Expected inflation rates are measured at [SSeconomy.inflation_value()*100]%" // DARKPACK EDIT CHANGE
var/update_alerts = FALSE
- if(HAS_TRAIT(SSstation, STATION_TRAIT_ECONOMY_ALERTS))
+ if(HAS_TRAIT(SSstation, STATION_TRAIT_ECONOMY_ALERTS) && (living_player_count() > 1))
var/datum/bank_account/moneybags
var/static/list/typecache_bank = typecacheof(list(/datum/bank_account/department, /datum/bank_account/remote))
for(var/i in bank_accounts_by_id)
@@ -185,11 +187,11 @@ SUBSYSTEM_DEF(economy)
if(!moneybags || moneybags.account_balance < current_acc.account_balance)
moneybags = current_acc
if (moneybags)
- earning_report += "Our GMM Spotlight would like to alert you that [moneybags.account_holder] is your station's most affulent crewmate! They've hit it big with [moneybags.account_balance] credits saved. "
+ earning_report += "Our GMM Spotlight would like to alert you that [moneybags.account_holder] is your station's most affulent crewmate! They've hit it big with [moneybags.account_balance] [MONEY_NAME] saved. "
update_alerts = TRUE
inflict_moneybags(moneybags)
- earning_report += "That's all from the Nanotrasen Economist Division."
- GLOB.news_network.submit_article(earning_report, "Station Earnings Report", NEWSCASTER_STATION_ANNOUNCEMENTS, null, update_alert = update_alerts)
+ earning_report += " That's all from the [CITY_NAME] Economist Division." // DARKPACK EDIT CHANGE
+ GLOB.news_network.submit_article(earning_report, "[CITY_NAME] Earnings Report", NEWSCASTER_STATION_ANNOUNCEMENTS, null, update_alert = update_alerts) // DARKPACK EDIT CHANGE
return TRUE
/**
@@ -204,7 +206,7 @@ SUBSYSTEM_DEF(economy)
return 1
if(HAS_TRAIT(SSeconomy, TRAIT_MARKET_CRASHING))
return inflation_value //early return instead of the actual check
- inflation_value = max(round(((station_total / bank_accounts_by_id.len) / station_target), 0.1), 1.0)
+ inflation_value = clamp(round(((station_total / bank_accounts_by_id.len) / station_target), 0.1), 0.9, 1.1) // DARKPACK EDIT CHANGE
return inflation_value
/**
diff --git a/code/controllers/subsystem/events.dm b/code/controllers/subsystem/events.dm
index 2ecec8989d0b..1aea336e3752 100644
--- a/code/controllers/subsystem/events.dm
+++ b/code/controllers/subsystem/events.dm
@@ -8,6 +8,8 @@ SUBSYSTEM_DEF(events)
var/list/control = list()
///assoc list of all datum/round_event_control, ordered by name. name => event
var/list/events_by_name = list()
+ ///assoc list of all nonrunning event types, ordered by name. name => event typepath
+ var/list/nonrunning_events_by_name = list()
///list of all existing /datum/round_event currently being run.
var/list/running = list()
///cache of currently running events, for lag checking.
@@ -24,7 +26,10 @@ SUBSYSTEM_DEF(events)
/datum/controller/subsystem/events/Initialize()
for(var/type in typesof(/datum/round_event_control))
var/datum/round_event_control/event = new type()
- if(!event.typepath || !event.valid_for_map())
+ if(!event.typepath)
+ continue
+ if(!event.valid_for_map())
+ nonrunning_events_by_name[event.name] = event.type
continue //don't want this one! leave it for the garbage collector
control += event //add it to the list of all events (controls)
events_by_name[event.name] = event
@@ -49,8 +54,9 @@ SUBSYSTEM_DEF(events)
var/list/configuration = json_decode(file2text(json_file))
for(var/variable in configuration)
var/datum/round_event_control/event = events_by_name[variable]
- if(!event)
- stack_trace("Invalid event [event] attempting to be configured.")
+ if(isnull(event))
+ if(isnull(nonrunning_events_by_name[variable])) // don't stack_trace events that aren't running due to map flags
+ stack_trace("Invalid event [variable] attempting to be configured.")
continue
for(var/event_variable in configuration[variable])
if(!(event.vars.Find(event_variable)))
diff --git a/code/controllers/subsystem/explosions.dm b/code/controllers/subsystem/explosions.dm
index 9fb15c8087ed..f8062a8a2247 100644
--- a/code/controllers/subsystem/explosions.dm
+++ b/code/controllers/subsystem/explosions.dm
@@ -472,8 +472,7 @@ ADMIN_VERB(check_bomb_impacts, R_DEBUG, "Check Bomb Impact", "See what the effec
var/took = (REALTIMEOFDAY - started_at) / 10
//You need to press the DebugGame verb to see these now....they were getting annoying and we've collected a fair bit of data. Just -test- changes to explosion code using this please so we can compare
- if(GLOB.Debug2)
- log_world("## DEBUG: Explosion([x0],[y0],[z0])(d[devastation_range],h[heavy_impact_range],l[light_impact_range]): Took [took] seconds.")
+ debug_world("Explosion([x0],[y0],[z0])(d[devastation_range],h[heavy_impact_range],l[light_impact_range]): Took [took] seconds.")
explosion_index += 1
diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm
index 405f2ec12b4c..ce8672a6d9bf 100644
--- a/code/controllers/subsystem/job.dm
+++ b/code/controllers/subsystem/job.dm
@@ -31,7 +31,7 @@ SUBSYSTEM_DEF(job)
var/list/prioritized_jobs = list()
var/list/latejoin_trackers = list()
- var/overflow_role = /datum/job/assistant
+ var/datum/job/overflow_role = /datum/job/vampire/citizen // DARKPACK EDIT, ORIGINAL: var/datum/job/overflow_role = /datum/job/assistant
var/list/level_order = list(JP_HIGH, JP_MEDIUM, JP_LOW)
@@ -48,6 +48,7 @@ SUBSYSTEM_DEF(job)
* See [/datum/controller/subsystem/ticker/proc/equip_characters]
*/
var/list/chain_of_command = list(
+ /* // DARKPACK EDIT START
JOB_CAPTAIN = 1,
JOB_HEAD_OF_PERSONNEL = 2,
JOB_RESEARCH_DIRECTOR = 3,
@@ -55,6 +56,9 @@ SUBSYSTEM_DEF(job)
JOB_CHIEF_MEDICAL_OFFICER = 5,
JOB_HEAD_OF_SECURITY = 6,
JOB_QUARTERMASTER = 7,
+ */
+ JOB_PRINCE = 1,
+ // DARKPACK EDIT END
)
/// If TRUE, some player has been assigned Captaincy or Acting Captaincy at some point during the shift and has been given the spare ID safe code.
@@ -426,7 +430,7 @@ SUBSYSTEM_DEF(job)
job_debug("DO: Player count to assign roles to: [initial_players_to_assign]")
//Scale number of open security officer slots to population
- setup_officer_positions()
+ //setup_officer_positions() DAKRPACK EDIT REMOVAL - JOBS
//Jobs will have fewer access permissions if the number of players exceeds the threshold defined in game_options.txt
var/min_access_threshold = CONFIG_GET(number/minimal_access_threshold)
@@ -734,13 +738,19 @@ SUBSYSTEM_DEF(job)
/atom/proc/JoinPlayerHere(mob/joining_mob, buckle)
// By default, just place the mob on the same turf as the marker or whatever.
- joining_mob.forceMove(get_turf(src))
+ // Set joining_mob as the new mob so subtypes can use it as a proper mob.
+ if(ispath(joining_mob))
+ joining_mob = new joining_mob(get_turf(src))
+ else
+ joining_mob.forceMove(get_turf(src))
+ return joining_mob
/obj/structure/chair/JoinPlayerHere(mob/joining_mob, buckle)
- . = ..()
+ var/mob/created_joining_mob = ..()
// Placing a mob in a chair will attempt to buckle it, or else fall back to default.
- if(buckle && isliving(joining_mob))
- buckle_mob(joining_mob, FALSE, FALSE)
+ if(buckle && isliving(created_joining_mob))
+ buckle_mob(created_joining_mob, FALSE, FALSE)
+ return created_joining_mob
/datum/controller/subsystem/job/proc/send_to_late_join(mob/M, buckle = TRUE)
var/atom/destination
@@ -978,7 +988,7 @@ SUBSYSTEM_DEF(job)
job_debug("[debug_prefix]: Player is qdeleted, Player: [player][add_job_to_log ? ", Job: [possible_job]" : ""]")
return JOB_UNAVAILABLE_GENERIC
- return JOB_AVAILABLE
+ return check_job_eligibility_darkpack(player, possible_job, debug_prefix, add_job_to_log) // DARKPACK EDIT, ORIGINAL: return JOB_AVAILABLE
/**
* Check if the station manifest has at least a certain amount of this staff type.
diff --git a/code/controllers/subsystem/library.dm b/code/controllers/subsystem/library.dm
index 7933bbae0c75..87b64f1af870 100644
--- a/code/controllers/subsystem/library.dm
+++ b/code/controllers/subsystem/library.dm
@@ -58,7 +58,7 @@ SUBSYSTEM_DEF(library)
/datum/controller/subsystem/library/proc/prepare_official_posters()
printable_posters = list()
for(var/obj/structure/sign/poster/official/poster_type as anything in subtypesof(/obj/structure/sign/poster/official))
- if (initial(poster_type.printable) == TRUE) //Mostly this check exists to keep directionals from ending up in the printable list
+ if (initial(poster_type.pixel_x) == 0 && initial(poster_type.pixel_y) == 0) //Anything with an initial pixel offset is a directional subtype, keep it out the list
printable_posters[initial(poster_type.name)] = poster_type
/datum/controller/subsystem/library/proc/prepare_library_areas()
diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index 45ebd159a476..d7ae34fab4ee 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -455,10 +455,12 @@ Used by the AI doomsday and the self-destruct nuke.
#ifndef LOWMEMORYMODE
+ /* // DARKPACK EDIT REMOVAL - TODO - PENUMBRA
if(current_map.minetype == MINETYPE_LAVALAND)
LoadGroup(FailedZs, "Lavaland", "map_files/Mining", "Lavaland.dmm", default_traits = ZTRAITS_LAVALAND)
else if (!isnull(current_map.minetype) && current_map.minetype != MINETYPE_NONE && current_map.minetype != MINETYPE_ICE)
INIT_ANNOUNCE("WARNING: An unknown minetype '[current_map.minetype]' was set! This is being ignored! Update the maploader code!")
+ */
#endif
if(LAZYLEN(FailedZs)) //but seriously, unless the server's filesystem is messed up this will never happen
@@ -486,7 +488,7 @@ GLOBAL_LIST_EMPTY(the_station_areas)
/// Generates the global station area list, filling it with typepaths of unique areas found on the station Z.
/datum/controller/subsystem/mapping/proc/generate_station_area_list()
for(var/area/station/station_area in GLOB.areas)
- if (!(station_area.area_flags & UNIQUE_AREA))
+ if (!(station_area.area_flags_mapping & UNIQUE_AREA))
continue
if (is_station_level(station_area.z))
GLOB.the_station_areas += station_area.type
diff --git a/code/controllers/subsystem/materials.dm b/code/controllers/subsystem/materials.dm
index 5341a671c8ee..e0b2bcc73378 100644
--- a/code/controllers/subsystem/materials.dm
+++ b/code/controllers/subsystem/materials.dm
@@ -21,16 +21,16 @@ SUBSYSTEM_DEF(materials)
var/list/list/material_combos
///List of stackcrafting recipes for materials using base recipes
var/list/base_stack_recipes = list(
- new /datum/stack_recipe("Chair", /obj/structure/chair/greyscale, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND | CRAFT_APPLIES_MATS, category = CAT_FURNITURE),
- new /datum/stack_recipe("Toilet", /obj/structure/toilet/greyscale, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND | CRAFT_APPLIES_MATS, category = CAT_FURNITURE),
- new /datum/stack_recipe("Sink Frame", /obj/structure/sinkframe, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND | CRAFT_APPLIES_MATS, category = CAT_FURNITURE),
- new /datum/stack_recipe("Material floor tile", /obj/item/stack/tile/material, 1, 4, 20, crafting_flags = CRAFT_APPLIES_MATS, category = CAT_TILES),
- /* new /datum/stack_recipe("Material airlock assembly", /obj/structure/door_assembly/door_assembly_material, 4, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND | CRAFT_APPLIES_MATS, category = CAT_DOORS), */ // DARKPACK EDIT REMOVE
- new /datum/stack_recipe("Material platform", /obj/structure/platform/material, 2, time = 3 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND | CRAFT_APPLIES_MATS, trait_booster = TRAIT_QUICK_BUILD, trait_modifier = 0.75, category = CAT_STRUCTURE), \
+ new /datum/stack_recipe("Chair", /obj/structure/chair/greyscale, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND | CRAFT_SKIP_MATERIALS_PARITY, category = CAT_FURNITURE),
+ new /datum/stack_recipe("Toilet", /obj/structure/toilet/greyscale, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND | CRAFT_SKIP_MATERIALS_PARITY, category = CAT_FURNITURE),
+ new /datum/stack_recipe("Sink Frame", /obj/structure/sinkframe, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND | CRAFT_SKIP_MATERIALS_PARITY, category = CAT_FURNITURE),
+ new /datum/stack_recipe("Material floor tile", /obj/item/stack/tile/material, 1, 4, 20, crafting_flags = CRAFT_SKIP_MATERIALS_PARITY, category = CAT_TILES),
+ /* new /datum/stack_recipe("Material airlock assembly", /obj/structure/door_assembly/door_assembly_material, 4, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND | CRAFT_SKIP_MATERIALS_PARITY, category = CAT_DOORS), */ // DARKPACK EDIT REMOVE
+ new /datum/stack_recipe("Material platform", /obj/structure/platform/material, 2, time = 3 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND | CRAFT_SKIP_MATERIALS_PARITY, trait_booster = TRAIT_QUICK_BUILD, trait_modifier = 0.75, category = CAT_STRUCTURE), \
)
///List of stackcrafting recipes for materials using rigid recipes
var/list/rigid_stack_recipes = list(
- new /datum/stack_recipe("Carving block", /obj/structure/carving_block, 5, time = 3 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND | CRAFT_APPLIES_MATS, category = CAT_STRUCTURE),
+ new /datum/stack_recipe("Carving block", /obj/structure/carving_block, 5, time = 3 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND | CRAFT_SKIP_MATERIALS_PARITY, category = CAT_STRUCTURE),
)
///A list of dimensional themes used by the dimensional anomaly and other things, most of which require materials to function.
@@ -157,8 +157,7 @@ SUBSYSTEM_DEF(materials)
if(!material_combos)
InitializeMaterials()
var/list/combo_params = list()
- for(var/x in materials_declaration)
- var/datum/material/mat = x
+ for(var/datum/material/mat as anything in materials_declaration)
combo_params += "[istype(mat) ? mat.id : mat]=[OPTIMAL_COST(materials_declaration[mat] * multiplier)]"
sortTim(combo_params, GLOBAL_PROC_REF(cmp_text_asc)) // We have to sort now in case the declaration was not in order
var/combo_index = combo_params.Join("-")
diff --git a/code/controllers/subsystem/networks/bitrunning.dm b/code/controllers/subsystem/networks/bitrunning.dm
index 5e6a1c6bd345..51b7f329a4a6 100644
--- a/code/controllers/subsystem/networks/bitrunning.dm
+++ b/code/controllers/subsystem/networks/bitrunning.dm
@@ -19,7 +19,7 @@ SUBSYSTEM_DEF(bitrunning)
var/list/levels = list()
for(var/datum/lazy_template/virtual_domain/domain as anything in all_domains)
- if(domain.test_only)
+ if(domain.domain_flags & DOMAIN_TEST_ONLY)
continue
var/can_view = domain.difficulty < scanner_tier && domain.cost <= points + 5
var/can_view_reward = domain.difficulty < (scanner_tier + 1) && domain.cost <= points + 3
diff --git a/code/controllers/subsystem/networks/id_access.dm b/code/controllers/subsystem/networks/id_access.dm
index 66bb83a831ea..94793f311149 100644
--- a/code/controllers/subsystem/networks/id_access.dm
+++ b/code/controllers/subsystem/networks/id_access.dm
@@ -249,86 +249,89 @@ SUBSYSTEM_DEF(id_access)
/// Setup dictionary that converts access levels to text descriptions.
/datum/controller/subsystem/id_access/proc/setup_access_descriptions()
- desc_by_access["[ACCESS_CARGO]"] = "Cargo Bay"
- desc_by_access["[ACCESS_SECURITY]"] = "Security"
- desc_by_access["[ACCESS_BRIG]"] = "Holding Cells"
- desc_by_access["[ACCESS_COURT]"] = "Courtroom"
- desc_by_access["[ACCESS_DETECTIVE]"] = "Detective Office"
- desc_by_access["[ACCESS_MEDICAL]"] = "Medical"
- desc_by_access["[ACCESS_GENETICS]"] = "Genetics Lab"
- desc_by_access["[ACCESS_MORGUE]"] = "Morgue"
- desc_by_access["[ACCESS_MORGUE_SECURE]"] = "Coroner"
- desc_by_access["[ACCESS_SCIENCE]"] = "R&D Lab"
- desc_by_access["[ACCESS_ORDNANCE]"] = "Ordnance Lab"
- desc_by_access["[ACCESS_ORDNANCE_STORAGE]"] = "Ordnance Storage"
- desc_by_access["[ACCESS_PLUMBING]"] = "Chemistry Lab"
- desc_by_access["[ACCESS_RD]"] = "RD Office"
- desc_by_access["[ACCESS_BAR]"] = "Bar"
- desc_by_access["[ACCESS_JANITOR]"] = "Custodial Closet"
- desc_by_access["[ACCESS_ENGINEERING]"] = "Engineering"
- desc_by_access["[ACCESS_ENGINE_EQUIP]"] = "Power and Engineering Equipment"
- desc_by_access["[ACCESS_MAINT_TUNNELS]"] = "Maintenance"
- desc_by_access["[ACCESS_EXTERNAL_AIRLOCKS]"] = "External Airlocks"
- desc_by_access["[ACCESS_CHANGE_IDS]"] = "ID Console"
- desc_by_access["[ACCESS_AI_UPLOAD]"] = "AI Chambers"
- desc_by_access["[ACCESS_TELEPORTER]"] = "Teleporter"
- desc_by_access["[ACCESS_EVA]"] = "EVA"
- desc_by_access["[ACCESS_COMMAND]"] = "Command"
- desc_by_access["[ACCESS_CAPTAIN]"] = "Captain"
- desc_by_access["[ACCESS_ALL_PERSONAL_LOCKERS]"] = "Personal Lockers"
- desc_by_access["[ACCESS_CHAPEL_OFFICE]"] = "Chapel Office"
- desc_by_access["[ACCESS_TECH_STORAGE]"] = "Technical Storage"
- desc_by_access["[ACCESS_ATMOSPHERICS]"] = "Atmospherics"
- desc_by_access["[ACCESS_CREMATORIUM]"] = "Crematorium"
- desc_by_access["[ACCESS_ARMORY]"] = "Armory"
- desc_by_access["[ACCESS_CONSTRUCTION]"] = "Construction"
- desc_by_access["[ACCESS_KITCHEN]"] = "Kitchen"
- desc_by_access["[ACCESS_HYDROPONICS]"] = "Hydroponics"
- desc_by_access["[ACCESS_LIBRARY]"] = "Library"
- desc_by_access["[ACCESS_LAWYER]"] = "Law Office"
- desc_by_access["[ACCESS_ROBOTICS]"] = "Robotics"
- desc_by_access["[ACCESS_VIROLOGY]"] = "Virology"
- desc_by_access["[ACCESS_PSYCHOLOGY]"] = "Psychology"
- desc_by_access["[ACCESS_CMO]"] = "CMO Office"
- desc_by_access["[ACCESS_QM]"] = "QM Office"
- desc_by_access["[ACCESS_SURGERY]"] = "Surgery"
- desc_by_access["[ACCESS_THEATRE]"] = "Theatre"
- desc_by_access["[ACCESS_RESEARCH]"] = "Science"
- desc_by_access["[ACCESS_MINING]"] = "Mining Dock"
- desc_by_access["[ACCESS_SHIPPING]"] = "Cargo Shipping"
- desc_by_access["[ACCESS_VAULT]"] = "Main Vault"
- desc_by_access["[ACCESS_MINING_STATION]"] = "Mining Outpost"
- desc_by_access["[ACCESS_XENOBIOLOGY]"] = "Xenobiology Lab"
- desc_by_access["[ACCESS_HOP]"] = "HoP Office"
- desc_by_access["[ACCESS_HOS]"] = "HoS Office"
- desc_by_access["[ACCESS_CE]"] = "CE Office"
- desc_by_access["[ACCESS_PHARMACY]"] = "Pharmacy"
- desc_by_access["[ACCESS_RC_ANNOUNCE]"] = "RC Announcements"
- desc_by_access["[ACCESS_KEYCARD_AUTH]"] = "Keycode Auth."
- desc_by_access["[ACCESS_TCOMMS]"] = "Telecommunications"
- desc_by_access["[ACCESS_GATEWAY]"] = "Gateway"
- desc_by_access["[ACCESS_BRIG_ENTRANCE]"] = "Brig"
- desc_by_access["[ACCESS_MINERAL_STOREROOM]"] = "Mineral Storage"
- desc_by_access["[ACCESS_MINISAT]"] = "AI Satellite"
- desc_by_access["[ACCESS_WEAPONS]"] = "Weapon Permit"
- desc_by_access["[ACCESS_NETWORK]"] = "Network Access"
- desc_by_access["[ACCESS_MECH_MINING]"] = "Mining Mech Access"
- desc_by_access["[ACCESS_MECH_MEDICAL]"] = "Medical Mech Access"
- desc_by_access["[ACCESS_MECH_SECURITY]"] = "Security Mech Access"
- desc_by_access["[ACCESS_MECH_SCIENCE]"] = "Science Mech Access"
- desc_by_access["[ACCESS_MECH_ENGINE]"] = "Engineering Mech Access"
- desc_by_access["[ACCESS_AUX_BASE]"] = "Auxiliary Base"
- desc_by_access["[ACCESS_SERVICE]"] = "Service Hallway"
- desc_by_access["[ACCESS_CENT_GENERAL]"] = "Code Grey"
- desc_by_access["[ACCESS_CENT_THUNDER]"] = "Code Yellow"
- desc_by_access["[ACCESS_CENT_STORAGE]"] = "Code Orange"
- desc_by_access["[ACCESS_CENT_LIVING]"] = "Code Green"
- desc_by_access["[ACCESS_CENT_MEDICAL]"] = "Code White"
- desc_by_access["[ACCESS_CENT_TELEPORTER]"] = "Code Blue"
- desc_by_access["[ACCESS_CENT_SPECOPS]"] = "Code Black"
- desc_by_access["[ACCESS_CENT_CAPTAIN]"] = "Code Gold"
- desc_by_access["[ACCESS_CENT_BAR]"] = "Code Scotch"
- desc_by_access["[ACCESS_BIT_DEN]"] = "Bitrunner Den"
+ desc_by_access[ACCESS_CARGO] = "Cargo Bay"
+ desc_by_access[ACCESS_SECURITY] = "Security"
+ desc_by_access[ACCESS_BRIG] = "Holding Cells"
+ desc_by_access[ACCESS_COURT] = "Courtroom"
+ desc_by_access[ACCESS_DETECTIVE] = "Detective Office"
+ desc_by_access[ACCESS_MEDICAL] = "Medical"
+ desc_by_access[ACCESS_GENETICS] = "Genetics Lab"
+ desc_by_access[ACCESS_MORGUE] = "Morgue"
+ desc_by_access[ACCESS_MORGUE_SECURE] = "Coroner"
+ desc_by_access[ACCESS_SCIENCE] = "R&D Lab"
+ desc_by_access[ACCESS_ORDNANCE] = "Ordnance Lab"
+ desc_by_access[ACCESS_ORDNANCE_STORAGE] = "Ordnance Storage"
+ desc_by_access[ACCESS_PLUMBING] = "Chemistry Lab"
+ desc_by_access[ACCESS_RD] = "RD Office"
+ desc_by_access[ACCESS_BAR] = "Bar"
+ desc_by_access[ACCESS_JANITOR] = "Custodial Closet"
+ desc_by_access[ACCESS_ENGINEERING] = "Engineering"
+ desc_by_access[ACCESS_ENGINE_EQUIP] = "Power and Engineering Equipment"
+ desc_by_access[ACCESS_MAINT_TUNNELS] = "Maintenance"
+ desc_by_access[ACCESS_EXTERNAL_AIRLOCKS] = "External Airlocks"
+ desc_by_access[ACCESS_CHANGE_IDS] = "ID Console"
+ desc_by_access[ACCESS_AI_UPLOAD] = "AI Chambers"
+ desc_by_access[ACCESS_TELEPORTER] = "Teleporter"
+ desc_by_access[ACCESS_EVA] = "EVA"
+ desc_by_access[ACCESS_BUDGET] = "Department Budget"
+ desc_by_access[ACCESS_COMMAND] = "Command"
+ desc_by_access[ACCESS_CAPTAIN] = "Captain"
+ desc_by_access[ACCESS_ALL_PERSONAL_LOCKERS] = "Personal Lockers"
+ desc_by_access[ACCESS_CHAPEL_OFFICE] = "Chapel Office"
+ desc_by_access[ACCESS_TECH_STORAGE] = "Technical Storage"
+ desc_by_access[ACCESS_ATMOSPHERICS] = "Atmospherics"
+ desc_by_access[ACCESS_CREMATORIUM] = "Crematorium"
+ desc_by_access[ACCESS_ARMORY] = "Armory"
+ desc_by_access[ACCESS_CONSTRUCTION] = "Construction"
+ desc_by_access[ACCESS_KITCHEN] = "Kitchen"
+ desc_by_access[ACCESS_HYDROPONICS] = "Hydroponics"
+ desc_by_access[ACCESS_LIBRARY] = "Library"
+ desc_by_access[ACCESS_LAWYER] = "Law Office"
+ desc_by_access[ACCESS_ROBOTICS] = "Robotics"
+ desc_by_access[ACCESS_VIROLOGY] = "Virology"
+ desc_by_access[ACCESS_PSYCHOLOGY] = "Psychology"
+ desc_by_access[ACCESS_CMO] = "CMO Office"
+ desc_by_access[ACCESS_PARAMEDIC] = "Paramedic Office"
+ desc_by_access[ACCESS_QM] = "QM Office"
+ desc_by_access[ACCESS_SURGERY] = "Surgery"
+ desc_by_access[ACCESS_THEATRE] = "Theatre"
+ desc_by_access[ACCESS_RESEARCH] = "Science"
+ desc_by_access[ACCESS_MINING] = "Mining Dock"
+ desc_by_access[ACCESS_SHIPPING] = "Cargo Shipping"
+ desc_by_access[ACCESS_VAULT] = "Main Vault"
+ desc_by_access[ACCESS_MINING_STATION] = "Mining Outpost"
+ desc_by_access[ACCESS_XENOBIOLOGY] = "Xenobiology Lab"
+ desc_by_access[ACCESS_HOP] = "HoP Office"
+ desc_by_access[ACCESS_HOS] = "HoS Office"
+ desc_by_access[ACCESS_CE] = "CE Office"
+ desc_by_access[ACCESS_PHARMACY] = "Pharmacy"
+ desc_by_access[ACCESS_RC_ANNOUNCE] = "RC Announcements"
+ desc_by_access[ACCESS_KEYCARD_AUTH] = "Keycode Auth."
+ desc_by_access[ACCESS_TCOMMS] = "Telecommunications"
+ desc_by_access[ACCESS_GATEWAY] = "Gateway"
+ desc_by_access[ACCESS_BRIG_ENTRANCE] = "Brig"
+ desc_by_access[ACCESS_MINERAL_STOREROOM] = "Mineral Storage"
+ desc_by_access[ACCESS_MINISAT] = "AI Satellite"
+ desc_by_access[ACCESS_WEAPONS] = "Weapon Permit"
+ desc_by_access[ACCESS_NETWORK] = "Network Access"
+ desc_by_access[ACCESS_MECH_MINING] = "Mining Mech Access"
+ desc_by_access[ACCESS_MECH_MEDICAL] = "Medical Mech Access"
+ desc_by_access[ACCESS_MECH_SECURITY] = "Security Mech Access"
+ desc_by_access[ACCESS_MECH_SCIENCE] = "Science Mech Access"
+ desc_by_access[ACCESS_MECH_ENGINE] = "Engineering Mech Access"
+ desc_by_access[ACCESS_AUX_BASE] = "Auxiliary Base"
+ desc_by_access[ACCESS_SERVICE] = "Service Hallway"
+ desc_by_access[ACCESS_CENT_GENERAL] = "CentCom General Access"
+ desc_by_access[ACCESS_CENT_THUNDER] = "CentCom Thunderdome"
+ desc_by_access[ACCESS_CENT_STORAGE] = "CentCom Storage"
+ desc_by_access[ACCESS_CENT_LIVING] = "CentCom Living Quarters"
+ desc_by_access[ACCESS_CENT_MEDICAL] = "CentCom Medical"
+ desc_by_access[ACCESS_CENT_TELEPORTER] = "CentCom Teleporter"
+ desc_by_access[ACCESS_CENT_SPECOPS] = "CentCom SpecOps"
+ desc_by_access[ACCESS_CENT_CAPTAIN] = "CentCom Captain"
+ desc_by_access[ACCESS_CENT_BAR] = "CentCom Bar"
+ desc_by_access[ACCESS_CENT_OFFICER] = "CentCom Officer"
+ desc_by_access[ACCESS_BIT_DEN] = "Bitrunner Den"
/**
* Returns the access bitflags associated with any given access level.
diff --git a/code/controllers/subsystem/networks/research.dm b/code/controllers/subsystem/networks/research.dm
index dece0f78e01e..8a48e90c2661 100644
--- a/code/controllers/subsystem/networks/research.dm
+++ b/code/controllers/subsystem/networks/research.dm
@@ -66,6 +66,7 @@ SUBSYSTEM_DEF(research)
/obj/item/assembly/signaler/anomaly/bioscrambler = MAX_CORES_BIOSCRAMBLER,
/obj/item/assembly/signaler/anomaly/dimensional = MAX_CORES_DIMENSIONAL,
/obj/item/assembly/signaler/anomaly/ectoplasm = MAX_CORES_ECTOPLASMIC,
+ /obj/item/assembly/signaler/anomaly/weather = MAX_CORES_WEATHER,
)
/// Lookup list for ordnance briefers.
diff --git a/code/controllers/subsystem/ore_generation.dm b/code/controllers/subsystem/ore_generation.dm
index b364bfe04873..7f51c2bcbbe5 100644
--- a/code/controllers/subsystem/ore_generation.dm
+++ b/code/controllers/subsystem/ore_generation.dm
@@ -22,12 +22,49 @@ SUBSYSTEM_DEF(ore_generation)
var/list/ore_vent_minerals = list()
/datum/controller/subsystem/ore_generation/Initialize()
+ /// First, lets sort each ore_vent here based on their distance to the landmark, then we'll assign sizes.
+ var/list/sort_vents = list()
+ for(var/obj/structure/ore_vent/vent as anything in possible_vents)
+
+ var/obj/landmark_anchor //We need to find the mining epicenter to gather distance from.
+ for(var/obj/possible_landmark as anything in GLOB.mining_center) // have to check multiple due to icebox
+ if(possible_landmark.z == vent.z)
+ landmark_anchor = possible_landmark
+ break
+
+ if(!landmark_anchor) //We're missing a mining epicenter landmark, but it's not crash-worthy.
+ vent.vent_size_setup(random = TRUE, force_size = null, map_loading = TRUE)
+ continue
+
+ sort_vents.Insert(length(sort_vents), vent)
+ sort_vents[vent] = get_dist(get_turf(vent),get_turf(landmark_anchor))
+
+ sortTim(sort_vents, GLOBAL_PROC_REF(cmp_numeric_asc), associative = TRUE) // Should sort list from closest to farthest.
+ possible_vents = sort_vents // Now we can work with the main list
+
+ var/cutoff = round((length(possible_vents) / 3))
+ var/vent_size_level = SMALL_VENT_TYPE
+
+ for(var/obj/structure/ore_vent/vent as anything in possible_vents)
+ vent.vent_size_setup(random = FALSE, force_size = vent_size_level, map_loading = TRUE)
+ cutoff--
+ if(cutoff > 0 || vent_size_level == LARGE_VENT_TYPE)
+ continue
+ cutoff = round((length(possible_vents) / 3))
+ switch(vent_size_level)
+ if(SMALL_VENT_TYPE)
+ vent_size_level = MEDIUM_VENT_TYPE
+ if(MEDIUM_VENT_TYPE)
+ vent_size_level = LARGE_VENT_TYPE
+
+ //Finally, we're going to round robin through the list of ore vents and assign a mineral to them until complete.
//Basically, we're going to round robin through the list of ore vents and assign a mineral to them until complete.
for(var/obj/structure/ore_vent/vent as anything in possible_vents)
if(vent.unique_vent)
continue //Ya'll already got your minerals.
vent.generate_mineral_breakdown(map_loading = TRUE)
+
/// Handles roundstart logging
logger.Log(
LOG_CATEGORY_CAVE_GENERATION,
diff --git a/code/controllers/subsystem/persistence/_persistence.dm b/code/controllers/subsystem/persistence/_persistence.dm
index af94d034d37c..789835c2e826 100644
--- a/code/controllers/subsystem/persistence/_persistence.dm
+++ b/code/controllers/subsystem/persistence/_persistence.dm
@@ -94,6 +94,7 @@ SUBSYSTEM_DEF(persistence)
for(var/datum/transport_controller/linear/tram/transport as anything in SStransport.transports_by_type[TRANSPORT_TYPE_TRAM])
save_tram_history(transport.specific_transport_id)
save_tram_counter()
+ save_guestbooks() // DARKPACK EDIT ADD
///Loads up Poly's speech buffer.
diff --git a/code/controllers/subsystem/persistence/engravings.dm b/code/controllers/subsystem/persistence/engravings.dm
index ad00c7909d72..c60f5ae524b0 100644
--- a/code/controllers/subsystem/persistence/engravings.dm
+++ b/code/controllers/subsystem/persistence/engravings.dm
@@ -62,7 +62,7 @@
if(!engraving.persistent_save)
continue
var/area/engraved_area = get_area(engraving.parent)
- if(!(engraved_area.area_flags & PERSISTENT_ENGRAVINGS))
+ if(!(engraved_area.area_flags_mapping & PERSISTENT_ENGRAVINGS))
continue
saved_data["entries"] += engraving.save_persistent()
diff --git a/code/controllers/subsystem/persistence/scars.dm b/code/controllers/subsystem/persistence/scars.dm
index fa378f24dd43..5c6a76f4e134 100644
--- a/code/controllers/subsystem/persistence/scars.dm
+++ b/code/controllers/subsystem/persistence/scars.dm
@@ -5,7 +5,7 @@
if(!istype(ending_human) || !ending_human.mind?.original_character_slot_index || !ending_human.client?.prefs.read_preference(/datum/preference/toggle/persistent_scars))
continue
- var/mob/living/carbon/human/original_human = ending_human.mind.original_character.resolve()
+ var/mob/living/carbon/human/original_human = ending_human.mind.original_character?.resolve()
if(!original_human)
continue
diff --git a/code/controllers/subsystem/processing/fishing.dm b/code/controllers/subsystem/processing/fishing.dm
index 5283560a5a50..a607995157ca 100644
--- a/code/controllers/subsystem/processing/fishing.dm
+++ b/code/controllers/subsystem/processing/fishing.dm
@@ -29,7 +29,7 @@ PROCESSING_SUBSYSTEM_DEF(fishing)
var/icon/questionmark = icon('icons/effects/random_spawners.dmi', "questionmark")
var/list/mark_dimension = get_icon_dimensions(questionmark)
var/list/spawned_fish = list()
- var/list/fish_subtypes = sortTim(subtypesof(/obj/item/fish), GLOBAL_PROC_REF(cmp_init_name_asc))
+ var/list/fish_subtypes = sortTim(valid_subtypesof(/obj/item/fish), GLOBAL_PROC_REF(cmp_init_name_asc)) // DARKPACK EDIT CHANGE - FISHING
for(var/obj/item/fish/fish_type as anything in fish_subtypes)
var/list/fish_dimensions = get_icon_dimensions(fish_type::icon)
var/icon/fish_icon = icon(fish_type::icon, fish_type::icon_state, frame = 1, moving = FALSE)
diff --git a/code/controllers/subsystem/processing/instruments.dm b/code/controllers/subsystem/processing/instruments.dm
index fd486d419ebd..9cd8706e0c4f 100644
--- a/code/controllers/subsystem/processing/instruments.dm
+++ b/code/controllers/subsystem/processing/instruments.dm
@@ -36,10 +36,8 @@ PROCESSING_SUBSYSTEM_DEF(instruments)
songs -= S
/datum/controller/subsystem/processing/instruments/proc/initialize_instrument_data()
- for(var/path in subtypesof(/datum/instrument))
+ for(var/path in valid_subtypesof(/datum/instrument))
var/datum/instrument/I = path
- if(initial(I.abstract_type) == path)
- continue
I = new path
I.Initialize()
if(!I.id)
diff --git a/code/controllers/subsystem/processing/personality.dm b/code/controllers/subsystem/processing/personality.dm
new file mode 100644
index 000000000000..0f9c1021befd
--- /dev/null
+++ b/code/controllers/subsystem/processing/personality.dm
@@ -0,0 +1,83 @@
+PROCESSING_SUBSYSTEM_DEF(personalities)
+ name = "Personalities"
+ runlevels = RUNLEVEL_GAME
+ flags = SS_BACKGROUND|SS_POST_FIRE_TIMING
+ wait = 3 SECONDS
+
+ /// All personality singletons indexed by their type
+ VAR_FINAL/list/datum/personality/personalities_by_type
+ /// All personality singletons indexed by their savefile key
+ VAR_FINAL/list/datum/personality/personalities_by_key
+ /// Assoc list of personality group to list of personality typepaths in that group
+ VAR_FINAL/list/incompatibilities_by_group
+ /// For personalities which process, this tracks all mobs we need to process for
+ VAR_FINAL/list/processing_personalities
+
+/datum/controller/subsystem/processing/personalities/Initialize()
+ init_personalities()
+ return SS_INIT_SUCCESS
+
+/// Initialized personality singletons
+/datum/controller/subsystem/processing/personalities/proc/init_personalities()
+ if(length(personalities_by_type))
+ return // Already initialized
+
+ personalities_by_type = list()
+ personalities_by_key = list()
+ incompatibilities_by_group = list()
+ processing_personalities = list()
+ for(var/datum/personality/personality_type as anything in subtypesof(/datum/personality))
+ var/personality_key = personality_type::savefile_key
+ if(isnull(personality_key))
+ // Abstract personality, ignore
+ continue
+ if(personalities_by_key[personality_key])
+ stack_trace("Personality save key collision! \
+ key: [personality_key] - \
+ new: [personality_type::name] - \
+ old: [personalities_by_key[personality_key].name]")
+ continue
+
+ var/datum/personality/personality = new personality_type()
+ personalities_by_type[personality_type] = personality
+ personalities_by_key[personality.savefile_key] = personality
+ for(var/group in personality.groups)
+ incompatibilities_by_group[group] ||= list()
+ incompatibilities_by_group[group] += personality_type
+
+/// Helper to check if the new personality type is incompatible with the passed list of personality types
+/datum/controller/subsystem/processing/personalities/proc/is_incompatible(list/personality_types, new_personality_type)
+ if(!length(incompatibilities_by_group))
+ stack_trace("Checking personality incompatibilities before the incompatibility list was initialized?")
+ return FALSE
+ if(length(personality_types))
+ // No incompatibilities possible with no personalities
+ return FALSE
+ var/datum/personality/new_personality = personalities_by_type[new_personality_type]
+ if(!length(new_personality.groups))
+ // No groups, so no incompatibilities
+ return FALSE
+
+ // Filters all incompatibily groups against the new personality's groups
+ for(var/group, incompatibility_list in incompatibilities_by_group & new_personality.groups)
+ // Then checks if any personality type in the list is also in the group
+ if(length(incompatibility_list & personality_types))
+ return TRUE
+ return FALSE
+
+/// Helper to select a random list of personalities, respecting incompatibilities. REturns a list of typepaths
+/datum/controller/subsystem/processing/personalities/proc/select_random_personalities(lower_end = 1, upper_end = CONFIG_GET(number/max_personalities))
+ var/list/personality_pool = personalities_by_type.Copy()
+ var/list/selected_personalities = list()
+ var/num = rand(lower_end, upper_end)
+ var/i = 1
+ while(i <= num)
+ if(!length(personality_pool))
+ break
+ var/picked_type = pick(personality_pool)
+ if(is_incompatible(selected_personalities, picked_type))
+ continue
+ selected_personalities += picked_type
+ personality_pool -= picked_type
+ i += 1
+ return selected_personalities
diff --git a/code/controllers/subsystem/processing/priority_effects.dm b/code/controllers/subsystem/processing/priority_effects.dm
index ee4fb7f7f6dc..f3be081ec50c 100644
--- a/code/controllers/subsystem/processing/priority_effects.dm
+++ b/code/controllers/subsystem/processing/priority_effects.dm
@@ -1,6 +1,6 @@
PROCESSING_SUBSYSTEM_DEF(priority_effects)
name = "Priority Status Effects"
- flags = SS_TICKER | SS_KEEP_TIMING | SS_NO_INIT
- wait = 2 // Not seconds - we're running on SS_TICKER, so this is ticks.
+ flags = SS_KEEP_TIMING | SS_NO_INIT
+ wait = 0.2 SECONDS // Same as SSfastprocess, but can be anything, assuming you refactor all high-priority status effect intervals and durations to be a multiple of it.
priority = FIRE_PRIORITY_PRIORITY_EFFECTS
stat_tag = "PEFF"
diff --git a/code/controllers/subsystem/processing/processing.dm b/code/controllers/subsystem/processing/processing.dm
index 81ff1a5640b4..d2b255211686 100644
--- a/code/controllers/subsystem/processing/processing.dm
+++ b/code/controllers/subsystem/processing/processing.dm
@@ -40,7 +40,7 @@ SUBSYSTEM_DEF(processing)
* Additionally, any "prob" you use in this proc should instead use the SPT_PROB define to make sure that the final probability per second stays the same even if the subsystem's wait is altered.
* Examples where this must be considered:
* - Implementing a cooldown timer, use `mytimer -= seconds_per_tick`, not `mytimer -= 1`. This way, `mytimer` will always have the unit of seconds
- * - Damaging a mob, do `L.adjustFireLoss(20 * seconds_per_tick)`, not `L.adjustFireLoss(20)`. This way, the damage per second stays constant even if the wait of the subsystem is changed
+ * - Damaging a mob, do `L.adjust_fire_loss(20 * seconds_per_tick)`, not `L.adjust_fire_loss(20)`. This way, the damage per second stays constant even if the wait of the subsystem is changed
* - Probability of something happening, do `if(SPT_PROB(25, seconds_per_tick))`, not `if(prob(25))`. This way, if the subsystem wait is e.g. lowered, there won't be a higher chance of this event happening per second
*
* If you override this do not call parent, as it will return PROCESS_KILL. This is done to prevent objects that dont override process() from staying in the processing list
diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm
index 82ab648eefce..67e51e2747b2 100644
--- a/code/controllers/subsystem/processing/quirks.dm
+++ b/code/controllers/subsystem/processing/quirks.dm
@@ -8,13 +8,11 @@ GLOBAL_LIST_INIT_TYPED(quirk_blacklist, /list/datum/quirk, list(
list(/datum/quirk/item_quirk/blindness, /datum/quirk/item_quirk/scarred_eye),
list(/datum/quirk/item_quirk/blindness, /datum/quirk/item_quirk/fluoride_stare),
list(/datum/quirk/item_quirk/blindness, /datum/quirk/touchy),
- list(/datum/quirk/jolly, /datum/quirk/depression, /datum/quirk/apathetic, /datum/quirk/hypersensitive),
+ list(/datum/quirk/jolly, /datum/quirk/depression, /datum/quirk/hypersensitive),
list(/datum/quirk/no_taste, /datum/quirk/vegetarian, /datum/quirk/deviant_tastes, /datum/quirk/gamer),
list(/datum/quirk/pineapple_liker, /datum/quirk/pineapple_hater, /datum/quirk/gamer),
list(/datum/quirk/alcohol_tolerance, /datum/quirk/light_drinker),
list(/datum/quirk/item_quirk/clown_enjoyer, /datum/quirk/item_quirk/mime_fan),
- list(/datum/quirk/bad_touch, /datum/quirk/friendly),
- list(/datum/quirk/extrovert, /datum/quirk/introvert),
list(/datum/quirk/prosthetic_limb, /datum/quirk/quadruple_amputee, /datum/quirk/body_purist),
list(/datum/quirk/transhumanist, /datum/quirk/body_purist),
list(/datum/quirk/prosthetic_organ, /datum/quirk/tin_man, /datum/quirk/body_purist),
@@ -107,7 +105,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
*Randomises the quirks for a specified mob
*/
/datum/controller/subsystem/processing/quirks/proc/randomise_quirks(mob/living/user)
- var/bonus_quirks = max((length(user.quirks) + rand(-RANDOM_QUIRK_BONUS, RANDOM_QUIRK_BONUS)), MINIMUM_RANDOM_QUIRKS)
+ var/bonus_quirks = max((LAZYLEN(user.quirks) + rand(-RANDOM_QUIRK_BONUS, RANDOM_QUIRK_BONUS)), MINIMUM_RANDOM_QUIRKS)
var/added_quirk_count = 0 //How many we've added
var/list/quirks_to_add = list() //Quirks we're adding
var/good_count = 0
@@ -181,7 +179,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
var/list/positive_quirks = list()
var/points_enabled = !CONFIG_GET(flag/disable_quirk_points)
var/max_positive_quirks = CONFIG_GET(number/max_positive_quirks)
- var/balance = 0
+ var/balance = -CONFIG_GET(number/default_quirk_points)
var/list/all_quirks = get_quirks()
diff --git a/code/controllers/subsystem/processing/station.dm b/code/controllers/subsystem/processing/station.dm
index 45a10f3a9740..3f363934e4d4 100644
--- a/code/controllers/subsystem/processing/station.dm
+++ b/code/controllers/subsystem/processing/station.dm
@@ -7,7 +7,7 @@ PROCESSING_SUBSYSTEM_DEF(station)
///A list of currently active station traits
var/list/station_traits = list()
///Assoc list of trait type || assoc list of traits with weighted value. Used for picking traits from a specific category.
- var/list/selectable_traits_by_types = list(STATION_TRAIT_POSITIVE = list(), STATION_TRAIT_NEUTRAL = list(), STATION_TRAIT_NEGATIVE = list())
+ var/alist/selectable_traits_by_types = alist(STATION_TRAIT_POSITIVE = list(), STATION_TRAIT_NEUTRAL = list(), STATION_TRAIT_NEGATIVE = list())
///Currently active announcer. Starts as a type but gets initialized after traits are selected
var/datum/centcom_announcer/announcer = /datum/centcom_announcer/default
///A list of trait roles that should be protected from antag
@@ -94,15 +94,17 @@ PROCESSING_SUBSYSTEM_DEF(station)
return
- for(var/datum/station_trait/trait_typepath as anything in subtypesof(/datum/station_trait))
+ for(var/datum/station_trait/trait_typepath as anything in valid_subtypesof(/datum/station_trait))
// If forced, (probably debugging), just set it up now, keep it out of the pool.
if(initial(trait_typepath.force))
setup_trait(trait_typepath)
continue
- if(initial(trait_typepath.abstract_type) == trait_typepath)
- continue //Dont add abstract ones to it
+ // DARKPACK EDIT ADD START - CITY_TRAITS
+ if(!initial(trait_typepath.darkpack_allowed))
+ continue
+ // DARKPACK EDIT ADD END
if(!(initial(trait_typepath.trait_flags) & STATION_TRAIT_PLANETARY) && SSmapping.is_planetary()) // we're on a planet but we can't do planet ;_;
continue
@@ -137,6 +139,18 @@ PROCESSING_SUBSYSTEM_DEF(station)
pick_traits(STATION_TRAIT_NEUTRAL, neutral_trait_budget)
pick_traits(STATION_TRAIT_NEGATIVE, negative_trait_budget)
+ // DARKPACK EDIT ADD START - CITY_TRAITS
+ var/news_worthy_info
+ var/list/trait_list_strings = list()
+ for(var/datum/station_trait/station_trait as anything in station_traits)
+ if(!(station_trait.newspaper_message && prob(station_trait.newspaper_chance)))
+ continue
+ trait_list_strings += "[station_trait.newspaper_message] "
+ if(trait_list_strings.len > 0)
+ news_worthy_info = "Todays events to look out for: " + trait_list_strings.Join()
+ GLOB.news_network.submit_article(news_worthy_info, "The Daily Collum", NEWSCASTER_STATION_ANNOUNCEMENTS, null)
+ // DARKPACK EDIT ADD END
+
/**
* Picks traits of a specific category (e.g. bad or good), initializes them, adds them to the list of traits,
* then removes them from possible traits as to not roll twice and subtracts their cost from the budget.
diff --git a/code/controllers/subsystem/security_level.dm b/code/controllers/subsystem/security_level.dm
index 11bb96b3d2da..2e48d593faec 100644
--- a/code/controllers/subsystem/security_level.dm
+++ b/code/controllers/subsystem/security_level.dm
@@ -20,7 +20,7 @@ SUBSYSTEM_DEF(security_level)
if(!current_security_level.looping_sound) // No sound? No play.
can_fire = FALSE
return
- sound_to_playing_players(current_security_level.looping_sound)
+ sound_to_playing_players(current_security_level.looping_sound, volume_preference = /datum/preference/numeric/volume/sound_ambience_volume)
/**
diff --git a/code/controllers/subsystem/sounds.dm b/code/controllers/subsystem/sounds.dm
index 85a9da41a602..36597f53789e 100644
--- a/code/controllers/subsystem/sounds.dm
+++ b/code/controllers/subsystem/sounds.dm
@@ -34,6 +34,50 @@ SUBSYSTEM_DEF(sounds)
/// Any errors from precaching.
VAR_PRIVATE/list/precache_errors = list()
+ // Comments from https://github.com/DaedalusDock/daedalusdock We love Francinum.
+ /// A list of sound formats that work in byond. Indexed for direct accesing rather then loop itteration or usage of `in`
+ var/static/list/byond_sound_formats = list(
+ "mid" = TRUE, //Midi, 8.3 File Name
+ "midi" = TRUE, //Midi, Long File Name
+ "mod" = TRUE, //Module, Original Amiga Tracker format
+ "it" = TRUE, //Impulse Tracker Module format
+ "s3m" = TRUE, //ScreamTracker 3 Module
+ "xm" = TRUE, //FastTracker 2 Module
+ "oxm" = TRUE, //FastTracker 2 (Vorbis Compressed Samples)
+ "wav" = TRUE, //Waveform Audio File Format, A (R)IFF-class format, and Microsoft's choice in the 80s sound format pissing match.
+ "ogg" = TRUE, //OGG Audio Container, Usually contains Vorbis-compressed Audio
+ //"raw" = TRUE, //On the tin, byond purports to support raw, uncompressed PCM Audio. I actually have no fucking idea how FMOD actually handles these.
+ //since they completely lack all information. As a confusion based anti-footgun, I'm just going to wire this to FALSE for now. It's here though.
+ "wma" = TRUE, //Windows Media Audio container
+ "aiff" = TRUE, //Audio Interchange File Format, Apple's side of the 80s sound format pissing match. It's also (R)IFF in a trenchcoat.
+ "mp3" = TRUE //MPeg Layer 3 Container (And usually, Codec.)
+ )
+
+ /// File types we can sniff the duration from using rustg.
+ var/static/list/safe_formats = list(
+ "ogg" = TRUE,
+ "mp3" = TRUE
+ )
+
+ // Currently set to private as I would prefer you use byond_sound_formats but you can unprivate it if you have a valid use!
+ // Put more common extensions first to speed this up a bit (So only ogg and mp3 lol.)
+ /// Similar to byond_sound_formats, a list of sound formats that work in byond.
+ VAR_PRIVATE/static/list/byond_sound_extensions = list(
+ ".ogg",
+ ".mp3",
+ ".mid",
+ ".midi",
+ ".mod",
+ ".it",
+ ".s3m",
+ ".xm",
+ ".oxm",
+ ".wav",
+ //".raw", See byond_sound_formats
+ ".wma",
+ ".aiff"
+ )
+
/datum/controller/subsystem/sounds/Initialize()
setup_available_channels()
find_all_available_sounds()
@@ -46,6 +90,10 @@ SUBSYSTEM_DEF(sounds)
// Precache ambience sounds
for(var/key in GLOB.ambience_assoc)
sounds_to_precache |= GLOB.ambience_assoc[key]
+ // DARKPACK EDIT ADD START
+ for(var/key in GLOB.music_assoc)
+ sounds_to_precache |= GLOB.music_assoc[key]
+ // DARKPACK EDIT ADD END
precache_sounds()
@@ -63,26 +111,10 @@ SUBSYSTEM_DEF(sounds)
/datum/controller/subsystem/sounds/proc/find_all_available_sounds()
all_sounds = list()
- // Put more common extensions first to speed this up a bit
- var/static/list/valid_file_extensions = list(
- ".ogg",
- ".wav",
- ".mid",
- ".midi",
- ".mod",
- ".it",
- ".s3m",
- ".xm",
- ".oxm",
- ".raw",
- ".wma",
- ".aiff",
- )
-
- all_sounds = pathwalk("sound/", valid_file_extensions)
+ all_sounds = pathwalk("sound/", byond_sound_extensions)
// DARKPACK EDIT ADD START
- all_sounds += pathwalk("modular_darkpack/master_files/sounds/", valid_file_extensions)
- all_sounds += pathwalk("modular_darkpack/modules/", valid_file_extensions)
+ all_sounds += pathwalk("modular_darkpack/master_files/sounds/", byond_sound_extensions)
+ all_sounds += pathwalk("modular_darkpack/modules/", byond_sound_extensions)
// DARKPACK EDIT ADD END
/// Removes a channel from using list.
diff --git a/code/controllers/subsystem/sprite_accessories.dm b/code/controllers/subsystem/sprite_accessories.dm
index dfe7b6aadd14..2ceed1d3fbb9 100644
--- a/code/controllers/subsystem/sprite_accessories.dm
+++ b/code/controllers/subsystem/sprite_accessories.dm
@@ -5,6 +5,11 @@
/// The female specific list that we get from init_sprite_accessory_subtypes()
#define FEMALE_SPRITE_LIST "female_sprites"
+/// Use this to init a sprite accessory list for a feature where mobs are required to have one selected
+#define INIT_ACCESSORY(sprite_accessory) init_sprite_accessory_subtypes(sprite_accessory, add_blank = FALSE)[DEFAULT_SPRITE_LIST]
+/// Use this to init a sprite accessory list for a feature where mobs can opt to not have one selected
+#define INIT_OPTIONAL_ACCESSORY(sprite_accessory) init_sprite_accessory_subtypes(sprite_accessory, add_blank = TRUE)[DEFAULT_SPRITE_LIST]
+
/// subsystem that just holds lists of sprite accessories for accession in generating said sprites.
/// A sprite accessory is something that we add to a human sprite to make them look different. This is hair, facial hair, underwear, mutant bits, etc.
SUBSYSTEM_DEF(accessories) // just 'accessories' for brevity
@@ -36,28 +41,8 @@ SUBSYSTEM_DEF(accessories) // just 'accessories' for brevity
//Socks
var/list/socks_list //! stores /datum/sprite_accessory/socks indexed by name
- //Lizard Bits (all datum lists indexed by name)
- var/list/lizard_markings_list
- var/list/snouts_list
- var/list/horns_list
- var/list/frills_list
- var/list/spines_list
- var/list/tail_spines_list
-
- //Mutant Human bits
- var/list/tails_list_felinid
- var/list/tails_list_lizard
- var/list/tails_list_monkey
- var/list/tails_list_xeno
- var/list/tails_list_fish
- var/list/ears_list
- var/list/wings_list
- var/list/wings_open_list
- var/list/moth_wings_list
- var/list/moth_antennae_list
- var/list/moth_markings_list
- var/list/caps_list
- var/list/pod_hair_list
+ //All features, indexed by feature key, then name of the sprite accessory to the datum iteslf
+ var/list/list/feature_list
/datum/controller/subsystem/accessories/PreInit() // this stuff NEEDS to be set up before GLOB for preferences and stuff to work so this must go here. sorry
setup_lists()
@@ -91,26 +76,31 @@ SUBSYSTEM_DEF(accessories) // just 'accessories' for brevity
socks_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/socks)[DEFAULT_SPRITE_LIST]
- lizard_markings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/lizard_markings, add_blank = TRUE)[DEFAULT_SPRITE_LIST]
- tails_list_felinid = init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/felinid, add_blank = TRUE)[DEFAULT_SPRITE_LIST]
- tails_list_lizard = init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/lizard)[DEFAULT_SPRITE_LIST]
- tails_list_monkey = init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/monkey)[DEFAULT_SPRITE_LIST]
- tails_list_xeno = init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/xeno)[DEFAULT_SPRITE_LIST]
- //tails fo fish organ infusions, not for prefs.
- tails_list_fish = init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/fish)[DEFAULT_SPRITE_LIST]
- snouts_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/snouts)[DEFAULT_SPRITE_LIST]
- horns_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/horns, add_blank = TRUE)[DEFAULT_SPRITE_LIST]
- ears_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/ears, add_blank = TRUE)[DEFAULT_SPRITE_LIST]
- wings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/wings, add_blank = TRUE)[DEFAULT_SPRITE_LIST]
- wings_open_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/wings_open)[DEFAULT_SPRITE_LIST]
- frills_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/frills, add_blank = TRUE)[DEFAULT_SPRITE_LIST]
- spines_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/spines, add_blank = TRUE)[DEFAULT_SPRITE_LIST]
- tail_spines_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/tail_spines, add_blank = TRUE)[DEFAULT_SPRITE_LIST]
- caps_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/caps)[DEFAULT_SPRITE_LIST]
- moth_wings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_wings)[DEFAULT_SPRITE_LIST]
- moth_antennae_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_antennae)[DEFAULT_SPRITE_LIST]
- moth_markings_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/moth_markings, add_blank = TRUE)[DEFAULT_SPRITE_LIST]
- pod_hair_list = init_sprite_accessory_subtypes(/datum/sprite_accessory/pod_hair)[DEFAULT_SPRITE_LIST]
+ feature_list = list()
+ // felinids
+ feature_list[FEATURE_TAIL_CAT] = INIT_OPTIONAL_ACCESSORY(/datum/sprite_accessory/tails/felinid)
+ feature_list[FEATURE_EARS] = INIT_OPTIONAL_ACCESSORY(/datum/sprite_accessory/ears)
+ // lizards
+ feature_list[FEATURE_FRILLS] = INIT_OPTIONAL_ACCESSORY(/datum/sprite_accessory/frills)
+ feature_list[FEATURE_HORNS] = INIT_OPTIONAL_ACCESSORY(/datum/sprite_accessory/horns)
+ feature_list[FEATURE_LIZARD_MARKINGS] = INIT_OPTIONAL_ACCESSORY(/datum/sprite_accessory/lizard_markings)
+ feature_list[FEATURE_SNOUT] = INIT_ACCESSORY(/datum/sprite_accessory/snouts)
+ feature_list[FEATURE_SPINES] = INIT_OPTIONAL_ACCESSORY(/datum/sprite_accessory/spines)
+ feature_list[FEATURE_TAILSPINES] = INIT_OPTIONAL_ACCESSORY(/datum/sprite_accessory/tail_spines)
+ feature_list[FEATURE_TAIL_LIZARD] = INIT_ACCESSORY(/datum/sprite_accessory/tails/lizard)
+ // moths
+ feature_list[FEATURE_MOTH_WINGS] = INIT_ACCESSORY(/datum/sprite_accessory/moth_wings)
+ feature_list[FEATURE_MOTH_ANTENNAE] = INIT_ACCESSORY(/datum/sprite_accessory/moth_antennae)
+ feature_list[FEATURE_MOTH_MARKINGS] = INIT_OPTIONAL_ACCESSORY(/datum/sprite_accessory/moth_markings)
+ // generic wings
+ feature_list[FEATURE_WINGS] = INIT_OPTIONAL_ACCESSORY(/datum/sprite_accessory/wings)
+ feature_list[FEATURE_WINGS_OPEN] = INIT_OPTIONAL_ACCESSORY(/datum/sprite_accessory/wings_open)
+ // generic features
+ feature_list[FEATURE_MUSH_CAP] = INIT_ACCESSORY(/datum/sprite_accessory/caps)
+ feature_list[FEATURE_POD_HAIR] = INIT_ACCESSORY(/datum/sprite_accessory/pod_hair)
+ feature_list[FEATURE_TAIL_FISH] = INIT_ACCESSORY(/datum/sprite_accessory/tails/fish)
+ feature_list[FEATURE_TAIL_MONKEY] = INIT_ACCESSORY(/datum/sprite_accessory/tails/monkey)
+ feature_list[FEATURE_TAIL_XENO] = INIT_ACCESSORY(/datum/sprite_accessory/tails/xeno)
/// This proc just initializes all /datum/sprite_accessory/hair_gradient into an list indexed by gradient-style name
/datum/controller/subsystem/accessories/proc/init_hair_gradients()
@@ -161,6 +151,9 @@ SUBSYSTEM_DEF(accessories) // just 'accessories' for brevity
return returnable_list
+#undef INIT_ACCESSORY
+#undef INIT_OPTIONAL_ACCESSORY
+
#undef DEFAULT_SPRITE_LIST
#undef MALE_SPRITE_LIST
#undef FEMALE_SPRITE_LIST
diff --git a/code/controllers/subsystem/statpanel.dm b/code/controllers/subsystem/statpanel.dm
index 30d91ed11a65..d4cb7fe3ec80 100644
--- a/code/controllers/subsystem/statpanel.dm
+++ b/code/controllers/subsystem/statpanel.dm
@@ -41,6 +41,8 @@ SUBSYSTEM_DEF(statpanels)
"Round Time: [ROUND_TIME()]",
"Local City Time: [SSticker.round_start_timeofday ? "[station_time_timestamp("hh:mm MMM")] [CURRENT_STATION_YEAR]" : "The round hasn't started yet!"]",
"Time Dilation: [round(SStime_track.time_dilation_current,1)]% AVG:([round(SStime_track.time_dilation_avg_fast,1)]%, [round(SStime_track.time_dilation_avg,1)]%, [round(SStime_track.time_dilation_avg_slow,1)]%)",
+ "---", // DARKPACK EDIT ADD
+ "Masquerade: [SSmasquerade.get_description()]", // DARKPACK EDIT ADD
)
if(SSshuttle.emergency)
@@ -220,7 +222,6 @@ SUBSYSTEM_DEF(statpanels)
#endif
for(var/datum/controller/subsystem/sub_system as anything in Master.subsystems)
mc_data[++mc_data.len] = list("\[[sub_system.state_letter()]][sub_system.name]", sub_system.stat_entry(), text_ref(sub_system))
- mc_data[++mc_data.len] = list("Camera Net", "Cameras: [GLOB.cameranet.cameras.len] | Chunks: [GLOB.cameranet.chunks.len]", text_ref(GLOB.cameranet))
///immediately update the active statpanel tab of the target client
/datum/controller/subsystem/statpanels/proc/immediate_send_stat_data(client/target)
diff --git a/code/controllers/subsystem/stock_market.dm b/code/controllers/subsystem/stock_market.dm
index 1cce5a8c5496..8ecd6cc8085d 100644
--- a/code/controllers/subsystem/stock_market.dm
+++ b/code/controllers/subsystem/stock_market.dm
@@ -20,16 +20,9 @@ SUBSYSTEM_DEF(stock_market)
/datum/controller/subsystem/stock_market/Initialize()
for(var/datum/material/possible_market as anything in subtypesof(/datum/material)) // I need to make this work like this, but lets hardcode it for now
if(possible_market.tradable)
- materials_prices += possible_market
materials_prices[possible_market] = possible_market.value_per_unit * SHEET_MATERIAL_AMOUNT
-
- materials_trends += possible_market
materials_trends[possible_market] = rand(MARKET_TREND_DOWNWARD,MARKET_TREND_UPWARD) //aka -1 to 1
-
- materials_trend_life += possible_market
materials_trend_life[possible_market] = rand(1,3)
-
- materials_quantity += possible_market
materials_quantity[possible_market] = possible_market.tradable_base_quantity + (rand(-(possible_market.tradable_base_quantity) * 0.5, possible_market.tradable_base_quantity * 0.5))
return SS_INIT_SUCCESS
diff --git a/code/controllers/subsystem/tgui.dm b/code/controllers/subsystem/tgui.dm
index 39d281964f1d..d87aa0f1dd1d 100644
--- a/code/controllers/subsystem/tgui.dm
+++ b/code/controllers/subsystem/tgui.dm
@@ -39,6 +39,25 @@ SUBSYSTEM_DEF(tgui)
basehtml = replacetextEx(basehtml, "", "Nanotrasen (c) 2525-[CURRENT_STATION_YEAR]")
+/datum/controller/subsystem/tgui/OnConfigLoad()
+ var/storage_iframe = CONFIG_GET(string/storage_cdn_iframe)
+
+ if(storage_iframe && storage_iframe != /datum/config_entry/string/storage_cdn_iframe::default)
+ basehtml = replacetext(basehtml, "\[tgui:storagecdn\]", storage_iframe)
+ return
+
+ if(CONFIG_GET(string/asset_transport) == "webroot")
+ var/datum/asset_transport/webroot/webroot = SSassets.transport
+
+ var/datum/asset_cache_item/item = webroot.register_asset("iframe.html", file("tgui/public/iframe.html"))
+ basehtml = replacetext(basehtml, "\[tgui:storagecdn\]", webroot.get_asset_url("iframe.html", item))
+ return
+
+ if(!storage_iframe)
+ return
+
+ basehtml = replacetext(basehtml, "\[tgui:storagecdn\]", storage_iframe)
+
/datum/controller/subsystem/tgui/Shutdown()
close_all_uis()
@@ -283,6 +302,27 @@ SUBSYSTEM_DEF(tgui)
count++
return count
+
+/**
+ * public
+ *
+ * Resets position of all UIs to 0, 0.
+ *
+ * required user mob The mob who opened/is using the UI.
+ * optional src_object datum If provided, only close UIs belonging this src_object.
+ *
+ * return int The number of UIs reset.
+ */
+/datum/controller/subsystem/tgui/proc/reset_ui_position(mob/user, datum/src_object)
+ var/count = 0
+ if(length(user?.tgui_open_uis) == 0)
+ return count
+ for(var/datum/tgui/ui in user.tgui_open_uis)
+ if(isnull(src_object) || ui.src_object == src_object)
+ ui.reset_ui_position()
+ count++
+ return count
+
/**
* private
*
diff --git a/code/controllers/subsystem/throwing.dm b/code/controllers/subsystem/throwing.dm
index 83f6e4e4ff8c..95c6923269f6 100644
--- a/code/controllers/subsystem/throwing.dm
+++ b/code/controllers/subsystem/throwing.dm
@@ -127,7 +127,7 @@ SUBSYSTEM_DEF(throwing)
qdel(src)
-/// Returns the mob thrower, or null
+/// Returns the thrower, or null
/datum/thrownthing/proc/get_thrower()
. = thrower?.resolve()
if(isnull(.))
@@ -144,11 +144,11 @@ SUBSYSTEM_DEF(throwing)
return
var/atom/movable/actual_target = initial_target?.resolve()
- var/mob/mob_thrower = get_thrower()
+ var/atom/thrower = get_thrower()
if(dist_travelled) //to catch sneaky things moving on our tile while we slept
for(var/atom/movable/obstacle as anything in get_turf(thrownthing))
- if (obstacle == thrownthing || (obstacle == mob_thrower && !ismob(thrownthing)))
+ if(obstacle == thrownthing || (obstacle == thrower && !ismob(thrownthing)))
continue
if(ismob(obstacle) && thrownthing.pass_flags & PASSMOB && (obstacle != actual_target))
continue
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index 1ec2838efc65..69ee885438f8 100644
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -14,7 +14,11 @@ SUBSYSTEM_DEF(ticker)
/// or a "round-ending" event, like summoning Nar'Sie, a blob victory, the nuke going off, etc. ([FORCE_END_ROUND])
var/force_ending = END_ROUND_AS_NORMAL
/// If TRUE, there is no lobby phase, the game starts immediately.
+ #ifdef ABSOLUTE_MINIMUM
+ var/start_immediately = TRUE
+ #else
var/start_immediately = FALSE
+ #endif
/// Boolean to track and check if our subsystem setup is done.
var/setup_done = FALSE
@@ -54,7 +58,7 @@ SUBSYSTEM_DEF(ticker)
var/roundend_check_paused = FALSE
var/round_start_time = 0
- var/round_start_timeofday = 0 // DARKPACK ADDITION
+ var/round_start_timeofday = 0 // DARKPACK EDIT ADD
var/list/round_start_events
var/list/round_end_events
var/mode_result = "undefined"
@@ -70,21 +74,6 @@ SUBSYSTEM_DEF(ticker)
var/reboot_timer = null
/datum/controller/subsystem/ticker/Initialize()
- var/list/byond_sound_formats = list(
- "mid" = TRUE,
- "midi" = TRUE,
- "mod" = TRUE,
- "it" = TRUE,
- "s3m" = TRUE,
- "xm" = TRUE,
- "oxm" = TRUE,
- "wav" = TRUE,
- "ogg" = TRUE,
- "raw" = TRUE,
- "wma" = TRUE,
- "aiff" = TRUE,
- )
-
var/list/provisional_title_music = flist("[global.config.directory]/title_music/sounds/")
var/list/music = list()
var/use_rare_music = prob(1)
@@ -112,11 +101,8 @@ SUBSYSTEM_DEF(ticker)
music -= old_login_music
for(var/S in music)
- var/list/L = splittext(S,".")
- if(L.len >= 2)
- var/ext = LOWER_TEXT(L[L.len]) //pick the real extension, no 'honk.ogg.exe' nonsense here
- if(byond_sound_formats[ext])
- continue
+ if(IS_SOUND_FILE(S))
+ continue
music -= S
if(!length(music))
@@ -229,16 +215,26 @@ SUBSYSTEM_DEF(ticker)
return TRUE
if(GLOB.revolution_handler?.result == REVOLUTION_VICTORY)
return TRUE
- // DARKPACK ADDITION START - CITY_TIME
+ // DARKPACK EDIT ADD START - CITY_TIME
if(SScity_time.roundend_started)
return TRUE
- // DARKPACK ADDITION END
+ // DARKPACK EDIT ADD END
return FALSE
+/// Gets a list of players with their readied state so we can post it as a log
+/datum/controller/subsystem/ticker/proc/get_player_ready_states()
+ var/list/player_states = list()
+ for(var/mob/dead/new_player/player as anything in GLOB.new_player_list)
+ player_states[player.ckey] = player.ready
+ return player_states
+
/datum/controller/subsystem/ticker/proc/setup()
to_chat(world, span_boldannounce("Starting game..."))
var/init_start = world.timeofday
+ var/list/players_and_readiness = get_player_ready_states()
+ log_game("Players and Readiness: [json_encode(players_and_readiness)]", players_and_readiness)
+
CHECK_TICK
//Configure mode and assign player to antagonists
var/can_continue = FALSE
@@ -248,7 +244,7 @@ SUBSYSTEM_DEF(ticker)
can_continue = can_continue && SSjob.divide_occupations() //Distribute jobs
CHECK_TICK
- if(!GLOB.Debug2)
+ if(!GLOB.debugging_enabled)
if(!can_continue)
log_game("Game failed pre_setup")
to_chat(world, "Error setting up game. Reverting to pre-game lobby.")
@@ -285,13 +281,13 @@ SUBSYSTEM_DEF(ticker)
LAZYCLEARLIST(round_start_events)
round_start_time = world.time //otherwise round_start_time would be 0 for the signals
- round_start_timeofday = world.timeofday // DARKPACK ADDITION
+ round_start_timeofday = world.timeofday // DARKPACK EDIT ADD
SEND_SIGNAL(src, COMSIG_TICKER_ROUND_STARTING, world.time)
log_world("Game start took [(world.timeofday - init_start)/10]s")
INVOKE_ASYNC(SSdbcore, TYPE_PROC_REF(/datum/controller/subsystem/dbcore,SetRoundStart))
- to_chat(world, span_notice(span_bold("Welcome to [station_name()], enjoy your stay!")))
+ to_chat(world, span_notice(span_bold("Another night in [station_name()], another dollar."))) // DARKPACK EDIT CHANGE
SEND_SOUND(world, sound(SSstation.announcer.get_rand_welcome_sound()))
current_state = GAME_STATE_PLAYING
@@ -552,10 +548,15 @@ SUBSYSTEM_DEF(ticker)
var/acting_captain = !is_captain_job(player_assigned_role)
SSjob.promote_to_captain(new_player_living, acting_captain)
OnRoundstart(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(minor_announce), player_assigned_role.get_captaincy_announcement(new_player_living)))
- if((player_assigned_role.job_flags & JOB_ASSIGN_QUIRKS) && ishuman(new_player_living) && CONFIG_GET(flag/roundstart_traits))
- if(new_player_mob.client?.prefs?.should_be_random_hardcore(player_assigned_role, new_player_living.mind))
- new_player_mob.client.prefs.hardcore_random_setup(new_player_living)
- SSquirks.AssignQuirks(new_player_living, new_player_mob.client)
+ if(ishuman(new_player_living))
+ if(player_assigned_role.job_flags & JOB_ASSIGN_QUIRKS)
+ if(CONFIG_GET(flag/roundstart_traits))
+ if(new_player_mob.client?.prefs?.should_be_random_hardcore(player_assigned_role, new_player_living.mind))
+ new_player_mob.client.prefs.hardcore_random_setup(new_player_living)
+ SSquirks.AssignQuirks(new_player_living, new_player_mob.client)
+ else // clear any personalities the prefs added since our job clearly does not want them
+ new_player_living.clear_personalities()
+
if(ishuman(new_player_living))
SEND_SIGNAL(new_player_living, COMSIG_HUMAN_CHARACTER_SETUP_FINISHED)
CHECK_TICK
@@ -695,7 +696,7 @@ SUBSYSTEM_DEF(ticker)
/datum/controller/subsystem/ticker/proc/send_news_report()
var/news_message
- var/news_source = "Nanotrasen News Network"
+ var/news_source = "[CITY_NAME] News Network"
var/decoded_station_name = html_decode(station_name()) //decode station_name to avoid minor_announce double encode
var/decoded_emergency_reason = html_decode(emergency_reason)
diff --git a/code/controllers/subsystem/timer.dm b/code/controllers/subsystem/timer.dm
index 20fe4eb47b60..ef6826396c2d 100644
--- a/code/controllers/subsystem/timer.dm
+++ b/code/controllers/subsystem/timer.dm
@@ -519,30 +519,30 @@ SUBSYSTEM_DEF(timer)
#if defined(TIMER_DEBUG)
// Generate debug-friendly list for timer, more complex but also more expensive
timer_info = list(
- 1 = id,
- 2 = timeToRun,
- 3 = wait,
- 4 = flags,
- 5 = callBack, /* Safe to hold this directly because it's never del'd */
- 6 = "[callBack.object]",
- 7 = text_ref(callBack.object),
- 8 = getcallingtype(),
- 9 = callBack.delegate,
- 10 = callBack.arguments ? callBack.arguments.Copy() : null,
- 11 = "[source]"
+ /* 1 = */ id,
+ /* 2 = */ timeToRun,
+ /* 3 = */ wait,
+ /* 4 = */ flags,
+ /* 5 = */ callBack, /* Safe to hold this directly because it's never del'd */
+ /* 6 = */ "[callBack.object]",
+ /* 7 = */ text_ref(callBack.object),
+ /* 8 = */ getcallingtype(),
+ /* 9 = */ callBack.delegate,
+ /* 10 = */ callBack.arguments ? callBack.arguments.Copy() : null,
+ /* 11 = */ "[source]"
)
#else
// Generate a debuggable list for the timer, simpler but wayyyy cheaper, string generation (and ref/copy memes) is a bitch and this saves a LOT of time
timer_info = list(
- 1 = id,
- 2 = timeToRun,
- 3 = wait,
- 4 = flags,
- 5 = callBack, /* Safe to hold this directly because it's never del'd */
- 6 = "[callBack.object]",
- 7 = getcallingtype(),
- 8 = callBack.delegate,
- 9 = "[source]"
+ /* 1 = */ id,
+ /* 2 = */ timeToRun,
+ /* 3 = */ wait,
+ /* 4 = */ flags,
+ /* 5 = */ callBack, /* Safe to hold this directly because it's never del'd */
+ /* 6 = */ "[callBack.object]",
+ /* 7 = */ getcallingtype(),
+ /* 8 = */ callBack.delegate,
+ /* 9 = */ "[source]"
)
#endif
diff --git a/code/controllers/subsystem/tts.dm b/code/controllers/subsystem/tts.dm
index 1106318e021c..4c9314c8ec93 100644
--- a/code/controllers/subsystem/tts.dm
+++ b/code/controllers/subsystem/tts.dm
@@ -105,7 +105,10 @@ SUBSYSTEM_DEF(tts)
return
var/channel = SSsounds.random_available_channel()
- for(var/mob/listening_mob in listeners | SSmobs.dead_players_by_zlevel[turf_source.z])//observers always hear through walls
+ for(var/atom/movable/hearer in listeners | SSmobs.dead_players_by_zlevel[turf_source.z])//observers always hear through walls
+ var/mob/listening_mob = hearer.get_listening_mob()
+ if(isnull(listening_mob))
+ continue
if(QDELING(listening_mob))
stack_trace("TTS tried to play a sound to a deleted mob.")
continue
@@ -115,13 +118,13 @@ SUBSYSTEM_DEF(tts)
if(volume_modifier == 0 || (tts_pref == TTS_SOUND_OFF))
continue
- var/sound_volume = ((listening_mob == target)? 60 : 85) + volume_offset
+ var/sound_volume = ((hearer == target)? 60 : 85) + volume_offset
sound_volume = sound_volume*volume_modifier
var/datum/language_holder/holder = listening_mob.get_language_holder()
var/audio_to_use = (tts_pref == TTS_SOUND_BLIPS) ? audio_blips : audio
if(!holder.has_language(language))
continue
- if(get_dist(listening_mob, turf_source) <= range)
+ if(get_dist(hearer, turf_source) <= range)
listening_mob.playsound_local(
turf_source,
vol = sound_volume,
@@ -294,8 +297,8 @@ SUBSYSTEM_DEF(tts)
var/datum/http_request/request_blips = new()
var/file_name = "tmp/tts/[identifier].ogg"
var/file_name_blips = "tmp/tts/[identifier]_blips.ogg"
- request.prepare(RUSTG_HTTP_METHOD_GET, "[CONFIG_GET(string/tts_http_url)]/tts?voice=[speaker]&identifier=[identifier]&filter=[url_encode(filter)]&pitch=[pitch]&special_filters=[url_encode(special_filters)]", json_encode(list("text" = shell_scrubbed_input)), headers, file_name, timeout_seconds = CONFIG_GET(number/tts_http_timeout_seconds))
- request_blips.prepare(RUSTG_HTTP_METHOD_GET, "[CONFIG_GET(string/tts_http_url)]/tts-blips?voice=[speaker]&identifier=[identifier]&filter=[url_encode(filter)]&pitch=[pitch]&special_filters=[url_encode(special_filters)]", json_encode(list("text" = shell_scrubbed_input)), headers, file_name_blips, timeout_seconds = CONFIG_GET(number/tts_http_timeout_seconds))
+ request.prepare(RUSTG_HTTP_METHOD_GET, "[CONFIG_GET(string/tts_http_url)]/tts?voice=[speaker]&identifier=[identifier]&filter=[tts_filter_encode(filter, speaker)]&pitch=[pitch]&special_filters=[url_encode(special_filters)]", json_encode(list("text" = shell_scrubbed_input)), headers, file_name, timeout_seconds = CONFIG_GET(number/tts_http_timeout_seconds))
+ request_blips.prepare(RUSTG_HTTP_METHOD_GET, "[CONFIG_GET(string/tts_http_url)]/tts-blips?voice=[speaker]&identifier=[identifier]&filter=[tts_filter_encode(filter, speaker, blips = TRUE)]&pitch=[pitch]&special_filters=[url_encode(special_filters)]", json_encode(list("text" = shell_scrubbed_input)), headers, file_name_blips, timeout_seconds = CONFIG_GET(number/tts_http_timeout_seconds))
var/datum/tts_request/current_request = new /datum/tts_request(identifier, request, request_blips, shell_scrubbed_input, target, local, language, message_range, volume_offset, listeners, pitch)
var/list/player_queued_tts_messages = queued_tts_messages[target]
if(!player_queued_tts_messages)
diff --git a/code/controllers/subsystem/wardrobe.dm b/code/controllers/subsystem/wardrobe.dm
index 2593595bdf63..4f25ff47d1c8 100644
--- a/code/controllers/subsystem/wardrobe.dm
+++ b/code/controllers/subsystem/wardrobe.dm
@@ -41,6 +41,10 @@ SUBSYSTEM_DEF(wardrobe)
var/stock_hit = 0
/// How many items would we make just by loading the master list once?
var/one_go_master = 0
+ /// Item types that should not ever be recycled, only generated (like modsuits)
+ var/static/list/recycle_blacklist = typecacheof(list(
+ /obj/item/mod/control/pre_equipped,
+ ))
/datum/controller/subsystem/wardrobe/Initialize()
setup_callbacks()
@@ -207,9 +211,17 @@ SUBSYSTEM_DEF(wardrobe)
order_list[queued_type] = amount
+/// Take an existing object, and recycle it if we are allowed to by stashing it back into our storage
+/datum/controller/subsystem/wardrobe/proc/recycle_object(obj/item/object)
+ // Don't restock blacklisted items, instead just delete them
+ if(is_type_in_typecache(object, recycle_blacklist))
+ qdel(object)
+ return
+ stash_object(object)
+
/// Take an existing object, and insert it into our storage
/// If we can't or won't take it, it's deleted. You do not own this object after passing it in
-/datum/controller/subsystem/wardrobe/proc/stash_object(atom/movable/object)
+/datum/controller/subsystem/wardrobe/proc/stash_object(obj/item/object)
var/object_type = object.type
var/list/master_info = canon_minimum[object_type]
// I will not permit objects you didn't reserve ahead of time
diff --git a/code/controllers/subsystem/weather.dm b/code/controllers/subsystem/weather.dm
index 0882720cdfbd..c330455fb15f 100644
--- a/code/controllers/subsystem/weather.dm
+++ b/code/controllers/subsystem/weather.dm
@@ -109,7 +109,8 @@ SUBSYSTEM_DEF(weather)
var/datum/weather/W = new weather_datum_type(z_levels, weather_data)
- W.telegraph()
+ W.telegraph(weather_data)
+ return W
/datum/controller/subsystem/weather/proc/make_eligible(z, possible_weather)
eligible_zlevels[z] = possible_weather
diff --git a/code/datums/achievements/misc_achievements.dm b/code/datums/achievements/misc_achievements.dm
index 4e37400d51d6..224941e6ce3d 100644
--- a/code/datums/achievements/misc_achievements.dm
+++ b/code/datums/achievements/misc_achievements.dm
@@ -8,6 +8,12 @@
database_id = MEDAL_METEOR
icon_state = "meteors"
+/datum/award/achievement/misc/meteor_punch
+ name = "Your Life In Your Hands"
+ desc = "Give some space debris a piece of your mind"
+ database_id = MEDAL_METEOR_PUNCH
+ icon_state = "punchmeteors"
+
/datum/award/achievement/misc/pulse
name = "Jackpot"
desc = "Win a pulse rifle from an arcade machine"
diff --git a/code/datums/actions/action.dm b/code/datums/actions/action.dm
index 127193834b67..e17e33ded63e 100644
--- a/code/datums/actions/action.dm
+++ b/code/datums/actions/action.dm
@@ -178,6 +178,10 @@
return FALSE
if(action_disabled)
return FALSE
+ if((check_flags & AB_CHECK_CONSCIOUS) && owner.stat != CONSCIOUS)
+ if (feedback)
+ owner.balloon_alert(owner, "[owner.stat == DEAD ? "dead" : "unconscious"]!")
+ return FALSE
if((check_flags & AB_CHECK_HANDS_BLOCKED) && HAS_TRAIT(owner, TRAIT_HANDS_BLOCKED))
if (feedback)
owner.balloon_alert(owner, "hands blocked!")
@@ -196,10 +200,6 @@
if (feedback)
owner.balloon_alert(owner, "must stand up!")
return FALSE
- if((check_flags & AB_CHECK_CONSCIOUS) && owner.stat != CONSCIOUS)
- if (feedback)
- owner.balloon_alert(owner, "unconscious!")
- return FALSE
if((check_flags & AB_CHECK_PHASED) && HAS_TRAIT(owner, TRAIT_MAGICALLY_PHASED))
if (feedback)
owner.balloon_alert(owner, "incorporeal!")
diff --git a/code/datums/actions/items/change_name.dm b/code/datums/actions/items/change_name.dm
new file mode 100644
index 000000000000..4eb9286ecc42
--- /dev/null
+++ b/code/datums/actions/items/change_name.dm
@@ -0,0 +1,11 @@
+/datum/action/innate/change_name
+ name = "Change Name"
+ button_icon_state = "ghost"
+
+/datum/action/innate/change_name/Activate()
+ var/new_name = reject_bad_name(tgui_input_text(usr, "Enter a new name.", "Renaming", initial(owner.name)), allow_numbers = TRUE, max_length = MAX_NAME_LEN, cap_after_symbols = FALSE)
+ if(!new_name)
+ return FALSE
+
+ owner.fully_replace_character_name(owner.name, new_name)
+ return TRUE
diff --git a/code/datums/actions/mobs/fire_breath.dm b/code/datums/actions/mobs/fire_breath.dm
index b38687a72aba..cbc25a78e8ae 100644
--- a/code/datums/actions/mobs/fire_breath.dm
+++ b/code/datums/actions/mobs/fire_breath.dm
@@ -77,7 +77,7 @@
to_chat(barbecued, span_userdanger("You're frozen solid by [source]'s icy breath!"))
else
to_chat(barbecued, span_userdanger("You are burned by [source]'s fire breath!"))
- barbecued.adjustFireLoss(fire_damage)
+ barbecued.adjust_fire_loss(fire_damage)
/// Shoot three lines of fire in a sort of fork pattern approximating a cone
/datum/action/cooldown/mob_cooldown/fire_breath/cone
diff --git a/code/datums/actions/mobs/lava_swoop.dm b/code/datums/actions/mobs/lava_swoop.dm
index 428c97566567..16e2e66f7ef8 100644
--- a/code/datums/actions/mobs/lava_swoop.dm
+++ b/code/datums/actions/mobs/lava_swoop.dm
@@ -97,7 +97,7 @@
owner.mouse_opacity = initial(owner.mouse_opacity)
playsound(owner.loc, 'sound/effects/meteorimpact.ogg', 200, TRUE)
for(var/mob/living/victim in orange(1, owner) - owner)
- victim.adjustBruteLoss(75)
+ victim.adjust_brute_loss(75)
if(!QDELETED(victim)) // Some mobs are deleted on death
var/throw_dir = get_dir(owner, victim)
if(victim.loc == owner.loc)
diff --git a/code/datums/ai/_ai_controller.dm b/code/datums/ai/_ai_controller.dm
index 7fb76efcc62e..6c2e3d942d39 100644
--- a/code/datums/ai/_ai_controller.dm
+++ b/code/datums/ai/_ai_controller.dm
@@ -387,7 +387,7 @@ multiple modular subtrees with behaviors
///Stops pawns from performing such actions that should require the target to be adjacent.
var/atom/movable/moving_pawn = pawn
- var/can_reach = !(current_behavior.behavior_flags & AI_BEHAVIOR_REQUIRE_REACH) || moving_pawn.CanReach(current_movement_target)
+ var/can_reach = !(current_behavior.behavior_flags & AI_BEHAVIOR_REQUIRE_REACH) || current_movement_target.IsReachableBy(moving_pawn)
if(can_reach && current_behavior.required_distance >= get_dist(moving_pawn, current_movement_target)) ///Are we close enough to engage?
if(ai_movement.moving_controllers[src] == current_movement_target) //We are close enough, if we're moving stop.
ai_movement.stop_moving_towards(src)
diff --git a/code/datums/ai/babies/babies_subtrees.dm b/code/datums/ai/babies/babies_subtrees.dm
index 60ca7dc8193a..7cadd1e8c551 100644
--- a/code/datums/ai/babies/babies_subtrees.dm
+++ b/code/datums/ai/babies/babies_subtrees.dm
@@ -3,10 +3,12 @@
*/
/datum/ai_planning_subtree/make_babies
operational_datums = list(/datum/component/breed)
- ///chance to make babies
+ /// Chance to make babies
var/chance = 5
- ///make babies behavior we will use
+ /// Make babies behavior we will use
var/datum/ai_behavior/reproduce_behavior = /datum/ai_behavior/make_babies
+ /// Find partner behavior we will use
+ var/datum/ai_behavior/partner_behavior = /datum/ai_behavior/find_partner
/datum/ai_planning_subtree/make_babies/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
. = ..()
@@ -25,4 +27,4 @@
return
// Find target
- controller.queue_behavior(/datum/ai_behavior/find_partner, BB_BABIES_TARGET, BB_BABIES_PARTNER_TYPES, BB_BABIES_CHILD_TYPES)
+ controller.queue_behavior(partner_behavior, BB_BABIES_TARGET, BB_BABIES_PARTNER_TYPES, BB_BABIES_CHILD_TYPES)
diff --git a/code/datums/ai/basic_mobs/basic_ai_behaviors/basic_attacking.dm b/code/datums/ai/basic_mobs/basic_ai_behaviors/basic_attacking.dm
index b75fc1ef38e3..2e145c31ec4b 100644
--- a/code/datums/ai/basic_mobs/basic_ai_behaviors/basic_attacking.dm
+++ b/code/datums/ai/basic_mobs/basic_ai_behaviors/basic_attacking.dm
@@ -22,7 +22,7 @@
var/atom/target = controller.blackboard[target_key]
if (isnull(target))
return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_FAILED
- if (!controller.pawn.CanReach(target))
+ if (!target.IsReachableBy(controller.pawn))
controller.clear_blackboard_key(BB_BASIC_MOB_MELEE_COOLDOWN_TIMER)
return AI_BEHAVIOR_INSTANT
diff --git a/code/datums/ai/basic_mobs/basic_ai_behaviors/climb_tree.dm b/code/datums/ai/basic_mobs/basic_ai_behaviors/climb_tree.dm
index 5046baa7e0f1..c30943caf50c 100644
--- a/code/datums/ai/basic_mobs/basic_ai_behaviors/climb_tree.dm
+++ b/code/datums/ai/basic_mobs/basic_ai_behaviors/climb_tree.dm
@@ -1,6 +1,6 @@
/datum/ai_behavior/find_and_set/valid_tree
-/datum/ai_behavior/find_and_set/valid_tree/search_tactic(datum/ai_controller/controller, locate_path, search_range)
+/datum/ai_behavior/find_and_set/valid_tree/search_tactic(datum/ai_controller/controller, locate_path, search_range = SEARCH_TACTIC_DEFAULT_RANGE)
var/list/valid_trees = list()
for (var/obj/structure/flora/tree/tree_target in oview(search_range, controller.pawn))
if(istype(tree_target, /obj/structure/flora/tree/dead)) //no died trees
diff --git a/code/datums/ai/basic_mobs/basic_ai_behaviors/find_parent.dm b/code/datums/ai/basic_mobs/basic_ai_behaviors/find_parent.dm
index 07b4845f0275..31735f99231b 100644
--- a/code/datums/ai/basic_mobs/basic_ai_behaviors/find_parent.dm
+++ b/code/datums/ai/basic_mobs/basic_ai_behaviors/find_parent.dm
@@ -4,21 +4,32 @@
/datum/ai_behavior/find_mom/perform(seconds_per_tick, datum/ai_controller/controller, mom_key, ignore_mom_key, found_mom)
var/mob/living_pawn = controller.pawn
- var/list/mom_types = controller.blackboard[mom_key]
var/list/all_moms = list()
+ var/list/mom_types = controller.blackboard[mom_key]
var/list/ignore_types = controller.blackboard[ignore_mom_key]
if(!length(mom_types))
return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_FAILED
for(var/mob/mother in oview(look_range, living_pawn))
- if(!is_type_in_list(mother, mom_types))
- continue
- if(is_type_in_list(mother, ignore_types)) //so the not permanent baby and the permanent baby subtype dont followed each other
- continue
- all_moms += mother
+ if (is_possible_mom(mother, mom_types, ignore_types))
+ all_moms += mother
if(length(all_moms))
controller.set_blackboard_key(found_mom, pick(all_moms))
return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_SUCCEEDED
return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_FAILED
+
+/datum/ai_behavior/find_mom/proc/is_possible_mom(mob/mother, list/mom_types, list/ignore_types)
+ if(!is_type_in_list(mother, mom_types))
+ return FALSE
+ if(is_type_in_list(mother, ignore_types)) // so the not permanent baby and the permanent baby subtype dont followed each other
+ return FALSE
+ return TRUE
+
+/datum/ai_behavior/find_mom/raptor/is_possible_mom(mob/mother, list/mom_types, list/ignore_types)
+ . = ..()
+ if (!. || !istype(mother, /mob/living/basic/raptor))
+ return FALSE
+ var/mob/living/basic/raptor/raptor = mother
+ return raptor.growth_stage == RAPTOR_ADULT
diff --git a/code/datums/ai/basic_mobs/basic_subtrees/attack_adjacent_target.dm b/code/datums/ai/basic_mobs/basic_subtrees/attack_adjacent_target.dm
index 8effc7a0fa73..98cf1654f713 100644
--- a/code/datums/ai/basic_mobs/basic_subtrees/attack_adjacent_target.dm
+++ b/code/datums/ai/basic_mobs/basic_subtrees/attack_adjacent_target.dm
@@ -26,7 +26,10 @@
/datum/ai_behavior/basic_melee_attack/opportunistic/perform(seconds_per_tick, datum/ai_controller/controller, target_key, targeting_strategy_key, hiding_location_key)
var/atom/movable/atom_pawn = controller.pawn
- if(!atom_pawn.CanReach(controller.blackboard[target_key]))
+ var/atom/atom_target = controller.blackboard[target_key]
+ if (QDELETED(atom_target))
+ return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_FAILED
+ if(!atom_target.IsReachableBy(atom_pawn))
return AI_BEHAVIOR_INSTANT | AI_BEHAVIOR_SUCCEEDED
. = ..()
return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_SUCCEEDED
diff --git a/code/datums/ai/basic_mobs/basic_subtrees/drag_items.dm b/code/datums/ai/basic_mobs/basic_subtrees/drag_items.dm
index f0017a67c00e..3bdb1ab8f588 100644
--- a/code/datums/ai/basic_mobs/basic_subtrees/drag_items.dm
+++ b/code/datums/ai/basic_mobs/basic_subtrees/drag_items.dm
@@ -6,19 +6,19 @@
if(prob(controller.blackboard[BB_GUILTY_CONSCIOUS_CHANCE]))
controller.queue_behavior(/datum/ai_behavior/stop_dragging)
return
- if(!controller.blackboard[BB_STEAL_CHANCE])
+ if(!prob(controller.blackboard[BB_STEAL_CHANCE]))
return
if(!controller.blackboard_key_exists(BB_ITEM_TO_STEAL))
- controller.queue_behavior(/datum/ai_behavior/find_and_set/find_stealable, /obj/item, BB_ITEM_TO_STEAL)
+ controller.queue_behavior(/datum/ai_behavior/find_and_set/find_stealable, BB_ITEM_TO_STEAL, /obj/item)
return
- controller.queue_behavior(/datum/ai_behavior/drag_target)
+ controller.queue_behavior(/datum/ai_behavior/drag_target, BB_ITEM_TO_STEAL)
return SUBTREE_RETURN_FINISH_PLANNING
/datum/ai_behavior/find_and_set/find_stealable
behavior_flags = AI_BEHAVIOR_CAN_PLAN_DURING_EXECUTION
action_cooldown = 2 MINUTES
-/datum/ai_behavior/find_and_set/find_stealable/search_tactic(datum/ai_controller/controller, locate_path, search_range)
+/datum/ai_behavior/find_and_set/find_stealable/search_tactic(datum/ai_controller/controller, locate_path, search_range = SEARCH_TACTIC_DEFAULT_RANGE)
var/mob/living/living_pawn = controller.pawn
var/list/possible_items = shuffle_inplace(oview(search_range, controller.pawn))
@@ -32,7 +32,7 @@
/datum/ai_behavior/stop_dragging
behavior_flags = AI_BEHAVIOR_CAN_PLAN_DURING_EXECUTION
-/datum/ai_behavior/stop_dragging/perform(seconds_per_tick, datum/ai_controller/controller, target_key)
+/datum/ai_behavior/stop_dragging/perform(seconds_per_tick, datum/ai_controller/controller)
var/mob/living/living_pawn = controller.pawn
living_pawn.stop_pulling()
return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_SUCCEEDED
diff --git a/code/datums/ai/basic_mobs/basic_subtrees/escape_captivity.dm b/code/datums/ai/basic_mobs/basic_subtrees/escape_captivity.dm
index 9dfbfce94de8..759a5c69eb85 100644
--- a/code/datums/ai/basic_mobs/basic_subtrees/escape_captivity.dm
+++ b/code/datums/ai/basic_mobs/basic_subtrees/escape_captivity.dm
@@ -8,11 +8,13 @@
/datum/ai_planning_subtree/escape_captivity/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
var/mob/living/living_pawn = controller.pawn
- if (living_pawn.buckled && !ismob(living_pawn.buckled))
- if (!pacifist && !living_pawn.can_hold_items() || living_pawn.usable_hands < 1) // If we don't have hands then prioritise slapping the shit out of whatever we are attached to
- controller.queue_behavior(/datum/ai_behavior/break_out_of_object, living_pawn.buckled)
- else
+ if (isobj(living_pawn.buckled))
+ // we can just stand up we don't need to freak out
+ if (pacifist || !HAS_TRAIT(living_pawn.buckled, TRAIT_DANGEROUS_BUCKLE))
controller.queue_behavior(/datum/ai_behavior/resist)
+ // otherwise beat the shit out of we we gotta get out NOW
+ else
+ controller.queue_behavior(/datum/ai_behavior/break_out_of_object, living_pawn.buckled)
return SUBTREE_RETURN_FINISH_PLANNING
if (!isturf(living_pawn.loc) && !ismob(living_pawn.loc) && !istype(living_pawn.loc, /obj/item/mob_holder))
@@ -26,7 +28,7 @@
controller.queue_behavior(/datum/ai_behavior/break_out_of_object, contained_in)
else
controller.queue_behavior(/datum/ai_behavior/resist)
- return SUBTREE_RETURN_FINISH_PLANNING
+ return SUBTREE_RETURN_FINISH_PLANNING
var/mob/puller = living_pawn.pulledby
if (puller && puller.grab_state > GRAB_PASSIVE)
@@ -60,7 +62,7 @@
if (QDELETED(target))
return FALSE
var/mob/living/pawn = controller.pawn
- if (!pawn.CanReach(target))
+ if (!target.IsReachableBy(pawn))
return FALSE
return pawn.loc == target || pawn.buckled == target
diff --git a/code/datums/ai/basic_mobs/basic_subtrees/find_parent.dm b/code/datums/ai/basic_mobs/basic_subtrees/find_parent.dm
index ef44df82f78d..7b35053ff386 100644
--- a/code/datums/ai/basic_mobs/basic_subtrees/find_parent.dm
+++ b/code/datums/ai/basic_mobs/basic_subtrees/find_parent.dm
@@ -7,7 +7,7 @@
var/mob/baby = controller.pawn
if(QDELETED(target))
- controller.queue_behavior(/datum/ai_behavior/find_mom, BB_FIND_MOM_TYPES, BB_IGNORE_MOM_TYPES, BB_FOUND_MOM)
+ find_mom(controller)
return
if(get_dist(target, baby) > minimum_distance)
@@ -23,3 +23,9 @@
controller.queue_behavior(/datum/ai_behavior/perform_emote, "dances around their parent!")
return SUBTREE_RETURN_FINISH_PLANNING
+
+/datum/ai_planning_subtree/look_for_adult/proc/find_mom(datum/ai_controller/controller)
+ controller.queue_behavior(/datum/ai_behavior/find_mom, BB_FIND_MOM_TYPES, BB_IGNORE_MOM_TYPES, BB_FOUND_MOM)
+
+/datum/ai_planning_subtree/look_for_adult/raptor/find_mom(datum/ai_controller/controller)
+ controller.queue_behavior(/datum/ai_behavior/find_mom/raptor, BB_FIND_MOM_TYPES, BB_FOUND_MOM)
diff --git a/code/datums/ai/basic_mobs/basic_subtrees/go_for_swim.dm b/code/datums/ai/basic_mobs/basic_subtrees/go_for_swim.dm
index e6427455c4ed..ba50023567fe 100644
--- a/code/datums/ai/basic_mobs/basic_subtrees/go_for_swim.dm
+++ b/code/datums/ai/basic_mobs/basic_subtrees/go_for_swim.dm
@@ -28,7 +28,7 @@
///find land if its time to get out of water, otherwise find water
/datum/ai_behavior/find_and_set/swim_alternate
-/datum/ai_behavior/find_and_set/swim_alternate/search_tactic(datum/ai_controller/controller, locate_path, search_range)
+/datum/ai_behavior/find_and_set/swim_alternate/search_tactic(datum/ai_controller/controller, locate_path, search_range = SEARCH_TACTIC_DEFAULT_RANGE)
var/mob/living/living_pawn = controller.pawn
if(QDELETED(living_pawn))
return null
diff --git a/code/datums/ai/basic_mobs/basic_subtrees/simple_find_target.dm b/code/datums/ai/basic_mobs/basic_subtrees/simple_find_target.dm
index f80ffcc155e8..525248529615 100644
--- a/code/datums/ai/basic_mobs/basic_subtrees/simple_find_target.dm
+++ b/code/datums/ai/basic_mobs/basic_subtrees/simple_find_target.dm
@@ -1,10 +1,12 @@
/datum/ai_planning_subtree/simple_find_target
/// Variable to store target in
var/target_key = BB_BASIC_MOB_CURRENT_TARGET
+ /// Targeting strategy key to use
+ var/strategy_key = BB_TARGETING_STRATEGY
/datum/ai_planning_subtree/simple_find_target/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
. = ..()
- controller.queue_behavior(/datum/ai_behavior/find_potential_targets, target_key, BB_TARGETING_STRATEGY, BB_BASIC_MOB_CURRENT_TARGET_HIDING_LOCATION)
+ controller.queue_behavior(/datum/ai_behavior/find_potential_targets, target_key, strategy_key, BB_BASIC_MOB_CURRENT_TARGET_HIDING_LOCATION)
// Prevents finding a target if a human is nearby
/datum/ai_planning_subtree/simple_find_target/not_while_observed
@@ -21,4 +23,7 @@
/datum/ai_planning_subtree/simple_find_target/increased_range
/datum/ai_planning_subtree/simple_find_target/increased_range/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
- controller.queue_behavior(/datum/ai_behavior/find_potential_targets/bigger_range, target_key, BB_TARGETING_STRATEGY, BB_BASIC_MOB_CURRENT_TARGET_HIDING_LOCATION)
+ controller.queue_behavior(/datum/ai_behavior/find_potential_targets/bigger_range, target_key, strategy_key, BB_BASIC_MOB_CURRENT_TARGET_HIDING_LOCATION)
+
+/datum/ai_planning_subtree/simple_find_target/hunt
+ strategy_key = BB_HUNT_TARGETING_STRATEGY
diff --git a/code/datums/ai/basic_mobs/targeting_strategies/basic_targeting_strategy.dm b/code/datums/ai/basic_mobs/targeting_strategies/basic_targeting_strategy.dm
index 6848d5d323d0..227b4f2fc287 100644
--- a/code/datums/ai/basic_mobs/targeting_strategies/basic_targeting_strategy.dm
+++ b/code/datums/ai/basic_mobs/targeting_strategies/basic_targeting_strategy.dm
@@ -154,3 +154,6 @@
if(!istype(target) || target.has_status_effect(/datum/status_effect/gutted))
return FALSE
return ..()
+
+/datum/targeting_strategy/basic/exact_match
+ check_factions_exactly = TRUE
diff --git a/code/datums/ai/basic_mobs/targeting_strategies/dont_target_friends.dm b/code/datums/ai/basic_mobs/targeting_strategies/dont_target_friends.dm
index 41c01ca91589..268b4ca88428 100644
--- a/code/datums/ai/basic_mobs/targeting_strategies/dont_target_friends.dm
+++ b/code/datums/ai/basic_mobs/targeting_strategies/dont_target_friends.dm
@@ -16,7 +16,7 @@
if(!(target.resistance_flags & INDESTRUCTIBLE))
return TRUE
- if(target in living_mob.ai_controller.blackboard[BB_FRIENDS_LIST])
+ if(isliving(target) && (target in living_mob.ai_controller.blackboard[BB_FRIENDS_LIST]))
return FALSE
return ..()
diff --git a/code/datums/ai/dog/dog_controller.dm b/code/datums/ai/dog/dog_controller.dm
index 215224c305c6..29cb890c3ffe 100644
--- a/code/datums/ai/dog/dog_controller.dm
+++ b/code/datums/ai/dog/dog_controller.dm
@@ -9,7 +9,7 @@
planning_subtrees = list(
/datum/ai_planning_subtree/random_speech/dog,
/datum/ai_planning_subtree/pet_planning,
- /datum/ai_planning_subtree/find_and_hunt_target/find_dog_food, // DARKPACK EDIT ADD
+ /datum/ai_planning_subtree/find_and_hunt_target/find_dog_food, // DARKPACK EDIT ADD - NPC
/datum/ai_planning_subtree/dog_harassment,
)
@@ -26,7 +26,7 @@
// With tongs in hand!
BB_TARGET_HELD_ITEM = /obj/item/kitchen/tongs,
BB_BABIES_PARTNER_TYPES = list(/mob/living/basic/pet/dog),
- BB_BABIES_CHILD_TYPES = list(/mob/living/basic/pet/dog/corgi),
+ BB_BABIES_CHILD_TYPES = list(/mob/living/basic/pet/dog/corgi/puppy),
)
planning_subtrees = list(
diff --git a/code/datums/ai/generic/find_and_set.dm b/code/datums/ai/generic/find_and_set.dm
index a705c7386986..95d8106a2add 100644
--- a/code/datums/ai/generic/find_and_set.dm
+++ b/code/datums/ai/generic/find_and_set.dm
@@ -34,21 +34,42 @@
/**
* Variant of find and set that also requires the item to be edible. checks hands too
*/
-/datum/ai_behavior/find_and_set/edible
+/datum/ai_behavior/find_and_set/food_or_drink
+ var/force_find_drinks = FALSE
-/datum/ai_behavior/find_and_set/edible/search_tactic(datum/ai_controller/controller, locate_path, search_range)
+/datum/ai_behavior/find_and_set/food_or_drink/search_tactic(datum/ai_controller/controller, locate_path, search_range = SEARCH_TACTIC_DEFAULT_RANGE)
var/mob/living/living_pawn = controller.pawn
+ var/find_drinks = force_find_drinks || controller.blackboard[BB_IGNORE_DRINKS] || FALSE
- for(var/atom/held_candidate as anything in living_pawn.held_items)
- if(IsEdible(held_candidate))
+ for(var/atom/held_candidate in living_pawn.held_items)
+ if(is_food_or_drink(controller, held_candidate, find_drinks))
return held_candidate
- for(var/atom/local_candidate as anything in oview(search_range, controller.pawn))
- if(IsEdible(local_candidate) && istype(local_candidate, locate_path))
+ for(var/atom/local_candidate in oview(search_range, controller.pawn))
+ if(is_food_or_drink(controller, local_candidate, find_drinks) && istype(local_candidate, locate_path))
return local_candidate
return null
+/datum/ai_behavior/find_and_set/food_or_drink/proc/is_food_or_drink(datum/ai_controller/controller, obj/item/thing, find_drinks = FALSE)
+ return is_food(thing) || (find_drinks && is_drink(thing))
+
+/datum/ai_behavior/find_and_set/food_or_drink/proc/is_food(obj/item/thing)
+ if(IS_EDIBLE(thing))
+ return TRUE
+ if(istype(thing, /obj/item/reagent_containers/cup/bowl))
+ return thing.reagents.total_volume > 0
+ return FALSE
+
+/datum/ai_behavior/find_and_set/food_or_drink/proc/is_drink(obj/item/thing)
+ if(istype(thing, /obj/item/reagent_containers/cup/glass))
+ return thing.reagents.total_volume > 0
+ return FALSE
+
+/datum/ai_behavior/find_and_set/food_or_drink/to_eat
+
+/datum/ai_behavior/find_and_set/food_or_drink/to_serve
+ force_find_drinks = TRUE
/**
* Variant of find and set that only checks in hands, search range should be excluded for this
@@ -71,7 +92,7 @@
*/
/datum/ai_behavior/find_and_set/in_list
-/datum/ai_behavior/find_and_set/in_list/search_tactic(datum/ai_controller/controller, locate_paths, search_range)
+/datum/ai_behavior/find_and_set/in_list/search_tactic(datum/ai_controller/controller, locate_paths, search_range = SEARCH_TACTIC_DEFAULT_RANGE)
var/list/found = typecache_filter_list(oview(search_range, controller.pawn), locate_paths)
if(length(found))
return pick(found)
@@ -91,7 +112,7 @@
*/
/datum/ai_behavior/find_and_set/animatable
-/datum/ai_behavior/find_and_set/animatable/search_tactic(datum/ai_controller/controller, locate_path, search_range)
+/datum/ai_behavior/find_and_set/animatable/search_tactic(datum/ai_controller/controller, locate_path, search_range = SEARCH_TACTIC_DEFAULT_RANGE)
var/mob/living/living_pawn = controller.pawn
var/list/nearby_items = list()
@@ -112,7 +133,7 @@
*/
/datum/ai_behavior/find_and_set/nearest_wall
-/datum/ai_behavior/find_and_set/nearest_wall/search_tactic(datum/ai_controller/controller, locate_path, search_range)
+/datum/ai_behavior/find_and_set/nearest_wall/search_tactic(datum/ai_controller/controller, locate_path, search_range = SEARCH_TACTIC_DEFAULT_RANGE)
var/mob/living/living_pawn = controller.pawn
var/list/nearby_walls = list()
@@ -129,7 +150,7 @@
*/
/datum/ai_behavior/find_and_set/friendly_corpses
-/datum/ai_behavior/find_and_set/friendly_corpses/search_tactic(datum/ai_controller/controller, locate_path, search_range)
+/datum/ai_behavior/find_and_set/friendly_corpses/search_tactic(datum/ai_controller/controller, locate_path, search_range = SEARCH_TACTIC_DEFAULT_RANGE)
var/mob/living/living_pawn = controller.pawn
var/list/nearby_bodies = list()
for (var/mob/living/dead_pal in oview(search_range, controller.pawn))
@@ -151,7 +172,7 @@
*/
/datum/ai_behavior/find_and_set/conscious_person
-/datum/ai_behavior/find_and_set/conscious_person/search_tactic(datum/ai_controller/controller, locate_path, search_range)
+/datum/ai_behavior/find_and_set/conscious_person/search_tactic(datum/ai_controller/controller, locate_path, search_range = SEARCH_TACTIC_DEFAULT_RANGE)
var/list/customers = list()
for(var/mob/living/carbon/human/target in oview(search_range, controller.pawn))
if(IS_DEAD_OR_INCAP(target) || !target.mind)
@@ -166,7 +187,7 @@
/datum/ai_behavior/find_and_set/nearby_friends
action_cooldown = 2 SECONDS
-/datum/ai_behavior/find_and_set/nearby_friends/search_tactic(datum/ai_controller/controller, locate_path, search_range)
+/datum/ai_behavior/find_and_set/nearby_friends/search_tactic(datum/ai_controller/controller, locate_path, search_range = SEARCH_TACTIC_DEFAULT_RANGE)
var/atom/friend = locate(/mob/living/carbon/human) in oview(search_range, controller.pawn)
if(isnull(friend))
@@ -179,7 +200,7 @@
/datum/ai_behavior/find_and_set/in_list/turf_types
-/datum/ai_behavior/find_and_set/in_list/turf_types/search_tactic(datum/ai_controller/controller, locate_paths, search_range)
+/datum/ai_behavior/find_and_set/in_list/turf_types/search_tactic(datum/ai_controller/controller, locate_paths, search_range = SEARCH_TACTIC_DEFAULT_RANGE)
var/list/found = RANGE_TURFS(search_range, controller.pawn)
shuffle_inplace(found)
for(var/turf/possible_turf as anything in found)
@@ -191,7 +212,7 @@
/datum/ai_behavior/find_and_set/in_list/closest_turf
-/datum/ai_behavior/find_and_set/in_list/closest_turf/search_tactic(datum/ai_controller/controller, locate_paths, search_range)
+/datum/ai_behavior/find_and_set/in_list/closest_turf/search_tactic(datum/ai_controller/controller, locate_paths, search_range = SEARCH_TACTIC_DEFAULT_RANGE)
var/list/found = RANGE_TURFS(search_range, controller.pawn)
for(var/turf/possible_turf as anything in found)
if(!is_type_in_typecache(possible_turf, locate_paths) || !can_see(controller.pawn, possible_turf, search_range))
diff --git a/code/datums/ai/generic/generic_behaviors.dm b/code/datums/ai/generic/generic_behaviors.dm
index 4339c18d7bcf..da338fa45cbd 100644
--- a/code/datums/ai/generic/generic_behaviors.dm
+++ b/code/datums/ai/generic/generic_behaviors.dm
@@ -86,20 +86,16 @@
var/atom/target = controller.blackboard[target_key]
if(QDELETED(target))
return FALSE
+ if(target == controller.pawn) // this can sometimes end up as ourselves, in which case there is no reason to move
+ return FALSE
set_movement_target(controller, target)
/datum/ai_behavior/use_on_object/perform(seconds_per_tick, datum/ai_controller/controller, target_key)
- var/mob/living/pawn = controller.pawn
- var/obj/item/held_item = pawn.get_item_by_slot(pawn.get_active_hand())
var/atom/target = controller.blackboard[target_key]
if(QDELETED(target))
return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_FAILED
- if(held_item)
- held_item.melee_attack_chain(pawn, target)
- else
- controller.ai_interact(target = target, combat_mode = FALSE)
-
+ controller.ai_interact(target = target, combat_mode = FALSE)
return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_SUCCEEDED
/datum/ai_behavior/give
@@ -118,10 +114,14 @@
if(!held_item) //if held_item is null, we pretend that action was successful
return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_SUCCEEDED
- if(!target || !isliving(target))
+ if(QDELETED(target) || !target.IsReachableBy(pawn))
return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_FAILED
var/mob/living/living_target = target
+ if(!isliving(living_target)) // target should reasonably only ever be set to a living mob
+ stack_trace("Tried to give an item to a non-living target!")
+ return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_FAILED
+
var/perform_flags = try_to_give_item(controller, living_target, held_item)
if(perform_flags & AI_BEHAVIOR_FAILED)
return perform_flags
@@ -161,36 +161,73 @@
target.put_in_hands(held_item)
return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_SUCCEEDED
+/datum/ai_behavior/give/finish_action(datum/ai_controller/controller, succeeded, target_key)
+ . = ..()
+ controller.clear_blackboard_key(target_key)
/datum/ai_behavior/consume
+ action_cooldown = 2 SECONDS
+
+/datum/ai_behavior/consume/perform(seconds_per_tick, datum/ai_controller/controller, target_key, hunger_timer_key)
+ var/mob/living/living_pawn = controller.pawn
+ var/obj/item/target = controller.blackboard[target_key]
+ if(QDELETED(target) || !living_pawn.is_holding(target))
+ return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_FAILED
+
+ controller.ai_interact(target = living_pawn, combat_mode = FALSE)
+
+ return AI_BEHAVIOR_DELAY | (is_content(living_pawn, target) ? AI_BEHAVIOR_SUCCEEDED : AI_BEHAVIOR_FAILED)
+
+/datum/ai_behavior/consume/finish_action(datum/ai_controller/controller, succeeded, target_key, hunger_timer_key)
+ . = ..()
+ if(!succeeded)
+ return
+ controller.set_blackboard_key(hunger_timer_key, world.time + rand(12 SECONDS, 60 SECONDS))
+
+ var/mob/living/living_pawn = controller.pawn
+ var/obj/item/target = controller.blackboard[target_key]
+ if(!QDELETED(target) && !DOING_INTERACTION_WITH_TARGET(living_pawn, target))
+ controller.clear_blackboard_key(target_key)
+ living_pawn.dropItemToGround(target) // drops empty drink glasses
+ for(var/obj/item/trash/trash in living_pawn.held_items)
+ living_pawn.dropItemToGround(trash) // drops spawned trash items
+
+/// Check if the target is fully consumed, or being actively consumed, or if we're just bored of eating it
+/datum/ai_behavior/consume/proc/is_content(mob/living/living_pawm, obj/item/target)
+ if(QDELETED(target))
+ return TRUE
+ if(DOING_INTERACTION_WITH_TARGET(living_pawm, target))
+ return TRUE
+ if(target.reagents?.total_volume <= 0)
+ return TRUE
+ // Even if we don't finish it all we can randomly decide to be done
+ return prob(10)
+
+// navigate to target item and pick it up if we can
+/datum/ai_behavior/navigate_to_and_pick_up
behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT | AI_BEHAVIOR_REQUIRE_REACH
action_cooldown = 2 SECONDS
-/datum/ai_behavior/consume/setup(datum/ai_controller/controller, target_key)
+/datum/ai_behavior/navigate_to_and_pick_up/setup(datum/ai_controller/controller, target_key, drop_held = TRUE)
. = ..()
set_movement_target(controller, controller.blackboard[target_key])
-/datum/ai_behavior/consume/perform(seconds_per_tick, datum/ai_controller/controller, target_key, hunger_timer_key)
+/datum/ai_behavior/navigate_to_and_pick_up/setup(datum/ai_controller/controller, target_key, drop_held = TRUE)
var/mob/living/living_pawn = controller.pawn
var/obj/item/target = controller.blackboard[target_key]
if(QDELETED(target))
return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_FAILED
- if(!(target in living_pawn.held_items))
- if(!living_pawn.get_empty_held_indexes() || !living_pawn.put_in_hands(target))
- return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_FAILED
-
- target.melee_attack_chain(living_pawn, living_pawn)
-
- if(QDELETED(target) || prob(10)) // Even if we don't finish it all we can randomly decide to be done
+ if(living_pawn.is_holding(target)) // already in hands
return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_SUCCEEDED
+ if(!target.IsReachableBy(living_pawn)) // can't reach it, despite being adjacent
+ return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_FAILED
+ if(living_pawn.get_active_held_item()) // something is in our hands already
+ if(!drop_held || !living_pawn.dropItemToGround(living_pawn.get_active_held_item()))
+ return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_FAILED
- return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_FAILED
-
-/datum/ai_behavior/consume/finish_action(datum/ai_controller/controller, succeeded, target_key, hunger_timer_key)
- . = ..()
- if(succeeded)
- controller.set_blackboard_key(hunger_timer_key, world.time + rand(12 SECONDS, 60 SECONDS))
+ controller.ai_interact(target, combat_mode = FALSE)
+ return AI_BEHAVIOR_DELAY | (target.loc == living_pawn ? AI_BEHAVIOR_SUCCEEDED : AI_BEHAVIOR_FAILED)
/**
* Drops items in hands, very important for future behaviors that require the pawn to grab stuff
diff --git a/code/datums/ai/generic/generic_subtrees.dm b/code/datums/ai/generic/generic_subtrees.dm
index 9d5ff8638fc9..6fe92668f916 100644
--- a/code/datums/ai/generic/generic_subtrees.dm
+++ b/code/datums/ai/generic/generic_subtrees.dm
@@ -53,7 +53,13 @@
* relevant blackboards:
* * BB_NEXT_HUNGRY - set by this subtree, is when the controller is next hungry
*/
+/datum/ai_planning_subtree/generic_hunger
+
/datum/ai_planning_subtree/generic_hunger/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
+ var/mob/living/living_pawn = controller.pawn
+ if(living_pawn.nutrition > NUTRITION_LEVEL_HUNGRY)
+ return
+
var/next_eat = controller.blackboard[BB_NEXT_HUNGRY]
if(!next_eat)
//inits the blackboard timer
@@ -63,16 +69,30 @@
if(world.time < next_eat)
return
+ // find food
var/atom/food_target = controller.blackboard[BB_FOOD_TARGET]
-
if(isnull(food_target))
- controller.queue_behavior(/datum/ai_behavior/find_and_set/edible, BB_FOOD_TARGET, /obj/item, 2)
- return
-
- var/mob/living/living_pawn = controller.pawn
- if(!length(living_pawn.get_empty_held_indexes()) && !(food_target in living_pawn.held_items))
- controller.queue_behavior(/datum/ai_behavior/drop_item)
+ controller.queue_behavior(/datum/ai_behavior/find_and_set/food_or_drink/to_eat, BB_FOOD_TARGET, /obj/item, 2)
return SUBTREE_RETURN_FINISH_PLANNING
- controller.queue_behavior(/datum/ai_behavior/consume, BB_FOOD_TARGET, BB_NEXT_HUNGRY)
+ if(living_pawn.is_holding(food_target))
+ controller.queue_behavior(/datum/ai_behavior/consume, BB_FOOD_TARGET, BB_NEXT_HUNGRY)
+ // it's been moved since we found it
+ else if(!isturf(food_target.loc))
+ // someone took it. we will fight over it!
+ if(isliving(food_target.loc) && will_fight_for_food(food_target.loc, living_pawn, controller))
+ controller.add_blackboard_key_assoc(BB_MONKEY_ENEMIES, food_target.loc, MONKEY_FOOD_HATRED_AMOUNT)
+ // eh, find something else
+ else
+ controller.clear_blackboard_key(BB_FOOD_TARGET)
+ return SUBTREE_RETURN_FINISH_PLANNING
+ else
+ controller.queue_behavior(/datum/ai_behavior/navigate_to_and_pick_up, BB_FOOD_TARGET, TRUE)
return SUBTREE_RETURN_FINISH_PLANNING
+
+/datum/ai_planning_subtree/generic_hunger/proc/will_fight_for_food(mob/living/thief, mob/living/monkey, datum/ai_controller/controller)
+ if(controller.blackboard[BB_MONKEY_AGGRESSIVE])
+ return TRUE
+ if(controller.blackboard[BB_MONKEY_TAMED])
+ return FALSE
+ return prob(100 * ((NUTRITION_LEVEL_HUNGRY - monkey.nutrition) / NUTRITION_LEVEL_HUNGRY))
diff --git a/code/datums/ai/hunting_behavior/hunting_mouse.dm b/code/datums/ai/hunting_behavior/hunting_mouse.dm
index b5c9a7743a4a..3bcee20b79ea 100644
--- a/code/datums/ai/hunting_behavior/hunting_mouse.dm
+++ b/code/datums/ai/hunting_behavior/hunting_mouse.dm
@@ -40,7 +40,7 @@
if (!isturf(instrument.loc) || !can_see(pawn, instrument))
controller.clear_blackboard_key(BB_SONG_INSTRUMENT)
return
- if (pawn.CanReach(instrument))
+ if (instrument.IsReachableBy(pawn))
return
controller.queue_behavior(/datum/ai_behavior/travel_towards/adjacent, BB_SONG_INSTRUMENT)
return SUBTREE_RETURN_FINISH_PLANNING
@@ -49,7 +49,7 @@
/datum/ai_behavior/find_and_set/piano_synth // Disinclude subtypes
-/datum/ai_behavior/find_and_set/piano_synth/search_tactic(datum/ai_controller/controller, locate_path, search_range)
+/datum/ai_behavior/find_and_set/piano_synth/search_tactic(datum/ai_controller/controller, locate_path, search_range = SEARCH_TACTIC_DEFAULT_RANGE)
for(var/obj/item/instrument/piano_synth/synth in oview(search_range, controller.pawn))
if(synth.type == /obj/item/instrument/piano_synth)
return synth
diff --git a/code/datums/ai/monkey/monkey_behaviors.dm b/code/datums/ai/monkey/monkey_behaviors.dm
index ef49de98823d..01dd0b61449d 100644
--- a/code/datums/ai/monkey/monkey_behaviors.dm
+++ b/code/datums/ai/monkey/monkey_behaviors.dm
@@ -87,7 +87,7 @@
var/success = FALSE
- if(do_after(living_pawn, MONKEY_ITEM_SNATCH_DELAY, victim) && target && living_pawn.CanReach(victim))
+ if(do_after(living_pawn, MONKEY_ITEM_SNATCH_DELAY, victim) && target && victim.IsReachableBy(living_pawn))
for(var/obj/item/I in victim.held_items)
if(I == target)
@@ -195,7 +195,7 @@
//look for any potential weapons we're holding
var/obj/item/potential_weapon = locate() in living_pawn.held_items
- if(!living_pawn.CanReach(target, potential_weapon))
+ if(!target.IsReachableBy(living_pawn, potential_weapon?.reach))
return FALSE
if(isnull(potential_weapon))
diff --git a/code/datums/ai/monkey/monkey_controller.dm b/code/datums/ai/monkey/monkey_controller.dm
index 4c778f661220..18bdb0be26b0 100644
--- a/code/datums/ai/monkey/monkey_controller.dm
+++ b/code/datums/ai/monkey/monkey_controller.dm
@@ -25,14 +25,19 @@ have ways of interacting with a specific mob and control it.
BB_MONKEY_GUN_NEURONS_ACTIVATED = FALSE,
BB_SONG_LINES = MONKEY_SONG,
BB_RESISTING = FALSE,
+ BB_MONKEY_GIVE_CHANCE = 5,
)
idle_behavior = /datum/idle_behavior/idle_monkey
/datum/targeting_strategy/basic/monkey
/datum/targeting_strategy/basic/monkey/faction_check(datum/ai_controller/controller, mob/living/living_mob, mob/living/the_target)
+ // if they wronged us, all bets are off
if(controller.blackboard[BB_MONKEY_ENEMIES][the_target])
return FALSE
+ // target was forcibly set, all bets are off again
+ if(controller.blackboard[BB_MONKEY_CURRENT_ATTACK_TARGET] == the_target)
+ return FALSE
return ..()
/datum/ai_controller/monkey/process(seconds_per_tick)
@@ -59,12 +64,24 @@ have ways of interacting with a specific mob and control it.
planning_subtrees = list(
/datum/ai_planning_subtree/generic_resist,
/datum/ai_planning_subtree/monkey_combat,
+ /datum/ai_planning_subtree/serve_food,
/datum/ai_planning_subtree/generic_hunger,
/datum/ai_planning_subtree/generic_play_instrument,
- /datum/ai_planning_subtree/punpun_shenanigans,
+ /datum/ai_planning_subtree/monkey_shenanigans,
)
idle_behavior = /datum/idle_behavior/idle_monkey/pun_pun
+/datum/ai_controller/monkey/pun_pun/TryPossessPawn(atom/new_pawn)
+ . = ..()
+ if(. & AI_CONTROLLER_INCOMPATIBLE)
+ return
+ pawn = new_pawn
+ set_blackboard_key(BB_IGNORE_DRINKS, TRUE)
+ set_blackboard_key(BB_MONKEY_TAMED, TRUE)
+ set_blackboard_key(BB_MONKEY_GIVE_CHANCE, 30)
+ set_blackboard_key(BB_MONKEY_PRESS_TYPEPATH, /obj/structure/desk_bell)
+ set_trip_mode(mode = FALSE)
+
/datum/ai_controller/monkey/angry
/datum/ai_controller/monkey/angry/TryPossessPawn(atom/new_pawn)
diff --git a/code/datums/ai/monkey/monkey_subtrees.dm b/code/datums/ai/monkey/monkey_subtrees.dm
index 1210fe44ba11..dc8793ffdfed 100644
--- a/code/datums/ai/monkey/monkey_subtrees.dm
+++ b/code/datums/ai/monkey/monkey_subtrees.dm
@@ -7,21 +7,22 @@
return
if(!controller.blackboard[BB_MONKEY_CURRENT_PRESS_TARGET])
- controller.queue_behavior(/datum/ai_behavior/find_nearby, BB_MONKEY_CURRENT_PRESS_TARGET)
- return
-
- if(prob(50))
+ if(controller.blackboard[BB_MONKEY_PRESS_TYPEPATH])
+ controller.queue_behavior(/datum/ai_behavior/find_and_set, BB_MONKEY_CURRENT_PRESS_TARGET, controller.blackboard[BB_MONKEY_PRESS_TYPEPATH], 2)
+ else
+ controller.queue_behavior(/datum/ai_behavior/find_nearby, BB_MONKEY_CURRENT_PRESS_TARGET)
+ else if(prob(50))
controller.queue_behavior(/datum/ai_behavior/use_on_object, BB_MONKEY_CURRENT_PRESS_TARGET)
return SUBTREE_RETURN_FINISH_PLANNING
if(!controller.blackboard[BB_MONKEY_CURRENT_GIVE_TARGET])
- controller.queue_behavior(/datum/ai_behavior/find_and_set/pawn_must_hold_item, BB_MONKEY_CURRENT_GIVE_TARGET, /mob/living, 2)
- else
- if(prob(5))
- controller.queue_behavior(/datum/ai_behavior/give, BB_MONKEY_CURRENT_GIVE_TARGET)
- return SUBTREE_RETURN_FINISH_PLANNING
+ controller.queue_behavior(/datum/ai_behavior/find_and_set/pawn_must_hold_item, BB_MONKEY_CURRENT_GIVE_TARGET, /mob/living/carbon/human, 2)
+ else if(prob(controller.blackboard[BB_MONKEY_GIVE_CHANCE]))
+ controller.queue_behavior(/datum/ai_behavior/give, BB_MONKEY_CURRENT_GIVE_TARGET)
+ return SUBTREE_RETURN_FINISH_PLANNING
- controller.TryFindWeapon()
+ if(!controller.blackboard[BB_MONKEY_TAMED])
+ controller.TryFindWeapon()
///monkey combat subtree.
/datum/ai_planning_subtree/monkey_combat/SelectBehaviors(datum/ai_controller/monkey/controller, seconds_per_tick)
@@ -55,7 +56,8 @@
controller.queue_behavior(/datum/ai_behavior/recruit_monkeys, BB_MONKEY_CURRENT_ATTACK_TARGET)
return
- controller.queue_behavior(/datum/ai_behavior/battle_screech/monkey)
+ if(SPT_PROB(ismonkey(living_pawn) ? 25 : 10, seconds_per_tick))
+ controller.queue_behavior(/datum/ai_behavior/battle_screech/monkey)
controller.queue_behavior(/datum/ai_behavior/monkey_attack_mob, BB_MONKEY_CURRENT_ATTACK_TARGET)
return SUBTREE_RETURN_FINISH_PLANNING
@@ -69,3 +71,42 @@
controller.queue_behavior(/datum/ai_behavior/disposal_mob, BB_MONKEY_CURRENT_ATTACK_TARGET, BB_MONKEY_TARGET_DISPOSAL)
return SUBTREE_RETURN_FINISH_PLANNING
+
+/// Finds food or drinks, picks them up, then gives them to nearby humans
+/datum/ai_planning_subtree/serve_food
+
+/datum/ai_planning_subtree/serve_food/SelectBehaviors(datum/ai_controller/monkey/controller, seconds_per_tick)
+ var/mob/living/living_pawn = controller.pawn
+ var/list/nearby_patrons = list()
+ for(var/mob/living/carbon/human/human_mob in oview(5, living_pawn))
+ if(istype(human_mob.mind?.assigned_role, /datum/job/bartender))
+ return // my boss is on duty!
+ if(human_mob.stat != CONSCIOUS || ismonkey(human_mob))
+ continue
+ if(!human_mob.get_empty_held_indexes())
+ continue
+ nearby_patrons += human_mob
+
+ // Need at least 2 patrons to bother serving (bearing in mind the
+ if(length(nearby_patrons) < 1)
+ return
+
+ var/obj/item/serving = controller.blackboard[BB_MONKEY_CURRENT_SERVED_ITEM]
+ if(QDELETED(serving) || serving.reagents.total_volume <= 0)
+ controller.queue_behavior(/datum/ai_behavior/find_and_set/food_or_drink/to_serve, BB_MONKEY_CURRENT_SERVED_ITEM, /obj/item, 2)
+ return
+
+ // we have something to serve, pick a patron and go hand it over
+ if(living_pawn.is_holding(serving))
+ controller.blackboard[BB_MONKEY_CURRENT_GIVE_TARGET] ||= pick(nearby_patrons)
+ controller.queue_behavior(/datum/ai_behavior/give, BB_MONKEY_CURRENT_GIVE_TARGET)
+ return SUBTREE_RETURN_FINISH_PLANNING
+
+ // we have something to serve but aren't holding it yet
+ if(isturf(serving.loc))
+ // fetch the drink
+ controller.queue_behavior(/datum/ai_behavior/navigate_to_and_pick_up, BB_MONKEY_CURRENT_SERVED_ITEM, TRUE)
+ else
+ // give up on the dream
+ controller.clear_blackboard_key(BB_MONKEY_CURRENT_SERVED_ITEM)
+ return SUBTREE_RETURN_FINISH_PLANNING
diff --git a/code/datums/ai/monkey/punpun_subtrees.dm b/code/datums/ai/monkey/punpun_subtrees.dm
deleted file mode 100644
index 6370393db001..000000000000
--- a/code/datums/ai/monkey/punpun_subtrees.dm
+++ /dev/null
@@ -1,22 +0,0 @@
-/datum/ai_planning_subtree/punpun_shenanigans/SelectBehaviors(datum/ai_controller/monkey/controller, seconds_per_tick)
-
- controller.set_trip_mode(mode = FALSE) // pun pun doesn't fuck around
-
- if(prob(5))
- controller.queue_behavior(/datum/ai_behavior/use_in_hand)
-
- if(!SPT_PROB(MONKEY_SHENANIGAN_PROB, seconds_per_tick))
- return
-
- if(!controller.blackboard[BB_MONKEY_CURRENT_PRESS_TARGET])
- controller.queue_behavior(/datum/ai_behavior/find_and_set, BB_MONKEY_CURRENT_PRESS_TARGET, /obj/structure/desk_bell, 2)
- else if(prob(50))
- controller.queue_behavior(/datum/ai_behavior/use_on_object, BB_MONKEY_CURRENT_PRESS_TARGET)
- return SUBTREE_RETURN_FINISH_PLANNING
-
- if(!controller.blackboard[BB_MONKEY_CURRENT_GIVE_TARGET])
- controller.queue_behavior(/datum/ai_behavior/find_and_set/pawn_must_hold_item, BB_MONKEY_CURRENT_GIVE_TARGET, /mob/living, 2)
- else if(prob(30))
- controller.queue_behavior(/datum/ai_behavior/give, BB_MONKEY_CURRENT_GIVE_TARGET)
- return SUBTREE_RETURN_FINISH_PLANNING
-
diff --git a/code/datums/ai/movement/ai_movement_jps.dm b/code/datums/ai/movement/ai_movement_jps.dm
index 3781dd7f5dc7..1153833a31ee 100644
--- a/code/datums/ai/movement/ai_movement_jps.dm
+++ b/code/datums/ai/movement/ai_movement_jps.dm
@@ -53,6 +53,3 @@
/datum/ai_movement/jps/bot/travel_to_beacon
maximum_length = AI_BOT_PATH_LENGTH
max_pathing_attempts = 10
-
-/datum/ai_movement/jps/modsuit
- maximum_length = MOD_AI_RANGE
diff --git a/code/datums/ai/objects/mod.dm b/code/datums/ai/objects/mod.dm
deleted file mode 100644
index 46b41adb1c87..000000000000
--- a/code/datums/ai/objects/mod.dm
+++ /dev/null
@@ -1,48 +0,0 @@
-/// An AI controller for the MODsuit pathfinder module. It's activated by module and attaches itself to the user.
-/datum/ai_controller/mod
- blackboard = list(
- BB_MOD_TARGET,
- BB_MOD_MODULE,
- )
- can_idle = FALSE
- max_target_distance = MOD_AI_RANGE //a little spicy but its one specific item that summons it, and it doesn't run otherwise
- ai_movement = /datum/ai_movement/jps/modsuit
- ///ID card generated from the suit's required access. Used for pathing.
- var/obj/item/card/id/advanced/id_card
-
-/datum/ai_controller/mod/TryPossessPawn(atom/new_pawn)
- if(!istype(new_pawn, /obj/item/mod/control))
- return AI_CONTROLLER_INCOMPATIBLE
- var/obj/item/mod/control/mod = new_pawn
- id_card = new /obj/item/card/id/advanced/simple_bot()
- if(length(mod.req_access))
- id_card.set_access(mod.req_access)
- return ..() //Run parent at end
-
-/datum/ai_controller/mod/UnpossessPawn(destroy)
- QDEL_NULL(id_card)
- return ..() //Run parent at end
-
-/datum/ai_controller/mod/SelectBehaviors(seconds_per_tick)
- current_behaviors = list()
- if(blackboard[BB_MOD_TARGET] && blackboard[BB_MOD_MODULE])
- queue_behavior(/datum/ai_behavior/mod_attach)
-
-/datum/ai_controller/mod/get_access()
- return id_card.GetAccess()
-
-/datum/ai_behavior/mod_attach
- behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT|AI_BEHAVIOR_MOVE_AND_PERFORM
-
-/datum/ai_behavior/mod_attach/perform(seconds_per_tick, datum/ai_controller/controller)
- if(!controller.pawn.Adjacent(controller.blackboard[BB_MOD_TARGET]))
- return AI_BEHAVIOR_DELAY
- var/obj/item/mod/module/pathfinder/module = controller.blackboard[BB_MOD_MODULE]
- module.attach(controller.blackboard[BB_MOD_TARGET])
- return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_SUCCEEDED
-
-/datum/ai_behavior/mod_attach/finish_action(datum/ai_controller/controller, succeeded)
- . = ..()
- controller.clear_blackboard_key(BB_MOD_TARGET)
- var/obj/item/mod/module/pathfinder/module = controller.blackboard[BB_MOD_MODULE]
- module.end_recall(succeeded)
diff --git a/code/datums/alarm.dm b/code/datums/alarm.dm
index 27125efbc9c1..52788e41dacf 100644
--- a/code/datums/alarm.dm
+++ b/code/datums/alarm.dm
@@ -14,7 +14,7 @@
///Represents a single source of alarms, one alarm handler will only ever count for one alarm per listener
/datum/alarm_handler
///A list of alarm type -> list of areas we currently have alarms in
- var/list/sent_alarms = list()
+ var/list/sent_alarms
///Our source atom
var/atom/source_atom
@@ -27,8 +27,8 @@
return ..()
/datum/alarm_handler/Destroy()
- for(var/alarm_type in sent_alarms)
- for(var/area/area_to_clear as anything in sent_alarms[alarm_type])
+ for(var/alarm_type, sent_alarm in sent_alarms)
+ for(var/area/area_to_clear as anything in sent_alarm)
//Yeet all connected alarms
clear_alarm_from_area(alarm_type, area_to_clear)
source_atom = null
@@ -46,13 +46,13 @@
var/area/our_area = get_area(use_as_source_atom)
var/our_z_level = use_as_source_atom.z
- var/list/existing_alarms = sent_alarms[alarm_type]
+ var/list/existing_alarms = LAZYACCESS(sent_alarms, alarm_type)
if(existing_alarms)
if(our_area in existing_alarms)
return FALSE
else
- sent_alarms[alarm_type] = list()
- existing_alarms = sent_alarms[alarm_type]
+ LAZYSET(sent_alarms, alarm_type, list())
+ existing_alarms = sent_alarms[alarm_type] // List will definitely exist because of previous line, no need for lazy macro
existing_alarms += our_area
@@ -76,16 +76,16 @@
///Exists so we can request that the alarms from an area are cleared, even if our source atom is no longer in that area
/datum/alarm_handler/proc/clear_alarm_from_area(alarm_type, area/our_area)
- var/list/existing_alarms = sent_alarms[alarm_type]
- if(!existing_alarms)
+ var/list/existing_alarms = LAZYACCESS(sent_alarms, alarm_type)
+ if(isnull(existing_alarms))
return FALSE
if(!(our_area in existing_alarms))
return FALSE
- existing_alarms -= our_area
- if(!length(existing_alarms))
- sent_alarms -= alarm_type
+ LAZYREMOVE(existing_alarms, our_area)
+ if(!LAZYLEN(existing_alarms))
+ LAZYREMOVE(sent_alarms, alarm_type)
our_area.active_alarms[alarm_type] -= 1
if(!length(our_area.active_alarms))
diff --git a/code/datums/announcers/default_announcer.dm b/code/datums/announcers/default_announcer.dm
index bf24f611af84..68e899922918 100644
--- a/code/datums/announcers/default_announcer.dm
+++ b/code/datums/announcers/default_announcer.dm
@@ -1,5 +1,5 @@
/datum/centcom_announcer/default
- welcome_sounds = list('sound/announcer/default/welcome.ogg')
+ welcome_sounds = list('modular_darkpack/master_files/sounds/announce.ogg') // DARKPACK EDIT CHANGE
alert_sounds = list('sound/announcer/default/attention.ogg')
command_report_sounds = list('sound/announcer/default/commandreport.ogg')
event_sounds = list(ANNOUNCER_AIMALF = 'sound/announcer/default/aimalf.ogg',
diff --git a/code/datums/bodypart_overlays/emote_bodypart_overlay.dm b/code/datums/bodypart_overlays/emote_bodypart_overlay.dm
index cabb10558a05..fbdea6018395 100644
--- a/code/datums/bodypart_overlays/emote_bodypart_overlay.dm
+++ b/code/datums/bodypart_overlays/emote_bodypart_overlay.dm
@@ -39,11 +39,13 @@
*
* Returns the given overlay, which can be deleted to stop displaying it. Will return null if no bodypart matching the overlay's attached_body_zone field can be found.
*/
-/mob/living/carbon/human/proc/give_emote_overlay(overlay_typepath)
- var/datum/bodypart_overlay/simple/emote/overlay = new overlay_typepath()
- var/obj/item/bodypart/bodypart = src.get_bodypart(overlay.attached_body_zone)
+/mob/living/carbon/human/proc/give_emote_overlay(datum/bodypart_overlay/simple/emote/overlay_typepath)
+ var/obj/item/bodypart/bodypart = get_bodypart(overlay_typepath::attached_body_zone)
if(!bodypart)
return null
+ if(locate(overlay_typepath) in bodypart.bodypart_overlays)
+ return null
+ var/datum/bodypart_overlay/simple/emote/overlay = new overlay_typepath()
bodypart.add_bodypart_overlay(overlay)
return overlay
diff --git a/code/datums/bodypart_overlays/markings_bodypart_overlay.dm b/code/datums/bodypart_overlays/markings_bodypart_overlay.dm
index 5cd5eb3cedc8..ed02a96ca0fe 100644
--- a/code/datums/bodypart_overlays/markings_bodypart_overlay.dm
+++ b/code/datums/bodypart_overlays/markings_bodypart_overlay.dm
@@ -42,15 +42,12 @@
var/gender_string = (use_gender && limb.is_dimorphic) ? (limb.gender == MALE ? MALE : FEMALE + "_") : "" //we only got male and female sprites
return mutable_appearance(icon, gender_string + icon_state + "_" + limb.body_zone, layer = layer)
+/datum/bodypart_overlay/simple/body_marking/get_accessory(name)
+ return SSaccessories.feature_list[dna_feature_key][name]
+
/datum/bodypart_overlay/simple/body_marking/moth
dna_feature_key = FEATURE_MOTH_MARKINGS
-/datum/bodypart_overlay/simple/body_marking/moth/get_accessory(name)
- return SSaccessories.moth_markings_list[name]
-
/datum/bodypart_overlay/simple/body_marking/lizard
dna_feature_key = FEATURE_LIZARD_MARKINGS
applies_to = list(/obj/item/bodypart/chest)
-
-/datum/bodypart_overlay/simple/body_marking/lizard/get_accessory(name)
- return SSaccessories.lizard_markings_list[name]
diff --git a/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm b/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm
index f34fa2fa255d..40b303b1a4f0 100644
--- a/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm
+++ b/code/datums/bodypart_overlays/mutant_bodypart_overlay.dm
@@ -33,9 +33,10 @@
stack_trace("adding a [parent.type] to a [receiver.type] when it shouldn't be!")
if(imprint_on_next_insertion) //We only want this set *once*
- var/feature_name = receiver.dna.features[feature_key]
+ var/feature_name = receiver.dna.features[feature_key] || receiver.dna.species.mutant_organs[parent.type]
if (isnull(feature_name))
- feature_name = receiver.dna.species.mutant_organs[parent.type]
+ stack_trace("[type] has no default feature name for organ [parent.type]!")
+ feature_name = get_consistent_feature_entry(get_global_feature_list()) //fallback to something
set_appearance_from_name(feature_name)
imprint_on_next_insertion = FALSE
@@ -118,7 +119,11 @@
///Return a dumb glob list for this specific feature (called from parse_sprite)
/datum/bodypart_overlay/mutant/proc/get_global_feature_list()
- CRASH("External organ has no feature list, it will render invisible")
+ var/list/feature_list = SSaccessories.feature_list[feature_key]
+ if(isnull(feature_list))
+ stack_trace("External organ has no feature list, it will render invisible")
+ return list()
+ return feature_list
///Give the organ its color. Force will override the existing one.
/datum/bodypart_overlay/mutant/proc/inherit_color(obj/item/bodypart/bodypart_owner, force)
diff --git a/code/datums/brain_damage/brain_trauma.dm b/code/datums/brain_damage/brain_trauma.dm
index 3c7f5ce7aec0..9d1caff55f68 100644
--- a/code/datums/brain_damage/brain_trauma.dm
+++ b/code/datums/brain_damage/brain_trauma.dm
@@ -8,14 +8,22 @@
abstract_type = /datum/brain_trauma
var/name = "Brain Trauma"
var/desc = "A trauma caused by brain damage, which causes issues to the patient."
- var/scan_desc = "generic brain trauma" //description when detected by a health scanner
- var/mob/living/carbon/owner //the poor bastard
- var/obj/item/organ/brain/brain //the poor bastard's brain
+ /// Description when detected by a health scanner
+ var/scan_desc = "generic brain trauma"
+ /// The poor bastard
+ var/mob/living/carbon/owner
+ /// The poor bastard's brain
+ var/obj/item/organ/brain/brain
+ /// Message sent in chat when trauma is gained
var/gain_text = span_notice("You feel traumatized.")
+ /// Message sent in chat when trauma is lost
var/lose_text = span_notice("You no longer feel traumatized.")
+ /// If the trauma can be gained, checked in can_gain_trauma
var/can_gain = TRUE
- var/random_gain = TRUE //can this be gained through random traumas?
- var/resilience = TRAUMA_RESILIENCE_BASIC //how hard is this to cure?
+ /// If this trauma can be gained randomly
+ var/random_gain = TRUE
+ /// How hard is this to cure?
+ var/resilience = TRAUMA_RESILIENCE_BASIC
/datum/brain_trauma/Destroy()
// Handles our references with our brain
diff --git a/code/datums/brain_damage/creepy_trauma.dm b/code/datums/brain_damage/creepy_trauma.dm
index 99cbaab630d0..cc5cac5fd38e 100644
--- a/code/datums/brain_damage/creepy_trauma.dm
+++ b/code/datums/brain_damage/creepy_trauma.dm
@@ -34,6 +34,7 @@
antagonist.greet()
log_game("[key_name(antagonist)] has developed an obsession with [key_name(obsession)].")
RegisterSignal(owner, COMSIG_CARBON_HELPED, PROC_REF(on_hug))
+ ADD_TRAIT(owner, TRAIT_DESENSITIZED, REF(src))
/datum/brain_trauma/special/obsessed/on_life(seconds_per_tick, times_fired)
if(!obsession || obsession.stat == DEAD)
@@ -71,6 +72,7 @@
if(obsession)
log_game("[key_name(owner)] is no longer obsessed with [key_name(obsession)].")
UnregisterSignal(obsession, COMSIG_MOB_EYECONTACT)
+ REMOVE_TRAIT(owner, TRAIT_DESENSITIZED, REF(src))
/datum/brain_trauma/special/obsessed/handle_speech(datum/source, list/speech_args)
if(!viewing)
@@ -102,7 +104,7 @@
if(41 to 80)
INVOKE_ASYNC(owner, TYPE_PROC_REF(/mob, emote), "pale")
shake_camera(owner, 15, 1)
- owner.adjustStaminaLoss(70)
+ owner.adjust_stamina_loss(70)
to_chat(owner, span_userdanger("You feel your heart lurching in your chest..."))
if(81 to 100)
INVOKE_ASYNC(owner, TYPE_PROC_REF(/mob, emote), "cough")
diff --git a/code/datums/brain_damage/imaginary_friend.dm b/code/datums/brain_damage/imaginary_friend.dm
index 2c99da7c6f05..05e56a445693 100644
--- a/code/datums/brain_damage/imaginary_friend.dm
+++ b/code/datums/brain_damage/imaginary_friend.dm
@@ -216,7 +216,7 @@
owner.imaginary_group -= src
return ..()
-/mob/eye/imaginary_friend/Hear(atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, freq_name, freq_color, list/spans, list/message_mods = list(), message_range)
+/mob/eye/imaginary_friend/Hear(atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, freq_name, freq_color, list/spans, list/message_mods = list(), message_range, source) // DARKPACK EDIT, ORIGINAL: /mob/eye/imaginary_friend/Hear(atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, freq_name, freq_color, list/spans, list/message_mods = list(), message_range)
if (safe_read_pref(client, /datum/preference/toggle/enable_runechat) && (safe_read_pref(client, /datum/preference/toggle/enable_runechat_non_mobs) || ismob(speaker)))
create_chat_message(speaker, message_language, raw_message, spans)
to_chat(src, compose_message(speaker, message_language, raw_message, radio_freq, freq_name, freq_color, spans, message_mods))
diff --git a/code/datums/brain_damage/magic.dm b/code/datums/brain_damage/magic.dm
index d0026703c135..d15296baa224 100644
--- a/code/datums/brain_damage/magic.dm
+++ b/code/datums/brain_damage/magic.dm
@@ -74,8 +74,12 @@
scan_desc = "extra-sensory paranoia"
gain_text = span_warning("You feel like something wants to kill you...")
lose_text = span_notice("You no longer feel eyes on your back.")
+ /// Type of stalker that is chasing us
+ var/stalker_type = /obj/effect/client_image_holder/stalker_phantom
+ /// Reference to the stalker that is chasing us
var/obj/effect/client_image_holder/stalker_phantom/stalker
- var/close_stalker = FALSE //For heartbeat
+ /// Plays a sound when the stalker is near their victim
+ var/close_stalker = FALSE
/datum/brain_trauma/magic/stalker/Destroy()
QDEL_NULL(stalker)
@@ -87,7 +91,7 @@
/datum/brain_trauma/magic/stalker/proc/create_stalker()
var/turf/stalker_source = locate(owner.x + pick(-12, 12), owner.y + pick(-12, 12), owner.z) //random corner
- stalker = new(stalker_source, owner)
+ stalker = new stalker_type(stalker_source, owner)
/datum/brain_trauma/magic/stalker/on_lose()
QDEL_NULL(stalker)
@@ -125,3 +129,12 @@
desc = "It's coming closer..."
image_icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi'
image_state = "curseblob"
+
+// Heretic subtype that replaces the ghost guy with a stargazer
+/datum/brain_trauma/magic/stalker/cosmic
+ stalker_type = /obj/effect/client_image_holder/stalker_phantom/cosmic
+ random_gain = FALSE
+
+/obj/effect/client_image_holder/stalker_phantom/cosmic
+ image_icon = 'icons/mob/nonhuman-player/96x96eldritch_mobs.dmi'
+ image_state = "star_gazer"
diff --git a/code/datums/brain_damage/mild.dm b/code/datums/brain_damage/mild.dm
index ffdabc0adf70..81c589d33897 100644
--- a/code/datums/brain_damage/mild.dm
+++ b/code/datums/brain_damage/mild.dm
@@ -125,7 +125,7 @@
return ..()
/datum/brain_trauma/mild/healthy/on_life(seconds_per_tick, times_fired)
- owner.adjustStaminaLoss(-6 * seconds_per_tick) //no pain, no fatigue
+ owner.adjust_stamina_loss(-6 * seconds_per_tick) //no pain, no fatigue
/datum/brain_trauma/mild/healthy/on_lose()
owner.remove_status_effect(/datum/status_effect/grouped/screwy_hud/fake_healthy, type)
@@ -155,7 +155,7 @@
else if(SPT_PROB(1.5, seconds_per_tick))
to_chat(owner, span_warning("You feel a sudden weakness in your muscles!"))
- owner.adjustStaminaLoss(50)
+ owner.adjust_stamina_loss(50)
..()
/datum/brain_trauma/mild/muscle_spasms
@@ -217,7 +217,7 @@
word = copytext(word, 1, suffix_foundon)
word = html_decode(word)
- if(GLOB.most_common_words[LOWER_TEXT(word)])
+ if(GLOB.most_common_words_alphabetical[LOWER_TEXT(word)])
new_message += word + suffix
else
if(prob(30) && message_split.len > 2)
diff --git a/code/datums/brain_damage/phobia.dm b/code/datums/brain_damage/phobia.dm
index 4703750cd01f..3662fc74073f 100644
--- a/code/datums/brain_damage/phobia.dm
+++ b/code/datums/brain_damage/phobia.dm
@@ -4,21 +4,12 @@
scan_desc = "phobia"
gain_text = span_warning("You start finding default values very unnerving...")
lose_text = span_notice("You no longer feel afraid of default values.")
+ /// What do we fear exactly?
var/phobia_type
- /// Cooldown for proximity checks so we don't spam a range 7 view every two seconds.
- COOLDOWN_DECLARE(check_cooldown)
- /// Cooldown for freakouts to prevent permastunning.
- COOLDOWN_DECLARE(scare_cooldown)
-
- ///What mood event to apply when we see the thing & freak out.
- var/datum/mood_event/mood_event_type = /datum/mood_event/phobia
-
- var/regex/trigger_regex
- //instead of cycling every atom, only cycle the relevant types
- var/list/trigger_mobs
- var/list/trigger_objs //also checked in mob equipment
- var/list/trigger_turfs
- var/list/trigger_species
+ /// Specific terror handler to apply, in case we want
+ var/terror_handler = /datum/terror_handler/phobia_source
+ /// What mood event to apply when we see the thing & freak out.
+ var/mood_event_type = /datum/mood_event/phobia
/datum/brain_trauma/mild/phobia/New(new_phobia_type)
if(new_phobia_type)
@@ -30,132 +21,22 @@
gain_text = span_warning("You start finding [phobia_type] very unnerving...")
lose_text = span_notice("You no longer feel afraid of [phobia_type].")
scan_desc += " of [phobia_type]"
- trigger_regex = GLOB.phobia_regexes[phobia_type]
- trigger_mobs = GLOB.phobia_mobs[phobia_type]
- trigger_objs = GLOB.phobia_objs[phobia_type]
- trigger_turfs = GLOB.phobia_turfs[phobia_type]
- trigger_species = GLOB.phobia_species[phobia_type]
- ..()
-
-/datum/brain_trauma/mild/phobia/on_lose(silent)
- owner.clear_mood_event("phobia_[phobia_type]")
return ..()
-/datum/brain_trauma/mild/phobia/on_life(seconds_per_tick, times_fired)
- ..()
- if(HAS_TRAIT(owner, TRAIT_FEARLESS))
- return
- if(owner.is_blind())
- return
-
- if(!COOLDOWN_FINISHED(src, check_cooldown) || !COOLDOWN_FINISHED(src, scare_cooldown))
- return
-
- COOLDOWN_START(src, check_cooldown, 5 SECONDS)
- var/list/seen_atoms = view(7, owner)
- if(LAZYLEN(trigger_objs))
- for(var/obj/seen_item in seen_atoms)
- if(is_scary_item(seen_item))
- freak_out(seen_item)
- return
-
- if(LAZYLEN(trigger_turfs))
- for(var/turf/checked in seen_atoms)
- if(is_type_in_typecache(checked, trigger_turfs))
- freak_out(checked)
- return
-
- seen_atoms -= owner //make sure they aren't afraid of themselves.
- if(LAZYLEN(trigger_mobs) || LAZYLEN(trigger_species) || LAZYLEN(trigger_objs))
- for(var/mob/living/checked in seen_atoms)
- if (is_scary_mob(checked))
- freak_out(checked)
- return
-
-/// Returns true if this item should be scary to us
-/datum/brain_trauma/mild/phobia/proc/is_scary_item(obj/checked)
- if (QDELETED(checked) || !is_type_in_typecache(checked, trigger_objs) || checked.invisibility > owner.see_invisible)
- return FALSE
- if (!isitem(checked))
- return TRUE
- var/obj/item/checked_item = checked
- return !HAS_TRAIT(checked_item, TRAIT_EXAMINE_SKIP)
-
-/datum/brain_trauma/mild/phobia/proc/is_scary_mob(mob/living/checked)
- if(is_type_in_typecache(checked, trigger_mobs))
- return TRUE
-
- if (!ishuman(checked))
- return FALSE
-
- var/mob/living/carbon/human/as_human = checked
- if (LAZYLEN(trigger_species))
- if (is_type_in_typecache(as_human.dna?.species, trigger_species))
- return TRUE
-
- if (!LAZYLEN(trigger_objs))
- return FALSE
-
- for(var/obj/item/equipped as anything in as_human.get_visible_items())
- if(is_scary_item(equipped))
- return TRUE
-
- return FALSE
+/datum/brain_trauma/mild/phobia/on_gain()
+ . = ..()
+ var/datum/component/fearful/fear = owner.AddComponentFrom(REF(src), /datum/component/fearful, list(/datum/terror_handler/startle))
+ var/datum/terror_handler/phobia_source/phobia = fear.add_handler(terror_handler, REF(src))
+ phobia.trigger_regex = GLOB.phobia_regexes[phobia_type]
+ phobia.trigger_mobs = GLOB.phobia_mobs[phobia_type]
+ phobia.trigger_objs = GLOB.phobia_objs[phobia_type]
+ phobia.trigger_turfs = GLOB.phobia_turfs[phobia_type]
+ phobia.trigger_species = GLOB.phobia_species[phobia_type]
+ phobia.mood_event_type = mood_event_type
-/datum/brain_trauma/mild/phobia/handle_hearing(datum/source, list/hearing_args)
- if(!owner.can_hear() || owner == hearing_args[HEARING_SPEAKER] || !owner.has_language(hearing_args[HEARING_LANGUAGE])) //words can't trigger you if you can't hear them *taps head*
- return
-
- if(HAS_TRAIT(owner, TRAIT_FEARLESS) || !COOLDOWN_FINISHED(src, scare_cooldown))
- return
-
- if(trigger_regex.Find(hearing_args[HEARING_RAW_MESSAGE]) != 0)
- addtimer(CALLBACK(src, PROC_REF(freak_out), null, trigger_regex.group[2]), 1 SECONDS) //to react AFTER the chat message
- hearing_args[HEARING_RAW_MESSAGE] = trigger_regex.Replace(hearing_args[HEARING_RAW_MESSAGE], "[span_phobia("$2")]$3")
-
-/datum/brain_trauma/mild/phobia/handle_speech(datum/source, list/speech_args)
- if (HAS_TRAIT(owner, TRAIT_FEARLESS))
- return
- if (trigger_regex.Find(speech_args[SPEECH_MESSAGE]) == 0)
- return
-
- var/stutter = prob(50)
- var/whisper = prob(30)
-
- if (!stutter && !whisper)
- return
-
- if (whisper)
- speech_args[SPEECH_SPANS] |= SPAN_SMALL_VOICE
- if (stutter)
- owner.set_stutter_if_lower(4 SECONDS)
- to_chat(owner, span_warning("You struggle to say the word \"[span_phobia("[trigger_regex.group[2]]")]\"!"))
-
-/datum/brain_trauma/mild/phobia/proc/freak_out(atom/reason, trigger_word)
- if(owner.stat == DEAD)
- return
-
- var/message = pick("spooks you to the bone", "shakes you up", "terrifies you", "sends you into a panic", "sends chills down your spine")
- if(trigger_word)
- if (owner.has_status_effect(/datum/status_effect/minor_phobia_reaction))
- return
- to_chat(owner, span_userdanger("Hearing [span_phobia(trigger_word)] [message]!"))
- owner.apply_status_effect(/datum/status_effect/minor_phobia_reaction)
- return
-
- COOLDOWN_START(src, scare_cooldown, 12 SECONDS)
- if(mood_event_type)
- owner.add_mood_event("phobia_[phobia_type]", mood_event_type)
-
- if(reason)
- to_chat(owner, span_userdanger("Seeing [span_phobia(reason.name)] [message]!"))
- else
- to_chat(owner, span_userdanger("Something [message]!"))
-
- if(reason)
- owner.face_atom(reason)
- owner._pointed(reason)
- owner.apply_status_effect(/datum/status_effect/stacking/phobia_reaction, 1, mood_event_type)
+/datum/brain_trauma/mild/phobia/on_lose(silent)
+ . = ..()
+ owner.RemoveComponentSource(REF(src), /datum/component/fearful)
// Defined phobia types for badminry, not included in the RNG trauma pool to avoid diluting.
@@ -178,11 +59,7 @@
/datum/brain_trauma/mild/phobia/blood
phobia_type = "blood"
random_gain = FALSE
-
-/datum/brain_trauma/mild/phobia/blood/is_scary_item(obj/checked)
- if (GET_ATOM_BLOOD_DNA_LENGTH(checked))
- return TRUE
- return ..()
+ terror_handler = /datum/terror_handler/phobia_source/blood
/datum/brain_trauma/mild/phobia/clowns
phobia_type = "clowns"
diff --git a/code/datums/brain_damage/severe.dm b/code/datums/brain_damage/severe.dm
index 57cfae25cf5e..16289a58fe5b 100644
--- a/code/datums/brain_damage/severe.dm
+++ b/code/datums/brain_damage/severe.dm
@@ -204,7 +204,6 @@
scan_desc = "monophobia"
gain_text = span_warning("You feel really lonely...")
lose_text = span_notice("You feel like you could be safe on your own.")
- var/stress = 0
/datum/brain_trauma/severe/monophobia/on_gain()
. = ..()
@@ -356,7 +355,7 @@
stealables += potential_stealable
for(var/obj/item/stealable as anything in shuffle(stealables))
- if(!owner.CanReach(stealable, view_only = TRUE) || stealable.IsObscured())
+ if(!stealable.IsReachableBy(owner) || stealable.IsObscured())
continue
// Try to do a raw click on the item with one of our empty hands, to pick it up (duh)
owner.log_message("attempted to pick up (kleptomania)", LOG_ATTACK, color = "orange")
diff --git a/code/datums/brain_damage/special.dm b/code/datums/brain_damage/special.dm
index b27335ce3fb2..d5e5157c1c10 100644
--- a/code/datums/brain_damage/special.dm
+++ b/code/datums/brain_damage/special.dm
@@ -392,7 +392,7 @@
if(get_dist(owner, beepsky) <= 1)
owner.playsound_local(owner, 'sound/items/weapons/egloves.ogg', 50)
owner.visible_message(span_warning("[owner]'s body jerks as if it was shocked."), span_userdanger("You feel the fist of the LAW."))
- owner.adjustStaminaLoss(rand(40, 70))
+ owner.adjust_stamina_loss(rand(40, 70))
QDEL_NULL(beepsky)
if(prob(20) && get_dist(owner, beepsky) <= 8)
@@ -463,12 +463,14 @@
owner.add_mood_event("combat_ptsd", /datum/mood_event/desentized)
owner.mob_mood?.mood_modifier -= 1 //Basically nothing can change your mood
owner.mob_mood?.sanity_level = SANITY_DISTURBED //Makes sanity on a unstable level unless cured
+ ADD_TRAIT(owner, TRAIT_DESENSITIZED, REF(src))
. = ..()
/datum/brain_trauma/special/ptsd/on_lose()
owner.clear_mood_event("combat_ptsd")
owner.mob_mood?.mood_modifier += 1
owner.mob_mood?.sanity_level = SANITY_GREAT
+ REMOVE_TRAIT(owner, TRAIT_DESENSITIZED, REF(src))
return ..()
/datum/brain_trauma/special/primal_instincts
diff --git a/code/datums/brain_damage/split_personality.dm b/code/datums/brain_damage/split_personality.dm
index f1d58ccb3421..0fb56079a966 100644
--- a/code/datums/brain_damage/split_personality.dm
+++ b/code/datums/brain_damage/split_personality.dm
@@ -15,8 +15,6 @@
var/poll_role = "split personality"
///How long do we give ghosts to respond?
var/poll_time = 20 SECONDS
- ///The stranger_backseat does not have temp body component so we will ghostize() on_lose
- var/temp_component = FALSE
/datum/brain_trauma/severe/split_personality/on_gain()
var/mob/living/brain_owner = owner
@@ -43,7 +41,7 @@
/// Attempts to get a ghost to play the personality
/datum/brain_trauma/severe/split_personality/proc/get_ghost()
var/mob/chosen_one = SSpolling.poll_ghosts_for_target(
- question = "Do you want to play as [span_danger("[owner.real_name]'s")] [span_notice(poll_role)]?. You will be able to return to your original body after.",
+ question = "Do you want to play as [span_danger("[owner.real_name]'s")] [span_notice(poll_role)]?",
check_jobban = ROLE_PAI,
poll_time = poll_time,
checked_target = owner,
@@ -58,26 +56,11 @@
if(isnull(ghost))
qdel(src)
return
- if(ghost.mind.current)// if they previous had a body preserve them else that means they never had one or it was destroyed so assign ckey like normal
- stranger_backseat.AddComponent( \
- /datum/component/temporary_body, \
- old_mind = ghost.mind, \
- old_body = ghost.mind.current, \
- )
- temp_component = TRUE
-
stranger_backseat.PossessByPlayer(ghost.ckey)
stranger_backseat.log_message("became [key_name(owner)]'s split personality.", LOG_GAME)
message_admins("[ADMIN_LOOKUPFLW(stranger_backseat)] became [ADMIN_LOOKUPFLW(owner)]'s split personality.")
- owner_backseat.AddComponent( \
- /datum/component/temporary_body, \
- old_mind = owner.mind, \
- old_body = owner, \
- perma_body_attached = TRUE, \
- )
-
/datum/brain_trauma/severe/split_personality/on_life(seconds_per_tick, times_fired)
if(owner.stat == DEAD)
@@ -89,33 +72,72 @@
..()
/datum/brain_trauma/severe/split_personality/on_lose()
- // qdel the mob with the temporary component will ensure the original mind will go back into the body and vice versa for the stranger mind
- if(!temp_component)
- stranger_backseat?.ghostize()
+ if(current_controller != OWNER) //it would be funny to cure a guy only to be left with the other personality, but it seems too cruel
+ switch_personalities(TRUE)
QDEL_NULL(stranger_backseat)
QDEL_NULL(owner_backseat)
..()
-// Changes who controls the body
+
/datum/brain_trauma/severe/split_personality/proc/switch_personalities(reset_to_owner = FALSE)
if(QDELETED(owner) || QDELETED(stranger_backseat) || QDELETED(owner_backseat))
return
+ var/mob/living/split_personality/current_backseat
+ var/mob/living/split_personality/new_backseat
if(current_controller == STRANGER || reset_to_owner)
- //back seat to body and vice versa
- stranger_backseat.PossessByPlayer(owner.ckey)
- //logging
- owner_backseat.log_message("assumed control of [key_name(owner)] due to [src]. (Original owner: [stranger_backseat.key])", LOG_GAME)
- owner.PossessByPlayer(owner_backseat.ckey)
- to_chat(stranger_backseat, span_userdanger("You feel your control being taken away... your other personality is in charge now!"))
-
+ current_backseat = owner_backseat
+ new_backseat = stranger_backseat
else
- owner_backseat.PossessByPlayer(owner.ckey)
- stranger_backseat.log_message("assumed control of [key_name(owner)] due to [src]. (Original owner: [owner_backseat.key])", LOG_GAME)
- owner.PossessByPlayer(stranger_backseat.ckey)
- to_chat(owner_backseat, span_userdanger("You feel your control being taken away... your other personality is in charge now!"))
+ current_backseat = stranger_backseat
+ new_backseat = owner_backseat
+
+ if(!current_backseat.client) //Make sure we never switch to a logged off mob.
+ return
+
+ current_backseat.log_message("assumed control of [key_name(owner)] due to [src]. (Original owner: [current_controller == OWNER ? owner.key : current_backseat.key])", LOG_GAME)
+ to_chat(owner, span_userdanger("You feel your control being taken away... your other personality is in charge now!"))
+ to_chat(current_backseat, span_userdanger("You manage to take control of your body!"))
+
+ //Body to backseat
+
+ var/h2b_id = owner.computer_id
+ var/h2b_ip= owner.lastKnownIP
+ owner.computer_id = null
+ owner.lastKnownIP = null
+
+ new_backseat.ckey = owner.ckey
+
+ new_backseat.name = owner.name
+
+ if(owner.mind)
+ new_backseat.mind = owner.mind
+
+ if(!new_backseat.computer_id)
+ new_backseat.computer_id = h2b_id
+
+ if(!new_backseat.lastKnownIP)
+ new_backseat.lastKnownIP = h2b_ip
+
+ if(reset_to_owner && new_backseat.mind)
+ new_backseat.ghostize(FALSE)
+
+ //Backseat to body
+
+ var/s2h_id = current_backseat.computer_id
+ var/s2h_ip= current_backseat.lastKnownIP
+ current_backseat.computer_id = null
+ current_backseat.lastKnownIP = null
+
+ owner.ckey = current_backseat.ckey
+ owner.mind = current_backseat.mind
+
+ if(!owner.computer_id)
+ owner.computer_id = s2h_id
+
+ if(!owner.lastKnownIP)
+ owner.lastKnownIP = s2h_ip
- to_chat(owner, span_userdanger("You manage to take control of your body!"))
current_controller = !current_controller
@@ -141,6 +163,11 @@
trauma.switch_personalities()
qdel(trauma)
+ //if one of the two ghosts, the other one stays permanently
+ if(!body.client && trauma.initialized)
+ trauma.switch_personalities()
+ qdel(trauma)
+
..()
/mob/living/split_personality/Login()
@@ -155,7 +182,7 @@
to_chat(src, span_warning("You cannot speak, your other self is controlling your body!"))
return FALSE
-/mob/living/split_personality/emote(act, m_type = null, message = null, intentional = FALSE, force_silence = FALSE, forced = FALSE)
+/mob/living/split_personality/emote(act, type_override = NONE, message = null, intentional = FALSE, force_silence = FALSE, forced = FALSE)
return FALSE
///////////////BRAINWASHING////////////////////
@@ -194,7 +221,7 @@
/datum/brain_trauma/severe/split_personality/brainwashing/get_ghost()
set waitfor = FALSE
- var/mob/chosen_one = SSpolling.poll_ghosts_for_target("Do you want to play as [span_danger("[owner.real_name]'s")] brainwashed mind? You will be able to return to your original body after.", poll_time = 7.5 SECONDS, checked_target = stranger_backseat, alert_pic = owner, role_name_text = "brainwashed mind")
+ var/mob/chosen_one = SSpolling.poll_ghosts_for_target("Do you want to play as [span_danger("[owner.real_name]'s")] brainwashed mind?", poll_time = 7.5 SECONDS, checked_target = stranger_backseat, alert_pic = owner, role_name_text = "brainwashed mind")
if(chosen_one)
stranger_backseat.PossessByPlayer(chosen_one.ckey)
else
@@ -298,7 +325,7 @@
//too drunk to feel anything
//if they're to this point, they're likely dying of liver damage
//and not accounting for that, the split personality is temporary
- owner.adjustStaminaLoss(-25)
+ owner.adjust_stamina_loss(-25)
duration_in_seconds -= seconds_per_tick
/mob/living/split_personality/blackout
diff --git a/code/datums/chatmessage.dm b/code/datums/chatmessage.dm
index 6f0b45797719..cf555170b686 100644
--- a/code/datums/chatmessage.dm
+++ b/code/datums/chatmessage.dm
@@ -207,7 +207,7 @@
var/starting_height = target.maptext_height
// Translate any existing messages upwards, apply exponential decay factors to timers
message_loc = isturf(target) ? target : get_atom_on_turf(target)
- if (owned_by.seen_messages)
+ if (owned_by && owned_by.seen_messages)
var/idx = 1
var/combined_height = approx_lines
for(var/datum/chatmessage/m as anything in owned_by.seen_messages[message_loc])
@@ -270,7 +270,7 @@
message.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA | KEEP_APART
message.alpha = 0
message.pixel_z = starting_height
- message.pixel_w = -target.base_pixel_w
+ message.pixel_w = -message_loc.base_pixel_w
message.maptext_width = CHAT_MESSAGE_WIDTH
message.maptext_height = mheight * 1.25 // We add extra because some characters are superscript, like actions
message.maptext_x = (CHAT_MESSAGE_WIDTH - owner.bound_width) * -0.5
@@ -280,8 +280,9 @@
animate_lifespan = lifespan
// View the message
- LAZYADDASSOCLIST(owned_by.seen_messages, message_loc, src)
- owned_by.images |= message
+ if(owned_by)
+ LAZYADDASSOCLIST(owned_by.seen_messages, message_loc, src)
+ owned_by.images |= message
// Fade in
animate(message, alpha = 255, time = CHAT_MESSAGE_SPAWN_TIME)
diff --git a/code/datums/components/_component.dm b/code/datums/components/_component.dm
index 4b496da1b73b..5c93b9833f8f 100644
--- a/code/datums/components/_component.dm
+++ b/code/datums/components/_component.dm
@@ -457,6 +457,9 @@
var/c_type = target.type
qdel(target)
CRASH("Incompatible [c_type] transfer attempt to a [type]!")
+ if(COMPONENT_NOTRANSFER)
+ qdel(target)
+ return
AddComponent(target)
if(!QDELETED(target))
diff --git a/code/datums/components/anti_magic.dm b/code/datums/components/anti_magic.dm
index 29855ac6c476..014a89cf6c75 100644
--- a/code/datums/components/anti_magic.dm
+++ b/code/datums/components/anti_magic.dm
@@ -45,7 +45,6 @@
datum/callback/check_blocking,
)
-
var/atom/movable/movable = parent
if(!istype(movable))
return COMPONENT_INCOMPATIBLE
@@ -54,6 +53,7 @@
if(isitem(movable))
RegisterSignal(movable, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip))
RegisterSignal(movable, COMSIG_ITEM_DROPPED, PROC_REF(on_drop))
+ RegisterSignal(movable, COMSIG_ATOM_EXAMINE_TAGS, PROC_REF(get_examine_tags))
RegisterSignals(movable, list(COMSIG_ITEM_ATTACK, COMSIG_ITEM_ATTACK_ATOM), PROC_REF(on_attack))
compatible = TRUE
else if(ismob(movable))
@@ -95,6 +95,20 @@
SIGNAL_HANDLER
unregister_antimagic_signals(bucklee)
+/datum/component/anti_magic/proc/get_examine_tags(atom/source, mob/user, list/examine_list)
+ SIGNAL_HANDLER
+
+ if(antimagic_flags == ALL_MAGIC_RESISTANCE)
+ examine_list["magic-proof"] = "It is thoroughly shielded against all known forms of magic."
+ return
+
+ if(antimagic_flags & MAGIC_RESISTANCE)
+ examine_list["warded"] = "It possesses a general resistance to regular spells and magic."
+ if(antimagic_flags & MAGIC_RESISTANCE_MIND)
+ examine_list["telepathy-proof"] = "It appears to be insulated against telepathic or mental influence."
+ if(antimagic_flags & MAGIC_RESISTANCE_HOLY)
+ examine_list["blessed"] = "It is protected by a divine shield against unholy and dark forms of magic."
+
/datum/component/anti_magic/proc/on_equip(atom/movable/source, mob/equipper, slot)
SIGNAL_HANDLER
diff --git a/code/datums/components/appearance_on_aggro.dm b/code/datums/components/appearance_on_aggro.dm
index 143c0b260cdb..1cc9ef4f2109 100644
--- a/code/datums/components/appearance_on_aggro.dm
+++ b/code/datums/components/appearance_on_aggro.dm
@@ -65,13 +65,10 @@
/datum/component/appearance_on_aggro/proc/on_icon_state_updated(mob/living/source)
SIGNAL_HANDLER
- if (source.stat == DEAD)
- return
- source.icon_state = source.ai_controller?.blackboard_key_exists(target_key) ? aggro_state : initial(source.icon_state)
+ if (source.stat != DEAD)
+ source.icon_state = source.ai_controller?.blackboard_key_exists(target_key) ? aggro_state : initial(source.icon_state)
/datum/component/appearance_on_aggro/proc/on_overlays_updated(mob/living/basic/source, list/overlays)
SIGNAL_HANDLER
-
- if(!(source.ai_controller?.blackboard_key_exists(target_key)))
- return
- overlays += aggro_overlay
+ if(source.ai_controller?.blackboard_key_exists(target_key) && source.stat != DEAD)
+ overlays += aggro_overlay
diff --git a/code/datums/components/aquarium.dm b/code/datums/components/aquarium.dm
index 314b34bfe13e..5e22047744fb 100644
--- a/code/datums/components/aquarium.dm
+++ b/code/datums/components/aquarium.dm
@@ -388,15 +388,15 @@
for(var/obj/item/fish/fish_type as anything in types_to_mate_with)
var/list/type_fishes = tracked_fish_by_type[fish_type]
- if(length(type_fishes) >= initial(fish_type.stable_population))
+ if(length(type_fishes) >= fish_type::stable_population)
continue
candidates += type_fishes
///Check if an offspring of two fish (or one if self-reproducing) can evolve.
/datum/component/aquarium/proc/check_evolution(atom/movable/source, obj/item/fish/fish, obj/item/fish/mate, datum/fish_evolution/evolution)
SIGNAL_HANDLER
- //chances are halved if only one parent has this evolution.
- var/real_probability = (mate && (evolution.type in mate.evolution_types)) ? evolution.probability : evolution.probability * 0.5
+ //chances are halved if it isn't asexual reproduction and one parent doesn't have the evolution.
+ var/real_probability = (isnull(mate) || (evolution.type in mate.evolution_types)) ? evolution.probability : evolution.probability * 0.5
if(HAS_TRAIT(fish, TRAIT_FISH_MUTAGENIC) || (mate && HAS_TRAIT(mate, TRAIT_FISH_MUTAGENIC)))
real_probability *= 3
if(!prob(real_probability))
@@ -697,6 +697,8 @@
check_fluid_and_temperature(fish)
/datum/component/aquarium/proc/admire(atom/movable/source, mob/living/user)
+ if(!isliving(user))
+ return
source.balloon_alert(user, "admiring aquarium...")
if(!do_after(user, 5 SECONDS, target = source))
return
diff --git a/code/datums/components/area_sound_manager.dm b/code/datums/components/area_sound_manager.dm
index 8dfb7895699d..f712fc8043b3 100644
--- a/code/datums/components/area_sound_manager.dm
+++ b/code/datums/components/area_sound_manager.dm
@@ -43,7 +43,7 @@
/datum/component/area_sound_manager/proc/react_to_z_move(datum/source, turf/old_turf, turf/new_turf)
SIGNAL_HANDLER
- if(!length(accepted_zs) || (new_turf.z in accepted_zs))
+ if(!length(accepted_zs) || (new_turf?.z in accepted_zs))
return
qdel(src)
diff --git a/code/datums/components/atom_mounted.dm b/code/datums/components/atom_mounted.dm
new file mode 100644
index 000000000000..12d73e1ae240
--- /dev/null
+++ b/code/datums/components/atom_mounted.dm
@@ -0,0 +1,168 @@
+// This element should be applied to wall-mounted machines/structures, so that if the support structure it's "hanging" from is broken or deconstructed, the wall-hung structure will deconstruct.
+/datum/component/atom_mounted
+ /// The closed turf our object is currently linked to.
+ var/atom/hanging_support_atom
+
+/datum/component/atom_mounted/Initialize(target_structure, on_drop_callback)
+ . = ..()
+ if(!isobj(parent))
+ return COMPONENT_INCOMPATIBLE
+ hanging_support_atom = target_structure
+ RegisterSignal(hanging_support_atom, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine))
+ if(isclosedturf(hanging_support_atom))
+ RegisterSignal(hanging_support_atom, COMSIG_TURF_CHANGE, PROC_REF(on_turf_changing))
+ else
+ RegisterSignal(hanging_support_atom, COMSIG_QDELETING, PROC_REF(on_structure_delete))
+
+/datum/component/atom_mounted/RegisterWithParent()
+ ADD_TRAIT(parent, TRAIT_WALLMOUNTED, REF(src))
+ RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(on_move))
+
+/datum/component/atom_mounted/UnregisterFromParent()
+ REMOVE_TRAIT(parent, TRAIT_WALLMOUNTED, REF(src))
+ UnregisterSignal(parent, COMSIG_MOVABLE_MOVED)
+
+/datum/component/atom_mounted/Destroy(force)
+ UnregisterSignal(hanging_support_atom, list(COMSIG_ATOM_EXAMINE))
+ if(isclosedturf(hanging_support_atom))
+ UnregisterSignal(hanging_support_atom, COMSIG_TURF_CHANGE)
+ else
+ UnregisterSignal(hanging_support_atom, COMSIG_QDELETING)
+ hanging_support_atom = null
+ return ..()
+
+/**
+ * When the wall is examined, explains that it's supporting the linked object.
+ */
+/datum/component/atom_mounted/proc/on_examine(datum/source, mob/user, list/examine_list)
+ SIGNAL_HANDLER
+
+ if (parent in view(user.client?.view || world.view, user))
+ examine_list += span_notice("\The [hanging_support_atom] is currently supporting [span_bold("[parent]")]. Deconstruction or excessive damage would cause it to [span_bold("fall to the ground")].")
+
+/// When the type of turf changes, if it is changing into a floor we should drop our contents
+/datum/component/atom_mounted/proc/on_turf_changing(datum/source, path, new_baseturfs, flags, post_change_callbacks)
+ SIGNAL_HANDLER
+
+ if(ispath(path, /turf/open))
+ drop_wallmount()
+
+/datum/component/atom_mounted/proc/on_structure_delete(datum/source, force)
+ SIGNAL_HANDLER
+
+ drop_wallmount()
+
+/// If we get dragged from our wall (by a singulo for instance) we should deconstruct
+/datum/component/atom_mounted/proc/on_move(datum/source, atom/old_loc, dir, forced, list/old_locs)
+ SIGNAL_HANDLER
+ // If we're having our lighting messed with we're likely to get dragged about
+ // That shouldn't lead to a decon
+ if(HAS_TRAIT(parent, TRAIT_LIGHTING_DEBUGGED))
+ return
+ drop_wallmount()
+
+/**
+ * Handles the dropping of the linked object. This is done via deconstruction, as that should be the most sane way to handle it for most objects.
+ * Except for intercoms, which are handled by creating a new wallframe intercom, as they're apparently items.
+*/
+/datum/component/atom_mounted/proc/drop_wallmount()
+ PRIVATE_PROC(TRUE)
+
+ var/obj/hanging_parent = parent
+ hanging_parent.visible_message(message = span_warning("\The [hanging_parent] falls apart!"), vision_distance = 5)
+ hanging_parent.deconstruct(FALSE)
+
+
+/// Returns a list of potential turfs to mount on. This should not check if those turfs are valid but only locate them
+/obj/proc/get_turfs_to_mount_on()
+ PROTECTED_PROC(TRUE)
+ RETURN_TYPE(/list/turf)
+
+ //Infer using icon offsets. Can support diagonal mounting
+ var/pixel_direction = NONE
+ if(pixel_x > (ICON_SIZE_X / 2))
+ pixel_direction |= EAST
+ else if(pixel_x < -(ICON_SIZE_X / 2))
+ pixel_direction |= WEST
+ if(pixel_y > (ICON_SIZE_Y / 2))
+ pixel_direction |= NORTH
+ else if(pixel_y < -(ICON_SIZE_Y / 2))
+ pixel_direction |= SOUTH
+
+ . = list()
+ if(pixel_direction != NONE)
+ . += get_step(src, pixel_direction)
+ . += get_turf(src)
+
+/**
+ * Checks if our object can mount on this turf
+ *
+ * Arguments
+ * * turf/target - the turf we are trying to mount on
+*/
+/obj/proc/is_mountable_turf(turf/target)
+ PROTECTED_PROC(TRUE)
+ SHOULD_BE_PURE(TRUE)
+
+ return isclosedturf(target)
+
+/// Returns an list of object types we can mount on if the turf is unmountable
+/obj/proc/get_moutable_objects()
+ PROTECTED_PROC(TRUE)
+ SHOULD_BE_PURE(TRUE)
+ RETURN_TYPE(/list/obj)
+
+ var/static/list/obj/attachables = list(
+ /obj/structure/table,
+ /obj/structure/window,
+ /obj/structure/fence,
+ /obj/structure/falsewall,
+ )
+
+ return attachables
+
+/**
+ * Finds an support atom to hang this object on. If you need to mount the object on Late Initialize
+ * then pass TRUE inside Initialize() but not in LateInitialize().
+ * The flag is only applied if no support atom could be found during Initialize() as a last resort
+ *
+ * Arguments
+ * * mark_for_late_init - if TRUE will apply the MOUNT_ON_LATE_INITIALIZE which gets cleared on every call
+ * * late_init - should only be passed as TRUE from inside LateInitialize()
+*/
+/obj/proc/find_and_mount_on_atom(mark_for_late_init = FALSE, late_init = FALSE)
+ if(obj_flags & MOUNT_ON_LATE_INITIALIZE)
+ obj_flags &= ~MOUNT_ON_LATE_INITIALIZE
+ else if(late_init)
+ return TRUE
+
+ var/area/location = get_area(src)
+ if(!isarea(location) || istype(location, /area/shuttle))
+ return FALSE
+
+ var/msg
+ if(PERFORM_ALL_TESTS(focus_only/atom_mounted) && !mark_for_late_init)
+ msg = "[type] Could not find attachable object at [location.type] "
+
+ var/list/turf/attachable_turfs = get_turfs_to_mount_on()
+ for(var/turf/target as anything in attachable_turfs)
+ var/atom/attachable_atom
+ if(is_mountable_turf(target))
+ attachable_atom = target //your usual wallmount
+ else
+ var/list/obj/attachables = get_moutable_objects()
+ for(var/obj/attachable in target)
+ if(is_type_in_list(attachable, attachables))
+ attachable_atom = attachable
+ break
+ if(attachable_atom)
+ AddComponent(/datum/component/atom_mounted, attachable_atom)
+ return TRUE
+ if(msg)
+ msg += "([target.x],[target.y],[target.z]) "
+ if(msg)
+ stack_trace(msg)
+
+ if(mark_for_late_init)
+ obj_flags |= MOUNT_ON_LATE_INITIALIZE
+ return FALSE
diff --git a/code/datums/components/aura_healing.dm b/code/datums/components/aura_healing.dm
index e71a06de2fb2..93d9c62c08f2 100644
--- a/code/datums/components/aura_healing.dm
+++ b/code/datums/components/aura_healing.dm
@@ -44,6 +44,9 @@
/// The color to give the healing visual
var/healing_color = COLOR_GREEN
+ /// If the aura also heals the owner of the component
+ var/self_heal = TRUE
+
/// A list of being healed to active alerts
var/list/mob/living/current_alerts = list()
@@ -64,6 +67,7 @@
simple_heal = 0,
limit_to_trait = null,
healing_color = COLOR_GREEN,
+ self_heal = TRUE,
)
if (!isatom(parent))
return COMPONENT_INCOMPATIBLE
@@ -83,6 +87,7 @@
src.simple_heal = simple_heal
src.limit_to_trait = limit_to_trait
src.healing_color = healing_color
+ src.self_heal = self_heal
/datum/component/aura_healing/Destroy(force)
STOP_PROCESSING(SSaura, src)
@@ -115,26 +120,25 @@
for (var/mob/living/candidate as anything in to_heal)
if (!current_alerts[candidate])
- var/atom/movable/screen/alert/aura_healing/alert = candidate.throw_alert(alert_category, /atom/movable/screen/alert/aura_healing, new_master = parent)
- alert.desc = "You are being healed by [parent]."
+ candidate.throw_alert(alert_category, /atom/movable/screen/alert/aura_healing, new_master = parent)
current_alerts[candidate] = TRUE
if (should_show_effect && candidate.health < candidate.maxHealth)
new /obj/effect/temp_visual/heal(get_turf(candidate), healing_color)
if (iscarbon(candidate) || issilicon(candidate) || isbasicmob(candidate))
- candidate.adjustBruteLoss(-brute_heal * seconds_per_tick, updating_health = FALSE)
- candidate.adjustFireLoss(-burn_heal * seconds_per_tick, updating_health = FALSE)
+ candidate.adjust_brute_loss(-brute_heal * seconds_per_tick, updating_health = FALSE)
+ candidate.adjust_fire_loss(-burn_heal * seconds_per_tick, updating_health = FALSE)
if (iscarbon(candidate))
// Toxin healing is forced for slime people
- candidate.adjustToxLoss(-toxin_heal * seconds_per_tick, updating_health = FALSE, forced = TRUE)
+ candidate.adjust_tox_loss(-toxin_heal * seconds_per_tick, updating_health = FALSE, forced = TRUE)
- candidate.adjustOxyLoss(-suffocation_heal * seconds_per_tick, updating_health = FALSE)
- candidate.adjustStaminaLoss(-stamina_heal * seconds_per_tick, updating_stamina = FALSE)
+ candidate.adjust_oxy_loss(-suffocation_heal * seconds_per_tick, updating_health = FALSE)
+ candidate.adjust_stamina_loss(-stamina_heal * seconds_per_tick, updating_stamina = FALSE)
for (var/organ in organ_healing)
- candidate.adjustOrganLoss(organ, -organ_healing[organ] * seconds_per_tick)
+ candidate.adjust_organ_loss(organ, -organ_healing[organ] * seconds_per_tick)
var/mob/living/carbon/carbidate = candidate
for(var/datum/wound/iter_wound as anything in carbidate.all_wounds)
iter_wound.adjust_blood_flow(-wound_clotting * seconds_per_tick)
@@ -146,8 +150,7 @@
var/mob/living/basic/basic_candidate = candidate
basic_candidate.adjust_health(-simple_heal * seconds_per_tick, updating_health = FALSE)
- if (candidate.blood_volume < BLOOD_VOLUME_NORMAL)
- candidate.blood_volume += blood_heal * seconds_per_tick
+ candidate.adjust_blood_volume(blood_heal * seconds_per_tick, maximum = BLOOD_VOLUME_NORMAL)
candidate.updatehealth()
@@ -158,5 +161,12 @@
/atom/movable/screen/alert/aura_healing
name = "Aura Healing"
icon_state = "template"
+ use_user_hud_icon = TRUE
+ clickable_glow = TRUE
+ click_master = FALSE
+
+/atom/movable/screen/alert/aura_healing/update_desc(updates)
+ . = ..()
+ desc = "You are being healed by [master_ref?.resolve()]."
#undef HEAL_EFFECT_COOLDOWN
diff --git a/code/datums/components/bakeable.dm b/code/datums/components/bakeable.dm
index 70234236ce47..f43b4fc162b9 100644
--- a/code/datums/components/bakeable.dm
+++ b/code/datums/components/bakeable.dm
@@ -37,8 +37,8 @@
var/atom/result = new bake_result
if(!item_target.compare_materials(result))
var/warning = "custom_materials of [result.type] when baked compared to just spawned don't match"
- var/what_it_should_be = item_target.get_materials_english_list()
- stack_trace("[warning]. custom_materials should be [what_it_should_be].")
+ var/what_it_should_be = item_target.transcribe_materials_list()
+ stack_trace("[warning]. should be: custom_materials = [what_it_should_be].")
qdel(result)
// Inherit the new values passed to the component
diff --git a/code/datums/components/blob_minion.dm b/code/datums/components/blob_minion.dm
index 75eee8410d25..b6db9de6c36d 100644
--- a/code/datums/components/blob_minion.dm
+++ b/code/datums/components/blob_minion.dm
@@ -49,6 +49,8 @@
RegisterSignal(overmind, COMSIG_QDELETING, PROC_REF(overmind_deleted))
RegisterSignal(overmind, COMSIG_BLOB_SELECTED_STRAIN, PROC_REF(strain_properties_changed))
strain_properties_changed(overmind, overmind.blobstrain)
+ var/mob/living_parent = parent
+ living_parent.pass_flags |= PASSBLOB
/// Our overmind is gone, uh oh!
/datum/component/blob_minion/proc/overmind_deleted()
@@ -70,7 +72,6 @@
/datum/component/blob_minion/RegisterWithParent()
var/mob/living/living_parent = parent
- living_parent.pass_flags |= PASSBLOB
living_parent.faction |= ROLE_BLOB
ADD_TRAIT(parent, TRAIT_BLOB_ALLY, REF(src))
remove_verb(parent, /mob/living/verb/pulled) // No dragging people into the blob
@@ -113,6 +114,7 @@
COMSIG_HOSTILE_PRE_ATTACKINGTARGET,
))
GLOB.blob_telepathy_mobs -= parent
+ living_parent.pass_flags &= ~PASSBLOB
/// Become blobpilled when we gain a mind
/datum/component/blob_minion/proc/on_mind_init(mob/living/minion, datum/mind/new_mind)
@@ -152,9 +154,9 @@
/datum/component/blob_minion/proc/on_burned(mob/living/minion, exposed_temperature, exposed_volume)
SIGNAL_HANDLER
if(isnull(exposed_temperature))
- minion.adjustFireLoss(5)
+ minion.adjust_fire_loss(5)
return
- minion.adjustFireLoss(clamp(0.01 * exposed_temperature, 1, 5))
+ minion.adjust_fire_loss(clamp(0.01 * exposed_temperature, 1, 5))
/// Someone is attempting to move through us, allow it if it is a blob tile
/datum/component/blob_minion/proc/on_attempted_pass(mob/living/minion, atom/movable/incoming)
diff --git a/code/datums/components/boomerang.dm b/code/datums/components/boomerang.dm
index e41917a2b104..82a189985bc5 100644
--- a/code/datums/components/boomerang.dm
+++ b/code/datums/components/boomerang.dm
@@ -85,7 +85,7 @@
/datum/component/boomerang/proc/aerodynamic_swing(datum/thrownthing/throwingdatum)
var/mob/thrown_by = throwingdatum?.get_thrower()
var/obj/item/true_parent = parent
- if(thrown_by)
+ if(istype(thrown_by))
addtimer(CALLBACK(true_parent, TYPE_PROC_REF(/atom/movable, throw_at), thrown_by, boomerang_throw_range, throwingdatum.speed, thrown_by, TRUE), 0.1 SECONDS)
COOLDOWN_START(src, last_boomerang_throw, BOOMERANG_REBOUND_INTERVAL)
true_parent.visible_message(
diff --git a/code/datums/components/boss_music.dm b/code/datums/components/boss_music.dm
index a5d2de4c8d59..3d7bdf896bf8 100644
--- a/code/datums/components/boss_music.dm
+++ b/code/datums/components/boss_music.dm
@@ -12,15 +12,12 @@
///List of callback timers, used to clear out mobs listening to boss music after `track_duration`.
var/list/music_callbacks = list()
-/datum/component/boss_music/Initialize(
- boss_track,
- track_duration,
-)
+/datum/component/boss_music/Initialize(boss_track)
. = ..()
if(!ishostile(parent))
return COMPONENT_INCOMPATIBLE
src.boss_track = boss_track
- src.track_duration = track_duration
+ track_duration = SSsounds.get_sound_length(boss_track)
/datum/component/boss_music/Destroy(force)
. = ..()
diff --git a/code/datums/components/breeding.dm b/code/datums/components/breeding.dm
index 6c323ed835d3..328d7ae18572 100644
--- a/code/datums/components/breeding.dm
+++ b/code/datums/components/breeding.dm
@@ -2,17 +2,17 @@
* A component to allow us to breed
*/
/datum/component/breed
- /// additional mobs we can breed with
+ /// Additional mobs we can breed with
var/list/can_breed_with
- ///weighted list of the possible baby types
+ /// Weighted list of the possible baby types
var/list/baby_paths
- ///time to wait after breeding
+ /// Time to wait after breeding
var/breed_timer
- ///AI key we set when we're ready to breed
+ /// AI key we set when we're ready to breed
var/breed_key = BB_BREED_READY
- ///are we ready to breed?
+ /// Are we ready to breed?
var/ready_to_breed = TRUE
- ///callback after we give birth to the child
+ /// Callback after we give birth to the child
var/datum/callback/post_birth
/datum/component/breed/Initialize(list/can_breed_with = list(), breed_timer = 40 SECONDS, baby_paths = list(), post_birth)
@@ -44,13 +44,15 @@
REMOVE_TRAIT(parent, TRAIT_MOB_BREEDER, REF(src))
post_birth = null
-
/datum/component/breed/proc/breed_with_partner(mob/living/source, mob/living/target)
SIGNAL_HANDLER
if(source.combat_mode)
return
+ if(!ismob(target))
+ return
+
if(source.client || target.client)
return
diff --git a/code/datums/components/caltrop.dm b/code/datums/components/caltrop.dm
index cd06bdb2a00d..43b52abb0172 100644
--- a/code/datums/components/caltrop.dm
+++ b/code/datums/components/caltrop.dm
@@ -104,6 +104,8 @@
if(HAS_TRAIT(digitigrade_fan, TRAIT_LIGHT_STEP))
damage *= 0.75
+ if(flags & CALTROP_ANTS && HAS_TRAIT(digitigrade_fan, TRAIT_SPACE_ANT_IMMUNITY))
+ damage = 0
if(!(flags & CALTROP_SILENT) && !digitigrade_fan.has_status_effect(/datum/status_effect/caltropped))
digitigrade_fan.apply_status_effect(/datum/status_effect/caltropped)
diff --git a/code/datums/components/can_flash_from_behind.dm b/code/datums/components/can_flash_from_behind.dm
index c443d160dfbd..f375df20c988 100644
--- a/code/datums/components/can_flash_from_behind.dm
+++ b/code/datums/components/can_flash_from_behind.dm
@@ -10,10 +10,10 @@
return COMPONENT_INCOMPATIBLE
/datum/component/can_flash_from_behind/RegisterWithParent()
- RegisterSignal(parent, COMSIG_MOB_PRE_FLASHED_CARBON, PROC_REF(on_pre_flashed_carbon))
+ RegisterSignal(parent, COMSIG_MOB_PRE_FLASHED_MOB, PROC_REF(on_pre_flashed_carbon))
/datum/component/can_flash_from_behind/UnregisterFromParent()
- UnregisterSignal(parent, COMSIG_MOB_PRE_FLASHED_CARBON)
+ UnregisterSignal(parent, COMSIG_MOB_PRE_FLASHED_MOB)
/datum/component/can_flash_from_behind/proc/on_pre_flashed_carbon(source, flashed, flash, deviation)
SIGNAL_HANDLER
diff --git a/code/datums/components/chasm.dm b/code/datums/components/chasm.dm
index 7ce66b86c1ac..71bb1d28c53a 100644
--- a/code/datums/components/chasm.dm
+++ b/code/datums/components/chasm.dm
@@ -42,6 +42,7 @@
RegisterSignal(parent, SIGNAL_ADDTRAIT(TRAIT_CHASM_STOPPED), PROC_REF(on_chasm_stopped))
RegisterSignal(parent, SIGNAL_REMOVETRAIT(TRAIT_CHASM_STOPPED), PROC_REF(on_chasm_no_longer_stopped))
target_turf = target
+ ADD_TRAIT(parent, TRAIT_AI_AVOID_TURF, REF(src))
RegisterSignal(parent, COMSIG_ATOM_ABSTRACT_ENTERED, PROC_REF(entered))
RegisterSignal(parent, COMSIG_ATOM_ABSTRACT_EXITED, PROC_REF(exited))
RegisterSignal(parent, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON, PROC_REF(initialized_on))
@@ -53,6 +54,7 @@
parent.AddComponent(/datum/component/fishing_spot, GLOB.preset_fish_sources[/datum/fish_source/chasm])
/datum/component/chasm/UnregisterFromParent()
+ REMOVE_TRAIT(parent, TRAIT_AI_AVOID_TURF, REF(src))
storage = null
/datum/component/chasm/proc/entered(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs)
@@ -161,16 +163,29 @@
if(isliving(dropped_thing))
var/mob/living/fallen = dropped_thing
fallen.Paralyze(100)
- fallen.adjustBruteLoss(30)
+ fallen.adjust_brute_loss(30)
falling_atoms -= falling_ref
return
// send to oblivion
- dropped_thing.visible_message(span_boldwarning("[dropped_thing] falls into [parent]!"), span_userdanger("[oblivion_message]"))
+
if (isliving(dropped_thing))
var/mob/living/falling_mob = dropped_thing
ADD_TRAIT(falling_mob, TRAIT_NO_TRANSFORM, REF(src))
- falling_mob.Paralyze(20 SECONDS)
+ falling_mob.Stun(20 SECONDS, ignore_canstun = TRUE)
+
+ if (HAS_MIND_TRAIT(falling_mob, TRAIT_NAIVE))
+ falling_mob.do_alert_animation()
+ dropped_thing.visible_message(span_boldwarning("[dropped_thing] kicks [dropped_thing.p_their()] legs in the air, as if running in place!"))
+ dropped_thing.Shake(1, 0, 2 SECONDS, 0.3 SECONDS)
+ sleep(3 SECONDS)
+
+ if (get_turf(falling_mob) != get_turf(parent))
+ REMOVE_TRAIT(falling_mob, TRAIT_NO_TRANSFORM, REF(src))
+ falling_mob.Paralyze(17 SECONDS, ignore_canstun = TRUE) // Wow nice job
+ return
+
+ dropped_thing.visible_message(span_boldwarning("[dropped_thing] falls into [parent]!"), span_userdanger("[oblivion_message]"))
var/oldtransform = dropped_thing.transform
var/oldcolor = dropped_thing.color
diff --git a/code/datums/components/connect_inventory.dm b/code/datums/components/connect_inventory.dm
index c2e688171b43..2322c3ed9d71 100644
--- a/code/datums/components/connect_inventory.dm
+++ b/code/datums/components/connect_inventory.dm
@@ -32,7 +32,7 @@
/datum/component/connect_inventory/proc/update_signals()
unregister_signals()
- for(var/obj/item/item as anything in tracked.get_equipped_items(INCLUDE_POCKETS | INCLUDE_HELD))
+ for(var/obj/item/item as anything in tracked.get_equipped_items(INCLUDE_POCKETS|INCLUDE_HELD|INCLUDE_PROSTHETICS|INCLUDE_ABSTRACT))
if(!(allowed_slots & tracked.get_slot_by_item(item)))
continue
RegisterSignal(item, COMSIG_ITEM_DROPPED, PROC_REF(on_unequipped_item))
@@ -40,7 +40,7 @@
parent.RegisterSignal(item, signal, connections[signal])
/datum/component/connect_inventory/proc/unregister_signals()
- for(var/obj/item/item as anything in tracked.get_equipped_items(INCLUDE_POCKETS | INCLUDE_HELD))
+ for(var/obj/item/item as anything in tracked.get_equipped_items(INCLUDE_POCKETS|INCLUDE_HELD|INCLUDE_PROSTHETICS|INCLUDE_ABSTRACT))
UnregisterSignal(item, COMSIG_ITEM_DROPPED)
parent.UnregisterSignal(item, connections)
diff --git a/code/datums/components/crafting/_recipes.dm b/code/datums/components/crafting/_recipes.dm
index 86b5d095a55a..86a4a38d490c 100644
--- a/code/datums/components/crafting/_recipes.dm
+++ b/code/datums/components/crafting/_recipes.dm
@@ -26,6 +26,8 @@
var/list/parts = list()
///items, structures and machineries of types that are in this list won't transfer their materials to the result
var/list/requirements_mats_blacklist
+ ///if set, the materials in this list and their values will be subtracted from the result.
+ var/list/removed_mats
///like tool_behaviors but for reagents
var/list/chem_catalysts = list()
///where it shows up in the crafting UI
@@ -102,9 +104,9 @@
src.reqs[material] = stack_recipe.req_amount
src.category = stack_recipe.category || CAT_MISC
src.placement_checks = stack_recipe.placement_checks
+ src.crafting_flags = stack_recipe.crafting_flags
- if(!(stack_recipe.crafting_flags & CRAFT_APPLIES_MATS))
- requirements_mats_blacklist = list(material) //the item is not intended to have mats :shrug:
+ src.removed_mats = stack_recipe.removed_mats
/**
* Run custom pre-craft checks for this recipe, don't add feedback messages in this because it will spam the client
@@ -122,3 +124,8 @@
/// Additional UI data to be passed to the crafting UI for this recipe
/datum/crafting_recipe/proc/crafting_ui_data()
return list()
+
+// DARKPACK EDIT ADD START
+/datum/crafting_recipe/proc/is_recipe_available(mob/user)
+ return TRUE
+// DARKPACK EDIT ADD END
diff --git a/code/datums/components/crafting/chemistry.dm b/code/datums/components/crafting/chemistry.dm
index 7f7d5136e836..dd21976be474 100644
--- a/code/datums/components/crafting/chemistry.dm
+++ b/code/datums/components/crafting/chemistry.dm
@@ -42,6 +42,7 @@
)
time = 5 SECONDS
category = CAT_CHEMISTRY
+ crafting_flags = parent_type::crafting_flags | CRAFT_SKIP_MATERIALS_PARITY //there are two ways to make a chem bombcore. We go with the first one for mats check
/datum/crafting_recipe/alcohol_burner
name = "Burner (Ethanol)"
diff --git a/code/datums/components/crafting/containers.dm b/code/datums/components/crafting/containers.dm
index 6062da2ef55d..f3a22cd2f6e2 100644
--- a/code/datums/components/crafting/containers.dm
+++ b/code/datums/components/crafting/containers.dm
@@ -27,8 +27,9 @@
/obj/item/stack/sheet/mineral/bamboo = 20
)
result = /obj/item/storage/basket
+ crafting_flags = CRAFT_SKIP_MATERIALS_PARITY
category = CAT_CONTAINERS
- crafting_flags = parent_type::crafting_flags | CRAFT_MUST_BE_LEARNED
+ crafting_flags = parent_type::crafting_flags | CRAFT_MUST_BE_LEARNED | CRAFT_SKIP_MATERIALS_PARITY
steps = list(
"master the art of underwater basketweaving",
"be underwater"
diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm
index 53e1fbe600d6..ffa069c3e7e6 100644
--- a/code/datums/components/crafting/crafting.dm
+++ b/code/datums/components/crafting/crafting.dm
@@ -238,7 +238,7 @@
var/mob/living/carbon/human/human_crafter
if(ishuman(crafter))
human_crafter = crafter
- recipe_time = recipe_time * human_crafter.st_stat_multiplier(STAT_CRAFTS)
+ recipe_time = recipe_time / human_crafter.st_get_stat(STAT_CRAFTS)
// DARKPACK EDIT ADD END
if(!do_after(crafter, round(recipe_time, 0.1 SECONDS), target = crafter))
@@ -251,15 +251,30 @@
//used to gather the material composition of the utilized requirements to transfer to the result
var/list/total_materials = list()
var/list/stuff_to_use = get_used_reqs(recipe, crafter, total_materials)
+
+ for(var/mat in recipe.removed_mats)
+ var/to_remove = recipe.removed_mats[mat]
+ var/datum/material/ref_mat = locate(mat) in total_materials
+ if(!ref_mat)
+ continue
+ if(total_materials[ref_mat] < to_remove)
+ total_materials -= ref_mat
+ else
+ total_materials[ref_mat] -= to_remove
+
var/atom/result
var/turf/craft_turf = get_turf(crafter.loc)
- var/set_materials = TRUE
+ var/set_materials = !(recipe.crafting_flags & CRAFT_NO_MATERIALS)
if(ispath(recipe.result, /turf))
result = craft_turf.place_on_top(recipe.result)
else if(ispath(recipe.result, /obj/item/stack))
+ var/res_amount = recipe.result_amount || 1
//we don't merge the stack right away but try to put it in the hand of the crafter
- result = new recipe.result(craft_turf, recipe.result_amount || 1, /*merge =*/FALSE)
- set_materials = FALSE //stacks are bit too complex for it for now, but you're free to change that.
+ if(set_materials)
+ result = new recipe.result(craft_turf, res_amount, /*merge =*/ FALSE, /*mat_override =*/ total_materials, /*mat_amt =*/ 1 / res_amount)
+ set_materials = FALSE //We've already set the materials on init. Don't do it again
+ else
+ result = new recipe.result(craft_turf, res_amount, FALSE)
else
result = new recipe.result(craft_turf)
if(result.atom_storage && recipe.delete_contents)
@@ -379,21 +394,21 @@
if(recipe.structures)
requirements += recipe.structures
+ var/list/surroundings = get_environment(atom, recipe.blacklist)
for(var/path_key in requirements)
- var/list/surroundings
var/amount = recipe.reqs?[path_key] || recipe.machinery?[path_key] || recipe.structures?[path_key]
if(!amount)//since machinery & structures can have 0 aka CRAFTING_MACHINERY_USE - i.e. use it, don't consume it!
continue
- surroundings = get_environment(atom, recipe.blacklist)
- surroundings -= return_list
if(ispath(path_key, /datum/reagent))
if(!holder)
holder = new(INFINITY, NO_REACT) //an infinite volume holder than can store reagents without reacting
return_list += holder
+ var/list/checked = list()
while(amount > 0)
- var/obj/item/reagent_containers/container = locate() in surroundings
+ var/obj/item/reagent_containers/container = locate() in ((surroundings | return_list) - checked)
if(isnull(container)) //This would only happen if the previous checks for contents and tools were flawed.
stack_trace("couldn't fulfill the required amount for [path_key]. Dangit")
+ break
if(QDELING(container)) //it's deleting...
surroundings -= container
continue
@@ -401,7 +416,7 @@
if(reagent_volume)
container.reagents.trans_to(holder, min(amount, reagent_volume), target_id = path_key, no_react = TRUE)
amount -= reagent_volume
- surroundings -= container
+ checked += container
container.update_appearance(UPDATE_ICON)
else if(ispath(path_key, /obj/item/stack))
var/obj/item/stack/tally_stack
@@ -409,6 +424,7 @@
var/obj/item/stack/origin_stack = locate(path_key) in surroundings
if(isnull(origin_stack)) //This would only happen if the previous checks for contents and tools were flawed.
stack_trace("couldn't fulfill the required amount for [path_key]. Dangit")
+ break
if(QDELING(origin_stack))
continue
var/amount_to_give = min(origin_stack.amount, amount)
@@ -427,6 +443,7 @@
var/atom/movable/item = locate(path_key) in surroundings
if(isnull(item)) //This would only happen if the previous checks for contents and tools were flawed.
stack_trace("couldn't fulfill the required amount for [path_key]. Dangit")
+ break
if(QDELING(item))
continue
return_list += item
@@ -443,11 +460,11 @@
return FALSE
if (recipe.category == CAT_CULT && !IS_CULTIST(user)) // Skip blood cult recipes if not cultist
return FALSE
- //DARKPACK EDIT ADD - START
- // if (recipe.category == CAT_TZIMISCE) // TODO: [Disciplines] Uncomment when viscissitude is a thing.
- // return FALSE
- //DARKPACK EDIT ADD - END
- return TRUE
+ // DARKPACK EDIT ADD - START
+ if (recipe.category == CAT_TZIMISCE) // TODO: [Disciplines] Uncomment when viscissitude is a thing.
+ return HAS_TRAIT(user, TRAIT_VICISSITUDE_KNOWLEDGE)
+ // DARKPACK EDIT ADD - END
+ return recipe.is_recipe_available(user) // DARKPACK EDIT CHANGE
/datum/component/personal_crafting/proc/component_ui_interact(atom/movable/screen/craft/image, location, control, params, user)
SIGNAL_HANDLER
diff --git a/code/datums/components/crafting/equipment.dm b/code/datums/components/crafting/equipment.dm
index 8b9079471655..79dbac1ba7a2 100644
--- a/code/datums/components/crafting/equipment.dm
+++ b/code/datums/components/crafting/equipment.dm
@@ -60,6 +60,7 @@
)
time = 10 SECONDS
category = CAT_EQUIPMENT
+ removed_mats = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2)
/datum/crafting_recipe/motorized_wheelchair
name = "Motorized Wheelchair"
diff --git a/code/datums/components/crafting/furniture.dm b/code/datums/components/crafting/furniture.dm
index c3f6557f89a2..ecbf1d7fc9aa 100644
--- a/code/datums/components/crafting/furniture.dm
+++ b/code/datums/components/crafting/furniture.dm
@@ -81,3 +81,40 @@
tool_behaviors = list(TOOL_SCREWDRIVER)
category = CAT_FURNITURE
time = 10 SECONDS
+
+/datum/crafting_recipe/lamp
+ name = "Desk Lamp"
+ result = /obj/item/flashlight/lamp
+ reqs = list(
+ /obj/item/flashlight = 1,
+ /obj/item/stack/rods = 1,
+ /obj/item/light/bulb = 1,
+ )
+ crafting_flags = CRAFT_SKIP_MATERIALS_PARITY
+ tool_behaviors = list(TOOL_SCREWDRIVER)
+ category = CAT_FURNITURE
+
+/datum/crafting_recipe/lamp/New()
+ . = ..()
+ blacklist += subtypesof(/obj/item/flashlight)
+
+/datum/crafting_recipe/lamp/green
+ name = "Green Desk Lamp"
+ result = /obj/item/flashlight/lamp/green
+
+/datum/crafting_recipe/banana_lamp
+ name = "Banana Lamp"
+ result = /obj/item/flashlight/lamp/bananalamp
+ reqs = list(
+ /obj/item/flashlight/lamp = 1,
+ /obj/item/grown/bananapeel = 1,
+ )
+ blacklist = list(
+ /obj/item/flashlight/lamp/bananalamp,
+ /obj/item/flashlight/lamp/space_bubble,
+ )
+ requirements_mats_blacklist = list(/obj/item/grown/bananapeel)
+ tool_behaviors = list(TOOL_SCREWDRIVER)
+ category = CAT_FURNITURE
+
+
diff --git a/code/datums/components/crafting/guncrafting.dm b/code/datums/components/crafting/guncrafting.dm
index fecf14d21d69..9c5e5d4304b6 100644
--- a/code/datums/components/crafting/guncrafting.dm
+++ b/code/datums/components/crafting/guncrafting.dm
@@ -16,6 +16,8 @@
desc = "A prototype modular receiver and trigger assembly for a firearm."
icon = 'icons/obj/weapons/improvised.dmi'
icon_state = "receiver"
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5.5, /datum/material/cardboard = SHEET_MATERIAL_AMOUNT)
+
/* // DARKPACK EDIT REMOVE
/obj/item/weaponcrafting/receiver/create_slapcraft_component()
var/static/list/slapcraft_recipe_list = list(/datum/crafting_recipe/pipegun)
@@ -28,7 +30,7 @@
/obj/item/weaponcrafting/stock
name = "rifle stock"
desc = "A classic rifle stock that doubles as a grip, roughly carved out of wood."
- custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 6)
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 8)
resistance_flags = FLAMMABLE
icon = 'icons/obj/weapons/improvised.dmi'
icon_state = "riflestock"
@@ -68,31 +70,61 @@
/obj/item/weaponcrafting/gunkit/nuclear
name = "advanced energy gun parts kit (lethal/nonlethal)"
desc = "A suitcase containing the necessary gun parts to transform a standard energy gun into an advanced energy gun."
+ custom_materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 5,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT,
+ /datum/material/uranium = SHEET_MATERIAL_AMOUNT * 1.5,
+ /datum/material/titanium = HALF_SHEET_MATERIAL_AMOUNT,
+ )
/obj/item/weaponcrafting/gunkit/tesla
name = "tesla cannon parts kit (lethal)"
desc = "A suitcase containing the necessary gun parts to construct a tesla cannon around a stabilized flux anomaly. Handle with care."
icon_state = "weaponskit_tesla"
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 5, /datum/material/silver = SHEET_MATERIAL_AMOUNT * 5)
/obj/item/weaponcrafting/gunkit/xray
name = "x-ray laser gun parts kit (lethal)"
desc = "A suitcase containing the necessary gun parts to turn a laser gun into a x-ray laser gun. Do not point most parts directly towards face."
+ custom_materials = list(
+ /datum/material/gold = SHEET_MATERIAL_AMOUNT * 2.5,
+ /datum/material/uranium = SHEET_MATERIAL_AMOUNT * 2,
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2.5,
+ /datum/material/titanium = SHEET_MATERIAL_AMOUNT,
+ /datum/material/bluespace = SHEET_MATERIAL_AMOUNT,
+ )
/obj/item/weaponcrafting/gunkit/ion
name = "ion carbine parts kit (nonlethal/highly destructive/very lethal (silicons))"
desc = "A suitcase containing the necessary gun parts to transform a standard laser gun into a ion carbine. Perfect against lockers you don't have access to."
+ custom_materials = list(/datum/material/silver = SHEET_MATERIAL_AMOUNT * 3, /datum/material/iron = SHEET_MATERIAL_AMOUNT * 4, /datum/material/uranium = SHEET_MATERIAL_AMOUNT)
/obj/item/weaponcrafting/gunkit/temperature
name = "temperature gun parts kit (less lethal/very lethal (lizardpeople))"
desc = "A suitcase containing the necessary gun parts to transform a standard energy gun into a temperature gun. Fantastic at birthday parties and killing indigenous populations of lizardpeople."
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 5, /datum/material/silver = SHEET_MATERIAL_AMOUNT * 1.5)
/obj/item/weaponcrafting/gunkit/beam_rifle
name = "\improper Event Horizon anti-existential beam rifle part kit (DOOMSDAY DEVICE, DO NOT CONSTRUCT)"
desc = "What fevered minds wrought this terrible construction kit? To create a frame to harness the strange energies that flow through the Spinward Sector towards such horrible acts of violence?"
+ custom_materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 5,
+ /datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5,
+ /datum/material/diamond = SHEET_MATERIAL_AMOUNT * 2.5,
+ /datum/material/uranium = SHEET_MATERIAL_AMOUNT * 4,
+ /datum/material/silver = SHEET_MATERIAL_AMOUNT * 2.25,
+ /datum/material/gold = SHEET_MATERIAL_AMOUNT * 2.5,
+ )
/obj/item/weaponcrafting/gunkit/ebow
name = "energy crossbow part kit (less lethal)"
desc = "Highly illegal weapons refurbishment kit that allows you to turn the standard proto-kinetic accelerator into a near-duplicate energy crossbow. Almost like the real thing!"
+ custom_materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2.5,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT * 1.5,
+ /datum/material/uranium = HALF_SHEET_MATERIAL_AMOUNT * 1.5,
+ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT * 1.5,
+ )
/obj/item/weaponcrafting/gunkit/hellgun
name = "hellfire laser gun degradation kit (warcrime lethal)"
@@ -101,6 +133,7 @@
/obj/item/weaponcrafting/gunkit/photon
name = "photon cannon parts kit (nonlethal)"
desc = "A suitcase containing the necessary gun parts to construct a photon cannon around a stabilized flux anomaly. Harness the power of the sun, in the palms of your hands."
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 3, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 7, /datum/material/gold = SHEET_MATERIAL_AMOUNT * 5)
/obj/item/weaponcrafting/gunkit/sks
name = "\improper Sakhno SKS semi-automatic rifle parts kit (lethal)"
diff --git a/code/datums/components/crafting/melee_weapon.dm b/code/datums/components/crafting/melee_weapon.dm
index 671e355995a5..5ab6b44a7158 100644
--- a/code/datums/components/crafting/melee_weapon.dm
+++ b/code/datums/components/crafting/melee_weapon.dm
@@ -33,6 +33,51 @@
time = 4 SECONDS
category = CAT_WEAPON_MELEE
+/datum/crafting_recipe/stunsword
+ name = "\improper NT-20 'Excalibur' Stunsword"
+ result = /obj/item/melee/baton/security/stunsword
+ reqs = list(
+ /obj/item/claymore = 1,
+ /obj/item/melee/baton/security = 1
+ )
+ blacklist = list(
+ /obj/item/claymore/cutlass,
+ /obj/item/claymore/cutlass/old,
+ /obj/item/claymore/carrot,
+ /obj/item/claymore/shortsword,
+ /obj/item/claymore/highlander,
+ /obj/item/claymore/weak,
+ /obj/item/claymore/weak/ceremonial,
+ /obj/item/claymore/highlander/robot
+ )
+ tool_behaviors = list(TOOL_WELDER)
+ time = 10 SECONDS
+ category = CAT_WEAPON_MELEE
+
+/datum/crafting_recipe/stunswordalt
+ name = "\improper NT-20 'Excalibur' Stunsword"
+ result = /obj/item/melee/baton/security/stunsword
+ reqs = list(
+ /obj/item/katana = 1,
+ /obj/item/melee/baton/security = 1,
+ )
+ tool_behaviors = list(TOOL_WELDER)
+ crafting_flags = parent_type::crafting_flags | CRAFT_SKIP_MATERIALS_PARITY
+ time = 10 SECONDS
+ category = CAT_WEAPON_MELEE
+
+/datum/crafting_recipe/stunswordalt2
+ name = "\improper NT-20 'Excalibur' Stunsword"
+ result = /obj/item/melee/baton/security/stunsword
+ reqs = list(
+ /obj/item/melee/sabre = 1,
+ /obj/item/melee/baton/telescopic/contractor_baton = 1,
+ )
+ tool_behaviors = list(TOOL_WELDER)
+ crafting_flags = parent_type::crafting_flags | CRAFT_SKIP_MATERIALS_PARITY
+ time = 10 SECONDS
+ category = CAT_WEAPON_MELEE
+
/datum/crafting_recipe/tailclub
name = "Tail Club"
result = /obj/item/tailclub
@@ -211,3 +256,15 @@
time = 120 SECONDS
category = CAT_WEAPON_MELEE
*/
+
+/datum/crafting_recipe/dragonator_spear_untreated
+ name = "Untreated Giant-Killer Spear"
+ result = /obj/item/spear/dragonator_untreated
+ reqs = list(
+ /obj/item/stack/sheet/plasteel = 15,
+ /obj/item/stack/sheet/mineral/titanium = 5,
+ /obj/item/knife = 7,
+ )
+ time = 5 SECONDS
+ category = CAT_WEAPON_MELEE
+
diff --git a/code/datums/components/crafting/ranged_weapon.dm b/code/datums/components/crafting/ranged_weapon.dm
index 82d072db5fa3..24d061505d4c 100644
--- a/code/datums/components/crafting/ranged_weapon.dm
+++ b/code/datums/components/crafting/ranged_weapon.dm
@@ -110,7 +110,7 @@
/datum/crafting_recipe/xraylaser
name = "X-ray Laser Gun"
- result = /obj/item/gun/energy/xray
+ result = /obj/item/gun/energy/laser/xray
reqs = list(
/obj/item/gun/energy/laser = 1,
/obj/item/weaponcrafting/gunkit/xray = 1,
@@ -316,7 +316,7 @@
/datum/crafting_recipe/pipe_organ_gun
name = "Pipe Organ Gun"
tool_behaviors = list(TOOL_WELDER, TOOL_SCREWDRIVER)
- result = /obj/structure/mounted_gun/pipe
+ result = /obj/structure/mounted_gun/organ_gun
reqs = list(
/obj/item/pipe = 8,
/obj/item/stack/sheet/mineral/wood = 15,
@@ -328,7 +328,48 @@
time = 15 SECONDS
category = CAT_WEAPON_RANGED
crafting_flags = CRAFT_CHECK_DENSITY
+
+/datum/crafting_recipe/Ratvarian_Repeater
+ name = "Emplaced Ratvarian Repeater"
+ tool_behaviors = list(TOOL_SCREWDRIVER,TOOL_WRENCH)
+ result = /obj/structure/mounted_gun/ratvarian_repeater
+ reqs = list(
+ /obj/item/stack/cable_coil = 15,
+ /obj/item/stock_parts/micro_laser = 2,
+ /obj/item/stock_parts/capacitor = 2,
+ /obj/item/reagent_containers/cup/glass/drinkingglass = 2,
+ /obj/item/stack/sheet/bronze = 5,
+ /obj/item/stack/rods = 10,
+ )
+ time = 15 SECONDS
+ category = CAT_WEAPON_RANGED
+ crafting_flags = CRAFT_CHECK_DENSITY
+
+/datum/crafting_recipe/Detached_Ratvarian_Repeater
+ name = "Iconoclast's Repeater"
+ tool_behaviors = list(TOOL_WELDER)
+ result = /obj/item/gun/energy/laser/musket/repeater
+ structures = list(
+ /obj/structure/mounted_gun/ratvarian_repeater = CRAFTING_STRUCTURE_CONSUME,
+ )
+ time = 10 SECONDS
+ category = CAT_WEAPON_RANGED
+ crafting_flags = CRAFT_CHECK_DENSITY
*/
+
+/datum/crafting_recipe/large_ballista
+ name = "Improvised Ballista"
+ tool_behaviors = list(TOOL_WELDER,TOOL_SCREWDRIVER,TOOL_WRENCH,TOOL_WIRECUTTER)
+ result = /obj/structure/mounted_gun/ballista
+ reqs = list(
+ /obj/item/stack/cable_coil = 15,
+ /obj/item/stack/sheet/iron = 10,
+ /obj/item/stack/rods = 10,
+ )
+ time = 8 SECONDS
+ category = CAT_WEAPON_RANGED
+ crafting_flags = CRAFT_CHECK_DENSITY
+
/datum/crafting_recipe/trash_cannon
name = "Trash Cannon"
tool_behaviors = list(TOOL_WELDER, TOOL_SCREWDRIVER)
diff --git a/code/datums/components/crafting/structures.dm b/code/datums/components/crafting/structures.dm
index 7a32efd976db..b047daabcdaf 100644
--- a/code/datums/components/crafting/structures.dm
+++ b/code/datums/components/crafting/structures.dm
@@ -8,6 +8,7 @@
result = /obj/item/stack/sheet/paperframes
result_amount = 5
category = CAT_STRUCTURE
+ requirements_mats_blacklist = list(/obj/item/stack/sheet/mineral/wood)
/datum/crafting_recipe/rib
name = "Colossal Rib"
@@ -107,3 +108,66 @@
)
category = CAT_STRUCTURE
*/
+
+/datum/crafting_recipe/secure_safe
+ name = "Secure safe"
+ result = /obj/item/wallframe/secure_safe
+ reqs = list(
+ /obj/item/stack/sheet/plasteel = 10,
+ /obj/item/stack/sheet/mineral/titanium = 5,
+ /obj/item/stack/cable_coil = 5,
+ /obj/item/stack/rods = 5,
+ /obj/item/wallframe/button = 1,
+ )
+ tool_behaviors = list(TOOL_SCREWDRIVER, TOOL_WELDER, TOOL_DRILL)
+ time = 30 SECONDS
+ removed_mats = list(
+ /datum/material/alloy/plasteel = SHEET_MATERIAL_AMOUNT * 2,
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.55,
+ /datum/material/titanium = SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT,
+ )
+ category = CAT_STRUCTURE
+
+/datum/crafting_recipe/vault
+ name = "Vault"
+ result = /obj/structure/safe/open
+ reqs = list(
+ /obj/item/stack/sheet/mineral/metal_hydrogen = 20,
+ /obj/item/stack/sheet/mineral/plastitanium = 10,
+ /obj/item/stack/cable_coil = 5,
+ /obj/item/stack/rods = 5,
+ /obj/item/wallframe/secure_safe = 1,
+ )
+ tool_behaviors = list(TOOL_SCREWDRIVER, TOOL_WELDER, TOOL_DRILL)
+ time = 90 SECONDS
+ removed_mats = list(
+ /datum/material/metalhydrogen = SHEET_MATERIAL_AMOUNT * 5,
+ /datum/material/alloy/plastitanium = SHEET_MATERIAL_AMOUNT * 2,
+ /datum/material/alloy/plasteel = SHEET_MATERIAL_AMOUNT * 2,
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.5,
+ /datum/material/titanium = SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT,
+ )
+ category = CAT_STRUCTURE
+ crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ON_SOLID_GROUND
+
+/datum/crafting_recipe/vault_floor
+ name = "Floor Vault"
+ result = /obj/structure/safe/floor/open
+ reqs = list(
+ /obj/item/stack/sheet/mineral/metal_hydrogen = 20,
+ /obj/item/stack/sheet/mineral/plastitanium = 10,
+ /obj/item/stack/cable_coil = 5,
+ /obj/item/stack/rods = 5,
+ )
+ tool_behaviors = list(TOOL_SCREWDRIVER, TOOL_WELDER, TOOL_DRILL)
+ time = 90 SECONDS
+ category = CAT_STRUCTURE
+ removed_mats = list(
+ /datum/material/metalhydrogen = SHEET_MATERIAL_AMOUNT * 5,
+ /datum/material/alloy/plastitanium = SHEET_MATERIAL_AMOUNT * 2,
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT,
+ )
+ crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ON_SOLID_GROUND
diff --git a/code/datums/components/crafting/tailoring.dm b/code/datums/components/crafting/tailoring.dm
index 3bd34f5d53f7..c115c1c964c5 100644
--- a/code/datums/components/crafting/tailoring.dm
+++ b/code/datums/components/crafting/tailoring.dm
@@ -151,6 +151,7 @@
tool_behaviors = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
reqs = list(/obj/item/clothing/glasses/hud/security/sunglasses = 1)
category = CAT_EQUIPMENT
+ crafting_flags = parent_type::crafting_flags | CRAFT_SKIP_MATERIALS_PARITY
/datum/crafting_recipe/hudsunmed
name = "Medical HUDsunglasses"
@@ -169,6 +170,7 @@
tool_behaviors = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
reqs = list(/obj/item/clothing/glasses/hud/health/sunglasses = 1)
category = CAT_EQUIPMENT
+ crafting_flags = parent_type::crafting_flags | CRAFT_SKIP_MATERIALS_PARITY
/datum/crafting_recipe/hudsundiag
name = "Diagnostic HUDsunglasses"
@@ -187,6 +189,7 @@
tool_behaviors = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
reqs = list(/obj/item/clothing/glasses/hud/diagnostic/sunglasses = 1)
category = CAT_EQUIPMENT
+ crafting_flags = parent_type::crafting_flags | CRAFT_SKIP_MATERIALS_PARITY
/datum/crafting_recipe/scienceglasses
name = "Science Glasses"
@@ -205,6 +208,7 @@
tool_behaviors = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
reqs = list(/obj/item/clothing/glasses/sunglasses/chemical = 1)
category = CAT_EQUIPMENT
+ crafting_flags = parent_type::crafting_flags | CRAFT_SKIP_MATERIALS_PARITY
*/
/datum/crafting_recipe/ghostsheet
name = "Ghost Sheet"
@@ -540,6 +544,7 @@
/obj/item/stack/sheet/mineral/metal_hydrogen = 1,
/obj/item/stack/sheet/mineral/zaukerite = 1,
)
+ crafting_flags = parent_type::crafting_flags | CRAFT_SKIP_MATERIALS_PARITY // stupid recipe, don't give every atmos gas mask these mats.
category = CAT_CLOTHING
*/
diff --git a/code/datums/components/crafting/tools.dm b/code/datums/components/crafting/tools.dm
index f8df4fc03c2d..b1abcc20514d 100644
--- a/code/datums/components/crafting/tools.dm
+++ b/code/datums/components/crafting/tools.dm
@@ -17,6 +17,7 @@
blacklist = list(/obj/item/grown/log/steel)
result = /obj/structure/bonfire
category = CAT_TOOLS
+ crafting_flags = parent_type::crafting_flags | CRAFT_SKIP_MATERIALS_PARITY
/datum/crafting_recipe/boneshovel
name = "Serrated Bone Shovel"
@@ -119,3 +120,27 @@
)
category = CAT_TOOLS
+/datum/crafting_recipe/jaws_of_recovery
+ name = "Modified Jaws of Recovery"
+ desc = "This one acts like regular jaws of life, letting you pry any door and doesn't announce doors you're prying open."
+ time = 10 SECONDS
+ tool_behaviors = list(TOOL_SCREWDRIVER, TOOL_WELDER)
+ result = /obj/item/crowbar/power/paramedic/silent
+ reqs = list(
+ /obj/item/crowbar/power = 1,
+ /obj/item/bonesetter = 1,
+ )
+ category = CAT_TOOLS
+
+/datum/crafting_recipe/lantern
+ name = "Lantern"
+ result = /obj/item/flashlight/lantern
+ reqs = list(
+ /obj/item/flashlight/flare/candle = 1,
+ /obj/item/stack/rods = 1,
+ /obj/item/stack/sheet/glass = 1,
+ )
+ crafting_flags = CRAFT_SKIP_MATERIALS_PARITY
+ tool_behaviors = list(TOOL_SCREWDRIVER)
+ category = CAT_TOOLS
+
diff --git a/code/datums/components/crafting/weapon_ammo.dm b/code/datums/components/crafting/weapon_ammo.dm
index 5f91005e883e..76b0528f97a1 100644
--- a/code/datums/components/crafting/weapon_ammo.dm
+++ b/code/datums/components/crafting/weapon_ammo.dm
@@ -102,7 +102,9 @@
tool_behaviors = list(TOOL_SCREWDRIVER)
time = 1.2 SECONDS
category = CAT_WEAPON_AMMO
+ crafting_flags = CRAFT_SKIP_MATERIALS_PARITY
*/
+
/datum/crafting_recipe/trashball
name = "Trashball"
result = /obj/item/stack/cannonball/trashball
diff --git a/code/datums/components/cult_ritual_item.dm b/code/datums/components/cult_ritual_item.dm
index 1e4e4ab76bcb..f9eb301392fd 100644
--- a/code/datums/components/cult_ritual_item.dm
+++ b/code/datums/components/cult_ritual_item.dm
@@ -300,12 +300,14 @@
return
our_turf = get_turf(cultist) //we may have moved. adjust as needed...
+ var/can_have_blood = CAN_HAVE_BLOOD(cultist)
+
cultist.visible_message(
- span_warning("[cultist] [cultist.blood_volume ? "cuts open [cultist.p_their()] arm and begins writing in [cultist.p_their()] own blood":"begins sketching out a strange design"]!"),
- span_cult("You [cultist.blood_volume ? "slice open your arm and ":""]begin drawing a sigil of the Geometer.")
+ span_warning("[cultist] [can_have_blood ? "cuts open [cultist.p_their()] arm and begins writing in [cultist.p_their()] own blood":"begins sketching out a strange design"]!"),
+ span_cult("You [can_have_blood ? "slice open your arm and ":""]begin drawing a sigil of the Geometer.")
)
- if(cultist.blood_volume)
+ if(can_have_blood)
cultist.apply_damage(initial(rune_to_scribe.scribe_damage), BRUTE, pick(GLOB.arm_zones), wound_bonus = CANT_WOUND) // *cuts arm* *bone explodes* ever have one of those days?
var/scribe_mod = initial(rune_to_scribe.scribe_delay)
@@ -332,7 +334,7 @@
return FALSE
cultist.visible_message(
- span_warning("[cultist] creates a strange circle[cultist.blood_volume ? " in [cultist.p_their()] own blood":""]."),
+ span_warning("[cultist] creates a strange circle[can_have_blood ? " in [cultist.p_their()] own blood":""]."),
span_cult("You finish drawing the arcane markings of the Geometer.")
)
diff --git a/code/datums/components/damage_aura.dm b/code/datums/components/damage_aura.dm
index 9c4e996113b8..3497e83cb90f 100644
--- a/code/datums/components/damage_aura.dm
+++ b/code/datums/components/damage_aura.dm
@@ -97,13 +97,14 @@
/// What effect the damage aura has if it has an owner.
/datum/component/damage_aura/proc/owner_effect(mob/living/owner_mob, seconds_per_tick)
var/need_mob_update = FALSE
- need_mob_update += owner_mob.adjustStaminaLoss(-20 * seconds_per_tick, updating_stamina = FALSE)
- need_mob_update += owner_mob.adjustBruteLoss(-1 * seconds_per_tick, updating_health = FALSE)
- need_mob_update += owner_mob.adjustFireLoss(-1 * seconds_per_tick, updating_health = FALSE)
- need_mob_update += owner_mob.adjustToxLoss(-1 * seconds_per_tick, updating_health = FALSE, forced = TRUE)
- need_mob_update += owner_mob.adjustOxyLoss(-1 * seconds_per_tick, updating_health = FALSE)
- if (owner_mob.blood_volume < BLOOD_VOLUME_NORMAL)
- owner_mob.blood_volume += 2 * seconds_per_tick
+ need_mob_update += owner_mob.adjust_stamina_loss(-20 * seconds_per_tick, updating_stamina = FALSE)
+ need_mob_update += owner_mob.adjust_brute_loss(-1 * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += owner_mob.adjust_fire_loss(-1 * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += owner_mob.adjust_tox_loss(-1 * seconds_per_tick, updating_health = FALSE, forced = TRUE)
+ need_mob_update += owner_mob.adjust_oxy_loss(-1 * seconds_per_tick, updating_health = FALSE)
+
+ owner_mob.adjust_blood_volume(2 * seconds_per_tick, maximum = BLOOD_VOLUME_NORMAL)
+
if(need_mob_update)
owner_mob.updatehealth()
@@ -134,16 +135,16 @@
to_chat(candidate, damage_message)
if (iscarbon(candidate) || issilicon(candidate) || isbasicmob(candidate))
- candidate.adjustBruteLoss(brute_damage * seconds_per_tick, updating_health = FALSE)
- candidate.adjustFireLoss(burn_damage * seconds_per_tick, updating_health = FALSE)
+ candidate.adjust_brute_loss(brute_damage * seconds_per_tick, updating_health = FALSE)
+ candidate.adjust_fire_loss(burn_damage * seconds_per_tick, updating_health = FALSE)
if (iscarbon(candidate))
- candidate.adjustToxLoss(toxin_damage * seconds_per_tick, updating_health = FALSE)
- candidate.adjustOxyLoss(suffocation_damage * seconds_per_tick, updating_health = FALSE)
- candidate.adjustStaminaLoss(stamina_damage * seconds_per_tick, updating_stamina = FALSE)
+ candidate.adjust_tox_loss(toxin_damage * seconds_per_tick, updating_health = FALSE)
+ candidate.adjust_oxy_loss(suffocation_damage * seconds_per_tick, updating_health = FALSE)
+ candidate.adjust_stamina_loss(stamina_damage * seconds_per_tick, updating_stamina = FALSE)
for (var/organ in organ_damage)
- candidate.adjustOrganLoss(organ, organ_damage[organ] * seconds_per_tick)
+ candidate.adjust_organ_loss(organ, organ_damage[organ] * seconds_per_tick)
else if (isanimal(candidate))
var/mob/living/simple_animal/animal_candidate = candidate
animal_candidate.adjustHealth(simple_damage * seconds_per_tick, updating_health = FALSE)
@@ -151,8 +152,7 @@
var/mob/living/basic/basic_candidate = candidate
basic_candidate.adjust_health(simple_damage * seconds_per_tick, updating_health = FALSE)
- if (candidate.blood_volume > BLOOD_VOLUME_SURVIVE)
- candidate.blood_volume -= blood_damage * seconds_per_tick
+ candidate.adjust_blood_volume(blood_damage * seconds_per_tick, minimum = BLOOD_VOLUME_SURVIVE)
candidate.updatehealth()
diff --git a/code/datums/components/dart_insert.dm b/code/datums/components/dart_insert.dm
index 9770de669b55..f2816949c9d2 100644
--- a/code/datums/components/dart_insert.dm
+++ b/code/datums/components/dart_insert.dm
@@ -60,9 +60,9 @@
add_to_dart(dart, user)
return COMPONENT_CANCEL_ATTACK_CHAIN
-/datum/component/dart_insert/proc/on_reskin(datum/source, mob/user, skin)
+/datum/component/dart_insert/proc/on_reskin(datum/source, skin)
SIGNAL_HANDLER
- SEND_SIGNAL(parent, COMSIG_DART_INSERT_PARENT_RESKINNED)
+ SEND_SIGNAL(parent, COMSIG_DART_INSERT_PARENT_RESKINNED, skin)
/datum/component/dart_insert/proc/add_to_dart(obj/item/ammo_casing/dart, mob/user)
var/obj/projectile/dart_projectile = dart.loaded_projectile
diff --git a/code/datums/components/dejavu.dm b/code/datums/components/dejavu.dm
index 249fdc97cb57..0c880ae7b4a3 100644
--- a/code/datums/components/dejavu.dm
+++ b/code/datums/components/dejavu.dm
@@ -48,12 +48,12 @@
if(isliving(parent))
var/mob/living/L = parent
- tox_loss = L.getToxLoss()
- oxy_loss = L.getOxyLoss()
- stamina_loss = L.getStaminaLoss()
+ tox_loss = L.get_tox_loss()
+ oxy_loss = L.get_oxy_loss()
+ stamina_loss = L.get_stamina_loss()
brain_loss = L.get_organ_loss(ORGAN_SLOT_BRAIN)
rewind_type = PROC_REF(rewind_living)
- aggravated_loss = L.getAggLoss() // DARKPACK EDIT ADD - AGGRAVATED_DAMAGE
+ aggravated_loss = L.get_agg_loss() // DARKPACK EDIT ADD - AGGRAVATED_DAMAGE
if(iscarbon(parent))
var/mob/living/carbon/C = parent
@@ -100,11 +100,11 @@
parent.AddComponent(type, 1, rewind_interval, TRUE)
var/mob/living/master = parent
- master.setToxLoss(tox_loss)
- master.setOxyLoss(oxy_loss)
- master.setStaminaLoss(stamina_loss)
- master.setOrganLoss(ORGAN_SLOT_BRAIN, brain_loss)
- master.setAggLoss(aggravated_loss) // DARKPACK EDIT ADD - AGGRAVATED_DAMAGE
+ master.set_tox_loss(tox_loss)
+ master.set_oxy_loss(oxy_loss)
+ master.set_stamina_loss(stamina_loss)
+ master.set_organ_loss(ORGAN_SLOT_BRAIN, brain_loss)
+ master.set_agg_loss(aggravated_loss) // DARKPACK EDIT ADD - AGGRAVATED_DAMAGE
rewind()
/datum/component/dejavu/proc/rewind_carbon()
@@ -139,12 +139,12 @@
no_rewinds_message = "\"Rewind complete. You have arrived at: 10 seconds ago.\""
/datum/component/dejavu/timeline/rewind()
- playsound(get_turf(parent), 'sound/items/modsuit/rewinder.ogg')
- . = ..()
+ playsound(get_turf(parent), 'sound/items/modsuit/rewinder.ogg', 50, TRUE)
+ return ..()
/datum/component/dejavu/wizard
rewind_message = "Your temporal ward activated, pulling you through spacetime!"
/datum/component/dejavu/wizard/rewind()
- playsound(get_turf(parent), 'sound/items/modsuit/rewinder.ogg')
- . = ..()
+ playsound(get_turf(parent), 'sound/items/modsuit/rewinder.ogg', 50, TRUE)
+ return ..()
diff --git a/code/datums/components/earprotection.dm b/code/datums/components/earprotection.dm
index 542a1d0c60f3..9d9e80ff09d1 100644
--- a/code/datums/components/earprotection.dm
+++ b/code/datums/components/earprotection.dm
@@ -1,14 +1,24 @@
+///Whenever get_ear_protection() is called, this proc adds 'protection_value' to the wearer's natural ear protection.
/datum/component/wearertargeting/earprotection
- signals = list(COMSIG_CARBON_SOUNDBANG)
+ signals = list(COMSIG_LIVING_GET_EAR_PROTECTION)
mobtype = /mob/living/carbon
proctype = PROC_REF(reducebang)
- var/reduce_amount = 1
+ //positive amount indicating how much protection this gives
+ var/protection_amount = 1
valid_slots = ITEM_SLOT_EARS | ITEM_SLOT_HEAD
-/datum/component/wearertargeting/earprotection/Initialize(reduce_amount = 1)
+/datum/component/wearertargeting/earprotection/Initialize(protection_amount = EAR_PROTECTION_NORMAL)
. = ..()
- if(reduce_amount)
- src.reduce_amount = reduce_amount
+ src.protection_amount = protection_amount
+ RegisterSignal(parent, COMSIG_ATOM_EXAMINE_TAGS, PROC_REF(get_examine_tags))
/datum/component/wearertargeting/earprotection/proc/reducebang(datum/source, list/reflist)
- reflist[1] -= reduce_amount
+ SIGNAL_HANDLER
+ reflist[EAR_PROTECTION_ARG] += protection_amount
+
+/datum/component/wearertargeting/earprotection/proc/get_examine_tags(atom/source, mob/user, list/examine_list)
+ SIGNAL_HANDLER
+ if(protection_amount == EAR_PROTECTION_NORMAL)
+ examine_list["sound-proof"] = "It protects the ears from flashbangs and other loud noises."
+ else if(protection_amount >= EAR_PROTECTION_HEAVY)
+ examine_list["sound-proof"] = "It provides [protection_amount == EAR_PROTECTION_FULL ? "full" : "heavy"] protection against flashbangs and other loud noises."
diff --git a/code/datums/components/echolocation.dm b/code/datums/components/echolocation.dm
index a40c14306290..59b18ae0001b 100644
--- a/code/datums/components/echolocation.dm
+++ b/code/datums/components/echolocation.dm
@@ -99,17 +99,15 @@
if(HAS_TRAIT(echolocator, TRAIT_ECHOLOCATION_EXTRA_RANGE))
real_echo_range += 2
var/list/filtered = list()
- var/list/seen = dview(real_echo_range, get_turf(echolocator.client?.eye || echolocator), invis_flags = echolocator.see_invisible)
if(blinding)
- for(var/atom/seen_atom as anything in seen)
+ for(var/atom/seen_atom as anything in dview(real_echo_range, get_turf(echolocator.client?.eye || echolocator), invis_flags = echolocator.see_invisible))
if(!seen_atom.alpha)
continue
if(allowed_paths[seen_atom.type])
filtered += seen_atom
else
- var/list/ranged_atoms = range(real_echo_range, get_turf(echolocator.client?.eye || echolocator))
- for(var/atom/possible_atom as anything in ranged_atoms)
- if(!possible_atom.alpha)
+ for(var/atom/possible_atom as anything in range(real_echo_range, get_turf(echolocator.client?.eye || echolocator)))
+ if(!possible_atom.alpha || possible_atom.invisibility > echolocator.see_invisible)
continue
if(allowed_paths[possible_atom.type])
filtered += possible_atom
diff --git a/code/datums/components/empathy.dm b/code/datums/components/empathy.dm
new file mode 100644
index 000000000000..fb147ac6013e
--- /dev/null
+++ b/code/datums/components/empathy.dm
@@ -0,0 +1,98 @@
+// Empath quirk component, it's a component because it can be applied in ways that don't give you the quirk. (For health analyzer purposes)
+
+/datum/component/empathy
+
+ dupe_mode = COMPONENT_DUPE_SOURCES
+
+ // Whether or not we should get scared the next time we see an evil person.
+ var/seen_it = FALSE
+
+ // What sort of information we can glean from examining someone
+ var/visible_info = ALL
+
+ // Whether or not we can use empathy on ourselves
+ var/self_empath = FALSE
+
+ // Whether or not empathy works on humans playing dead
+ var/sense_dead = FALSE
+
+ // Whether or not we can tell if people whisper under their mask from far away (We can't hear what they said, we just know they said something)
+ var/sense_whisper = TRUE
+
+ // Whether or not we can be smited by someoneone with the evil trait using the mending touch mutation
+ var/smite_target = TRUE
+
+/datum/component/empathy/Initialize(seen_it = FALSE, visible_info = ALL, self_empath = FALSE, sense_dead = FALSE, sense_whisper = TRUE, smite_target = TRUE)
+ if (!isliving(parent))
+ return COMPONENT_INCOMPATIBLE
+
+ src.seen_it = seen_it
+ src.visible_info = visible_info
+ src.self_empath = self_empath
+ src.sense_dead = sense_dead
+ src.sense_whisper = sense_whisper
+ src.smite_target = smite_target
+ if(sense_whisper)
+ ADD_TRAIT(parent, TRAIT_SEE_MASK_WHISPER, REF(src))
+
+/datum/component/empathy/RegisterWithParent()
+ RegisterSignal(parent, COMSIG_CARBON_MID_EXAMINE, PROC_REF(get_empath_info))
+ RegisterSignal(parent, COMSIG_ON_LAY_ON_HANDS, PROC_REF(on_hands_laid))
+
+/datum/component/empathy/proc/get_empath_info(datum/source, mob/living/target, list/examine_list)
+ SIGNAL_HANDLER
+ if(target.stat == DEAD)
+ return
+ if(HAS_TRAIT(target, TRAIT_FAKEDEATH))
+ if(sense_dead)
+ examine_list += "Something about this dead body doesn't look right..."
+ else
+ return
+ var/mob/living/living_parent = parent
+ if(target == living_parent && !self_empath)
+ return
+ var/t_They = target.p_They()
+ var/t_their = target.p_their()
+ var/t_Their = target.p_Their()
+ var/t_are = target.p_are()
+ if((visible_info & EMPATH_SEE_COMBAT) && target.combat_mode)
+ examine_list += "[t_They] seem[p_s()] to be on guard."
+ if((visible_info & EMPATH_SEE_OXY) && target.get_oxy_loss() >= 10)
+ examine_list += "[t_They] seem[p_s()] winded."
+ if((visible_info & EMPATH_SEE_TOX) && target.get_tox_loss() >= 10)
+ examine_list += "[t_They] seem[p_s()] sickly."
+ if((visible_info & EMPATH_SEE_SANITY) && target.mob_mood.sanity <= SANITY_DISTURBED)
+ examine_list += "[t_They] seem[p_s()] distressed."
+ if((visible_info & EMPATH_SEE_BLIND) && target.is_blind())
+ examine_list += "[t_They] appear[p_s()] to be staring off into space."
+ if((visible_info & EMPATH_SEE_DEAF) && HAS_TRAIT(target, TRAIT_DEAF))
+ examine_list += "[t_They] appear[p_s()] to not be responding to noises."
+ if((visible_info & EMPATH_SEE_HOT) && target.bodytemperature > target.get_body_temp_heat_damage_limit())
+ examine_list += "[t_They] [t_are] flushed and wheezing."
+ if((visible_info & EMPATH_SEE_COLD) && target.bodytemperature < target.get_body_temp_cold_damage_limit())
+ examine_list += "[t_They] [t_are] shivering."
+ if((visible_info & EMPATH_SEE_EVIL) && HAS_TRAIT(target, TRAIT_EVIL))
+ examine_list += "[t_Their] eyes radiate with a unfeeling, cold detachment. There is nothing but darkness within [t_their] soul."
+ if(living_parent.mind?.holy_role >= HOLY_ROLE_PRIEST)
+ examine_list += span_warning("PERFECT FOR SMITING!!")
+ else if(!seen_it)
+ seen_it = TRUE
+ living_parent.add_mood_event("encountered_evil", /datum/mood_event/encountered_evil)
+ living_parent.set_jitter_if_lower(15 SECONDS)
+
+/datum/component/empathy/proc/on_hands_laid(datum/source, mob/living/carbon/smiter)
+ SIGNAL_HANDLER
+ if(iscarbon(parent))
+ var/mob/living/carbon/carbon_parent = parent
+ if(carbon_parent.mob_biotypes & MOB_UNDEAD)
+ return FALSE
+ if(smite_target && HAS_TRAIT(smiter, TRAIT_EVIL))
+ return TRUE
+ return FALSE
+
+/datum/component/empathy/UnregisterFromParent()
+ UnregisterSignal(parent, COMSIG_CARBON_MID_EXAMINE)
+
+/datum/component/empathy/Destroy(force = FALSE)
+ REMOVE_TRAIT(parent, TRAIT_SEE_MASK_WHISPER, REF(src))
+ return ..()
diff --git a/code/datums/components/fantasy/suffixes.dm b/code/datums/components/fantasy/suffixes.dm
index db90b67a0833..5a89a6125fe6 100644
--- a/code/datums/components/fantasy/suffixes.dm
+++ b/code/datums/components/fantasy/suffixes.dm
@@ -111,11 +111,12 @@
/mob/living/simple_animal,
)
for(var/type in mob_subtype_whitelist)
- possible_mobtypes += subtypesof(type)
+ possible_mobtypes += valid_subtypesof(type)
var/list/mob_subtype_blacklist = list(
/mob/living/simple_animal/hostile/asteroid/elite,
/mob/living/simple_animal/hostile/megafauna,
+ /mob/living/basic/boss,
)
for(var/type in mob_subtype_blacklist)
possible_mobtypes -= subtypesof(type)
diff --git a/code/datums/components/fearful/effects.dm b/code/datums/components/fearful/effects.dm
index b2b4458cbfa1..17a62201257d 100644
--- a/code/datums/components/fearful/effects.dm
+++ b/code/datums/components/fearful/effects.dm
@@ -52,7 +52,7 @@
/datum/terror_handler/heart_problems
handler_type = TERROR_HANDLER_EFFECT
default = TRUE
- COOLDOWN_DECLARE(effect_cd)
+ COOLDOWN_DECLARE(message_cd)
/datum/terror_handler/heart_problems/tick(seconds_per_tick, terror_buildup)
. = ..()
@@ -66,7 +66,10 @@
return
if (terror_buildup < TERROR_BUILDUP_HEART_ATTACK || !prob(15))
- owner.adjustOxyLoss(8)
+ owner.adjust_oxy_loss(8)
+ if (!COOLDOWN_FINISHED(src, message_cd))
+ return
+ COOLDOWN_START(src, message_cd, TERROR_MESSAGE_CD)
if (terror_buildup < TERROR_BUILDUP_FEAR)
to_chat(owner, span_warning("Your heart skips a beat."))
else
@@ -167,4 +170,48 @@
deltimer(panic_end_timer)
panic_end_timer = null
+/datum/terror_handler/startle
+ handler_type = TERROR_HANDLER_EFFECT
+ COOLDOWN_DECLARE(startle_cd)
+
+/datum/terror_handler/startle/tick(seconds_per_tick, terror_buildup)
+ . = ..()
+ if (owner.stat >= UNCONSCIOUS || !COOLDOWN_FINISHED(src, startle_cd))
+ return
+
+ if (terror_buildup < TERROR_BUILDUP_FEAR || terror_buildup - component.last_tick_buildup < TERROR_STARTLE_MINIMUM_DIFFERENCE)
+ return
+
+ // The more scared we are, and the more fear we acquired at once last tick, the higher the probability of us being startled is
+ // Not SPT_PROB or FEAR_SCALING because this is only triggered during ticks when we actually acquire fear
+ if (!prob(15 * (terror_buildup - component.last_tick_buildup) / TERROR_STARTLE_MINIMUM_DIFFERENCE * terror_buildup / TERROR_BUILDUP_FEAR))
+ return
+
+ COOLDOWN_START(src, startle_cd, TERROR_STARTLE_COOLDOWN)
+ switch (rand(1, 3))
+ if (1)
+ to_chat(owner, span_warning("You are startled!"))
+ owner.emote("jump")
+ owner.Immobilize(0.1 SECONDS * (terror_buildup / TERROR_BUILDUP_FEAR))
+
+ if (2)
+ owner.emote("scream")
+ owner.say("AAAAH!!", forced = "phobia")
+ if (!prob(15 * (terror_buildup / TERROR_BUILDUP_FEAR)))
+ return
+ var/held_item = owner.get_active_held_item()
+ if (owner.dropItemToGround(held_item))
+ owner.visible_message(
+ span_danger("[owner.name] drops \the [held_item]!"),
+ span_warning("You drop \the [held_item]!"), null, COMBAT_MESSAGE_RANGE)
+
+ if (3)
+ to_chat(owner, span_warning("You lose your balance!"))
+ owner.adjust_staggered_up_to(2 SECONDS * (terror_buildup / TERROR_BUILDUP_FEAR), 20 SECONDS)
+ owner.add_movespeed_modifier(/datum/movespeed_modifier/status_effect/spooked)
+ addtimer(CALLBACK(src, PROC_REF(speed_up)), 3 SECONDS, TIMER_STOPPABLE | TIMER_DELETE_ME)
+
+/datum/terror_handler/startle/proc/speed_up()
+ owner.remove_movespeed_modifier(/datum/movespeed_modifier/status_effect/spooked)
+
#undef FEAR_SCALING
diff --git a/code/datums/components/fearful/fearful.dm b/code/datums/components/fearful/fearful.dm
index e75d739c2a5a..a2480acb4820 100644
--- a/code/datums/components/fearful/fearful.dm
+++ b/code/datums/components/fearful/fearful.dm
@@ -73,7 +73,7 @@
/datum/component/fearful/proc/add_handler(handler_type, source)
for (var/datum/terror_handler/existing as anything in terror_handlers)
- if (existing.type == handler_type)
+ if (existing.type == handler_type && !existing.bespoke)
terror_handlers[existing] += source
return
@@ -83,8 +83,21 @@
if (!overriden_handlers[override_type])
overriden_handlers[override_type] = list()
overriden_handlers[override_type][handler_type] = TRUE
+ return handler
+
+/datum/component/fearful/proc/get_fear_multiplier()
+ var/multiplier = 1
+ var/mob/living/parent_mob = parent
+ if(HAS_PERSONALITY(parent_mob, /datum/personality/cowardly))
+ multiplier *= 1.25
+ if(HAS_PERSONALITY(parent_mob, /datum/personality/paranoid))
+ multiplier *= 1.10
+ if(HAS_PERSONALITY(parent_mob, /datum/personality/brave))
+ multiplier *= 0.75
+ return multiplier
/datum/component/fearful/process(seconds_per_tick)
+ var/fear_modifier = get_fear_multiplier()
var/terror_adjustment = 0
var/list/tick_later = list()
for (var/datum/terror_handler/handler as anything in terror_handlers)
@@ -94,12 +107,12 @@
tick_later += handler
continue
var/adjustment = handler.tick(seconds_per_tick, terror_buildup)
- terror_buildup = clamp(terror_buildup + adjustment, 0, TERROR_BUILDUP_MAXIMUM)
+ terror_buildup = clamp(terror_buildup + (adjustment * fear_modifier), 0, TERROR_BUILDUP_MAXIMUM)
terror_adjustment += adjustment
for (var/datum/terror_handler/handler as anything in tick_later)
var/adjustment = handler.tick(seconds_per_tick, terror_buildup)
- terror_buildup = clamp(terror_buildup + adjustment, 0, TERROR_BUILDUP_MAXIMUM)
+ terror_buildup = clamp(terror_buildup + (adjustment * fear_modifier), 0, TERROR_BUILDUP_MAXIMUM)
terror_adjustment += adjustment
// If we gained terror in any way, don't tick it down
@@ -109,7 +122,7 @@
// Tick terror down while we're not being actively spooked
if (terror_buildup > 0)
- terror_buildup = max(terror_buildup - TERROR_BUILDUP_PASSIVE_DECREASE, 0)
+ terror_buildup = max(terror_buildup - (TERROR_BUILDUP_PASSIVE_DECREASE * (1 / fear_modifier)) * seconds_per_tick, 0)
last_tick_buildup = terror_buildup
/datum/component/fearful/proc/on_examine(mob/living/source, mob/user, list/examine_list)
@@ -156,11 +169,12 @@
)
return COMPONENT_BLOCK_MISC_HELP
- for (var/datum/brain_trauma/mild/phobia/phobia in source.get_traumas())
- if (!phobia.is_scary_mob(hugger))
- continue
+ var/hug_buildup = 0
+ for (var/datum/terror_handler/handler as anything in terror_handlers)
+ hug_buildup += handler.on_hug(hugger)
- terror_buildup += HUG_TERROR_AMOUNT
+ if (hug_buildup > 0)
+ terror_buildup += hug_buildup
source.visible_message(
span_warning("[source] recoils in fear as [hugger] attempts to hug [source.p_them()]!"),
span_boldwarning("You recoil in terror as [hugger] attempts to hug you!"),
diff --git a/code/datums/components/fearful/sources.dm b/code/datums/components/fearful/sources.dm
deleted file mode 100644
index c0fd104c9c87..000000000000
--- a/code/datums/components/fearful/sources.dm
+++ /dev/null
@@ -1,168 +0,0 @@
-// Terror source handlers
-/// Simple source which passively increases terror based on a single condition and can do something when its added/removed
-/datum/terror_handler/simple_source
- handler_type = TERROR_HANDLER_SOURCE
- /// How much terror is added per second
- var/buildup_per_second = 10
- /// Have we already applied our effects?
- var/active = FALSE
-
-/datum/terror_handler/simple_source/tick(seconds_per_tick, terror_buildup)
- . = ..()
- if (check_condition(seconds_per_tick, terror_buildup) && terror_buildup < TERROR_BUILDUP_PASSIVE_MAXIMUM)
- if (!active)
- on_activation(terror_buildup)
- . += min(buildup_per_second * seconds_per_tick, TERROR_BUILDUP_PASSIVE_MAXIMUM - terror_buildup)
- else if (active)
- on_deactivation(terror_buildup)
-
-/// Proc that children should override with their conditions
-/datum/terror_handler/simple_source/proc/check_condition(seconds_per_tick, terror_buildup)
- return !HAS_TRAIT(owner, TRAIT_FEARLESS) && !HAS_TRAIT(owner, TRAIT_MIND_TEMPORARILY_GONE) && owner.stat < UNCONSCIOUS
-
-/// Proc that's called when the effect is first applied, for moodlets and alike
-/datum/terror_handler/simple_source/proc/on_activation(terror_buildup)
- active = TRUE
-
-/// Proc that's called when the effect stops working, for moodlets and alike
-/datum/terror_handler/simple_source/proc/on_deactivation(terror_buildup)
- active = FALSE
-
-/// Makes the owner terrified of darkness
-/datum/terror_handler/simple_source/nyctophobia
- buildup_per_second = 5 // Takes about two minutes to reach maximum
- /// Are we counteracted by mesons?
- var/meson_negated = TRUE
-
-/datum/terror_handler/simple_source/nyctophobia/Destroy(force)
- owner.clear_mood_event("nyctophobia")
- return ..()
-
-/datum/terror_handler/simple_source/nyctophobia/check_condition(seconds_per_tick, terror_buildup)
- . = ..()
- if (!.)
- return
-
- if (ishuman(owner))
- var/mob/living/carbon/human/as_human = owner
- if(as_human.dna?.species.id in list(SPECIES_SHADOW, SPECIES_NIGHTMARE))
- return FALSE
-
- if (meson_negated && (owner.sight & SEE_TURFS))
- return FALSE
-
- var/lit_tiles = 0
- var/unlit_tiles = 0
-
- for (var/turf/open/turf_to_check in range(1, owner))
- var/light_amount = turf_to_check.get_lumcount()
- if (light_amount > LIGHTING_TILE_IS_DARK)
- lit_tiles++
- else
- unlit_tiles++
-
- return lit_tiles < unlit_tiles
-
-/datum/terror_handler/simple_source/nyctophobia/on_activation(terror_buildup)
- . = ..()
- owner.add_mood_event("nyctophobia", /datum/mood_event/nyctophobia)
-
-/datum/terror_handler/simple_source/nyctophobia/on_deactivation(terror_buildup)
- . = ..()
- owner.clear_mood_event("nyctophobia")
-
-// Nightmare spell version with quicker buildup that shadows the quirk one, also handles removing the status upon reaching 0 terror
-/datum/terror_handler/simple_source/nyctophobia/terrified
- // Takes about 30 seconds to reach maximum if you include 100 from casting the spell
- buildup_per_second = 15
- // Overrides the base type with slower buildup
- overrides = list(/datum/terror_handler/simple_source/nyctophobia)
- meson_negated = FALSE
-
-/datum/terror_handler/simple_source/nyctophobia/terrified/tick(seconds_per_tick, terror_buildup)
- . = ..()
- if (terror_buildup == 0 && !.)
- owner.RemoveComponentSource("terrified", /datum/component/fearful)
-
-/// Makes the owner afraid of being stuck in closets, crates, mechs, etc
-/datum/terror_handler/simple_source/claustrophobia
- buildup_per_second = 15
-
-/datum/terror_handler/simple_source/claustrophobia/Destroy(force)
- owner.clear_mood_event("claustrophobia")
- return ..()
-
-/datum/terror_handler/simple_source/claustrophobia/check_condition(seconds_per_tick, terror_buildup)
- . = ..()
- if (!.)
- return
-
- if (isturf(owner.loc))
- return FALSE
-
- if (SPT_PROB(15, seconds_per_tick))
- to_chat(owner, span_warning("You feel trapped! Must escape... can't breathe..."))
-
- return TRUE
-
-/datum/terror_handler/simple_source/claustrophobia/on_activation(terror_buildup)
- . = ..()
- owner.add_mood_event("claustrophobia", /datum/mood_event/claustrophobia)
-
-/datum/terror_handler/simple_source/claustrophobia/on_deactivation(terror_buildup)
- . = ..()
- owner.clear_mood_event("claustrophobia")
-
-/// Makes the owner afraid of certain jolly figures
-/datum/terror_handler/simple_source/clausophobia
- buildup_per_second = 20
-
-/datum/terror_handler/simple_source/clausophobia/check_condition(seconds_per_tick, terror_buildup)
- . = ..()
- if (!.)
- return
-
- var/certified_jolly = FALSE
-
- for(var/mob/living/carbon/human/possible_claus in view(5, owner))
- if(istype(possible_claus.back, /obj/item/storage/backpack/santabag))
- certified_jolly = TRUE
- break
-
- if(istype(possible_claus.head, /obj/item/clothing/head/costume/santa) || istype(possible_claus.head, /obj/item/clothing/head/helmet/space/santahat))
- certified_jolly = TRUE
- break
-
- if(istype(possible_claus.wear_suit, /obj/item/clothing/suit/space/santa))
- certified_jolly = TRUE
- break
-
- if (!certified_jolly)
- return FALSE
-
- if (SPT_PROB(15, seconds_per_tick))
- to_chat(owner, span_warning("Santa Claus is here! I gotta get out of here!"))
-
- return TRUE
-
-/// Makes the owner afraid of being alone
-/datum/terror_handler/simple_source/monophobia
- buildup_per_second = 2.5 // Pretty low, ~4 minutes to reach passive cap
-
-/datum/terror_handler/simple_source/monophobia/check_condition(seconds_per_tick, terror_buildup)
- . = ..()
- if (!.)
- return
-
- var/check_radius = 7
- if (owner.is_blind())
- check_radius = 1
-
- for (var/mob/living/friend in view(check_radius, owner))
- if (friend == owner)
- continue
-
- if (istype(friend, /mob/living/basic/pet) || friend.ckey)
- return FALSE
-
- return TRUE
diff --git a/code/datums/components/fearful/sources/_sources.dm b/code/datums/components/fearful/sources/_sources.dm
new file mode 100644
index 000000000000..6c5631671992
--- /dev/null
+++ b/code/datums/components/fearful/sources/_sources.dm
@@ -0,0 +1,179 @@
+// Terror source handlers
+/// Simple source which passively increases terror based on a single condition and can do something when its added/removed
+/datum/terror_handler/simple_source
+ handler_type = TERROR_HANDLER_SOURCE
+ /// How much terror is added per second
+ var/buildup_per_second = 10
+ /// Have we already applied our effects?
+ var/active = FALSE
+
+/datum/terror_handler/simple_source/tick(seconds_per_tick, terror_buildup)
+ . = ..()
+ if (check_condition(seconds_per_tick, terror_buildup) && terror_buildup < TERROR_BUILDUP_PASSIVE_MAXIMUM)
+ if (!active)
+ on_activation(terror_buildup)
+ . += min(buildup_per_second * seconds_per_tick, TERROR_BUILDUP_PASSIVE_MAXIMUM - terror_buildup)
+ else if (active)
+ on_deactivation(terror_buildup)
+
+/// Proc that children should override with their conditions
+/datum/terror_handler/simple_source/proc/check_condition(seconds_per_tick, terror_buildup)
+ return !HAS_TRAIT(owner, TRAIT_FEARLESS) && !HAS_TRAIT(owner, TRAIT_MIND_TEMPORARILY_GONE) && owner.stat < UNCONSCIOUS
+
+/// Proc that's called when the effect is first applied, for moodlets and alike
+/datum/terror_handler/simple_source/proc/on_activation(terror_buildup)
+ active = TRUE
+
+/// Proc that's called when the effect stops working, for moodlets and alike
+/datum/terror_handler/simple_source/proc/on_deactivation(terror_buildup)
+ active = FALSE
+
+/// Makes the owner terrified of darkness
+/datum/terror_handler/simple_source/nyctophobia
+ buildup_per_second = 5 // Takes about two minutes to reach maximum
+ /// Are we counteracted by mesons?
+ var/meson_negated = TRUE
+
+/datum/terror_handler/simple_source/nyctophobia/Destroy(force)
+ owner.clear_mood_event("nyctophobia")
+ return ..()
+
+/datum/terror_handler/simple_source/nyctophobia/check_condition(seconds_per_tick, terror_buildup)
+ . = ..()
+ if (!.)
+ return
+
+ if (ishuman(owner))
+ var/mob/living/carbon/human/as_human = owner
+ if(as_human.dna?.species.id in list(SPECIES_SHADOW, SPECIES_NIGHTMARE))
+ return FALSE
+
+ if (meson_negated && (owner.sight & SEE_TURFS))
+ return FALSE
+
+ var/lit_tiles = 0
+ var/unlit_tiles = 0
+
+ for (var/turf/open/turf_to_check in range(1, owner))
+ var/light_amount = turf_to_check.get_lumcount()
+ if (light_amount > LIGHTING_TILE_IS_DARK)
+ lit_tiles++
+ else
+ unlit_tiles++
+
+ return lit_tiles < unlit_tiles
+
+/datum/terror_handler/simple_source/nyctophobia/on_activation(terror_buildup)
+ . = ..()
+ owner.add_mood_event("nyctophobia", /datum/mood_event/nyctophobia)
+
+/datum/terror_handler/simple_source/nyctophobia/on_deactivation(terror_buildup)
+ . = ..()
+ owner.clear_mood_event("nyctophobia")
+
+/// Nightmare spell version with quicker buildup that shadows the quirk one, also handles removing the status upon reaching 0 terror
+/datum/terror_handler/simple_source/nyctophobia/terrified
+ // Takes about 30 seconds to reach maximum if you include 100 from casting the spell
+ buildup_per_second = 15
+ // Overrides the base type with slower buildup
+ overrides = list(/datum/terror_handler/simple_source/nyctophobia)
+ meson_negated = FALSE
+
+/datum/terror_handler/simple_source/nyctophobia/terrified/tick(seconds_per_tick, terror_buildup)
+ . = ..()
+ if (terror_buildup == 0 && !.)
+ owner.RemoveComponentSource("terrified", /datum/component/fearful)
+
+/// Makes the owner afraid of being stuck in closets, crates, mechs, etc
+/datum/terror_handler/simple_source/claustrophobia
+ buildup_per_second = 15
+ COOLDOWN_DECLARE(message_cd)
+
+/datum/terror_handler/simple_source/claustrophobia/Destroy(force)
+ owner.clear_mood_event("claustrophobia")
+ return ..()
+
+/datum/terror_handler/simple_source/claustrophobia/check_condition(seconds_per_tick, terror_buildup)
+ . = ..()
+ if (!.)
+ return
+
+ if (isturf(owner.loc))
+ return FALSE
+
+ if (COOLDOWN_FINISHED(src, message_cd) && SPT_PROB(15, seconds_per_tick))
+ to_chat(owner, span_warning("You feel trapped! Must escape... can't breathe..."))
+ COOLDOWN_START(src, message_cd, TERROR_MESSAGE_CD)
+
+ return TRUE
+
+/datum/terror_handler/simple_source/claustrophobia/on_activation(terror_buildup)
+ . = ..()
+ owner.add_mood_event("claustrophobia", /datum/mood_event/claustrophobia)
+
+/datum/terror_handler/simple_source/claustrophobia/on_deactivation(terror_buildup)
+ . = ..()
+ owner.clear_mood_event("claustrophobia")
+
+/// Makes the owner afraid of certain jolly figures
+/datum/terror_handler/simple_source/clausophobia
+ buildup_per_second = 20
+ COOLDOWN_DECLARE(message_cd)
+
+/datum/terror_handler/simple_source/clausophobia/check_condition(seconds_per_tick, terror_buildup)
+ . = ..()
+ if (!.)
+ return
+
+ var/certified_jolly = FALSE
+
+ for (var/mob/living/carbon/human/possible_claus in view(5, owner))
+ if (possible_claus == owner)
+ continue // imagine being scared of your own existence
+
+ if (!istype(possible_claus.wear_suit, /obj/item/clothing/suit/space/santa))
+ continue
+
+ if (istype(possible_claus.back, /obj/item/storage/backpack/santabag))
+ certified_jolly = TRUE
+ break
+
+ if (istype(possible_claus.head, /obj/item/clothing/head/costume/santa) || istype(possible_claus.head, /obj/item/clothing/head/helmet/space/santahat))
+ certified_jolly = TRUE
+ break
+
+ if (!certified_jolly)
+ return FALSE
+
+ if (COOLDOWN_FINISHED(src, message_cd) && SPT_PROB(15, seconds_per_tick))
+ to_chat(owner, span_warning("Santa Claus is here! I gotta get out of here!"))
+ COOLDOWN_START(src, message_cd, TERROR_MESSAGE_CD)
+
+ return TRUE
+
+/// Makes the owner afraid of being alone
+/datum/terror_handler/simple_source/monophobia
+ buildup_per_second = 2.5 // Pretty low, ~4 minutes to reach passive cap
+ COOLDOWN_DECLARE(message_cd)
+
+/datum/terror_handler/simple_source/monophobia/check_condition(seconds_per_tick, terror_buildup)
+ . = ..()
+ if (!.)
+ return
+
+ var/check_radius = 7
+ if (owner.is_blind())
+ check_radius = 1
+
+ for (var/mob/living/friend in view(check_radius, owner))
+ if (friend == owner)
+ continue
+
+ if (istype(friend, /mob/living/basic/pet) || friend.ckey)
+ return FALSE
+
+ if (COOLDOWN_FINISHED(src, message_cd) && SPT_PROB(10, seconds_per_tick))
+ to_chat(owner, span_warning("You feel terribly lonely..."))
+ COOLDOWN_START(src, message_cd, TERROR_MESSAGE_CD)
+
+ return TRUE
diff --git a/code/datums/components/fearful/sources/phobia.dm b/code/datums/components/fearful/sources/phobia.dm
new file mode 100644
index 000000000000..e93038677698
--- /dev/null
+++ b/code/datums/components/fearful/sources/phobia.dm
@@ -0,0 +1,170 @@
+/// Complex terror source that increases buildup whenever the owner hears, sees, or tries to say something they're afraid of
+/datum/terror_handler/phobia_source
+ handler_type = TERROR_HANDLER_SOURCE
+ bespoke = TRUE
+ /// Last time we got scared shitless for passive increase in fear
+ /// Regex for words that set the phobia off
+ var/regex/trigger_regex
+ // Instead of cycling every atom, only cycle the relevant types
+ var/list/trigger_mobs
+ /// Includes mob equipment
+ var/list/trigger_objs
+ var/list/trigger_turfs
+ var/list/trigger_species
+ /// What mood event to apply when we see the thing & freak out.
+ var/mood_event_type = /datum/mood_event/phobia
+ /// Cooldown for proximity checks so we don't spam a range 7 view every two seconds.
+ COOLDOWN_DECLARE(check_cooldown)
+ /// Cooldown for the actual scare effect so chat spam won't instantly send us spiraling
+ COOLDOWN_DECLARE(scare_cooldown)
+
+/datum/terror_handler/phobia_source/New(mob/living/new_owner, datum/component/fearful/new_component)
+ . = ..()
+ RegisterSignal(new_owner, COMSIG_MOB_SAY, PROC_REF(handle_speech))
+ RegisterSignal(new_owner, COMSIG_MOVABLE_HEAR, PROC_REF(handle_hearing))
+
+/datum/terror_handler/phobia_source/Destroy(force)
+ UnregisterSignal(owner, list(COMSIG_MOB_SAY, COMSIG_MOVABLE_HEAR))
+ return ..()
+
+/datum/terror_handler/phobia_source/proc/can_trigger()
+ return !HAS_TRAIT(owner, TRAIT_FEARLESS) && !HAS_TRAIT(owner, TRAIT_MIND_TEMPORARILY_GONE) && owner.stat < UNCONSCIOUS
+
+/datum/terror_handler/phobia_source/tick(seconds_per_tick, terror_buildup)
+ . = ..()
+ if (!can_trigger())
+ return
+
+ // If we're still scared from the last trigger, keep adding just a tiiiiny buildup to prevent it from fading away
+ if (!COOLDOWN_FINISHED(src, scare_cooldown))
+ return 0.01
+
+ if(!COOLDOWN_FINISHED(src, check_cooldown) || owner.is_blind())
+ return
+
+ COOLDOWN_START(src, check_cooldown, PHOBIA_CHECK_DELAY)
+ if(LAZYLEN(trigger_objs))
+ for (var/obj/seen_thing in view(owner.client?.view || world.view, owner))
+ if(is_scary_item(seen_thing))
+ return freak_out(seen_thing)
+
+ if(LAZYLEN(trigger_turfs))
+ for(var/turf/checked in view(owner.client?.view || world.view, owner))
+ if(is_type_in_typecache(checked, trigger_turfs))
+ return freak_out(checked)
+
+ if(LAZYLEN(trigger_mobs) || LAZYLEN(trigger_species) || LAZYLEN(trigger_objs))
+ for(var/mob/living/checked in view(owner.client?.view || world.view, owner))
+ if (checked != owner && is_scary_mob(checked))
+ return freak_out(checked)
+
+/// Returns true if this item should be scary to us
+/datum/terror_handler/phobia_source/proc/is_scary_item(obj/checked)
+ if (QDELETED(checked) || !is_type_in_typecache(checked, trigger_objs) || checked.invisibility > owner.see_invisible)
+ return FALSE
+
+ if (!isitem(checked) || !ismob(checked.loc) || HAS_TRAIT(checked.loc, TRAIT_UNKNOWN_APPEARANCE))
+ return TRUE
+
+ var/obj/item/checked_item = checked
+ return !HAS_TRAIT(checked_item, TRAIT_EXAMINE_SKIP)
+
+/datum/terror_handler/phobia_source/proc/is_scary_mob(mob/living/checked)
+ if (checked.invisibility > owner.see_invisible || checked.alpha == 0)
+ return FALSE
+
+ if (is_type_in_typecache(checked, trigger_mobs))
+ return TRUE
+
+ if (!ishuman(checked))
+ return FALSE
+
+ var/mob/living/carbon/human/as_human = checked
+ if (LAZYLEN(trigger_species))
+ // Can't be racist(?) if you can't see their face
+ if (is_type_in_typecache(as_human.dna?.species, trigger_species) && !as_human.is_face_obscured())
+ return TRUE
+
+ if (!LAZYLEN(trigger_objs))
+ return FALSE
+
+ for (var/obj/item/equipped as anything in as_human.get_visible_items())
+ if (is_scary_item(equipped))
+ return TRUE
+
+ return FALSE
+
+/datum/terror_handler/phobia_source/proc/handle_hearing(datum/source, list/hearing_args)
+ SIGNAL_HANDLER
+
+ if (!can_trigger() || !COOLDOWN_FINISHED(src, scare_cooldown))
+ return
+
+ // Words can't trigger you if you can't hear them *taps head*
+ if(!owner.can_hear() || owner == hearing_args[HEARING_SPEAKER] || !owner.has_language(hearing_args[HEARING_LANGUAGE]))
+ return
+
+ if(trigger_regex.Find(hearing_args[HEARING_RAW_MESSAGE]))
+ // To react AFTER the chat message
+ addtimer(CALLBACK(src, PROC_REF(freak_out), null, trigger_regex.group[2]), 1 SECONDS)
+ hearing_args[HEARING_RAW_MESSAGE] = trigger_regex.Replace(hearing_args[HEARING_RAW_MESSAGE], "[span_phobia("$2")]$3")
+
+/datum/terror_handler/phobia_source/proc/handle_speech(datum/source, list/speech_args)
+ SIGNAL_HANDLER
+
+ if (!can_trigger())
+ return
+
+ if (trigger_regex.Find(speech_args[SPEECH_MESSAGE]) == 0)
+ return
+
+ var/stutter = prob(50)
+ var/whisper = prob(30)
+
+ if (!stutter && !whisper)
+ return
+
+ if (whisper)
+ speech_args[SPEECH_SPANS] |= SPAN_SMALL_VOICE
+ if (stutter)
+ owner.set_stutter_if_lower(4 SECONDS)
+ to_chat(owner, span_warning("You struggle to say the word \"[span_phobia("[trigger_regex.group[2]]")]\"!"))
+
+/datum/terror_handler/phobia_source/proc/freak_out(reason)
+ COOLDOWN_START(src, scare_cooldown, 12 SECONDS)
+ var/message = pick("spooks you to the bone", "shakes you up", "terrifies you", "sends you into a panic", "sends chills down your spine")
+ if(istext(reason))
+ to_chat(owner, span_bolddanger("Hearing [span_phobia(reason)] [message]!"))
+ owner.add_mood_event("phobia_minor", /datum/mood_event/startled)
+ // Because this is called from a signal and not the main process, we need to add the buildup by hand
+ if (component.terror_buildup < TERROR_BUILDUP_PASSIVE_MAXIMUM)
+ component.terror_buildup = min(component.terror_buildup + PHOBIA_WORD_TERROR_BUILDUP, TERROR_BUILDUP_PASSIVE_MAXIMUM)
+ return
+
+ if(mood_event_type)
+ owner.add_mood_event("phobia", mood_event_type)
+
+ if(isatom(reason))
+ var/atom/as_atom = reason
+ to_chat(owner, span_bolddanger("Seeing [span_phobia("[as_atom.name]")] [message]!"))
+ else
+ to_chat(owner, span_bolddanger("Something [message]!"))
+ return PHOBIA_FREAKOUT_TERROR_BUILDUP
+
+/datum/terror_handler/phobia_source/on_hug(mob/living/hugger)
+ if (is_scary_mob(hugger))
+ return HUG_TERROR_AMOUNT
+ return 0
+
+/// Snowflake handler for hemophobia which triggers on bloodied items and mobs
+/datum/terror_handler/phobia_source/blood
+
+/datum/terror_handler/phobia_source/blood/is_scary_item(obj/checked)
+ if (GET_ATOM_BLOOD_DNA_LENGTH(checked))
+ return TRUE
+ return ..()
+
+/datum/terror_handler/phobia_source/blood/is_scary_mob(mob/living/checked)
+ if (GET_ATOM_BLOOD_DNA_LENGTH(checked))
+ return TRUE
+ return ..()
diff --git a/code/datums/components/fearful/terror_handler.dm b/code/datums/components/fearful/terror_handler.dm
index 93aa6a6c5b11..1b2add3bf35b 100644
--- a/code/datums/components/fearful/terror_handler.dm
+++ b/code/datums/components/fearful/terror_handler.dm
@@ -11,6 +11,8 @@
var/default = FALSE
/// Other effects which should be disabled while this one is running
var/list/overrides
+ /// Is this handler bespoke, and always requires a new instance upon adding even when one is already present?
+ var/bespoke = FALSE
/datum/terror_handler/New(mob/living/new_owner, datum/component/fearful/new_component)
. = ..()
@@ -25,3 +27,7 @@
/// Single tick of terror handler, returns adjustment to terror buildup
/datum/terror_handler/proc/tick(seconds_per_tick, terror_buildup)
return 0
+
+/// Additional effects when we're hugged by a mob, returns fear adjustment per hug. Should only be positive.
+/datum/terror_handler/proc/on_hug(mob/living/hugger)
+ return 0
diff --git a/code/datums/components/fishing_spot.dm b/code/datums/components/fishing_spot.dm
index 127f542f5611..be645066bb66 100644
--- a/code/datums/components/fishing_spot.dm
+++ b/code/datums/components/fishing_spot.dm
@@ -1,5 +1,6 @@
// A thing you can fish in
/datum/component/fishing_spot
+ dupe_mode = COMPONENT_DUPE_UNIQUE
/// Defines the probabilities and fish availibilty
var/datum/fish_source/fish_source
@@ -26,7 +27,6 @@
REMOVE_TRAIT(parent, TRAIT_FISHING_SPOT, REF(src))
fish_source.on_fishing_spot_del(src)
fish_source = null
- REMOVE_TRAIT(parent, TRAIT_FISHING_SPOT, REF(src))
return ..()
/datum/component/fishing_spot/proc/handle_cast(datum/source, obj/item/fishing_rod/rod, mob/user)
diff --git a/code/datums/components/food/edible.dm b/code/datums/components/food/edible.dm
index 552731fc74dc..9541615485e0 100644
--- a/code/datums/components/food/edible.dm
+++ b/code/datums/components/food/edible.dm
@@ -39,11 +39,11 @@ Behavior that's still missing from this component that original food items had t
///Last time we checked for food likes
var/last_check_time
///Assoc list of sources and their foodtypes
- var/list/foodtypes_by_source = list()
+ var/list/foodtypes_by_source
///Assoc list of sources and their food flags
- var/list/food_flags_by_source = list()
+ var/list/food_flags_by_source
///Assoc list of sources and their junkiness
- var/list/junkiness_by_source = list()
+ var/list/junkiness_by_source
/datum/component/edible/Initialize(
list/initial_reagents,
@@ -93,10 +93,6 @@ Behavior that's still missing from this component that original food items had t
RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(UseFromHand))
RegisterSignal(parent, COMSIG_ITEM_USED_AS_INGREDIENT, PROC_REF(used_to_customize))
- var/obj/item/item = parent
- if(!item.grind_results)
- item.grind_results = list() //If this doesn't already exist, add it as an empty list. This is needed for the grinder to accept it.
-
else if(isturf(parent) || isstructure(parent))
RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, PROC_REF(TryToEatIt))
@@ -145,16 +141,16 @@ Behavior that's still missing from this component that original food items had t
var/recalculate = FALSE
if(!isnull(foodtypes))
- if(foodtypes_by_source[source]) //foodtypes being overriden
+ if(LAZYACCESS(foodtypes_by_source, source)) //foodtypes being overriden
recalculate = TRUE
- foodtypes_by_source[source] = foodtypes
+ LAZYSET(foodtypes_by_source, source, foodtypes)
if(!isnull(food_flags))
- if(food_flags_by_source[source]) //food_flags being overriden
+ if(LAZYACCESS(food_flags_by_source, source)) //food_flags being overridden
recalculate = TRUE
- food_flags_by_source[source] = food_flags
+ LAZYSET(food_flags_by_source, source, food_flags)
if(!isnull(junkiness))
- src.junkiness += junkiness - junkiness_by_source[source]
- junkiness_by_source[source] = junkiness
+ src.junkiness += junkiness - LAZYACCESS(junkiness_by_source, source)
+ LAZYSET(junkiness_by_source, source, junkiness)
if(recalculate)
recalculate_food_flags()
@@ -194,10 +190,10 @@ Behavior that's still missing from this component that original food items had t
/datum/component/edible/on_source_remove(source)
//rebuild the foodtypes and food_flags bitfields without the removed source
- foodtypes_by_source -= source
- food_flags_by_source -= source
- junkiness -= junkiness_by_source[source]
- junkiness_by_source -= source
+ LAZYREMOVE(foodtypes_by_source, source)
+ LAZYREMOVE(food_flags_by_source, source)
+ junkiness -= LAZYACCESS(junkiness_by_source, source)
+ LAZYREMOVE(junkiness_by_source, source)
recalculate_food_flags()
return ..()
@@ -205,8 +201,8 @@ Behavior that's still missing from this component that original food items had t
foodtypes = NONE
food_flags = NONE
for(var/source_key in foodtypes_by_source)
- foodtypes |= foodtypes_by_source[source_key]
- food_flags |= food_flags_by_source[source_key]
+ foodtypes |= LAZYACCESS(foodtypes_by_source, source_key)
+ food_flags |= LAZYACCESS(food_flags_by_source, source_key)
if(foodtypes & GORE)
ADD_TRAIT(parent, TRAIT_VALID_DNA_INFUSION, REF(src))
else
@@ -287,7 +283,7 @@ Behavior that's still missing from this component that original food items had t
else
examine_list += span_notice("[owner] was bitten multiple times!")
- if(GLOB.Debug2)
+ if(GLOB.debugging_enabled)
examine_list += span_notice("Reagent purities:")
for(var/datum/reagent/reagent as anything in owner.reagents.reagent_list)
examine_list += span_notice("- [reagent.name] [reagent.volume]u: [round(reagent.purity * 100)]% pure")
@@ -495,6 +491,7 @@ Behavior that's still missing from this component that original food items had t
playsound(eater.loc,'sound/items/eatfood.ogg', rand(10,50), TRUE)
if(!owner.reagents.total_volume)
return
+ SEND_SIGNAL(eater, COMSIG_LIVING_EAT_FOOD, owner)
var/sig_return = SEND_SIGNAL(parent, COMSIG_FOOD_EATEN, eater, feeder, bitecount, bite_consumption)
if(sig_return & DESTROY_FOOD)
qdel(owner)
@@ -516,6 +513,8 @@ Behavior that's still missing from this component that original food items had t
checkLiked(fraction, eater)
+ check_materials(eater, fraction)
+
if(!owner.reagents.total_volume)
On_Consume(eater, feeder)
@@ -531,6 +530,29 @@ Behavior that's still missing from this component that original food items had t
return TRUE
+///Perform operations based on materials and/or if the parent object is a stack.
+/datum/component/edible/proc/check_materials(mob/living/carbon/eater, fraction)
+ var/atom/owner = parent
+ var/is_stack = isstack(owner)
+
+ //food may also apply golem buffs if it contains certain materials and the mob has the required trait
+ if(owner.custom_materials && HAS_TRAIT(eater, TRAIT_ROCK_EATER))
+ for(var/datum/material/material as anything in owner.custom_materials)
+ var/effect_stack_amount = (owner.custom_materials[material] * fraction) / SHEET_MATERIAL_AMOUNT
+ var/datum/golem_food_buff/effect
+ effect = GLOB.golem_stack_food_directory[material.sheet_type || material.ore_type]
+ if(effect?.can_consume(eater))
+ effect.on_consumption(eater, owner, effect_stack_amount)
+
+ if(fraction >= 1) //don't bother if the item is about to be deleted anyway...
+ return
+
+ if(is_stack) //stacks use up sheets, which recalulates the materials already.
+ var/obj/item/stack/stack = owner
+ stack.use(CEILING(stack.amount * fraction, 1))
+ else if(owner.custom_materials)
+ owner.set_custom_materials(owner.custom_materials, 1 - fraction)
+
///Checks whether or not the eater can actually consume the food
/datum/component/edible/proc/CanConsume(mob/living/carbon/eater, mob/living/feeder)
if(!iscarbon(eater))
@@ -550,8 +572,10 @@ Behavior that's still missing from this component that original food items had t
qdel(food)
return FALSE
- if(SEND_SIGNAL(eater, COMSIG_CARBON_ATTEMPT_EAT, food) & COMSIG_CARBON_BLOCK_EAT)
- return
+ if(SEND_SIGNAL(eater, COMSIG_CARBON_ATTEMPT_EAT, food) & BLOCK_EAT_ATTEMPT)
+ return FALSE
+ if(SEND_SIGNAL(food, COMSIG_FOOD_ATTEMPT_EAT, eater, feeder) & BLOCK_EAT_ATTEMPT)
+ return FALSE
return TRUE
///Applies food buffs according to the crafting complexity
@@ -611,10 +635,7 @@ Behavior that's still missing from this component that original food items had t
var/atom/owner = parent
var/timeout_mod = owner.reagents.get_average_purity(/datum/reagent/consumable) * 2 // mood event duration is 100% at average purity of 50%
- var/datum/mood_event/event = GLOB.food_quality_events[food_quality]
- event = new event.type
- event.timeout *= timeout_mod
- gourmand.add_mood_event("quality_food", event)
+ gourmand.add_mood_event("quality_food", /datum/mood_event/food, food_quality, timeout_mod)
gourmand.adjust_disgust(-5 + -2 * food_quality * fraction)
var/quality_label = GLOB.food_quality_description[food_quality]
to_chat(gourmand, span_notice("That's \an [quality_label] meal."))
@@ -720,6 +741,8 @@ Behavior that's still missing from this component that original food items had t
///Ability to feed food to puppers
/datum/component/edible/proc/on_entered(datum/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs)
SIGNAL_HANDLER
+ if(QDELETED(parent))
+ return
SEND_SIGNAL(parent, COMSIG_FOOD_CROSSED, arrived, bitecount)
///Response to being used to customize something
diff --git a/code/datums/components/food/ice_cream_holder.dm b/code/datums/components/food/ice_cream_holder.dm
index d509a15484bb..59ee6cdc95b9 100644
--- a/code/datums/components/food/ice_cream_holder.dm
+++ b/code/datums/components/food/ice_cream_holder.dm
@@ -315,10 +315,10 @@ GLOBAL_LIST_INIT_TYPED(ice_cream_flavours, /datum/ice_cream_flavour, init_ice_cr
ingredients = list(/datum/reagent/consumable/milk, /datum/reagent/consumable/ice, /datum/reagent/consumable/peachjuice)
reagent_type = /datum/reagent/consumable/peachjuice
-/datum/ice_cream_flavour/vanilla/korta
+/*/datum/ice_cream_flavour/vanilla/korta // DARKPACK EDIT REMOVE START - No lizzers
name = ICE_CREAM_KORTA_VANILLA
desc = "filled with vanilla ice cream made with korta milk. Lizards love it!"
- ingredients = list(/datum/reagent/consumable/korta_milk, /datum/reagent/consumable/ice, /datum/reagent/consumable/vanilla)
+ ingredients = list(/datum/reagent/consumable/korta_milk, /datum/reagent/consumable/ice, /datum/reagent/consumable/vanilla)*/ // DARKPACK EDIT REMOVE END - No lizzers
/datum/ice_cream_flavour/cherry_chocolate
name = ICE_CREAM_CHERRY_CHOCOLATE
@@ -343,11 +343,11 @@ GLOBAL_LIST_INIT_TYPED(ice_cream_flavours, /datum/ice_cream_flavour, init_ice_cr
ingredients_text = "optional flavorings"
takes_custom_ingredients = TRUE
-/datum/ice_cream_flavour/custom/korta
+/*/datum/ice_cream_flavour/custom/korta // DARKPACK EDIT REMOVE START - No lizzers
name = ICE_CREAM_KORTA_CUSTOM
desc = "filled with artisanal lizard-friendly ice cream. Made with real $CUSTOM_NAME. Ain't that something."
ingredients = list(/datum/reagent/consumable/korta_milk, /datum/reagent/consumable/ice)
- ingredients_text = "optional flavorings"
+ ingredients_text = "optional flavorings"*/ // DARKPACK EDIT REMOVE END - No lizzers
/datum/ice_cream_flavour/custom/add_flavour(datum/component/ice_cream_holder/target, datum/reagents/custom_ingredients)
if(!custom_ingredients || custom_ingredients.total_volume < 4) //consumable reagents have stronger taste so higher volume are required to allow non-food flavourings to break through better.
diff --git a/code/datums/components/gps.dm b/code/datums/components/gps.dm
index e1d620222cbc..a9e4a3b82f99 100644
--- a/code/datums/components/gps.dm
+++ b/code/datums/components/gps.dm
@@ -5,11 +5,13 @@ GLOBAL_LIST_EMPTY(GPS_list)
var/gpstag = "COM0"
var/tracking = TRUE
var/emped = FALSE
+ var/list/turf/tagged
-/datum/component/gps/Initialize(_gpstag = "COM0")
+/datum/component/gps/Initialize(_gpstag = "COM0", _tracking = TRUE)
if(!isatom(parent))
return COMPONENT_INCOMPATIBLE
gpstag = _gpstag
+ tracking = _tracking
GLOB.GPS_list += src
/datum/component/gps/Destroy()
@@ -32,8 +34,9 @@ GLOBAL_LIST_EMPTY(GPS_list)
var/global_mode = TRUE //If disabled, only GPS signals of the same Z level are shown
/// UI state of GPS, altering when it can be used.
var/datum/ui_state/state = null
+ var/debug_mode = FALSE
-/datum/component/gps/item/Initialize(_gpstag = "COM0", emp_proof = FALSE, state = null, overlay_state = "working")
+/datum/component/gps/item/Initialize(_gpstag = "COM0", _tracking = TRUE, emp_proof = FALSE, state = null, overlay_state = "working", debug = FALSE)
. = ..()
if(. == COMPONENT_INCOMPATIBLE || !isitem(parent))
return COMPONENT_INCOMPATIBLE
@@ -41,17 +44,28 @@ GLOBAL_LIST_EMPTY(GPS_list)
if(isnull(state))
state = GLOB.default_state
src.state = state
+ debug_mode = debug
var/atom/A = parent
if(overlay_state)
A.add_overlay(overlay_state)
A.name = "[initial(A.name)] ([gpstag])"
RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(interact))
+
+ if(debug_mode && tracking)
+ RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(tag_the_floor))
+
if(!emp_proof)
RegisterSignal(parent, COMSIG_ATOM_EMP_ACT, PROC_REF(on_emp_act))
+
RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine))
RegisterSignal(parent, COMSIG_CLICK_ALT, PROC_REF(on_click_alt))
+/datum/component/gps/item/Destroy()
+ if(tagged)
+ clear()
+ return ..()
+
///Called on COMSIG_ITEM_ATTACK_SELF
/datum/component/gps/item/proc/interact(datum/source, mob/user)
SIGNAL_HANDLER
@@ -59,6 +73,29 @@ GLOBAL_LIST_EMPTY(GPS_list)
if(user)
INVOKE_ASYNC(src, PROC_REF(ui_interact), user)
+///Called on COMSIG_MOVABLE_MOVED
+/datum/component/gps/item/proc/tag_the_floor(atom/movable/mover, turf/old_loc)
+ SIGNAL_HANDLER
+
+ if(!debug_mode)
+ return
+
+ var/turf/tagged_turf = get_turf(mover)
+ if(tagged_turf)
+ tagged_turf.color = RANDOM_COLOUR
+ tagged_turf.maptext = MAPTEXT("[tagged_turf.x],[tagged_turf.y],[tagged_turf.z]")
+ LAZYOR(tagged, tagged_turf)
+
+///Called on COMSIG_MOVABLE_MOVED
+/datum/component/gps/item/proc/clear()
+ SIGNAL_HANDLER
+
+ while(tagged.len)
+ var/turf/tagged_turf = pop(tagged)
+ tagged_turf.color = initial(tagged_turf.color)
+ tagged_turf.maptext = initial(tagged_turf.maptext)
+ LAZYNULL(tagged)
+
///Called on COMSIG_ATOM_EXAMINE
/datum/component/gps/item/proc/on_examine(datum/source, mob/user, list/examine_list)
SIGNAL_HANDLER
@@ -108,6 +145,13 @@ GLOBAL_LIST_EMPTY(GPS_list)
to_chat(user, span_notice("[parent] is now tracking, and visible to other GPS devices."))
tracking = TRUE
+ if(debug_mode)
+ if(tracking)
+ RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(tag_the_floor))
+ else
+ UnregisterSignal(parent, COMSIG_MOVABLE_MOVED)
+ clear()
+
/datum/component/gps/item/ui_interact(mob/user, datum/tgui/ui)
if(emped)
to_chat(user, span_hear("[parent] fizzles weakly."))
diff --git a/code/datums/components/grillable.dm b/code/datums/components/grillable.dm
index 34a6675edd6a..5b31a0fdec0c 100644
--- a/code/datums/components/grillable.dm
+++ b/code/datums/components/grillable.dm
@@ -41,8 +41,8 @@
var/atom/result = new cook_result
if(!item_parent.compare_materials(result))
var/warning = "custom_materials of [result.type] when grilled compared to just spawned don't match"
- var/what_it_should_be = item_parent.get_materials_english_list()
- stack_trace("[warning]. custom_materials should be [what_it_should_be].")
+ var/what_it_should_be = item_parent.transcribe_materials_list()
+ stack_trace("[warning]. should be: custom_materials = [what_it_should_be].")
qdel(result)
/datum/component/grillable/RegisterWithParent()
@@ -155,7 +155,7 @@
LAZYADD(grilled_food.intrinsic_food_materials, original_food.intrinsic_food_materials)
grilled_result.set_custom_materials(original_object.custom_materials)
- if(IsEdible(grilled_result) && positive_result)
+ if(IS_EDIBLE(grilled_result) && positive_result)
BLACKBOX_LOG_FOOD_MADE(grilled_result.type)
//make space and tranfer reagents if it has any, also let any bad result handle removing or converting the transferred reagents on its own terms
if(grilled_result.reagents && original_object.reagents)
diff --git a/code/datums/components/happiness.dm b/code/datums/components/happiness.dm
index 75aecee35613..791b9b32b7c4 100644
--- a/code/datums/components/happiness.dm
+++ b/code/datums/components/happiness.dm
@@ -62,7 +62,7 @@
/datum/component/happiness/proc/on_eat(datum/source)
SIGNAL_HANDLER
- increase_happiness_level(on_eat_change)
+ change_happiness_level(on_eat_change)
/datum/component/happiness/proc/on_clean(mob/living/source)
SIGNAL_HANDLER
@@ -74,7 +74,7 @@
return NONE
COOLDOWN_START(src, groom_cooldown, GROOM_COOLDOWN)
- increase_happiness_level(on_groom_change)
+ change_happiness_level(on_groom_change)
return COMPONENT_CLEANED|COMPONENT_CLEANED_GAIN_XP
/datum/component/happiness/proc/on_petted(datum/source, mob/living/petter, list/modifiers)
@@ -91,42 +91,55 @@
/datum/component/happiness/proc/pet_animal()
if(!COOLDOWN_FINISHED(src, pet_cooldown))
return
- increase_happiness_level(on_petted_change)
+ change_happiness_level(on_petted_change)
COOLDOWN_START(src, pet_cooldown, PET_COOLDOWN)
-/datum/component/happiness/proc/increase_happiness_level(amount)
- happiness_level = min(happiness_level + amount, maximum_happiness)
- if(!HAS_TRAIT(parent, TRAIT_MOB_HIDE_HAPPINESS))
- var/mob/living/living_parent = parent
+/datum/component/happiness/proc/change_happiness_level(amount)
+ var/old_happiness = happiness_level
+ happiness_level = clamp(happiness_level + amount, 0, maximum_happiness)
+ var/happiness_percentage = happiness_level / maximum_happiness
+ var/old_percentage = old_happiness / maximum_happiness
+
+ var/old_threshold = 0
+ var/new_threshold = 0
+ for(var/check_percentage in callback_percentages)
+ if (check_percentage <= old_percentage)
+ old_threshold = check_percentage
+ if (check_percentage <= happiness_percentage)
+ new_threshold = check_percentage
+
+ if (old_threshold != new_threshold)
+ SEND_SIGNAL(parent, COMSIG_MOB_HAPPINESS_CHANGE, happiness_percentage)
+ happiness_callback?.Invoke(happiness_percentage)
+
+ var/mob/living/living_parent = parent
+ living_parent.ai_controller?.set_blackboard_key(blackboard_key, happiness_percentage)
+
+ if(!HAS_TRAIT(parent, TRAIT_MOB_HIDE_HAPPINESS) && amount > 0)
new /obj/effect/temp_visual/heart(living_parent.loc)
living_parent.spin(spintime = 2 SECONDS, speed = 1)
- START_PROCESSING(SSprocessing, src)
+
+ if (happiness_level > 0)
+ START_PROCESSING(SSprocessing, src)
/datum/component/happiness/proc/view_happiness(mob/living/source, mob/living/clicker)
- if(HAS_TRAIT(source, TRAIT_MOB_HIDE_HAPPINESS) || !istype(clicker) || !COOLDOWN_FINISHED(src, happiness_inspect) || !clicker.CanReach(source))
+ if(HAS_TRAIT(source, TRAIT_MOB_HIDE_HAPPINESS) || !istype(clicker) || !COOLDOWN_FINISHED(src, happiness_inspect) || !source.IsReachableBy(clicker))
return
var/y_position = source.get_cached_height() + 1
var/obj/effect/overlay/happiness_overlay/hearts = new
+ hearts.pixel_w -= source.base_pixel_x + source.base_pixel_w
hearts.pixel_y = y_position
- hearts.set_hearts(happiness_level/maximum_happiness)
+ hearts.set_hearts(happiness_level / maximum_happiness)
source.vis_contents += hearts
COOLDOWN_START(src, happiness_inspect, INSPECT_TIMER)
-
/datum/component/happiness/process()
- var/mob/living/living_parent = parent
- var/happiness_percentage = happiness_level/maximum_happiness
- living_parent.ai_controller?.set_blackboard_key(blackboard_key, happiness_percentage)
- var/check_percentage_in_list = round(happiness_percentage * 100, 1)
- if(check_percentage_in_list in callback_percentages)
- SEND_SIGNAL(parent, COMSIG_MOB_HAPPINESS_CHANGE, happiness_percentage)
- happiness_callback?.Invoke(happiness_percentage)
-
if(happiness_level <= 0)
return PROCESS_KILL
+ var/mob/living/living_parent = parent
var/modifier = living_parent.ai_controller?.blackboard[BB_BASIC_DEPRESSED] ? 2 : 1
- happiness_level = max(0, happiness_level - modifier)
+ change_happiness_level(-modifier)
/obj/effect/overlay/happiness_overlay
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
diff --git a/code/datums/components/hat_stabilizer.dm b/code/datums/components/hat_stabilizer.dm
index 44545f273a45..b7d1a4a3ce2b 100644
--- a/code/datums/components/hat_stabilizer.dm
+++ b/code/datums/components/hat_stabilizer.dm
@@ -2,7 +2,7 @@
/datum/component/hat_stabilizer
dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS
/// Currently "stored" hat. No armor or function will be inherited, only the icon and cover flags.
- var/obj/item/clothing/head/attached_hat
+ var/obj/item/attached_hat
/// If TRUE, the hat will fall to the ground when the owner does so. It can also be shot off.
var/loose_hat = FALSE
/// Original cover flags for the helmet, before a hat is placed
@@ -12,6 +12,8 @@
var/use_worn_icon = TRUE
/// Pixel z offset for the hat
var/pixel_z_offset
+ /// Which way a loose hat is offset
+ var/head_angle = 1
/datum/component/hat_stabilizer/Initialize(use_worn_icon = FALSE, pixel_z_offset = 0, loose_hat = FALSE)
if(!ismovable(parent))
@@ -114,7 +116,7 @@
if(loose_hat)
var/matrix/tilt_trix = matrix(worn_overlay.transform)
var/angle = 5
- tilt_trix.Turn(angle * pick(1, -1))
+ tilt_trix.Turn(angle * head_angle)
worn_overlay.transform = tilt_trix
worn_overlay.pixel_z = pixel_z_offset + attached_hat.worn_y_offset
overlays += worn_overlay
@@ -132,7 +134,7 @@
if(loose_hat)
var/matrix/tilt_trix = matrix(worn_overlay.transform)
var/angle = 5
- tilt_trix.Turn(angle * pick(1, -1))
+ tilt_trix.Turn(angle * head_angle)
worn_overlay.transform = tilt_trix
worn_overlay.pixel_z = pixel_z_offset + attached_hat.worn_y_offset
overlays += worn_overlay
@@ -147,41 +149,44 @@
SIGNAL_HANDLER
var/atom/movable/movable_parent = parent
- if(!istype(hitting_item, /obj/item/clothing/head))
+ if(!(hitting_item.slot_flags & ITEM_SLOT_HEAD))
return
if(attached_hat)
movable_parent.balloon_alert(user, "hat already attached!")
return
+ if(isclothing(hitting_item))
+ var/obj/item/clothing/hat = hitting_item
+ if(hat.clothing_flags & STACKABLE_HELMET_EXEMPT)
+ movable_parent.balloon_alert(user, "invalid hat!")
+ return
- var/obj/item/clothing/hat = hitting_item
- if(hat.clothing_flags & STACKABLE_HELMET_EXEMPT)
- movable_parent.balloon_alert(user, "invalid hat!")
+ if(!user.transferItemToLoc(hitting_item, parent, force = FALSE, silent = TRUE))
return
- if(!user.transferItemToLoc(hat, parent, force = FALSE, silent = TRUE))
- return
-
- attach_hat(hat, user)
+ attach_hat(hitting_item, user)
-/datum/component/hat_stabilizer/proc/attach_hat(obj/item/clothing/hat, mob/user)
+/datum/component/hat_stabilizer/proc/attach_hat(obj/item/hat, mob/user)
var/atom/movable/movable_parent = parent
attached_hat = hat
RegisterSignal(hat, COMSIG_MOVABLE_MOVED, PROC_REF(on_hat_movement))
+ head_angle = pick(1, -1)
if (!isnull(user))
movable_parent.balloon_alert(user, "hat attached")
- if (!istype(parent, /obj/item/clothing))
+ if (!isclothing(parent))
movable_parent.update_appearance()
return
var/obj/item/clothing/apparel = parent
- apparel.attach_clothing_traits(attached_hat.clothing_traits)
+ if(isclothing(attached_hat))
+ var/obj/item/clothing/realhat = attached_hat
+ apparel.attach_clothing_traits(realhat.clothing_traits)
+ apparel.visor_flags_cover |= realhat.visor_flags_cover
former_flags = apparel.flags_cover
former_visor_flags = apparel.visor_flags_cover
apparel.flags_cover |= attached_hat.flags_cover
- apparel.visor_flags_cover |= attached_hat.visor_flags_cover
apparel.update_appearance()
if (ismob(apparel.loc))
@@ -220,14 +225,16 @@
else
movable_parent.balloon_alert_to_viewers("the hat falls to the floor!")
- if (!istype(parent, /obj/item/clothing))
+ if (!isclothing(parent))
attached_hat = null
movable_parent.update_appearance()
return
var/former_hat = attached_hat
var/obj/item/clothing/apparel = parent
- apparel.detach_clothing_traits(attached_hat.clothing_traits)
+ if(isclothing(attached_hat))
+ var/obj/item/clothing/truehat = attached_hat
+ apparel.detach_clothing_traits(truehat.clothing_traits)
apparel.flags_cover = former_flags
apparel.visor_flags_cover = former_visor_flags
apparel.update_appearance()
@@ -235,8 +242,8 @@
if (ismob(apparel.loc))
var/mob/wearer = apparel.loc
wearer.update_clothing(wearer.get_slot_by_item(apparel))
-
- return former_hat
+ if(isnull(user))
+ return former_hat
/datum/component/hat_stabilizer/proc/on_requesting_context_from_item(atom/source, list/context, obj/item/held_item, mob/user)
SIGNAL_HANDLER
diff --git a/code/datums/components/hazard_area.dm b/code/datums/components/hazard_area.dm
index f747e8e2ace7..79a67fd78ad0 100644
--- a/code/datums/components/hazard_area.dm
+++ b/code/datums/components/hazard_area.dm
@@ -169,4 +169,5 @@
/atom/movable/screen/alert/status_effect/hazard_area
name = "Hazardous Area"
desc = "The area you are currently within is incredibly hazardous to you. Check your surroundings and vacate as soon as possible."
- icon_state = "hazard_area"
+ use_user_hud_icon = TRUE
+ overlay_state = "hazard_area"
diff --git a/code/datums/components/healing_touch.dm b/code/datums/components/healing_touch.dm
index 07f04cba01d7..b8580e2e458f 100644
--- a/code/datums/components/healing_touch.dm
+++ b/code/datums/components/healing_touch.dm
@@ -45,6 +45,8 @@
var/required_modifier
/// Callback to run after healing a mob
var/datum/callback/after_healed
+ /// Callback to run to get a multiplier for our healing value
+ var/datum/callback/healing_multiplier
/datum/component/healing_touch/Initialize(
heal_brute = 20,
@@ -65,6 +67,7 @@
heal_color = COLOR_HEALING_CYAN,
required_modifier = null,
datum/callback/after_healed = null,
+ datum/callback/healing_multiplier = null,
)
if (!isliving(parent))
return COMPONENT_INCOMPATIBLE
@@ -87,6 +90,7 @@
src.heal_color = heal_color
src.required_modifier = required_modifier
src.after_healed = after_healed
+ src.healing_multiplier = healing_multiplier
RegisterSignal(parent, COMSIG_LIVING_UNARMED_ATTACK, PROC_REF(try_healing)) // Players
RegisterSignal(parent, COMSIG_HOSTILE_PRE_ATTACKINGTARGET, PROC_REF(try_healing)) // NPCs
@@ -161,14 +165,14 @@
/datum/component/healing_touch/proc/has_healable_damage(mob/living/target)
if (!isnull(valid_biotypes) && !(valid_biotypes & target.mob_biotypes))
return FALSE
- if (target.getStaminaLoss() > 0 && heal_stamina)
+ if (target.get_stamina_loss() > 0 && heal_stamina)
return TRUE
- if (target.getOxyLoss() > 0 && heal_oxy)
+ if (target.get_oxy_loss() > 0 && heal_oxy)
return TRUE
- if (target.getToxLoss() > 0 && heal_tox)
+ if (target.get_tox_loss() > 0 && heal_tox)
return TRUE
if (!iscarbon(target))
- return (target.getBruteLoss() > 0 && heal_brute) || (target.getFireLoss() > 0 && heal_burn)
+ return (target.get_brute_loss() > 0 && heal_brute) || (target.get_fire_loss() > 0 && heal_burn)
var/mob/living/carbon/carbon_target = target
for (var/obj/item/bodypart/part in carbon_target.bodyparts)
if (!(part.brute_dam && heal_brute) && !(part.burn_dam && heal_burn))
@@ -190,15 +194,21 @@
if (complete_text)
healer.visible_message(span_notice("[format_string(complete_text, healer, target)]"))
+ var/mult = 1
+ if (healing_multiplier)
+ mult = healing_multiplier.Invoke(healer, target)
+ if (mult == 0)
+ return
+
var/healed = target.heal_overall_damage(
- brute = heal_brute,
- burn = heal_burn,
- stamina = heal_stamina,
+ brute = heal_brute * mult,
+ burn = heal_burn * mult,
+ stamina = heal_stamina * mult,
required_bodytype = required_bodytype,
updating_health = FALSE,
)
- healed += target.adjustOxyLoss(-heal_oxy, updating_health = FALSE, required_biotype = valid_biotypes)
- healed += target.adjustToxLoss(-heal_tox, updating_health = FALSE, required_biotype = valid_biotypes)
+ healed += target.adjust_oxy_loss(-heal_oxy * mult, updating_health = FALSE, required_biotype = valid_biotypes)
+ healed += target.adjust_tox_loss(-heal_tox * mult, updating_health = FALSE, required_biotype = valid_biotypes)
if (healed <= 0)
return
diff --git a/code/datums/components/heart_eater.dm b/code/datums/components/heart_eater.dm
index 1ef06559624b..d61aec5ac438 100644
--- a/code/datums/components/heart_eater.dm
+++ b/code/datums/components/heart_eater.dm
@@ -111,11 +111,11 @@
///Heart eater give also strong healing from hearts.
/datum/component/heart_eater/proc/healing_heart(mob/living/carbon/human/eater)
for(var/heal_organ in eater.organs)
- eater.adjustOrganLoss(heal_organ, -50)
+ eater.adjust_organ_loss(heal_organ, -50)
for(var/datum/wound/heal_wound in eater.all_wounds)
heal_wound.remove_wound()
- eater.adjustBruteLoss(-50)
- eater.adjustFireLoss(-50)
- eater.adjustToxLoss(-50)
- eater.adjustOxyLoss(-50)
- eater.adjustStaminaLoss(-50)
+ eater.adjust_brute_loss(-50)
+ eater.adjust_fire_loss(-50)
+ eater.adjust_tox_loss(-50)
+ eater.adjust_oxy_loss(-50)
+ eater.adjust_stamina_loss(-50)
diff --git a/code/datums/components/houlihan_teleport.dm b/code/datums/components/houlihan_teleport.dm
new file mode 100644
index 000000000000..b819742e495a
--- /dev/null
+++ b/code/datums/components/houlihan_teleport.dm
@@ -0,0 +1,93 @@
+/// Teleports interactors onto a safe turf randomly picked from a list of z-levels.
+/datum/component/houlihan_teleport
+ dupe_mode = COMPONENT_DUPE_HIGHLANDER
+ /// Text that will appear in the alert prompt.
+ var/question = "Travel back?"
+ /// List of z-levels that the user can teleport to. By default, this is station z-levels.
+ var/list/zlevels
+
+/datum/component/houlihan_teleport/Initialize(question, zlevels)
+ . = ..()
+ if(!isstructure(parent))
+ return COMPONENT_INCOMPATIBLE
+
+ if(!isnull(question) && (!istext(question) || !length(question)))
+ stack_trace("received bad question argument, falling back to default")
+ question = null
+ src.question = question || initial(src.question)
+
+ if(!isnull(zlevels) && (!islist(zlevels) || !length(zlevels)))
+ stack_trace("received bad zlevels argument, falling back to default")
+ zlevels = null
+ src.zlevels = zlevels || SSmapping.levels_by_trait(ZTRAIT_STATION)
+
+/datum/component/houlihan_teleport/RegisterWithParent()
+ RegisterSignals(parent, list(COMSIG_ATOM_ATTACK_ROBOT, COMSIG_ATOM_ATTACK_PAW, COMSIG_ATOM_ATTACK_ANIMAL, COMSIG_ATOM_ATTACK_LARVA), PROC_REF(handle_generic_attack))
+ RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, PROC_REF(handle_attack_hand))
+ RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(handle_attackby))
+
+/datum/component/houlihan_teleport/UnregisterFromParent()
+ UnregisterSignal(parent, list(
+ COMSIG_ATOM_ATTACK_ROBOT, COMSIG_ATOM_ATTACK_PAW, COMSIG_ATOM_ATTACK_ANIMAL, COMSIG_ATOM_ATTACK_LARVA, //handle_generic_attack
+ COMSIG_ATOM_ATTACK_HAND, //handle_attack_hand
+ COMSIG_ATOM_ATTACKBY, //handle_attackby
+ ))
+
+/datum/component/houlihan_teleport/proc/get_me_outta_here(obj/structure/source, mob/living/user)
+ var/said_yes = (tgui_alert(user, question, source.name, list("Yes", "No")) == "Yes")
+ if(!said_yes || !source.Adjacent(user))
+ return
+
+ var/turf/destination_turf = zlevels ? find_safe_turf(zlevels) : get_safe_random_station_turf_equal_weight()
+ if(!destination_turf)
+ source.balloon_alert(user, "uh oh...")
+ to_chat(user, span_warning("Nothing happens. You feel like this is a bad sign."))
+ return
+
+ var/turf/user_turf = get_turf(user)
+ var/atom/movable/dragged = user.pulling
+ user.forceMove(destination_turf)
+ user_turf.balloon_alert_to_viewers("(pop)")
+ if(dragged)
+ var/turf/dragged_turf = get_turf(dragged)
+ dragged.forceMove(destination_turf)
+ user.start_pulling(dragged, force = TRUE)
+ dragged_turf.balloon_alert_to_viewers("(pop)")
+
+ to_chat(list(user, dragged), span_notice("You blink and find yourself in [get_area_name(destination_turf)]."))
+ user.emote("blink")
+ astype(dragged, /mob)?.emote("blink") // shhhhh just let it happen
+
+/datum/component/houlihan_teleport/proc/handle_generic_attack(obj/structure/source, mob/living/user, list/modifiers)
+ SIGNAL_HANDLER
+
+ if(user.combat_mode)
+ return NONE
+
+ if(iscyborg(user) && !source.Adjacent(user))
+ return NONE
+
+ INVOKE_ASYNC(src, PROC_REF(get_me_outta_here), source, user)
+ return COMPONENT_NO_AFTERATTACK
+
+/datum/component/houlihan_teleport/proc/handle_attack_hand(obj/structure/source, mob/user, list/modifiers)
+ SIGNAL_HANDLER
+
+ if(!isliving(user))
+ return NONE
+
+ var/mob/living/living_user = user
+ if(living_user.combat_mode)
+ return NONE
+
+ INVOKE_ASYNC(src, PROC_REF(get_me_outta_here), source, living_user)
+ return COMPONENT_CANCEL_ATTACK_CHAIN
+
+/datum/component/houlihan_teleport/proc/handle_attackby(obj/structure/source, obj/item/item, mob/living/user, list/modifiers)
+ SIGNAL_HANDLER
+
+ if(user.combat_mode)
+ return NONE
+
+ INVOKE_ASYNC(src, PROC_REF(get_me_outta_here), source, user)
+ return COMPONENT_NO_AFTERATTACK
diff --git a/code/datums/components/irradiated.dm b/code/datums/components/irradiated.dm
index 803af82940be..31ee58bb77ef 100644
--- a/code/datums/components/irradiated.dm
+++ b/code/datums/components/irradiated.dm
@@ -85,7 +85,7 @@
return PROCESS_KILL
var/mob/living/carbon/human/human_parent = parent
- if (human_parent.getToxLoss() == 0)
+ if (human_parent.get_tox_loss() == 0)
qdel(src)
return PROCESS_KILL
@@ -181,7 +181,7 @@
if (isliving(source))
var/mob/living/living_source = source
- to_chat(user, span_bolddanger("[icon2html(geiger_counter, user)] Subject is irradiated. Contamination traces back to roughly [DisplayTimeText(world.time - beginning_of_irradiation, 5)] ago. Current toxin levels: [living_source.getToxLoss()]."))
+ to_chat(user, span_bolddanger("[icon2html(geiger_counter, user)] Subject is irradiated. Contamination traces back to roughly [DisplayTimeText(world.time - beginning_of_irradiation, 5)] ago. Current toxin levels: [living_source.get_tox_loss()]."))
else
// In case the green wasn't obvious enough...
to_chat(user, span_bolddanger("[icon2html(geiger_counter, user)] Target is irradiated."))
@@ -198,7 +198,8 @@
/atom/movable/screen/alert/irradiated
name = "Irradiated"
desc = "You're irradiated! Heal your toxins quick, and stand under a shower to halt the incoming damage."
- icon_state = ALERT_IRRADIATED
+ use_user_hud_icon = TRUE
+ overlay_state = "irradiated"
#undef RADIATION_BURN_SPLOTCH_DAMAGE
#undef RADIATION_BURN_INTERVAL_MIN
diff --git a/code/datums/components/joint_damage.dm b/code/datums/components/joint_damage.dm
index 5397bd307cab..e96a387abc0e 100644
--- a/code/datums/components/joint_damage.dm
+++ b/code/datums/components/joint_damage.dm
@@ -31,5 +31,5 @@
var/mob/living/overlord_to_damage = overlord_mob?.resolve()
if(!isnull(overlord_to_damage))
- overlord_to_damage.adjustBruteLoss(previous_health_count - source.health) ///damage or heal overlord
+ overlord_to_damage.adjust_brute_loss(previous_health_count - source.health) ///damage or heal overlord
previous_health_count = source.health
diff --git a/code/datums/components/jukebox.dm b/code/datums/components/jukebox.dm
index 7e9f96571347..07004dd05b36 100644
--- a/code/datums/components/jukebox.dm
+++ b/code/datums/components/jukebox.dm
@@ -95,16 +95,26 @@
var/static/list/config_songs
if(isnull(config_songs))
config_songs = list()
- var/list/tracks = flist("[global.config.directory]/jukebox_music/sounds/")
+ var/list/tracks = flist(CONFIG_JUKEBOX_SOUNDS)
for(var/track_file in tracks)
var/datum/track/new_track = new()
- new_track.song_path = file("[global.config.directory]/jukebox_music/sounds/[track_file]")
+ new_track.song_path = file("[CONFIG_JUKEBOX_SOUNDS][track_file]")
var/list/track_data = splittext(track_file, "+")
- if(length(track_data) < 3)
+ if(!length(track_data) || !IS_SOUND_FILE_SAFE(new_track.song_path))
continue
- new_track.song_name = track_data[1]
- new_track.song_length = text2num(track_data[2])
- new_track.song_beat = text2num(track_data[3])
+ var/track_name = track_data[JUKEBOX_NAME]
+ track_name = strip_filepath_extension(track_name, SSsounds.safe_formats)
+ new_track.song_name = track_name
+ new_track.song_length = SSsounds.get_sound_length(new_track.song_path)
+ if(track_data.len >= 3) // Bandaid for legacy tracks to not use the length for the bpm rather then the actual beats.
+ var/static/logged_to_admins = FALSE
+ log_game("[new_track.song_path] track data seems to be using the legacy format; we will attempt to make it work.")
+ if(!logged_to_admins)
+ message_admins("The jukebox has tracks uploaded in a legacy format. Length is now fetched programmatically, with title and beats being the only required fields.")
+ logged_to_admins = TRUE
+ new_track.song_beat_deciseconds = text2num(track_data[3])
+ else if(track_data.len >= 2)
+ new_track.song_beat_deciseconds = text2num(track_data[JUKEBOX_BEATS])
config_songs[new_track.song_name] = new_track
if(!length(config_songs))
@@ -128,7 +138,7 @@
UNTYPED_LIST_ADD(songs_data, list( \
"name" = song_name, \
"length" = DisplayTimeText(one_song.song_length), \
- "beat" = one_song.song_beat, \
+ "beat" = one_song.song_beat_deciseconds || "Unknown", \
))
data["active"] = !!active_song_sound
@@ -399,11 +409,12 @@
var/song_length = 0
/// How long is a beat of the song in decisconds
/// Used to determine time between effects when played
- var/song_beat = 0
+ /// Do note this is NOT BPM.
+ var/song_beat_deciseconds = 0
// Default track supplied for testing and also because it's a banger
/datum/track/default
song_path = 'sound/music/lobby_music/title3.ogg'
song_name = "Tintin on the Moon"
song_length = 3 MINUTES + 52 SECONDS
- song_beat = 1 SECONDS
+ song_beat_deciseconds = 1 SECONDS
diff --git a/code/datums/components/life_link.dm b/code/datums/components/life_link.dm
index 98858f61c3cb..a79758122c51 100644
--- a/code/datums/components/life_link.dm
+++ b/code/datums/components/life_link.dm
@@ -65,13 +65,13 @@
amount *= our_mob.get_damage_mod(type)
switch (type)
if(BRUTE)
- host.adjustBruteLoss(amount, forced = TRUE)
+ host.adjust_brute_loss(amount, forced = TRUE)
if(BURN)
- host.adjustFireLoss(amount, forced = TRUE)
+ host.adjust_fire_loss(amount, forced = TRUE)
if(TOX)
- host.adjustToxLoss(amount, forced = TRUE)
+ host.adjust_tox_loss(amount, forced = TRUE)
if(OXY)
- host.adjustOxyLoss(amount, forced = TRUE)
+ host.adjust_oxy_loss(amount, forced = TRUE)
on_passed_damage?.Invoke(our_mob, host, amount)
return COMPONENT_IGNORE_CHANGE
@@ -80,9 +80,9 @@
/datum/component/life_link/proc/on_limb_damage(mob/living/our_mob, limb, brute, burn)
SIGNAL_HANDLER
if (brute != 0)
- host.adjustBruteLoss(brute, updating_health = FALSE)
+ host.adjust_brute_loss(brute, updating_health = FALSE)
if (burn != 0)
- host.adjustFireLoss(burn, updating_health = FALSE)
+ host.adjust_fire_loss(burn, updating_health = FALSE)
if (brute != 0 || burn != 0)
host.updatehealth()
on_passed_damage?.Invoke(our_mob, host, brute + burn)
diff --git a/code/datums/components/lockable_storage.dm b/code/datums/components/lockable_storage.dm
index 456bac0c45dc..51a0e48be6cd 100644
--- a/code/datums/components/lockable_storage.dm
+++ b/code/datums/components/lockable_storage.dm
@@ -34,13 +34,8 @@
canthold = list(/obj/item/storage/briefcase/secure),
)
-
- src.lock_code = lock_code
- if(!isnull(lock_code))
- atom_parent.atom_storage.set_locked(STORAGE_FULLY_LOCKED)
src.can_hack_open = can_hack_open
-
- atom_parent.update_appearance()
+ set_lock_code(lock_code)
/datum/component/lockable_storage/RegisterWithParent()
. = ..()
@@ -144,8 +139,18 @@
if(!tool.use_tool(parent, user, 40 SECONDS, volume = 50))
return
source.balloon_alert(user, "hacked")
+ set_lock_code(null)
+
+/datum/component/lockable_storage/proc/break_lock()
+ can_hack_open = FALSE // since it's broken for good
lock_code = null
+ var/obj/source = parent
+ source.obj_flags |= EMAGGED
+ source.atom_storage.locked = STORAGE_NOT_LOCKED
+ SEND_SIGNAL(source, COMSIG_LOCKABLE_STORAGE_SET_CODE, lock_code)
+ source.update_appearance()
+
/datum/component/lockable_storage/proc/on_emag(obj/source, mob/user, obj/item/card/emag/emag_card)
SIGNAL_HANDLER
@@ -154,17 +159,36 @@
if(source.obj_flags & EMAGGED)
return FALSE
- source.obj_flags |= EMAGGED
- can_hack_open = FALSE // since it's broken for good
source.visible_message(span_warning("Sparks fly from [source]!"), blind_message = span_hear("You hear a faint electrical spark."))
source.balloon_alert(user, "lock destroyed")
playsound(source, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
- lock_code = null
- source.atom_storage.locked = STORAGE_NOT_LOCKED
- source.update_appearance()
+ break_lock()
return ITEM_INTERACT_SUCCESS
+/**
+ * Sets the lock code for this storage and updates the locked state accordingly
+ * Arguments:
+ * * new_code - The new lock code to set, can be null to remove the code
+ */
+/datum/component/lockable_storage/proc/set_lock_code(new_code, mob/living/user)
+ var/obj/source = parent
+
+ // Can't set lock code if the electronics are emagged
+ if(source.obj_flags & EMAGGED)
+ return FALSE
+
+ lock_code = new_code
+ SEND_SIGNAL(source, COMSIG_LOCKABLE_STORAGE_SET_CODE, new_code)
+ var/lock_state = lock_code ? STORAGE_FULLY_LOCKED : STORAGE_NOT_LOCKED
+ source.atom_storage.set_locked(lock_state)
+ source.update_appearance()
+
+ if(istype(user) && new_code)
+ to_chat(user, span_notice("You set the [source] pincode to [lock_code]."))
+
+ return TRUE
+
///Updates the icon state depending on if we're locked or not.
/datum/component/lockable_storage/proc/on_update_icon_state(obj/source)
SIGNAL_HANDLER
@@ -219,7 +243,7 @@
if(!lock_code)
if(length(numeric_input) != 5)
return TRUE
- lock_code = numeric_input
+ set_lock_code(numeric_input, usr)
numeric_input = ""
return TRUE
//unlocking the current code.
diff --git a/code/datums/components/manual_heart.dm b/code/datums/components/manual_heart.dm
index fb815cdfdbb3..2dfd703ed462 100644
--- a/code/datums/components/manual_heart.dm
+++ b/code/datums/components/manual_heart.dm
@@ -49,22 +49,21 @@
RegisterSignal(parent, COMSIG_CARBON_LOSE_ORGAN, PROC_REF(check_removed_organ))
RegisterSignal(parent, COMSIG_CARBON_GAIN_ORGAN, PROC_REF(check_added_organ))
RegisterSignal(parent, COMSIG_HEART_MANUAL_PULSE, PROC_REF(on_pump))
- RegisterSignals(parent, list(COMSIG_LIVING_DEATH, SIGNAL_ADDTRAIT(TRAIT_NOBLOOD)), PROC_REF(pause))
- RegisterSignals(parent, list(COMSIG_LIVING_REVIVE, SIGNAL_REMOVETRAIT(TRAIT_NOBLOOD)), PROC_REF(restart))
+ RegisterSignal(parent, COMSIG_LIVING_UPDATE_BLOOD_STATUS, PROC_REF(on_update_blood_status))
pump_action.cooldown_time = pump_delay - (1 SECONDS) //you can pump up to a second early
pump_action.Grant(parent)
var/mob/living/carbon/carbon_parent = parent
var/obj/item/organ/heart/parent_heart = carbon_parent.get_organ_slot(ORGAN_SLOT_HEART)
- if(parent_heart && !HAS_TRAIT(carbon_parent, TRAIT_NOBLOOD) && carbon_parent.stat != DEAD)
+ if(parent_heart && CAN_HAVE_BLOOD(carbon_parent) && carbon_parent.stat != DEAD)
START_PROCESSING(SSdcs, src)
COOLDOWN_START(src, heart_timer, pump_delay)
to_chat(parent, span_userdanger("Your heart no longer beats automatically! You have to pump it manually - otherwise you'll die!"))
/datum/component/manual_heart/UnregisterFromParent()
- UnregisterSignal(parent, list(COMSIG_CARBON_GAIN_ORGAN, COMSIG_CARBON_LOSE_ORGAN, COMSIG_HEART_MANUAL_PULSE, COMSIG_LIVING_REVIVE, COMSIG_LIVING_DEATH, SIGNAL_ADDTRAIT(TRAIT_NOBLOOD), SIGNAL_REMOVETRAIT(TRAIT_NOBLOOD)))
+ UnregisterSignal(parent, list(COMSIG_CARBON_GAIN_ORGAN, COMSIG_CARBON_LOSE_ORGAN, COMSIG_HEART_MANUAL_PULSE, COMSIG_LIVING_REVIVE, COMSIG_LIVING_DEATH, COMSIG_LIVING_UPDATE_BLOOD_STATUS))
to_chat(parent, span_userdanger("You feel your heart start beating normally again!"))
var/mob/living/carbon/carbon_parent = parent
@@ -95,14 +94,14 @@
var/mob/living/carbon/carbon_owner = owner
- if(HAS_TRAIT(carbon_owner, TRAIT_NOBLOOD))
+ if(!CAN_HAVE_BLOOD(carbon_owner))
return
- carbon_owner.blood_volume = min(carbon_owner.blood_volume + (blood_loss * 0.5), BLOOD_VOLUME_MAXIMUM)
+ carbon_owner.adjust_blood_volume(blood_loss * 0.5)
carbon_owner.remove_client_colour(REF(src))
add_colour = TRUE
- carbon_owner.adjustBruteLoss(-heal_brute)
- carbon_owner.adjustFireLoss(-heal_burn)
- carbon_owner.adjustOxyLoss(-heal_oxy)
+ carbon_owner.adjust_brute_loss(-heal_brute)
+ carbon_owner.adjust_fire_loss(-heal_burn)
+ carbon_owner.adjust_oxy_loss(-heal_oxy)
/datum/component/manual_heart/process()
var/mob/living/carbon/carbon_parent = parent
@@ -115,13 +114,21 @@
if(!COOLDOWN_FINISHED(src, heart_timer))
return
- carbon_parent.blood_volume = max(carbon_parent.blood_volume - blood_loss, 0)
+ carbon_parent.adjust_blood_volume(-blood_loss)
to_chat(carbon_parent, span_userdanger("You have to keep pumping your blood!"))
COOLDOWN_START(src, heart_timer, MANUAL_HEART_GRACE_PERIOD) //give two full seconds before losing more blood
if(add_colour)
carbon_parent.add_client_colour(/datum/client_colour/manual_heart_blood, REF(src))
add_colour = FALSE
+/datum/component/manual_heart/proc/on_update_blood_status(datum/source, had_blood, has_blood, new_blood_volume, old_blood_volume)
+ SIGNAL_HANDLER
+
+ if (has_blood)
+ restart()
+ else
+ pause()
+
///If a new heart is added, start processing.
/datum/component/manual_heart/proc/check_added_organ(mob/organ_owner, obj/item/organ/new_organ)
SIGNAL_HANDLER
@@ -151,7 +158,7 @@
/datum/component/manual_heart/proc/check_valid()
var/mob/living/carbon/carbon_parent = parent
var/obj/item/organ/heart/parent_heart = carbon_parent.get_organ_slot(ORGAN_SLOT_HEART)
- return !isnull(parent_heart) && !HAS_TRAIT(carbon_parent, TRAIT_NOBLOOD) && carbon_parent.stat != DEAD
+ return !isnull(parent_heart) && CAN_HAVE_BLOOD(carbon_parent) && carbon_parent.stat != DEAD
///Action to pump your heart. Cooldown will always be set to 1 second less than the pump delay.
/datum/action/cooldown/manual_heart
@@ -169,7 +176,7 @@
///The action button is only available when you're a living carbon with blood and a heart.
/datum/action/cooldown/manual_heart/IsAvailable(feedback = FALSE)
var/mob/living/carbon/heart_haver = owner
- if(!istype(heart_haver) || HAS_TRAIT(heart_haver, TRAIT_NOBLOOD) || heart_haver.stat == DEAD)
+ if(!istype(heart_haver) || !CAN_HAVE_BLOOD(heart_haver) || heart_haver.stat == DEAD)
return FALSE
var/obj/item/organ/heart/heart_havers_heart = heart_haver.get_organ_slot(ORGAN_SLOT_HEART)
if(isnull(heart_havers_heart))
diff --git a/code/datums/components/mob_chain.dm b/code/datums/components/mob_chain.dm
index e2f90eed16ee..06bec239a2d4 100644
--- a/code/datums/components/mob_chain.dm
+++ b/code/datums/components/mob_chain.dm
@@ -171,7 +171,7 @@
SIGNAL_HANDLER
if (forced)
return
- back?.adjustStaminaLoss(amount, forced = forced)
+ back?.adjust_stamina_loss(amount, forced = forced)
/// On damage or heal, affect our furthest segment
/datum/component/mob_chain/proc/on_adjust_damage(mob/living/our_mob, type, amount, forced)
@@ -180,13 +180,13 @@
return
switch (type)
if(BRUTE)
- back.adjustBruteLoss(amount, forced = forced)
+ back.adjust_brute_loss(amount, forced = forced)
if(BURN)
- back.adjustFireLoss(amount, forced = forced)
+ back.adjust_fire_loss(amount, forced = forced)
if(TOX)
- back.adjustToxLoss(amount, forced = forced)
+ back.adjust_tox_loss(amount, forced = forced)
if(OXY) // If all segments are suffocating we pile damage backwards until our ass starts dying forwards
- back.adjustOxyLoss(amount, forced = forced)
+ back.adjust_oxy_loss(amount, forced = forced)
return COMPONENT_IGNORE_CHANGE
/// Special handling for if damage is delegated to a mob's limbs instead of its overall damage
@@ -195,9 +195,9 @@
if (isnull(back))
return
if (brute != 0)
- back.adjustBruteLoss(brute, updating_health = FALSE)
+ back.adjust_brute_loss(brute, updating_health = FALSE)
if (burn != 0)
- back.adjustFireLoss(burn, updating_health = FALSE)
+ back.adjust_fire_loss(burn, updating_health = FALSE)
if (brute != 0 || burn != 0)
back.updatehealth()
return COMPONENT_PREVENT_LIMB_DAMAGE
diff --git a/code/datums/components/monitored_area.dm b/code/datums/components/monitored_area.dm
new file mode 100644
index 000000000000..6797fe15f0ab
--- /dev/null
+++ b/code/datums/components/monitored_area.dm
@@ -0,0 +1,74 @@
+/// Area component that makes all movement inside get tracked by motion sensitive cameras
+/datum/component/monitored_area
+ dupe_mode = COMPONENT_DUPE_UNIQUE // Only one area will ever exist, so only one component will ever exist
+
+ /// This actually handles updating cameras and whatnot.
+ var/datum/motion_group/motion_group
+
+/datum/component/monitored_area/Initialize()
+ // By the way, this component should be added in LateInitialize().
+ if(!isarea(parent))
+ return COMPONENT_INCOMPATIBLE
+ motion_group = new()
+
+/datum/component/monitored_area/RegisterWithParent()
+ RegisterSignal(parent, COMSIG_AREA_ENTERED, PROC_REF(on_entered))
+ RegisterSignal(parent, COMSIG_AREA_EXITED, PROC_REF(on_exited))
+ // FIXME: cameras will never be updated after registration
+ for(var/obj/machinery/camera/camera in parent)
+ motion_group.track_camera(camera)
+
+/datum/component/monitored_area/UnregisterFromParent()
+ UnregisterSignal(parent, list(COMSIG_AREA_ENTERED, COMSIG_AREA_EXITED))
+ for(var/obj/machinery/camera/camera as anything in motion_group.motion_cameras)
+ motion_group.untrack_camera(camera)
+
+/datum/component/monitored_area/proc/on_entered(area/_source, atom/movable/gain, area/_old_area)
+ SIGNAL_HANDLER
+ motion_group.track_mob(gain)
+
+/datum/component/monitored_area/proc/on_exited(area/_source, atom/movable/lost, _direction)
+ SIGNAL_HANDLER
+ motion_group.untrack_mob(lost)
+
+/// Handler for motion groups. Motion-sensitive cameras can optionally associate with one of these groups.
+/// This doesn't do anything by itself. Something needs to drive it (like a [component][/datum/component/monitored_area]).
+/datum/motion_group
+ /// The cameras in this area that we are tracking. Lazy.
+ var/list/obj/machinery/camera/motion_cameras
+ /// Our motion targets. This gets referenced by cameras.
+ var/list/datum/weakref/motion_targets = list()
+
+/datum/motion_group/proc/track_camera(obj/machinery/camera/gain_camera)
+ if(!gain_camera.isMotion())
+ return
+
+ RegisterSignal(gain_camera, COMSIG_QDELETING, PROC_REF(untrack_camera))
+ gain_camera.set_area_motion(src)
+ LAZYOR(motion_cameras, gain_camera)
+
+/datum/motion_group/proc/untrack_camera(obj/machinery/camera/lost_camera)
+ SIGNAL_HANDLER
+
+ LAZYREMOVE(motion_cameras, lost_camera)
+ UnregisterSignal(lost_camera, COMSIG_QDELETING)
+ if(!LAZYLEN(motion_cameras))
+ // clear targets if we don't have any cameras so we don't have hanging references
+ // (they're weakrefs but still we should be doing this)
+ LAZYNULL(motion_targets)
+
+/datum/motion_group/proc/track_mob(mob/gain_mob)
+ if(!ismob(gain_mob) || !LAZYLEN(motion_cameras))
+ return
+
+ for(var/obj/machinery/camera/camera as anything in motion_cameras)
+ camera.new_target(gain_mob)
+ return //??
+
+/datum/motion_group/proc/untrack_mob(mob/lost_mob)
+ if(!ismob(lost_mob) || !LAZYLEN(motion_cameras))
+ return
+
+ for(var/obj/machinery/camera/camera as anything in motion_cameras)
+ camera.lost_target(lost_mob)
+ return //??
diff --git a/code/datums/components/orbiter.dm b/code/datums/components/orbiter.dm
index 72d7aeb91632..7bfead87625b 100644
--- a/code/datums/components/orbiter.dm
+++ b/code/datums/components/orbiter.dm
@@ -1,7 +1,11 @@
/datum/component/orbiter
can_transfer = TRUE
dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS
+ /// Assoc list of all orbiters -> their initial matrix
var/list/orbiter_list
+ /// Assoc list of orbiters -> their orbiting parameters
+ var/list/orbiter_params
+ /// Movement tracker used to check when our owner moves
var/datum/movement_detector/tracker
//radius: range to orbit at, radius of the circle formed by orbiting (in pixels)
@@ -14,6 +18,7 @@
return COMPONENT_INCOMPATIBLE
orbiter_list = list()
+ orbiter_params = list()
begin_orbit(orbiter, radius, clockwise, rotation_speed, rotation_segments, pre_rotation)
@@ -39,6 +44,7 @@
for(var/i in orbiter_list)
end_orbit(i)
orbiter_list = null
+ orbiter_params = null
return ..()
/datum/component/orbiter/InheritComponent(datum/component/orbiter/newcomp, original, atom/movable/orbiter, radius, clockwise, rotation_speed, rotation_segments, pre_rotation)
@@ -50,11 +56,14 @@
var/atom/movable/incoming_orbiter = o
incoming_orbiter.orbiting = src
// It is important to transfer the signals so we don't get locked to the new orbiter component for all time
- newcomp.UnregisterSignal(incoming_orbiter, COMSIG_MOVABLE_MOVED)
+ newcomp.UnregisterSignal(incoming_orbiter, list(COMSIG_MOVABLE_MOVED, COMSIG_ATOM_BEFORE_SHUTTLE_MOVE, COMSIG_ATOM_AFTER_SHUTTLE_MOVE))
RegisterSignal(incoming_orbiter, COMSIG_MOVABLE_MOVED, PROC_REF(orbiter_move_react))
+ RegisterSignal(incoming_orbiter, COMSIG_ATOM_BEFORE_SHUTTLE_MOVE, PROC_REF(orbiter_before_shuttle_move))
orbiter_list += newcomp.orbiter_list
+ orbiter_params += newcomp.orbiter_params
newcomp.orbiter_list = null
+ newcomp.orbiter_params = null
/datum/component/orbiter/PostTransfer(datum/new_parent)
if(!isatom(new_parent) || isarea(new_parent) || !get_turf(new_parent))
@@ -67,11 +76,14 @@
orbiter.orbiting.end_orbit(orbiter, TRUE)
else
orbiter.orbiting.end_orbit(orbiter)
+
+ orbiter_params[orbiter] = args.Copy(2)
orbiter_list[orbiter] = TRUE
orbiter.orbiting = src
ADD_TRAIT(orbiter, TRAIT_NO_FLOATING_ANIM, ORBITING_TRAIT)
RegisterSignal(orbiter, COMSIG_MOVABLE_MOVED, PROC_REF(orbiter_move_react))
+ RegisterSignal(orbiter, COMSIG_ATOM_BEFORE_SHUTTLE_MOVE, PROC_REF(orbiter_before_shuttle_move))
SEND_SIGNAL(parent, COMSIG_ATOM_ORBIT_BEGIN, orbiter)
@@ -103,15 +115,28 @@
orbiter.abstract_move(get_turf(parent))
to_chat(orbiter, span_notice("Now orbiting [parent]."))
+/datum/component/orbiter/proc/orbiter_before_shuttle_move(atom/source)
+ SIGNAL_HANDLER
+ // We need to detach ourselves before the shuttle moves and reattach afterwards
+ end_orbit(source, TRUE)
+ RegisterSignal(source, COMSIG_ATOM_AFTER_SHUTTLE_MOVE, PROC_REF(orbiter_after_shuttle_move))
+
+/datum/component/orbiter/proc/orbiter_after_shuttle_move(atom/source)
+ SIGNAL_HANDLER
+ UnregisterSignal(source, COMSIG_ATOM_AFTER_SHUTTLE_MOVE)
+ begin_orbit(arglist(list(source) + orbiter_params[source]))
+
/datum/component/orbiter/proc/end_orbit(atom/movable/orbiter, refreshing=FALSE)
if(!orbiter_list[orbiter])
return
- UnregisterSignal(orbiter, COMSIG_MOVABLE_MOVED)
+ UnregisterSignal(orbiter, list(COMSIG_MOVABLE_MOVED, COMSIG_ATOM_BEFORE_SHUTTLE_MOVE, COMSIG_ATOM_AFTER_SHUTTLE_MOVE))
SEND_SIGNAL(parent, COMSIG_ATOM_ORBIT_STOP, orbiter)
orbiter.SpinAnimation(0, 0)
if(istype(orbiter_list[orbiter],/matrix)) //This is ugly.
orbiter.transform = orbiter_list[orbiter]
orbiter_list -= orbiter
+ if(!refreshing)
+ orbiter_params -= orbiter
orbiter.stop_orbit(src)
orbiter.orbiting = null
diff --git a/code/datums/components/palette.dm b/code/datums/components/palette.dm
index 2ae66f50b23c..0fb937a3b11c 100644
--- a/code/datums/components/palette.dm
+++ b/code/datums/components/palette.dm
@@ -106,7 +106,7 @@
var/is_right_clicking = LAZYACCESS(params2list(params), RIGHT_CLICK)
var/index = text2num(choice)
if(is_right_clicking)
- var/chosen_color = input(user, "Pick new color", "[parent]", colors[index]) as color|null
+ var/chosen_color = tgui_color_picker(user, "Pick new color", "[parent]", colors[index])
if(chosen_color && !QDELETED(src) && !IS_DEAD_OR_INCAP(user) && user.is_holding(parent))
colors[index] = chosen_color
update_radial_list()
diff --git a/code/datums/components/payment.dm b/code/datums/components/payment.dm
index 282492827370..e03ad9a61d75 100644
--- a/code/datums/components/payment.dm
+++ b/code/datums/components/payment.dm
@@ -124,8 +124,8 @@
user.pulling = dollars_left
else
user.pulling = dollars_left
- log_econ("[total_cost] dollars were spent on [parent] by [user].")
- to_chat(user, span_notice("Purchase completed with held cash."))
+ log_econ("[total_cost] [MONEY_NAME] were spent on [parent] by [user].")
+ to_chat(user, span_notice("Purchase completed with held [MONEY_NAME]."))
// DARKPACK EDIT CHANGE END - ECONOMY
playsound(user, 'sound/effects/cashregister.ogg', 20, TRUE)
return TRUE
@@ -174,11 +174,11 @@
to_chat(user, span_warning("Credit Card lacks funds. Aborting."))
if(PAYMENT_VENDING)
to_chat(user, span_warning("You do not possess the funds to purchase that."))
- atom_parent.balloon_alert(user, "needs [total_cost] credit\s!")
+ atom_parent.balloon_alert(user, "needs [total_cost] [MONEY_NAME_AUTOPURAL(total_cost)]!")
return FALSE
target_acc.transfer_money(credit_card.registered_account, total_cost, "Nanotrasen: Usage of Corporate Machinery")
- log_econ("[total_cost] credits were spent on [parent] by [user] via [credit_card.registered_account.account_holder]'s card.")
- credit_card.registered_account.bank_card_talk("[total_cost] credits deducted from your account.")
+ log_econ("[total_cost] [MONEY_NAME] were spent on [parent] by [user] via [credit_card.registered_account.account_holder]'s card.")
+ credit_card.registered_account.bank_card_talk("[total_cost] [MONEY_NAME] deducted from your account.")
playsound(src, 'sound/effects/cashregister.ogg', 20, TRUE)
SSeconomy.add_audit_entry(credit_card.registered_account, total_cost, parent)
return TRUE
diff --git a/code/datums/components/pet_commands/fetch.dm b/code/datums/components/pet_commands/fetch.dm
index 143ac9ca1014..f3675534fa95 100644
--- a/code/datums/components/pet_commands/fetch.dm
+++ b/code/datums/components/pet_commands/fetch.dm
@@ -73,10 +73,11 @@
return
var/mob/thrower = throwingdatum?.get_thrower()
- if(thrower)
- try_activate_command(thrower)
- set_command_target(parent, thrown_thing)
- parent.ai_controller.set_blackboard_key(BB_FETCH_DELIVER_TO, thrower)
+ if(!istype(thrower))
+ return
+ try_activate_command(thrower)
+ set_command_target(parent, thrown_thing)
+ parent.ai_controller.set_blackboard_key(BB_FETCH_DELIVER_TO, thrower)
// Don't try and fetch turfs or anchored objects if someone points at them
/datum/pet_command/fetch/look_for_target(mob/living/pointing_friend, obj/item/pointed_atom)
diff --git a/code/datums/components/plumbing/_plumbing.dm b/code/datums/components/plumbing/_plumbing.dm
index d2414cc5af0f..cc454d4327c4 100644
--- a/code/datums/components/plumbing/_plumbing.dm
+++ b/code/datums/components/plumbing/_plumbing.dm
@@ -26,6 +26,9 @@
var/supply_color = COLOR_BLUE
///Extend the pipe to the edge for wall-mounted plumbed devices, like sinks and showers
var/extend_pipe_to_edge = FALSE
+ /// How many distinct reagents can we accept at once
+ /// Ex - if this was set to "3", our component would only request the first 3 reagents found, even if more are available
+ var/distinct_reagent_cap = INFINITY
///turn_connects is for wheter or not we spin with the object to change our pipes
/datum/component/plumbing/Initialize(start=TRUE, ducting_layer, turn_connects=TRUE, datum/reagents/custom_receiver, extend_pipe_to_edge = FALSE)
@@ -55,10 +58,19 @@
RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(create_overlays)) //called by lateinit on startup
RegisterSignal(parent, COMSIG_ATOM_DIR_CHANGE, PROC_REF(on_parent_dir_change)) //called when placed on a shuttle and it moves, and other edge cases
RegisterSignal(parent, COMSIG_MOVABLE_CHANGE_DUCT_LAYER, PROC_REF(change_ducting_layer))
+ RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine))
/datum/component/plumbing/UnregisterFromParent()
- UnregisterSignal(parent, list(COMSIG_MOVABLE_MOVED, COMSIG_QDELETING, COMSIG_OBJ_DEFAULT_UNFASTEN_WRENCH, COMSIG_OBJ_HIDE, \
- COMSIG_ATOM_UPDATE_OVERLAYS, COMSIG_ATOM_DIR_CHANGE, COMSIG_MOVABLE_CHANGE_DUCT_LAYER))
+ UnregisterSignal(parent, list(
+ COMSIG_MOVABLE_MOVED,
+ COMSIG_QDELETING,
+ COMSIG_OBJ_DEFAULT_UNFASTEN_WRENCH,
+ COMSIG_OBJ_HIDE,
+ COMSIG_ATOM_UPDATE_OVERLAYS,
+ COMSIG_ATOM_DIR_CHANGE,
+ COMSIG_MOVABLE_CHANGE_DUCT_LAYER,
+ COMSIG_ATOM_EXAMINE,
+ ))
REMOVE_TRAIT(parent, TRAIT_UNDERFLOOR, REF(src))
/datum/component/plumbing/Destroy()
@@ -76,6 +88,12 @@
if(D & demand_connects)
send_request(D)
+/datum/component/plumbing/proc/on_examine(atom/movable/source, mob/user, list/examine_list)
+ SIGNAL_HANDLER
+
+ if(distinct_reagent_cap != INFINITY)
+ examine_list += span_notice("This plumbing component will only accept up to [distinct_reagent_cap] distinct reagents at once.")
+
///Can we be added to the ductnet?
/datum/component/plumbing/proc/can_add(datum/ductnet/ductnet, dir)
if(!active)
@@ -89,22 +107,44 @@
///called from in process(). only calls process_request(), but can be overwritten for children with special behaviour
/datum/component/plumbing/proc/send_request(dir)
- process_request(dir = dir)
+ var/amount_to_give = MACHINE_REAGENT_TRANSFER
+ // infinite cap means we need to special handling, process_request will just grab as much as it wants.
+ if(distinct_reagent_cap == INFINITY)
+ process_request(amount_to_give, null, dir) // null for no specific reagent, we're not picky.
+ return
+
+ // we have a cap, so we need to figure out what reagents we want
+ var/list/all_allowed_reagents = get_all_network_reagents(ducts["[dir]"])
+ if(length(all_allowed_reagents) > distinct_reagent_cap)
+ all_allowed_reagents.Cut(distinct_reagent_cap + 1)
+ else if(!length(all_allowed_reagents))
+ return
+
+ // request an even amount of each allowed reagent
+ var/amount_per_reagent = round(amount_to_give / length(all_allowed_reagents), CHEMICAL_VOLUME_ROUNDING)
+ for(var/allowed_reagent in all_allowed_reagents)
+ process_request(amount_per_reagent, allowed_reagent, dir)
+
+/// Returns a list of all distinct reagent types available in the passed duct network.
+/// The passed net can be null, it is handled.
+/datum/component/plumbing/proc/get_all_network_reagents(datum/ductnet/net)
+ var/list/distinct_reagents = list()
+ for(var/datum/reagent/existing_regent as anything in reagents.reagent_list)
+ distinct_reagents |= existing_regent.type
+ for(var/datum/component/plumbing/supplier as anything in net?.suppliers)
+ for(var/datum/reagent/chemical as anything in supplier.reagents.reagent_list)
+ distinct_reagents |= chemical.type
+ return distinct_reagents
///check who can give us what we want, and how many each of them will give us
/datum/component/plumbing/proc/process_request(amount = MACHINE_REAGENT_TRANSFER, reagent, dir, round_robin = TRUE)
- //find the duct to take from
- var/datum/ductnet/net
- if(!ducts.Find(num2text(dir)))
- return FALSE
- net = ducts[num2text(dir)]
-
+ var/datum/ductnet/net = ducts["[dir]"]
//find all valid suppliers in the duct
var/list/valid_suppliers = list()
- for(var/datum/component/plumbing/supplier as anything in net.suppliers)
+ for(var/datum/component/plumbing/supplier as anything in net?.suppliers)
if(supplier.can_give(amount, reagent, net))
valid_suppliers += supplier
- var/suppliersLeft = valid_suppliers.len
+ var/suppliersLeft = length(valid_suppliers)
if(!suppliersLeft)
return FALSE
@@ -122,12 +162,10 @@
SHOULD_BE_PURE(TRUE)
if(amount <= 0)
- return
+ return FALSE
if(reagent) //only asked for one type of reagent
- for(var/datum/reagent/contained_reagent as anything in reagents.reagent_list)
- if(contained_reagent.type == reagent)
- return TRUE
+ return reagents.has_reagent(reagent)
else if(reagents.total_volume) //take whatever
return TRUE
@@ -244,6 +282,8 @@
// Machines disable when they get moved
for(var/obj/machinery/duct/duct in parent_movable.loc)
if(duct.anchored && (duct.duct_layer & ducting_layer))
+ log_mapping("[duct.name] was found at [AREACOORD(parent_movable)] spawning on top of [parent_movable.name], \
+ which should not occur as it takes ducts itself!")
duct.disconnect_duct()
if(demand_connects)
diff --git a/code/datums/components/plumbing/automated_iv.dm b/code/datums/components/plumbing/automated_iv.dm
new file mode 100644
index 000000000000..1f067a7b1e86
--- /dev/null
+++ b/code/datums/components/plumbing/automated_iv.dm
@@ -0,0 +1,33 @@
+/datum/component/plumbing/automated_iv
+ demand_connects = SOUTH
+ supply_connects = NORTH
+ ///Temporary holder to store all the reagents from the iv drip before transferring it to the ducts
+ var/datum/reagents/plumbing/holder
+
+/datum/component/plumbing/automated_iv/Initialize(start = TRUE, _ducting_layer, _turn_connects = TRUE, datum/reagents/custom_receiver, distinct_reagent_cap = 3)
+ . = ..()
+ if(!istype(parent, /obj/machinery/iv_drip/plumbing))
+ return COMPONENT_INCOMPATIBLE
+ var/obj/machinery/iv_drip/plumbing/drip = parent
+ holder = new(drip.reagents.maximum_volume, drip.reagents.flags)
+ holder.my_atom = drip
+
+/datum/component/plumbing/automated_iv/Destroy(force)
+ QDEL_NULL(holder)
+ return ..()
+
+/datum/component/plumbing/automated_iv/can_give(amount, reagent)
+ var/obj/machinery/iv_drip/plumbing/drip = parent
+ return ..() && drip.mode == IV_TAKING
+
+/datum/component/plumbing/automated_iv/send_request(dir)
+ var/obj/machinery/iv_drip/plumbing/drip = parent
+ if(drip.mode == IV_INJECTING)
+ return ..()
+
+/datum/component/plumbing/automated_iv/transfer_to(datum/component/plumbing/target, amount, reagent, datum/ductnet/net, round_robin = TRUE)
+ reagents.trans_to(holder, reagents.total_volume)
+ reagents = holder
+ . = ..()
+ var/obj/machinery/iv_drip/plumbing/drip = parent
+ reagents = drip.reagents
diff --git a/code/datums/components/plumbing/reaction_chamber.dm b/code/datums/components/plumbing/reaction_chamber.dm
index 07ea18e13da6..3332d94b0948 100644
--- a/code/datums/components/plumbing/reaction_chamber.dm
+++ b/code/datums/components/plumbing/reaction_chamber.dm
@@ -83,5 +83,3 @@
/datum/component/plumbing/alkaline_input/send_request(dir)
process_request(reagent = /datum/reagent/reaction_agent/basic_buffer, dir = dir)
-
-
diff --git a/code/datums/components/plumbing/simple_components.dm b/code/datums/components/plumbing/simple_components.dm
index 1378780353a4..98fa64f885a0 100644
--- a/code/datums/components/plumbing/simple_components.dm
+++ b/code/datums/components/plumbing/simple_components.dm
@@ -3,6 +3,10 @@
/datum/component/plumbing/simple_demand
demand_connects = SOUTH
+/datum/component/plumbing/simple_demand/Initialize(start, ducting_layer, turn_connects, datum/reagents/custom_receiver, extend_pipe_to_edge, distinct_reagent_cap = INFINITY)
+ src.distinct_reagent_cap = distinct_reagent_cap
+ return ..()
+
///has one pipe output that only supplies. example is liquid pump and manual input pipe
/datum/component/plumbing/simple_supply
supply_connects = SOUTH
diff --git a/code/datums/components/plundering_attacks.dm b/code/datums/components/plundering_attacks.dm
index f55fa42b0717..93aa42925496 100644
--- a/code/datums/components/plundering_attacks.dm
+++ b/code/datums/components/plundering_attacks.dm
@@ -44,7 +44,7 @@
amount_to_steal = account_to_rob.account_balance
plunder_stored += amount_to_steal
account_to_rob.adjust_money(-amount_to_steal)
- account_to_rob.bank_card_talk("Transaction confirmed! Transferred [amount_to_steal] credits to \!")
+ account_to_rob.bank_card_talk("Transaction confirmed! Transferred [amount_to_steal] [MONEY_NAME] to \!")
/datum/component/plundering_attacks/proc/drop_plunder()
SIGNAL_HANDLER
diff --git a/code/datums/components/pricetag.dm b/code/datums/components/pricetag.dm
index dfa1471ec912..d8636952921e 100644
--- a/code/datums/components/pricetag.dm
+++ b/code/datums/components/pricetag.dm
@@ -91,7 +91,7 @@
overall_item_price = max(0, overall_item_price - payee_cut)
payee.adjust_money(payee_cut, "Pricetag: [capitalize(format_text(source.name))] Sale")
- payee.bank_card_talk("Sale of [source] recorded. [payee_cut] credits added to account.")
+ payee.bank_card_talk("Sale of [source] recorded. [payee_cut] [MONEY_NAME] added to account.")
// Update the report with the modified final price
report.total_value[export] += overall_item_price
diff --git a/code/datums/components/proficient_miner.dm b/code/datums/components/proficient_miner.dm
index cdc3b65871b4..cd9d02b1bd57 100644
--- a/code/datums/components/proficient_miner.dm
+++ b/code/datums/components/proficient_miner.dm
@@ -1,11 +1,17 @@
/// Component given to mobs that can mine when moving
/datum/component/proficient_miner
+ /// Toolspeed for mining, 0 will cause it to instamine rock
+ var/mining_speed = 0
+ /// Should we pass the do_after visuals to our rider if we are a mob?
+ var/pass_driver = FALSE
/// Last tick when we bumpmined. Prevents diagonal bumpnining being thrice as fast as normal
var/last_bumpmine_tick = -1
-/datum/component/proficient_miner/Initialize()
+/datum/component/proficient_miner/Initialize(mining_speed = 0, pass_driver = FALSE)
if (!ismovable(parent))
return COMPONENT_INCOMPATIBLE
+ src.mining_speed = mining_speed
+ src.pass_driver = pass_driver
/datum/component/proficient_miner/RegisterWithParent()
RegisterSignal(parent, COMSIG_MOVABLE_BUMP, PROC_REF(on_bump))
@@ -26,12 +32,37 @@
return
var/turf/closed/mineral/mineral_wall = target
- if(!istype(mineral_wall, /turf/closed/mineral/gibtonite))
- last_bumpmine_tick = world.time
- mineral_wall.gets_drilled(source)
+ if(istype(mineral_wall, /turf/closed/mineral/gibtonite))
+ var/turf/closed/mineral/gibtonite/gibtonite_wall = mineral_wall
+ if(gibtonite_wall.stage != GIBTONITE_UNSTRUCK)
+ return
+
+ if(user && mining_speed > 0)
+ INVOKE_ASYNC(src, PROC_REF(slow_mine), user, target)
+ return
+
+ last_bumpmine_tick = world.time
+ mineral_wall.gets_drilled(source)
+
+/datum/component/proficient_miner/proc/slow_mine(mob/living/user, turf/closed/mineral/mineral_wall)
+ if(TIMER_COOLDOWN_RUNNING(mineral_wall, REF(user))) //prevents mining turfs in progress
return
- var/turf/closed/mineral/gibtonite/gibtonite_wall = mineral_wall
- if(gibtonite_wall.stage == GIBTONITE_UNSTRUCK)
- last_bumpmine_tick = world.time
- mineral_wall.gets_drilled(source)
+ var/mining_delay = mineral_wall.tool_mine_speed * mining_speed
+ TIMER_COOLDOWN_START(mineral_wall, REF(user), mining_delay)
+ var/static/list/mine_sounds = list('sound/effects/pickaxe/picaxe1.ogg', 'sound/effects/pickaxe/picaxe2.ogg', 'sound/effects/pickaxe/picaxe3.ogg')
+ playsound(user, pick(mine_sounds), 50)
+
+ var/mob/living/driver = null
+ if (pass_driver && length(user.buckled_mobs))
+ driver = user.buckled_mobs[1]
+
+ if(!do_after(user, mining_delay, mineral_wall, bar_override = driver))
+ TIMER_COOLDOWN_END(mineral_wall, REF(user)) //if we fail we can start again immediately
+ return
+
+ if (mining_delay > MIN_TOOL_SOUND_DELAY)
+ playsound(user, pick(mine_sounds), 50)
+
+ if(istype(mineral_wall))
+ mineral_wall.gets_drilled(driver || user)
diff --git a/code/datums/components/profound_fisher.dm b/code/datums/components/profound_fisher.dm
index 836fc7e21673..3c2ddbef1a85 100644
--- a/code/datums/components/profound_fisher.dm
+++ b/code/datums/components/profound_fisher.dm
@@ -105,7 +105,7 @@
/datum/component/profound_fisher/proc/should_fish_on(mob/living/user, atom/target)
if(!HAS_TRAIT(target, TRAIT_FISHING_SPOT) || GLOB.fishing_challenges_by_user[user])
return FALSE
- if(user.combat_mode || !user.CanReach(target))
+ if(user.combat_mode || !target.IsReachableBy(user))
return FALSE
return TRUE
diff --git a/code/datums/components/prosthetic_item.dm b/code/datums/components/prosthetic_item.dm
index b8876f5484f9..1537535974f6 100644
--- a/code/datums/components/prosthetic_item.dm
+++ b/code/datums/components/prosthetic_item.dm
@@ -137,6 +137,9 @@
* Returns the created pseudopart
*/
/mob/living/carbon/proc/make_item_prosthetic(obj/item/some_thing, target_zone = BODY_ZONE_R_ARM, fall_prob = 0)
+ if(HAS_TRAIT_FROM(some_thing, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT))
+ CRASH("make_item_prosthetic given an item that is already a prosthetic limb!")
+
var/obj/item/bodypart/existing = get_bodypart(target_zone)
existing?.drop_limb(special = TRUE)
diff --git a/code/datums/components/radioactive_exposure.dm b/code/datums/components/radioactive_exposure.dm
index b8a034e77882..324e8c28e295 100644
--- a/code/datums/components/radioactive_exposure.dm
+++ b/code/datums/components/radioactive_exposure.dm
@@ -75,4 +75,5 @@
/atom/movable/screen/alert/radioactive_area
name = "Radioactive Area"
desc = "This place is no good! We need to get some protection or get out fast!"
- icon_state = ALERT_RADIOACTIVE_AREA
+ use_user_hud_icon = TRUE
+ overlay_state = "radioactive_area"
diff --git a/code/datums/components/redirect_attack_hand_from_turf.dm b/code/datums/components/redirect_attack_hand_from_turf.dm
index 1e5380290709..6d1327f3bcc2 100644
--- a/code/datums/components/redirect_attack_hand_from_turf.dm
+++ b/code/datums/components/redirect_attack_hand_from_turf.dm
@@ -28,13 +28,21 @@
src.screentip_texts = screentip_texts
src.interact_check = interact_check
- RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved))
connect_to_new_turf()
+/datum/component/redirect_attack_hand_from_turf/RegisterWithParent()
+ . = ..()
+ RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved))
+
/datum/component/redirect_attack_hand_from_turf/Destroy(force)
+ interact_check = null
disconnect_from_old_turf()
return ..()
+/datum/component/redirect_attack_hand_from_turf/UnregisterFromParent()
+ . = ..()
+ UnregisterSignal(parent, COMSIG_MOVABLE_MOVED)
+
/datum/component/redirect_attack_hand_from_turf/proc/find_turf()
PRIVATE_PROC(TRUE)
@@ -101,7 +109,7 @@
var/atom/movable/movable_parent = parent
if (!movable_parent.can_interact(user))
return NONE
-
+
if (!isnull(interact_check) && !interact_check.Invoke(user))
return NONE
@@ -123,7 +131,7 @@
if (!isnull(held_item))
return NONE
-
+
if (!isnull(interact_check) && !interact_check.Invoke(user))
return NONE
diff --git a/code/datums/components/reflection.dm b/code/datums/components/reflection.dm
index 82ed1a24da22..d5d37b72dd2c 100644
--- a/code/datums/components/reflection.dm
+++ b/code/datums/components/reflection.dm
@@ -148,9 +148,9 @@
SIGNAL_HANDLER
var/atom/movable/reflection = LAZYACCESS(reflected_movables, target)
- if(reflection)
- qdel(reflection)
LAZYREMOVE(reflected_movables, target)
+ if(!QDELETED(reflection))
+ qdel(reflection)
UnregisterSignal(target, check_reflect_signals)
UnregisterSignal(target, COMSIG_QDELETING)
diff --git a/code/datums/components/regenerator.dm b/code/datums/components/regenerator.dm
index 44c189eaf2f0..9e9fdc09738c 100644
--- a/code/datums/components/regenerator.dm
+++ b/code/datums/components/regenerator.dm
@@ -115,13 +115,13 @@
var/need_mob_update = FALSE
if(brute_per_second)
- need_mob_update += living_parent.adjustBruteLoss(-1 * heal_mod * brute_per_second * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += living_parent.adjust_brute_loss(-1 * heal_mod * brute_per_second * seconds_per_tick, updating_health = FALSE)
if(burn_per_second)
- need_mob_update += living_parent.adjustFireLoss(-1 * heal_mod * burn_per_second * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += living_parent.adjust_fire_loss(-1 * heal_mod * burn_per_second * seconds_per_tick, updating_health = FALSE)
if(tox_per_second)
- need_mob_update += living_parent.adjustToxLoss(-1 * heal_mod * tox_per_second * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += living_parent.adjust_tox_loss(-1 * heal_mod * tox_per_second * seconds_per_tick, updating_health = FALSE)
if(oxy_per_second)
- need_mob_update += living_parent.adjustOxyLoss(-1 * heal_mod * oxy_per_second * seconds_per_tick, updating_health = FALSE)
+ need_mob_update += living_parent.adjust_oxy_loss(-1 * heal_mod * oxy_per_second * seconds_per_tick, updating_health = FALSE)
if(heals_wounds && iscarbon(parent))
var/mob/living/carbon/carbon_parent = living_parent
diff --git a/code/datums/components/reskinnable_atom.dm b/code/datums/components/reskinnable_atom.dm
new file mode 100644
index 000000000000..84566458593b
--- /dev/null
+++ b/code/datums/components/reskinnable_atom.dm
@@ -0,0 +1,208 @@
+/**
+ * ### Atom skin singleton datum
+ *
+ * Simple datum which holds information about a skin that can be applied to an atom.
+ */
+/datum/atom_skin
+ abstract_type = /datum/atom_skin
+
+ /// Required, name shown in the radial menu
+ var/preview_name
+
+ /// If true, changing the reskin also changes the base_icon_state of the atom
+ var/change_base_icon_state = FALSE
+ /// If true, changing the reskin also changes the inhand_icon_state of the atom
+ var/change_inhand_icon_state = FALSE
+ /// If true, unset vars are reset to their original values when applying this skin
+ var/reset_missing = TRUE
+
+ /// Optional, name to change the atom to when applied
+ var/new_name
+ /// Optional, description to change the atom to when applied
+ var/new_desc
+ /// Optional, icon to change the atom to when applied
+ var/new_icon
+ /// Optional, icon_state to change the atom to when applied
+ var/new_icon_state
+
+/**
+ * Applies all relevant skin changes to the given atom
+ * Can be overridden to add additional behavior, such as registering signals or altering other vars.
+ *
+ * * apply_to: The atom to apply the skin to
+ */
+/datum/atom_skin/proc/apply(atom/apply_to)
+ SHOULD_CALL_PARENT(TRUE)
+ APPLY_VAR_OR_RESET_INITIAL(apply_to, name, new_name, reset_missing)
+ APPLY_VAR_OR_RESET_INITIAL(apply_to, desc, new_desc, reset_missing)
+ APPLY_VAR_OR_RESET_INITIAL(apply_to, icon, new_icon, reset_missing)
+ APPLY_VAR_OR_RESET_TO(apply_to, icon_state, new_icon_state, reset_missing, initial(apply_to.post_init_icon_state) || initial(apply_to.icon_state))
+ if(change_base_icon_state)
+ APPLY_VAR_OR_RESET_INITIAL(apply_to, base_icon_state, new_icon_state, reset_missing)
+ if(change_inhand_icon_state && isitem(apply_to))
+ var/obj/item/item_apply_to = apply_to
+ APPLY_VAR_OR_RESET_INITIAL(item_apply_to, inhand_icon_state, new_icon_state, reset_missing)
+
+/**
+ * Resets all changes this skin would have made to the given atom
+ * Does not verify that the skin was actually applied to the atom beforehand.
+ * Can be overridden to add additional behavior, such as unregistering signals or altering other vars.
+ *
+ * * clear_from: The atom to clear the skin from
+ */
+/datum/atom_skin/proc/clear_skin(atom/clear_from)
+ SHOULD_CALL_PARENT(TRUE)
+ RESET_INITIAL_IF_SET(clear_from, name, new_name)
+ RESET_INITIAL_IF_SET(clear_from, desc, new_desc)
+ RESET_INITIAL_IF_SET(clear_from, icon, new_icon)
+ RESET_TO_IF_SET(clear_from, icon_state, new_icon_state, initial(clear_from.post_init_icon_state) || initial(clear_from.icon_state))
+ if(change_base_icon_state)
+ RESET_INITIAL_IF_SET(clear_from, base_icon_state, new_icon_state)
+ if(change_inhand_icon_state && isitem(clear_from))
+ var/obj/item/item_clear_from = clear_from
+ RESET_INITIAL_IF_SET(item_clear_from, inhand_icon_state, new_icon_state)
+
+/// Gets a preview image for this skin based on the given atom's icon and icon_state
+/datum/atom_skin/proc/get_preview_icon(atom/for_atom)
+ return image(
+ icon = new_icon || for_atom.icon,
+ icon_state = new_icon_state || for_atom.icon_state,
+ )
+
+/**
+ * ### Reskinnable atoms
+ *
+ * Simple component which lets an atom be alt-clicked to open a radial menu to choose a new skin to apply.
+ */
+/datum/component/reskinable_item
+ dupe_mode = COMPONENT_DUPE_SELECTIVE
+ /// Base reskin type to pull options from - all subtypes except those blacklisted are valid options
+ VAR_PRIVATE/base_reskin_type
+ /// If TRUE, the reskin option is infinite-use. If FALSE, the component is deleted on use (so you're stuck with that skin).
+ VAR_PRIVATE/infinite_reskin = FALSE
+ /// List of subtypes of /datum/atom_skin that are not allowed to be used for this item
+ VAR_PRIVATE/list/blacklisted_subtypes
+
+ /// Currently applied skin preview_name
+ VAR_PRIVATE/current_skin
+
+/datum/component/reskinable_item/Initialize(base_reskin_type, infinite = FALSE, initial_skin, list/blacklisted_subtypes = list())
+ if(!isatom(parent) || isarea(parent))
+ return COMPONENT_INCOMPATIBLE
+
+ src.base_reskin_type = base_reskin_type
+ src.infinite_reskin = infinite
+ src.blacklisted_subtypes = blacklisted_subtypes
+
+ if(initial_skin)
+ set_skin_by_name(initial_skin)
+
+ var/atom/atom_parent = parent
+ atom_parent.flags_1 |= HAS_CONTEXTUAL_SCREENTIPS_1
+
+/datum/component/reskinable_item/RegisterWithParent()
+ RegisterSignal(parent, COMSIG_CLICK_ALT, PROC_REF(on_click_alt_reskin))
+ RegisterSignal(parent, COMSIG_ATOM_EXAMINE_TAGS, PROC_REF(add_tags))
+ RegisterSignal(parent, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(add_context))
+
+/datum/component/reskinable_item/UnregisterFromParent()
+ UnregisterSignal(parent, COMSIG_CLICK_ALT)
+ UnregisterSignal(parent, COMSIG_ATOM_EXAMINE_TAGS)
+ UnregisterSignal(parent, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM)
+
+/datum/component/reskinable_item/CheckDupeComponent(datum/component/comp, base_reskin_type, infinite = FALSE, initial_skin, list/blacklisted_subtypes = list())
+ if(src.base_reskin_type != base_reskin_type)
+ return FALSE // new comp - though the alt-click behavior will collide
+
+ src.infinite_reskin = infinite
+ src.blacklisted_subtypes = blacklisted_subtypes
+
+ set_skin_by_name(initial_skin)
+ return TRUE // same comp
+
+/datum/component/reskinable_item/proc/get_skins_by_name()
+ var/list/reskin_options = list()
+ for(var/datum/atom_skin/reskin_option as anything in valid_subtypesof(base_reskin_type) - blacklisted_subtypes)
+ reskin_options[reskin_option::preview_name] = reskin_option
+
+ return reskin_options
+
+/datum/component/reskinable_item/proc/set_skin_by_name(input_name)
+ var/list/reskin_options = get_skins_by_name()
+ if(current_skin)
+ var/datum/atom_skin/previous_skin = GLOB.atom_skins[reskin_options[current_skin]]
+ previous_skin.clear_skin(parent)
+
+ if(input_name)
+ var/datum/atom_skin/reskin_to_apply = GLOB.atom_skins[reskin_options[input_name]]
+ reskin_to_apply.apply(parent)
+
+ current_skin = input_name
+
+ var/atom/atom_parent = parent
+ atom_parent.update_appearance()
+
+ if(isitem(parent))
+ var/obj/item/item_parent = parent
+ item_parent.update_slot_icon()
+
+ SEND_SIGNAL(parent, COMSIG_OBJ_RESKIN, input_name)
+
+/datum/component/reskinable_item/proc/add_context(atom/source, list/context, obj/item/held_item, mob/user)
+ SIGNAL_HANDLER
+
+ context[SCREENTIP_CONTEXT_ALT_LMB] = "Reskin"
+ return CONTEXTUAL_SCREENTIP_SET
+
+/datum/component/reskinable_item/proc/add_tags(atom/source, mob/user, list/tags)
+ SIGNAL_HANDLER
+
+ tags["reskinnable"] = "This item is able to be reskinned! Alt-Click to do so!"
+
+/// Called when alt clicked and the item has unique reskin options
+/datum/component/reskinable_item/proc/on_click_alt_reskin(datum/source, mob/user)
+ SIGNAL_HANDLER
+
+ if(!user.can_perform_action(parent, NEED_DEXTERITY))
+ return NONE
+
+ INVOKE_ASYNC(src, PROC_REF(reskin_obj), user)
+ return CLICK_ACTION_SUCCESS
+
+/**
+ * Reskins object based on a user's choice
+ *
+ * Arguments:
+ * * user The mob choosing a reskin option
+ */
+/datum/component/reskinable_item/proc/reskin_obj(mob/user)
+ var/atom/atom_parent = parent
+
+ var/list/items = list()
+ for(var/reskin_name, reskin_typepath in get_skins_by_name())
+ items[reskin_name] = GLOB.atom_skins[reskin_typepath].get_preview_icon(atom_parent)
+
+ sort_list(items)
+
+ var/pick = show_radial_menu(user, parent, items, custom_check = CALLBACK(src, PROC_REF(check_reskin_menu), user), radius = 38, require_near = TRUE)
+ if(!pick || !items[pick])
+ return
+
+ set_skin_by_name(pick)
+ to_chat(user, span_info("[parent] is now skinned as '[pick].'"))
+
+ if(!infinite_reskin)
+ qdel(src)
+
+/**
+ * Checks if we are allowed to interact with a radial menu for reskins
+ *
+ * Arguments:
+ * * user The mob interacting with the menu
+ */
+/datum/component/reskinable_item/proc/check_reskin_menu(mob/user)
+ if(QDELETED(parent))
+ return FALSE
+ if(user.incapacitated)
+ return FALSE
+ return TRUE
diff --git a/code/datums/components/riding/riding_mob.dm b/code/datums/components/riding/riding_mob.dm
index e966012bdae9..a27e05915a40 100644
--- a/code/datums/components/riding/riding_mob.dm
+++ b/code/datums/components/riding/riding_mob.dm
@@ -5,8 +5,10 @@
var/can_be_driven = TRUE
/// If TRUE, this creature's abilities can be triggered by the rider while mounted
var/can_use_abilities = FALSE
- /// shall we require riders to go through the riding minigame if they arent in our friends list
+ /// Shall we require riders to go through the riding minigame if they arent in our friends list
var/require_minigame = FALSE
+ /// Do we use vehicle_move_delay or default to mob's own movespeed?
+ var/uses_native_speed = FALSE
/// unsharable abilities that we will force to be shared anyway
var/list/override_unsharable_abilities = list()
/// abilities that are always blacklisted from sharing
@@ -103,8 +105,12 @@
formerly_ridden.layer = MOB_LAYER
return ..()
+/datum/component/riding/creature/Process_Spacemove(direction, continuous_move)
+ var/mob/living/living_parent = parent
+ return override_allow_spacemove || living_parent.Process_Spacemove(direction, continuous_move)
+
/datum/component/riding/creature/driver_move(atom/movable/movable_parent, mob/living/user, direction)
- if(!COOLDOWN_FINISHED(src, vehicle_move_cooldown) || !Process_Spacemove())
+ if(!COOLDOWN_FINISHED(src, vehicle_move_cooldown) || !Process_Spacemove(direction))
return COMPONENT_DRIVER_BLOCK_MOVE
if(!keycheck(user))
if(ispath(keytype, /obj/item))
@@ -113,7 +119,7 @@
return COMPONENT_DRIVER_BLOCK_MOVE
var/mob/living/living_parent = parent
step(living_parent, direction)
- var/modified_move_delay = vehicle_move_delay
+ var/modified_move_delay = uses_native_speed ? living_parent.cached_multiplicative_slowdown : vehicle_move_delay
if(HAS_TRAIT(user, TRAIT_ROUGHRIDER)) // YEEHAW!
switch(HAS_TRAIT(user, TRAIT_PRIMITIVE) ? SANITY_LEVEL_GREAT : user.mob_mood?.sanity_level)
if(SANITY_LEVEL_GREAT)
@@ -126,6 +132,8 @@
modified_move_delay *= 1.1
if(SANITY_LEVEL_INSANE)
modified_move_delay *= 1.2
+ if(NSCOMPONENT(direction) && EWCOMPONENT(direction))
+ modified_move_delay = FLOOR(modified_move_delay * sqrt(2), world.tick_lag)
COOLDOWN_START(src, vehicle_move_cooldown, modified_move_delay)
return ..()
@@ -417,6 +425,7 @@
COOLDOWN_START(src, pony_trot_cooldown, 500 MILLISECONDS)
/datum/component/riding/creature/bear
+ vehicle_move_delay = 1.5
/datum/component/riding/creature/bear/get_rider_offsets_and_layers(pass_index, mob/offsetter)
return list(
@@ -494,7 +503,7 @@
/datum/component/riding/creature/goliath
keytype = /obj/item/key/lasso
- vehicle_move_delay = 4
+ uses_native_speed = TRUE
rider_traits = list(TRAIT_NO_FLOATING_ANIM, TRAIT_TENTACLE_IMMUNE)
/datum/component/riding/creature/goliath/deathmatch
@@ -570,6 +579,17 @@
return charger.summoner == user
/datum/component/riding/creature/goldgrub
+ uses_native_speed = TRUE
+
+/datum/component/riding/creature/goldgrub/Initialize(mob/living/riding_mob, force, ride_check_flags)
+ . = ..()
+ var/mob/living/basic/mining/goldgrub/goldgrub = parent
+ goldgrub.add_movespeed_modifier(/datum/movespeed_modifier/goldgrub_mount)
+
+/datum/component/riding/creature/goldgrub/Destroy(force)
+ var/mob/living/basic/mining/goldgrub/goldgrub = parent
+ goldgrub.remove_movespeed_modifier(/datum/movespeed_modifier/goldgrub_mount)
+ return ..()
/datum/component/riding/creature/goldgrub/get_rider_offsets_and_layers(pass_index, mob/offsetter)
return list(
@@ -616,7 +636,7 @@
if(!isclosedturf(pointed))
return
var/mob/living/basic/basic_parent = parent
- if(!basic_parent.CanReach(pointed))
+ if(!pointed.IsReachableBy(basic_parent))
return
basic_parent.melee_attack(pointed)
@@ -626,6 +646,7 @@
/datum/component/riding/creature/raptor
require_minigame = TRUE
+ uses_native_speed = TRUE
ride_check_flags = RIDER_NEEDS_ARM | UNBUCKLE_DISABLED_RIDER
/datum/component/riding/creature/raptor/Initialize(mob/living/riding_mob, force, ride_check_flags)
@@ -655,18 +676,11 @@
force_dismount(buckled_mob, throw_range = 2, gentle = TRUE)
/datum/component/riding/creature/raptor/get_rider_offsets_and_layers(pass_index, mob/offsetter)
- if(!SSmapping.is_planetary())
- return list(
- TEXT_NORTH = list(-1, 7),
- TEXT_SOUTH = list(2, 10),
- TEXT_EAST = list(0, 7),
- TEXT_WEST = list(0, 7),
- )
return list(
- TEXT_NORTH = list(0, 7),
- TEXT_SOUTH = list(0, 10),
- TEXT_EAST = list(-3, 9),
- TEXT_WEST = list(3, 9),
+ TEXT_NORTH = list(-1, 7),
+ TEXT_SOUTH = list(2, 10),
+ TEXT_EAST = list(0, 7),
+ TEXT_WEST = list(0, 7),
)
/datum/component/riding/creature/raptor/get_parent_offsets_and_layers()
@@ -683,8 +697,45 @@
if (istype(raptor))
raptor.adjust_offsets(dir)
-/datum/component/riding/creature/raptor/fast
- vehicle_move_delay = 1.5
-
/datum/component/riding/creature/raptor/combat
ai_behavior_while_ridden = RIDING_PAUSE_AI_MOVEMENT
+
+/datum/component/riding/creature/raptor/healer/vehicle_mob_buckle(mob/living/ridden, mob/living/rider, force)
+ RegisterSignal(rider, COMSIG_MOB_STATCHANGE, PROC_REF(on_buckled_stat_change))
+ return ..()
+
+/datum/component/riding/creature/raptor/healer/vehicle_mob_unbuckle(mob/living/formerly_ridden, mob/living/former_rider, force)
+ UnregisterSignal(former_rider, COMSIG_MOB_STATCHANGE)
+ return ..()
+
+/datum/component/riding/creature/raptor/healer/proc/on_buckled_stat_change(mob/living/source, new_stat, old_stat)
+ SIGNAL_HANDLER
+
+ var/mob/living/basic/raptor/raptor = source.buckled
+ if (!istype(raptor)) // what
+ UnregisterSignal(source, COMSIG_MOB_STATCHANGE)
+ return
+
+ // Heal the owner and flee whatever might've attacked them
+ if (new_stat == CONSCIOUS || new_stat == DEAD || old_stat != CONSCIOUS || !raptor.ai_controller)
+ ADD_TRAIT(raptor, TRAIT_AI_PAUSED, REF(src))
+ return
+
+ REMOVE_TRAIT(raptor, TRAIT_AI_PAUSED, REF(src))
+ // Rip bozo, but you're not our friend
+ if (source in raptor.ai_controller.blackboard[BB_FRIENDS_LIST])
+ raptor.ai_controller.set_blackboard_key(BB_INJURED_RAPTOR, source)
+
+ for (var/mob/living/possible_hostile in view(5, raptor))
+ if (possible_hostile.stat || possible_hostile.invisibility > raptor.see_invisible || source.faction_check_atom(possible_hostile))
+ continue
+ raptor.ai_controller.set_blackboard_key(BB_BASIC_MOB_FLEE_TARGET, possible_hostile)
+ break
+
+/datum/component/riding/creature/raptor/small/get_rider_offsets_and_layers(pass_index, mob/offsetter)
+ return list(
+ TEXT_NORTH = list(-1, 5),
+ TEXT_SOUTH = list(2, 8),
+ TEXT_EAST = list(0, 5),
+ TEXT_WEST = list(0, 5),
+ )
diff --git a/code/datums/components/riding/riding_vehicle.dm b/code/datums/components/riding/riding_vehicle.dm
index 9043f57f9d30..91e282a14e8b 100644
--- a/code/datums/components/riding/riding_vehicle.dm
+++ b/code/datums/components/riding/riding_vehicle.dm
@@ -97,7 +97,10 @@
return
step(movable_parent, direction)
- COOLDOWN_START(src, vehicle_move_cooldown, vehicle_move_delay)
+ var/move_delay = vehicle_move_delay
+ if(NSCOMPONENT(direction) && EWCOMPONENT(direction))
+ move_delay = FLOOR(move_delay * sqrt(2), world.tick_lag)
+ COOLDOWN_START(src, vehicle_move_cooldown, move_delay)
if(QDELETED(src))
return
@@ -475,3 +478,60 @@
var/obj/vehicle/ridden/wheelchair/motorized/our_chair = parent
if(istype(our_chair) && our_chair.power_cell)
our_chair.power_cell.use(our_chair.energy_usage / max(our_chair.power_efficiency, 1) * 0.05)
+
+/datum/component/riding/vehicle/golfcart
+ ride_check_flags = RIDER_NEEDS_ARMS | UNBUCKLE_DISABLED_RIDER
+ vehicle_move_delay = 1.5
+ keytype = /obj/item/key/golfcart
+
+/datum/component/riding/vehicle/golfcart/restore_parent_layer_and_offsets()
+ // just don't restore anything.
+ // restoring layers fucks stuff to do with the rear part
+ return
+
+/datum/component/riding/vehicle/golfcart/driver_move(atom/movable/movable_parent, mob/living/user, direction)
+ if (!istype(parent, /obj/vehicle/ridden/golfcart))
+ return ..()
+ var/obj/vehicle/ridden/golfcart/cart = parent
+ if (!cart.cell && !cart.is_hotrod())
+ return COMPONENT_DRIVER_BLOCK_MOVE
+ if (cart.cell)
+ if (cart.cell.charge <= 0)
+ return COMPONENT_DRIVER_BLOCK_MOVE
+ if (get_turf(cart.child) == get_step(cart, direction))
+ cart.set_movedelay_effect(2)
+ else
+ cart.set_movedelay_effect(1)
+ vehicle_move_delay = cart.movedelay
+ return ..()
+
+/datum/component/riding/vehicle/golfcart/handle_ride(mob/user, direction)
+ if (!istype(parent, /obj/vehicle/ridden/golfcart))
+ return ..()
+ var/obj/vehicle/ridden/golfcart/cart = parent
+ if (cart.cell)
+ var/charge_to_use = min(cart.charge_per_move, cart.cell.charge)
+ cart.cell.use(charge_to_use)
+ return ..()
+
+/datum/component/riding/vehicle/golfcart/update_parent_layer_and_offsets(dir, animate)
+ . = ..()
+ if (istype(parent, /obj))
+ var/obj/objectified = parent
+ objectified.update_appearance(UPDATE_ICON)
+
+/datum/component/riding/vehicle/golfcart/get_rider_offsets_and_layers(pass_index, mob/offsetter)
+ return list(
+ TEXT_NORTH = list(0, -16),
+ TEXT_SOUTH = list(0, 10),
+ TEXT_EAST = list(-8, 2),
+ TEXT_WEST = list(8, 2),
+ )
+
+/datum/component/riding/vehicle/golfcart/get_parent_offsets_and_layers()
+ return list(
+ TEXT_NORTH = list(0, 0, ABOVE_MOB_LAYER),
+ TEXT_SOUTH = list(0, 0, ABOVE_MOB_LAYER),
+ TEXT_EAST = list(0, 0, VEHICLE_LAYER),
+ TEXT_WEST = list(0, 0, VEHICLE_LAYER),
+ )
diff --git a/code/datums/components/rotation.dm b/code/datums/components/rotation.dm
deleted file mode 100644
index e57d23ffe50b..000000000000
--- a/code/datums/components/rotation.dm
+++ /dev/null
@@ -1,146 +0,0 @@
-/datum/component/simple_rotation
- /// Additional stuff to do after rotation
- var/datum/callback/post_rotation
- /// Rotation flags for special behavior
- var/rotation_flags = NONE
-
-/**
- * Adds the ability to rotate an object by Alt-click or using Right-click verbs.
- *
- * args:
- * * rotation_flags (optional) Bitflags that determine behavior for rotation (defined at the top of this file)
- * * post_rotation (optional) Callback proc that is used after the object is rotated (sound effects, balloon alerts, etc.)
- **/
-/datum/component/simple_rotation/Initialize(rotation_flags = NONE, post_rotation)
- if(!ismovable(parent))
- return COMPONENT_INCOMPATIBLE
-
- var/atom/movable/source = parent
- source.flags_1 |= HAS_CONTEXTUAL_SCREENTIPS_1
-
- src.rotation_flags = rotation_flags
- src.post_rotation = post_rotation || CALLBACK(src, PROC_REF(default_post_rotation))
-
-/datum/component/simple_rotation/RegisterWithParent()
- RegisterSignal(parent, COMSIG_CLICK_ALT, PROC_REF(rotate_left))
- RegisterSignal(parent, COMSIG_CLICK_ALT_SECONDARY, PROC_REF(rotate_right))
- RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(ExamineMessage))
- RegisterSignal(parent, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(on_requesting_context_from_item))
- return ..()
-
-/datum/component/simple_rotation/PostTransfer(datum/new_parent)
- //Because of the callbacks which we don't track cleanly we can't transfer this
- //item cleanly, better to let the new of the new item create a new rotation datum
- //instead (there's no real state worth transferring)
- return COMPONENT_NOTRANSFER
-
-/datum/component/simple_rotation/UnregisterFromParent()
- UnregisterSignal(parent, list(
- COMSIG_CLICK_ALT,
- COMSIG_CLICK_ALT_SECONDARY,
- COMSIG_ATOM_EXAMINE,
- COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM,
- ))
- return ..()
-
-/datum/component/simple_rotation/Destroy()
- post_rotation = null
- return ..()
-
-/datum/component/simple_rotation/proc/ExamineMessage(datum/source, mob/user, list/examine_list)
- SIGNAL_HANDLER
- if(rotation_flags & ROTATION_REQUIRE_WRENCH)
- examine_list += span_notice("This requires a wrench to be rotated.")
-
-/datum/component/simple_rotation/proc/rotate_right(datum/source, mob/user)
- SIGNAL_HANDLER
- rotate(user, ROTATION_CLOCKWISE)
- return CLICK_ACTION_SUCCESS
-
-/datum/component/simple_rotation/proc/rotate_left(datum/source, mob/user)
- SIGNAL_HANDLER
- rotate(user, ROTATION_COUNTERCLOCKWISE)
- return CLICK_ACTION_SUCCESS
-
-/datum/component/simple_rotation/proc/rotate(mob/user, degrees)
- if(QDELETED(user))
- CRASH("[src] is being rotated [user ? "with a qdeleting" : "without a"] user")
- if(!istype(user))
- CRASH("[src] is being rotated without a user of the wrong type: [user.type]")
- if(!isnum(degrees))
- CRASH("[src] is being rotated without providing the amount of degrees needed")
-
- if(!can_be_rotated(user, degrees) || !can_user_rotate(user, degrees))
- return
-
- var/obj/rotated_obj = parent
- rotated_obj.setDir(turn(rotated_obj.dir, degrees))
- if(rotation_flags & ROTATION_REQUIRE_WRENCH)
- playsound(rotated_obj, 'sound/items/tools/ratchet.ogg', 50, TRUE)
-
- post_rotation.Invoke(user, degrees)
-
-/datum/component/simple_rotation/proc/can_user_rotate(mob/user, degrees)
- if(isliving(user) && user.can_perform_action(parent, NEED_DEXTERITY))
- return TRUE
- if((rotation_flags & ROTATION_GHOSTS_ALLOWED) && isobserver(user) && CONFIG_GET(flag/ghost_interaction))
- return TRUE
- return FALSE
-
-/datum/component/simple_rotation/proc/can_be_rotated(mob/user, degrees, silent=FALSE)
- var/obj/rotated_obj = parent
- if(!rotated_obj.Adjacent(user))
- silent = TRUE
-
- if(rotation_flags & ROTATION_REQUIRE_WRENCH)
- if(!isliving(user))
- return FALSE
- var/obj/item/tool = user.get_active_held_item()
- if(!tool || tool.tool_behaviour != TOOL_WRENCH)
- if(!silent)
- rotated_obj.balloon_alert(user, "need a wrench!")
- return FALSE
- if(!(rotation_flags & ROTATION_IGNORE_ANCHORED) && rotated_obj.anchored)
- if(istype(rotated_obj, /obj/structure/window) && !silent)
- rotated_obj.balloon_alert(user, "need to unscrew!")
- else if(!silent)
- rotated_obj.balloon_alert(user, "need to unwrench!")
- return FALSE
-
- if(rotation_flags & ROTATION_NEEDS_ROOM)
- var/target_dir = turn(rotated_obj.dir, degrees)
- var/obj/structure/window/rotated_window = rotated_obj
- var/fulltile = istype(rotated_window) ? rotated_window.fulltile : FALSE
- if(!valid_build_direction(rotated_obj.loc, target_dir, is_fulltile = fulltile))
- if(!silent)
- rotated_obj.balloon_alert(user, "can't rotate in that direction!")
- return FALSE
-
- if(rotation_flags & ROTATION_NEEDS_UNBLOCKED)
- var/turf/rotate_turf = get_turf(rotated_obj)
- if(rotate_turf.is_blocked_turf(source_atom = rotated_obj))
- if(!silent)
- rotated_obj.balloon_alert(user, "rotation is blocked!")
- return FALSE
- return TRUE
-
-/datum/component/simple_rotation/proc/default_post_rotation(mob/user, degrees)
- return
-
-// maybe we don't need the item context proc but instead the hand one? since we don't need to check held_item
-/datum/component/simple_rotation/proc/on_requesting_context_from_item(atom/source, list/context, obj/item/held_item, mob/user)
- SIGNAL_HANDLER
-
- var/rotation_screentip = FALSE
-
- if(can_be_rotated(user, ROTATION_CLOCKWISE, silent=TRUE))
- context[SCREENTIP_CONTEXT_ALT_LMB] = "Rotate left"
- rotation_screentip = TRUE
- if(can_be_rotated(user, ROTATION_COUNTERCLOCKWISE, silent=TRUE))
- context[SCREENTIP_CONTEXT_ALT_RMB] = "Rotate right"
- rotation_screentip = TRUE
-
- if(rotation_screentip)
- return CONTEXTUAL_SCREENTIP_SET
-
- return NONE
diff --git a/code/datums/components/seethrough.dm b/code/datums/components/seethrough.dm
index ba674f67471d..bbae5ea34b8f 100644
--- a/code/datums/components/seethrough.dm
+++ b/code/datums/components/seethrough.dm
@@ -1,11 +1,9 @@
///A component that lets you turn an object invisible when you're standing on certain relative turfs to it, like behind a tree
/datum/component/seethrough
- ///List of lists that represent relative coordinates to the source atom
- var/list/relative_turf_coords
///A list of turfs on which we make ourself transparent
var/list/watched_turfs
///Associate list, with client = trickery_image. Track which client is being tricked with which image
- var/list/tricked_mobs = list()
+ var/list/tricked_mobs
///Which alpha do we animate towards?
var/target_alpha
@@ -15,18 +13,18 @@
var/perimeter_reset_timer
///Does this object let clicks from players its transparent to pass through it
var/clickthrough
+ /// Define for the area which is considered behind
+ var/see_through_map
///see_through_map is a define pointing to a specific map. It's basically defining the area which is considered behind. See see_through_maps.dm for a list of maps
/datum/component/seethrough/Initialize(see_through_map = SEE_THROUGH_MAP_DEFAULT, target_alpha = 100, animation_time = 0.5 SECONDS, perimeter_reset_timer = 2 SECONDS, clickthrough = TRUE)
. = ..()
- relative_turf_coords = GLOB.see_through_maps[see_through_map]
-
- if(!isatom(parent) || !LAZYLEN(relative_turf_coords))
+ //GLOB.see_through_maps[see_through_map is a list of lists that represent relative coordinates to the source atom
+ if(!isatom(parent) || !LAZYLEN(GLOB.see_through_maps[see_through_map]))
return COMPONENT_INCOMPATIBLE
- relative_turf_coords = GLOB.see_through_maps[see_through_map]
- src.relative_turf_coords = relative_turf_coords
+ src.see_through_map = see_through_map
src.target_alpha = target_alpha
src.animation_time = animation_time
src.perimeter_reset_timer = perimeter_reset_timer
@@ -40,7 +38,7 @@
/datum/component/seethrough/proc/setup_perimeter(atom/parent)
watched_turfs = list()
- for(var/list/coordinates as anything in relative_turf_coords)
+ for(var/list/coordinates as anything in GLOB.see_through_maps[see_through_map])
var/turf/target = TURF_FROM_COORDS_LIST(list(parent.x + coordinates[1], parent.y + coordinates[2], parent.z + coordinates[3]))
if(isnull(target))
@@ -90,7 +88,7 @@
if(mob in tricked_mobs)
var/image/trickery_image = tricked_mobs[mob]
animate(trickery_image, alpha = 255, time = animation_time)
- tricked_mobs.Remove(mob)
+ LAZYREMOVE(tricked_mobs, mob)
UnregisterSignal(mob, COMSIG_MOB_LOGOUT)
//after playing the fade-in animation, remove the screen obj
@@ -119,7 +117,7 @@
animate(user_overlay, alpha = target_alpha, time = animation_time)
- tricked_mobs[fool] = user_overlay
+ LAZYSET(tricked_mobs, fool, user_overlay)
RegisterSignal(fool, COMSIG_MOB_LOGOUT, PROC_REF(on_client_disconnect))
@@ -150,13 +148,13 @@
for(var/atom/movable/screen/plane_master/seethrough in our_hud.get_true_plane_masters(SEETHROUGH_PLANE))
seethrough.hide_plane(fool)
- tricked_mobs.Cut()
+ LAZYNULL(tricked_mobs)
///Image is removed when they log out because client gets deleted, so drop the mob reference
/datum/component/seethrough/proc/on_client_disconnect(mob/fool)
SIGNAL_HANDLER
- tricked_mobs.Remove(fool)
+ LAZYREMOVE(tricked_mobs, fool)
UnregisterSignal(fool, COMSIG_MOB_LOGOUT)
RegisterSignal(fool, COMSIG_MOB_LOGIN, PROC_REF(trick_mob))
var/datum/hud/our_hud = fool.hud_used
diff --git a/code/datums/components/shell.dm b/code/datums/components/shell.dm
index 44252c365753..4c649a68b7df 100644
--- a/code/datums/components/shell.dm
+++ b/code/datums/components/shell.dm
@@ -44,7 +44,7 @@
RegisterSignal(parent, COMSIG_ATOM_ATTACK_GHOST, PROC_REF(on_attack_ghost))
if(!(shell_flags & SHELL_FLAG_CIRCUIT_UNMODIFIABLE))
RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_MULTITOOL), PROC_REF(on_multitool_act))
- RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(on_attack_by))
+ RegisterSignal(parent, COMSIG_ATOM_ITEM_INTERACTION, PROC_REF(on_item_interaction))
if(!(shell_flags & SHELL_FLAG_CIRCUIT_UNREMOVABLE))
RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_SCREWDRIVER), PROC_REF(on_screwdriver_act))
RegisterSignal(parent, COMSIG_OBJ_DECONSTRUCT, PROC_REF(on_object_deconstruct))
@@ -91,7 +91,7 @@
/datum/component/shell/UnregisterFromParent()
UnregisterSignal(parent, list(
- COMSIG_ATOM_ATTACKBY,
+ COMSIG_ATOM_ITEM_INTERACTION,
COMSIG_ATOM_TOOL_ACT(TOOL_SCREWDRIVER),
COMSIG_ATOM_TOOL_ACT(TOOL_MULTITOOL),
COMSIG_OBJ_DECONSTRUCT,
@@ -160,55 +160,56 @@
attached_circuit?.set_on(source.anchored)
/**
- * Called when an item hits the parent. This is the method to add the circuitboard to the component.
+ * Called when interacting with the parent using an item. This is the method to add the circuitboard to the component.
*/
-/datum/component/shell/proc/on_attack_by(atom/source, obj/item/item, mob/living/attacker)
+/datum/component/shell/proc/on_item_interaction(atom/source, mob/living/user, obj/item/item, list/modifiers)
SIGNAL_HANDLER
- if(!is_authorized(attacker))
+ if(!is_authorized(user))
return
if(istype(item, /obj/item/stock_parts/power_store/cell))
- source.balloon_alert(attacker, "can't put cell in directly!")
+ source.balloon_alert(user, "can't put cell in directly!")
return
if(istype(item, /obj/item/inducer))
var/obj/item/inducer/inducer = item
- INVOKE_ASYNC(inducer, TYPE_PROC_REF(/obj/item, interact_with_atom), attached_circuit || parent, attacker, list())
- return COMPONENT_NO_AFTERATTACK
+ INVOKE_ASYNC(inducer, TYPE_PROC_REF(/obj/item, interact_with_atom), attached_circuit || parent, user, list())
+ return ITEM_INTERACT_SUCCESS
if(attached_circuit)
if(attached_circuit.owner_id && item == attached_circuit.owner_id.resolve())
set_locked(!locked)
- source.balloon_alert(attacker, "[locked ? "locked" : "unlocked"] [source]")
- return COMPONENT_NO_AFTERATTACK
+ source.balloon_alert(user, "[locked ? "locked" : "unlocked"] [source]")
+ return ITEM_INTERACT_SUCCESS
if(!attached_circuit.owner_id && isidcard(item))
- source.balloon_alert(attacker, "owner id set for [item]")
+ source.balloon_alert(user, "owner id set for [item]")
attached_circuit.owner_id = WEAKREF(item)
- return COMPONENT_NO_AFTERATTACK
+ return ITEM_INTERACT_SUCCESS
if(istype(item, /obj/item/circuit_component))
- attached_circuit.add_component_manually(item, attacker)
- return COMPONENT_NO_AFTERATTACK
+ if(attached_circuit.add_component_manually(item, user))
+ return ITEM_INTERACT_SUCCESS
+ return ITEM_INTERACT_BLOCKING
if(!istype(item, /obj/item/integrated_circuit))
return
var/obj/item/integrated_circuit/logic_board = item
- . = COMPONENT_NO_AFTERATTACK
if(logic_board.shell) // I'll be surprised if this ever happens
- return
+ return ITEM_INTERACT_BLOCKING
if(attached_circuit)
- source.balloon_alert(attacker, "there is already a circuitboard inside!")
- return
+ source.balloon_alert(user, "there is already a circuitboard inside!")
+ return ITEM_INTERACT_BLOCKING
if(logic_board.current_size > capacity)
- source.balloon_alert(attacker, "this is too large to fit into [parent]!")
- return
+ source.balloon_alert(user, "this is too large to fit into [parent]!")
+ return ITEM_INTERACT_BLOCKING
- logic_board.inserter_mind = WEAKREF(attacker.mind)
- attach_circuit(logic_board, attacker)
+ logic_board.inserter_mind = WEAKREF(user.mind)
+ attach_circuit(logic_board, user)
+ return ITEM_INTERACT_SUCCESS
/// Sets whether the shell is locked or not
/datum/component/shell/proc/set_locked(new_value)
diff --git a/code/datums/components/shielded.dm b/code/datums/components/shielded.dm
index 8be812678287..1f3269dab2d0 100644
--- a/code/datums/components/shielded.dm
+++ b/code/datums/components/shielded.dm
@@ -28,6 +28,8 @@
var/show_charge_as_alpha = FALSE
/// The item we use for recharging
var/recharge_path
+ /// The item can block OVERWHELMING_ATTACK, which is mostly used by mech melee attacks.
+ var/can_block_overwhelming = FALSE
/// The cooldown tracking when we were last hit
COOLDOWN_DECLARE(recently_hit_cd)
@@ -36,7 +38,7 @@
/// A callback for the sparks/message that play when a charge is used, see [/datum/component/shielded/proc/default_run_hit_callback]
var/datum/callback/on_hit_effects
-/datum/component/shielded/Initialize(max_charges = 3, recharge_start_delay = 20 SECONDS, charge_increment_delay = 1 SECONDS, charge_recovery = 1, lose_multiple_charges = FALSE, show_charge_as_alpha = FALSE, recharge_path = null, starting_charges = null, shield_icon_file = 'icons/effects/effects.dmi', shield_icon = "shield-old", shield_inhand = FALSE, run_hit_callback)
+/datum/component/shielded/Initialize(max_charges = 3, recharge_start_delay = 20 SECONDS, charge_increment_delay = 1 SECONDS, charge_recovery = 1, lose_multiple_charges = FALSE, show_charge_as_alpha = FALSE, recharge_path = null, can_block_overwhelming = FALSE, starting_charges = null, shield_icon_file = 'icons/effects/effects.dmi', shield_icon = "shield-old", shield_inhand = FALSE, run_hit_callback)
if(!isitem(parent) || max_charges <= 0)
return COMPONENT_INCOMPATIBLE
@@ -47,6 +49,7 @@
src.lose_multiple_charges = lose_multiple_charges
src.show_charge_as_alpha = show_charge_as_alpha
src.recharge_path = recharge_path
+ src.can_block_overwhelming = can_block_overwhelming
src.shield_icon_file = shield_icon_file
src.shield_icon = shield_icon
src.shield_inhand = shield_inhand
@@ -165,6 +168,11 @@
if(current_charges <= 0)
return
+
+ // if our shield is unable to block OVERWHELMING_ATTACK type attacks, we just let it pass.
+ if(attack_type == OVERWHELMING_ATTACK && !can_block_overwhelming)
+ return
+
. = COMPONENT_HIT_REACTION_BLOCK
var/charge_loss = 1 // how many charges do we lose
@@ -175,6 +183,9 @@
else if(damage < 3)
charge_loss = 0
+ else if(attack_type == OVERWHELMING_ATTACK && !lose_multiple_charges) // Always expend all charges when blocking an overwhelming attack unless we're using our shield like health.
+ charge_loss = max_charges
+
adjust_charge(-charge_loss)
INVOKE_ASYNC(src, PROC_REF(actually_run_hit_callback), owner, attack_text, current_charges)
diff --git a/code/datums/components/shuttle_move_deferred_checks.dm b/code/datums/components/shuttle_move_deferred_checks.dm
index e7268fe98c05..bc228998c6ea 100644
--- a/code/datums/components/shuttle_move_deferred_checks.dm
+++ b/code/datums/components/shuttle_move_deferred_checks.dm
@@ -2,13 +2,13 @@
/datum/component/shuttle_move_deferred_checks
dupe_mode = COMPONENT_DUPE_SOURCES
/// An list of targets to listen for the movements of
- var/list/targets = list()
+ var/list/targets
/// The check to call on the parent when a target moves. Can be the name of a proc on the parent, or a `/datum/callback`.
var/check
/// A list of each target currently being moved by a shuttle - if this list is not empty, checks will not be run.
- var/list/moving_targets = list()
+ var/list/moving_targets
/datum/component/shuttle_move_deferred_checks/Initialize(check)
. = ..()
@@ -27,7 +27,7 @@
var/atom/movable/movable = locate(source)
if(!istype(movable) || (check != src.check))
return COMPONENT_INCOMPATIBLE
- targets += movable
+ LAZYADD(targets, movable)
RegisterSignal(movable, COMSIG_MOVABLE_MOVED, PROC_REF(on_target_moved))
RegisterSignal(movable, COMSIG_ATOM_BEFORE_SHUTTLE_MOVE, PROC_REF(before_target_shuttle_move))
RegisterSignal(movable, COMSIG_ATOM_AFTER_SHUTTLE_MOVE, PROC_REF(after_target_shuttle_move))
@@ -37,11 +37,9 @@
var/atom/movable/movable = locate(source)
if(!istype(movable))
return
- targets -= movable
- moving_targets -= movable
+ LAZYREMOVE(targets, movable)
+ LAZYREMOVE(moving_targets, movable)
UnregisterSignal(movable, list(COMSIG_MOVABLE_MOVED, COMSIG_ATOM_BEFORE_SHUTTLE_MOVE, COMSIG_ATOM_AFTER_SHUTTLE_MOVE, COMSIG_QDELETING))
- if(!length(moving_targets) && length(targets))
- call_check()
return ..()
/datum/component/shuttle_move_deferred_checks/proc/call_check()
@@ -53,18 +51,18 @@
/datum/component/shuttle_move_deferred_checks/proc/on_target_moved(atom/movable/source, atom/old_loc, dir, forced, list/old_locs)
SIGNAL_HANDLER
- if(length(moving_targets))
+ if(LAZYLEN(moving_targets))
return
call_check()
/datum/component/shuttle_move_deferred_checks/proc/before_target_shuttle_move(atom/source)
SIGNAL_HANDLER
- moving_targets |= source
+ LAZYOR(moving_targets, source)
/datum/component/shuttle_move_deferred_checks/proc/after_target_shuttle_move(atom/source)
SIGNAL_HANDLER
- moving_targets -= source
- if(!length(moving_targets))
+ LAZYOR(moving_targets, source)
+ if(!LAZYLEN(moving_targets))
call_check()
/datum/component/shuttle_move_deferred_checks/proc/on_target_deleted(datum/source)
diff --git a/code/datums/components/sign_language.dm b/code/datums/components/sign_language.dm
index 8181388b6994..08bdb50d5a7c 100644
--- a/code/datums/components/sign_language.dm
+++ b/code/datums/components/sign_language.dm
@@ -310,6 +310,10 @@
/// Send a visible message depending on the tone of the message that the sender is trying to convey to the world.
/datum/component/sign_language/proc/emote_tone(mob/living/carbon/carbon_parent, emote_tone)
+ if(ishuman(carbon_parent))
+ var/mob/living/carbon/human/human_parent = carbon_parent
+ if(human_parent.is_face_obscured())
+ return // You can't see someone's expression if their face is obscured (or disfigured)
switch(emote_tone)
if(TONE_INQUISITIVE)
carbon_parent.visible_message(span_bold("quirks [carbon_parent.p_their()] brows quizzically."), visible_message_flags = EMOTE_MESSAGE|BLOCK_SELF_HIGHLIGHT_MESSAGE)
diff --git a/code/datums/components/simple_bodycam.dm b/code/datums/components/simple_bodycam.dm
index 9d653f38a784..1723a7a0a5a0 100644
--- a/code/datums/components/simple_bodycam.dm
+++ b/code/datums/components/simple_bodycam.dm
@@ -56,7 +56,7 @@
do_update_cam()
/datum/component/simple_bodycam/proc/do_update_cam()
- GLOB.cameranet.updatePortableCamera(bodycam, camera_update_time)
+ SScameras.update_portable_camera(bodycam, camera_update_time)
/datum/component/simple_bodycam/proc/rotate_cam(datum/source, old_dir, new_dir)
SIGNAL_HANDLER
diff --git a/code/datums/components/space_allergy.dm b/code/datums/components/space_allergy.dm
index 595c5fc0dfa9..a89161cfb775 100644
--- a/code/datums/components/space_allergy.dm
+++ b/code/datums/components/space_allergy.dm
@@ -18,6 +18,8 @@
SIGNAL_HANDLER
if(is_on_a_planet(parent) && parent.has_gravity())
- allergy = parent.apply_status_effect(/datum/status_effect/planet_allergy) //your gamer body cant stand real gravity < Soul
+ var/status_effect = parent.apply_status_effect(/datum/status_effect/planet_allergy) //your gamer body cant stand real gravity < Soul
+ if(status_effect)
+ allergy = status_effect
else
QDEL_NULL(allergy)
diff --git a/code/datums/components/speechmod.dm b/code/datums/components/speechmod.dm
index 45b2a6912682..e6d39faf57ca 100644
--- a/code/datums/components/speechmod.dm
+++ b/code/datums/components/speechmod.dm
@@ -50,10 +50,13 @@
targeted = owner.loc
RegisterSignal(targeted, COMSIG_MOB_SAY, PROC_REF(handle_speech))
- RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equipped))
- RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_unequipped))
- RegisterSignal(parent, COMSIG_ORGAN_IMPLANTED, PROC_REF(on_implanted))
- RegisterSignal(parent, COMSIG_ORGAN_REMOVED, PROC_REF(on_removed))
+ if (isorgan(parent))
+ RegisterSignal(parent, COMSIG_ORGAN_IMPLANTED, PROC_REF(on_implanted))
+ RegisterSignal(parent, COMSIG_ORGAN_REMOVED, PROC_REF(on_removed))
+ else
+ RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equipped))
+ RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_unequipped))
+
/datum/component/speechmod/proc/handle_speech(datum/source, list/speech_args)
SIGNAL_HANDLER
diff --git a/code/datums/components/splattercasting.dm b/code/datums/components/splattercasting.dm
index cc11afbf789e..bac08cdbbecc 100644
--- a/code/datums/components/splattercasting.dm
+++ b/code/datums/components/splattercasting.dm
@@ -82,7 +82,7 @@
var/blood_cost = (cooldown_remaining - new_cooldown ) * COOLDOWN_TO_BLOOD_RATIO
spell.StartCooldown(new_cooldown)
- source.blood_volume -= blood_cost
+ source.adjust_blood_volume(-blood_cost)
var/cost_desc
diff --git a/code/datums/components/squashable.dm b/code/datums/components/squashable.dm
index 785c6771ad3f..faa9d0e37fe2 100644
--- a/code/datums/components/squashable.dm
+++ b/code/datums/components/squashable.dm
@@ -74,7 +74,7 @@
if(squash_flags & SQUASHED_SHOULD_BE_GIBBED)
target.gib(DROP_ALL_REMAINS)
else
- target.adjustBruteLoss(squash_damage)
+ target.adjust_brute_loss(squash_damage)
/datum/component/squashable/UnregisterFromParent()
. = ..()
diff --git a/code/datums/components/storm_hating.dm b/code/datums/components/storm_hating.dm
index 896c9cd471a1..62a59a0ad71a 100644
--- a/code/datums/components/storm_hating.dm
+++ b/code/datums/components/storm_hating.dm
@@ -19,6 +19,7 @@
. = ..()
RegisterSignal(parent, COMSIG_ENTER_AREA, PROC_REF(on_area_entered))
RegisterSignal(parent, COMSIG_EXIT_AREA, PROC_REF(on_area_exited))
+ RegisterSignal(parent, COMSIG_MOB_LOGIN, PROC_REF(on_login))
/datum/component/storm_hating/UnregisterFromParent()
. = ..()
@@ -46,3 +47,7 @@
return
parent_atom.fade_into_nothing(life_time = 3 SECONDS, fade_time = 2 SECONDS)
qdel(src)
+
+/datum/component/storm_hating/proc/on_login(datum/source)
+ SIGNAL_HANDLER
+ qdel(src)
diff --git a/code/datums/components/style/style.dm b/code/datums/components/style/style.dm
index 2e8fb5cd07c1..7e156603e88f 100644
--- a/code/datums/components/style/style.dm
+++ b/code/datums/components/style/style.dm
@@ -95,7 +95,7 @@
src.multitooled = multitooled
/datum/component/style/RegisterWithParent()
- RegisterSignal(parent, COMSIG_USER_ITEM_INTERACTION, PROC_REF(hotswap))
+ RegisterSignal(parent, COMSIG_USER_PRE_ITEM_ATTACK, PROC_REF(hotswap))
RegisterSignal(parent, COMSIG_MOB_MINED, PROC_REF(on_mine))
RegisterSignal(parent, COMSIG_MOB_APPLY_DAMAGE, PROC_REF(on_take_damage))
RegisterSignal(parent, COMSIG_MOB_EMOTED("taunt"), PROC_REF(on_taunt))
@@ -110,7 +110,7 @@
ADD_TRAIT(parent, TRAIT_MINING_PARRYING, STYLE_TRAIT)
/datum/component/style/UnregisterFromParent()
- UnregisterSignal(parent, COMSIG_USER_ITEM_INTERACTION)
+ UnregisterSignal(parent, COMSIG_USER_PRE_ITEM_ATTACK)
UnregisterSignal(parent, COMSIG_MOB_MINED)
UnregisterSignal(parent, COMSIG_MOB_APPLY_DAMAGE)
UnregisterSignal(parent, COMSIG_MOB_EMOTED("taunt"))
@@ -292,27 +292,28 @@
return "#364866"
/// A proc that lets a user, when their rank >= `hotswap_rank`, swap items in storage with what's in their hands, simply by clicking on the stored item with a held item
-/datum/component/style/proc/hotswap(mob/living/source, atom/target, obj/item/weapon, list/modifiers)
+/datum/component/style/proc/hotswap(mob/living/source, obj/item/weapon, atom/target, list/modifiers)
SIGNAL_HANDLER
-
- if((rank < hotswap_rank) || !isitem(target) || !(target in source.get_all_contents()))
+ if((rank < hotswap_rank) || !isitem(target) || get(target, /mob/living) != source)
return NONE
var/obj/item/item_target = target
-
if(!(item_target.item_flags & IN_STORAGE))
return NONE
- var/datum/storage/atom_storage = item_target.loc.atom_storage
+ INVOKE_ASYNC(src, PROC_REF(hotswap_interact), source, weapon, target, modifiers)
+ return COMPONENT_CANCEL_ATTACK_CHAIN
+/datum/component/style/proc/hotswap_interact(mob/living/source, obj/item/weapon, atom/target, list/modifiers)
+ var/datum/storage/atom_storage = target.loc.atom_storage
if(!atom_storage.can_insert(weapon, source, messages = FALSE))
source.balloon_alert(source, "unable to hotswap!")
- return NONE
+ return
- atom_storage.attempt_insert(weapon, source, override = TRUE)
- INVOKE_ASYNC(source, TYPE_PROC_REF(/mob/living, put_in_hands), target)
- source.visible_message(span_notice("[source] quickly swaps [weapon] out with [target]!"), span_notice("You quickly swap [weapon] with [target]."))
- return ITEM_INTERACT_BLOCKING
+ if (atom_storage.attempt_insert(weapon, source, override = TRUE) && source.put_in_hands(target))
+ source.visible_message(span_notice("[source] quickly swaps [weapon] out with [target]!"), span_notice("You quickly swap [weapon] with [target]."))
+ else
+ source.balloon_alert(source, "unable to hotswap!")
// Point givers
/datum/component/style/proc/on_punch(mob/living/carbon/human/punching_person, atom/attacked_atom, proximity)
diff --git a/code/datums/components/subtype_picker.dm b/code/datums/components/subtype_picker.dm
index 5f8e1b471b61..46ff3f281ab5 100644
--- a/code/datums/components/subtype_picker.dm
+++ b/code/datums/components/subtype_picker.dm
@@ -24,6 +24,7 @@
/datum/component/subtype_picker/Destroy(force)
on_picked_callback = null
+ subtype2descriptions = null
return ..()
/datum/component/subtype_picker/RegisterWithParent()
@@ -69,11 +70,12 @@
return
var/picked_subtype = name2subtype[name_of_type]
- picked_subtype = new picked_subtype(picker.drop_location())
- on_picked_callback?.Invoke(picked_subtype, picker)
+ var/obj/item/picked = new picked_subtype(picker.drop_location())
+ on_picked_callback?.Invoke(picked, picker)
+ SEND_SIGNAL(picked, COMSIG_ITEM_SUBTYPE_PICKER_SELECTED, target, picker)
qdel(target)
- picker.put_in_hands(picked_subtype)
+ picker.put_in_hands(picked)
/**
* Checks if we are allowed to interact with the radial menu
diff --git a/code/datums/components/surgery_initiator.dm b/code/datums/components/surgery_initiator.dm
deleted file mode 100644
index 56c49e4c0ec2..000000000000
--- a/code/datums/components/surgery_initiator.dm
+++ /dev/null
@@ -1,344 +0,0 @@
-/// Allows an item to be used to initiate surgeries.
-/datum/component/surgery_initiator
- /// The currently selected target that the user is proposing a surgery on
- var/datum/weakref/surgery_target_ref
-
- /// The last user, as a weakref
- var/datum/weakref/last_user_ref
-
-/datum/component/surgery_initiator/Initialize()
- . = ..()
- if(!isitem(parent))
- return COMPONENT_INCOMPATIBLE
-
- var/obj/item/surgery_tool = parent
- surgery_tool.item_flags |= ITEM_HAS_CONTEXTUAL_SCREENTIPS
- ///Make sure we can use the surgery UI while laying down
- surgery_tool.interaction_flags_atom |= INTERACT_ATOM_IGNORE_MOBILITY
-
-/datum/component/surgery_initiator/Destroy(force)
- last_user_ref = null
- surgery_target_ref = null
-
- return ..()
-
-/datum/component/surgery_initiator/RegisterWithParent()
- RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(initiate_surgery_moment))
- RegisterSignal(parent, COMSIG_ITEM_REQUESTING_CONTEXT_FOR_TARGET, PROC_REF(add_item_context))
-
-/datum/component/surgery_initiator/UnregisterFromParent()
- UnregisterSignal(parent, COMSIG_ITEM_ATTACK, COMSIG_ITEM_REQUESTING_CONTEXT_FOR_TARGET)
- unregister_signals()
-
-/datum/component/surgery_initiator/proc/unregister_signals()
- var/mob/living/last_user = last_user_ref?.resolve()
- if (!isnull(last_user_ref))
- UnregisterSignal(last_user, COMSIG_MOB_SELECTED_ZONE_SET)
-
- var/mob/living/surgery_target = surgery_target_ref?.resolve()
- if (!isnull(surgery_target_ref))
- UnregisterSignal(surgery_target, COMSIG_MOB_SURGERY_STARTED)
-
-/// Does the surgery initiation.
-/datum/component/surgery_initiator/proc/initiate_surgery_moment(datum/source, atom/target, mob/user)
- SIGNAL_HANDLER
- if(!isliving(target))
- return
- INVOKE_ASYNC(src, PROC_REF(do_initiate_surgery_moment), target, user)
- return COMPONENT_CANCEL_ATTACK_CHAIN
-
-/datum/component/surgery_initiator/proc/do_initiate_surgery_moment(mob/living/target, mob/user)
- var/datum/surgery/current_surgery
-
- for(var/i_one in target.surgeries)
- var/datum/surgery/surgeryloop = i_one
- if(surgeryloop.location == user.zone_selected)
- current_surgery = surgeryloop
- break
-
- if (!isnull(current_surgery) && !current_surgery.step_in_progress)
- attempt_cancel_surgery(current_surgery, target, user)
- return
-
- var/list/available_surgeries = get_available_surgeries(user, target)
-
- if(!length(available_surgeries))
- if (target.body_position == LYING_DOWN || !(target.mobility_flags & MOBILITY_LIEDOWN))
- target.balloon_alert(user, "no surgeries available!")
- else
- target.balloon_alert(user, "make them lie down!")
-
- return
-
- unregister_signals()
-
- last_user_ref = WEAKREF(user)
- surgery_target_ref = WEAKREF(target)
-
- RegisterSignal(user, COMSIG_MOB_SELECTED_ZONE_SET, PROC_REF(on_set_selected_zone))
- RegisterSignal(target, COMSIG_MOB_SURGERY_STARTED, PROC_REF(on_mob_surgery_started))
-
- ui_interact(user)
-
-/datum/component/surgery_initiator/proc/get_available_surgeries(mob/user, mob/living/target)
- var/list/available_surgeries = list()
-
- var/obj/item/bodypart/affecting = target.get_bodypart(check_zone(user.zone_selected))
-
- for(var/datum/surgery/surgery as anything in GLOB.surgeries_list)
- if(!surgery.possible_locs.Find(user.zone_selected))
- continue
- if(!is_type_in_list(target, surgery.target_mobtypes))
- continue
- if(user == target && !HAS_TRAIT(user, TRAIT_SELF_SURGERY) && !(surgery.surgery_flags & SURGERY_SELF_OPERABLE))
- continue
-
- if(isnull(affecting))
- if(surgery.surgery_flags & SURGERY_REQUIRE_LIMB)
- continue
- else
- if(surgery.requires_bodypart_type && !(affecting.bodytype & surgery.requires_bodypart_type))
- continue
- if(surgery.targetable_wound && !affecting.get_wound_type(surgery.targetable_wound))
- continue
- if((surgery.surgery_flags & SURGERY_REQUIRES_REAL_LIMB) && (affecting.bodypart_flags & BODYPART_PSEUDOPART))
- continue
-
- if(IS_IN_INVALID_SURGICAL_POSITION(target, surgery))
- continue
- if(!surgery.can_start(user, target))
- continue
-
- available_surgeries += surgery
-
- return available_surgeries
-
-/// Does the surgery de-initiation.
-/datum/component/surgery_initiator/proc/attempt_cancel_surgery(datum/surgery/the_surgery, mob/living/patient, mob/user)
- var/selected_zone = user.zone_selected
-
- if(the_surgery.status == 1)
- patient.surgeries -= the_surgery
- user.visible_message(
- span_notice("[user] removes [parent] from [patient]'s [patient.parse_zone_with_bodypart(selected_zone)]."),
- span_notice("You remove [parent] from [patient]'s [patient.parse_zone_with_bodypart(selected_zone)]."),
- )
-
- patient.balloon_alert(user, "stopped work on [patient.parse_zone_with_bodypart(selected_zone)]")
-
- qdel(the_surgery)
- return
-
- var/required_tool_type = TOOL_CAUTERY
- var/obj/item/close_tool = user.get_inactive_held_item()
- var/is_robotic = the_surgery.requires_bodypart_type == BODYTYPE_ROBOTIC
- if(is_robotic)
- required_tool_type = TOOL_SCREWDRIVER
-
- if(!close_tool || close_tool.tool_behaviour != required_tool_type)
- patient.balloon_alert(user, "need a [is_robotic ? "screwdriver": "cautery"] in your inactive hand to stop the surgery!")
- return
-
- if(the_surgery.operated_bodypart)
- the_surgery.operated_bodypart.adjustBleedStacks(-5)
-
- patient.surgeries -= the_surgery
-
- user.visible_message(
- span_notice("[user] closes [patient]'s [patient.parse_zone_with_bodypart(selected_zone)] with [close_tool] and removes [parent]."),
- span_notice("You close [patient]'s [patient.parse_zone_with_bodypart(selected_zone)] with [close_tool] and remove [parent]."),
- )
-
- patient.balloon_alert(user, "closed up [patient.parse_zone_with_bodypart(selected_zone)]")
-
- qdel(the_surgery)
-
-/datum/component/surgery_initiator/proc/on_mob_surgery_started(mob/source, datum/surgery/surgery, surgery_location)
- SIGNAL_HANDLER
-
- var/mob/living/last_user = last_user_ref.resolve()
-
- if (surgery_location != last_user.zone_selected)
- return
-
- if (!isnull(last_user))
- source.balloon_alert(last_user, "someone else started a surgery!")
-
- ui_close()
-
-/datum/component/surgery_initiator/proc/on_set_selected_zone(mob/source, new_zone)
- ui_interact(source)
-
-/datum/component/surgery_initiator/ui_interact(mob/user, datum/tgui/ui)
- ui = SStgui.try_update_ui(user, src, ui)
- if (!ui)
- ui = new(user, src, "SurgeryInitiator")
- ui.open()
-
-/datum/component/surgery_initiator/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
- . = ..()
- if (.)
- return .
-
- var/mob/user = usr
- var/mob/living/surgery_target = surgery_target_ref.resolve()
-
- if (isnull(surgery_target))
- return TRUE
-
- switch (action)
- if ("change_zone")
- var/zone = params["new_zone"]
- if (!(zone in list(
- BODY_ZONE_HEAD,
- BODY_ZONE_CHEST,
- BODY_ZONE_L_ARM,
- BODY_ZONE_R_ARM,
- BODY_ZONE_L_LEG,
- BODY_ZONE_R_LEG,
- BODY_ZONE_PRECISE_EYES,
- BODY_ZONE_PRECISE_MOUTH,
- BODY_ZONE_PRECISE_GROIN,
- )))
- return TRUE
-
- var/atom/movable/screen/zone_sel/zone_selector = user.hud_used?.zone_select
- zone_selector?.set_selected_zone(zone, user, should_log = FALSE)
-
- return TRUE
- if ("start_surgery")
- for (var/datum/surgery/surgery as anything in get_available_surgeries(user, surgery_target))
- if (surgery.name == params["surgery_name"])
- try_choose_surgery(user, surgery_target, surgery)
- return TRUE
-
-/datum/component/surgery_initiator/ui_assets(mob/user)
- return list(
- get_asset_datum(/datum/asset/simple/body_zones),
- )
-
-/datum/component/surgery_initiator/ui_data(mob/user)
- var/mob/living/surgery_target = surgery_target_ref?.resolve()
-
- var/list/surgeries = list()
- if (!isnull(surgery_target))
- for (var/datum/surgery/surgery as anything in get_available_surgeries(user, surgery_target))
- var/list/surgery_info = list(
- "name" = surgery.name,
- )
-
- if (surgery_needs_exposure(surgery, surgery_target))
- surgery_info["blocked"] = TRUE
-
- surgeries += list(surgery_info)
-
- return list(
- "selected_zone" = user.zone_selected,
- "target_name" = surgery_target?.name,
- "surgeries" = surgeries,
- )
-
-/datum/component/surgery_initiator/ui_close(mob/user)
- unregister_signals()
- surgery_target_ref = null
-
- return ..()
-
-/datum/component/surgery_initiator/ui_status(mob/user, datum/ui_state/state)
- var/mob/living/surgery_target = surgery_target_ref?.resolve()
- if (isnull(surgery_target))
- return UI_CLOSE
-
- if (!can_start_surgery(user, surgery_target))
- return UI_CLOSE
-
- return ..()
-
-/datum/component/surgery_initiator/proc/can_start_surgery(mob/user, mob/living/target)
- if (!user.Adjacent(target))
- return FALSE
-
- // The item was moved somewhere else
- var/atom/movable/tool = parent
- if (tool.loc != user)
- return FALSE
-
- // While we were choosing, another surgery was started at the same location
- for (var/datum/surgery/surgery in target.surgeries)
- if (surgery.location == user.zone_selected)
- return FALSE
-
- return TRUE
-
-/datum/component/surgery_initiator/proc/try_choose_surgery(mob/user, mob/living/target, datum/surgery/surgery)
- if (!can_start_surgery(user, target))
- // This could have a more detailed message, but the UI closes when this is true anyway, so
- // if it ever comes up, it'll be because of lag.
- target.balloon_alert(user, "can't start the surgery!")
- return
-
- var/selected_zone = user.zone_selected
- var/obj/item/bodypart/affecting_limb = target.get_bodypart(check_zone(selected_zone))
-
- if ((surgery.surgery_flags & SURGERY_REQUIRE_LIMB) && isnull(affecting_limb))
- target.balloon_alert(user, "patient has no [parse_zone(selected_zone)]!")
- return
-
- if (!isnull(affecting_limb))
- if(surgery.requires_bodypart_type && !(affecting_limb.bodytype & surgery.requires_bodypart_type))
- target.balloon_alert(user, "not the right type of limb!")
- return
- if(surgery.targetable_wound && !affecting_limb.get_wound_type(surgery.targetable_wound))
- target.balloon_alert(user, "no wound to operate on!")
- return
-
- if (IS_IN_INVALID_SURGICAL_POSITION(target, surgery))
- target.balloon_alert(user, "patient is not lying down!")
- return
-
- if (!surgery.can_start(user, target))
- target.balloon_alert(user, "can't start the surgery!")
- return
-
- if (surgery_needs_exposure(surgery, target))
- target.balloon_alert(user, "expose [target.p_their()] [target.parse_zone_with_bodypart(selected_zone)]!")
- return
-
- ui_close()
-
- var/datum/surgery/procedure = new surgery.type(target, selected_zone, affecting_limb)
-
- target.balloon_alert(user, "starting \"[LOWER_TEXT(procedure.name)]\"")
-
- user.visible_message(
- span_notice("[user] drapes [parent] over [target]'s [target.parse_zone_with_bodypart(selected_zone)] to prepare for surgery."),
- span_notice("You drape [parent] over [target]'s [target.parse_zone_with_bodypart(selected_zone)] to prepare for \an [procedure.name]."),
- )
-
- log_combat(user, target, "operated on", null, "(OPERATION TYPE: [procedure.name]) (TARGET AREA: [selected_zone])")
-
-/datum/component/surgery_initiator/proc/surgery_needs_exposure(datum/surgery/surgery, mob/living/target)
- var/mob/living/user = last_user_ref?.resolve()
- if (isnull(user))
- return FALSE
- if(surgery.surgery_flags & SURGERY_IGNORE_CLOTHES)
- return FALSE
-
- return !get_location_accessible(target, user.zone_selected)
-
-/**
- * Adds context sensitivy directly to the surgery initator file for screentips
- * Arguments:
- * * source - the surgery drapes, cloak, or bedsheet calling surgery initator
- * * context - Preparing Surgery, the component has a lot of ballon alerts to deal with most contexts
- * * target - the living target mob you are doing surgery on
- * * user - refers to user who will see the screentip when the drapes are on a living target
- */
-/datum/component/surgery_initiator/proc/add_item_context(obj/item/source, list/context, atom/target, mob/living/user,)
- SIGNAL_HANDLER
-
- if(!isliving(target))
- return NONE
-
- context[SCREENTIP_CONTEXT_LMB] = "Prepare Surgery"
- return CONTEXTUAL_SCREENTIP_SET
diff --git a/code/datums/components/table_smash.dm b/code/datums/components/table_smash.dm
deleted file mode 100644
index 017f0cff7b3c..000000000000
--- a/code/datums/components/table_smash.dm
+++ /dev/null
@@ -1,197 +0,0 @@
-/// Component which allows mobs to be smashed onto this surface like a wrestling move
-/datum/component/table_smash
- /// If true, mobs will be placed gently on the table even if they're in an aggressive grab
- var/gentle_push
- /// Callback invoked after a hostile table action
- var/datum/callback/after_smash
-
-/datum/component/table_smash/Initialize(gentle_push = FALSE, after_smash = null)
- . = ..()
- if (!isobj(parent))
- return COMPONENT_INCOMPATIBLE
-
- src.gentle_push = gentle_push
- src.after_smash = after_smash
-
-/datum/component/table_smash/RegisterWithParent()
- RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_interaction))
- RegisterSignal(parent, COMSIG_ATOM_ITEM_INTERACTION, PROC_REF(on_item_interaction))
-
- var/static/list/loc_connections = list(
- COMSIG_LIVING_DISARM_COLLIDE = PROC_REF(on_pushed_into),
- )
- AddComponent(/datum/component/connect_loc_behalf, parent, loc_connections)
-
-/datum/component/table_smash/UnregisterFromParent()
- UnregisterSignal(parent, list(COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_ITEM_INTERACTION))
-
-/// Called when someone clicks on our surface
-/datum/component/table_smash/proc/on_interaction(obj/table, mob/user)
- SIGNAL_HANDLER
-
- if (!table.Adjacent(user) || !user.pulling)
- return
-
- if (!isliving(user.pulling))
- if (!(user.pulling.pass_flags & PASSTABLE))
- return
-
- user.Move_Pulled(table)
-
- if (user.pulling.loc == table.loc)
- user.visible_message(span_notice("[user] places [user.pulling] onto [table]."),
- span_notice("You place [user.pulling] onto [table]."))
- user.stop_pulling()
-
- return COMPONENT_CANCEL_ATTACK_CHAIN
-
- var/mob/living/pushed_mob = user.pulling
- if (pushed_mob.buckled)
- if (pushed_mob.buckled == table)
- //Already buckled to the table, you probably meant to unbuckle them
- return
-
- to_chat(user, span_warning("[pushed_mob] is buckled to [pushed_mob.buckled]!"))
- return COMPONENT_CANCEL_ATTACK_CHAIN
-
- INVOKE_ASYNC(src, PROC_REF(perform_table_smash), table, user)
- return COMPONENT_CANCEL_ATTACK_CHAIN
-
-/// We have a mob being pressed onto the table, but how strongly?
-/datum/component/table_smash/proc/perform_table_smash(obj/table, mob/living/user)
- var/mob/living/pushed_mob = user.pulling
- if (user.combat_mode)
- switch(user.grab_state)
- if (GRAB_PASSIVE)
- to_chat(user, span_warning("You need a better grip to do that!"))
- return
- if (GRAB_AGGRESSIVE)
- if (gentle_push)
- tableplace(user, pushed_mob)
- else
- tablepush(user, pushed_mob)
- if (GRAB_NECK to GRAB_KILL)
- tablelimbsmash(user, pushed_mob)
- else
- pushed_mob.visible_message(span_notice("[user] begins to place [pushed_mob] onto [table]..."), \
- span_userdanger("[user] begins to place [pushed_mob] onto [table]..."))
- if (do_after(user, 3.5 SECONDS, target = pushed_mob))
- tableplace(user, pushed_mob)
- else
- return
-
- user.stop_pulling()
-
-/// Called when someone clicks on our surface with an item
-/datum/component/table_smash/proc/on_item_interaction(obj/table, mob/living/user, obj/item/item, modifiers)
- SIGNAL_HANDLER
- if (!istype(item, /obj/item/riding_offhand))
- return NONE
-
- var/obj/item/riding_offhand/riding_item = item
- var/mob/living/carried_mob = riding_item.rider
- if (carried_mob == user) //Piggyback user.
- return NONE
-
- INVOKE_ASYNC(src, PROC_REF(riding_offhand_act), user, item)
- return ITEM_INTERACT_BLOCKING
-
-/// Called when someone clicks on our surface using a fireman's carry
-/datum/component/table_smash/proc/riding_offhand_act(mob/living/user, obj/item/riding_offhand/riding_item)
- var/mob/living/carried_mob = riding_item.rider
- if (user.combat_mode)
- user.unbuckle_mob(carried_mob)
- tablelimbsmash(user, carried_mob)
- return ITEM_INTERACT_SUCCESS
-
- var/tableplace_delay = 3.5 SECONDS
- var/skills_space = ""
- if (HAS_TRAIT(user, TRAIT_QUICKER_CARRY))
- tableplace_delay = 2 SECONDS
- skills_space = " expertly"
- else if (HAS_TRAIT(user, TRAIT_QUICK_CARRY))
- tableplace_delay = 2.75 SECONDS
- skills_space = " quickly"
-
- var/obj/item/organ/cyberimp/chest/spine/potential_spine = user.get_organ_slot(ORGAN_SLOT_SPINE)
- if (istype(potential_spine))
- tableplace_delay *= potential_spine.athletics_boost_multiplier
-
- carried_mob.visible_message(span_notice("[user] begins to[skills_space] place [carried_mob] onto [parent]..."),
- span_userdanger("[user] begins to[skills_space] place [carried_mob] onto [parent]..."))
- if (!do_after(user, tableplace_delay, target = carried_mob))
- return ITEM_INTERACT_BLOCKING
- user.unbuckle_mob(carried_mob)
- tableplace(user, carried_mob)
- return ITEM_INTERACT_SUCCESS
-
-/// Gently place the mob onto the table
-/datum/component/table_smash/proc/tableplace(mob/living/user, mob/living/pushed_mob)
- var/obj/table = parent
- pushed_mob.forceMove(table.loc)
- pushed_mob.set_resting(TRUE, TRUE)
- pushed_mob.visible_message(span_notice("[user] places [pushed_mob] onto [parent]."), \
- span_notice("[user] places [pushed_mob] onto [parent]."))
- log_combat(user, pushed_mob, "places", null, "onto [parent]")
-
-/// Aggressively smash the mob onto the table
-/datum/component/table_smash/proc/tablepush(mob/living/user, mob/living/pushed_mob)
- if (HAS_TRAIT(user, TRAIT_PACIFISM))
- to_chat(user, span_danger("Throwing [pushed_mob] onto the table might hurt them!"))
- return
-
- var/passtable_key = REF(user)
- passtable_on(pushed_mob, passtable_key)
- for (var/obj/obj in user.loc.contents)
- if (!obj.CanAllowThrough(pushed_mob))
- return
-
- var/obj/table = parent
- pushed_mob.Move(table.loc)
- passtable_off(pushed_mob, passtable_key)
- if (pushed_mob.loc != table.loc) //Something prevented the tabling
- return
-
- pushed_mob.Knockdown(3 SECONDS)
- pushed_mob.apply_damage(10, BRUTE)
- pushed_mob.apply_damage(40, STAMINA)
- playsound(pushed_mob, 'sound/effects/tableslam.ogg', 90, TRUE)
- pushed_mob.visible_message(span_danger("[user] slams [pushed_mob] onto \the [parent]!"), \
- span_userdanger("[user] slams you onto \the [parent]!"))
- log_combat(user, pushed_mob, "tabled", null, "onto [parent]")
- pushed_mob.add_mood_event("table", /datum/mood_event/table)
- SEND_SIGNAL(user, COMSIG_LIVING_TABLE_SLAMMING, pushed_mob, parent)
- after_smash?.Invoke(pushed_mob)
-
-/// Even more aggressively smash a single part of a mob onto the table
-/datum/component/table_smash/proc/tablelimbsmash(mob/living/user, mob/living/pushed_mob)
- var/obj/table = parent
- pushed_mob.Knockdown(3 SECONDS)
- var/obj/item/bodypart/banged_limb = pushed_mob.get_bodypart(user.zone_selected) || pushed_mob.get_bodypart(BODY_ZONE_HEAD)
- var/extra_wound = 0
- if (HAS_TRAIT(user, TRAIT_HULK))
- extra_wound = 20
- pushed_mob.apply_damage(30, BRUTE, banged_limb, wound_bonus = extra_wound)
- pushed_mob.apply_damage(60, STAMINA)
- playsound(pushed_mob, 'sound/effects/bang.ogg', 90, TRUE)
- pushed_mob.visible_message(span_danger("[user] smashes [pushed_mob]'s [banged_limb.plaintext_zone] against \the [parent]!"),
- span_userdanger("[user] smashes your [banged_limb.plaintext_zone] against \the [parent]"))
- log_combat(user, pushed_mob, "head slammed", null, "against [parent]")
- pushed_mob.add_mood_event("table", /datum/mood_event/table_limbsmash, banged_limb)
- table.take_damage(50)
- SEND_SIGNAL(user, COMSIG_LIVING_TABLE_LIMB_SLAMMING, pushed_mob, parent)
- after_smash?.Invoke(pushed_mob)
-
-/// Called when someone is shoved into our tile
-/datum/component/table_smash/proc/on_pushed_into(turf/source, mob/living/shover, mob/living/target, shove_flags, obj/item/weapon)
- SIGNAL_HANDLER
- if((shove_flags & SHOVE_KNOCKDOWN_BLOCKED) || !(shove_flags & SHOVE_BLOCKED))
- return
- target.Knockdown(SHOVE_KNOCKDOWN_TABLE, daze_amount = 3 SECONDS)
- target.visible_message(span_danger("[shover.name] shoves [target.name] onto \the [parent]!"),
- span_userdanger("You're shoved onto \the [parent] by [shover.name]!"), span_hear("You hear aggressive shuffling followed by a loud thud!"), COMBAT_MESSAGE_RANGE, shover)
- to_chat(shover, span_danger("You shove [target.name] onto \the [parent]!"))
- target.throw_at(parent, 1, 1, null, FALSE) //1 speed throws with no spin are basically just forcemoves with a hard collision check
- log_combat(shover, target, "shoved", "onto [parent] (table)[weapon ? " with [weapon]" : ""]")
- after_smash?.Invoke(target)
- return COMSIG_LIVING_SHOVE_HANDLED
diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm
index ac4a44c99799..ad8d53b123de 100644
--- a/code/datums/components/tackle.dm
+++ b/code/datums/components/tackle.dm
@@ -118,7 +118,7 @@
clicked_atom = get_turf_in_angle(tackle_angle, get_turf(user), min_distance)
user.Knockdown(base_knockdown, ignore_canstun = TRUE)
- user.adjustStaminaLoss(stamina_cost)
+ user.adjust_stamina_loss(stamina_cost)
user.throw_at(clicked_atom, range, speed, user, FALSE)
addtimer(CALLBACK(src, PROC_REF(resetTackle)), base_knockdown, TIMER_STOPPABLE)
return(COMSIG_MOB_CANCEL_CLICKON)
@@ -411,6 +411,13 @@
if(istype(potential_spine))
defense_mod += potential_spine.strength_bonus
+ if(istype(tackle_target.wear_suit, /obj/item/clothing/suit/hooded/cultrobes/eldritch/blade))
+ defense_mod += 8
+ if(istype(tackle_target.wear_suit, /obj/item/clothing/suit/hooded/cultrobes/eldritch/rust))
+ var/obj/item/clothing/suit/hooded/cultrobes/eldritch/rust/rust_robes = tackle_target.wear_suit
+ if(rust_robes.rusted)
+ defense_mod += 10
+
// OF-FENSE
var/mob/living/carbon/sacker = parent
var/sacker_drunkenness = sacker.get_drunk_amount()
@@ -459,11 +466,11 @@
if(human_sacker.mob_mood.sanity_level == SANITY_LEVEL_INSANE) //I've gone COMPLETELY INSANE
attack_mod += 15
- human_sacker.adjustStaminaLoss(100) //AHAHAHAHAHAHAHAHA
+ human_sacker.adjust_stamina_loss(100) //AHAHAHAHAHAHAHAHA
if(HAS_TRAIT(human_sacker, TRAIT_BRAWLING_KNOCKDOWN_BLOCKED)) // tackling with riot specialized armor, like riot armor, is effective but tiring
attack_mod += 2
- human_sacker.adjustStaminaLoss(20)
+ human_sacker.adjust_stamina_loss(20)
var/randomized_tackle_roll = rand(-3, 3) - defense_mod + attack_mod + skill_mod
return randomized_tackle_roll
@@ -615,7 +622,7 @@
embed.ignore_throwspeed_threshold = initial(embed.ignore_throwspeed_threshold)
embed.impact_pain_mult = initial(embed.impact_pain_mult)
windscreen_casualty.atom_destruction()
- user.adjustStaminaLoss(10 * speed)
+ user.adjust_stamina_loss(10 * speed)
user.Paralyze(3 SECONDS)
user.visible_message(span_danger("[user] smacks into [windscreen_casualty] and shatters it, shredding [user.p_them()]self with glass!"), span_userdanger("You smacks into [windscreen_casualty] and shatter it, shredding yourself with glass!"))
@@ -624,8 +631,8 @@
user.Paralyze(1 SECONDS)
user.Knockdown(3 SECONDS)
windscreen_casualty.take_damage(30 * speed)
- user.adjustStaminaLoss(10 * speed, updating_stamina=FALSE)
- user.adjustBruteLoss(5 * speed)
+ user.adjust_stamina_loss(10 * speed, updating_stamina=FALSE)
+ user.adjust_brute_loss(5 * speed)
/datum/component/tackler/proc/delayedSmash(obj/structure/window/windscreen_casualty)
if(windscreen_casualty)
@@ -669,8 +676,8 @@
HOW_big_of_a_miss_did_we_just_make = ", making a ginormous mess!" // an extra exclamation point!! for emphasis!!!
owner.visible_message(span_danger("[owner] trips over [kevved] and slams into it face-first[HOW_big_of_a_miss_did_we_just_make]!"), span_userdanger("You trip over [kevved] and slam into it face-first[HOW_big_of_a_miss_did_we_just_make]!"))
- owner.adjustStaminaLoss(15 + messes.len * 2, updating_stamina = FALSE)
- owner.adjustBruteLoss(8 + messes.len, updating_health = FALSE)
+ owner.adjust_stamina_loss(15 + messes.len * 2, updating_stamina = FALSE)
+ owner.adjust_brute_loss(8 + messes.len, updating_health = FALSE)
owner.Paralyze(0.4 SECONDS * messes.len) // .4 seconds of paralyze for each thing you knock around
owner.Knockdown(2 SECONDS + 0.4 SECONDS * messes.len) // 2 seconds of knockdown after the paralyze
owner.updatehealth()
diff --git a/code/datums/components/temporary_body.dm b/code/datums/components/temporary_body.dm
index 3af84faaee94..deadf90e6f99 100644
--- a/code/datums/components/temporary_body.dm
+++ b/code/datums/components/temporary_body.dm
@@ -12,10 +12,8 @@
var/datum/weakref/old_body_ref
/// Returns the mind if the parent dies by any means
var/delete_on_death = FALSE
- /// If the temporary body is attached to a permanent body (split personality body) then we dont ghostize and instead just simply transfer client back
- var/perma_body_attached
-/datum/component/temporary_body/Initialize(datum/mind/old_mind, mob/living/old_body, delete_on_death = FALSE, perma_body_attached = FALSE)
+/datum/component/temporary_body/Initialize(datum/mind/old_mind, mob/living/old_body, delete_on_death = FALSE)
if(!isliving(parent))
return COMPONENT_INCOMPATIBLE
src.old_mind_ref = WEAKREF(old_mind)
@@ -23,7 +21,6 @@
ADD_TRAIT(old_body, TRAIT_MIND_TEMPORARILY_GONE, REF(src))
src.old_body_ref = WEAKREF(old_body)
src.delete_on_death = delete_on_death
- src.perma_body_attached = perma_body_attached
/datum/component/temporary_body/RegisterWithParent()
RegisterSignal(parent, COMSIG_QDELETING, PROC_REF(on_parent_destroy))
@@ -48,13 +45,12 @@
return
var/mob/living/living_parent = parent
- if(!perma_body_attached)
- var/mob/dead/observer/ghost = living_parent.ghostize()
- if(!ghost)
- ghost = living_parent.get_ghost()
- if(!ghost)
- CRASH("[src] belonging to [parent] was completely unable to find a ghost to put back into a body!")
- ghost.mind = old_mind
+ var/mob/dead/observer/ghost = living_parent.ghostize()
+ if(!ghost)
+ ghost = living_parent.get_ghost()
+ if(!ghost)
+ CRASH("[src] belonging to [parent] was completely unable to find a ghost to put back into a body!")
+ ghost.mind = old_mind
if(old_body?.stat != DEAD)
old_mind.transfer_to(old_body, force_key_move = TRUE)
else
diff --git a/code/datums/components/tether.dm b/code/datums/components/tether.dm
index b2aedaeb9ff4..e156640682ff 100644
--- a/code/datums/components/tether.dm
+++ b/code/datums/components/tether.dm
@@ -286,7 +286,7 @@
/datum/component/tether/proc/process_beam_click(atom/source, atom/location, params, mob/user)
var/turf/nearest_turf
for (var/turf/line_turf in get_line(get_turf(parent), get_turf(tether_target)))
- if (user.CanReach(line_turf))
+ if (line_turf.IsReachableBy(user))
nearest_turf = line_turf
break
diff --git a/code/datums/components/throwbonus_on_windup.dm b/code/datums/components/throwbonus_on_windup.dm
index f93109126d1b..dd12b945f29e 100644
--- a/code/datums/components/throwbonus_on_windup.dm
+++ b/code/datums/components/throwbonus_on_windup.dm
@@ -45,13 +45,17 @@
start_windup()
/datum/component/throwbonus_on_windup/proc/start_windup()
+ if(!QDELETED(our_bar))
+ CRASH("throwbonus_on_windup component attempted to start windup while already winding up a throw!")
throwforce_bonus = initial(throwforce_bonus)
var/mob/living/our_holder = holder?.resolve()
if(isnull(holder))
return
+
if(throw_text)
to_chat(our_holder, span_warning(throw_text))
+
var/x_position = CEILING(our_holder.get_visual_width() * 0.5, 1)
our_bar = new()
our_bar.maximum_count = maximum_bonus
@@ -76,9 +80,12 @@
holder = null
return ..()
-/datum/component/throwbonus_on_windup/proc/throw_change(datum/source, throw_mode)
+/datum/component/throwbonus_on_windup/proc/throw_change(mob/living/source, throw_mode)
SIGNAL_HANDLER
+ if (source.get_active_held_item() != parent)
+ return
+
if(throw_mode)
start_windup()
else
diff --git a/code/datums/components/torn_wall.dm b/code/datums/components/torn_wall.dm
index 9b36921a39f3..5de757e9fd81 100644
--- a/code/datums/components/torn_wall.dm
+++ b/code/datums/components/torn_wall.dm
@@ -13,10 +13,11 @@
dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS
var/current_stage = TORN_WALL_INITIAL
-/datum/component/torn_wall/Initialize()
+/datum/component/torn_wall/Initialize(current_stage)
. = ..()
if (!isclosedturf(parent) || isindestructiblewall(parent))
return COMPONENT_INCOMPATIBLE
+ src.current_stage = current_stage || src.current_stage
/datum/component/torn_wall/RegisterWithParent()
RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examined))
diff --git a/code/datums/components/transforming.dm b/code/datums/components/transforming.dm
index eda017372310..a82f247df630 100644
--- a/code/datums/components/transforming.dm
+++ b/code/datums/components/transforming.dm
@@ -114,10 +114,10 @@
/datum/component/transforming/UnregisterFromParent()
UnregisterSignal(parent, list(COMSIG_ITEM_ATTACK_SELF, COMSIG_ITEM_SHARPEN_ACT, COMSIG_DETECTIVE_SCANNED))
-/datum/component/transforming/proc/on_scan(datum/source, mob/user, list/extra_data)
+/datum/component/transforming/proc/on_scan(datum/source, mob/user, datum/detective_scanner_log/entry)
SIGNAL_HANDLER
- LAZYADD(extra_data[DETSCAN_CATEGORY_NOTES], "Readings suggest some form of state changing.")
+ entry.add_data_entry(DETSCAN_CATEGORY_NOTES, "Readings suggest some form of state changing.")
/*
* Called on [COMSIG_ITEM_ATTACK_SELF].
@@ -273,11 +273,11 @@
var/obj/item/item_parent = parent
switch(item_parent.damtype)
if(STAMINA)
- user.adjustStaminaLoss(clumsy_damage)
+ user.adjust_stamina_loss(clumsy_damage)
if(OXY)
- user.adjustOxyLoss(clumsy_damage)
+ user.adjust_oxy_loss(clumsy_damage)
if(TOX)
- user.adjustToxLoss(clumsy_damage)
+ user.adjust_tox_loss(clumsy_damage)
if(BRUTE)
user.take_bodypart_damage(brute=clumsy_damage)
if(BURN)
diff --git a/code/datums/components/trapdoor.dm b/code/datums/components/trapdoor.dm
index 28b708200159..7407e467bf0a 100644
--- a/code/datums/components/trapdoor.dm
+++ b/code/datums/components/trapdoor.dm
@@ -11,10 +11,13 @@
* assembly code at the bottom of this file
*/
/datum/component/trapdoor
+ can_transfer = TRUE
///assembly tied to this trapdoor
var/obj/item/assembly/trapdoor/assembly
///path of the turf this should change into when the assembly is pulsed. needed for openspace trapdoors knowing what to turn back into
var/trapdoor_turf_path
+ ///stack of baseturfs on top of the openspace under this trapdoor
+ var/list/trapdoor_baseturfs = list()
/// is this trapdoor "conspicuous" (ie. it gets examine text and overlay added)
var/conspicuous
/// overlay that makes trapdoors more obvious
@@ -32,8 +35,10 @@
var/autoclose = TRUE
/// Delay before trapdoor shuts close
var/autoclose_delay = 5 SECONDS
+ /// Is this trapdoor on a shuttle
+ var/on_shuttle = FALSE
-/datum/component/trapdoor/Initialize(starts_open, trapdoor_turf_path, assembly, conspicuous = TRUE, list/carried_decals = null, autoclose = TRUE)
+/datum/component/trapdoor/Initialize(starts_open, trapdoor_turf_path, trapdoor_baseturfs, assembly, conspicuous = TRUE, list/carried_decals = null, autoclose = TRUE)
if(!isopenturf(parent))
return COMPONENT_INCOMPATIBLE
@@ -46,29 +51,57 @@
if(!trapdoor_overlay)
trapdoor_overlay = mutable_appearance('icons/turf/overlays.dmi', "border_black", ABOVE_NORMAL_TURF_LAYER)
+ var/turf/parent_turf = parent
+ if(SSshuttle.get_containing_shuttle(parent_turf))
+ on_shuttle = TRUE
+
if(IS_OPEN(parent))
- openspace_trapdoor_setup(trapdoor_turf_path, assembly)
+ openspace_trapdoor_setup(trapdoor_turf_path, trapdoor_baseturfs)
if(autoclose)
addtimer(CALLBACK(src, PROC_REF(try_closing)), autoclose_delay)
else
- tile_trapdoor_setup(trapdoor_turf_path, assembly)
+ tile_trapdoor_setup()
if(starts_open)
try_opening()
+/datum/component/trapdoor/PostTransfer(datum/new_parent)
+ if(!isopenturf(new_parent))
+ if(isatom(new_parent))
+ var/atom/new_parent_atom = new_parent
+ new_parent_atom.visible_message(span_warning("The trapdoor mechanism under [new_parent_atom] is broken!"))
+ return COMPONENT_NOTRANSFER
+ if(SSshuttle.get_containing_shuttle(new_parent))
+ on_shuttle = TRUE
+ else
+ on_shuttle = FALSE
+
+/datum/component/trapdoor/proc/is_under_shuttle()
+ var/turf/parent_turf = parent
+ var/shuttle_skipover_depth = parent_turf.depth_to_find_baseturf(/turf/baseturf_skipover/shuttle)
+ return shuttle_skipover_depth && parent_turf.depth_to_find_baseturf(/turf/baseturf_skipover/trapdoor) > shuttle_skipover_depth
+
///initializing as an opened trapdoor, we need to trust that we were given the data by a closed trapdoor
-/datum/component/trapdoor/proc/openspace_trapdoor_setup(trapdoor_turf_path)
+/datum/component/trapdoor/proc/openspace_trapdoor_setup(trapdoor_turf_path, trapdoor_baseturfs)
src.trapdoor_turf_path = trapdoor_turf_path
+ src.trapdoor_baseturfs = trapdoor_baseturfs
///initializing as a closed trapdoor, we need to take data from the tile we're on to give it to the open state to store
-/datum/component/trapdoor/proc/tile_trapdoor_setup(trapdoor_turf_path)
+/datum/component/trapdoor/proc/tile_trapdoor_setup()
src.trapdoor_turf_path = parent.type
+ insert_trapdoor_skipover()
if(stored_decals.len)
reapply_all_decals()
if(conspicuous)
var/turf/parent_turf = parent
parent_turf.add_overlay(trapdoor_overlay)
+/datum/component/trapdoor/proc/insert_trapdoor_skipover()
+ var/turf/parent_turf = parent
+ if(parent_turf.depth_to_find_baseturf(/turf/baseturf_skipover/trapdoor))
+ return
+ parent_turf.insert_baseturf((parent_turf.level_to_find_baseturf(/turf/baseturf_skipover/shuttle) || 1) + 1, /turf/baseturf_skipover/trapdoor)
+
/datum/component/trapdoor/RegisterWithParent()
. = ..()
RegisterSignal(parent, COMSIG_TURF_CHANGE, PROC_REF(turf_changed_pre))
@@ -79,6 +112,8 @@
RegisterSignal(assembly, COMSIG_ASSEMBLY_PULSED, PROC_REF(toggle_trapdoor))
RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_MULTITOOL), PROC_REF(try_unlink))
RegisterSignal(parent, COMSIG_ATOM_ITEM_INTERACTION, PROC_REF(try_link))
+ RegisterSignal(parent, COMSIG_SHUTTLE_TURF_SHOULD_MOVE_SPECIAL, PROC_REF(should_move_special))
+ RegisterSignal(parent, COMSIG_SHUTTLE_TURF_ON_MOVE_SPECIAL, PROC_REF(on_move_special))
/datum/component/trapdoor/UnregisterFromParent()
. = ..()
@@ -89,9 +124,13 @@
UnregisterSignal(parent, COMSIG_ATOM_EXAMINE)
UnregisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_MULTITOOL))
UnregisterSignal(parent, COMSIG_ATOM_ITEM_INTERACTION)
+ UnregisterSignal(parent, COMSIG_SHUTTLE_TURF_SHOULD_MOVE_SPECIAL)
+ UnregisterSignal(parent, COMSIG_SHUTTLE_TURF_ON_MOVE_SPECIAL)
/datum/component/trapdoor/proc/try_unlink(turf/source, mob/user, obj/item/tool)
SIGNAL_HANDLER
+ if(is_under_shuttle())
+ return
if(!assembly)
return
if(IS_OPEN(parent))
@@ -103,6 +142,8 @@
/datum/component/trapdoor/proc/try_link(turf/source, mob/user, obj/item/tool)
SIGNAL_HANDLER
+ if(is_under_shuttle())
+ return
if(!istype(tool, /obj/item/trapdoor_remote))
return
var/obj/item/trapdoor_remote/remote = tool
@@ -121,6 +162,8 @@
/datum/component/trapdoor/proc/async_try_link(turf/source, mob/user, obj/item/trapdoor_remote/remote)
if(!do_after(user, 2 SECONDS, target=source))
return
+ if(QDELETED(src))
+ return
if(IS_OPEN(parent))
source.balloon_alert(user, "can't link trapdoor when its open")
return
@@ -134,6 +177,8 @@
/datum/component/trapdoor/proc/async_try_unlink(turf/source, mob/user, obj/item/tool)
if(!do_after(user, 5 SECONDS, target=source))
return
+ if(QDELETED(src))
+ return
if(IS_OPEN(parent))
source.balloon_alert(user, "can't unlink trapdoor when its open")
return
@@ -156,6 +201,8 @@
* changing turfs does not bring over decals, so we must perform a little bit of element reapplication.
*/
/datum/component/trapdoor/proc/reapply_all_decals()
+ if(is_under_shuttle())
+ return
for(var/list/element_data as anything in stored_decals)
apply_decal(element_data[1], element_data[2], element_data[3], element_data[4])
stored_decals = list()
@@ -187,12 +234,12 @@
try_closing()
///signal called by turf changing
-/datum/component/trapdoor/proc/turf_changed_pre(datum/source, path, new_baseturfs, flags, post_change_callbacks)
+/datum/component/trapdoor/proc/turf_changed_pre(datum/source, path, list/new_baseturfs, flags, post_change_callbacks)
SIGNAL_HANDLER
var/turf/open/dying_trapdoor = parent
if((flags & CHANGETURF_TRAPDOOR_INDUCED) == 0) //not a process of the trapdoor
- if(!IS_OPEN(parent) && !ispath(path, /turf/closed) && !ispath(path, /turf/open/openspace)) // allow people to place tiles on plating / change tiles without breaking the trapdoor
- post_change_callbacks += CALLBACK(src, TYPE_PROC_REF(/datum/component/trapdoor, carry_over_trapdoor), path, conspicuous, assembly)
+ if(!IS_OPEN(parent) && !ispath(path, /turf/closed) && islist(new_baseturfs) && new_baseturfs.Find(/turf/baseturf_skipover/trapdoor)) // allow people to place tiles on plating / change tiles without breaking the trapdoor
+ post_change_callbacks += CALLBACK(src, TYPE_PROC_REF(/datum/component/trapdoor, carry_over_trapdoor), path, null, conspicuous, assembly)
return
// otherwise, break trapdoor
dying_trapdoor.visible_message(span_warning("The trapdoor mechanism in [dying_trapdoor] is broken!"))
@@ -201,7 +248,7 @@
stored_decals.Cut()
assembly = null
return
- post_change_callbacks += CALLBACK(src, TYPE_PROC_REF(/datum/component/trapdoor, carry_over_trapdoor), trapdoor_turf_path, conspicuous, assembly)
+ post_change_callbacks += CALLBACK(src, TYPE_PROC_REF(/datum/component/trapdoor, carry_over_trapdoor), trapdoor_turf_path, trapdoor_baseturfs, conspicuous, assembly)
/**
* ## carry_over_trapdoor
@@ -209,8 +256,8 @@
* applies the trapdoor to the new turf (created by the last trapdoor)
* apparently callbacks with arguments on invoke and the callback itself have the callback args go first. interesting!
*/
-/datum/component/trapdoor/proc/carry_over_trapdoor(trapdoor_turf_path, conspicuous, assembly, turf/new_turf)
- new_turf.AddComponent(/datum/component/trapdoor, FALSE, trapdoor_turf_path, assembly, conspicuous, stored_decals, autoclose)
+/datum/component/trapdoor/proc/carry_over_trapdoor(trapdoor_turf_path, trapdoor_baseturfs, conspicuous, assembly, turf/new_turf)
+ new_turf.AddComponent(/datum/component/trapdoor, FALSE, trapdoor_turf_path, trapdoor_baseturfs, assembly, conspicuous, stored_decals, autoclose)
/**
* ## on_examine
@@ -219,6 +266,8 @@
*/
/datum/component/trapdoor/proc/on_examine(datum/source, mob/user, list/examine_text)
SIGNAL_HANDLER
+ if(is_under_shuttle())
+ return
if(conspicuous)
examine_text += "There seems to be a tiny gap around this tile with some wires that you might be able to pulse with a multitool."
@@ -230,12 +279,19 @@
*/
/datum/component/trapdoor/proc/try_opening()
var/turf/open/trapdoor_turf = parent
+ var/opening_depth = trapdoor_turf.depth_to_find_baseturf(/turf/baseturf_skipover/trapdoor)
+ if(!opening_depth)
+ stack_trace("Could not find baseturf skipover for trapdoor")
+ return
+ if(is_under_shuttle())
+ return
///we want to save this turf's decals as they were right before deletion, so this is the point where we begin listening
if(assembly)
RegisterSignal(parent, COMSIG_TURF_DECAL_DETACHED, PROC_REF(decal_detached))
playsound(trapdoor_turf, 'sound/machines/trapdoor/trapdoor_open.ogg', 50)
+ trapdoor_baseturfs = trapdoor_turf.get_baseturfs_to_depth(opening_depth)
trapdoor_turf.visible_message(span_warning("[trapdoor_turf] swings open!"))
- trapdoor_turf.ChangeTurf(/turf/open/openspace, flags = CHANGETURF_INHERIT_AIR | CHANGETURF_TRAPDOOR_INDUCED)
+ trapdoor_turf.ScrapeAway(opening_depth, flags = CHANGETURF_INHERIT_AIR | CHANGETURF_TRAPDOOR_INDUCED)
/**
* ## try_closing
@@ -251,7 +307,23 @@
return
playsound(trapdoor_turf, 'sound/machines/trapdoor/trapdoor_shut.ogg', 50)
trapdoor_turf.visible_message(span_warning("The trapdoor mechanism in [trapdoor_turf] swings shut!"))
- trapdoor_turf.ChangeTurf(trapdoor_turf_path, flags = CHANGETURF_INHERIT_AIR | CHANGETURF_TRAPDOOR_INDUCED)
+ var/list/new_baseturfs = list()
+ new_baseturfs += trapdoor_turf.baseturfs
+ new_baseturfs += trapdoor_turf.type
+ if(on_shuttle)
+ new_baseturfs += /turf/baseturf_skipover/shuttle
+ new_baseturfs += trapdoor_baseturfs
+ trapdoor_baseturfs = null
+ trapdoor_turf.ChangeTurf(trapdoor_turf_path, new_baseturfs, flags = CHANGETURF_INHERIT_AIR | CHANGETURF_TRAPDOOR_INDUCED)
+
+/datum/component/trapdoor/proc/should_move_special(datum/source)
+ SIGNAL_HANDLER
+ var/turf/source_turf = source
+ return IS_OPEN(source_turf) && !is_under_shuttle()
+
+/datum/component/trapdoor/proc/on_move_special(datum/source, turf/new_turf)
+ SIGNAL_HANDLER
+ new_turf.TakeComponent(src)
#undef IS_OPEN
@@ -305,6 +377,7 @@
icon = 'icons/obj/devices/remote.dmi'
icon_state = "trapdoor_remote"
COOLDOWN_DECLARE(trapdoor_cooldown)
+ custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 1.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.5)
var/trapdoor_cooldown_time = 2 SECONDS
var/obj/item/assembly/trapdoor/internals
@@ -402,6 +475,7 @@
desc = "A kit containing all the parts needed to build a trapdoor. Can only be used on open space."
icon = 'icons/obj/weapons/improvised.dmi'
icon_state = "kitsuitcase"
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 6.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 2.2)
var/in_use = FALSE
/obj/item/trapdoor_kit/Initialize(mapload)
diff --git a/code/datums/components/usb_port.dm b/code/datums/components/usb_port.dm
index a6ec5ffcf784..832d9fe67a9f 100644
--- a/code/datums/components/usb_port.dm
+++ b/code/datums/components/usb_port.dm
@@ -29,8 +29,6 @@
if (!isatom(parent))
return COMPONENT_INCOMPATIBLE
- circuit_components = list()
-
src.circuit_component_types = circuit_component_types
src.extra_registration_callback = extra_registration_callback
src.extra_unregistration_callback = extra_unregistration_callback
@@ -40,7 +38,7 @@
if(length(circuit_components))
UnregisterFromParent()
should_register = TRUE
- QDEL_LIST(circuit_components)
+ QDEL_LAZYLIST(circuit_components)
for(var/circuit_component in components)
var/obj/item/circuit_component/component = circuit_component
@@ -49,7 +47,7 @@
if(!should_register)
component.register_usb_parent(parent)
RegisterSignal(component, COMSIG_CIRCUIT_COMPONENT_SAVE, PROC_REF(save_component))
- circuit_components += component
+ LAZYADD(circuit_components, component)
if(should_register)
RegisterWithParent()
@@ -113,7 +111,7 @@
on_atom_usb_cable_try_attach(src, cable, null)
/datum/component/usb_port/Destroy()
- QDEL_LIST(circuit_components)
+ QDEL_LAZYLIST(circuit_components)
QDEL_NULL(usb_cable_beam)
attached_circuit = null
@@ -160,7 +158,7 @@
/datum/component/usb_port/proc/on_atom_usb_cable_try_attach(datum/source, obj/item/usb_cable/connecting_cable, mob/user)
SIGNAL_HANDLER
- if (!length(circuit_components))
+ if (!LAZYLEN(circuit_components))
set_circuit_components(circuit_component_types)
var/atom/atom_parent = parent
diff --git a/code/datums/components/wall_mounted.dm b/code/datums/components/wall_mounted.dm
deleted file mode 100644
index daab50eb1877..000000000000
--- a/code/datums/components/wall_mounted.dm
+++ /dev/null
@@ -1,102 +0,0 @@
-// This element should be applied to wall-mounted machines/structures, so that if the wall it's "hanging" from is broken or deconstructed, the wall-hung structure will deconstruct.
-/datum/component/wall_mounted
- dupe_mode = COMPONENT_DUPE_ALLOWED
- /// The wall our object is currently linked to.
- var/turf/hanging_wall_turf
- /// Callback to the parent's proc to call on the linked object when the wall disappear's or changes.
- var/datum/callback/on_drop
-
-/datum/component/wall_mounted/Initialize(target_wall, on_drop_callback)
- . = ..()
- if(!isobj(parent))
- return COMPONENT_INCOMPATIBLE
- if(!isturf(target_wall))
- return COMPONENT_INCOMPATIBLE
- hanging_wall_turf = target_wall
- on_drop = on_drop_callback
-
-/datum/component/wall_mounted/RegisterWithParent()
- ADD_TRAIT(parent, TRAIT_WALLMOUNTED, REF(src))
- RegisterSignal(hanging_wall_turf, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine))
- RegisterSignal(hanging_wall_turf, COMSIG_TURF_CHANGE, PROC_REF(on_turf_changing))
- RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(on_move))
- RegisterSignal(parent, COMSIG_QDELETING, PROC_REF(on_linked_destroyed))
-
-/datum/component/wall_mounted/UnregisterFromParent()
- REMOVE_TRAIT(parent, TRAIT_WALLMOUNTED, REF(src))
- UnregisterSignal(hanging_wall_turf, list(COMSIG_ATOM_EXAMINE, COMSIG_TURF_CHANGE))
- UnregisterSignal(parent, list(COMSIG_QDELETING, COMSIG_MOVABLE_MOVED))
- hanging_wall_turf = null
-
-/**
- * Basic reference handling if the hanging/linked object is destroyed first.
- */
-/datum/component/wall_mounted/proc/on_linked_destroyed()
- SIGNAL_HANDLER
- if(!QDELING(src))
- qdel(src)
-
-/**
- * When the wall is examined, explains that it's supporting the linked object.
- */
-/datum/component/wall_mounted/proc/on_examine(datum/source, mob/user, list/examine_list)
- SIGNAL_HANDLER
- if (parent in view(user.client?.view || world.view, user))
- examine_list += span_notice("\The [hanging_wall_turf] is currently supporting [span_bold("[parent]")]. Deconstruction or excessive damage would cause it to [span_bold("fall to the ground")].")
-
-/**
- * When the type of turf changes, if it is changing into a floor we should drop our contents
- */
-/datum/component/wall_mounted/proc/on_turf_changing(datum/source, path, new_baseturfs, flags, post_change_callbacks)
- SIGNAL_HANDLER
- if (ispath(path, /turf/open))
- drop_wallmount()
-
-
-/**
- * If we get dragged from our wall (by a singulo for instance) we should deconstruct
- */
-/datum/component/wall_mounted/proc/on_move(datum/source, atom/old_loc, dir, forced, list/old_locs)
- SIGNAL_HANDLER
- // If we're having our lighting messed with we're likely to get dragged about
- // That shouldn't lead to a decon
- if(HAS_TRAIT(parent, TRAIT_LIGHTING_DEBUGGED))
- return
- drop_wallmount()
-
-/**
- * Handles the dropping of the linked object. This is done via deconstruction, as that should be the most sane way to handle it for most objects.
- * Except for intercoms, which are handled by creating a new wallframe intercom, as they're apparently items.
- */
-/datum/component/wall_mounted/proc/drop_wallmount()
- SIGNAL_HANDLER
- var/obj/hanging_parent = parent
-
- if(on_drop)
- hanging_parent.visible_message(message = span_warning("\The [hanging_parent] falls off the wall!"), vision_distance = 5)
- on_drop.Invoke(hanging_parent)
- else
- hanging_parent.visible_message(message = span_warning("\The [hanging_parent] falls apart!"), vision_distance = 5)
- hanging_parent.deconstruct()
-
- if(!QDELING(src))
- qdel(src) //Well, we fell off the wall, so we're done here.
-
-/**
- * Checks object direction and then verifies if there's a wall in that direction. Finally, applies a wall_mounted component to the object.
- *
- * @param directional If TRUE, will use the direction of the object to determine the wall to attach to. If FALSE, will use the object's loc.
- * @param custom_drop_callback If set, will use this callback instead of the default deconstruct callback.
- */
-/obj/proc/find_and_hang_on_wall(directional = TRUE, custom_drop_callback)
- if(istype(get_area(src), /area/shuttle))
- return FALSE //For now, we're going to keep the component off of shuttles to avoid the turf changing issue. We'll hit that later really;
- var/turf/attachable_wall
- if(directional)
- attachable_wall = get_step(src, dir)
- else
- attachable_wall = loc ///Pull from the curent object loc
- if(!iswallturf(attachable_wall))
- return FALSE//Nothing to latch onto, or not the right thing.
- src.AddComponent(/datum/component/wall_mounted, attachable_wall, custom_drop_callback)
- return TRUE
diff --git a/code/datums/components/weatherannouncer.dm b/code/datums/components/weatherannouncer.dm
index 70105875d8db..35c51f0c3436 100644
--- a/code/datums/components/weatherannouncer.dm
+++ b/code/datums/components/weatherannouncer.dm
@@ -81,7 +81,7 @@
return // No change
var/atom/movable/speaker = parent
var/msg = get_warning_message()
- var/obj/machinery/announcement_system/aas = get_announcement_system(/datum/aas_config_entry/weather, speaker)
+ var/obj/machinery/announcement_system/aas = get_announcement_system(/datum/aas_config_entry/weather, speaker, list(RADIO_CHANNEL_SUPPLY))
// Active AAS will override default announcement lines
if (aas)
msg = aas.compile_config_message(/datum/aas_config_entry/weather, list(), !is_weather_dangerous ? 4 : warning_level + 1)
@@ -188,6 +188,14 @@
"Safe" = "No risk expected from incoming weather front.",
)
+/datum/aas_config_entry/weather/act_up()
+ . = ..()
+ if (.)
+ return
+
+ // 10% chance to turn off weather broadcast entirely
+ if (prob(10))
+ enabled = FALSE
#undef WEATHER_ALERT_CLEAR
#undef WEATHER_ALERT_INCOMING
diff --git a/code/datums/components/wet_floor.dm b/code/datums/components/wet_floor.dm
index f362359f3cde..720d1ff34953 100644
--- a/code/datums/components/wet_floor.dm
+++ b/code/datums/components/wet_floor.dm
@@ -54,28 +54,25 @@
return ..()
/datum/component/wet_floor/proc/update_overlay()
+ var/turf/parent_turf = parent
if(!should_display_overlay)
if(!current_overlay)
return
- var/turf/parent_turf = parent
parent_turf.cut_overlay(current_overlay)
current_overlay = null
return
var/intended
- if(!isfloorturf(parent))
- intended = generic_turf_overlay
- else
- switch(highest_strength)
- if(TURF_WET_PERMAFROST)
- intended = permafrost_overlay
- if(TURF_WET_ICE)
- intended = ice_overlay
- else
- intended = water_overlay
+ switch(highest_strength)
+ if(TURF_WET_PERMAFROST)
+ intended = permafrost_overlay
+ if(TURF_WET_ICE)
+ // Should really get someone to make a generic_ice_overlay.
+ intended = parent_turf.tiled_turf ? ice_overlay : generic_turf_overlay
+ else
+ intended = parent_turf.tiled_turf ? water_overlay : generic_turf_overlay
if(current_overlay != intended)
- var/turf/parent_turf = parent
parent_turf.cut_overlay(current_overlay)
parent_turf.add_overlay(intended)
current_overlay = intended
diff --git a/code/datums/datum.dm b/code/datums/datum.dm
index 509153de002c..39c0f9ab284c 100644
--- a/code/datums/datum.dm
+++ b/code/datums/datum.dm
@@ -87,9 +87,13 @@
/**
* Parent types.
- *
- * Use path Ex:(abstract_type = /obj/item). Generally for abstract code objects, atoms with a set abstract_type can never be selected by spawner.
- * These should be things that should never show up in a round, this does not include things that require init behavoir to function.
+ *
+ * Abstract-ness is a meta-property of a class that is used to indicate
+ * that the class is intended to be used as a base class for others, and
+ * should not (or cannot) be instantiated.
+ * We have no such language concept in DM, and so we provide a datum member
+ * that can be used to hint at abstractness for circumstances where we would
+ * like that to be the case, such as base behavior providers.
*/
var/abstract_type = /datum
@@ -338,7 +342,7 @@
var/list/filter_info = filter_data[index]
if (filter_info["name"] != name)
continue
- filter_data -= filter_info
+ filter_data -= list(filter_info)
filter_cache -= filter_cache[index]
break
@@ -488,6 +492,12 @@
var/atom/atom_cast = src // filters only work with images or atoms.
return atom_cast.filters[name]
+/// Returns filter data associated with the passed key
+/datum/proc/get_filter_data(name)
+ for (var/list/filter_info as anything in filter_data)
+ if (filter_info["name"] == name)
+ return filter_info.Copy()
+
/// Removes the passed filter, or multiple filters, if supplied with a list.
/datum/proc/remove_filter(name_or_names, update = TRUE)
ASSERT(isatom(src) || isimage(src))
diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm
index 5efa1554bafb..5fc4928990b2 100644
--- a/code/datums/diseases/advance/advance.dm
+++ b/code/datums/diseases/advance/advance.dm
@@ -543,6 +543,9 @@
/datum/disease/advance/proc/totalTransmittable()
return properties["transmittable"]
+/datum/disease/advance/proc/totalSeverity()
+ return properties["severity"]
+
/**
* If the disease has an incubation time (such as event diseases) start the timer, let properties determine if there's no timer set.
*/
diff --git a/code/datums/diseases/advance/symptoms/bleeding.dm b/code/datums/diseases/advance/symptoms/bleeding.dm
new file mode 100644
index 000000000000..2964c01cefe0
--- /dev/null
+++ b/code/datums/diseases/advance/symptoms/bleeding.dm
@@ -0,0 +1,68 @@
+/*Anticoagulant
+ * Increases stealth
+ * No change to resistance
+ * Reduces to stage speed
+ * Reduces transmissibility
+ * Fatal Level
+ * Bonus: Worsens blood loss
+*/
+
+/datum/symptom/bleeding
+ name = "Anticoagulant"
+ desc = "The virus prevents the body from clotting blood. Unnoticable unless the host is bleeding."
+ stealth = 1
+ resistance = 0
+ stage_speed = -2
+ transmittable = -2
+ severity = 3
+ level = 7
+ threshold_descs = list(
+ "Stage Speed 9" = "The host becomes more vulnerable to bleeding wounds.",
+ "Stealth 3" = "The symptom remains hidden even while active."
+ )
+ var/easybleed = FALSE
+ var/hidden = FALSE
+
+/datum/symptom/bleeding/Start(datum/disease/advance/A)
+ . = ..()
+ if(!.)
+ return
+ if(A.totalStageSpeed() >= 9)
+ easybleed = TRUE
+ if(A.totalStealth() >= 3)
+ hidden = TRUE
+
+/datum/symptom/bleeding/Activate(datum/disease/advance/A)
+ . = ..()
+ if(!.)
+ return
+ var/mob/living/carbon/carbon_host = A.affected_mob
+ for(var/datum/wound/possible_bleeding_wound as anything in carbon_host.all_wounds)
+ if(possible_bleeding_wound.blood_flow && !hidden)
+ if(4 > A.stage >= 2)
+ to_chat(carbon_host, span_warning("Your bleeding wounds start to itch."))
+ if(A.stage >= 4)
+ to_chat(carbon_host, span_warning("Your bleeding wounds itch like crazy as more blood leaves your body."))
+ return
+
+/datum/symptom/bleeding/on_stage_change(datum/disease/advance/A)
+ . = ..()
+ if(!.)
+ return
+ var/mob/living/carbon/carbon_host = A.affected_mob
+ if(A.stage >= 4)
+ ADD_TRAIT(carbon_host, TRAIT_BLOOD_FOUNTAIN, DISEASE_TRAIT)
+ if(easybleed)
+ ADD_TRAIT(carbon_host, TRAIT_EASYBLEED, DISEASE_TRAIT)
+ return
+ REMOVE_TRAIT(carbon_host, TRAIT_BLOOD_FOUNTAIN, DISEASE_TRAIT)
+ REMOVE_TRAIT(carbon_host, TRAIT_EASYBLEED, DISEASE_TRAIT)
+
+
+/datum/symptom/bleeding/End(datum/disease/advance/A)
+ . = ..()
+ if(!.)
+ return
+ var/mob/living/carbon/carbon_host = A.affected_mob
+ REMOVE_TRAIT(carbon_host, TRAIT_BLOOD_FOUNTAIN, DISEASE_TRAIT)
+ REMOVE_TRAIT(carbon_host, TRAIT_EASYBLEED, DISEASE_TRAIT)
diff --git a/code/datums/diseases/advance/symptoms/choking.dm b/code/datums/diseases/advance/symptoms/choking.dm
index 6ae9fe42b6e3..68ad1720d9f7 100644
--- a/code/datums/diseases/advance/symptoms/choking.dm
+++ b/code/datums/diseases/advance/symptoms/choking.dm
@@ -60,11 +60,11 @@
infected_mob.emote("gasp")
/datum/symptom/choking/proc/Choke_stage_3_4(mob/living/M, datum/disease/advance/A)
- M.adjustOxyLoss(rand(6,13))
+ M.adjust_oxy_loss(rand(6,13))
return 1
/datum/symptom/choking/proc/Choke(mob/living/M, datum/disease/advance/A)
- M.adjustOxyLoss(rand(10,18))
+ M.adjust_oxy_loss(rand(10,18))
return 1
/*
@@ -128,25 +128,25 @@ Bonus
to_chat(M, span_userdanger("[pick("Your lungs hurt!", "It hurts to breathe!")]"))
Asphyxiate(M, A)
M.emote("gasp")
- if(M.getOxyLoss() >= (M.maxHealth / (200/120)))
+ if(M.get_oxy_loss() >= (M.maxHealth / (200/120)))
M.visible_message(span_warning("[M] stops breathing, as if their lungs have totally collapsed!"))
Asphyxiate_death(M, A)
return
/datum/symptom/asphyxiation/proc/Asphyxiate_stage_3_4(mob/living/M, datum/disease/advance/A)
var/get_damage = rand(10,15) * power
- M.adjustOxyLoss(get_damage)
+ M.adjust_oxy_loss(get_damage)
return 1
/datum/symptom/asphyxiation/proc/Asphyxiate(mob/living/M, datum/disease/advance/A)
var/get_damage = rand(15,21) * power
- M.adjustOxyLoss(get_damage)
+ M.adjust_oxy_loss(get_damage)
if(paralysis)
M.reagents.add_reagent_list(list(/datum/reagent/toxin/pancuronium = 3, /datum/reagent/toxin/sodium_thiopental = 3))
return 1
/datum/symptom/asphyxiation/proc/Asphyxiate_death(mob/living/M, datum/disease/advance/A)
var/get_damage = rand(25,35) * power
- M.adjustOxyLoss(get_damage)
- M.adjustOrganLoss(ORGAN_SLOT_BRAIN, get_damage/2)
+ M.adjust_oxy_loss(get_damage)
+ M.adjust_organ_loss(ORGAN_SLOT_BRAIN, get_damage/2)
return 1
diff --git a/code/datums/diseases/advance/symptoms/confusion.dm b/code/datums/diseases/advance/symptoms/confusion.dm
index 159eccfbd1cc..1d54a2b78882 100644
--- a/code/datums/diseases/advance/symptoms/confusion.dm
+++ b/code/datums/diseases/advance/symptoms/confusion.dm
@@ -57,6 +57,6 @@
to_chat(infected_mob, span_userdanger("You can't think straight!"))
infected_mob.adjust_confusion_up_to(16 SECONDS * power, 30 SECONDS)
if(brain_damage)
- infected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3 * power, 80)
+ infected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 3 * power, 80)
infected_mob.updatehealth()
return
diff --git a/code/datums/diseases/advance/symptoms/deafness.dm b/code/datums/diseases/advance/symptoms/deafness.dm
index bf096a9fb4ad..fa26dfbd7087 100644
--- a/code/datums/diseases/advance/symptoms/deafness.dm
+++ b/code/datums/diseases/advance/symptoms/deafness.dm
@@ -45,7 +45,6 @@
return
var/mob/living/carbon/infected_mob = advanced_disease.affected_mob
- var/obj/item/organ/ears/ears = infected_mob.get_organ_slot(ORGAN_SLOT_EARS)
switch(advanced_disease.stage)
if(3, 4)
@@ -53,15 +52,18 @@
to_chat(infected_mob, span_warning("[pick("You hear a ringing in your ear.", "Your ears pop.")]"))
if(5)
if(causes_permanent_deafness)
- if(ears.damage < ears.maxHealth)
+ if(!HAS_TRAIT_FROM(infected_mob, TRAIT_DEAF, DISEASE_TRAIT))
to_chat(infected_mob, span_userdanger("Your ears pop painfully and start bleeding!"))
// Just absolutely murder me man
- ears.apply_organ_damage(ears.maxHealth)
+ infected_mob.adjust_organ_loss(ORGAN_SLOT_EARS, INFINITY)
infected_mob.emote("scream")
ADD_TRAIT(infected_mob, TRAIT_DEAF, DISEASE_TRAIT)
else
to_chat(infected_mob, span_userdanger("Your ears pop and begin ringing loudly!"))
- ears.deaf = min(20, ears.deaf + 15)
+ var/obj/item/organ/ears/ears = infected_mob.get_organ_slot(ORGAN_SLOT_EARS)
+ var/deafness_to_add = min(40 SECONDS - ears.temporary_deafness, 30 SECONDS)
+ if(deafness_to_add > 0)
+ ears.adjust_temporary_deafness(deafness_to_add)
/datum/symptom/deafness/on_stage_change(datum/disease/advance/advanced_disease)
. = ..()
diff --git a/code/datums/diseases/advance/symptoms/flesh_eating.dm b/code/datums/diseases/advance/symptoms/flesh_eating.dm
index 005a651b7f33..df282fb82aea 100644
--- a/code/datums/diseases/advance/symptoms/flesh_eating.dm
+++ b/code/datums/diseases/advance/symptoms/flesh_eating.dm
@@ -54,7 +54,7 @@ Bonus
var/get_damage = rand(15,25) * power
M.take_overall_damage(brute = get_damage, required_bodytype = BODYTYPE_ORGANIC)
if(pain)
- M.adjustStaminaLoss(get_damage * 2)
+ M.adjust_stamina_loss(get_damage * 2)
if(bleed)
if(ishuman(M))
var/mob/living/carbon/human/H = M
diff --git a/code/datums/diseases/advance/symptoms/headache.dm b/code/datums/diseases/advance/symptoms/headache.dm
index f6e2be2aba0d..b11a461c3adc 100644
--- a/code/datums/diseases/advance/symptoms/headache.dm
+++ b/code/datums/diseases/advance/symptoms/headache.dm
@@ -50,7 +50,7 @@
to_chat(M, span_warning("[pick("Your head hurts.", "Your head pounds.")]"))
if(power >= 2 && A.stage >= 4)
to_chat(M, span_warning("[pick("Your head hurts a lot.", "Your head pounds incessantly.")]"))
- M.adjustStaminaLoss(25)
+ M.adjust_stamina_loss(25)
if(power >= 3 && A.stage >= 5)
to_chat(M, span_userdanger("[pick("Your head hurts!", "You feel a burning knife inside your brain!", "A wave of pain fills your head!")]"))
M.Stun(35)
diff --git a/code/datums/diseases/advance/symptoms/heal.dm b/code/datums/diseases/advance/symptoms/heal.dm
index 2b31a2091a4b..154642529983 100644
--- a/code/datums/diseases/advance/symptoms/heal.dm
+++ b/code/datums/diseases/advance/symptoms/heal.dm
@@ -10,30 +10,36 @@
symptom_delay_min = 1
symptom_delay_max = 1
var/passive_message = "" //random message to infected but not actively healing people
+ var/healable_bodytypes = BODYTYPE_ORGANIC // What types of body parts we can heal
-/datum/symptom/heal/Activate(datum/disease/advance/A)
+/datum/symptom/heal/Activate(datum/disease/advance/our_disease)
. = ..()
if(!.)
return
- var/mob/living/M = A.affected_mob
- switch(A.stage)
+ healable_bodytypes = BODYTYPE_ORGANIC
+ if(our_disease.infectable_biotypes & MOB_ROBOTIC)
+ healable_bodytypes |= BODYTYPE_ROBOTIC // Inorganic biology lets us heal more bodytypes
+ if(our_disease.infectable_biotypes & MOB_MINERAL)
+ healable_bodytypes |= BODYTYPE_GOLEM
+ var/mob/living/living_host = our_disease.affected_mob
+ switch(our_disease.stage)
if(4, 5)
- var/effectiveness = CanHeal(A)
+ var/effectiveness = CanHeal(our_disease)
if(!effectiveness)
- if(passive_message && prob(2) && passive_message_condition(M))
- to_chat(M, passive_message)
+ if(passive_message && prob(2) && passive_message_condition(living_host))
+ to_chat(living_host, passive_message)
return
else
- Heal(M, A, effectiveness)
+ Heal(living_host, our_disease, effectiveness)
return
-/datum/symptom/heal/proc/CanHeal(datum/disease/advance/A)
+/datum/symptom/heal/proc/CanHeal(datum/disease/advance/our_disease)
return power
-/datum/symptom/heal/proc/Heal(mob/living/M, datum/disease/advance/A, actual_power)
+/datum/symptom/heal/proc/Heal(mob/living/living_host, datum/disease/advance/our_disease, actual_power)
return TRUE
-/datum/symptom/heal/proc/passive_message_condition(mob/living/M)
+/datum/symptom/heal/proc/passive_message_condition(mob/living/living_host)
return TRUE
/*Starlight Condensation
@@ -64,13 +70,13 @@
#define STARLIGHT_CANNOT_HEAL 0
#define STARLIGHT_MAX_RANGE 2
-/datum/symptom/heal/starlight/Start(datum/disease/advance/A)
+/datum/symptom/heal/starlight/Start(datum/disease/advance/our_disease)
. = ..()
if(!.)
return
- if(A.totalTransmittable() >= 6)
+ if(our_disease.totalTransmittable() >= 6)
nearspace_penalty = 1
- if(A.totalStageSpeed() >= 6)
+ if(our_disease.totalStageSpeed() >= 6)
power = 2
/datum/symptom/heal/starlight/proc/CanTileHealDirectional(turf/turf_to_check, direction)
@@ -132,15 +138,15 @@
else
return current_heal_level
-/datum/symptom/heal/starlight/CanHeal(datum/disease/advance/A)
- var/mob/living/affected_mob = A.affected_mob
- var/turf/turf_of_mob = get_turf(affected_mob)
+/datum/symptom/heal/starlight/CanHeal(datum/disease/advance/our_disease)
+ var/mob/living/living_host = our_disease.affected_mob
+ var/turf/turf_of_mob = get_turf(living_host)
switch(CanTileHeal(turf_of_mob, FALSE))
if(STARLIGHT_CAN_HEAL_WITH_PENALTY)
return power * nearspace_penalty
if(STARLIGHT_CAN_HEAL)
return power
- for(var/turf/turf_to_check in view(affected_mob, STARLIGHT_MAX_RANGE))
+ for(var/turf/turf_to_check in view(living_host, STARLIGHT_MAX_RANGE))
if(CanTileHeal(turf_to_check, TRUE))
return power * nearspace_penalty
@@ -149,25 +155,19 @@
#undef STARLIGHT_CANNOT_HEAL
#undef STARLIGHT_MAX_RANGE
-/datum/symptom/heal/starlight/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power)
+/datum/symptom/heal/starlight/Heal(mob/living/carbon/carbon_host, datum/disease/advance/our_disease, actual_power)
var/heal_amt = actual_power
- if(M.getToxLoss() && prob(5))
- to_chat(M, span_notice("Your skin tingles as the starlight seems to heal you."))
-
- M.adjustToxLoss(-(4 * heal_amt)) //most effective on toxins
-
- var/list/parts = M.get_damaged_bodyparts(1,1, BODYTYPE_ORGANIC)
-
- if(!parts.len)
- return
-
- for(var/obj/item/bodypart/bodypart in parts)
- if(bodypart.heal_damage(heal_amt/parts.len, heal_amt/parts.len, required_bodytype = BODYTYPE_ORGANIC))
- M.update_damage_overlays()
- return 1
+ if(carbon_host.get_tox_loss() && prob(5))
+ to_chat(carbon_host, span_notice("Your skin tingles as the starlight seems to heal you."))
+ var/needs_update = FALSE
+ needs_update += carbon_host.adjust_tox_loss(-4 * heal_amt, updating_health = FALSE, required_biotype = healable_bodytypes) // Most effective on toxins
+ needs_update += carbon_host.heal_overall_damage(heal_amt, heal_amt, required_bodytype = healable_bodytypes, updating_health = FALSE)
+ if(needs_update)
+ carbon_host.updatehealth()
+ return TRUE
-/datum/symptom/heal/starlight/passive_message_condition(mob/living/M)
- if(M.getBruteLoss() || M.getFireLoss() || M.getToxLoss())
+/datum/symptom/heal/starlight/passive_message_condition(mob/living/living_host)
+ if(living_host.get_brute_loss() || living_host.get_fire_loss() || living_host.get_tox_loss())
return TRUE
return FALSE
@@ -193,23 +193,23 @@
)
var/food_conversion = FALSE
-/datum/symptom/heal/chem/Start(datum/disease/advance/A)
+/datum/symptom/heal/chem/Start(datum/disease/advance/our_disease)
. = ..()
if(!.)
return
- if(A.totalStageSpeed() >= 6)
+ if(our_disease.totalStageSpeed() >= 6)
food_conversion = TRUE
- if(A.totalResistance() >= 7)
+ if(our_disease.totalResistance() >= 7)
power = 2
-/datum/symptom/heal/chem/Heal(mob/living/M, datum/disease/advance/A, actual_power)
- for(var/datum/reagent/R in M.reagents.reagent_list) //Not just toxins!
- M.reagents.remove_reagent(R.type, actual_power)
+/datum/symptom/heal/chem/Heal(mob/living/living_host, datum/disease/advance/our_disease, actual_power)
+ for(var/datum/reagent/each_reagent in living_host.reagents.reagent_list) //Not just toxins!
+ var/food = living_host.reagents.remove_reagent(each_reagent.type, actual_power)
if(food_conversion)
- M.adjust_nutrition(0.3)
+ living_host.adjust_nutrition(0.3 * food)
if(prob(2))
- to_chat(M, span_notice("You feel a mild warmth as your blood purifies itself."))
- return 1
+ to_chat(living_host, span_notice("You feel a mild warmth as your blood purifies itself."))
+ return TRUE
/*Metabolic Boost
@@ -237,23 +237,23 @@
var/triple_metabolism = FALSE
var/reduced_hunger = FALSE
-/datum/symptom/heal/metabolism/Start(datum/disease/advance/A)
+/datum/symptom/heal/metabolism/Start(datum/disease/advance/our_disease)
. = ..()
if(!.)
return
- if(A.totalStageSpeed() >= 10)
+ if(our_disease.totalStageSpeed() >= 10)
triple_metabolism = TRUE
- if(A.totalStealth() >= 3)
+ if(our_disease.totalStealth() >= 3)
reduced_hunger = TRUE
-/datum/symptom/heal/metabolism/Heal(mob/living/carbon/infected_mob, datum/disease/advance/A, actual_power)
+/datum/symptom/heal/metabolism/Heal(mob/living/carbon/carbon_host, datum/disease/advance/our_disease, actual_power)
var/metabolic_boost = triple_metabolism ? 2 : 1
- infected_mob.reagents.metabolize(infected_mob, metabolic_boost * SSMOBS_DT, 0, can_overdose=TRUE) //this works even without a liver; it's intentional since the virus is metabolizing by itself
- infected_mob.overeatduration = max(infected_mob.overeatduration - 4 SECONDS, 0)
+ carbon_host.reagents.metabolize(carbon_host, metabolic_boost * SSMOBS_DT, 0, can_overdose=TRUE) //this works even without a liver; it's intentional since the virus is metabolizing by itself
+ carbon_host.overeatduration = max(carbon_host.overeatduration - 4 SECONDS, 0)
var/lost_nutrition = 9 - (reduced_hunger * 5)
- infected_mob.adjust_nutrition(-lost_nutrition * HUNGER_FACTOR) //Hunger depletes at 10x the normal speed
+ carbon_host.adjust_nutrition(-lost_nutrition * HUNGER_FACTOR) //Hunger depletes at 10x the normal speed
if(prob(2))
- to_chat(infected_mob, span_notice("You feel an odd gurgle in your stomach, as if it was working much faster than normal."))
+ to_chat(carbon_host, span_notice("You feel an odd gurgle in your stomach, as if it was working much faster than normal."))
return TRUE
/*Nocturnal Regeneration
@@ -276,40 +276,31 @@
"Stage Speed 8" = "Doubles healing speed.",
)
-/datum/symptom/heal/darkness/Start(datum/disease/advance/A)
+/datum/symptom/heal/darkness/Start(datum/disease/advance/our_disease)
. = ..()
if(!.)
return
- if(A.totalStageSpeed() >= 8)
+ if(our_disease.totalStageSpeed() >= 8)
power = 2
-/datum/symptom/heal/darkness/CanHeal(datum/disease/advance/A)
- var/mob/living/M = A.affected_mob
+/datum/symptom/heal/darkness/CanHeal(datum/disease/advance/our_disease)
+ var/mob/living/living_host = our_disease.affected_mob
var/light_amount = 0
- if(isturf(M.loc)) //else, there's considered to be no light
- var/turf/T = M.loc
- light_amount = min(1,T.get_lumcount()) - 0.5
+ if(isturf(living_host.loc)) //else, there's considered to be no light
+ var/turf/host_turf = living_host.loc
+ light_amount = min(1,host_turf.get_lumcount()) - 0.5
if(light_amount < SHADOW_SPECIES_LIGHT_THRESHOLD)
return power
-/datum/symptom/heal/darkness/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power)
+/datum/symptom/heal/darkness/Heal(mob/living/carbon/carbon_host, datum/disease/advance/our_disease, actual_power)
var/heal_amt = 2 * actual_power
-
- var/list/parts = M.get_damaged_bodyparts(1,1,BODYTYPE_ORGANIC)
-
- if(!parts.len)
- return
-
+ carbon_host.heal_overall_damage(heal_amt, heal_amt * 0.5, required_bodytype = healable_bodytypes)
if(prob(5))
- to_chat(M, span_notice("The darkness soothes and mends your wounds."))
-
- for(var/obj/item/bodypart/bodypart in parts)
- if(bodypart.heal_damage(heal_amt/parts.len, heal_amt/parts.len * 0.5, required_bodytype = BODYTYPE_ORGANIC)) //more effective on brute
- M.update_damage_overlays()
- return 1
+ to_chat(carbon_host, span_notice("The darkness soothes and mends your wounds."))
+ return TRUE
-/datum/symptom/heal/darkness/passive_message_condition(mob/living/M)
- if(M.getBruteLoss() || M.getFireLoss())
+/datum/symptom/heal/darkness/passive_message_condition(mob/living/living_host)
+ if(living_host.get_brute_loss() || living_host.get_fire_loss())
return TRUE
return FALSE
@@ -338,84 +329,74 @@
"Stage Speed 7" = "Increases healing speed.",
)
-/datum/symptom/heal/coma/Start(datum/disease/advance/A)
+/datum/symptom/heal/coma/Start(datum/disease/advance/our_disease)
. = ..()
if(!.)
return
- if(A.totalStageSpeed() >= 7)
+ if(our_disease.totalStageSpeed() >= 7)
power = 1.5
- if(A.totalResistance() >= 4)
+ if(our_disease.totalResistance() >= 4)
stabilize = TRUE
- if(A.totalStealth() >= 2)
+ if(our_disease.totalStealth() >= 2)
deathgasp = TRUE
-/datum/symptom/heal/coma/on_stage_change(datum/disease/advance/A) //mostly copy+pasted from the code for self-respiration's TRAIT_NOBREATH stuff
+/datum/symptom/heal/coma/on_stage_change(datum/disease/advance/our_disease) //mostly copy+pasted from the code for self-respiration's TRAIT_NOBREATH stuff
. = ..()
if(!.)
return FALSE
- if(A.stage >= 4 && stabilize)
- ADD_TRAIT(A.affected_mob, TRAIT_NOCRITDAMAGE, DISEASE_TRAIT)
+ if(our_disease.stage >= 4 && stabilize)
+ ADD_TRAIT(our_disease.affected_mob, TRAIT_NOCRITDAMAGE, DISEASE_TRAIT)
else
- REMOVE_TRAIT(A.affected_mob, TRAIT_NOCRITDAMAGE, DISEASE_TRAIT)
+ REMOVE_TRAIT(our_disease.affected_mob, TRAIT_NOCRITDAMAGE, DISEASE_TRAIT)
return TRUE
-/datum/symptom/heal/coma/End(datum/disease/advance/A)
+/datum/symptom/heal/coma/End(datum/disease/advance/our_disease)
. = ..()
if(!.)
return
if(active_coma)
uncoma()
- REMOVE_TRAIT(A.affected_mob, TRAIT_NOCRITDAMAGE, DISEASE_TRAIT)
+ REMOVE_TRAIT(our_disease.affected_mob, TRAIT_NOCRITDAMAGE, DISEASE_TRAIT)
-/datum/symptom/heal/coma/CanHeal(datum/disease/advance/A)
- var/mob/living/M = A.affected_mob
- if(HAS_TRAIT(M, TRAIT_DEATHCOMA))
+/datum/symptom/heal/coma/CanHeal(datum/disease/advance/our_disease)
+ var/mob/living/living_host = our_disease.affected_mob
+ if(HAS_TRAIT(living_host, TRAIT_DEATHCOMA))
return power
- if(M.IsSleeping())
+ if(living_host.IsSleeping())
return power * 0.25 //Voluntary unconsciousness yields lower healing.
- switch(M.stat)
+ switch(living_host.stat)
if(UNCONSCIOUS, HARD_CRIT)
return power * 0.9
if(SOFT_CRIT)
return power * 0.5
- if(M.getBruteLoss() + M.getFireLoss() >= 70 && !active_coma && !(HAS_TRAIT(M,TRAIT_NOSOFTCRIT)))
- to_chat(M, span_warning("You feel yourself slip into a regenerative coma..."))
+ if(living_host.get_brute_loss() + living_host.get_fire_loss() >= living_host.maxHealth * 0.7 && !active_coma && !(HAS_TRAIT(living_host, TRAIT_NOSOFTCRIT)))
+ to_chat(living_host, span_warning("You feel yourself slip into a regenerative coma..."))
active_coma = TRUE
- addtimer(CALLBACK(src, PROC_REF(coma), M), 6 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(coma), living_host), 6 SECONDS)
-/datum/symptom/heal/coma/proc/coma(mob/living/M)
- if(QDELETED(M) || M.stat == DEAD)
+/datum/symptom/heal/coma/proc/coma(mob/living/living_host)
+ if(QDELETED(living_host) || living_host.stat == DEAD || HAS_TRAIT(living_host, TRAIT_NOSOFTCRIT))
return
- M.fakedeath("regenerative_coma", !deathgasp)
- addtimer(CALLBACK(src, PROC_REF(uncoma), M), 30 SECONDS)
+ living_host.fakedeath("regenerative_coma", !deathgasp)
+ addtimer(CALLBACK(src, PROC_REF(uncoma), living_host), 30 SECONDS)
-/datum/symptom/heal/coma/proc/uncoma(mob/living/M)
- if(QDELETED(M) || !active_coma)
+/datum/symptom/heal/coma/proc/uncoma(mob/living/living_host)
+ if(QDELETED(living_host) || !active_coma)
return
active_coma = FALSE
- M.cure_fakedeath("regenerative_coma")
+ living_host.cure_fakedeath("regenerative_coma")
-/datum/symptom/heal/coma/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power)
+/datum/symptom/heal/coma/Heal(mob/living/carbon/carbon_host, datum/disease/advance/our_disease, actual_power)
var/heal_amt = 4 * actual_power
-
- var/list/parts = M.get_damaged_bodyparts(1,1)
-
- if(!parts.len)
- return
-
- for(var/obj/item/bodypart/bodypart in parts)
- if(bodypart.heal_damage(heal_amt/parts.len, heal_amt/parts.len, required_bodytype = BODYTYPE_ORGANIC))
- M.update_damage_overlays()
-
- if(active_coma && M.getBruteLoss() + M.getFireLoss() == 0)
- uncoma(M)
-
+ carbon_host.heal_overall_damage(heal_amt, heal_amt, required_bodytype = healable_bodytypes)
+ if(active_coma && carbon_host.get_brute_loss() + carbon_host.get_fire_loss() == 0)
+ uncoma(carbon_host)
return 1
-/datum/symptom/heal/coma/passive_message_condition(mob/living/M)
- if((M.getBruteLoss() + M.getFireLoss()) > 30)
+/datum/symptom/heal/coma/passive_message_condition(mob/living/living_host)
+ if((living_host.get_brute_loss() + living_host.get_fire_loss()) > living_host.maxHealth * 0.3)
return TRUE
return FALSE
@@ -435,48 +416,37 @@
)
var/absorption_coeff = 1
-/datum/symptom/heal/water/Start(datum/disease/advance/A)
+/datum/symptom/heal/water/Start(datum/disease/advance/our_disease)
. = ..()
if(!.)
return
- if(A.totalStageSpeed() >= 7)
+ if(our_disease.totalStageSpeed() >= 7)
power = 2
- if(A.totalResistance() >= 5)
+ if(our_disease.totalResistance() >= 5)
absorption_coeff = 0.25
-/datum/symptom/heal/water/CanHeal(datum/disease/advance/advanced_disease)
+/datum/symptom/heal/water/CanHeal(datum/disease/advance/our_disease)
. = 0
- var/mob/living/carbon/infected_mob = advanced_disease.affected_mob
+ var/mob/living/carbon/carbon_host = our_disease.affected_mob
- if(infected_mob.fire_stacks < 0)
- infected_mob.adjust_fire_stacks(min(absorption_coeff, -infected_mob.fire_stacks))
+ if(carbon_host.fire_stacks < 0)
+ carbon_host.adjust_fire_stacks(min(absorption_coeff, -carbon_host.fire_stacks))
. += power
- if(infected_mob.reagents.has_reagent(/datum/reagent/water/holywater, needs_metabolizing = FALSE))
- infected_mob.reagents.remove_reagent(/datum/reagent/water/holywater, 0.5 * absorption_coeff)
+ if(carbon_host.reagents.has_reagent(/datum/reagent/water/holywater, needs_metabolizing = FALSE))
+ carbon_host.reagents.remove_reagent(/datum/reagent/water/holywater, 0.5 * absorption_coeff)
. += power * 0.75
- else if(infected_mob.reagents.has_reagent(/datum/reagent/water, needs_metabolizing = FALSE))
- infected_mob.reagents.remove_reagent(/datum/reagent/water, 0.5 * absorption_coeff)
+ else if(carbon_host.reagents.has_reagent(/datum/reagent/water, needs_metabolizing = FALSE))
+ carbon_host.reagents.remove_reagent(/datum/reagent/water, 0.5 * absorption_coeff)
. += power * 0.5
-/datum/symptom/heal/water/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power)
+/datum/symptom/heal/water/Heal(mob/living/carbon/carbon_host, datum/disease/advance/our_disease, actual_power)
var/heal_amt = 2 * actual_power
+ if(carbon_host.heal_overall_damage(heal_amt * 0.5, heal_amt, required_bodytype = healable_bodytypes) && prob(5))
+ to_chat(carbon_host, span_notice("You feel yourself absorbing the water around you to soothe your damaged skin."))
+ return TRUE
- var/list/parts = M.get_damaged_bodyparts(1,1, BODYTYPE_ORGANIC) //more effective on burns
-
- if(!parts.len)
- return
-
- if(prob(5))
- to_chat(M, span_notice("You feel yourself absorbing the water around you to soothe your damaged skin."))
-
- for(var/obj/item/bodypart/bodypart in parts)
- if(bodypart.heal_damage(heal_amt/parts.len * 0.5, heal_amt/parts.len, required_bodytype = BODYTYPE_ORGANIC))
- M.update_damage_overlays()
-
- return 1
-
-/datum/symptom/heal/water/passive_message_condition(mob/living/carbon/infected_mob)
- if(infected_mob.getBruteLoss() || infected_mob.getFireLoss())
+/datum/symptom/heal/water/passive_message_condition(mob/living/carbon/carbon_host)
+ if(carbon_host.get_brute_loss() || carbon_host.get_fire_loss())
return TRUE
return FALSE
@@ -510,37 +480,37 @@
)
var/temp_rate = 1
-/datum/symptom/heal/plasma/Start(datum/disease/advance/A)
+/datum/symptom/heal/plasma/Start(datum/disease/advance/our_disease)
. = ..()
if(!.)
return
- if(A.totalStageSpeed() >= 7)
+ if(our_disease.totalStageSpeed() >= 7)
power = 2
- if(A.totalTransmittable() >= 6)
+ if(our_disease.totalTransmittable() >= 6)
temp_rate = 4
// We do this to prevent liver damage from injecting plasma when plasma fixation virus reaches stage 4 and beyond
-/datum/symptom/heal/plasma/on_stage_change(datum/disease/advance/advanced_disease)
+/datum/symptom/heal/plasma/on_stage_change(datum/disease/advance/our_disease)
. = ..()
if(!.)
return FALSE
- if(advanced_disease.stage >= 4)
- ADD_TRAIT(advanced_disease.affected_mob, TRAIT_PLASMA_LOVER_METABOLISM, DISEASE_TRAIT)
+ if(our_disease.stage >= 4)
+ ADD_TRAIT(our_disease.affected_mob, TRAIT_PLASMA_LOVER_METABOLISM, DISEASE_TRAIT)
else
- REMOVE_TRAIT(advanced_disease.affected_mob, TRAIT_PLASMA_LOVER_METABOLISM, DISEASE_TRAIT)
+ REMOVE_TRAIT(our_disease.affected_mob, TRAIT_PLASMA_LOVER_METABOLISM, DISEASE_TRAIT)
return TRUE
-/datum/symptom/heal/plasma/End(datum/disease/advance/advanced_disease)
+/datum/symptom/heal/plasma/End(datum/disease/advance/our_disease)
. = ..()
if(!.)
return
- REMOVE_TRAIT(advanced_disease.affected_mob, TRAIT_PLASMA_LOVER_METABOLISM, DISEASE_TRAIT)
+ REMOVE_TRAIT(our_disease.affected_mob, TRAIT_PLASMA_LOVER_METABOLISM, DISEASE_TRAIT)
// Check internals breath, environmental plasma, and plasma in bloodstream to determine the heal power
-/datum/symptom/heal/plasma/CanHeal(datum/disease/advance/advanced_disease)
- var/mob/living/carbon/infected_mob = advanced_disease.affected_mob
+/datum/symptom/heal/plasma/CanHeal(datum/disease/advance/our_disease)
+ var/mob/living/carbon/carbon_host = our_disease.affected_mob
var/datum/gas_mixture/environment
var/list/gases
@@ -550,7 +520,7 @@
/// the amount of mols in a breath is significantly lower than in the environment so we are just going to use the tank's
/// distribution pressure as an abstraction rather than calculate it using the ideal gas equation.
/// balanced around a tank set to 4kpa = about 0.2 healing power. maxes out at 0.75 healing power, or 15kpa.
- var/obj/item/tank/internals/internals_tank = infected_mob.internal
+ var/obj/item/tank/internals/internals_tank = carbon_host.internal
if(internals_tank)
var/datum/gas_mixture/tank_contents = internals_tank.return_air()
if(tank_contents && round(tank_contents.return_pressure())) // make sure the tank is not empty or 0 pressure
@@ -558,44 +528,39 @@
// higher tank distribution pressure leads to more healing, but once you get to about 15kpa you reach the max
. += power * min(MAX_HEAL_COEFFICIENT_INTERNALS, internals_tank.distribute_pressure * HEALING_PER_BREATH_PRESSURE)
else // Check environment
- if(infected_mob.loc)
- environment = infected_mob.loc.return_air()
+ if(carbon_host.loc)
+ environment = carbon_host.loc.return_air()
if(environment)
gases = environment.gases
if(gases[/datum/gas/plasma])
. += power * min(MAX_HEAL_COEFFICIENT_INTERNALS, gases[/datum/gas/plasma][MOLES] * HEALING_PER_MOL)
// Check for reagents in bloodstream
- if(infected_mob.reagents.has_reagent(/datum/reagent/toxin/plasma, needs_metabolizing = TRUE))
+ if(carbon_host.reagents.has_reagent(/datum/reagent/toxin/plasma, needs_metabolizing = TRUE))
. += power * MAX_HEAL_COEFFICIENT_BLOODSTREAM //Determines how much the symptom heals if injected or ingested
-/datum/symptom/heal/plasma/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power)
+/datum/symptom/heal/plasma/Heal(mob/living/carbon/carbon_host, datum/disease/advance/our_disease, actual_power)
var/heal_amt = BASE_HEAL_PLASMA_FIXATION * actual_power
if(prob(5))
- to_chat(M, span_notice("You feel yourself absorbing plasma inside and around you..."))
-
- var/target_temp = M.get_body_temp_normal()
- if(M.bodytemperature > target_temp)
- M.adjust_bodytemperature(-20 * temp_rate * TEMPERATURE_DAMAGE_COEFFICIENT, target_temp)
- if(prob(5))
- to_chat(M, span_notice("You feel less hot."))
- else if(M.bodytemperature < (M.get_body_temp_normal() + 1))
- M.adjust_bodytemperature(20 * temp_rate * TEMPERATURE_DAMAGE_COEFFICIENT, 0, target_temp)
- if(prob(5))
- to_chat(M, span_notice("You feel warmer."))
-
- M.adjustToxLoss(-heal_amt)
-
- var/list/parts = M.get_damaged_bodyparts(1,1, BODYTYPE_ORGANIC)
- if(!parts.len)
- return
+ to_chat(carbon_host, span_notice("You feel yourself absorbing plasma inside and around you..."))
+
+ var/difference = carbon_host.get_body_temp_normal() - carbon_host.bodytemperature
if(prob(5))
- to_chat(M, span_notice("The pain from your wounds fades rapidly."))
- for(var/obj/item/bodypart/bodypart in parts)
- if(bodypart.heal_damage(heal_amt/parts.len, heal_amt/parts.len, required_bodytype = BODYTYPE_ORGANIC))
- M.update_damage_overlays()
- return 1
+ if(difference > -1) // Yes, it's supposed to be -1 and not 0. Probably so you keep getting passive messages even at normal temperature.
+ to_chat(carbon_host, span_notice("You feel warmer."))
+ if(difference < 0)
+ to_chat(carbon_host, span_notice("You feel less hot."))
+ carbon_host.adjust_bodytemperature(clamp(difference, -20 * temp_rate, 20 * temp_rate))
+ var/needs_update = FALSE
+ needs_update += carbon_host.adjust_tox_loss(-heal_amt, updating_health = FALSE, required_biotype = healable_bodytypes)
+ var/brute_burn_heal = carbon_host.heal_overall_damage(heal_amt, heal_amt, required_bodytype = healable_bodytypes, updating_health = FALSE)
+ needs_update += brute_burn_heal
+ if(brute_burn_heal && prob(5))
+ to_chat(carbon_host, span_notice("The pain from your wounds fades rapidly."))
+ if(needs_update)
+ carbon_host.updatehealth()
+ return TRUE
///Plasma End
#undef HEALING_PER_MOL
@@ -617,38 +582,28 @@
symptom_delay_max = 1
passive_message = span_notice("Your skin glows faintly for a moment.")
threshold_descs = list(
- "Transmission 6" = "Additionally heals cellular damage.",
"Resistance 7" = "Increases healing speed.",
)
-/datum/symptom/heal/radiation/Start(datum/disease/advance/A)
+/datum/symptom/heal/radiation/Start(datum/disease/advance/our_disease)
. = ..()
if(!.)
return
- if(A.totalResistance() >= 7)
+ if(our_disease.totalResistance() >= 7)
power = 2
-/datum/symptom/heal/radiation/CanHeal(datum/disease/advance/A)
- return HAS_TRAIT(A.affected_mob, TRAIT_IRRADIATED) ? power : 0
+/datum/symptom/heal/radiation/CanHeal(datum/disease/advance/our_disease)
+ return HAS_TRAIT(our_disease.affected_mob, TRAIT_IRRADIATED) ? power : 0
-/datum/symptom/heal/radiation/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power)
+/datum/symptom/heal/radiation/Heal(mob/living/carbon/carbon_host, datum/disease/advance/our_disease, actual_power)
var/heal_amt = actual_power
-
- if(M.adjustToxLoss(-(2 * heal_amt), updating_health = FALSE))
- M.updatehealth()
-
- var/list/parts = M.get_damaged_bodyparts(1,1, BODYTYPE_ORGANIC)
-
- if(!parts.len)
- return
-
- if(prob(4))
- to_chat(M, span_notice("Your skin glows faintly, and you feel your wounds mending themselves."))
-
- for(var/obj/item/bodypart/bodypart in parts)
- if(bodypart.heal_damage(heal_amt/parts.len, heal_amt/parts.len, required_bodytype = BODYTYPE_ORGANIC))
- M.update_damage_overlays()
- return 1
+ var/needs_update = FALSE
+ needs_update += carbon_host.adjust_tox_loss(-2 * heal_amt, updating_health = FALSE)
+ var/brute_burn_heal = carbon_host.heal_overall_damage(heal_amt, heal_amt, required_bodytype = healable_bodytypes, updating_health = FALSE)
+ needs_update += brute_burn_heal
+ if(brute_burn_heal && prob(4))
+ to_chat(carbon_host, span_notice("Your skin glows faintly, and you feel your wounds mending themselves."))
+ return TRUE
/datum/symptom/heal/radiation/can_generate_randomly()
- return ..() && !HAS_TRAIT(SSstation, STATION_TRAIT_RADIOACTIVE_NEBULA) //because people can never really suffer enough
+ return ..() && !HAS_TRAIT(SSstation, STATION_TRAIT_RADIOACTIVE_NEBULA) // Because people can never really suffer enough
diff --git a/code/datums/diseases/advance/symptoms/oxygen.dm b/code/datums/diseases/advance/symptoms/oxygen.dm
index 79f0646a5c4b..3478114bc6b3 100644
--- a/code/datums/diseases/advance/symptoms/oxygen.dm
+++ b/code/datums/diseases/advance/symptoms/oxygen.dm
@@ -39,11 +39,11 @@
switch(advanced_disease.stage)
if(4, 5)
infected_mob.losebreath = max(0, infected_mob.losebreath - 4)
- infected_mob.adjustOxyLoss(-7)
+ infected_mob.adjust_oxy_loss(-7)
if(prob(base_message_chance))
to_chat(infected_mob, span_notice("You realize you haven't been breathing."))
- if(regenerate_blood && infected_mob.blood_volume < BLOOD_VOLUME_NORMAL)
- infected_mob.blood_volume += 1
+ if(regenerate_blood)
+ infected_mob.adjust_blood_volume(1, maximum = BLOOD_VOLUME_NORMAL)
else
if(prob(base_message_chance))
to_chat(infected_mob, span_notice("Your lungs feel great."))
diff --git a/code/datums/diseases/advance/symptoms/sensory.dm b/code/datums/diseases/advance/symptoms/sensory.dm
index 2848ec484b3c..894b6ffcfec4 100644
--- a/code/datums/diseases/advance/symptoms/sensory.dm
+++ b/code/datums/diseases/advance/symptoms/sensory.dm
@@ -64,7 +64,7 @@
M.adjust_hallucinations(-20 SECONDS)
if(A.stage >= 5)
- M.adjustOrganLoss(ORGAN_SLOT_BRAIN, -3)
+ M.adjust_organ_loss(ORGAN_SLOT_BRAIN, -3)
if(trauma_heal_mild && iscarbon(M))
var/mob/living/carbon/C = M
if(prob(10))
@@ -96,7 +96,8 @@
if(4, 5)
if(advanced_disease.has_required_infectious_organ(infected_mob, ORGAN_SLOT_EARS))
var/obj/item/organ/ears/ears = infected_mob.get_organ_slot(ORGAN_SLOT_EARS)
- ears.adjustEarDamage(-4, -4)
+ ears?.apply_organ_damage(-4)
+ ears?.adjust_temporary_deafness(-8 SECONDS)
if(!advanced_disease.has_required_infectious_organ(infected_mob, ORGAN_SLOT_EYES))
return
diff --git a/code/datums/diseases/advance/symptoms/thermoregulation.dm b/code/datums/diseases/advance/symptoms/thermoregulation.dm
new file mode 100644
index 000000000000..7ab1ae6f7f91
--- /dev/null
+++ b/code/datums/diseases/advance/symptoms/thermoregulation.dm
@@ -0,0 +1,39 @@
+/** Thermoregulation
+ * No change to stealth.
+ * Increases resistance.
+ * Reduces stage speed.
+ * Reduces transmissibility
+ * Bonus: Regulates body temperature.
+ */
+
+/datum/symptom/thermoregulation
+ name = "Thermoregulation"
+ desc = "The virus reacts to extreme conditions and assists the body in regulating its temperature."
+ stealth = 0
+ resistance = 1
+ stage_speed = -2
+ transmittable = -1
+ level = 5
+ severity = 0
+ threshold_descs = list(
+ "Resistance 8" = "Increases thermal regulation speed."
+ )
+
+/datum/symptom/thermoregulation/Start(datum/disease/advance/A)
+ . = ..()
+ if(!.)
+ return
+ if(A.totalResistance() >= 8)
+ power = 1.75
+
+/datum/symptom/thermoregulation/Activate(datum/disease/advance/A)
+ . = ..()
+ if(!.)
+ return
+ if(A.stage >= 3)
+ var/mob/living/carbon/carbon_host = A.affected_mob
+ var/difference = carbon_host.dna.species.bodytemp_normal - carbon_host.bodytemperature
+ if(!(carbon_host.dna.species.bodytemp_cold_damage_limit < carbon_host.bodytemperature < carbon_host.dna.species.bodytemp_heat_damage_limit)) // No need to spam chat
+ to_chat(carbon_host, span_notice("You feel a [difference < 0 ? "warmth" : "chill"] spread through your body."))
+ var/stage_power = (A.stage == 3) ? power * 5 : power * 10 // Half as strong at stage 3
+ carbon_host.adjust_bodytemperature(clamp(difference, -stage_power, stage_power))
diff --git a/code/datums/diseases/anaphylaxis.dm b/code/datums/diseases/anaphylaxis.dm
index 12d408ad2159..fb105b4b0dea 100644
--- a/code/datums/diseases/anaphylaxis.dm
+++ b/code/datums/diseases/anaphylaxis.dm
@@ -54,8 +54,8 @@
if(affected_mob.num_legs >= 1 && SPT_PROB(5, seconds_per_tick))
to_chat(affected_mob, span_warning("You feel your leg[affected_mob.num_hands == 1 ? "":"s"] shake violently."))
affected_mob.adjust_jitter_up_to(8 SECONDS * seconds_per_tick, 1 MINUTES)
- if(prob(40) && affected_mob.getStaminaLoss() < 75)
- affected_mob.adjustStaminaLoss(15)
+ if(prob(40) && affected_mob.get_stamina_loss() < 75)
+ affected_mob.adjust_stamina_loss(15)
if(affected_mob.get_organ_slot(ORGAN_SLOT_EYES) && SPT_PROB(4, seconds_per_tick))
affected_mob.adjust_eye_blur(4 SECONDS * seconds_per_tick)
to_chat(affected_mob, span_warning("It's getting harder to see clearly."))
diff --git a/code/datums/diseases/beesease.dm b/code/datums/diseases/beesease.dm
index f2ef68b4e499..faf0445cbcb5 100644
--- a/code/datums/diseases/beesease.dm
+++ b/code/datums/diseases/beesease.dm
@@ -28,7 +28,7 @@
if(SPT_PROB(1, seconds_per_tick))
to_chat(affected_mob, span_danger("Your stomach stings painfully."))
if(prob(20))
- affected_mob.adjustToxLoss(2)
+ affected_mob.adjust_tox_loss(2)
if(4)
if(SPT_PROB(5, seconds_per_tick))
affected_mob.visible_message(span_danger("[affected_mob] buzzes."), \
diff --git a/code/datums/diseases/brainrot.dm b/code/datums/diseases/brainrot.dm
index 4f8571765aa9..615d3c949212 100644
--- a/code/datums/diseases/brainrot.dm
+++ b/code/datums/diseases/brainrot.dm
@@ -27,14 +27,14 @@
if(SPT_PROB(1, seconds_per_tick))
to_chat(affected_mob, span_danger("You don't feel like yourself."))
if(SPT_PROB(2.5, seconds_per_tick))
- affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1, 170)
+ affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 1, 170)
if(3)
if(SPT_PROB(1, seconds_per_tick))
affected_mob.emote("stare")
if(SPT_PROB(1, seconds_per_tick))
affected_mob.emote("drool")
if(SPT_PROB(5, seconds_per_tick))
- affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2, 170)
+ affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 2, 170)
if(prob(2))
to_chat(affected_mob, span_danger("Your try to remember something important...but can't."))
@@ -44,7 +44,7 @@
if(SPT_PROB(1, seconds_per_tick))
affected_mob.emote("drool")
if(SPT_PROB(7.5, seconds_per_tick))
- affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 3, 170)
+ affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 3, 170)
if(prob(2))
to_chat(affected_mob, span_danger("Strange buzzing fills your head, removing all thoughts."))
if(SPT_PROB(1.5, seconds_per_tick))
diff --git a/code/datums/diseases/chronic_illness.dm b/code/datums/diseases/chronic_illness.dm
index 9fc6c32eda11..6152e8945585 100644
--- a/code/datums/diseases/chronic_illness.dm
+++ b/code/datums/diseases/chronic_illness.dm
@@ -39,12 +39,12 @@
affected_mob.vomit(VOMIT_CATEGORY_BLOOD, lost_nutrition = 20)
if(SPT_PROB(0.5, seconds_per_tick))
to_chat(affected_mob, span_userdanger("[pick("You feel your heart slowing...", "You relax and slow your heartbeat.")]"))
- need_mob_update += affected_mob.adjustStaminaLoss(70, updating_stamina = FALSE)
+ need_mob_update += affected_mob.adjust_stamina_loss(70, updating_stamina = FALSE)
if(SPT_PROB(1, seconds_per_tick))
to_chat(affected_mob, span_danger("You feel a buzzing in your brain."))
SEND_SOUND(affected_mob, sound('sound/items/weapons/flash_ring.ogg'))
if(SPT_PROB(0.5, seconds_per_tick))
- need_mob_update += affected_mob.adjustBruteLoss(1, updating_health = FALSE)
+ need_mob_update += affected_mob.adjust_brute_loss(1, updating_health = FALSE)
if(need_mob_update)
affected_mob.updatehealth()
if(4)
@@ -56,7 +56,7 @@
if(prob(75))
affected_mob.vomit(VOMIT_CATEGORY_BLOOD, lost_nutrition = 45)
if(SPT_PROB(1, seconds_per_tick))
- need_mob_update += affected_mob.adjustStaminaLoss(100, updating_stamina = FALSE)
+ need_mob_update += affected_mob.adjust_stamina_loss(100, updating_stamina = FALSE)
affected_mob.visible_message(span_warning("[affected_mob] collapses!"))
if(prob(30))
to_chat(affected_mob, span_danger("Your vision blurs as you faint!"))
@@ -64,7 +64,7 @@
if(SPT_PROB(0.5, seconds_per_tick))
to_chat(affected_mob, span_danger("[pick("You feel as though your atoms are accelerating in place.", "You feel like you're being torn apart!")]"))
affected_mob.emote("scream")
- need_mob_update += affected_mob.adjustBruteLoss(10, updating_health = FALSE)
+ need_mob_update += affected_mob.adjust_brute_loss(10, updating_health = FALSE)
if(need_mob_update)
affected_mob.updatehealth()
if(5)
@@ -74,7 +74,7 @@
update_stage(1)
if(2)
to_chat(affected_mob, span_boldwarning("There is no place for you in this timeline."))
- affected_mob.adjustStaminaLoss(100, forced = TRUE)
+ affected_mob.adjust_stamina_loss(100, forced = TRUE)
playsound(affected_mob.loc, 'sound/effects/magic/repulse.ogg', 100, FALSE)
affected_mob.emote("scream")
for(var/mob/living/viewers in viewers(3, affected_mob.loc))
diff --git a/code/datums/diseases/death_sandwich_poisoning.dm b/code/datums/diseases/death_sandwich_poisoning.dm
index f865f4fb5be6..6fad7e445aee 100644
--- a/code/datums/diseases/death_sandwich_poisoning.dm
+++ b/code/datums/diseases/death_sandwich_poisoning.dm
@@ -28,7 +28,7 @@
if(SPT_PROB(0.5, seconds_per_tick))
affected_mob.emote("gag")
if(SPT_PROB(0.5, seconds_per_tick))
- affected_mob.adjustToxLoss(5)
+ affected_mob.adjust_tox_loss(5)
if(2)
if(SPT_PROB(5, seconds_per_tick))
affected_mob.emote("cough")
@@ -39,7 +39,7 @@
if(prob(20))
affected_mob.take_bodypart_damage(burn = 1)
if(SPT_PROB(3, seconds_per_tick))
- affected_mob.adjustToxLoss(10)
+ affected_mob.adjust_tox_loss(10)
if(3)
if(SPT_PROB(5, seconds_per_tick))
@@ -53,7 +53,7 @@
if(prob(60))
affected_mob.take_bodypart_damage(burn = 2)
if(SPT_PROB(6, seconds_per_tick))
- affected_mob.adjustToxLoss(15)
+ affected_mob.adjust_tox_loss(15)
if(SPT_PROB(1.5, seconds_per_tick))
to_chat(affected_mob, span_danger("You try to scream, but nothing comes out!"))
affected_mob.set_silence_if_lower(5 SECONDS)
diff --git a/code/datums/diseases/decloning.dm b/code/datums/diseases/decloning.dm
index 4e13341dab6f..8d0d5ece4670 100644
--- a/code/datums/diseases/decloning.dm
+++ b/code/datums/diseases/decloning.dm
@@ -49,7 +49,7 @@
affected_mob.emote("drool")
if(SPT_PROB(2.5, seconds_per_tick))
affected_mob.apply_status_effect(/datum/status_effect/decloning)
- affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 1, 170)
+ affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 1, 170)
if(SPT_PROB(7.5, seconds_per_tick))
affected_mob.adjust_stutter(6 SECONDS)
if(5)
@@ -61,4 +61,4 @@
to_chat(affected_mob, span_danger("Your skin starts degrading!"))
if(SPT_PROB(5, seconds_per_tick))
affected_mob.apply_status_effect(/datum/status_effect/decloning)
- affected_mob.adjustOrganLoss(ORGAN_SLOT_BRAIN, 2, 170)
+ affected_mob.adjust_organ_loss(ORGAN_SLOT_BRAIN, 2, 170)
diff --git a/code/datums/diseases/dna_spread.dm b/code/datums/diseases/dna_spread.dm
index 77f1b1a3cd25..168c7f3a2f2e 100644
--- a/code/datums/diseases/dna_spread.dm
+++ b/code/datums/diseases/dna_spread.dm
@@ -50,7 +50,7 @@
if(SPT_PROB(0.5, seconds_per_tick))
to_chat(affected_mob, span_danger("Your stomach hurts."))
if(prob(20))
- affected_mob.adjustToxLoss(2, FALSE)
+ affected_mob.adjust_tox_loss(2, FALSE)
if(4)
if(!transformed && !carrier)
//Save original dna for when the disease is cured.
diff --git a/code/datums/diseases/flu.dm b/code/datums/diseases/flu.dm
index 9412d2a2a2f6..4fa00e060979 100644
--- a/code/datums/diseases/flu.dm
+++ b/code/datums/diseases/flu.dm
@@ -30,7 +30,7 @@
if(SPT_PROB(0.5, seconds_per_tick))
to_chat(affected_mob, span_danger("Your stomach hurts."))
if(prob(20))
- affected_mob.adjustToxLoss(1, FALSE)
+ affected_mob.adjust_tox_loss(1, FALSE)
if(affected_mob.body_position == LYING_DOWN && SPT_PROB(10, seconds_per_tick))
to_chat(affected_mob, span_notice("You feel better."))
stage--
@@ -48,7 +48,7 @@
if(SPT_PROB(0.5, seconds_per_tick))
to_chat(affected_mob, span_danger("Your stomach hurts."))
if(prob(20))
- affected_mob.adjustToxLoss(1, FALSE)
+ affected_mob.adjust_tox_loss(1, FALSE)
if(affected_mob.body_position == LYING_DOWN && SPT_PROB(7.5, seconds_per_tick))
to_chat(affected_mob, span_notice("You feel better."))
stage--
diff --git a/code/datums/diseases/rhumba_beat.dm b/code/datums/diseases/rhumba_beat.dm
index ee38d36b1f75..554aa62e242f 100644
--- a/code/datums/diseases/rhumba_beat.dm
+++ b/code/datums/diseases/rhumba_beat.dm
@@ -19,7 +19,7 @@
switch(stage)
if(2)
if(SPT_PROB(26, seconds_per_tick))
- affected_mob.adjustFireLoss(5)
+ affected_mob.adjust_fire_loss(5)
if(SPT_PROB(0.5, seconds_per_tick))
to_chat(affected_mob, span_danger("You feel strange..."))
if(3)
diff --git a/code/datums/diseases/tuberculosis.dm b/code/datums/diseases/tuberculosis.dm
index 4b01ef804af2..f54df123c1bc 100644
--- a/code/datums/diseases/tuberculosis.dm
+++ b/code/datums/diseases/tuberculosis.dm
@@ -35,11 +35,11 @@
affected_mob.set_dizzy_if_lower(10 SECONDS)
if(SPT_PROB(1, seconds_per_tick))
to_chat(affected_mob, span_danger("You feel a sharp pain from your lower chest!"))
- need_mob_update += affected_mob.adjustOxyLoss(5, updating_health = FALSE)
+ need_mob_update += affected_mob.adjust_oxy_loss(5, updating_health = FALSE)
affected_mob.emote("gasp")
if(SPT_PROB(5, seconds_per_tick))
to_chat(affected_mob, span_danger("You feel air escape from your lungs painfully."))
- need_mob_update += affected_mob.adjustOxyLoss(25, updating_health = FALSE)
+ need_mob_update += affected_mob.adjust_oxy_loss(25, updating_health = FALSE)
affected_mob.emote("gasp")
if(need_mob_update)
affected_mob.updatehealth()
@@ -47,9 +47,9 @@
var/need_mob_update = FALSE
if(SPT_PROB(1, seconds_per_tick))
to_chat(affected_mob, span_userdanger("[pick("You feel your heart slowing...", "You relax and slow your heartbeat.")]"))
- need_mob_update += affected_mob.adjustStaminaLoss(70, updating_stamina = FALSE)
+ need_mob_update += affected_mob.adjust_stamina_loss(70, updating_stamina = FALSE)
if(SPT_PROB(5, seconds_per_tick))
- need_mob_update += affected_mob.adjustStaminaLoss(100, updating_stamina = FALSE)
+ need_mob_update += affected_mob.adjust_stamina_loss(100, updating_stamina = FALSE)
affected_mob.visible_message(span_warning("[affected_mob] faints!"), span_userdanger("You surrender yourself and feel at peace..."))
affected_mob.AdjustSleeping(10 SECONDS)
if(SPT_PROB(1, seconds_per_tick))
@@ -62,7 +62,11 @@
affected_mob.overeatduration = max(affected_mob.overeatduration - (200 SECONDS), 0)
affected_mob.adjust_nutrition(-100)
if(SPT_PROB(7.5, seconds_per_tick))
- to_chat(affected_mob, span_danger("[pick("You feel uncomfortably hot...", "You feel like unzipping your jumpsuit...", "You feel like taking off some clothes...")]"))
+ if(ishuman(affected_mob))
+ var/mob/living/carbon/human/human_victim = affected_mob
+ to_chat(human_victim, span_danger("[human_victim.w_uniform? pick("You feel uncomfortably hot...", "You feel like unzipping your jumpsuit...", "You feel like taking off some clothes...") : "You feel uncomfortably hot..."]"))
+ else
+ to_chat(affected_mob, span_danger("You feel uncomfortably hot..."))
affected_mob.adjust_bodytemperature(40)
if(need_mob_update)
affected_mob.updatehealth()
diff --git a/code/datums/dna/blocks/dna_features_block.dm b/code/datums/dna/blocks/dna_features_block.dm
index ce66061e8dee..adda8a1b0b71 100644
--- a/code/datums/dna/blocks/dna_features_block.dm
+++ b/code/datums/dna/blocks/dna_features_block.dm
@@ -18,134 +18,71 @@
/datum/dna_block/feature/ethereal_color/apply_to_mob(mob/living/carbon/human/target, dna_hash)
target.dna.features[feature_key] = sanitize_hexcolor(get_block(dna_hash))
-/datum/dna_block/feature/ears
+/// Features tied to a sprite accessory
+/datum/dna_block/feature/accessory
+ abstract_type = /datum/dna_block/feature/accessory
+
+/datum/dna_block/feature/accessory/create_unique_block(mob/living/carbon/human/target)
+ var/block_value = SSaccessories.feature_list[feature_key].Find(target.dna.features[feature_key])
+ var/max_value = length(SSaccessories.feature_list[feature_key])
+ return construct_block(block_value, max_value)
+
+/datum/dna_block/feature/accessory/apply_to_mob(mob/living/carbon/human/target, dna_hash)
+ var/block_value = get_block(dna_hash)
+ var/max_value = length(SSaccessories.feature_list[feature_key])
+ var/deconstructed = deconstruct_block(block_value, max_value)
+ target.dna.features[feature_key] = SSaccessories.feature_list[feature_key][deconstructed]
+
+/datum/dna_block/feature/accessory/ears
feature_key = FEATURE_EARS
-/datum/dna_block/feature/ears/create_unique_block(mob/living/carbon/human/target)
- return construct_block(SSaccessories.ears_list.Find(target.dna.features[feature_key]), length(SSaccessories.ears_list))
-
-/datum/dna_block/feature/ears/apply_to_mob(mob/living/carbon/human/target, dna_hash)
- target.dna.features[feature_key] = SSaccessories.ears_list[deconstruct_block(get_block(dna_hash), length(SSaccessories.ears_list))]
-
// One day, someone should consider merging all tails into one, this is stupid
// No I don't care that it will "Create situations where a felinid grows a lizard tail" that makes it more fun
-/datum/dna_block/feature/tail
- feature_key = FEATURE_TAIL
-
-/datum/dna_block/feature/tail/create_unique_block(mob/living/carbon/human/target)
- return construct_block(SSaccessories.tails_list_felinid.Find(target.dna.features[feature_key]), length(SSaccessories.tails_list_felinid))
-
-/datum/dna_block/feature/tail/apply_to_mob(mob/living/carbon/human/target, dna_hash)
- target.dna.features[feature_key] = SSaccessories.tails_list_felinid[deconstruct_block(get_block(dna_hash), length(SSaccessories.tails_list_felinid))]
+/datum/dna_block/feature/accessory/tail
+ feature_key = FEATURE_TAIL_CAT
-/datum/dna_block/feature/tail_lizard
+/datum/dna_block/feature/accessory/tail_lizard
feature_key = FEATURE_TAIL_LIZARD
-/datum/dna_block/feature/tail_lizard/create_unique_block(mob/living/carbon/human/target)
- return construct_block(SSaccessories.tails_list_lizard.Find(target.dna.features[feature_key]), length(SSaccessories.tails_list_lizard))
-
-/datum/dna_block/feature/tail_lizard/apply_to_mob(mob/living/carbon/human/target, dna_hash)
- target.dna.features[feature_key] = SSaccessories.tails_list_lizard[deconstruct_block(get_block(dna_hash), length(SSaccessories.tails_list_lizard))]
-
-/datum/dna_block/feature/tail_fish
+/datum/dna_block/feature/accessory/tail_fish
feature_key = FEATURE_TAIL_FISH
-/datum/dna_block/feature/tail_fish/create_unique_block(mob/living/carbon/human/target)
- return construct_block(SSaccessories.tails_list_fish.Find(target.dna.features[feature_key]), length(SSaccessories.tails_list_fish))
-
-/datum/dna_block/feature/tail_fish/apply_to_mob(mob/living/carbon/human/target, dna_hash)
- target.dna.features[feature_key] = SSaccessories.tails_list_fish[deconstruct_block(get_block(dna_hash), length(SSaccessories.tails_list_fish))]
-
-/datum/dna_block/feature/snout
+/datum/dna_block/feature/accessory/snout
feature_key = FEATURE_SNOUT
-/datum/dna_block/feature/snout/create_unique_block(mob/living/carbon/human/target)
- return construct_block(SSaccessories.snouts_list.Find(target.dna.features[feature_key]), length(SSaccessories.snouts_list))
-
-/datum/dna_block/feature/snout/apply_to_mob(mob/living/carbon/human/target, dna_hash)
- target.dna.features[feature_key] = SSaccessories.snouts_list[deconstruct_block(get_block(dna_hash), length(SSaccessories.snouts_list))]
-
-/datum/dna_block/feature/lizard_marking
+/datum/dna_block/feature/accessory/lizard_marking
feature_key = FEATURE_LIZARD_MARKINGS
-/datum/dna_block/feature/lizard_marking/create_unique_block(mob/living/carbon/human/target)
- return construct_block(SSaccessories.lizard_markings_list.Find(target.dna.features[feature_key]), length(SSaccessories.lizard_markings_list))
-
-/datum/dna_block/feature/lizard_marking/apply_to_mob(mob/living/carbon/human/target, dna_hash)
- target.dna.features[feature_key] = SSaccessories.lizard_markings_list[deconstruct_block(get_block(dna_hash), length(SSaccessories.lizard_markings_list))]
-
-/datum/dna_block/feature/horn
+/datum/dna_block/feature/accessory/horn
feature_key = FEATURE_HORNS
-/datum/dna_block/feature/horn/create_unique_block(mob/living/carbon/human/target)
- return construct_block(SSaccessories.horns_list.Find(target.dna.features[feature_key]), length(SSaccessories.horns_list))
-
-/datum/dna_block/feature/horn/apply_to_mob(mob/living/carbon/human/target, dna_hash)
- target.dna.features[feature_key] = SSaccessories.horns_list[deconstruct_block(get_block(dna_hash), length(SSaccessories.horns_list))]
-
-/datum/dna_block/feature/frill
+/datum/dna_block/feature/accessory/frill
feature_key = FEATURE_FRILLS
-/datum/dna_block/feature/frill/create_unique_block(mob/living/carbon/human/target)
- return construct_block(SSaccessories.frills_list.Find(target.dna.features[feature_key]), length(SSaccessories.frills_list))
-
-/datum/dna_block/feature/frill/apply_to_mob(mob/living/carbon/human/target, dna_hash)
- target.dna.features[feature_key] = SSaccessories.frills_list[deconstruct_block(get_block(dna_hash), length(SSaccessories.frills_list))]
-
-/datum/dna_block/feature/spine
+/datum/dna_block/feature/accessory/spine
feature_key = FEATURE_SPINES
-/datum/dna_block/feature/spine/create_unique_block(mob/living/carbon/human/target)
- return construct_block(SSaccessories.spines_list.Find(target.dna.features[feature_key]), length(SSaccessories.spines_list))
-
-/datum/dna_block/feature/spine/apply_to_mob(mob/living/carbon/human/target, dna_hash)
- target.dna.features[feature_key] = SSaccessories.spines_list[deconstruct_block(get_block(dna_hash), length(SSaccessories.spines_list))]
-
-/datum/dna_block/feature/moth_wing
+/datum/dna_block/feature/accessory/moth_wing
feature_key = FEATURE_MOTH_WINGS
-/datum/dna_block/feature/moth_wing/create_unique_block(mob/living/carbon/human/target)
+/datum/dna_block/feature/accessory/moth_wing/create_unique_block(mob/living/carbon/human/target)
if(target.dna.features[feature_key] == "Burnt Off") // Why is this snowflake check a thing. Please find a way to fix this later
return random_string(block_length, GLOB.hex_characters)
- return construct_block(SSaccessories.moth_wings_list.Find(target.dna.features[feature_key]), length(SSaccessories.moth_wings_list))
-
-/datum/dna_block/feature/moth_wing/apply_to_mob(mob/living/carbon/human/target, dna_hash)
- target.dna.features[feature_key] = SSaccessories.moth_wings_list[deconstruct_block(get_block(dna_hash), length(SSaccessories.moth_wings_list))]
+ return ..()
-/datum/dna_block/feature/moth_antenna
+/datum/dna_block/feature/accessory/moth_antenna
feature_key = FEATURE_MOTH_ANTENNAE
-/datum/dna_block/feature/moth_antenna/create_unique_block(mob/living/carbon/human/target)
+/datum/dna_block/feature/accessory/moth_antenna/create_unique_block(mob/living/carbon/human/target)
if(target.dna.features[feature_key] == "Burnt Off")
return random_string(block_length, GLOB.hex_characters)
- return construct_block(SSaccessories.moth_antennae_list.Find(target.dna.features[feature_key]), length(SSaccessories.moth_antennae_list))
-
-/datum/dna_block/feature/moth_antenna/apply_to_mob(mob/living/carbon/human/target, dna_hash)
- target.dna.features[feature_key] = SSaccessories.moth_antennae_list[deconstruct_block(get_block(dna_hash), length(SSaccessories.moth_antennae_list))]
+ return ..()
-/datum/dna_block/feature/moth_marking
+/datum/dna_block/feature/accessory/moth_marking
feature_key = FEATURE_MOTH_MARKINGS
-/datum/dna_block/feature/moth_marking/create_unique_block(mob/living/carbon/human/target)
- return construct_block(SSaccessories.moth_markings_list.Find(target.dna.features[feature_key]), length(SSaccessories.moth_markings_list))
-
-/datum/dna_block/feature/moth_marking/apply_to_mob(mob/living/carbon/human/target, dna_hash)
- target.dna.features[feature_key] = SSaccessories.moth_markings_list[deconstruct_block(get_block(dna_hash), length(SSaccessories.moth_markings_list))]
-
-/datum/dna_block/feature/mush_cap
+/datum/dna_block/feature/accessory/mush_cap
feature_key = FEATURE_MUSH_CAP
-/datum/dna_block/feature/mush_cap/create_unique_block(mob/living/carbon/human/target)
- return construct_block(SSaccessories.caps_list.Find(target.dna.features[feature_key]), length(SSaccessories.caps_list))
-
-/datum/dna_block/feature/mush_cap/apply_to_mob(mob/living/carbon/human/target, dna_hash)
- target.dna.features[feature_key] = SSaccessories.caps_list[deconstruct_block(get_block(dna_hash), length(SSaccessories.caps_list))]
-
-/datum/dna_block/feature/pod_hair
+/datum/dna_block/feature/accessory/pod_hair
feature_key = FEATURE_POD_HAIR
-
-/datum/dna_block/feature/pod_hair/create_unique_block(mob/living/carbon/human/target)
- return construct_block(SSaccessories.pod_hair_list.Find(target.dna.features[feature_key]), length(SSaccessories.pod_hair_list))
-
-/datum/dna_block/feature/pod_hair/apply_to_mob(mob/living/carbon/human/target, dna_hash)
- target.dna.features[feature_key] = SSaccessories.pod_hair_list[deconstruct_block(get_block(dna_hash), length(SSaccessories.pod_hair_list))]
diff --git a/code/datums/dna/blocks/dna_identity_block.dm b/code/datums/dna/blocks/dna_identity_block.dm
index 6543da283481..74ac384b3f9d 100644
--- a/code/datums/dna/blocks/dna_identity_block.dm
+++ b/code/datums/dna/blocks/dna_identity_block.dm
@@ -95,7 +95,7 @@
/datum/dna_block/identity/hair_gradient
/datum/dna_block/identity/hair_gradient/create_unique_block(mob/living/carbon/human/target)
- return construct_block(SSaccessories.hair_gradients_list.Find(target.grad_style[GRADIENT_HAIR_KEY]), length(SSaccessories.hair_gradients_list))
+ return construct_block(SSaccessories.hair_gradients_list.Find(target.get_hair_gradient_style(GRADIENT_HAIR_KEY)), length(SSaccessories.hair_gradients_list))
/datum/dna_block/identity/hair_gradient/apply_to_mob(mob/living/carbon/human/target, dna_hash)
var/gradient_style = SSaccessories.hair_gradients_list[deconstruct_block(get_block(dna_hash), length(SSaccessories.hair_gradients_list))]
@@ -105,7 +105,7 @@
block_length = DNA_BLOCK_SIZE_COLOR
/datum/dna_block/identity/hair_gradient_color/create_unique_block(mob/living/carbon/human/target)
- return sanitize_hexcolor(target.grad_color[GRADIENT_HAIR_KEY], include_crunch = FALSE)
+ return sanitize_hexcolor(target.get_hair_gradient_color(GRADIENT_HAIR_KEY), include_crunch = FALSE)
/datum/dna_block/identity/hair_gradient_color/apply_to_mob(mob/living/carbon/human/target, dna_hash)
target.set_hair_gradient_color(sanitize_hexcolor(get_block(dna_hash)), update = FALSE)
@@ -113,7 +113,7 @@
/datum/dna_block/identity/facial_gradient
/datum/dna_block/identity/facial_gradient/create_unique_block(mob/living/carbon/human/target)
- return construct_block(SSaccessories.facial_hair_gradients_list.Find(target.grad_style[GRADIENT_FACIAL_HAIR_KEY]), length(SSaccessories.facial_hair_gradients_list))
+ return construct_block(SSaccessories.facial_hair_gradients_list.Find(target.get_hair_gradient_style(GRADIENT_FACIAL_HAIR_KEY)), length(SSaccessories.facial_hair_gradients_list))
/datum/dna_block/identity/facial_gradient/apply_to_mob(mob/living/carbon/human/target, dna_hash)
var/gradient_style = SSaccessories.facial_hair_gradients_list[deconstruct_block(get_block(dna_hash), length(SSaccessories.facial_hair_gradients_list))]
@@ -123,7 +123,7 @@
block_length = DNA_BLOCK_SIZE_COLOR
/datum/dna_block/identity/facial_gradient_color/create_unique_block(mob/living/carbon/human/target)
- return sanitize_hexcolor(target.grad_color[GRADIENT_FACIAL_HAIR_KEY], include_crunch = FALSE)
+ return sanitize_hexcolor(target.get_hair_gradient_color(GRADIENT_FACIAL_HAIR_KEY), include_crunch = FALSE)
/datum/dna_block/identity/facial_gradient_color/apply_to_mob(mob/living/carbon/human/target, dna_hash)
target.set_facial_hair_gradient_color(sanitize_hexcolor(get_block(dna_hash)), update = FALSE)
diff --git a/code/datums/dna/dna.dm b/code/datums/dna/dna.dm
index 3720b03bd1ea..1957407588c7 100644
--- a/code/datums/dna/dna.dm
+++ b/code/datums/dna/dna.dm
@@ -83,7 +83,7 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block())
return ..()
///Copies the variables of a dna datum onto another.
-/datum/dna/proc/copy_dna(datum/dna/new_dna, transfer_flags = COPY_DNA_SE|COPY_DNA_SPECIES)
+/datum/dna/proc/copy_dna(datum/dna/new_dna, transfer_flags = COPY_DNA_SE|COPY_DNA_SPECIES|COPY_DNA_BLOOD_TYPE) // DARKPACK EDIT CHANGE - added '|COPY_DNA_BLOOD_TYPE', original : /datum/dna/proc/copy_dna(datum/dna/new_dna, transfer_flags = COPY_DNA_SE|COPY_DNA_SPECIES)
new_dna.unique_enzymes = unique_enzymes
new_dna.unique_identity = unique_identity
new_dna.unique_features = unique_features
@@ -94,13 +94,16 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block())
new_dna.default_mutation_genes = default_mutation_genes
//if the new DNA has a holder, transform them immediately, otherwise save it
if(new_dna.holder)
- if (iscarbon(new_dna.holder))
+ if (iscarbon(new_dna.holder) && (transfer_flags & COPY_DNA_BLOOD_TYPE)) // DARKPACK EDIT CHANGE - added & COPY_DNA_BLOOD_TYPE
var/mob/living/carbon/as_carbon = new_dna.holder
as_carbon.set_blood_type(blood_type)
if(transfer_flags & COPY_DNA_SPECIES)
new_dna.holder.set_species(species.type, icon_update = FALSE)
else
- new_dna.blood_type = blood_type
+ //DARKPACK EDIT CHANGE START - flag for copying blood type, we don't want to remove vampire blood from vampires using certain abilities
+ if(transfer_flags & COPY_DNA_BLOOD_TYPE)
+ new_dna.blood_type = blood_type
+ //DARKPACK EDIT CHANGE END
if(transfer_flags & COPY_DNA_SPECIES)
new_dna.species = new species.type
if(transfer_flags & COPY_DNA_MUTATIONS && holder?.can_mutate())
@@ -722,4 +725,4 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block())
eyes.Remove(src)
qdel(eyes)
visible_message(span_notice("[src] looks up and their eyes melt away!"), span_userdanger("I understand now."))
- addtimer(CALLBACK(src, PROC_REF(adjustOrganLoss), ORGAN_SLOT_BRAIN, 200), 2 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(adjust_organ_loss), ORGAN_SLOT_BRAIN, 200), 2 SECONDS)
diff --git a/code/datums/dna/dna_block.dm b/code/datums/dna/dna_block.dm
index f9205c2278ec..eaa005cf5dfb 100644
--- a/code/datums/dna/dna_block.dm
+++ b/code/datums/dna/dna_block.dm
@@ -56,12 +56,14 @@
/// Blocks for unique identities (skin tones, hair style, and gender)
/datum/dna_block/identity
+ abstract_type = /datum/dna_block/identity
/datum/dna_block/identity/position_in_hash()
return GLOB.total_ui_len_by_block[type]
/// Blocks for unique features (mutant color, mutant bodyparts)
/datum/dna_block/feature
+ abstract_type = /datum/dna_block/feature
/// The feature key this block ties in to.
var/feature_key = null
diff --git a/code/datums/elements/atmos_requirements.dm b/code/datums/elements/atmos_requirements.dm
index 42f5ceefe387..0b4b6e17443f 100644
--- a/code/datums/elements/atmos_requirements.dm
+++ b/code/datums/elements/atmos_requirements.dm
@@ -39,7 +39,7 @@
if(is_breathable_atmos(target))
target.clear_alert(ALERT_NOT_ENOUGH_OXYGEN)
return
- target.adjustBruteLoss(unsuitable_atmos_damage * seconds_per_tick)
+ target.adjust_brute_loss(unsuitable_atmos_damage * seconds_per_tick)
target.throw_alert(ALERT_NOT_ENOUGH_OXYGEN, /atom/movable/screen/alert/not_enough_oxy)
/datum/element/atmos_requirements/proc/is_breathable_atmos(mob/living/target)
diff --git a/code/datums/elements/basic_eating.dm b/code/datums/elements/basic_eating.dm
index a0f5a2cedefa..8b011823e16f 100644
--- a/code/datums/elements/basic_eating.dm
+++ b/code/datums/elements/basic_eating.dm
@@ -16,10 +16,12 @@
var/drinking
/// If true, we put food in our tummy instead of deleting it
var/add_to_contents
- /// Types the animal can eat.
+ /// If true, when add_to_contents would put the item into contents but when used for healing, the item is consumed instead
+ var/consume_healing
+ /// Types the animal can eat. Can be an assoc list with amount to heal/damage the mob by
var/list/food_types
-/datum/element/basic_eating/Attach(datum/target, heal_amt = 0, damage_amount = 0, damage_type = null, drinking = FALSE, add_to_contents = FALSE, food_types = list())
+/datum/element/basic_eating/Attach(datum/target, heal_amt = 0, damage_amount = 0, damage_type = null, drinking = FALSE, add_to_contents = FALSE, consume_healing = TRUE, food_types = list())
. = ..()
if(!isliving(target))
@@ -31,6 +33,7 @@
src.damage_type = damage_type
src.drinking = drinking
src.add_to_contents = add_to_contents
+ src.consume_healing = consume_healing
src.food_types = food_types
RegisterSignal(target, COMSIG_ATOM_ITEM_INTERACTION, PROC_REF(try_feed))
@@ -66,7 +69,8 @@
/datum/element/basic_eating/proc/try_eating(mob/living/eater, atom/target, mob/living/feeder)
if(!is_type_in_list(target, food_types))
return FALSE
- if(SEND_SIGNAL(eater, COMSIG_MOB_PRE_EAT, target, feeder) & COMSIG_MOB_CANCEL_EAT)
+ var/list/effect_mult = list()
+ if(SEND_SIGNAL(eater, COMSIG_MOB_PRE_EAT, target, feeder, effect_mult) & COMSIG_MOB_CANCEL_EAT)
return FALSE
if(add_to_contents && !ismovable(target))
return FALSE
@@ -76,22 +80,44 @@
else
eat_verb = pick("bite","chew","nibble","gnaw","gobble","chomp")
- if (heal_amt > 0)
- var/healed = heal_amt && eater.health < eater.maxHealth
- eater.heal_overall_damage(heal_amt)
+ var/best_match = null
+ var/best_value = 0
+ for (var/food_path in food_types)
+ // Not an assoc list
+ if (isnull(food_types[food_path]))
+ break
+ if (istype(target, food_path) && (!best_match || ispath(food_path, best_match)))
+ best_match = food_path
+ best_value = food_types[food_path]
+
+ var/to_heal = heal_amt
+ var/to_damage = damage_amount
+
+ if (best_match)
+ to_heal = 0
+ to_damage = 0
+ if (best_value > 0)
+ to_heal = best_value
+ else if (best_value < 0)
+ to_damage = -best_value
+
+ for (var/mult in effect_mult)
+ to_heal *= mult
+ to_damage *= mult
+
+ if (to_heal > 0)
+ var/healed = eater.heal_overall_damage(to_heal)
eater.visible_message(span_notice("[eater] [eat_verb]s [target]."), span_notice("You [eat_verb] [target][healed ? ", restoring some health" : ""]."))
-
- else if (damage_amount > 0 && damage_type)
- eater.apply_damage(damage_amount, damage_type)
- eater.visible_message(span_notice("[eater] [eat_verb]s [target], and seems to hurt itself."), span_notice("You [eat_verb] [target], hurting yourself in the process."))
-
+ else if (to_damage > 0 && damage_type)
+ var/damaged = eater.apply_damage(to_damage, damage_type)
+ eater.visible_message(span_notice("[eater] [eat_verb]s [target][damaged ? ", and seems to hurt [eater.p_themselves()]!" : "."]"), span_notice("You [eat_verb] [target][damaged ? ", hurting yourself in the process" : ""]."))
else
eater.visible_message(span_notice("[eater] [eat_verb]s [target]."), span_notice("You [eat_verb] [target]."))
- finish_eating(eater, target, feeder)
+ finish_eating(eater, target, feeder, to_heal)
return TRUE
-/datum/element/basic_eating/proc/finish_eating(mob/living/eater, atom/target, mob/living/feeder)
+/datum/element/basic_eating/proc/finish_eating(mob/living/eater, atom/target, mob/living/feeder, to_heal)
set waitfor = FALSE
if(drinking)
playsound(eater.loc,'sound/items/drink.ogg', rand(10,50), TRUE)
@@ -104,10 +130,12 @@
var/obj/item/stack/food_stack = target
final_target = food_stack.split_stack(1)
- eater.log_message("has eaten [target], [add_to_contents ? "swallowing it" : "destroying it"]!", LOG_ATTACK)
+ var/devour = add_to_contents && !to_heal
+ eater.log_message("has eaten [target], [devour ? "swallowing it" : "destroying it"]!", LOG_ATTACK)
- if (add_to_contents)
+ if (devour)
var/atom/movable/movable_target = final_target
movable_target.forceMove(eater)
else
qdel(final_target)
+
diff --git a/code/datums/elements/beauty.dm b/code/datums/elements/beauty.dm
index 8bfa298c1a72..edc2c0075175 100644
--- a/code/datums/elements/beauty.dm
+++ b/code/datums/elements/beauty.dm
@@ -11,7 +11,7 @@
* Assoc list of atoms as keys and number of time the same element instance has been attached to them as assoc value.
* So things don't get odd with same-valued yet dissimilar beauty modifiers being added to the same atom.
*/
- var/beauty_counter = list()
+ var/beauty_counter
/datum/element/beauty/Attach(datum/target, beauty)
. = ..()
@@ -19,6 +19,7 @@
return ELEMENT_INCOMPATIBLE
src.beauty = beauty
+ LAZYINITLIST(beauty_counter)
var/area/current_area = get_area(target)
var/beauty_active = TRUE
diff --git a/code/datums/elements/body_temp_sensitive.dm b/code/datums/elements/body_temp_sensitive.dm
index e3a694baed78..9cbb027123d7 100644
--- a/code/datums/elements/body_temp_sensitive.dm
+++ b/code/datums/elements/body_temp_sensitive.dm
@@ -50,7 +50,7 @@
var/gave_alert = FALSE
if(living_mob.bodytemperature < min_body_temp)
- living_mob.adjustFireLoss(cold_damage * seconds_per_tick, forced = TRUE)
+ living_mob.adjust_fire_loss(cold_damage * seconds_per_tick, forced = TRUE)
if(!living_mob.has_status_effect(/datum/status_effect/inebriated))
switch(cold_damage)
if(1 to 5)
@@ -62,7 +62,7 @@
gave_alert = TRUE
else if(living_mob.bodytemperature > max_body_temp)
- living_mob.adjustFireLoss(heat_damage * seconds_per_tick, forced = TRUE)
+ living_mob.adjust_fire_loss(heat_damage * seconds_per_tick, forced = TRUE)
switch(heat_damage)
if(1 to 5)
living_mob.throw_alert(ALERT_TEMPERATURE, /atom/movable/screen/alert/hot, 1)
diff --git a/code/datums/elements/bonus_damage.dm b/code/datums/elements/bonus_damage.dm
index 1fce0672c515..b99d346d2898 100644
--- a/code/datums/elements/bonus_damage.dm
+++ b/code/datums/elements/bonus_damage.dm
@@ -32,4 +32,4 @@
var/health_percentage = (living_target.health / living_target.maxHealth) * 100
if(living_target.stat == DEAD || health_percentage > damage_percentage)
return
- living_target.adjustBruteLoss(brute_damage_amount)
+ living_target.adjust_brute_loss(brute_damage_amount)
diff --git a/code/datums/elements/bugkiller_reagent.dm b/code/datums/elements/bugkiller_reagent.dm
index f6a09989335b..226e59da3329 100644
--- a/code/datums/elements/bugkiller_reagent.dm
+++ b/code/datums/elements/bugkiller_reagent.dm
@@ -30,7 +30,7 @@
return
// capping damage so splashing a beaker on a moth is not an instant crit
- var/damage = min(round(0.4 * reac_volume * (1 - touch_protection), 0.1), 12)
+ var/damage = min(round(reac_volume * (1 - touch_protection), 0.1), 20)
if(damage < 1)
return
@@ -87,4 +87,5 @@
/atom/movable/screen/alert/status_effect/bugkiller_death
name = "Overwhelming Toxicity"
desc = "Don't go into the light!"
- icon_state = "paralysis"
+ use_user_hud_icon = TRUE
+ overlay_state = "paralysis"
diff --git a/code/datums/elements/climbable.dm b/code/datums/elements/climbable.dm
index 2a16cfac7e6e..18cd40914719 100644
--- a/code/datums/elements/climbable.dm
+++ b/code/datums/elements/climbable.dm
@@ -37,7 +37,7 @@
examine_list["climbable"] = "It looks like it can be climbed on."
/datum/element/climbable/proc/can_climb(atom/source, mob/user)
- if (!user.CanReach(source))
+ if (!source.IsReachableBy(user))
return FALSE
var/dir_step = get_dir(user, source.loc)
//To jump over a railing you have to be standing next to it, not far behind it.
diff --git a/code/datums/elements/cuffable_item.dm b/code/datums/elements/cuffable_item.dm
new file mode 100644
index 000000000000..b81068d2361f
--- /dev/null
+++ b/code/datums/elements/cuffable_item.dm
@@ -0,0 +1,69 @@
+///This element allows the item it's attached to be bound to oneself's arm with a pair of handcuffs (sold separately). Borgs need not to apply
+/datum/element/cuffable_item
+
+/datum/element/cuffable_item/Attach(datum/target)
+ . = ..()
+
+ if(!isitem(target))
+ return ELEMENT_INCOMPATIBLE
+
+ RegisterSignal(target, COMSIG_ATOM_EXAMINE_MORE, PROC_REF(on_examine_more))
+ RegisterSignal(target, COMSIG_ATOM_ITEM_INTERACTION_SECONDARY, PROC_REF(item_interaction))
+
+ var/atom/atom_target = target
+ atom_target.flags_1 |= HAS_CONTEXTUAL_SCREENTIPS_1
+ RegisterSignal(atom_target, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(on_requesting_context_from_item))
+
+///Tell the player about the interaction if they examine the item twice.
+/datum/element/cuffable_item/proc/on_examine_more(obj/item/source, mob/user, list/examine_list)
+ SIGNAL_HANDLER
+
+ if(length(user.held_items) < 0 || iscyborg(user) || source.anchored)
+ return
+ examine_list += span_smallnotice("You could bind [source.p_them()] to your wrist with a pair of handcuffs...")
+
+///Give context to players holding a pair of handcuffs when hovering the item
+/datum/element/cuffable_item/proc/on_requesting_context_from_item(datum/source, list/context, obj/item/held_item, mob/user)
+ SIGNAL_HANDLER
+
+ if (!istype(held_item, /obj/item/restraints/handcuffs))
+ return NONE
+ var/obj/item/restraints/handcuffs/cuffs = held_item
+ if(!cuffs.used)
+ context[SCREENTIP_CONTEXT_RMB] = "Cuff to your wrist"
+ return CONTEXTUAL_SCREENTIP_SET
+
+/datum/element/cuffable_item/proc/item_interaction(obj/item/source, mob/living/user, obj/item/tool, modifiers)
+ SIGNAL_HANDLER
+
+ if(!istype(tool, /obj/item/restraints/handcuffs) || iscyborg(user) || source.anchored || !source.IsReachableBy(user))
+ return NONE
+
+ INVOKE_ASYNC(src, PROC_REF(apply_cuffs), source, user, tool)
+ return ITEM_INTERACT_SUCCESS
+
+///The proc responsible for adding the status effect to the player and all...
+/datum/element/cuffable_item/proc/apply_cuffs(obj/item/source, mob/living/user, obj/item/restraints/handcuffs/cuffs)
+ if(cuffs.used || DOING_INTERACTION_WITH_TARGET(user, source))
+ return
+
+ if(HAS_TRAIT_FROM(source, TRAIT_NODROP, CUFFED_ITEM_TRAIT))
+ to_chat(user, span_warning("[source] is already cuffed to your wrist!"))
+ return
+
+ if(cuffs.handcuffs_clumsiness_check(user))
+ return
+
+ source.balloon_alert(user, "cuffing item...")
+ playsound(source, cuffs.cuffsound, 30, TRUE, -2)
+ if(!do_after(user, cuffs.get_handcuff_time(user), source))
+ return
+
+ playsound(source, cuffs.cuffsuccesssound, 30, TRUE, -2)
+
+ if(user.apply_status_effect(/datum/status_effect/cuffed_item, source, cuffs))
+ source.balloon_alert(user, "item cuffed to wrist")
+ return
+
+ source.balloon_alert(user, "couldn't cuff to wrist!")
+ return
diff --git a/code/datums/elements/cuffsnapping.dm b/code/datums/elements/cuffsnapping.dm
index 3640b0a5bd8d..47728af0744d 100644
--- a/code/datums/elements/cuffsnapping.dm
+++ b/code/datums/elements/cuffsnapping.dm
@@ -49,12 +49,20 @@
UnregisterSignal(target, list(COMSIG_ITEM_ATTACK_SECONDARY, COMSIG_ATOM_EXAMINE, COMSIG_ITEM_REQUESTING_CONTEXT_FOR_TARGET))
return ..()
-/datum/element/cuffsnapping/proc/add_item_context(obj/item/source, list/context, mob/living/carbon/target, mob/living/user)
+/datum/element/cuffsnapping/proc/add_item_context(obj/item/source, list/context, atom/target, mob/living/user)
SIGNAL_HANDLER
- if(!iscarbon(target) || !target.handcuffed)
+ if(!isliving(target)) //Removing restraints takes precedence
return NONE
- context[SCREENTIP_CONTEXT_RMB] = "Cut Restraints"
- return CONTEXTUAL_SCREENTIP_SET
+ var/mob/living/living_target = target
+ if(iscarbon(living_target))
+ var/mob/living/carbon/carbon_target = living_target
+ if(carbon_target.handcuffed)
+ context[SCREENTIP_CONTEXT_RMB] = "Cut Restraints"
+ return CONTEXTUAL_SCREENTIP_SET
+ if(living_target.has_status_effect(/datum/status_effect/cuffed_item))
+ context[SCREENTIP_CONTEXT_RMB] = "Remove Binds From Item"
+ return CONTEXTUAL_SCREENTIP_SET
+ return NONE
///signal called on parent being examined
/datum/element/cuffsnapping/proc/on_examine(datum/target, mob/user, list/examine_list)
@@ -72,48 +80,74 @@
examine_list += span_notice(examine_string)
-/datum/element/cuffsnapping/proc/try_cuffsnap_target(obj/item/cutter, mob/living/carbon/target, mob/living/cutter_user, list/modifiers)
+///Signal called on parent when it right-clicks another mob.
+/datum/element/cuffsnapping/proc/try_cuffsnap_target(obj/item/cutter, mob/living/target, mob/living/cutter_user, list/modifiers)
SIGNAL_HANDLER
- if(!istype(target)) //we aren't the kind of mob that can even have cuffs, so we skip.
+ if(LAZYACCESS(cutter_user.do_afters, cutter))
return
- if(!target.handcuffed)
- return
+ var/mob/living/carbon/carbon_target = target
+ if(!istype(carbon_target) || !carbon_target.handcuffed)
+ var/datum/status_effect/cuffed_item/cuffed_status = target.has_status_effect(/datum/status_effect/cuffed_item)
+ if(!cuffed_status)
+ return NONE
+ INVOKE_ASYNC(src, PROC_REF(try_cuffsnap_item), cutter, target, cutter_user, cuffed_status.cuffed, cuffed_status.cuffs)
+ return COMPONENT_SKIP_ATTACK
- var/obj/item/restraints/handcuffs/cuffs = target.handcuffed
+ var/obj/item/restraints/handcuffs/cuffs = carbon_target.handcuffed
if(!istype(cuffs))
- return
-
- if(cuffs.restraint_strength && isnull(src.snap_time_strong))
- cutter_user.visible_message(span_notice("[cutter_user] tries to cut through [target]'s restraints with [cutter], but fails!"))
- playsound(source = get_turf(cutter), soundin = cutter.usesound ? cutter.usesound : cutter.hitsound, vol = cutter.get_clamped_volume(), vary = TRUE)
- return COMPONENT_SKIP_ATTACK
+ return NONE
- else if(isnull(src.snap_time_weak))
- cutter_user.visible_message(span_notice("[cutter_user] tries to cut through [target]'s restraints with [cutter], but fails!"))
- playsound(source = get_turf(cutter), soundin = cutter.usesound ? cutter.usesound : cutter.hitsound, vol = cutter.get_clamped_volume(), vary = TRUE)
- return COMPONENT_SKIP_ATTACK
+ if(check_cuffs_strength(carbon_target, target, cutter_user, cuffs, span_notice("[cutter_user] tries to cut through [target]'s restraints with [cutter], but fails!")))
+ INVOKE_ASYNC(src, PROC_REF(do_cuffsnap_target), cutter, target, cutter_user, cuffs)
- . = COMPONENT_SKIP_ATTACK
+ return COMPONENT_SKIP_ATTACK
- INVOKE_ASYNC(src, PROC_REF(do_cuffsnap_target), cutter, target, cutter_user, cuffs)
+///Check that the type of restraints can be cut by this element.
+/datum/element/cuffsnapping/proc/check_cuffs_strength(obj/item/cutter, mob/living/target, mob/living/cutter_user, obj/item/restraints/handcuffs/cuffs, message)
+ if(cuffs.restraint_strength ? snap_time_strong : snap_time_weak)
+ return TRUE
+ cutter_user.visible_message(message)
+ playsound(source = get_turf(cutter), soundin = cutter.usesound || cutter.hitsound, vol = cutter.get_clamped_volume(), vary = TRUE)
+ return FALSE
+///Called when a player tries to remove the cuffs restraining another mob.
/datum/element/cuffsnapping/proc/do_cuffsnap_target(obj/item/cutter, mob/living/carbon/target, mob/cutter_user, obj/item/restraints/handcuffs/cuffs)
if(LAZYACCESS(cutter_user.do_afters, cutter))
return
-
log_combat(cutter_user, target, "cut or tried to cut [target]'s cuffs", cutter)
- var/snap_time = src.snap_time_weak
- if(cuffs.restraint_strength)
- snap_time = src.snap_time_strong
+ do_snip_snap(cutter, target, cutter_user, cuffs, span_notice("[cutter_user] cuts [target]'s restraints with [cutter]!"))
+
+///Called when a player tries to remove the cuffs binding an item to their owner
+/datum/element/cuffsnapping/proc/try_cuffsnap_item(obj/item/cutter, mob/living/target, mob/living/cutter_user, obj/item/cuffed, obj/item/restraints/handcuffs/cuffs)
+ if(check_cuffs_strength(cutter, target, cutter_user, cuffs, span_notice("[cutter_user] tries to cut through the restraints binding [cuffed] to [target], but fails!")))
+ return
+
+ log_combat(cutter_user, target, "cut or tried to cut restraints binding [cuffed] to")
+
+ do_snip_snap(cutter, target, cutter_user, cuffs, span_notice("[cutter_user] cuts the restraints binding [src] to [target] with [cutter]!"))
+
+///The proc responsible for the very timed action that deletes the cuffs
+/datum/element/cuffsnapping/proc/do_snip_snap(obj/item/cutter, mob/living/target, mob/cutter_user, obj/item/restraints/handcuffs/cuffs, message)
+ var/snap_time = cuffs.restraint_strength ? snap_time_strong : snap_time_weak
+
+ var/target_was_restrained = FALSE
+ if(iscarbon(target))
+ var/mob/living/carbon/carbon_target = target
+ target_was_restrained = carbon_target.handcuffed
- if(snap_time == 0 || do_after(cutter_user, snap_time, target, interaction_key = cutter)) // If 0 just do it. This to bypass the do_after() creating a needless progress bar.
- cutter_user.do_attack_animation(target, used_item = cutter)
- cutter_user.visible_message(span_notice("[cutter_user] cuts [target]'s restraints with [cutter]!"))
- qdel(target.handcuffed)
- playsound(source = get_turf(cutter), soundin = cutter.usesound ? cutter.usesound : cutter.hitsound, vol = cutter.get_clamped_volume(), vary = TRUE)
+ if(snap_time)
+ if(!do_after(cutter_user, snap_time, target, interaction_key = cutter)) // If 0 just do it. This to bypass the do_after() creating a needless progress bar.
+ return
+ if(target_was_restrained) //Removing restraints takes priority over cuffed items. This only applies for carbon mobs, but we need to make sure the restraints are still the same.
+ var/mob/living/carbon/carbon_target = target
+ if(carbon_target.handcuffed != cuffs)
+ return
- return
+ cutter_user.do_attack_animation(target, used_item = cutter)
+ cutter_user.visible_message(message)
+ qdel(cuffs)
+ playsound(source = get_turf(cutter), soundin = cutter.usesound || cutter.hitsound, vol = cutter.get_clamped_volume(), vary = TRUE)
diff --git a/code/datums/elements/death_drops.dm b/code/datums/elements/death_drops.dm
index 70543260707b..b5d8f988d2d7 100644
--- a/code/datums/elements/death_drops.dm
+++ b/code/datums/elements/death_drops.dm
@@ -41,15 +41,18 @@
if (SEND_SIGNAL(target, COMSIG_LIVING_DROP_LOOT, spawn_loot, gibbed) & COMPONENT_NO_LOOT_DROP)
return
+ var/list/all_loot = list()
for(var/thing_to_spawn in spawn_loot)
for(var/i in 1 to (spawn_loot[thing_to_spawn] || 1))
- create_loot(thing_to_spawn, loot_loc, target, gibbed, spread_px = spawn_loot.len * 3)
+ all_loot += create_loot(thing_to_spawn, loot_loc, target, gibbed, spread_px = spawn_loot.len * 3)
+
+ list_clear_nulls(all_loot) // in case of gibbed corpses
+ SEND_SIGNAL(target, COMSIG_LIVING_DROPPED_LOOT, all_loot, gibbed)
/// Handles creating the loots
/datum/element/death_drops/proc/create_loot(typepath, atom/loot_loc, mob/living/dead, gibbed, spread_px = 4)
if(ispath(typepath, /obj/effect/mob_spawn/corpse))
- handle_corpse(typepath, loot_loc, dead, gibbed)
- return
+ return handle_corpse(typepath, loot_loc, dead, gibbed)
var/drop = new typepath(loot_loc)
if(isitem(drop) && spread_px)
@@ -57,18 +60,20 @@
var/clamped_px = clamp(spread_px, 0, 16)
dropped_item.pixel_x = rand(-clamped_px, clamped_px)
dropped_item.pixel_y = rand(-clamped_px, clamped_px)
+ return drop
/// Handles snowflake case of mob corpses
/datum/element/death_drops/proc/handle_corpse(typepath, atom/loot_loc, mob/living/dead, gibbed)
var/obj/effect/mob_spawn/corpse/spawner = new typepath(loot_loc, TRUE)
var/mob/living/body = spawner.create()
// done before the gib check so the bodyparts will be damaged
- body.setBruteLoss(dead.getBruteLoss())
- body.setFireLoss(dead.getFireLoss())
+ body.set_brute_loss(dead.get_brute_loss())
+ body.set_fire_loss(dead.get_fire_loss())
// if gibbed, dispose of the body
if(gibbed)
body.gib(DROP_ALL_REMAINS)
- return
+ return null
// otherwise continue with the rest of the damage types
- body.setToxLoss(dead.getToxLoss())
- body.setOxyLoss(dead.getOxyLoss())
+ body.set_tox_loss(dead.get_tox_loss())
+ body.set_oxy_loss(dead.get_oxy_loss())
+ return body
diff --git a/code/datums/elements/digitalcamo.dm b/code/datums/elements/digitalcamo.dm
index 1061131f88b6..30038f2a55da 100644
--- a/code/datums/elements/digitalcamo.dm
+++ b/code/datums/elements/digitalcamo.dm
@@ -27,14 +27,14 @@
/datum/element/digitalcamo/proc/HideFromAIHuds(mob/living/target)
for(var/mob/living/silicon/ai/AI in GLOB.ai_list)
- for (var/hud_type in AI.silicon_huds)
- var/datum/atom_hud/silicon_hud = GLOB.huds[hud_type]
+ for (var/hud_trait in AI.silicon_huds)
+ var/datum/atom_hud/silicon_hud = GLOB.huds[GLOB.trait_to_hud[hud_trait]]
silicon_hud.hide_single_atomhud_from(AI,target)
/datum/element/digitalcamo/proc/UnhideFromAIHuds(mob/living/target)
for(var/mob/living/silicon/ai/AI in GLOB.ai_list)
- for (var/hud_type in AI.silicon_huds)
- var/datum/atom_hud/silicon_hud = GLOB.huds[hud_type]
+ for (var/hud_trait in AI.silicon_huds)
+ var/datum/atom_hud/silicon_hud = GLOB.huds[GLOB.trait_to_hud[hud_trait]]
silicon_hud.unhide_single_atomhud_from(AI,target)
/datum/element/digitalcamo/proc/on_examine(datum/source, mob/M, list/examine_list)
diff --git a/code/datums/elements/drag_activation.dm b/code/datums/elements/drag_activation.dm
new file mode 100644
index 000000000000..12f44782f55d
--- /dev/null
+++ b/code/datums/elements/drag_activation.dm
@@ -0,0 +1,29 @@
+/**
+ * drag_to_activate element
+ *
+ * Allowing things to be activated by mouse dragging.
+ * Useful for objects which have a TGUI window on interaction.
+ */
+/datum/element/drag_to_activate
+
+/datum/element/drag_to_activate/Attach(datum/target)
+ if(!ismovable(target))
+ return ELEMENT_INCOMPATIBLE
+ RegisterSignal(target, COMSIG_MOUSEDROP_ONTO, PROC_REF(activate))
+ return ..()
+
+/datum/element/drag_to_activate/Detach(datum/source)
+ UnregisterSignal(source, COMSIG_MOUSEDROP_ONTO)
+ return ..()
+
+/datum/element/drag_to_activate/proc/activate(atom/movable/source, atom/over, mob/user)
+ SIGNAL_HANDLER
+
+ if(!user.can_perform_action(source, FORBID_TELEKINESIS_REACH))
+ return NONE
+
+ var/obj/item/item_source = source
+ if(!istype(over, /atom/movable/screen))
+ INVOKE_ASYNC(item_source, TYPE_PROC_REF(/obj/item, attack_self), user)
+ source.add_fingerprint(user)
+ return COMPONENT_CANCEL_MOUSEDROP_ONTO
diff --git a/code/datums/elements/drag_pickup.dm b/code/datums/elements/drag_pickup.dm
index 8eb73bbb4389..f93288303bd7 100644
--- a/code/datums/elements/drag_pickup.dm
+++ b/code/datums/elements/drag_pickup.dm
@@ -1,7 +1,8 @@
/**
- * drag_pickup element; for allowing things to be picked up by dragging.
+ * drag_pickup element
*
- * Used for paper bins.
+ * Allowing things to be picked up or unequipped by mouse-dragging.
+ * Useful for objects which have an interaction on click
*/
/datum/element/drag_pickup
@@ -15,20 +16,22 @@
UnregisterSignal(source, COMSIG_MOUSEDROP_ONTO)
return ..()
-/datum/element/drag_pickup/proc/pick_up(atom/source, atom/over, mob/user)
+/datum/element/drag_pickup/proc/pick_up(atom/movable/source, atom/over, mob/user)
SIGNAL_HANDLER
- var/mob/living/picker = user
- if(!istype(picker) || !user.can_perform_action(source, FORBID_TELEKINESIS_REACH))
- return
- var/obj/pickup_object = source
- if (pickup_object)
- if (pickup_object.anchored)
+ if(!user.can_perform_action(source, FORBID_TELEKINESIS_REACH))
+ return NONE
+ if(source.anchored)
+ return NONE
+ if(source.loc == user && isitem(source))
+ var/obj/item/item_source = source
+ if(!item_source.can_mob_unequip(user))
return COMPONENT_CANCEL_MOUSEDROP_ONTO
- if(over == picker)
- INVOKE_ASYNC(picker, TYPE_PROC_REF(/mob/, put_in_hands), source)
+ if(over == user)
+ INVOKE_ASYNC(user, TYPE_PROC_REF(/mob, put_in_hands), source)
else if(istype(over, /atom/movable/screen/inventory/hand))
- var/atom/movable/screen/inventory/hand/Selected_hand = over
- picker.putItemFromInventoryInHandIfPossible(source, Selected_hand.held_index)
+ var/atom/movable/screen/inventory/hand/selected_hand = over
+ user.putItemFromInventoryInHandIfPossible(source, selected_hand.held_index)
+ source.add_fingerprint(user)
return COMPONENT_CANCEL_MOUSEDROP_ONTO
diff --git a/code/datums/elements/dryable.dm b/code/datums/elements/dryable.dm
index 3d7842b30891..8a0f9964a7d7 100644
--- a/code/datums/elements/dryable.dm
+++ b/code/datums/elements/dryable.dm
@@ -21,8 +21,8 @@
var/atom/result = new dry_result
if(!atom_target.compare_materials(result))
var/warning = "custom_materials of [result.type] when dried compared to just spawned don't match"
- var/what_it_should_be = atom_target.get_materials_english_list()
- stack_trace("[warning]. custom_materials should be [what_it_should_be].")
+ var/what_it_should_be = atom_target.transcribe_materials_list()
+ stack_trace("[warning]. should be: custom_materials = [what_it_should_be].")
qdel(result)
diff --git a/code/datums/elements/earhealing.dm b/code/datums/elements/earhealing.dm
index ac69e8cc18ed..33e599eddbe9 100644
--- a/code/datums/elements/earhealing.dm
+++ b/code/datums/elements/earhealing.dm
@@ -27,8 +27,9 @@
for(var/i in user_by_item)
var/mob/living/carbon/user = user_by_item[i]
var/obj/item/organ/ears/ears = user.get_organ_slot(ORGAN_SLOT_EARS)
- if(!ears || !ears.damage || (ears.organ_flags & ORGAN_FAILING) || IS_ROBOTIC_ORGAN(ears))
+ if(!ears || (ears.organ_flags & ORGAN_FAILING) || IS_ROBOTIC_ORGAN(ears))
continue
- ears.deaf = max(ears.deaf - 0.25 * seconds_per_tick, (ears.damage < ears.maxHealth ? 0 : 1)) // Do not clear deafness if our ears are too damaged
+
+ ears.adjust_temporary_deafness(-0.5 SECONDS * seconds_per_tick)
ears.apply_organ_damage(-0.025 * seconds_per_tick)
CHECK_TICK
diff --git a/code/datums/elements/effect_trail.dm b/code/datums/elements/effect_trail.dm
index d1d2fbec44a6..58fddf51216c 100644
--- a/code/datums/elements/effect_trail.dm
+++ b/code/datums/elements/effect_trail.dm
@@ -16,13 +16,55 @@
src.chosen_effect = chosen_effect
/datum/element/effect_trail/Detach(datum/target)
- . = ..()
UnregisterSignal(target, COMSIG_MOVABLE_MOVED)
+ return ..()
/// Generates an effect
/datum/element/effect_trail/proc/generate_effect(atom/movable/target_object)
SIGNAL_HANDLER
var/turf/open/open_turf = get_turf(target_object)
- if(istype(open_turf))
- new chosen_effect(open_turf)
+ if(!istype(open_turf))
+ return
+ new chosen_effect(open_turf)
+
+/// If we are a cosmic heretic, this will return the appropriate effect trail based on our passive level. returns the default trail otherwise
+/proc/cosmic_trail_based_on_passive(mob/living/source)
+ if(isstargazer(source))
+ return /datum/element/effect_trail/cosmic_field/antiprojectile
+
+ var/datum/status_effect/heretic_passive/cosmic/cosmic_passive = source.has_status_effect(/datum/status_effect/heretic_passive/cosmic)
+ if(!cosmic_passive)
+ return /datum/element/effect_trail/cosmic_field
+ if(cosmic_passive.passive_level == 3)
+ return /datum/element/effect_trail/cosmic_field/antiprojectile
+ if(cosmic_passive.passive_level == 2)
+ return /datum/element/effect_trail/cosmic_field/antiexplosion
+ return /datum/element/effect_trail
+
+/datum/element/effect_trail/cosmic_field // Cosmic field subtype which applies any upgrades
+ var/prevents_explosions = FALSE
+ var/slows_projectiles = FALSE
+
+/datum/element/effect_trail/cosmic_field/Attach(datum/target, chosen_effect)
+ . = ..()
+ if(!ispath(chosen_effect, /obj/effect/forcefield/cosmic_field))
+ stack_trace("Tried to attach a cosmic_field effect trail with a non-cosmic field as the chosen effect")
+
+/datum/element/effect_trail/cosmic_field/generate_effect(atom/movable/target_object)
+ var/turf/open/open_turf = get_turf(target_object)
+ if(!istype(open_turf))
+ return
+ var/obj/effect/forcefield/cosmic_field/new_field = new chosen_effect(open_turf)
+
+ if(prevents_explosions)
+ new_field.prevents_explosions()
+ if(slows_projectiles)
+ new_field.slows_projectiles()
+
+/datum/element/effect_trail/cosmic_field/antiexplosion
+ prevents_explosions = TRUE
+
+/datum/element/effect_trail/cosmic_field/antiprojectile
+ prevents_explosions = TRUE
+ slows_projectiles = TRUE
diff --git a/code/datums/elements/elevation.dm b/code/datums/elements/elevation.dm
index 304d79ad1608..a0c3da5f3ab7 100644
--- a/code/datums/elements/elevation.dm
+++ b/code/datums/elements/elevation.dm
@@ -58,8 +58,8 @@
return
if(!HAS_TRAIT(location, TRAIT_TURF_HAS_ELEVATED_OBJ(pixel_shift)))
RegisterSignal(location, COMSIG_TURF_RESET_ELEVATION, PROC_REF(check_elevation))
+ reset_elevation(location) // This needs to go in the before COMSIG_TURF_CHANGE, or we can end up bouncing back into this and getting a runtime
RegisterSignal(location, COMSIG_TURF_CHANGE, PROC_REF(pre_change_turf))
- reset_elevation(location)
ADD_TRAIT(location, TRAIT_TURF_HAS_ELEVATED_OBJ(pixel_shift), ref(source))
/datum/element/elevation/proc/unregister_turf(atom/movable/source, atom/location)
diff --git a/code/datums/elements/empprotection.dm b/code/datums/elements/empprotection.dm
index 93a48ea5d17a..55db13d2809b 100644
--- a/code/datums/elements/empprotection.dm
+++ b/code/datums/elements/empprotection.dm
@@ -18,10 +18,26 @@
/datum/element/empprotection/proc/getEmpFlags(datum/source, severity)
SIGNAL_HANDLER
- return flags
+ return (flags & EMP_PROTECT_ALL)
/datum/element/empprotection/proc/get_examine_tags(atom/source, mob/user, list/examine_list)
SIGNAL_HANDLER
- if(flags)
- examine_list["EMP-proof"] = "It is shielded against electromagnetic pulses."
+ if(flags & EMP_NO_EXAMINE)
+ return
+
+ if((flags & EMP_PROTECT_ALL) == EMP_PROTECT_ALL)
+ examine_list["EMP proof"] = "[source.p_They()] [source.p_are()] unaffected by electromagnetic pulses, and shields [source.p_their()] contents and wiring from them."
+ return
+
+ if(flags & EMP_PROTECT_SELF)
+ examine_list["EMP resilient"] = "[source.p_They()] [source.p_are()] unaffected by electromagnetic pulses."
+
+ if((flags & (EMP_PROTECT_CONTENTS|EMP_PROTECT_WIRES)) == (EMP_PROTECT_CONTENTS|EMP_PROTECT_WIRES))
+ examine_list["partially EMP blocking"] = "[source.p_They()] protects [source.p_their()] wiring and contents from electromagnetic pulses."
+
+ else if(flags & EMP_PROTECT_CONTENTS)
+ examine_list["partially EMP blocking"] = "[source.p_They()] protects [source.p_their()] contents from electromagnetic pulses."
+
+ else if(flags & EMP_PROTECT_WIRES)
+ examine_list["partially EMP blocking"] = "[source.p_They()] protects [source.p_their()] wiring from electromagnetic pulses."
diff --git a/code/datums/elements/examine_lore.dm b/code/datums/elements/examine_lore.dm
new file mode 100644
index 000000000000..1ed3f998bb23
--- /dev/null
+++ b/code/datums/elements/examine_lore.dm
@@ -0,0 +1,39 @@
+/// A simple element for adding additional lore to things. Examine more? More like examine *lore*.
+/// Yes, the name's a pun, I'm sorry, I thought it was funny at the moment.
+/datum/element/examine_lore
+ element_flags = ELEMENT_BESPOKE
+ argument_hash_start_idx = 2
+ /// The message we add to items to denote that we have cool lore to read.
+ var/lore_hint
+ /// Our lore. In order to match descriptions on items, this should be considered to be pre-italicized.
+ var/lore
+
+/datum/element/examine_lore/Attach(datum/target, lore_hint, lore)
+ . = ..()
+
+ src.lore_hint = lore_hint || span_notice("You can [EXAMINE_HINT("look closer")] to learn a little more about [target].")
+ src.lore = lore
+
+ if(!lore)
+ stack_trace("[type] initialized without lore! Double-check element addition?")
+ return ELEMENT_INCOMPATIBLE
+
+ RegisterSignal(target, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine))
+ RegisterSignal(target, COMSIG_ATOM_EXAMINE_MORE, PROC_REF(on_examine_more))
+
+
+/datum/element/examine_lore/Detach(datum/source, ...)
+ . = ..()
+
+ UnregisterSignal(source, list(
+ COMSIG_ATOM_EXAMINE,
+ COMSIG_ATOM_EXAMINE_MORE,
+ ))
+
+/datum/element/examine_lore/proc/on_examine(datum/source, mob/user, list/examine_list)
+ SIGNAL_HANDLER
+ examine_list += lore_hint
+
+/datum/element/examine_lore/proc/on_examine_more(datum/source, mob/user, list/examine_list)
+ SIGNAL_HANDLER
+ examine_list += "[lore]"
diff --git a/code/datums/elements/food/microwavable.dm b/code/datums/elements/food/microwavable.dm
index e7efeae4501c..a9f5388cba1c 100644
--- a/code/datums/elements/food/microwavable.dm
+++ b/code/datums/elements/food/microwavable.dm
@@ -31,8 +31,8 @@
var/atom/result = new result_typepath
if(!target.compare_materials(result))
var/warning = "custom_materials of [result.type] when microwaved compared to just spawned don't match"
- var/what_it_should_be = target.get_materials_english_list()
- stack_trace("[warning]. custom_materials should be [what_it_should_be].")
+ var/what_it_should_be = target.transcribe_materials_list()
+ stack_trace("[warning]. should be: custom_materials = [what_it_should_be].")
qdel(result)
/datum/element/microwavable/Detach(datum/source)
diff --git a/code/datums/elements/food/processable.dm b/code/datums/elements/food/processable.dm
index 59c8c0462635..b3a1e2c54e27 100644
--- a/code/datums/elements/food/processable.dm
+++ b/code/datums/elements/food/processable.dm
@@ -14,8 +14,10 @@
var/table_required
///Verb used in processing food (such as slice, flatten), defaults to process
var/screentip_verb
+ ///Sound to play when the do_after begins
+ var/sound_to_play
-/datum/element/processable/Attach(datum/target, tool_behaviour, result_atom_type, amount_created = 3, time_to_process = 2 SECONDS, table_required = FALSE, screentip_verb = "Process")
+/datum/element/processable/Attach(datum/target, tool_behaviour, result_atom_type, amount_created = 3, time_to_process = 2 SECONDS, table_required = FALSE, screentip_verb = "Process", sound_to_play = null)
. = ..()
if(!isatom(target))
return ELEMENT_INCOMPATIBLE
@@ -26,6 +28,7 @@
src.result_atom_type = result_atom_type
src.table_required = table_required
src.screentip_verb = screentip_verb
+ src.sound_to_play = sound_to_play
var/atom/atom_target = target
atom_target.flags_1 |= HAS_CONTEXTUAL_SCREENTIPS_1
@@ -42,11 +45,11 @@
var/atom/movable/result = new result_atom_type
if(!prototype.compare_materials(result))
var/warning = "custom_materials of [result.type] when processed compared to just spawned don't match"
- var/what_it_should_be = prototype.get_materials_english_list()
+ var/what_it_should_be = prototype.transcribe_materials_list()
//compose a text string containing the syntax and paths to use for editing the custom_materials var
if(result.custom_materials)
what_it_should_be += " (you can round values a bit)"
- stack_trace("[warning]. custom_materials should be [what_it_should_be] (you can round values a bit).")
+ stack_trace("[warning]. should be: custom_materials = [what_it_should_be] (you can round values a bit).")
qdel(prototype)
qdel(result)
@@ -67,7 +70,7 @@
to_chat(user, span_notice("You cannot make [initial(result_atom_type.name)] here! You need a table or at least a tray."))
return
- mutable_recipes += list(list(TOOL_PROCESSING_RESULT = result_atom_type, TOOL_PROCESSING_AMOUNT = amount_created, TOOL_PROCESSING_TIME = time_to_process))
+ mutable_recipes += list(list(TOOL_PROCESSING_RESULT = result_atom_type, TOOL_PROCESSING_AMOUNT = amount_created, TOOL_PROCESSING_TIME = time_to_process, TOOL_PROCESSING_SOUND = sound_to_play))
///So people know what the frick they're doing without reading from a wiki page (I mean they will inevitably but i'm trying to help, ok?)
/datum/element/processable/proc/OnExamine(atom/source, mob/user, list/examine_list)
diff --git a/code/datums/elements/force_move_pulled.dm b/code/datums/elements/force_move_pulled.dm
new file mode 100644
index 000000000000..165da8240e8f
--- /dev/null
+++ b/code/datums/elements/force_move_pulled.dm
@@ -0,0 +1,20 @@
+/// Click dragging (thing) will force move (thing). A good use-case example for this would be clicking on a tile with a blood decal.
+/datum/element/force_move_pulled
+
+/datum/element/force_move_pulled/Attach(datum/target)
+ if(!isatom(target))
+ return ELEMENT_INCOMPATIBLE
+ . = ..()
+ RegisterSignal(target, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_click), override = TRUE)
+
+/datum/element/force_move_pulled/Detach(datum/target)
+ . = ..()
+ UnregisterSignal(target, COMSIG_ATOM_ATTACK_HAND)
+
+/datum/element/force_move_pulled/proc/on_click(atom/moving_atom, mob/user, list/modifiers)
+ SIGNAL_HANDLER
+ if(isnull(user.pulling))
+ return NONE
+
+ user.Move_Pulled(moving_atom)
+ return COMPONENT_CANCEL_ATTACK_CHAIN
diff --git a/code/datums/elements/haunted.dm b/code/datums/elements/haunted.dm
index 04f985c0d891..72048122c63d 100644
--- a/code/datums/elements/haunted.dm
+++ b/code/datums/elements/haunted.dm
@@ -24,12 +24,12 @@
REMOVE_TRAIT(master, TRAIT_MOVE_FLYING, ELEMENT_TRAIT(type))
master.RemoveElement(/datum/element/movetype_handler)
-/atom/movable/proc/make_haunted(source, color) //if not haunted, make haunted
+/obj/item/proc/make_haunted(source, color) //if not haunted, make haunted
if(!HAS_TRAIT(src, TRAIT_HAUNTED))
AddElement(/datum/element/haunted, color)
ADD_TRAIT(src, TRAIT_HAUNTED, source)
-/atom/movable/proc/remove_haunted(source) //if haunted, make not haunted
+/obj/item/proc/remove_haunted(source) //if haunted, make not haunted
REMOVE_TRAIT(src, TRAIT_HAUNTED, source)
if(!HAS_TRAIT(src, TRAIT_HAUNTED))
RemoveElement(/datum/element/haunted)
diff --git a/code/datums/elements/immerse.dm b/code/datums/elements/immerse.dm
index 3e28bbb7ea7a..b23623d51b0d 100644
--- a/code/datums/elements/immerse.dm
+++ b/code/datums/elements/immerse.dm
@@ -198,6 +198,8 @@ GLOBAL_LIST_INIT(immerse_ignored_movable, typecacheof(list(
/// Generate a mask filter mutable to use as render_source for the alpha filter based on provided width, height and immersion state
/datum/element/immerse/proc/generate_immerse_mask(width, height, is_below_water)
+ if (!width || !height)
+ return
var/clean_height = height
width = ceil(width / ICON_SIZE_X) * ICON_SIZE_X
height = ceil(height / ICON_SIZE_Y) * ICON_SIZE_Y
@@ -245,6 +247,8 @@ GLOBAL_LIST_INIT(immerse_ignored_movable, typecacheof(list(
var/is_below_water = (movable.layer < layer_to_check) ? "underwater-" : ""
// Tall mobs still only get covered to their feet, unless they're offset down
var/mutable_appearance/immerse_mask = generate_immerse_mask(movable.get_cached_width(), max(ICON_SIZE_Y - movable.pixel_z, ICON_SIZE_Y), is_below_water)
+ if (!immerse_mask)
+ return
var/atom/movable/immerse_mask/effect_relay = generated_visual_overlays[movable]
if (!effect_relay)
effect_relay = new(movable)
@@ -269,10 +273,12 @@ GLOBAL_LIST_INIT(immerse_ignored_movable, typecacheof(list(
/// A band-aid to keep the (unique) visual overlay from scaling and rotating along with its owner. I'm sorry.
/datum/element/immerse/proc/on_update_transform(mob/living/source, resize, new_lying_angle, is_opposite_angle)
SIGNAL_HANDLER
+ var/atom/movable/immerse_mask/effect_relay = generated_visual_overlays[source]
+ if (!effect_relay)
+ return
var/matrix/new_transform = matrix()
new_transform.Scale(1 / source.current_size)
new_transform.Turn(-new_lying_angle)
- var/atom/movable/immerse_mask/effect_relay = generated_visual_overlays[source]
var/mutable_appearance/relay_appearance = new(effect_relay.appearance)
relay_appearance.transform = new_transform
effect_relay.appearance = relay_appearance
@@ -281,10 +287,13 @@ GLOBAL_LIST_INIT(immerse_ignored_movable, typecacheof(list(
/datum/element/immerse/proc/on_spin_animation(atom/source, speed, loops, segments, segment)
SIGNAL_HANDLER
var/atom/movable/immerse_mask/immerse_mask = generated_visual_overlays[source]
- immerse_mask.do_spin_animation(speed, loops, segments, -segment)
+ if (immerse_mask)
+ immerse_mask.do_spin_animation(speed, loops, segments, -segment)
/datum/element/immerse/proc/on_update_offsets(mob/living/source, new_x, new_y, new_w, new_z, animate)
SIGNAL_HANDLER
+ if (!generated_visual_overlays[source])
+ return
var/old_height = ceil(max(ICON_SIZE_Y - source.pixel_z, ICON_SIZE_Y) / ICON_SIZE_Y)
var/new_height = ceil(max(ICON_SIZE_Y - new_z, ICON_SIZE_Y) / ICON_SIZE_Y)
if (old_height != new_height)
diff --git a/code/datums/elements/leeching_walk.dm b/code/datums/elements/leeching_walk.dm
index f5148b43a5a5..2ad01fc12d90 100644
--- a/code/datums/elements/leeching_walk.dm
+++ b/code/datums/elements/leeching_walk.dm
@@ -1,5 +1,6 @@
/// Buffs and heals the target while standing on rust.
/datum/element/leeching_walk
+ var/healing_multiplier = 1.0 // How much healing to do
/datum/element/leeching_walk/Attach(datum/target)
. = ..()
@@ -43,17 +44,24 @@
// Heals all damage + Stamina
var/need_mob_update = FALSE
var/delta_time = DELTA_WORLD_TIME(SSmobs) * 0.5 // SSmobs.wait is 2 secs, so this should be halved.
- need_mob_update += source.adjustBruteLoss(-3 * delta_time, updating_health = FALSE)
- need_mob_update += source.adjustFireLoss(-3 * delta_time, updating_health = FALSE)
- need_mob_update += source.adjustToxLoss(-3 * delta_time, updating_health = FALSE, forced = TRUE) // Slimes are people too
- need_mob_update += source.adjustOxyLoss(-1.5 * delta_time, updating_health = FALSE)
- need_mob_update += source.adjustStaminaLoss(-10 * delta_time, updating_stamina = FALSE)
+ need_mob_update += source.adjust_brute_loss(-3 * delta_time * healing_multiplier, updating_health = FALSE)
+ need_mob_update += source.adjust_fire_loss(-3 * delta_time * healing_multiplier, updating_health = FALSE)
+ need_mob_update += source.adjust_tox_loss(-3 * delta_time * healing_multiplier, updating_health = FALSE, forced = TRUE) // Slimes are people too
+ need_mob_update += source.adjust_oxy_loss(-1.5 * delta_time * healing_multiplier, updating_health = FALSE)
+ need_mob_update += source.adjust_stamina_loss(-10 * delta_time * healing_multiplier, updating_stamina = FALSE)
if(need_mob_update)
source.updatehealth()
+ new /obj/effect/temp_visual/heal(get_turf(source), COLOR_BROWN)
// Reduces duration of stuns/etc
source.AdjustAllImmobility((-0.5 SECONDS) * delta_time)
// Heals blood loss
- if(source.blood_volume < BLOOD_VOLUME_NORMAL)
- source.blood_volume += 2.5 * delta_time
+ source.adjust_blood_volume(2.5 * delta_time, maximum = BLOOD_VOLUME_NORMAL)
// Slowly regulates your body temp
source.adjust_bodytemperature((source.get_body_temp_normal() - source.bodytemperature) / 5)
+
+/datum/element/leeching_walk/minor
+ healing_multiplier = 0.5
+
+// Minor variant which heals slightly less and no baton resistance
+/datum/element/leeching_walk/minor/on_move(mob/source, atom/old_loc, dir, forced, list/old_locs)
+ return
diff --git a/code/datums/elements/light_eater.dm b/code/datums/elements/light_eater.dm
index c13712cbce8f..6338b7ca2c4e 100644
--- a/code/datums/elements/light_eater.dm
+++ b/code/datums/elements/light_eater.dm
@@ -128,6 +128,12 @@
/datum/element/light_eater/proc/on_interacting_with(obj/item/source, mob/living/user, atom/target)
SIGNAL_HANDLER
if(eat_lights(target, source))
+ if (ismob(target))
+ var/mob/hit_user = target
+ if (hit_user.pulling)
+ var/atom/pulled_thing = hit_user.pulling // potentially dragging a light
+ if (!isliving(pulled_thing)) // we don't want conga lines to be affected
+ eat_lights(pulled_thing, source)
// do a "pretend" attack if we're hitting something that can't normally be
if(isobj(target))
var/obj/smacking = target
diff --git a/code/datums/elements/noticable_organ.dm b/code/datums/elements/noticable_organ.dm
index a6247d18bb53..7feac28d8d79 100644
--- a/code/datums/elements/noticable_organ.dm
+++ b/code/datums/elements/noticable_organ.dm
@@ -34,9 +34,7 @@
/// Proc that returns true or false if the organ should show its examine check.
/datum/element/noticable_organ/proc/should_show_text(mob/living/carbon/examined)
- if(body_zone && (body_zone in examined.get_covered_body_zones()))
- return FALSE
- return TRUE
+ return examined.is_location_accessible(body_zone)
/datum/element/noticable_organ/proc/enable_description(obj/item/organ/target, mob/living/carbon/receiver)
SIGNAL_HANDLER
diff --git a/code/datums/elements/nullrod_core.dm b/code/datums/elements/nullrod_core.dm
new file mode 100644
index 000000000000..020874777d5f
--- /dev/null
+++ b/code/datums/elements/nullrod_core.dm
@@ -0,0 +1,38 @@
+///Proxy element that attaches components, elements and traits that are common to more or less all nullrods.
+/datum/element/nullrod_core
+
+/**
+ * Called when the element is added to a datum. If the 'chaplain_spawnable' arg is TRUE and unit testing is enabled,
+ * we check that the target is actually in the nullrod_variants global list
+ */
+/datum/element/nullrod_core/Attach(obj/item/target, chaplain_spawnable = TRUE, rune_remove_line = "BEGONE FOUL MAGIKS!!")
+ . = ..()
+ if(!istype(target))
+ return ELEMENT_INCOMPATIBLE
+
+ target.AddComponent(/datum/component/anti_magic, MAGIC_RESISTANCE|MAGIC_RESISTANCE_HOLY)
+ target.AddComponent(/datum/component/effect_remover, \
+ success_feedback = "You disrupt the magic of %THEEFFECT with %THEWEAPON.", \
+ success_forcesay = rune_remove_line, \
+ tip_text = "Clear rune", \
+ on_clear_callback = CALLBACK(src, PROC_REF(on_cult_rune_removed), target), \
+ effects_we_clear = list(/obj/effect/rune, /obj/effect/heretic_rune, /obj/effect/cosmic_rune), \
+ )
+ target.AddElement(/datum/element/bane, mob_biotypes = MOB_SPIRIT, damage_multiplier = 0, added_damage = 25, requires_combat_mode = FALSE)
+ ADD_TRAIT(target, TRAIT_NULLROD_ITEM, ELEMENT_TRAIT(type))
+
+ if(!PERFORM_ALL_TESTS(focus_only/nullrod_variants) || !chaplain_spawnable)
+ return
+
+ if(!GLOB.nullrod_variants[target.type])
+ stack_trace("[target.type] is absent from the nullrod_variants global list. Please include it.")
+
+/// Callback for effect remover, invoked when a cult rune is cleared
+/datum/element/nullrod_core/proc/on_cult_rune_removed(obj/item/nullrod, obj/effect/target, mob/living/user)
+ if(!istype(target, /obj/effect/rune))
+ return
+
+ var/obj/effect/rune/target_rune = target
+ if(target_rune.log_when_erased)
+ user.log_message("erased [target_rune.cultist_name] rune using [nullrod]", LOG_GAME)
+ SSshuttle.shuttle_purchase_requirements_met[SHUTTLE_UNLOCK_NARNAR] = TRUE
diff --git a/code/datums/elements/openspace_item_click_handler.dm b/code/datums/elements/openspace_item_click_handler.dm
index 9059223fb0c3..b43ec92a2bc4 100644
--- a/code/datums/elements/openspace_item_click_handler.dm
+++ b/code/datums/elements/openspace_item_click_handler.dm
@@ -20,7 +20,7 @@
if((target.z == 0) || (user.z == 0) || target.z == user.z)
return NONE
var/turf/target_turf = parse_caught_click_modifiers(modifiers, get_turf(user.client?.eye || user), user.client)
- if(target_turf?.z == user.z && user.CanReach(target_turf, source))
+ if(target_turf?.z == user.z && target_turf.IsReachableBy(user, source?.reach))
INVOKE_ASYNC(source, TYPE_PROC_REF(/obj/item, handle_openspace_click), target_turf, user, modifiers)
return ITEM_INTERACT_BLOCKING
return NONE
diff --git a/code/datums/elements/organ_set_bonus.dm b/code/datums/elements/organ_set_bonus.dm
index fa6b272897a0..07d7e2474d22 100644
--- a/code/datums/elements/organ_set_bonus.dm
+++ b/code/datums/elements/organ_set_bonus.dm
@@ -106,6 +106,8 @@
RegisterSignal(carbon_owner, COMSIG_CARBON_REMOVE_LIMB, PROC_REF(untexture_limb))
for(var/obj/item/bodypart/limb as anything in carbon_owner.bodyparts)
+ if (!(limb.bodytype & BODYTYPE_ORGANIC))
+ continue
limb.add_bodypart_overlay(new limb_overlay(), update = FALSE)
if (color_overlay_priority)
limb.add_color_override(COLOR_WHITE, color_overlay_priority)
@@ -150,6 +152,9 @@
/datum/status_effect/organ_set_bonus/proc/texture_limb(atom/source, obj/item/bodypart/limb)
SIGNAL_HANDLER
+ if (!(limb.bodytype & BODYTYPE_ORGANIC))
+ return
+
// Not updating because enable/disable_bonus(obj/item/organ/removed_organ) call it down the line, and calls coming from comsigs update the owner's body themselves
limb.add_bodypart_overlay(new limb_overlay(), update = FALSE)
if(color_overlay_priority)
diff --git a/code/datums/elements/raptor_food.dm b/code/datums/elements/raptor_food.dm
new file mode 100644
index 000000000000..514509eaaba2
--- /dev/null
+++ b/code/datums/elements/raptor_food.dm
@@ -0,0 +1,87 @@
+/// Element which influences raptor children upon owner's consumption as food
+/datum/element/raptor_food
+ element_flags = ELEMENT_BESPOKE
+ argument_hash_start_idx = 2
+ /// Flat damage modifier
+ var/attack_modifier = null
+ /// Flat health modifier
+ var/health_modifier = null
+ /// Speed modifier
+ var/speed_modifier = null
+ /// Primary ability stat modifier
+ /// Multiplier equates to 1 + this
+ var/ability_modifier = null
+ /// Growth rate modifier
+ /// Multiplier equates to 1 + this
+ var/growth_modifier = null
+ /// Personality traits the child may get
+ var/list/personality_traits = null
+ /// Offspring color probability modifiers
+ var/list/color_chances = null
+
+/datum/element/raptor_food/Attach(obj/item/target, attack_modifier, health_modifier, speed_modifier, ability_modifier, growth_modifier, list/personality_traits, list/color_chances)
+ . = ..()
+ if (!isitem(target))
+ return ELEMENT_INCOMPATIBLE
+ src.attack_modifier = attack_modifier
+ src.health_modifier = health_modifier
+ src.speed_modifier = speed_modifier
+ src.ability_modifier = ability_modifier
+ src.growth_modifier = growth_modifier
+ src.personality_traits = personality_traits
+ src.color_chances = color_chances
+ RegisterSignal(target, COMSIG_ITEM_EATEN_BY_BASIC_MOB, PROC_REF(on_eaten))
+ RegisterSignal(target, COMSIG_ATOM_EXAMINE_MORE, PROC_REF(on_examine_more))
+
+/datum/element/raptor_food/Detach(datum/source, ...)
+ UnregisterSignal(source, list(COMSIG_ITEM_EATEN_BY_BASIC_MOB, COMSIG_ATOM_EXAMINE_MORE))
+ return ..()
+
+/datum/element/raptor_food/proc/on_examine_more(obj/item/source, mob/examiner, list/examine_list)
+ SIGNAL_HANDLER
+
+ if (!istype(examiner.buckled, /mob/living/basic/raptor))
+ return
+
+ // Just to check for priority
+ var/strognest_effect = max(attack_modifier, health_modifier, speed_modifier, ability_modifier, growth_modifier, 0)
+
+ // Only personality or color probability effects, or just pure negatives
+ if (strognest_effect == 0)
+ examine_list += span_notice("You reckon this would have unique effects on your raptor's offspring if you fed it to them...")
+ return
+
+ if (strognest_effect == attack_modifier)
+ examine_list += span_notice("You reckon this would have make your raptor's offspring stronger if you fed it to them...")
+ else if (strognest_effect == health_modifier)
+ examine_list += span_notice("You reckon this would have make your raptor's offspring tougher if you fed it to them...")
+ else if (strognest_effect == speed_modifier)
+ examine_list += span_notice("You reckon this would have make your raptor's offspring faster if you fed it to them...")
+ else if (strognest_effect == ability_modifier)
+ examine_list += span_notice("You reckon this would have make your raptor's offspring more capable if you fed it to them...")
+ else if (strognest_effect == growth_modifier)
+ examine_list += span_notice("You reckon this would have make your raptor's offspring grow faster if you fed it to them...")
+
+/datum/element/raptor_food/proc/on_eaten(obj/item/source, mob/living/eater, mob/living/feeder)
+ SIGNAL_HANDLER
+
+ if (!istype(eater, /mob/living/basic/raptor))
+ return
+
+ var/mob/living/basic/raptor/raptor = eater
+ var/list/our_food = raptor.inherited_stats.foods_eaten[source.type]
+ if (our_food)
+ our_food["amount"] += 1
+ return
+
+ raptor.inherited_stats.foods_eaten[source.type] = list(
+ "amount" = 1,
+ "attack" = attack_modifier,
+ "health" = health_modifier,
+ "speed" = speed_modifier,
+ "ability" = ability_modifier,
+ "growth" = growth_modifier,
+ "traits" = personality_traits?.Copy(),
+ "color_chances" = color_chances?.Copy(),
+ )
+
diff --git a/code/datums/elements/reagent_scoopable_atom.dm b/code/datums/elements/reagent_scoopable_atom.dm
new file mode 100644
index 000000000000..dddd7f79e4e4
--- /dev/null
+++ b/code/datums/elements/reagent_scoopable_atom.dm
@@ -0,0 +1,37 @@
+/datum/element/reagent_scoopable_atom
+ element_flags = ELEMENT_BESPOKE|ELEMENT_DETACH_ON_HOST_DESTROY
+ argument_hash_start_idx = 2
+ var/datum/reagent/reagent_to_extract
+
+/datum/element/reagent_scoopable_atom/Attach(datum/target, reagent_to_extract)
+ . = ..()
+ if(!isatom(target))
+ return ELEMENT_INCOMPATIBLE
+ if(!reagent_to_extract)
+ CRASH("[type] added to [target] without any reagent specified.")
+ src.reagent_to_extract = reagent_to_extract
+ RegisterSignal(target, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine))
+ RegisterSignal(target, COMSIG_ATOM_ITEM_INTERACTION, PROC_REF(on_item_interaction))
+
+/datum/element/reagent_scoopable_atom/Detach(datum/source, ...)
+ UnregisterSignal(source, list(COMSIG_ATOM_EXAMINE, COMSIG_ATOM_ITEM_INTERACTION))
+ return ..()
+
+/datum/element/reagent_scoopable_atom/proc/on_examine(atom/source, mob/user, list/examine_list)
+ SIGNAL_HANDLER
+
+ examine_list += span_info("Some [reagent_to_extract::name] could probably be scooped up with a container.")
+
+/datum/element/reagent_scoopable_atom/proc/on_item_interaction(atom/source, mob/living/user, obj/item/tool, list/modifiers)
+ SIGNAL_HANDLER
+
+ if(tool.is_open_container())
+ return extract_reagents(source, tool, user)
+
+/datum/element/reagent_scoopable_atom/proc/extract_reagents(atom/source, obj/item/container, mob/living/user)
+ if(!reagent_to_extract)
+ return ITEM_INTERACT_BLOCKING
+ if(!container.reagents.add_reagent(reagent_to_extract, rand(5, 10)))
+ to_chat(user, span_warning("[container] is full."))
+ user.visible_message(span_notice("[user] scoops [reagent_to_extract::name] from the [source] with [container]."), span_notice("You scoop out [reagent_to_extract::name] from the [src] using [container]."))
+ return ITEM_INTERACT_SUCCESS
diff --git a/code/datums/elements/relay_attackers.dm b/code/datums/elements/relay_attackers.dm
index 5d16fbb4e1bb..5dfef67a1191 100644
--- a/code/datums/elements/relay_attackers.dm
+++ b/code/datums/elements/relay_attackers.dm
@@ -16,6 +16,7 @@
RegisterSignal(target, COMSIG_ATOM_PREHITBY, PROC_REF(on_hitby))
RegisterSignal(target, COMSIG_ATOM_HULK_ATTACK, PROC_REF(on_attack_hulk))
RegisterSignal(target, COMSIG_ATOM_ATTACK_MECH, PROC_REF(on_attack_mech))
+ RegisterSignal(target, COMSIG_POWER_ACTIVATE_ON, PROC_REF(on_power_use)) // DARKPACK EDIT ADD
ADD_TRAIT(target, TRAIT_RELAYING_ATTACKER, REF(src))
/datum/element/relay_attackers/Detach(datum/source, ...)
@@ -31,6 +32,7 @@
COMSIG_ATOM_PREHITBY,
COMSIG_ATOM_HULK_ATTACK,
COMSIG_ATOM_ATTACK_MECH,
+ COMSIG_POWER_ACTIVATE_ON, // DARKPACK EDIT ADD
))
REMOVE_TRAIT(source, TRAIT_RELAYING_ATTACKER, REF(src))
@@ -74,8 +76,8 @@
var/obj/item/hit_item = hit_atom
if(!hit_item.throwforce)
return
- var/mob/thrown_by = throwingdatum?.get_thrower()
- if(!ismob(thrown_by))
+ var/atom/thrown_by = throwingdatum?.get_thrower()
+ if(!istype(thrown_by))
return
relay_attacker(target, thrown_by, hit_item.damtype == STAMINA ? ATTACKER_STAMINA_ATTACK : ATTACKER_DAMAGING_ATTACK)
@@ -87,6 +89,14 @@
SIGNAL_HANDLER
relay_attacker(target, mecha_attacker, ATTACKER_DAMAGING_ATTACK)
+// DARKPACK EDIT ADD START
+/datum/element/relay_attackers/proc/on_power_use(atom/target, datum/discipline_power/used_power, hostile_usage)
+ SIGNAL_HANDLER
+
+ if(hostile_usage)
+ relay_attacker(target, used_power.discipline.owner, ATTACKER_DAMAGING_ATTACK)
+// DARKPACK EDIT ADD END
+
/// Send out a signal identifying whoever just attacked us (usually a mob but sometimes a mech or turret)
/datum/element/relay_attackers/proc/relay_attacker(atom/victim, atom/attacker, attack_flags)
SEND_SIGNAL(victim, COMSIG_ATOM_WAS_ATTACKED, attacker, attack_flags)
diff --git a/code/datums/elements/rotation.dm b/code/datums/elements/rotation.dm
new file mode 100644
index 000000000000..6d4441659458
--- /dev/null
+++ b/code/datums/elements/rotation.dm
@@ -0,0 +1,136 @@
+/datum/element/simple_rotation
+ element_flags = ELEMENT_BESPOKE
+ argument_hash_start_idx = 2
+ /// Rotation flags for special behavior
+ var/rotation_flags
+
+/**
+ * Adds the ability to rotate an object by Alt-click or using Right-click verbs.
+ *
+ * args:
+ * * rotation_flags (optional) Bitflags that determine behavior for rotation (defined at the top of this file)
+ * * post_rotation (optional) Callback proc that is used after the object is rotated (sound effects, balloon alerts, etc.)
+ **/
+/datum/element/simple_rotation/Attach(datum/target, rotation_flags = NONE)
+ . = ..()
+ if(!ismovable(target))
+ return ELEMENT_INCOMPATIBLE
+
+ var/atom/movable/source = target
+ source.flags_1 |= HAS_CONTEXTUAL_SCREENTIPS_1
+
+ src.rotation_flags = rotation_flags
+
+ RegisterSignal(target, COMSIG_CLICK_ALT, PROC_REF(rotate_left))
+ RegisterSignal(target, COMSIG_CLICK_ALT_SECONDARY, PROC_REF(rotate_right))
+ RegisterSignal(target, COMSIG_ATOM_EXAMINE, PROC_REF(ExamineMessage))
+ RegisterSignal(target, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(on_requesting_context_from_item))
+
+/datum/element/simple_rotation/Detach(datum/source, ...)
+ . = ..()
+ UnregisterSignal(source, list(
+ COMSIG_CLICK_ALT,
+ COMSIG_CLICK_ALT_SECONDARY,
+ COMSIG_ATOM_EXAMINE,
+ COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM,
+ ))
+ return ..()
+
+/datum/element/simple_rotation/proc/ExamineMessage(datum/source, mob/user, list/examine_list)
+ SIGNAL_HANDLER
+ if(rotation_flags & ROTATION_REQUIRE_WRENCH)
+ examine_list += span_notice("This requires a wrench to be rotated.")
+
+/datum/element/simple_rotation/proc/rotate_right(datum/source, mob/user)
+ SIGNAL_HANDLER
+ rotate(user, source, ROTATION_CLOCKWISE)
+ return CLICK_ACTION_SUCCESS
+
+/datum/element/simple_rotation/proc/rotate_left(datum/source, mob/user)
+ SIGNAL_HANDLER
+ rotate(user, source, ROTATION_COUNTERCLOCKWISE)
+ return CLICK_ACTION_SUCCESS
+
+/datum/element/simple_rotation/proc/rotate(mob/user, obj/object_to_rotate, degrees)
+ if(QDELETED(user))
+ CRASH("[src] is being rotated [user ? "with a qdeleting" : "without a"] user")
+ if(!istype(user))
+ CRASH("[src] is being rotated without a user of the wrong type: [user.type]")
+ if(!isnum(degrees))
+ CRASH("[src] is being rotated without providing the amount of degrees needed")
+
+ if(!can_be_rotated(user, object_to_rotate, degrees) || !can_user_rotate(user, object_to_rotate, degrees))
+ return
+
+ object_to_rotate.setDir(turn(object_to_rotate.dir, degrees))
+ if(rotation_flags & ROTATION_REQUIRE_WRENCH)
+ playsound(object_to_rotate, 'sound/items/tools/ratchet.ogg', 50, TRUE)
+
+ object_to_rotate.post_rotation(user, degrees)
+
+/datum/element/simple_rotation/proc/can_user_rotate(mob/user, obj/object_to_rotate, degrees)
+ if(isliving(user) && user.can_perform_action(object_to_rotate, NEED_DEXTERITY))
+ return TRUE
+ if((rotation_flags & ROTATION_GHOSTS_ALLOWED) && isobserver(user) && CONFIG_GET(flag/ghost_interaction))
+ return TRUE
+ return FALSE
+
+/datum/element/simple_rotation/proc/can_be_rotated(mob/user, obj/object_to_rotate, degrees, silent = FALSE)
+ if(!object_to_rotate.Adjacent(user))
+ silent = TRUE
+
+ if(rotation_flags & ROTATION_REQUIRE_WRENCH)
+ if(!isliving(user))
+ return FALSE
+ var/obj/item/tool = user.get_active_held_item()
+ if(!tool || tool.tool_behaviour != TOOL_WRENCH)
+ if(!silent)
+ object_to_rotate.balloon_alert(user, "need a wrench!")
+ return FALSE
+
+ if(!(rotation_flags & ROTATION_IGNORE_ANCHORED) && object_to_rotate.anchored)
+ if(istype(object_to_rotate, /obj/structure/window) && !silent)
+ object_to_rotate.balloon_alert(user, "need to unscrew!")
+ else if(!silent)
+ object_to_rotate.balloon_alert(user, "need to unwrench!")
+ return FALSE
+
+ if(rotation_flags & ROTATION_NEEDS_ROOM)
+ var/target_dir = turn(object_to_rotate.dir, degrees)
+ var/obj/structure/window/window_to_rotate = object_to_rotate
+ var/fulltile = istype(window_to_rotate) ? window_to_rotate.fulltile : FALSE
+ if(!valid_build_direction(object_to_rotate.loc, target_dir, is_fulltile = fulltile))
+ if(!silent)
+ object_to_rotate.balloon_alert(user, "can't rotate in that direction!")
+ return FALSE
+
+ if(rotation_flags & ROTATION_NEEDS_UNBLOCKED)
+ var/turf/rotate_turf = get_turf(object_to_rotate)
+ if(rotate_turf.is_blocked_turf(source_atom = object_to_rotate))
+ if(!silent)
+ object_to_rotate.balloon_alert(user, "rotation is blocked!")
+ return FALSE
+
+ return TRUE
+
+// maybe we don't need the item context proc but instead the hand one? since we don't need to check held_item
+/datum/element/simple_rotation/proc/on_requesting_context_from_item(atom/source, list/context, obj/item/held_item, mob/user)
+ SIGNAL_HANDLER
+
+ var/rotation_screentip = FALSE
+
+ if(can_be_rotated(user, source, ROTATION_CLOCKWISE, silent=TRUE))
+ context[SCREENTIP_CONTEXT_ALT_LMB] = "Rotate left"
+ rotation_screentip = TRUE
+ if(can_be_rotated(user, source, ROTATION_COUNTERCLOCKWISE, silent=TRUE))
+ context[SCREENTIP_CONTEXT_ALT_RMB] = "Rotate right"
+ rotation_screentip = TRUE
+
+ if(rotation_screentip)
+ return CONTEXTUAL_SCREENTIP_SET
+
+ return NONE
+
+/// Calld on the atom after it has been successfully rotated
+/atom/movable/proc/post_rotation(mob/user, degrees)
+ return
diff --git a/code/datums/elements/rust.dm b/code/datums/elements/rust.dm
index 2bc63c127377..91bcd038d57d 100644
--- a/code/datums/elements/rust.dm
+++ b/code/datums/elements/rust.dm
@@ -36,7 +36,7 @@
/datum/element/rust/proc/handle_examine(datum/source, mob/user, list/examine_text)
SIGNAL_HANDLER
- examine_text += span_notice("[source] is very rusty, you could probably burn or scrape it off.")
+ examine_text += span_notice("[source] is very rusty, you could probably burn or scrape it off, hell maybe even pour some space cola on it to remove the rust.")
/datum/element/rust/proc/apply_rust_overlay(atom/parent_atom, list/overlays)
SIGNAL_HANDLER
@@ -115,6 +115,10 @@
/datum/element/rust/heretic/proc/on_entered(turf/source, atom/movable/entered, ...)
SIGNAL_HANDLER
+ if(ismecha(entered))
+ var/obj/vehicle/sealed/mecha/victim = entered
+ victim.take_damage(20, armour_penetration = 100)
+ return
if(!isliving(entered))
return
var/mob/living/victim = entered
diff --git a/code/datums/elements/spooky.dm b/code/datums/elements/spooky.dm
index 8edd90dbc25b..85daaaeda78d 100644
--- a/code/datums/elements/spooky.dm
+++ b/code/datums/elements/spooky.dm
@@ -58,14 +58,14 @@
if(bone_amount)
human.set_jitter_if_lower(12 SECONDS * bone_amount)
human.set_stutter(6.5 SECONDS * bone_amount)
- human.adjustStaminaLoss(3 * bone_amount * stam_dam_mult)
+ human.adjust_stamina_loss(3 * bone_amount * stam_dam_mult)
if(iszombie(human))
- human.adjustStaminaLoss(25)
+ human.adjust_stamina_loss(25)
human.Paralyze(15) //zombies can't resist the doot
return bone_amount
/datum/element/spooky/proc/spectral_change(mob/living/carbon/human/human, mob/living/user, obj/item/source)
- if(human.getStaminaLoss() <= 95)
+ if(human.get_stamina_loss() <= 95)
return
if(single_use)
diff --git a/code/datums/elements/strippable.dm b/code/datums/elements/strippable.dm
index 85f2fe6ca60f..47e38079c725 100644
--- a/code/datums/elements/strippable.dm
+++ b/code/datums/elements/strippable.dm
@@ -182,9 +182,14 @@
* All string keys in the list must be inside tgui\packages\tgui\interfaces\StripMenu.tsx
* You can also return null if there are no alternate actions.
*/
-/datum/strippable_item/proc/get_alternate_actions(atom/source, mob/user)
+/datum/strippable_item/proc/get_alternate_actions(atom/source, mob/user, obj/item/item)
RETURN_TYPE(/list)
- return null
+ SHOULD_CALL_PARENT(TRUE)
+
+ var/list/alt_actions = list()
+ if(item)
+ SEND_SIGNAL(item, COMSIG_ITEM_GET_STRIPPABLE_ALT_ACTIONS, source, user, alt_actions)
+ return alt_actions
/**
* Performs an alternate action on this strippable_item.
@@ -193,9 +198,9 @@
* - action_key: The key of the alternate action to perform.
* Returns FALSE if unable to perform the action; whether it be due to the signal or some other factor.
*/
-/datum/strippable_item/proc/perform_alternate_action(atom/source, mob/user, action_key)
+/datum/strippable_item/proc/perform_alternate_action(atom/source, mob/user, action_key, obj/item/item)
SHOULD_CALL_PARENT(TRUE)
- if(SEND_SIGNAL(user, COMSIG_TRY_ALT_ACTION, source, action_key) & COMPONENT_CANT_ALT_ACTION)
+ if(item && SEND_SIGNAL(item, COMSIG_ITEM_STRIPPABLE_ALT_ACTION, source, user, action_key) & COMPONENT_ALT_ACTION_DONE)
return FALSE
return TRUE
@@ -373,9 +378,10 @@
LAZYINITLIST(result)
- result["icon"] = icon2base64(icon(item.icon, item.icon_state))
+ result["icon"] = icon2base64(icon(item.icon, item.icon_state, frame = 1))
result["name"] = item.name
- result["alternate"] = item_data.get_alternate_actions(owner, user)
+ result["alternate"] = item_data.get_alternate_actions(owner, user, item)
+ list_clear_nulls(result["alternate"])
var/static/list/already_cried = list()
if(length(result["alternate"]) > 3 && !(type in already_cried))
stack_trace("Too many alternate actions for [type]! Only three are supported at the moment! This will look bad!")
@@ -486,16 +492,14 @@
return
var/item = strippable_item.get_item(owner)
- if (isnull(item))
- return
- if (!(alt_action in strippable_item.get_alternate_actions(owner, user)))
+ if (!(alt_action in strippable_item.get_alternate_actions(owner, user, item)))
return
LAZYORASSOCLIST(interactions, user, key)
// Potentially yielding
- strippable_item.perform_alternate_action(owner, user, alt_action)
+ strippable_item.perform_alternate_action(owner, user, alt_action, item)
LAZYREMOVEASSOC(interactions, user, key)
diff --git a/code/datums/elements/surgery_aid.dm b/code/datums/elements/surgery_aid.dm
new file mode 100644
index 000000000000..ca351cc6a56c
--- /dev/null
+++ b/code/datums/elements/surgery_aid.dm
@@ -0,0 +1,151 @@
+/// Item can be applied to mobs to prepare them for surgery (allowing people to operate on them)
+/datum/element/surgery_aid
+ element_flags = ELEMENT_BESPOKE
+ argument_hash_start_idx = 2
+ /// The name of the aid, for examine and messages, in plural form
+ var/aid_name
+
+/datum/element/surgery_aid/Attach(datum/target, aid_name = "things")
+ . = ..()
+ if(!isitem(target))
+ return ELEMENT_INCOMPATIBLE
+
+ src.aid_name = aid_name
+ RegisterSignal(target, COMSIG_ITEM_REQUESTING_CONTEXT_FOR_TARGET, PROC_REF(on_context))
+ RegisterSignal(target, COMSIG_ITEM_INTERACTING_WITH_ATOM, PROC_REF(on_item_interaction))
+
+ var/obj/item/realtarget = target
+ realtarget.item_flags |= ITEM_HAS_CONTEXTUAL_SCREENTIPS
+
+/datum/element/surgery_aid/Detach(datum/target)
+ . = ..()
+ UnregisterSignal(target, list(COMSIG_ITEM_INTERACTING_WITH_ATOM, COMSIG_ITEM_REQUESTING_CONTEXT_FOR_TARGET))
+
+/datum/element/surgery_aid/proc/on_context(obj/item/source, list/context, atom/target, mob/living/user)
+ SIGNAL_HANDLER
+
+ if(!isliving(target))
+ return NONE
+
+ var/mob/living/target_mob = target
+ if(!target_mob.has_limbs)
+ context[SCREENTIP_CONTEXT_LMB] = HAS_TRAIT(source, TRAIT_READY_TO_OPERATE) ? "Remove [aid_name]" : "Prepare for surgery"
+ return CONTEXTUAL_SCREENTIP_SET
+
+ var/obj/item/bodypart/precise_part = target_mob.get_bodypart(deprecise_zone(user.zone_selected)) || target_mob.get_bodypart(BODY_ZONE_CHEST)
+ context[SCREENTIP_CONTEXT_LMB] = HAS_TRAIT(precise_part, TRAIT_READY_TO_OPERATE) ? "Remove [aid_name]" : "Prepare [precise_part.plaintext_zone] for surgery"
+ return CONTEXTUAL_SCREENTIP_SET
+
+/datum/element/surgery_aid/proc/on_item_interaction(datum/source, mob/living/user, atom/target, ...)
+ SIGNAL_HANDLER
+
+ if(!isliving(target))
+ return NONE
+
+ var/mob/living/target_mob = target
+ var/obj/item/bodypart/precise_part = target_mob.get_bodypart(deprecise_zone(user.zone_selected)) || target_mob.get_bodypart(BODY_ZONE_CHEST)
+ surgery_prep(target_mob, user, precise_part?.body_zone || BODY_ZONE_CHEST, aid_name)
+ return ITEM_INTERACT_SUCCESS
+
+/datum/element/surgery_aid/proc/surgery_prep(mob/living/target_mob, mob/living/surgeon, body_zone)
+ var/datum/status_effect/surgery_prepped/prep = target_mob.has_status_effect(__IMPLIED_TYPE__)
+ if(isnull(prep) || !(body_zone in prep.zones))
+ target_mob.apply_status_effect(/datum/status_effect/surgery_prepped, body_zone, aid_name)
+ target_mob.balloon_alert(surgeon, "[parse_zone(body_zone)] surgery prepared")
+ return
+ prep.untrack_surgery(body_zone)
+ target_mob.balloon_alert(surgeon, "surgery cleared")
+
+/// Tracks which body zones have been prepped for surgery
+/datum/status_effect/surgery_prepped
+ id = "surgery_prepped"
+ alert_type = null
+ status_type = STATUS_EFFECT_REFRESH
+ processing_speed = STATUS_EFFECT_NORMAL_PROCESS
+ tick_interval = 2 SECONDS
+
+ /// Lazylist of zones being prepped, if empty we should not exist
+ var/list/zones
+ /// Lazylist of the names of all surgical aids used, for examine
+ var/list/surgical_aids
+ /// Counts movements while standing up - removes the effect if we move too much
+ var/movement_counter = 0
+
+/datum/status_effect/surgery_prepped/on_creation(mob/living/new_owner, target_zone, aid_name = "things")
+ . = ..()
+ track_surgery(target_zone)
+ LAZYOR(surgical_aids, aid_name)
+ ADD_TRAIT(owner, TRAIT_READY_TO_OPERATE, TRAIT_STATUS_EFFECT(id)) // needs to happen after tracking starts
+
+/datum/status_effect/surgery_prepped/refresh(mob/living/new_owner, target_zone, aid_name = "things")
+ track_surgery(target_zone)
+ LAZYOR(surgical_aids, aid_name)
+
+/datum/status_effect/surgery_prepped/on_apply()
+ RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(on_move))
+ RegisterSignal(owner, COMSIG_CARBON_POST_ATTACH_LIMB, PROC_REF(on_attach_limb))
+ RegisterSignal(owner, COMSIG_CARBON_POST_REMOVE_LIMB, PROC_REF(on_detach_limb))
+ return TRUE
+
+/datum/status_effect/surgery_prepped/on_remove()
+ for(var/zone in zones)
+ untrack_surgery(zone)
+ REMOVE_TRAIT(owner, TRAIT_READY_TO_OPERATE, TRAIT_STATUS_EFFECT(id))
+ UnregisterSignal(owner, list(COMSIG_MOVABLE_MOVED, COMSIG_CARBON_POST_ATTACH_LIMB, COMSIG_CARBON_POST_REMOVE_LIMB))
+
+/datum/status_effect/surgery_prepped/get_examine_text()
+ var/list/zones_readable = list()
+ // give the body zones a consistent order, the same order as GLOB.all_body_zones
+ for(var/zone in GLOB.all_body_zones & zones)
+ zones_readable += parse_zone(zone)
+
+ var/list/aid_readable = list()
+ for(var/aid in surgical_aids)
+ aid_readable += copytext_char(aid, -1) == "s" ? aid : "\a [aid]"
+
+ // "They have surgial drapes and a bedsheet adorning their chest, arms, and legs."
+ return "[owner.p_They()] [owner.p_have()] [english_list(aid_readable)] adorning [owner.p_their()] [english_list(zones_readable)]."
+
+/datum/status_effect/surgery_prepped/proc/on_move(datum/source, ...)
+ SIGNAL_HANDLER
+
+ if(owner.body_position == STANDING_UP)
+ movement_counter += 1
+ if(movement_counter < 4)
+ return
+ // "The surgical drapes and bedsheets adorning John fall off!"
+ owner.visible_message(span_warning("The [english_list(surgical_aids)] adorning [owner] fall off!"))
+ qdel(src)
+
+/datum/status_effect/surgery_prepped/proc/on_attach_limb(datum/source, obj/item/bodypart/limb)
+ SIGNAL_HANDLER
+
+ if(limb.body_zone in zones)
+ ADD_TRAIT(limb, TRAIT_READY_TO_OPERATE, TRAIT_STATUS_EFFECT(id))
+
+/datum/status_effect/surgery_prepped/proc/on_detach_limb(datum/source, obj/item/bodypart/limb)
+ SIGNAL_HANDLER
+
+ REMOVE_TRAIT(limb, TRAIT_READY_TO_OPERATE, TRAIT_STATUS_EFFECT(id))
+
+/datum/status_effect/surgery_prepped/tick(seconds_between_ticks)
+ if(owner.body_position == LYING_DOWN && movement_counter > 0)
+ movement_counter -= 1
+
+/datum/status_effect/surgery_prepped/proc/track_surgery(body_zone)
+ LAZYADD(zones, body_zone)
+ if(iscarbon(owner))
+ var/obj/item/bodypart/precise_part = owner.get_bodypart(body_zone)
+ if(precise_part)
+ ADD_TRAIT(precise_part, TRAIT_READY_TO_OPERATE, TRAIT_STATUS_EFFECT(id))
+ else if(body_zone != BODY_ZONE_CHEST)
+ stack_trace("Attempting to track surgery on a non-carbon mob with a non-chest body zone! This should not happen.")
+
+/datum/status_effect/surgery_prepped/proc/untrack_surgery(body_zone)
+ LAZYREMOVE(zones, body_zone)
+ if(iscarbon(owner))
+ var/obj/item/bodypart/precise_part = owner.get_bodypart(body_zone)
+ if(precise_part)
+ REMOVE_TRAIT(precise_part, TRAIT_READY_TO_OPERATE, TRAIT_STATUS_EFFECT(id))
+ if(!LAZYLEN(zones) && !QDELETED(src))
+ qdel(src) // no more zones to track, remove the status effect
diff --git a/code/datums/elements/swimming_tile.dm b/code/datums/elements/swimming_tile.dm
index 738a8d315efb..3f825942aaa8 100644
--- a/code/datums/elements/swimming_tile.dm
+++ b/code/datums/elements/swimming_tile.dm
@@ -11,6 +11,12 @@
var/ticking_oxy_damage
/// Probability to exhaust our swimmer
var/exhaust_swimmer_prob
+ /// Tracked list of all mobs that are present in our turfs
+ var/list/mob/swimmers = list()
+
+/datum/element/swimming_tile/Destroy(force)
+ swimmers = null
+ return ..()
/datum/element/swimming_tile/Attach(turf/target, stamina_entry_cost = 7, ticking_stamina_cost = 5, ticking_oxy_damage = 2, exhaust_swimmer_prob = 30)
. = ..()
@@ -39,41 +45,59 @@
/// When something enters the water set up to start drowning it
/datum/element/swimming_tile/proc/enter_water(atom/source, mob/living/swimmer)
SIGNAL_HANDLER
- if (!istype(swimmer))
+
+ if(!istype(swimmer))
return
- RegisterSignal(swimmer, SIGNAL_ADDTRAIT(TRAIT_IMMERSED), PROC_REF(dip_in))
+
+ if(QDELETED(swimmer))
+ return
+
if(HAS_TRAIT(swimmer, TRAIT_IMMERSED))
dip_in(swimmer)
+ if(swimmer in swimmers)
+ return
+
+ RegisterSignal(swimmer, SIGNAL_ADDTRAIT(TRAIT_IMMERSED), PROC_REF(dip_in))
+ RegisterSignal(swimmer, COMSIG_QDELETING, PROC_REF(on_swimmer_del))
+ swimmers |= swimmer
+
/// When something exits the water it probably shouldn't drowning
/datum/element/swimming_tile/proc/out_of_water(atom/source, mob/living/landlubber)
SIGNAL_HANDLER
- UnregisterSignal(landlubber, list(SIGNAL_ADDTRAIT(TRAIT_IMMERSED)))
+ UnregisterSignal(landlubber, list(SIGNAL_ADDTRAIT(TRAIT_IMMERSED), COMSIG_QDELETING))
+ swimmers -= landlubber
+
+/datum/element/swimming_tile/proc/on_swimmer_del(atom/source)
+ SIGNAL_HANDLER
+ out_of_water(null, source)
/// When we've validated that someone is actually in the water start drowning the-I mean, start swimming!
/datum/element/swimming_tile/proc/dip_in(mob/living/floater)
SIGNAL_HANDLER
- if ((!HAS_TRAIT(floater, TRAIT_SWIMMER) && (isnull(floater.buckled) || (!isvehicle(floater.buckled) && !ismob(floater.buckled))) && prob(exhaust_swimmer_prob)))
-
- //First, we determine our effective stamina entry cost baseline. This includes the value from the water, as well as any heavy clothing being worn. The strength trait halves this value.
- var/effective_stamina_entry_cost = HAS_TRAIT(floater, TRAIT_STRENGTH) ? (stamina_entry_cost + clothing_weight(floater)) : ((stamina_entry_cost + clothing_weight(floater)) / 2)
+ if(HAS_TRAIT(floater, TRAIT_SWIMMER) || (isvehicle(floater.buckled) || ismob(floater.buckled)) || !prob(exhaust_swimmer_prob))
+ // Apply the status anyway for when they stop riding
+ floater.apply_status_effect(/datum/status_effect/swimming, ticking_stamina_cost, ticking_oxy_damage)
+ return
- //Being in high gravity doubles our effective stamina cost
- var/gravity_modifier = floater.has_gravity() > STANDARD_GRAVITY ? 2 : 1
+ //First, we determine our effective stamina entry cost baseline. This includes the value from the water, as well as any heavy clothing being worn. The strength trait halves this value.
+ var/effective_stamina_entry_cost = HAS_TRAIT(floater, TRAIT_STRENGTH) ? (stamina_entry_cost + clothing_weight(floater)) : ((stamina_entry_cost + clothing_weight(floater)) / 2)
- //If our floater has a specialized spine, include that as a factor.
- var/obj/item/organ/cyberimp/chest/spine/potential_spine = floater.get_organ_slot(ORGAN_SLOT_SPINE)
- if(istype(potential_spine))
- effective_stamina_entry_cost *= potential_spine.athletics_boost_multiplier
+ //Being in high gravity doubles our effective stamina cost
+ var/gravity_modifier = floater.has_gravity() > STANDARD_GRAVITY ? 2 : 1
- //Finally, we get our athletics skill as a reduction to the stamina cost. This is a direct reduction.
- var/athletics_skill = (floater.mind?.get_skill_level(/datum/skill/athletics) || 1) - 1
+ //If our floater has a specialized spine, include that as a factor.
+ var/obj/item/organ/cyberimp/chest/spine/potential_spine = floater.get_organ_slot(ORGAN_SLOT_SPINE)
+ if(istype(potential_spine))
+ effective_stamina_entry_cost *= potential_spine.athletics_boost_multiplier
- floater.apply_damage(clamp((effective_stamina_entry_cost - athletics_skill) * gravity_modifier, 1, 100), STAMINA)
- floater.mind?.adjust_experience(/datum/skill/athletics, (stamina_entry_cost * gravity_modifier) * 0.1)
- floater.apply_status_effect(/datum/status_effect/exercised, 15 SECONDS)
+ //Finally, we get our athletics skill as a reduction to the stamina cost. This is a direct reduction.
+ var/athletics_skill = (floater.mind?.get_skill_level(/datum/skill/athletics) || 1) - 1
+ floater.apply_damage(clamp((effective_stamina_entry_cost - athletics_skill) * gravity_modifier, 1, 100), STAMINA)
+ floater.mind?.adjust_experience(/datum/skill/athletics, (stamina_entry_cost * gravity_modifier) * 0.1)
+ floater.apply_status_effect(/datum/status_effect/exercised, 15 SECONDS)
floater.apply_status_effect(/datum/status_effect/swimming, ticking_stamina_cost, ticking_oxy_damage) // Apply the status anyway for when they stop riding
/// The weight of our swimmers clothing, including slowdown, impacts the amount of stamina damage dealt on dipping in.
diff --git a/code/datums/elements/table_smash.dm b/code/datums/elements/table_smash.dm
new file mode 100644
index 000000000000..b0c9c2b7d056
--- /dev/null
+++ b/code/datums/elements/table_smash.dm
@@ -0,0 +1,198 @@
+/// Component which allows mobs to be smashed onto this surface like a wrestling move
+/datum/element/table_smash
+ element_flags = ELEMENT_BESPOKE
+ argument_hash_start_idx = 2
+ /// If true, mobs will be placed gently on the table even if they're in an aggressive grab
+ var/gentle_push
+
+/datum/element/table_smash/Attach(datum/target, gentle_push = FALSE)
+ . = ..()
+ if (!isobj(target))
+ return ELEMENT_INCOMPATIBLE
+
+ src.gentle_push = gentle_push
+
+ RegisterSignal(target, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_interaction))
+ RegisterSignal(target, COMSIG_ATOM_ITEM_INTERACTION, PROC_REF(on_item_interaction))
+
+ var/static/list/loc_connections = list(
+ COMSIG_LIVING_DISARM_COLLIDE = TYPE_PROC_REF(/obj/structure/table, on_pushed_into),
+ )
+ target.AddComponent(/datum/component/connect_loc_behalf, target, loc_connections)
+
+/datum/element/table_smash/Detach(datum/source, ...)
+ . = ..()
+ UnregisterSignal(source, list(COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_ITEM_INTERACTION))
+
+/// Called when someone clicks on our surface
+/datum/element/table_smash/proc/on_interaction(datum/source, mob/user)
+ SIGNAL_HANDLER
+
+ var/obj/source_obj = source
+ if (!source_obj.Adjacent(user) || !user.pulling)
+ return
+
+ if (!isliving(user.pulling))
+ if (!(user.pulling.pass_flags & PASSTABLE))
+ return
+
+ user.Move_Pulled(source_obj)
+
+ if (user.pulling.loc == source_obj.loc)
+ user.visible_message(span_notice("[user] places [user.pulling] onto [source_obj]."),
+ span_notice("You place [user.pulling] onto [source_obj]."))
+ user.stop_pulling()
+
+ return COMPONENT_CANCEL_ATTACK_CHAIN
+
+ var/mob/living/pushed_mob = user.pulling
+ if (pushed_mob.buckled)
+ if (pushed_mob.buckled == source_obj)
+ //Already buckled to the object, you probably meant to unbuckle them
+ return
+
+ to_chat(user, span_warning("[pushed_mob] is buckled to [pushed_mob.buckled]!"))
+ return COMPONENT_CANCEL_ATTACK_CHAIN
+
+ INVOKE_ASYNC(src, PROC_REF(perform_table_smash), source_obj, user)
+ return COMPONENT_CANCEL_ATTACK_CHAIN
+
+/// We have a mob being pressed onto the table, but how strongly?
+/datum/element/table_smash/proc/perform_table_smash(obj/structure/table/table, mob/living/user)
+ var/mob/living/pushed_mob = user.pulling
+ if (user.combat_mode)
+ switch(user.grab_state)
+ if (GRAB_PASSIVE)
+ to_chat(user, span_warning("You need a better grip to do that!"))
+ return
+ if (GRAB_AGGRESSIVE)
+ if (gentle_push)
+ tableplace(user, pushed_mob, table)
+ else
+ tablepush(user, pushed_mob, table)
+ if (GRAB_NECK to GRAB_KILL)
+ tablelimbsmash(user, pushed_mob, table)
+ else
+ pushed_mob.visible_message(span_notice("[user] begins to place [pushed_mob] onto [table]..."), \
+ span_userdanger("[user] begins to place [pushed_mob] onto [table]..."))
+ if (do_after(user, 3.5 SECONDS, target = pushed_mob))
+ tableplace(user, pushed_mob, table)
+ else
+ return
+
+ user.stop_pulling()
+
+/// Called when someone clicks on our surface with an item
+/datum/element/table_smash/proc/on_item_interaction(obj/structure/table/table, mob/living/user, obj/item/item, modifiers)
+ SIGNAL_HANDLER
+ if (!istype(item, /obj/item/riding_offhand))
+ return NONE
+
+ var/obj/item/riding_offhand/riding_item = item
+ var/mob/living/carried_mob = riding_item.rider
+ if (carried_mob == user) //Piggyback user.
+ return NONE
+
+ INVOKE_ASYNC(src, PROC_REF(riding_offhand_act), user, item)
+ return ITEM_INTERACT_BLOCKING
+
+/// Called when someone clicks on our surface using a fireman's carry
+/datum/element/table_smash/proc/riding_offhand_act(mob/living/user, obj/item/riding_offhand/riding_item, obj/structure/table/table)
+ var/mob/living/carried_mob = riding_item.rider
+ if (user.combat_mode)
+ user.unbuckle_mob(carried_mob)
+ tablelimbsmash(user, carried_mob)
+ return ITEM_INTERACT_SUCCESS
+
+ var/tableplace_delay = 3.5 SECONDS
+ var/skills_space = ""
+ if (HAS_TRAIT(user, TRAIT_QUICKER_CARRY))
+ tableplace_delay = 2 SECONDS
+ skills_space = " expertly"
+ else if (HAS_TRAIT(user, TRAIT_QUICK_CARRY))
+ tableplace_delay = 2.75 SECONDS
+ skills_space = " quickly"
+
+ var/obj/item/organ/cyberimp/chest/spine/potential_spine = user.get_organ_slot(ORGAN_SLOT_SPINE)
+ if (istype(potential_spine))
+ tableplace_delay *= potential_spine.athletics_boost_multiplier
+
+ carried_mob.visible_message(span_notice("[user] begins to[skills_space] place [carried_mob] onto [table]..."),
+ span_userdanger("[user] begins to[skills_space] place [carried_mob] onto [table]..."))
+ if (!do_after(user, tableplace_delay, target = carried_mob))
+ return ITEM_INTERACT_BLOCKING
+ user.unbuckle_mob(carried_mob)
+ tableplace(user, carried_mob, table)
+ return ITEM_INTERACT_SUCCESS
+
+/// Gently place the mob onto the table
+/datum/element/table_smash/proc/tableplace(mob/living/user, mob/living/pushed_mob, obj/structure/table/table)
+ pushed_mob.forceMove(table.loc)
+ pushed_mob.set_resting(TRUE, TRUE)
+ pushed_mob.visible_message(span_notice("[user] places [pushed_mob] onto [table]."), \
+ span_notice("[user] places [pushed_mob] onto [table]."))
+ log_combat(user, pushed_mob, "placed", null, "onto [table]")
+
+/// Aggressively smash the mob onto the table
+/datum/element/table_smash/proc/tablepush(mob/living/user, mob/living/pushed_mob, obj/structure/table/table)
+ if (HAS_TRAIT(user, TRAIT_PACIFISM))
+ to_chat(user, span_danger("Throwing [pushed_mob] onto the table might hurt them!"))
+ return
+
+ var/passtable_key = REF(user)
+ passtable_on(pushed_mob, passtable_key)
+ for (var/obj/obj in user.loc.contents)
+ if (!obj.CanAllowThrough(pushed_mob))
+ return
+
+ pushed_mob.Move(table.loc)
+ passtable_off(pushed_mob, passtable_key)
+ if (pushed_mob.loc != table.loc) //Something prevented the tabling
+ return
+
+ pushed_mob.Knockdown(3 SECONDS)
+ pushed_mob.apply_damage(10, BRUTE)
+ pushed_mob.apply_damage(40, STAMINA)
+ playsound(pushed_mob, 'sound/effects/tableslam.ogg', 90, TRUE)
+ pushed_mob.visible_message(span_danger("[user] slams [pushed_mob] onto \the [table]!"), \
+ span_userdanger("[user] slams you onto \the [table]!"))
+ log_combat(user, pushed_mob, "tabled", null, "onto [table]")
+ pushed_mob.add_mood_event("table", /datum/mood_event/table)
+ SEND_SIGNAL(user, COMSIG_LIVING_TABLE_SLAMMING, pushed_mob, table)
+ table.after_smash(pushed_mob)
+
+/// Even more aggressively smash a single part of a mob onto the table
+/datum/element/table_smash/proc/tablelimbsmash(mob/living/user, mob/living/pushed_mob, obj/structure/table/table)
+ pushed_mob.Knockdown(3 SECONDS)
+ var/obj/item/bodypart/banged_limb = pushed_mob.get_bodypart(user.zone_selected) || pushed_mob.get_bodypart(BODY_ZONE_HEAD)
+ var/extra_wound = 0
+ if (HAS_TRAIT(user, TRAIT_HULK))
+ extra_wound = 20
+ pushed_mob.apply_damage(30, BRUTE, banged_limb, wound_bonus = extra_wound)
+ pushed_mob.apply_damage(60, STAMINA)
+ playsound(pushed_mob, 'sound/effects/bang.ogg', 90, TRUE)
+ pushed_mob.visible_message(span_danger("[user] smashes [pushed_mob]'s [banged_limb.plaintext_zone] against \the [table]!"),
+ span_userdanger("[user] smashes your [banged_limb.plaintext_zone] against \the [table]"))
+ log_combat(user, pushed_mob, "head slammed", null, "against [table]")
+ pushed_mob.add_mood_event("table", /datum/mood_event/table_limbsmash, banged_limb)
+ table.take_damage(50)
+ SEND_SIGNAL(user, COMSIG_LIVING_TABLE_LIMB_SLAMMING, pushed_mob, table)
+ table.after_smash(pushed_mob)
+
+/// Called when someone is shoved into our tile
+/obj/structure/table/proc/on_pushed_into(datum/source, mob/living/shover, mob/living/target, shove_flags, obj/item/weapon)
+ SIGNAL_HANDLER
+ if((shove_flags & SHOVE_KNOCKDOWN_BLOCKED) || !(shove_flags & SHOVE_BLOCKED))
+ return
+ target.Knockdown(SHOVE_KNOCKDOWN_TABLE, daze_amount = 3 SECONDS)
+ target.visible_message(span_danger("[shover.name] shoves [target.name] onto \the [src]!"),
+ span_userdanger("You're shoved onto \the [src] by [shover.name]!"), span_hear("You hear aggressive shuffling followed by a loud thud!"), COMBAT_MESSAGE_RANGE, shover)
+ to_chat(shover, span_danger("You shove [target.name] onto \the [src]!"))
+ target.throw_at(src, 1, 1, null, FALSE) //1 speed throws with no spin are basically just forcemoves with a hard collision check
+ log_combat(shover, target, "shoved", "onto [src] (table)[weapon ? " with [weapon]" : ""]")
+ after_smash(target)
+ return COMSIG_LIVING_SHOVE_HANDLED
+
+/// What happens after something gets smashed onto this table
+/obj/structure/table/proc/after_smash(mob/living/smashed_onto)
+ return
diff --git a/code/datums/elements/tool_flash.dm b/code/datums/elements/tool_flash.dm
index f17d60970bf5..68a02897f941 100644
--- a/code/datums/elements/tool_flash.dm
+++ b/code/datums/elements/tool_flash.dm
@@ -33,5 +33,5 @@
/datum/element/tool_flash/proc/flash(datum/source, mob/living/user)
SIGNAL_HANDLER
- if(user && get_dist(get_turf(source), get_turf(user)) <= 1)
+ if(user && flash_strength > 0 && get_dist(get_turf(source), get_turf(user)) <= 1)
user.flash_act(max(flash_strength,1))
diff --git a/code/datums/elements/tool_renaming.dm b/code/datums/elements/tool_renaming.dm
index 729c5fd6a218..7583d27495b5 100644
--- a/code/datums/elements/tool_renaming.dm
+++ b/code/datums/elements/tool_renaming.dm
@@ -28,15 +28,17 @@
return NONE
var/obj/renamed_obj = interacting_with
+ var/obj/item/tool = source
- if(!(renamed_obj.obj_flags & UNIQUE_RENAME))
+ if(!(renamed_obj.obj_flags & UNIQUE_RENAME) || !user.can_write(tool))
return NONE
-
- INVOKE_ASYNC(src, PROC_REF(async_rename), user, renamed_obj)
+ INVOKE_ASYNC(src, PROC_REF(async_rename), user, renamed_obj, !(renamed_obj.obj_flags & RENAME_NO_DESC))
return ITEM_INTERACT_SUCCESS
-/datum/element/tool_renaming/proc/async_rename(mob/living/user, obj/renamed_obj)
- var/custom_choice = tgui_input_list(user, "What would you like to edit?", "Customization", list(OPTION_RENAME, OPTION_DESCRIPTION, OPTION_RESET))
+/datum/element/tool_renaming/proc/async_rename(mob/living/user, obj/renamed_obj, description_option)
+ if(!renamed_obj.rename_checks(user))
+ return
+ var/custom_choice = tgui_input_list(user, "What would you like to edit?", "Customization", list(OPTION_RENAME, description_option? OPTION_DESCRIPTION : null, OPTION_RESET))
if(QDELETED(renamed_obj) || !user.can_perform_action(renamed_obj) || isnull(custom_choice))
return
@@ -49,7 +51,7 @@
if(input == old_name || !input)
to_chat(user, span_notice("You changed [renamed_obj] to... well... [renamed_obj]."))
return
- renamed_obj.AddComponent(/datum/component/rename, input, renamed_obj.desc)
+ renamed_obj.AddComponent(/datum/component/rename, renamed_obj.nameformat(input, user), renamed_obj.desc)
to_chat(user, span_notice("You have successfully renamed \the [old_name] to [renamed_obj]."))
renamed_obj.update_appearance(UPDATE_NAME)
@@ -61,13 +63,14 @@
if(input == old_desc || !input)
to_chat(user, span_notice("You decide against changing [renamed_obj]'s description."))
return
- renamed_obj.AddComponent(/datum/component/rename, renamed_obj.name, input)
+ renamed_obj.AddComponent(/datum/component/rename, renamed_obj.name, renamed_obj.descformat(input, user))
to_chat(user, span_notice("You have successfully changed [renamed_obj]'s description."))
renamed_obj.update_appearance(UPDATE_DESC)
if(OPTION_RESET)
qdel(renamed_obj.GetComponent(/datum/component/rename))
- to_chat(user, span_notice("You have successfully reset [renamed_obj]'s name and description."))
+ to_chat(user, span_notice("You have successfully reset [renamed_obj]'s name[renamed_obj.obj_flags & RENAME_NO_DESC? "." : " and description."]"))
+ renamed_obj.rename_reset()
renamed_obj.update_appearance(UPDATE_NAME | UPDATE_DESC)
#undef OPTION_RENAME
diff --git a/code/datums/elements/watery_tile.dm b/code/datums/elements/watery_tile.dm
index 296928f26afd..3c72170ecefe 100644
--- a/code/datums/elements/watery_tile.dm
+++ b/code/datums/elements/watery_tile.dm
@@ -1,5 +1,11 @@
/datum/element/watery_tile
element_flags = ELEMENT_DETACH_ON_HOST_DESTROY
+ /// List of atoms that are present in this element's turfs
+ var/list/atom/movable/wet_dogs = list()
+
+/datum/element/watery_tile/Destroy(force)
+ wet_dogs = null
+ return ..()
/datum/element/watery_tile/Attach(turf/target)
. = ..()
@@ -22,11 +28,20 @@
/datum/element/watery_tile/proc/enter_water(atom/source, atom/movable/entered)
SIGNAL_HANDLER
+ if(QDELETED(entered) || HAS_TRAIT(entered, TRAIT_WALLMOUNTED))
+ return
+
+ if(HAS_TRAIT(entered, TRAIT_IMMERSED))
+ dip_in(entered)
+
+ if(entered in wet_dogs)
+ return
+
RegisterSignal(entered, SIGNAL_ADDTRAIT(TRAIT_IMMERSED), PROC_REF(dip_in))
+ RegisterSignal(entered, COMSIG_QDELETING, PROC_REF(on_content_del))
if(isliving(entered))
RegisterSignal(entered, SIGNAL_REMOVETRAIT(TRAIT_IMMERSED), PROC_REF(dip_out))
- if(HAS_TRAIT(entered, TRAIT_IMMERSED))
- dip_in(entered)
+ wet_dogs |= entered
/datum/element/watery_tile/proc/dip_in(atom/movable/source)
SIGNAL_HANDLER
@@ -39,10 +54,15 @@
/datum/element/watery_tile/proc/out_of_water(atom/source, atom/movable/gone)
SIGNAL_HANDLER
- UnregisterSignal(gone, list(SIGNAL_ADDTRAIT(TRAIT_IMMERSED), SIGNAL_REMOVETRAIT(TRAIT_IMMERSED)))
+ on_content_del(gone)
if(isliving(gone))
dip_out(gone)
+/datum/element/watery_tile/proc/on_content_del(atom/movable/source)
+ SIGNAL_HANDLER
+ UnregisterSignal(source, list(SIGNAL_ADDTRAIT(TRAIT_IMMERSED), SIGNAL_REMOVETRAIT(TRAIT_IMMERSED), COMSIG_QDELETING))
+ wet_dogs -= source
+
/datum/element/watery_tile/proc/dip_out(mob/living/source)
SIGNAL_HANDLER
source.remove_status_effect(/datum/status_effect/watery_tile_wetness)
diff --git a/code/datums/embedding.dm b/code/datums/embedding.dm
index dd6c044f79c4..1c876468350a 100644
--- a/code/datums/embedding.dm
+++ b/code/datums/embedding.dm
@@ -313,7 +313,7 @@
/// Someone attempted to pull us out! Either the owner by inspecting themselves, or someone else by examining the owner and clicking the link.
/datum/embedding/proc/rip_out(mob/living/jack_the_ripper)
- if (!jack_the_ripper.CanReach(owner))
+ if (!owner.IsReachableBy(jack_the_ripper))
return
if (!jack_the_ripper.can_perform_action(owner, FORBID_TELEKINESIS_REACH | NEED_HANDS | ALLOW_RESTING))
diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm
index 65b74962fd9d..396a15b64c66 100644
--- a/code/datums/emotes.dm
+++ b/code/datums/emotes.dm
@@ -94,13 +94,19 @@
*/
/datum/emote/proc/run_emote(mob/user, params, type_override, intentional = FALSE)
var/msg = select_message_type(user, message, intentional)
- if(params && message_param)
- msg = select_param(user, params)
+ if(params)
+ if(message_param)
+ msg = select_param(user, params)
+ else
+ msg = params
msg = replace_pronoun(user, msg)
if(!msg)
return
+ /// Use the type override if it exists
+ var/running_emote_type = type_override || emote_type
+
if(user.client)
user.log_message(msg, LOG_EMOTE)
@@ -116,13 +122,13 @@
playsound(source = user,soundin = tmp_sound,vol = 50, vary = FALSE, ignore_walls = sound_wall_ignore, frequency = frequency)
- var/is_important = emote_type & EMOTE_IMPORTANT
- var/is_visual = emote_type & EMOTE_VISIBLE
- var/is_audible = emote_type & EMOTE_AUDIBLE
+ var/is_important = running_emote_type & EMOTE_IMPORTANT
+ var/is_visual = running_emote_type & EMOTE_VISIBLE
+ var/is_audible = running_emote_type & EMOTE_AUDIBLE
var/additional_message_flags = get_message_flags(intentional)
// Emote doesn't get printed to chat, runechat only
- if(emote_type & EMOTE_RUNECHAT)
+ if(running_emote_type & EMOTE_RUNECHAT)
for(var/mob/viewer as anything in viewers(user))
if(isnull(viewer.client))
continue
diff --git a/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm b/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm
index 83eb1fb6351b..a1cb30f7032d 100644
--- a/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm
+++ b/code/datums/greyscale/config_types/greyscale_configs/greyscale_clothes.dm
@@ -227,6 +227,15 @@
name = "Infinity Scarf (Worn)"
icon_file = 'icons/mob/clothing/neck.dmi'
+/datum/greyscale_config/robe_cape
+ name = "Robe Cape"
+ icon_file = 'icons/obj/clothing/neck.dmi'
+ json_config = 'code/datums/greyscale/json_configs/robe_cape.json'
+
+/datum/greyscale_config/robe_cape/worn
+ name = "Robe Cape"
+ icon_file = 'icons/mob/clothing/neck.dmi'
+ json_config = 'code/datums/greyscale/json_configs/robe_cape_worn.json'
//
// GLOVES
//
diff --git a/code/datums/greyscale/json_configs/robe_cape.json b/code/datums/greyscale/json_configs/robe_cape.json
new file mode 100644
index 000000000000..a5ab38d41960
--- /dev/null
+++ b/code/datums/greyscale/json_configs/robe_cape.json
@@ -0,0 +1,10 @@
+{
+ "robe_cape": [
+ {
+ "type": "icon_state",
+ "icon_state": "robe_cape",
+ "blend_mode": "overlay",
+ "color_ids": [1]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/robe_cape_worn.json b/code/datums/greyscale/json_configs/robe_cape_worn.json
new file mode 100644
index 000000000000..7dd8cd976cda
--- /dev/null
+++ b/code/datums/greyscale/json_configs/robe_cape_worn.json
@@ -0,0 +1,10 @@
+{
+ "robe_cape": [
+ {
+ "type": "icon_state",
+ "icon_state": "robe_cape",
+ "blend_mode": "overlay",
+ "color_ids": [1]
+ }
+ ]
+}
diff --git a/code/datums/greyscale/json_configs/ushanka.json b/code/datums/greyscale/json_configs/ushanka.json
index 3099b13278b2..5c895a05c145 100644
--- a/code/datums/greyscale/json_configs/ushanka.json
+++ b/code/datums/greyscale/json_configs/ushanka.json
@@ -6,6 +6,12 @@
"blend_mode": "overlay",
"color_ids": [1]
},
+ {
+ "type": "icon_state",
+ "icon_state": "ushanka_fur_up",
+ "blend_mode": "overlay",
+ "color_ids": [1]
+ },
{
"type": "icon_state",
"icon_state": "ushanka_base_up",
@@ -20,11 +26,18 @@
"blend_mode": "overlay",
"color_ids": [1]
},
+ {
+ "type": "icon_state",
+ "icon_state": "ushanka_base_2",
+ "blend_mode": "overlay",
+ "color_ids": [1]
+ },
{
"type": "icon_state",
"icon_state": "ushanka_base",
"blend_mode": "overlay",
"color_ids": [2]
}
+
]
}
diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm
index 8dcaa2ecfaf1..d8fdb8f846b6 100644
--- a/code/datums/helper_datums/teleport.dm
+++ b/code/datums/helper_datums/teleport.dm
@@ -125,26 +125,53 @@
effect.attach(location)
effect.start()
-// Safe location finder
-/proc/find_safe_turf(zlevel, list/zlevels, extended_safety_checks = FALSE, dense_atoms = FALSE)
- if(!zlevels)
- if (zlevel)
- zlevels = list(zlevel)
- else
- zlevels = SSmapping.levels_by_trait(ZTRAIT_STATION)
- var/cycles = 1000
- for(var/cycle in 1 to cycles)
- // DRUNK DIALLING WOOOOOOOOO
+/**
+ * Attempts to find a "safe" floor turf within some given z-levels
+ * * zlevel_or_levels: The list of z-levels we are searching though. You can supply just a number and it will be turned into a list.
+ * * extended_safety_checks: Will do some additional checks to make sure the destination is safe, see [/proc/is_safe_turf].
+ * * dense_atoms: Will additionally check to see if the turf has any dense obstructions, like machines or structures.
+ *
+ * Returns a safe floor turf,
+ * **BUT** there is a chance of it being null if an extremely large portion of a z-level is unsafe or blocked.
+ */
+/proc/find_safe_turf(zlevel_or_levels, extended_safety_checks = FALSE, dense_atoms = FALSE) as /turf/open/floor
+ SHOULD_BE_PURE(TRUE)
+ RETURN_TYPE(/turf/open/floor)
+
+ var/list/zlevels
+ if(islist(zlevel_or_levels))
+ zlevels = zlevel_or_levels
+ else if(zlevel_or_levels)
+ zlevels = list(zlevel_or_levels)
+ else
+ zlevels = SSmapping.levels_by_trait(ZTRAIT_STATION)
+
+ for(var/cycle in 1 to 1000)
var/x = rand(1, world.maxx)
var/y = rand(1, world.maxy)
var/z = pick(zlevels)
var/random_location = locate(x,y,z)
-
- if(is_safe_turf(random_location, extended_safety_checks, dense_atoms, cycle < 300))//if the area is mostly NOTELEPORT (centcom) we gotta give up on this fantasy at some point.
+ var/keep_trying_no_teleport = (cycle < 300) //if the area is mostly NOTELEPORT (centcom) we gotta give up on this fantasy at some point.
+ if(is_safe_turf(random_location, extended_safety_checks, dense_atoms, keep_trying_no_teleport))
return random_location
-/// Checks if a given turf is a "safe" location
+/**
+ * Checks to see if a given turf is a "safe" location. Being safe requires the following to be true:
+ * * Must be a [floor][/turf/open/floor]
+ * * Must have air, and that air must have [breathable bounds][/proc/check_gases] for humans
+ * * Must have goldilocks temperature
+ * * Must have safe pressure
+ *
+ * Optionally:
+ * * extended_safety_checks: Will make additional checks for turfs that technically pass all previous requirements but still may not be safe
+ * * dense_atoms: Must be unobstructed (no blocking objects such as machines, structures or mobs)
+ * * no_teleport: Must not have [NOTELEPORT][/area/var/area_flag]
+ *
+ * Returns TRUE if all conditions pass, FALSE otherwise.
+ */
/proc/is_safe_turf(turf/random_location, extended_safety_checks = FALSE, dense_atoms = FALSE, no_teleport = FALSE)
+ SHOULD_BE_PURE(TRUE)
+
. = FALSE
if(!isfloorturf(random_location))
return
@@ -160,18 +187,18 @@
var/list/floor_gases = floor_gas_mixture.gases
var/static/list/gases_to_check = list(
- /datum/gas/oxygen = list(16, 100),
+ /datum/gas/oxygen = list(/obj/item/organ/lungs::safe_oxygen_min, 100),
/datum/gas/nitrogen,
- /datum/gas/carbon_dioxide = list(0, 10)
+ /datum/gas/carbon_dioxide = list(0, /obj/item/organ/lungs::safe_co2_max)
)
if(!check_gases(floor_gases, gases_to_check))
return FALSE
// Aim for goldilocks temperatures and pressure
- if((floor_gas_mixture.temperature <= 270) || (floor_gas_mixture.temperature >= 360))
+ if((floor_gas_mixture.temperature <= BODYTEMP_COLD_DAMAGE_LIMIT) || (floor_gas_mixture.temperature >= BODYTEMP_HEAT_DAMAGE_LIMIT))
return
var/pressure = floor_gas_mixture.return_pressure()
- if((pressure <= 20) || (pressure >= 550))
+ if((pressure <= HAZARD_LOW_PRESSURE) || (pressure >= HAZARD_HIGH_PRESSURE))
return
if(extended_safety_checks)
diff --git a/code/datums/hud.dm b/code/datums/hud.dm
index e81ded951feb..2e8524da6306 100644
--- a/code/datums/hud.dm
+++ b/code/datums/hud.dm
@@ -7,7 +7,7 @@ GLOBAL_LIST_EMPTY(all_huds)
GLOBAL_LIST_EMPTY(huds_by_category)
//GLOBAL HUD LIST
-GLOBAL_LIST_INIT(huds, list(
+GLOBAL_ALIST_INIT(huds, alist(
DATA_HUD_SECURITY_BASIC = new /datum/atom_hud/data/human/security/basic(),
DATA_HUD_SECURITY_ADVANCED = new /datum/atom_hud/data/human/security/advanced(),
DATA_HUD_MEDICAL_BASIC = new /datum/atom_hud/data/human/medical/basic(),
@@ -18,13 +18,25 @@ GLOBAL_LIST_INIT(huds, list(
DATA_HUD_AI_DETECT = new /datum/atom_hud/ai_detector(),
DATA_HUD_FAN = new /datum/atom_hud/data/human/fan_hud(),
DATA_HUD_MALF_APC = new /datum/atom_hud/data/malf_apc(),
+ DATA_HUD_AUSPEX_AURAS = new /datum/atom_hud/data/auspex_aura(), // DARKPACK EDIT ADD
))
+/// Assoc list of traits to the huds they give.
GLOBAL_LIST_INIT(trait_to_hud, list(
- TRAIT_SECURITY_HUD = DATA_HUD_SECURITY_ADVANCED,
- TRAIT_MEDICAL_HUD = DATA_HUD_MEDICAL_ADVANCED,
- TRAIT_DIAGNOSTIC_HUD = DATA_HUD_DIAGNOSTIC,
+ TRAIT_ABDUCTOR_HUD = DATA_HUD_ABDUCTOR,
TRAIT_BOT_PATH_HUD = DATA_HUD_BOT_PATH,
+ TRAIT_CLOWN_ENJOYER = DATA_HUD_FAN,
+ TRAIT_DIAGNOSTIC_HUD = DATA_HUD_DIAGNOSTIC,
+ TRAIT_MEDICAL_HUD = DATA_HUD_MEDICAL_ADVANCED,
+ TRAIT_MEDICAL_HUD_SENSOR_ONLY = DATA_HUD_MEDICAL_BASIC,
+ TRAIT_MIME_FAN = DATA_HUD_FAN,
+ TRAIT_SECURITY_HUD = DATA_HUD_SECURITY_ADVANCED,
+ TRAIT_SECURITY_HUD_ID_ONLY = DATA_HUD_SECURITY_BASIC,
+))
+
+/// Assoc list of traits that block other traits' huds to list of hud (traits) that they block
+GLOBAL_LIST_INIT(trait_blockers_to_hud, list(
+ TRAIT_BLOCK_SECHUD = list(TRAIT_SECURITY_HUD, TRAIT_SECURITY_HUD_ID_ONLY),
))
/datum/atom_hud
@@ -46,7 +58,7 @@ GLOBAL_LIST_INIT(trait_to_hud, list(
var/list/mob/hud_users_all_z_levels = list()
///these will be the indexes for the atom's hud_list
- var/list/hud_icons = list()
+ var/list/hud_icons
///mobs associated with the next time this hud can be added to them
var/list/next_time_allowed = list()
@@ -64,6 +76,8 @@ GLOBAL_LIST_INIT(trait_to_hud, list(
for(var/z_level in 1 to world.maxz)
hud_atoms += list(list())
hud_users += list(list())
+ if(LAZYLEN(hud_icons))
+ hud_icons = string_list(hud_icons)
RegisterSignal(SSdcs, COMSIG_GLOB_NEW_Z, PROC_REF(add_z_level_huds))
diff --git a/code/datums/id_trim/centcom.dm b/code/datums/id_trim/centcom.dm
index 7432540f07f3..86d3ec5b9fc8 100644
--- a/code/datums/id_trim/centcom.dm
+++ b/code/datums/id_trim/centcom.dm
@@ -110,7 +110,7 @@
access = SSid_access.get_region_access_list(list(REGION_CENTCOM, REGION_ALL_STATION))
-/// Trim for Deathsquad officers. All Centcom and Station Access.
+/// Trim for Deathsquad officers. All Centcom and Station Access. No centcom officer's access
/datum/id_trim/centcom/deathsquad
assignment = JOB_ERT_DEATHSQUAD
trim_state = "trim_deathcommando"
@@ -122,7 +122,7 @@
/datum/id_trim/centcom/deathsquad/New()
. = ..()
- access = SSid_access.get_region_access_list(list(REGION_CENTCOM, REGION_ALL_STATION))
+ access = (SSid_access.get_region_access_list(list(REGION_CENTCOM)) - ACCESS_CENT_OFFICER) | (SSid_access.get_region_access_list(list(REGION_ALL_STATION)))
/// Trim for generic ERT interns. No universal ID card changing access.
/datum/id_trim/centcom/ert
@@ -135,7 +135,7 @@
access = list(ACCESS_CENT_GENERAL) | (SSid_access.get_region_access_list(list(REGION_ALL_STATION)) - ACCESS_CHANGE_IDS)
-/// Trim for ERT Commanders. All station and centcom access.
+/// Trim for ERT Commanders. All station and centcom access. No centcom officer's access
/datum/id_trim/centcom/ert/commander
assignment = JOB_ERT_COMMANDER
trim_state = "trim_ert_commander"
@@ -144,7 +144,7 @@
/datum/id_trim/centcom/ert/commander/New()
. = ..()
- access = SSid_access.get_region_access_list(list(REGION_CENTCOM, REGION_ALL_STATION))
+ access = (SSid_access.get_region_access_list(list(REGION_CENTCOM)) - ACCESS_CENT_OFFICER) | (SSid_access.get_region_access_list(list(REGION_ALL_STATION)))
/// Trim for generic ERT seccies. No universal ID card changing access.
/datum/id_trim/centcom/ert/security
diff --git a/code/datums/id_trim/jobs.dm b/code/datums/id_trim/jobs.dm
index 1f6f61eda0a7..eb9f063d64f9 100644
--- a/code/datums/id_trim/jobs.dm
+++ b/code/datums/id_trim/jobs.dm
@@ -291,6 +291,7 @@
subdepartment_color = COLOR_CARGO_BROWN
sechud_icon_state = SECHUD_CARGO_TECHNICIAN
minimal_access = list(
+ ACCESS_BUDGET,
ACCESS_CARGO,
ACCESS_MAINT_TUNNELS,
ACCESS_MECH_MINING,
@@ -353,6 +354,7 @@
ACCESS_MORGUE,
ACCESS_SURGERY,
ACCESS_VIROLOGY,
+ ACCESS_PARAMEDIC,
)
template_access = list(
ACCESS_CAPTAIN,
@@ -374,6 +376,7 @@
ACCESS_ATMOSPHERICS,
ACCESS_AUX_BASE,
ACCESS_BRIG_ENTRANCE,
+ ACCESS_BUDGET,
ACCESS_CE,
ACCESS_COMMAND,
ACCESS_CONSTRUCTION,
@@ -417,6 +420,7 @@
extra_wildcard_access = list()
minimal_access = list(
ACCESS_BRIG_ENTRANCE,
+ ACCESS_BUDGET,
ACCESS_COMMAND,
ACCESS_KEYCARD_AUTH,
ACCESS_PLUMBING,
@@ -432,6 +436,7 @@
ACCESS_RC_ANNOUNCE,
ACCESS_SURGERY,
ACCESS_VIROLOGY,
+ ACCESS_PARAMEDIC,
)
minimal_wildcard_access = list(
ACCESS_CMO,
@@ -467,7 +472,7 @@
ACCESS_HOP,
)
job = /datum/job/clown
- honorifics = list("the Clown")
+ honorifics = list(" the Clown")
honorific_positions = HONORIFIC_POSITION_LAST_FULL | HONORIFIC_POSITION_NONE
/datum/id_trim/job/cook
@@ -519,6 +524,7 @@
ACCESS_PSYCHOLOGY,
ACCESS_PHARMACY,
ACCESS_VIROLOGY,
+ ACCESS_PARAMEDIC,
)
template_access = list(
ACCESS_CAPTAIN,
@@ -631,6 +637,7 @@
ACCESS_AUX_BASE,
ACCESS_BAR,
ACCESS_BRIG_ENTRANCE,
+ ACCESS_BUDGET,
ACCESS_CARGO,
ACCESS_CHAPEL_OFFICE,
ACCESS_CHANGE_IDS,
@@ -689,6 +696,7 @@
ACCESS_BIT_DEN,
ACCESS_BRIG,
ACCESS_BRIG_ENTRANCE,
+ ACCESS_BUDGET,
ACCESS_CARGO,
ACCESS_COMMAND,
ACCESS_CONSTRUCTION,
@@ -797,6 +805,7 @@
ACCESS_PHARMACY,
ACCESS_SURGERY,
ACCESS_VIROLOGY,
+ ACCESS_PARAMEDIC,
)
template_access = list(
ACCESS_CAPTAIN,
@@ -825,7 +834,7 @@
ACCESS_HOP,
)
job = /datum/job/mime
- honorifics = list("the Mime")
+ honorifics = list(" the Mime")
honorific_positions = HONORIFIC_POSITION_LAST_FULL | HONORIFIC_POSITION_NONE
/datum/id_trim/job/paramedic
@@ -840,6 +849,7 @@
ACCESS_MAINT_TUNNELS,
ACCESS_MORGUE,
ACCESS_MECH_MEDICAL,
+ ACCESS_PARAMEDIC,
)
extra_access = list(
ACCESS_BIT_DEN,
@@ -946,6 +956,7 @@
minimal_access = list(
ACCESS_AUX_BASE,
ACCESS_BIT_DEN,
+ ACCESS_BUDGET,
ACCESS_CARGO,
ACCESS_MAINT_TUNNELS,
ACCESS_MECH_MINING,
@@ -989,6 +1000,7 @@
ACCESS_AI_UPLOAD,
ACCESS_AUX_BASE,
ACCESS_BRIG_ENTRANCE,
+ ACCESS_BUDGET,
ACCESS_COMMAND,
ACCESS_CONSTRUCTION,
ACCESS_EVA,
@@ -1194,6 +1206,7 @@
ACCESS_PLUMBING,
ACCESS_SURGERY,
ACCESS_VIROLOGY,
+ ACCESS_PARAMEDIC,
)
honorifics = list("Orderly", "Officer")
@@ -1329,6 +1342,7 @@
ACCESS_MINERAL_STOREROOM,
ACCESS_SECURITY,
ACCESS_WEAPONS,
+ ACCESS_BUDGET,
) // See /datum/job/warden/get_access()
extra_access = list(
ACCESS_DETECTIVE,
diff --git a/code/datums/id_trim/syndicate.dm b/code/datums/id_trim/syndicate.dm
index 28a0429d9352..9f35fafee426 100644
--- a/code/datums/id_trim/syndicate.dm
+++ b/code/datums/id_trim/syndicate.dm
@@ -105,6 +105,8 @@
/datum/id_trim/chameleon/operative/clown
assignment = "Syndicate Entertainment Operative"
trim_state = "trim_clown"
+ sechud_icon_state = SECHUD_CLOWNOPS
+
/// Trim for Chameleon ID cards. Many outfits, nuke ops and some corpses hold Chameleon ID cards.
/datum/id_trim/chameleon/operative/clown_leader
@@ -112,3 +114,4 @@
access = list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER)
big_pointer = TRUE
pointer_color = COLOR_SYNDIE_RED
+ sechud_icon_state = SECHUD_CLOWNOPS
diff --git a/code/datums/keybinding/_keybindings.dm b/code/datums/keybinding/_keybindings.dm
index 2973e4403de0..e92eaf1d1776 100644
--- a/code/datums/keybinding/_keybindings.dm
+++ b/code/datums/keybinding/_keybindings.dm
@@ -16,7 +16,7 @@
if(LAZYLEN(hotkey_keys) && !LAZYLEN(classic_keys))
classic_keys = hotkey_keys.Copy()
-/datum/keybinding/proc/down(client/user, turf/target)
+/datum/keybinding/proc/down(client/user, turf/target, mousepos_x, mousepos_y)
SHOULD_CALL_PARENT(TRUE)
return SEND_SIGNAL(user.mob, keybind_signal, target) & COMSIG_KB_ACTIVATED
diff --git a/code/datums/keybinding/admin.dm b/code/datums/keybinding/admin.dm
index 587e26096334..0e703d7e148a 100644
--- a/code/datums/keybinding/admin.dm
+++ b/code/datums/keybinding/admin.dm
@@ -19,7 +19,7 @@
description = "Go ghost"
keybind_signal = COMSIG_KB_ADMIN_AGHOST_DOWN
-/datum/keybinding/admin/admin_ghost/down(client/user, turf/target)
+/datum/keybinding/admin/admin_ghost/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -33,7 +33,7 @@
description = "Opens up the new player panel"
keybind_signal = COMSIG_KB_ADMIN_PLAYERPANELNEW_DOWN
-/datum/keybinding/admin/player_panel_new/down(client/user, turf/target)
+/datum/keybinding/admin/player_panel_new/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -47,7 +47,7 @@
description = "Toggles buildmode"
keybind_signal = COMSIG_KB_ADMIN_TOGGLEBUILDMODE_DOWN
-/datum/keybinding/admin/toggle_buildmode_self/down(client/user, turf/target)
+/datum/keybinding/admin/toggle_buildmode_self/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -61,7 +61,7 @@
description = "Enters stealth mode"
keybind_signal = COMSIG_KB_ADMIN_STEALTHMODETOGGLE_DOWN
-/datum/keybinding/admin/stealthmode/down(client/user, turf/target)
+/datum/keybinding/admin/stealthmode/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -75,7 +75,7 @@
description = "Toggles ghost-like invisibility (Don't abuse this)"
keybind_signal = COMSIG_KB_ADMIN_INVISIMINTOGGLE_DOWN
-/datum/keybinding/admin/invisimin/down(client/user, turf/target)
+/datum/keybinding/admin/invisimin/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -89,7 +89,7 @@
description = "Allows you to send a message to dead chat"
keybind_signal = COMSIG_KB_ADMIN_DSAY_DOWN
-/datum/keybinding/admin/deadsay/down(client/user, turf/target)
+/datum/keybinding/admin/deadsay/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -103,7 +103,7 @@
description = "Shed your admin powers"
keybind_signal = COMSIG_KB_ADMIN_DEADMIN_DOWN
-/datum/keybinding/admin/deadmin/down(client/user, turf/target)
+/datum/keybinding/admin/deadmin/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -117,7 +117,7 @@
description = "Regain your admin powers"
keybind_signal = COMSIG_KB_ADMIN_READMIN_DOWN
-/datum/keybinding/admin/readmin/down(client/user, turf/target)
+/datum/keybinding/admin/readmin/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -131,7 +131,7 @@
description = "Open the View-Tags menu"
keybind_signal = COMSIG_KB_ADMIN_VIEWTAGS_DOWN
-/datum/keybinding/admin/view_tags/down(client/user, turf/target)
+/datum/keybinding/admin/view_tags/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
diff --git a/code/datums/keybinding/artificial_intelligence.dm b/code/datums/keybinding/artificial_intelligence.dm
index fbb7023ed9cf..8bf01889afcb 100644
--- a/code/datums/keybinding/artificial_intelligence.dm
+++ b/code/datums/keybinding/artificial_intelligence.dm
@@ -12,7 +12,7 @@
description = "Reconnects you to your most recently used AI shell"
keybind_signal = COMSIG_KB_SILICON_RECONNECT_DOWN
-/datum/keybinding/artificial_intelligence/reconnect/down(client/user, turf/target)
+/datum/keybinding/artificial_intelligence/reconnect/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
diff --git a/code/datums/keybinding/client.dm b/code/datums/keybinding/client.dm
index 85d10add3098..aa178cc1e0c3 100644
--- a/code/datums/keybinding/client.dm
+++ b/code/datums/keybinding/client.dm
@@ -10,7 +10,7 @@
description = "Ask an admin for help."
keybind_signal = COMSIG_KB_CLIENT_GETHELP_DOWN
-/datum/keybinding/client/admin_help/down(client/user, turf/target)
+/datum/keybinding/client/admin_help/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -25,7 +25,7 @@
description = "Take a screenshot."
keybind_signal = COMSIG_KB_CLIENT_SCREENSHOT_DOWN
-/datum/keybinding/client/screenshot/down(client/user, turf/target)
+/datum/keybinding/client/screenshot/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -39,7 +39,7 @@
description = "Makes the game window fullscreen."
keybind_signal = COMSIG_KB_CLIENT_FULLSCREEN_DOWN
-/datum/keybinding/client/toggle_fullscreen/down(client/user, turf/target)
+/datum/keybinding/client/toggle_fullscreen/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -53,7 +53,7 @@
description = "Hide most HUD features"
keybind_signal = COMSIG_KB_CLIENT_MINIMALHUD_DOWN
-/datum/keybinding/client/minimal_hud/down(client/user, turf/target)
+/datum/keybinding/client/minimal_hud/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -67,7 +67,7 @@
description = "Closes all UI windows you have open."
keybind_signal = COMSIG_KB_CLIENT_CLOSEUI_DOWN
-/datum/keybinding/client/close_every_ui/down(client/user, turf/target)
+/datum/keybinding/client/close_every_ui/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
diff --git a/code/datums/keybinding/communication.dm b/code/datums/keybinding/communication.dm
index 403f5bd56556..bc77eee0f93e 100644
--- a/code/datums/keybinding/communication.dm
+++ b/code/datums/keybinding/communication.dm
@@ -7,7 +7,7 @@
full_name = "IC Say"
keybind_signal = COMSIG_KB_CLIENT_SAY_DOWN
-/datum/keybinding/client/communication/say/down(client/user, turf/target)
+/datum/keybinding/client/communication/say/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -21,7 +21,7 @@
full_name = "IC Radio (;)"
keybind_signal = COMSIG_KB_CLIENT_RADIO_DOWN
-/datum/keybinding/client/communication/radio/down(client/user, turf/target)
+/datum/keybinding/client/communication/radio/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -35,7 +35,7 @@
full_name = "Out Of Character Say (OOC)"
keybind_signal = COMSIG_KB_CLIENT_OOC_DOWN
-/datum/keybinding/client/communication/ooc/down(client/user, turf/target)
+/datum/keybinding/client/communication/ooc/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -49,7 +49,7 @@
full_name = "Custom Emote (/Me)"
keybind_signal = COMSIG_KB_CLIENT_ME_DOWN
-/datum/keybinding/client/communication/me/down(client/user, turf/target)
+/datum/keybinding/client/communication/me/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
diff --git a/code/datums/keybinding/emote.dm b/code/datums/keybinding/emote.dm
index 6ea7f89e5bce..71f9ba881350 100644
--- a/code/datums/keybinding/emote.dm
+++ b/code/datums/keybinding/emote.dm
@@ -11,7 +11,7 @@
name = initial(faketype.key)
full_name = capitalize(initial(faketype.key))
-/datum/keybinding/emote/down(client/user, turf/target)
+/datum/keybinding/emote/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
diff --git a/code/datums/keybinding/human.dm b/code/datums/keybinding/human.dm
index ab432c09e8d0..b2cc0966e8dc 100644
--- a/code/datums/keybinding/human.dm
+++ b/code/datums/keybinding/human.dm
@@ -12,7 +12,7 @@
description = "Quickly puts an item in the best slot available"
keybind_signal = COMSIG_KB_HUMAN_QUICKEQUIP_DOWN
-/datum/keybinding/human/quick_equip/down(client/user, turf/target)
+/datum/keybinding/human/quick_equip/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -31,7 +31,7 @@
var/slot_item_name = "belt"
keybind_signal = COMSIG_KB_HUMAN_QUICKEQUIPBELT_DOWN
-/datum/keybinding/human/quick_equip_belt/down(client/user, turf/target)
+/datum/keybinding/human/quick_equip_belt/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
diff --git a/code/datums/keybinding/living.dm b/code/datums/keybinding/living.dm
index 84a013c89abc..e750b96b02c0 100644
--- a/code/datums/keybinding/living.dm
+++ b/code/datums/keybinding/living.dm
@@ -12,7 +12,7 @@
description = "Break free of your current state. Handcuffed? on fire? Resist!"
keybind_signal = COMSIG_KB_LIVING_RESIST_DOWN
-/datum/keybinding/living/resist/down(client/user, turf/target)
+/datum/keybinding/living/resist/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -31,13 +31,13 @@
owner.hud_used.resist_icon.icon_state = owner.hud_used.resist_icon.base_icon_state
/datum/keybinding/living/look_up
- hotkey_keys = list("L")
+ hotkey_keys = list("P") // DARKPACK EDIT, ORIGINAL: hotkey_keys = list("L")
name = "look up"
full_name = "Look Up"
description = "Look up at the next z-level. Only works if directly below open space."
keybind_signal = COMSIG_KB_LIVING_LOOKUP_DOWN
-/datum/keybinding/living/look_up/down(client/user, turf/target)
+/datum/keybinding/living/look_up/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -58,7 +58,7 @@
description = "Look down at the previous z-level. Only works if directly above open space."
keybind_signal = COMSIG_KB_LIVING_LOOKDOWN_DOWN
-/datum/keybinding/living/look_down/down(client/user, turf/target)
+/datum/keybinding/living/look_down/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -79,7 +79,7 @@
description = "Lay down, or get up."
keybind_signal = COMSIG_KB_LIVING_REST_DOWN
-/datum/keybinding/living/rest/down(client/user, turf/target)
+/datum/keybinding/living/rest/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -95,7 +95,7 @@
keybind_signal = COMSIG_KB_LIVING_TOGGLE_COMBAT_DOWN
-/datum/keybinding/living/toggle_combat_mode/down(client/user, turf/target)
+/datum/keybinding/living/toggle_combat_mode/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -109,7 +109,7 @@
description = "Enable combat mode."
keybind_signal = COMSIG_KB_LIVING_ENABLE_COMBAT_DOWN
-/datum/keybinding/living/enable_combat_mode/down(client/user, turf/target)
+/datum/keybinding/living/enable_combat_mode/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -123,7 +123,7 @@
description = "Disable combat mode."
keybind_signal = COMSIG_KB_LIVING_DISABLE_COMBAT_DOWN
-/datum/keybinding/living/disable_combat_mode/down(client/user, turf/target)
+/datum/keybinding/living/disable_combat_mode/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -137,7 +137,7 @@
description = "Held down to cycle to the other move intent, release to cycle back"
keybind_signal = COMSIG_KB_LIVING_TOGGLEMOVEINTENT_DOWN
-/datum/keybinding/living/toggle_move_intent/down(client/user, turf/target)
+/datum/keybinding/living/toggle_move_intent/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -158,7 +158,7 @@
description = "Pressing this cycle to the opposite move intent, does not cycle back"
keybind_signal = COMSIG_KB_LIVING_TOGGLEMOVEINTENTALT_DOWN
-/datum/keybinding/living/toggle_move_intent_alternative/down(client/user, turf/target)
+/datum/keybinding/living/toggle_move_intent_alternative/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -188,7 +188,7 @@
description = "Hold this to turn on throw mode, and release it to turn off throw mode"
keybind_signal = COMSIG_KB_LIVING_HOLDTHROWMODE_DOWN
-/datum/keybinding/living/hold_throw_mode/down(client/user, turf/target)
+/datum/keybinding/living/hold_throw_mode/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -219,7 +219,7 @@
return FALSE
return TRUE
-/datum/keybinding/living/give/down(client/user, turf/target)
+/datum/keybinding/living/give/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
diff --git a/code/datums/keybinding/mob.dm b/code/datums/keybinding/mob.dm
index 081ea131f584..dc9b37565084 100644
--- a/code/datums/keybinding/mob.dm
+++ b/code/datums/keybinding/mob.dm
@@ -9,7 +9,7 @@
description = ""
keybind_signal = COMSIG_KB_MOB_STOPPULLING_DOWN
-/datum/keybinding/mob/stop_pulling/down(client/user, turf/target)
+/datum/keybinding/mob/stop_pulling/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -27,7 +27,7 @@
description = ""
keybind_signal = COMSIG_KB_MOB_SWAPHANDS_DOWN
-/datum/keybinding/mob/swap_hands/down(client/user, turf/target)
+/datum/keybinding/mob/swap_hands/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -52,7 +52,7 @@
keybind_signal = COMSIG_KB_MOB_SELECTLEFTHAND_DOWN
hand_index = LEFT_HANDS
-/datum/keybinding/mob/select_hand/down(client/user, turf/target)
+/datum/keybinding/mob/select_hand/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -72,7 +72,7 @@
description = "Uses whatever item you have inhand"
keybind_signal = COMSIG_KB_MOB_ACTIVATEINHAND_DOWN
-/datum/keybinding/mob/activate_inhand/down(client/user, turf/target)
+/datum/keybinding/mob/activate_inhand/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -84,24 +84,49 @@
hotkey_keys = list("X")
name = "drop_item"
full_name = "Drop Item"
- description = ""
+ description = "Drops the item in your active hand to the ground."
keybind_signal = COMSIG_KB_MOB_DROPITEM_DOWN
-/datum/keybinding/mob/drop_item/down(client/user, turf/target)
+/datum/keybinding/mob/drop_item/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
if(iscyborg(user.mob)) //cyborgs can't drop items
return FALSE
- var/mob/M = user.mob
- var/obj/item/I = M.get_active_held_item()
- if(!I)
+ var/mob/user_mob = user.mob
+ var/obj/item/item_dropped = user_mob.get_active_held_item()
+ if(!item_dropped)
to_chat(user, span_warning("You have nothing to drop in your hand!"))
- else
- user.mob.dropItemToGround(I)
+ return TRUE
+ user.mob.dropItemToGround(item_dropped)
+ return TRUE
+
+/datum/keybinding/mob/drop_item_specific
+ hotkey_keys = list("CtrlX")
+ name = "drop_item_specific"
+ full_name = "Drop Item (Specific)"
+ description = "Drops the item in your active where your mouse cursor is, if in range."
+ keybind_signal = COMSIG_KB_MOB_DROPITEM_DOWN
+
+/datum/keybinding/mob/drop_item_specific/down(client/user, turf/target, mousepos_x, mousepos_y)
+ . = ..()
+ if(.)
+ return
+ if(iscyborg(user.mob)) //cyborgs can't drop items
+ return FALSE
+ var/mob/user_mob = user.mob
+ var/obj/item/item_dropped = user_mob.get_active_held_item()
+ if(!item_dropped)
+ to_chat(user, span_warning("You have nothing to drop in your hand!"))
+ return TRUE
+ if(!user_mob.Adjacent(target) || target.is_blocked_turf(source_atom = item_dropped))
+ return TRUE
+ var/x_value = (mousepos_x >= 0) ? mousepos_x - ICON_SIZE_X / 2 : mousepos_x + ICON_SIZE_X / 2
+ var/y_value = (mousepos_y >= 0) ? mousepos_y - ICON_SIZE_Y / 2 : mousepos_y + ICON_SIZE_Y / 2
+ user_mob.transfer_item_to_turf(item_dropped, target, x_value, y_value)
return TRUE
-/datum/keybinding/mob/target/down(client/user, turf/target)
+/datum/keybinding/mob/target/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return .
@@ -210,7 +235,7 @@
description = "Prevents you from moving"
keybind_signal = COMSIG_KB_MOB_BLOCKMOVEMENT_DOWN
-/datum/keybinding/mob/prevent_movement/down(client/user, turf/target)
+/datum/keybinding/mob/prevent_movement/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
diff --git a/code/datums/keybinding/movement.dm b/code/datums/keybinding/movement.dm
index bcdf3d18c7bf..2f0be3ee4ae4 100644
--- a/code/datums/keybinding/movement.dm
+++ b/code/datums/keybinding/movement.dm
@@ -37,7 +37,7 @@
description = "Moves your character up a z-level if possible"
keybind_signal = COMSIG_KB_MOVEMENT_ZLEVEL_MOVEUP_DOWN
-/datum/keybinding/movement/zlevel_upwards/down(client/user, turf/target)
+/datum/keybinding/movement/zlevel_upwards/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -51,7 +51,7 @@
description = "Moves your character down a z-level if possible"
keybind_signal = COMSIG_KB_MOVEMENT_ZLEVEL_MOVEDOWN_DOWN
-/datum/keybinding/movement/zlevel_downwards/down(client/user, turf/target)
+/datum/keybinding/movement/zlevel_downwards/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
diff --git a/code/datums/keybinding/robot.dm b/code/datums/keybinding/robot.dm
index d7a89d57d928..b412a13585a6 100644
--- a/code/datums/keybinding/robot.dm
+++ b/code/datums/keybinding/robot.dm
@@ -12,7 +12,7 @@
description = "Equips or unequips the first module"
keybind_signal = COMSIG_KB_SILICON_TOGGLEMODULEONE_DOWN
-/datum/keybinding/robot/moduleone/down(client/user, turf/target)
+/datum/keybinding/robot/moduleone/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -27,7 +27,7 @@
description = "Equips or unequips the second module"
keybind_signal = COMSIG_KB_SILICON_TOGGLEMODULETWO_DOWN
-/datum/keybinding/robot/moduletwo/down(client/user, turf/target)
+/datum/keybinding/robot/moduletwo/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -42,7 +42,7 @@
description = "Equips or unequips the third module"
keybind_signal = COMSIG_KB_SILICON_TOGGLEMODULETHREE_DOWN
-/datum/keybinding/robot/modulethree/down(client/user, turf/target)
+/datum/keybinding/robot/modulethree/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -57,7 +57,7 @@
description = "Unequips the active module"
keybind_signal = COMSIG_KB_SILICON_UNEQUIPMODULE_DOWN
-/datum/keybinding/robot/unequip_module/down(client/user, turf/target)
+/datum/keybinding/robot/unequip_module/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
@@ -73,7 +73,7 @@
description = "Returns you to your AI core"
keybind_signal = COMSIG_KB_SILION_UNDEPLOY_DOWN
-/datum/keybinding/robot/undeploy/down(client/user, turf/target)
+/datum/keybinding/robot/undeploy/down(client/user, turf/target, mousepos_x, mousepos_y)
. = ..()
if(.)
return
diff --git a/code/datums/looping_sounds/_looping_sound.dm b/code/datums/looping_sounds/_looping_sound.dm
index 2b2b00e19a16..7080033c63f3 100644
--- a/code/datums/looping_sounds/_looping_sound.dm
+++ b/code/datums/looping_sounds/_looping_sound.dm
@@ -68,7 +68,13 @@
//If we reserve a random sound channel, store the channel number here so we can clean it up later.
var/reserved_channel
-/datum/looping_sound/New(_parent, start_immediately = FALSE, _direct = FALSE, _skip_starting_sounds = FALSE)
+/datum/looping_sound/New(
+ _parent,
+ start_immediately = FALSE,
+ _direct = FALSE,
+ _skip_starting_sounds = FALSE,
+ sound_channel,
+)
if(!mid_sounds)
WARNING("A looping sound datum was created without sounds to play.")
return
@@ -76,6 +82,8 @@
set_parent(_parent)
direct = _direct
skip_starting_sounds = _skip_starting_sounds
+ if(sound_channel)
+ src.sound_channel = sound_channel
if(start_immediately)
start()
@@ -164,9 +172,9 @@
*/
/datum/looping_sound/proc/play(soundfile, volume_override)
var/sound/sound_to_play = sound(soundfile)
+ sound_to_play.channel = sound_channel || SSsounds.random_available_channel()
+ sound_to_play.volume = volume_override || volume //Use volume as fallback if theres no override
if(direct)
- sound_to_play.channel = sound_channel || SSsounds.random_available_channel()
- sound_to_play.volume = volume_override || volume //Use volume as fallback if theres no override
SEND_SOUND(parent, sound_to_play)
else
playsound(
@@ -176,6 +184,7 @@
vary,
extra_range,
falloff_exponent = falloff_exponent,
+ channel = sound_to_play.channel,
pressure_affected = pressure_affected,
ignore_walls = ignore_walls,
falloff_distance = falloff_distance,
diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm
index bb7dd27e947a..55aa87b924c9 100644
--- a/code/datums/map_config.dm
+++ b/code/datums/map_config.dm
@@ -66,6 +66,8 @@
/// Boolean that tells SSmapping to load all away missions in the codebase.
var/load_all_away_missions = FALSE
+ var/max_npcs = 0 // DARKPACK EDIT ADD - NPC
+
/**
* Proc that simply loads the default map config, which should always be functional.
*/
@@ -251,6 +253,11 @@
maps_to_spawn += pick_weight_take(wilderness)
shuffle(maps_to_spawn)
+ // DARKPACK EDIT ADD START - NPC
+ if ("max_npcs" in json)
+ max_npcs = json["max_npcs"]
+ // DARKPACK EDIT ADD END
+
#ifdef UNIT_TESTS
// Check for unit tests to skip, no reason to check these if we're not running tests
for(var/path_as_text in json["ignored_unit_tests"])
diff --git a/code/datums/mapgen/CaveGenerator.dm b/code/datums/mapgen/CaveGenerator.dm
index ec27a7d4b8fa..3641edb4d93c 100644
--- a/code/datums/mapgen/CaveGenerator.dm
+++ b/code/datums/mapgen/CaveGenerator.dm
@@ -104,7 +104,7 @@
/datum/map_generator/cave_generator/generate_terrain(list/turfs, area/generate_in)
. = ..()
- if(!(generate_in.area_flags & CAVES_ALLOWED))
+ if(!(generate_in.area_flags_mapping & CAVES_ALLOWED))
return
if(length(possible_biomes))
@@ -138,7 +138,7 @@
* you're probably doing something wrong.
*/
/datum/map_generator/cave_generator/proc/generate_terrain_with_biomes(list/turfs, area/generate_in)
- if(!(generate_in.area_flags & CAVES_ALLOWED))
+ if(!(generate_in.area_flags_mapping & CAVES_ALLOWED))
return
var/humidity_seed = rand(0, 50000)
@@ -212,10 +212,10 @@
return populate_terrain_with_biomes(turfs, generate_in)
// Area var pullouts to make accessing in the loop faster
- var/flora_allowed = (generate_in.area_flags & FLORA_ALLOWED) && length(flora_spawn_list)
- var/feature_allowed = (generate_in.area_flags & FLORA_ALLOWED) && length(feature_spawn_list)
- var/mobs_allowed = (generate_in.area_flags & MOB_SPAWN_ALLOWED) && length(mob_spawn_list)
- var/megas_allowed = (generate_in.area_flags & MEGAFAUNA_SPAWN_ALLOWED) && length(megafauna_spawn_list)
+ var/flora_allowed = (generate_in.area_flags_mapping & FLORA_ALLOWED) && length(flora_spawn_list)
+ var/feature_allowed = (generate_in.area_flags_mapping & FLORA_ALLOWED) && length(feature_spawn_list)
+ var/mobs_allowed = (generate_in.area_flags_mapping & MOB_SPAWN_ALLOWED) && length(mob_spawn_list)
+ var/megas_allowed = (generate_in.area_flags_mapping & MEGAFAUNA_SPAWN_ALLOWED) && length(megafauna_spawn_list)
var/start_time = REALTIMEOFDAY
@@ -310,9 +310,9 @@
*/
/datum/map_generator/cave_generator/proc/populate_terrain_with_biomes(list/turfs, area/generate_in)
// Area var pullouts to make accessing in the loop faster
- var/flora_allowed = (generate_in.area_flags & FLORA_ALLOWED)
- var/features_allowed = (generate_in.area_flags & FLORA_ALLOWED)
- var/fauna_allowed = (generate_in.area_flags & MOB_SPAWN_ALLOWED)
+ var/flora_allowed = (generate_in.area_flags_mapping & FLORA_ALLOWED)
+ var/features_allowed = (generate_in.area_flags_mapping & FLORA_ALLOWED)
+ var/fauna_allowed = (generate_in.area_flags_mapping & MOB_SPAWN_ALLOWED)
var/start_time = REALTIMEOFDAY
diff --git a/code/datums/mapgen/Cavegens/IcemoonCaves.dm b/code/datums/mapgen/Cavegens/IcemoonCaves.dm
index 475465783617..153b0c22e804 100644
--- a/code/datums/mapgen/Cavegens/IcemoonCaves.dm
+++ b/code/datums/mapgen/Cavegens/IcemoonCaves.dm
@@ -26,11 +26,12 @@
///Note that this spawn list is also in the lavaland generator
weighted_feature_spawn_list = list(
- /obj/structure/geyser/hollowwater = 10,
- /obj/structure/geyser/plasma_oxide = 10,
- /obj/structure/geyser/protozine = 10,
+ /obj/structure/geyser/hollowwater = 8,
+ /obj/structure/geyser/plasma_oxide = 8,
+ /obj/structure/geyser/protozine = 8,
/obj/structure/geyser/random = 2,
- /obj/structure/geyser/wittel = 10,
+ /obj/structure/geyser/wittel = 8,
+ /obj/structure/geyser/chiral_buffer = 8,
/obj/structure/ore_vent/boss/icebox = 1,
)
@@ -45,11 +46,12 @@
feature_spawn_chance = 0.15
weighted_feature_spawn_list = list(
- /obj/structure/geyser/hollowwater = 10,
- /obj/structure/geyser/plasma_oxide = 10,
- /obj/structure/geyser/protozine = 10,
+ /obj/structure/geyser/hollowwater = 8,
+ /obj/structure/geyser/plasma_oxide = 8,
+ /obj/structure/geyser/protozine = 8,
/obj/structure/geyser/random = 2,
- /obj/structure/geyser/wittel = 10,
+ /obj/structure/geyser/wittel = 8,
+ /obj/structure/geyser/chiral_buffer = 8,
)
weighted_flora_spawn_list = list(
diff --git a/code/datums/mapgen/Cavegens/LavalandGenerator.dm b/code/datums/mapgen/Cavegens/LavalandGenerator.dm
index 47b62ce4a1ba..be4dc3710f27 100644
--- a/code/datums/mapgen/Cavegens/LavalandGenerator.dm
+++ b/code/datums/mapgen/Cavegens/LavalandGenerator.dm
@@ -29,11 +29,12 @@
///Note that this spawn list is also in the icemoon generator
weighted_feature_spawn_list = list(
- /obj/structure/geyser/hollowwater = 10,
- /obj/structure/geyser/plasma_oxide = 10,
- /obj/structure/geyser/protozine = 10,
+ /obj/structure/geyser/hollowwater = 8,
+ /obj/structure/geyser/plasma_oxide = 8,
+ /obj/structure/geyser/protozine = 8,
/obj/structure/geyser/random = 2,
- /obj/structure/geyser/wittel = 10,
+ /obj/structure/geyser/wittel = 8,
+ /obj/structure/geyser/chiral_buffer = 8,
/obj/structure/ore_vent/boss = 1,
)
diff --git a/code/datums/mapgen/JungleGenerator.dm b/code/datums/mapgen/JungleGenerator.dm
index da7d7353a28c..61c641923a10 100644
--- a/code/datums/mapgen/JungleGenerator.dm
+++ b/code/datums/mapgen/JungleGenerator.dm
@@ -31,6 +31,10 @@
)
///Used to select "zoom" level into the perlin noise, higher numbers result in slower transitions
var/perlin_zoom = 65
+ // DARKPACK EDIT ADD START
+ ///Biome that is chosen when height is above 0.85
+ var/fallback_biome = /datum/biome/mountain
+ // DARKPACK EDIT ADD END
///Seeds the rust-g perlin noise with a random number.
/datum/map_generator/jungle_generator/generate_terrain(list/turfs, area/generate_in)
@@ -74,7 +78,7 @@
humidity_level = BIOME_HIGH_HUMIDITY
selected_biome = possible_biomes[heat_level][humidity_level]
else //Over 0.85; It's a mountain
- selected_biome = /datum/biome/mountain
+ selected_biome = fallback_biome // DARKPACK EDIT CHANGE - /datum/biome/mountain
selected_biome = SSmapping.biomes[selected_biome] //Get the instance of this biome from SSmapping
selected_biome.generate_turf(gen_turf)
CHECK_TICK
diff --git a/code/datums/mapgen/biomes/_biome.dm b/code/datums/mapgen/biomes/_biome.dm
index c80c37608352..cbd4bfd27e9b 100644
--- a/code/datums/mapgen/biomes/_biome.dm
+++ b/code/datums/mapgen/biomes/_biome.dm
@@ -136,7 +136,6 @@
if(!(flora_allowed && length(flora_types)) && !(features_allowed && length(feature_types)) && !(fauna_allowed && length(fauna_types)))
return
-
for(var/turf/target_turf as anything in target_turfs)
// We do the CHECK_TICK here because there's a bunch of continue calls
// in this.
@@ -180,43 +179,61 @@
// DARKPACK EDIT CHANGE START
/datum/biome/mudlands
- turf_type = /turf/open/misc/dirt/vamp
+ turf_type = /turf/open/misc/dirt
flora_types = list(
- /obj/structure/small_vamprocks = 2,
- /obj/structure/vamprocks = 1,
- /obj/structure/big_vamprocks = 1,
+ /obj/structure/flora/rock/pile/darkpack = 2,
+ /obj/structure/flora/rock/darkpack = 1,
+ /obj/structure/flora/rock/darkpack_big = 1,
)
flora_density = 3
/datum/biome/plains
- turf_type = /turf/open/misc/grass/vamp
+ turf_type = /turf/open/misc/grass
flora_types = list(
- /obj/structure/flora/bush/sparsegrass/style_random = 5,
+ /obj/effect/spawner/random/flora/grass = 25,
+ /obj/effect/spawner/random/flora/bushes = 10,
/obj/structure/flora/tree/vamp/pine = 1,
- /obj/structure/small_vamprocks = 1,
- /obj/structure/vamprocks = 1,
+ /obj/structure/flora/rock/pile/darkpack = 1,
+ /obj/structure/flora/rock/darkpack = 1,
)
- flora_density = 50
+ flora_density = 60
+ fauna_types = list(
+ /mob/living/basic/butterfly = 30,
+ /mob/living/basic/deer = 10,
+ /mob/living/basic/goose = 5,
+ /mob/living/basic/frog = 5,
+ /mob/living/basic/pet/fox = 1,
+ )
+ fauna_density = 2
/datum/biome/jungle
- turf_type = /turf/open/misc/grass/vamp
+ turf_type = /turf/open/misc/grass
flora_types = list(
- /obj/structure/flora/bush/sparsegrass/style_random = 1,
- /obj/structure/flora/tree/vamp/pine = 2,
- /obj/structure/small_vamprocks = 1,
- /obj/structure/vamprocks = 1,
+ /obj/effect/spawner/random/flora/grass = 5,
+ /obj/effect/spawner/random/flora/bushes = 2,
+ /obj/structure/flora/tree/vamp/pine = 3,
+ /obj/structure/flora/rock/pile/darkpack = 1,
+ /obj/structure/flora/rock/darkpack = 1,
)
- flora_density = 40
+ flora_density = 30
+ fauna_types = list(
+ /mob/living/basic/butterfly = 30,
+ /mob/living/basic/deer = 10,
+ /mob/living/basic/goose = 5,
+ /mob/living/basic/frog = 5,
+ /mob/living/basic/pet/fox = 1,
+ )
+ fauna_density = 1
/datum/biome/jungle/deep
- flora_density = 65
+ flora_density = 50
/datum/biome/wasteland
- turf_type = /turf/open/misc/dirt/vamp
+ turf_type = /turf/open/misc/dirt
flora_types = list(
- /obj/structure/small_vamprocks = 10,
- /obj/structure/vamprocks = 2,
- /obj/structure/big_vamprocks = 1,
+ /obj/structure/flora/rock/pile/darkpack = 10,
+ /obj/structure/flora/rock/darkpack = 2,
+ /obj/structure/flora/rock/darkpack_big = 1,
)
flora_density = 5
@@ -224,5 +241,5 @@
turf_type = /turf/open/water/beach/vamp
/datum/biome/mountain
- turf_type = /turf/closed/mineral/random/jungle
+ turf_type = /turf/closed/wall/vampwall/rock
// DARKPACK EDIT CHANGE END
diff --git a/code/datums/martial/boxing.dm b/code/datums/martial/boxing.dm
index 895d0faa6138..03ae3f3202e5 100644
--- a/code/datums/martial/boxing.dm
+++ b/code/datums/martial/boxing.dm
@@ -3,18 +3,27 @@
#define LEFT_LEFT_COMBO "HH"
#define RIGHT_RIGHT_COMBO "DD"
+#define STRAIGHT_PUNCH "straight_punch"
+#define RIGHT_HOOK "right_hook"
+#define LEFT_HOOK "left_hook"
+#define UPPERCUT "uppercut"
+#define LIGHT_JAB "light_jab"
+#define DISCOMBOBULATE "discombobulate"
+#define BLIND_JAB "blind_jab"
+#define CRAVEN_BLOW "craven_blow"
+#define NO_COMBO ""
+
/datum/martial_art/boxing
name = "Boxing"
id = MARTIALART_BOXING
pacifist_style = TRUE
+ help_verb = /mob/living/proc/boxing_help
/// Boolean on whether we are sportsmanlike in our tussling; TRUE means we have restrictions
var/honorable_boxer = TRUE
/// Default damage type for our boxing.
var/default_damage_type = STAMINA
/// List of traits applied to users of this martial art.
var/list/boxing_traits = list(TRAIT_BOXING_READY)
- /// Balloon alert cooldown for warning our boxer to alternate their blows to get more damage
- COOLDOWN_DECLARE(warning_cooldown)
/datum/martial_art/boxing/can_teach(mob/living/new_holder)
return ishuman(new_holder)
@@ -31,23 +40,39 @@
///Unlike most instances of this proc, this is actually called in _proc/tussle()
///Returns a multiplier on our skill damage bonus.
-/datum/martial_art/boxing/proc/check_streak(mob/living/attacker, mob/living/defender)
- var/combo_multiplier = 1
+/datum/martial_art/boxing/proc/check_streak(mob/living/attacker, mob/living/defender, obj/item/bodypart/arm/active_arm)
+ if(check_behind(attacker, defender) && !honorable_boxer)
+ reset_streak()
+ return CRAVEN_BLOW
+
+ if(HAS_TRAIT(attacker, TRAIT_DETECTIVES_TASTE) && defender.is_blind()) //In short: discombobulate
+ reset_streak()
+ return DISCOMBOBULATE
+
+ if(findtext(streak, LEFT_LEFT_COMBO) && active_arm.body_zone == BODY_ZONE_R_ARM || findtext(streak, RIGHT_RIGHT_COMBO) && active_arm.body_zone == BODY_ZONE_L_ARM)
+ reset_streak()
+ if(attacker.is_blind())
+ return BLIND_JAB
+ else
+ return LIGHT_JAB
- if(findtext(streak, LEFT_LEFT_COMBO) || findtext(streak, RIGHT_RIGHT_COMBO))
+ else if(findtext(streak, LEFT_LEFT_COMBO) && active_arm.body_zone == BODY_ZONE_L_ARM || findtext(streak, RIGHT_RIGHT_COMBO) && active_arm.body_zone == BODY_ZONE_R_ARM)
reset_streak()
- if(COOLDOWN_FINISHED(src, warning_cooldown))
- COOLDOWN_START(src, warning_cooldown, 2 SECONDS)
- attacker.balloon_alert(attacker, "weak combo, alternate your hits!")
- return combo_multiplier * 0.5
+ return STRAIGHT_PUNCH
if(findtext(streak, LEFT_RIGHT_COMBO) || findtext(streak, RIGHT_LEFT_COMBO))
reset_streak()
- // If we have an extra effect from the combo, perform it here. By default, we have no extra effect.
- perform_extra_effect(attacker, defender)
- return combo_multiplier * 1.5
+ if(active_arm.body_zone == BODY_ZONE_L_ARM)
+ if(findtext(streak, RIGHT_LEFT_COMBO))
+ return LEFT_HOOK
- return combo_multiplier
+ else if(active_arm.body_zone == BODY_ZONE_R_ARM)
+ if(findtext(streak, LEFT_RIGHT_COMBO))
+ return RIGHT_HOOK
+ else
+ return UPPERCUT
+
+ return NO_COMBO
/// An extra effect on some moves and attacks.
/datum/martial_art/boxing/proc/perform_extra_effect(mob/living/attacker, mob/living/defender)
@@ -56,7 +81,7 @@
/datum/martial_art/boxing/disarm_act(mob/living/attacker, mob/living/defender)
if(honor_check(defender))
add_to_streak("D", defender)
- tussle(attacker, defender, "right hook", "right hooked")
+ tussle(attacker, defender)
return MARTIAL_ATTACK_SUCCESS
/datum/martial_art/boxing/grab_act(mob/living/attacker, mob/living/defender)
@@ -68,14 +93,14 @@
/datum/martial_art/boxing/harm_act(mob/living/attacker, mob/living/defender)
if(honor_check(defender))
add_to_streak("H", defender)
- tussle(attacker, defender, "left hook", "left hooked")
+ tussle(attacker, defender)
return MARTIAL_ATTACK_SUCCESS
// Our only boxing move, which occurs on literally all attacks; the tussle. However, quite a lot morphs the results of this proc. Combos, unlike most martial arts attacks, are checked in this proc rather than our standard unarmed procs
-/datum/martial_art/boxing/proc/tussle(mob/living/attacker, mob/living/defender, atk_verb = "blind jab", atk_verbed = "blind jabbed")
+/datum/martial_art/boxing/proc/tussle(mob/living/attacker, mob/living/defender)
if(honorable_boxer) //Being a good sport, you never hit someone on the ground or already knocked down. It shows you're the better person.
- if(defender.body_position == LYING_DOWN && defender.getStaminaLoss() >= 100 || defender.IsUnconscious()) //If they're in stamcrit or unconscious, don't bloody punch them
+ if(defender.body_position == LYING_DOWN && defender.get_stamina_loss() >= 100 || defender.IsUnconscious()) //If they're in stamcrit or unconscious, don't bloody punch them
attacker.balloon_alert(attacker, "unsportsmanlike behaviour!")
return FALSE
@@ -102,45 +127,108 @@
attacker.do_attack_animation(defender, ATTACK_EFFECT_PUNCH)
+ // Our potential wound bonus on a punch. Only applies if we're dishonorable. Otherwise, we can't wound.
+ var/possible_wound_bonus = honorable_boxer ? 0 : CANT_WOUND
+
// Determines damage dealt on a punch. Against a boxing defender, we apply our skill bonus.
var/damage = rand(lower_force, upper_force)
- if(honor_check(defender))
- var/strength_bonus = HAS_TRAIT(attacker, TRAIT_STRENGTH) ? 2 : 0 //Investing into genetic strength improvements makes you a better boxer
-
- var/obj/item/organ/cyberimp/chest/spine/potential_spine = attacker.get_organ_slot(ORGAN_SLOT_SPINE) //Getting a cyberspine also pushes you further than just mere meat
- if(istype(potential_spine))
- strength_bonus *= potential_spine.strength_bonus
-
- damage += round(athletics_skill * check_streak(attacker, defender) + strength_bonus, 1)
- grant_experience = TRUE
+ // Attack verbs for our visible chat messages.
+ var/current_atk_verb = "punches"
+ var/current_atk_verbed = "punched"
- var/current_atk_verb = atk_verb
- var/current_atk_verbed = atk_verbed
-
- if(is_detective_job(attacker.mind?.assigned_role)) //In short: discombobulate
- current_atk_verb = "discombobulate"
- current_atk_verbed = "discombulated"
+ if(defender.check_block(attacker, damage, "[attacker]'s punch", UNARMED_ATTACK))
+ return FALSE
// Similar to a normal punch, should we have a value of 0 for our lower force, we simply miss outright.
if(!lower_force)
playsound(defender.loc, active_arm.unarmed_miss_sound, 25, TRUE, -1)
- defender.visible_message(span_warning("[attacker]'s [current_atk_verb] misses [defender]!"), \
- span_danger("You avoid [attacker]'s [current_atk_verb]!"), span_hear("You hear a swoosh!"), COMBAT_MESSAGE_RANGE, attacker)
- to_chat(attacker, span_warning("Your [current_atk_verb] misses [defender]!"))
- log_combat(attacker, defender, "attempted to hit", current_atk_verb)
- return FALSE
-
- if(defender.check_block(attacker, damage, "[attacker]'s [current_atk_verb]", UNARMED_ATTACK))
+ defender.visible_message(span_warning("[attacker]'s punch misses [defender]!"), \
+ span_danger("You avoid [attacker]'s punch!"), span_hear("You hear a swoosh!"), COMBAT_MESSAGE_RANGE, attacker)
+ to_chat(attacker, span_warning("Your punch misses [defender]!"))
+ log_combat(attacker, defender, "attempted to hit", "punch (boxing) ")
return FALSE
var/obj/item/bodypart/affecting = defender.get_bodypart(defender.get_random_valid_zone(attacker.zone_selected))
+
+ if(honor_check(defender))
+ var/strength_bonus = HAS_TRAIT(attacker, TRAIT_STRENGTH) ? 2 : 0 //Investing into genetic strength improvements makes you a better boxer
+
+ var/obj/item/organ/cyberimp/chest/spine/potential_spine = attacker.get_organ_slot(ORGAN_SLOT_SPINE) //Getting a cyberspine also pushes you further than just mere meat
+ if(istype(potential_spine))
+ strength_bonus *= potential_spine.strength_bonus
+
+ var/streak_augmentation = check_streak(attacker, defender, active_arm)
+
+ var/combo_multiplier = 0
+
+ switch(streak_augmentation)
+ if(STRAIGHT_PUNCH)
+ current_atk_verb = "straight punches"
+ current_atk_verbed = "straight punched"
+ combo_multiplier = 1
+
+ if(LIGHT_JAB)
+ current_atk_verb = "light jabs"
+ current_atk_verbed = "light jabbed"
+ combo_multiplier = 1
+
+ if(LEFT_HOOK)
+ current_atk_verb = "left hooks"
+ current_atk_verbed = "left hooked"
+ combo_multiplier = 1.5
+ attacker.changeNext_move(CLICK_CD_MELEE * 1.5)
+
+ if(RIGHT_HOOK)
+ current_atk_verb = "right hooks"
+ current_atk_verbed = "right hooked"
+ combo_multiplier = 1.5
+ attacker.changeNext_move(CLICK_CD_MELEE * 1.5)
+
+ if(UPPERCUT)
+ current_atk_verb = "uppercuts"
+ current_atk_verbed = "uppercutted"
+ base_unarmed_effectiveness *= 1.5
+ combo_multiplier = 1
+ attacker.changeNext_move(CLICK_CD_MELEE * 1.5)
+
+ if(DISCOMBOBULATE)
+ current_atk_verb = "discombobulates"
+ current_atk_verbed = "discombobulated"
+ affecting = defender.get_bodypart(defender.get_random_valid_zone(BODY_ZONE_HEAD))
+ defender.adjust_confusion_up_to(20 SECONDS, 50 SECONDS)
+ defender.adjust_dizzy_up_to(20 SECONDS, 50 SECONDS)
+ combo_multiplier = 1
+
+ if(BLIND_JAB)
+ current_atk_verb = "blind jabs"
+ current_atk_verbed = "blind jabbed"
+ combo_multiplier = 0.5
+ attacker.changeNext_move(CLICK_CD_MELEE * 1.5)
+
+ if(CRAVEN_BLOW)
+ current_atk_verb = "sucker punches"
+ current_atk_verbed = "sucker punch"
+ possible_wound_bonus = damage
+ combo_multiplier = 2
+ possible_wound_bonus *= 1.5
+ affecting = defender.get_bodypart(defender.get_random_valid_zone(BODY_ZONE_HEAD))
+ defender.adjust_staggered_up_to(STAGGERED_SLOWDOWN_LENGTH, 10 SECONDS) //why yes, this could result in them being knocked out in one.
+
+ damage += round((athletics_skill + strength_bonus) * combo_multiplier, 1)
+
+ if(combo_multiplier >= 1)
+ perform_extra_effect(attacker, defender)
+
+ if(defender.stat <= HARD_CRIT) // Do not grant experience against dead targets
+ grant_experience = TRUE
+
var/armor_block = defender.run_armor_check(affecting, MELEE, armour_penetration = base_unarmed_effectiveness)
playsound(defender, attack_sound, 25, TRUE, -1)
defender.visible_message(
- span_danger("[attacker] [current_atk_verbed] [defender]!"),
+ span_danger("[attacker] [current_atk_verb] [defender]!"),
span_userdanger("You're [current_atk_verbed] by [attacker]!"),
span_hear("You hear a sickening sound of flesh hitting flesh!"),
COMBAT_MESSAGE_RANGE,
@@ -152,7 +240,7 @@
// Determines the total amount of experience earned per punch
var/experience_earned = round(damage/4, 1)
- defender.apply_damage(damage, damage_type, affecting, armor_block)
+ defender.apply_damage(damage, damage_type, affecting, armor_block, wound_bonus = possible_wound_bonus)
log_combat(attacker, defender, "punched (boxing) ")
@@ -160,7 +248,7 @@
return TRUE
if(grant_experience)
- skill_experience_adjustment(attacker, (damage/lower_force))
+ skill_experience_adjustment(attacker, defender, (damage/lower_force))
//Determine our attackers athletics level as a knockout probability bonus
var/attacker_athletics_skill = (attacker.mind?.get_skill_modifier(/datum/skill/athletics, SKILL_RANDS_MODIFIER) + base_unarmed_effectiveness)
@@ -180,7 +268,7 @@
playsound(defender, 'sound/effects/coin2.ogg', 40, TRUE)
new /obj/effect/temp_visual/crit(get_turf(defender))
- skill_experience_adjustment(attacker, experience_earned) //double experience for a successful crit
+ skill_experience_adjustment(attacker, defender, experience_earned) //double experience for a successful crit
return TRUE
@@ -210,6 +298,10 @@
to_chat(attacker, span_danger("You stagger [defender] with a haymaker!"))
log_combat(attacker, defender, "staggered (boxing) ")
+ if(attacker.pulling == defender && attacker.grab_state >= GRAB_AGGRESSIVE) // dubious a normal boxer will be in a state where this happens, buuuut.
+ var/atom/throw_target = get_edge_target_turf(defender, attacker.dir)
+ defender.throw_at(throw_target, 2, 2, attacker)
+
/// Returns whether whoever is checked by this proc is complying with the rules of boxing. The boxer cannot block non-boxers, and cannot apply their scariest moves against non-boxers.
/datum/martial_art/boxing/proc/honor_check(mob/living/possible_boxer)
if(!honorable_boxer)
@@ -221,7 +313,7 @@
return TRUE
/// Handles our instances of experience gain while boxing. It also applies the exercised status effect.
-/datum/martial_art/boxing/proc/skill_experience_adjustment(mob/living/boxer, experience_value)
+/datum/martial_art/boxing/proc/skill_experience_adjustment(mob/living/boxer, mob/living/defender, experience_value)
//Boxing in heavier gravity gives you more experience
var/gravity_modifier = boxer.has_gravity() > STANDARD_GRAVITY ? 1 : 2
@@ -261,7 +353,7 @@
experience_earned = 2
// WE reward experience for getting punched while boxing
- skill_experience_adjustment(boxer, experience_earned) //just getting hit a bunch doesn't net you much experience however
+ skill_experience_adjustment(boxer, attacker, experience_earned) //just getting hit a bunch doesn't net you much experience however
if(!prob(block_chance))
return NONE
@@ -285,6 +377,23 @@
return FALSE
return ..()
+/mob/living/proc/boxing_help()
+ set name = "Focus on your Form"
+ set desc = "You focus on how to make the most of your boxing form."
+ set category = "Boxing"
+ to_chat(usr, "You focus on your form, visualizing how best to throw a punch.")
+
+ to_chat(usr, "What moves you perform depend on what mouse buttons you click, and whether the last button clicked matches which hand you have selected when you throw the last punch.")
+
+ to_chat(usr, "[span_notice("Straight Punch")]: Left Left/Right Right with the matching hand. Regular damage.")
+ to_chat(usr, "[span_notice("Jab")]: Left Left/Right Right with the opposite hand. Regular damage. If you're blind, you'll make a blind jab instead.")
+ to_chat(usr, "[span_notice("Left/Right Hook")]: Left Right/Right Left with the matching hand. Does extra damage, but slows your next hit.")
+ to_chat(usr, "[span_notice("Uppercut")]: Left Right/Right Left with the opposite hand. Has a higher probability to knock out the target, but slows your next hit.")
+
+ to_chat(usr, "While in Throw Mode, you can block incoming punches and return a bit of damage back to an attacker. Blocking attacks this way causes you to lose some stamina damage.")
+
+ to_chat(usr, "Your boxing abilities are only able to be used on other boxers.")
+
// Boxing Variants!
/// Evil Boxing; for sick, evil scoundrels. Has no honor, making it more lethal (therefore unable to be used by pacifists).
@@ -294,9 +403,26 @@
name = "Evil Boxing"
id = MARTIALART_EVIL_BOXING
pacifist_style = FALSE
+ help_verb = /mob/living/proc/evil_boxing_help
honorable_boxer = FALSE
boxing_traits = list(TRAIT_BOXING_READY, TRAIT_STRENGTH, TRAIT_STIMMED)
+/mob/living/proc/evil_boxing_help()
+ set name = "Focus on Brawling"
+ set desc = "You ponder how best to rearrange the faces of your enemies."
+ set category = "Evil Boxing"
+ to_chat(usr, "You contemplate on the violence ahead, visualizing how best to throw a punch.")
+
+ to_chat(usr, "What moves you perform depend on what mouse buttons you click, and whether the last button clicked matches which hand you have selected when you throw the last punch.")
+
+ to_chat(usr, "[span_notice("Straight Punch")]: Left Left/Right Right with the matching hand. Regular damage.")
+ to_chat(usr, "[span_notice("Jab")]: Left Left/Right Right with the opposite hand. Regular damage. If you're blind, you'll make a blind jab instead.")
+ to_chat(usr, "[span_notice("Left/Right Hook")]: Left Right/Right Left with the matching hand. Does extra damage, but slows your next hit.")
+ to_chat(usr, "[span_notice("Uppercut")]: Left Right/Right Left with the opposite hand. Has a higher probability to knock out the target, but slows your next hit.")
+ to_chat(usr, "[span_notice("Sucker Punch")]: Any combination done to a vulnerable target becomes a sucker punch. This could knock them out in one!.")
+
+ to_chat(usr, "While in Throw Mode, you can block incoming punches and return a bit of damage back to an attacker. Blocking attacks this way causes you to lose some stamina damage.")
+
/// Hunter Boxing: for the uncaring, completely deranged one-spacer ecological disaster.
/// The honor check accepts boxing ready targets, OR various biotypes as valid targets. Uses a special crit effect rather than the standard one (against monsters).
/// I guess technically, this allows for lethal boxing. If you want.
@@ -304,14 +430,33 @@
name = "Hunter Boxing"
id = MARTIALART_HUNTER_BOXING
pacifist_style = FALSE
+ help_verb = /mob/living/proc/hunter_boxing_help
default_damage_type = BRUTE
boxing_traits = list(TRAIT_BOXING_READY)
/// The mobs we are looking for to pass the honor check
- var/honorable_mob_biotypes = MOB_BEAST | MOB_SPECIAL | MOB_PLANT | MOB_BUG | MOB_MINING
+ var/honorable_mob_biotypes = MOB_BEAST | MOB_SPECIAL | MOB_PLANT | MOB_BUG | MOB_MINING | MOB_CRUSTACEAN | MOB_REPTILE
/// Our crit shout words. First word is then paired with a second word to form an attack name.
var/list/first_word_strike = list("Extinction", "Brutalization", "Explosion", "Adventure", "Thunder", "Lightning", "Sonic", "Atomizing", "Whirlwind", "Tornado", "Shark", "Falcon")
var/list/second_word_strike = list(" Punch", " Pawnch", "-punch", " Jab", " Hook", " Fist", " Uppercut", " Straight", " Strike", " Lunge")
+/mob/living/proc/hunter_boxing_help()
+ set name = "Focus on the Hunt"
+ set desc = "You focus on how to most effectively punch the hell out of another endangered species."
+ set category = "Hunter Boxing"
+ to_chat(usr, "You focus on your Fists. You focus on Adventure. You focus on the Hunt.")
+
+ to_chat(usr, "What moves you perform depend on what mouse buttons you click, and whether the last button clicked matches which hand you have selected when you throw the last punch.")
+
+ to_chat(usr, "[span_notice("Straight Punch")]: Left Left/Right Right with the matching hand. Regular damage.")
+ to_chat(usr, "[span_notice("Jab")]: Left Left/Right Right with the opposite hand. Regular damage. If you're blind, you'll make a blind jab instead.")
+ to_chat(usr, "[span_notice("Left/Right Hook")]: Left Right/Right Left with the matching hand. Does extra damage, but slows your next hit.")
+ to_chat(usr, "[span_notice("Uppercut")]: Left Right/Right Left with the opposite hand. Has a higher probability to critically hit the target, but slows your next hit.")
+
+ to_chat(usr, "While in Throw Mode, you can block incoming punches and return a bit of damage back to an attacker. Blocking attacks this way causes you to lose some stamina damage.")
+ to_chat(usr, "Stringing together effective combos restores some of your health and deals even more damage.")
+
+ to_chat(usr, "Your hunter boxing abilities are only able to be used on the various flora, fauna and unnatural creatures that reside in this universe. Against normal humanoids, you are just a boxer.")
+
/datum/martial_art/boxing/hunter/honor_check(mob/living/possible_boxer)
if(HAS_TRAIT(possible_boxer, TRAIT_BOXING_READY))
return TRUE
@@ -360,7 +505,26 @@
defender.apply_damage(rand(15,20), default_damage_type, BODY_ZONE_CHEST)
+/datum/martial_art/boxing/hunter/skill_experience_adjustment(mob/living/boxer, mob/living/defender, experience_value)
+ if(defender.mob_biotypes & MOB_HUMANOID && !istype(defender, /mob/living/simple_animal/hostile/megafauna))
+ return ..() //IF they're a normal human, we give the normal amount of experience instead
+
+ var/gravity_modifier = boxer.has_gravity() > STANDARD_GRAVITY ? 2 : 1
+ var/big_game_bonus = (defender.maxHealth / 500)
+
+ boxer.mind?.adjust_experience(/datum/skill/athletics, round(experience_value * (gravity_modifier + big_game_bonus), 1))
+
#undef LEFT_RIGHT_COMBO
#undef RIGHT_LEFT_COMBO
#undef LEFT_LEFT_COMBO
#undef RIGHT_RIGHT_COMBO
+
+#undef STRAIGHT_PUNCH
+#undef RIGHT_HOOK
+#undef LEFT_HOOK
+#undef UPPERCUT
+#undef LIGHT_JAB
+#undef DISCOMBOBULATE
+#undef BLIND_JAB
+#undef CRAVEN_BLOW
+#undef NO_COMBO
diff --git a/code/datums/martial/cqc.dm b/code/datums/martial/cqc.dm
index f2d65bf20ac1..4e3815a1e5dd 100644
--- a/code/datums/martial/cqc.dm
+++ b/code/datums/martial/cqc.dm
@@ -50,20 +50,30 @@
return NONE
if(attack_type == PROJECTILE_ATTACK)
return NONE
- if(!prob(block_chance))
+
+ var/blocking_text = "block"
+ var/blocking_text_s = "blocks"
+ var/potential_block_chance = block_chance
+
+ if(attack_type == OVERWHELMING_ATTACK)
+ blocking_text = "dodge"
+ blocking_text_s = "dodges"
+ potential_block_chance = clamp(round(potential_block_chance / (attack_type == OVERWHELMING_ATTACK ? 2 : 1), 1), 0, 100)
+
+ if(!prob(potential_block_chance))
return NONE
var/mob/living/attacker = GET_ASSAILANT(hitby)
if(istype(attacker) && cqc_user.Adjacent(attacker))
cqc_user.visible_message(
- span_danger("[cqc_user] blocks [attack_text] and twists [attacker]'s arm behind [attacker.p_their()] back!"),
- span_userdanger("You block [attack_text]!"),
+ span_danger("[cqc_user] [blocking_text_s] [attack_text] and twists [attacker]'s arm behind [attacker.p_their()] back!"),
+ span_userdanger("You [blocking_text] [attack_text]!"),
)
attacker.Stun(4 SECONDS)
else
cqc_user.visible_message(
- span_danger("[cqc_user] blocks [attack_text]!"),
- span_userdanger("You block [attack_text]!"),
+ span_danger("[cqc_user] [blocking_text_s] [attack_text]!"),
+ span_userdanger("You [blocking_text] [attack_text]!"),
)
return SUCCESSFUL_BLOCK
@@ -115,7 +125,7 @@
return FALSE
attacker.do_attack_animation(defender)
- if(defender.body_position == LYING_DOWN && !defender.IsUnconscious() && defender.getStaminaLoss() >= 100)
+ if(defender.body_position == LYING_DOWN && !defender.IsUnconscious() && defender.get_stamina_loss() >= 100)
log_combat(attacker, defender, "knocked out (Head kick)(CQC)")
defender.visible_message(
span_danger("[attacker] kicks [defender]'s head, knocking [defender.p_them()] out!"),
@@ -130,7 +140,7 @@
var/helmet_protection = defender.run_armor_check(BODY_ZONE_HEAD, MELEE)
defender.apply_effect(20 SECONDS, EFFECT_KNOCKDOWN, helmet_protection)
defender.apply_effect(10 SECONDS, EFFECT_UNCONSCIOUS, helmet_protection)
- defender.adjustOrganLoss(ORGAN_SLOT_BRAIN, 15, 150)
+ defender.adjust_organ_loss(ORGAN_SLOT_BRAIN, 15, 150)
else
defender.visible_message(
@@ -146,7 +156,7 @@
defender.throw_at(throw_target, 1, 14, attacker)
defender.apply_damage(10, attacker.get_attack_type())
if(defender.body_position == LYING_DOWN && !defender.IsUnconscious())
- defender.adjustStaminaLoss(45)
+ defender.adjust_stamina_loss(45)
log_combat(attacker, defender, "kicked (CQC)")
return TRUE
@@ -162,7 +172,7 @@
attacker,
)
to_chat(attacker, span_danger("You punch [defender]'s neck!"))
- defender.adjustStaminaLoss(60)
+ defender.adjust_stamina_loss(60)
playsound(attacker, 'sound/items/weapons/cqchit1.ogg', 50, TRUE, -1)
return TRUE
@@ -181,7 +191,7 @@
attacker,
)
to_chat(attacker, span_danger("You lock [defender] into a restraining position!"))
- defender.adjustStaminaLoss(20)
+ defender.adjust_stamina_loss(20)
defender.Stun(10 SECONDS)
restraining_mob = WEAKREF(defender)
addtimer(VARSET_CALLBACK(src, restraining_mob, null), 5 SECONDS, TIMER_UNIQUE)
@@ -205,7 +215,7 @@
var/obj/item/held_item = defender.get_active_held_item()
if(held_item && defender.temporarilyRemoveItemFromInventory(held_item))
attacker.put_in_hands(held_item)
- defender.adjustStaminaLoss(50)
+ defender.adjust_stamina_loss(50)
defender.apply_damage(25, attacker.get_attack_type())
return TRUE
diff --git a/code/datums/martial/kaza_ruk.dm b/code/datums/martial/kaza_ruk.dm
new file mode 100644
index 000000000000..1f7b0625dc02
--- /dev/null
+++ b/code/datums/martial/kaza_ruk.dm
@@ -0,0 +1,335 @@
+/datum/martial_art/kaza_ruk
+ name = "Kaza Ruk"
+ id = MARTIALART_KAZA_RUK
+ grab_damage_modifier = 5
+ grab_escape_chance_modifier = -10
+ VAR_PRIVATE/datum/action/neck_chop/neckchop
+ VAR_PRIVATE/datum/action/low_sweep/lowsweep
+ VAR_PRIVATE/datum/action/lung_punch/lungpunch
+
+/datum/martial_art/kaza_ruk/activate_style(mob/living/new_holder)
+ . = ..()
+ RegisterSignal(new_holder, COMSIG_HUMAN_PUNCHED, PROC_REF(blow_followup))
+
+/datum/martial_art/kaza_ruk/deactivate_style(mob/living/old_holder)
+ . = ..()
+ UnregisterSignal(old_holder, COMSIG_HUMAN_PUNCHED)
+
+/datum/martial_art/kaza_ruk/New()
+ . = ..()
+ neckchop = new(src)
+ lowsweep = new(src)
+ lungpunch = new(src)
+
+/datum/martial_art/kaza_ruk/Destroy()
+ neckchop = null
+ lowsweep = null
+ lungpunch = null
+ return ..()
+
+/datum/action/neck_chop
+ name = "Neck Chop"
+ desc = "Injures the neck, stopping the victim from speaking for a while."
+ button_icon = 'icons/mob/actions/actions_items.dmi'
+ button_icon_state = "neckchop"
+ check_flags = AB_CHECK_INCAPACITATED|AB_CHECK_HANDS_BLOCKED|AB_CHECK_CONSCIOUS
+
+/datum/action/neck_chop/Trigger(mob/clicker, trigger_flags)
+ . = ..()
+ if(!.)
+ return
+ var/datum/martial_art/source = target
+ if (source.streak == "neck_chop")
+ owner.visible_message(span_danger("[owner] assumes a neutral stance."), "Your next attack is cleared.")
+ owner.balloon_alert(owner, "cleared")
+ source.streak = ""
+ else
+ owner.visible_message(span_danger("[owner] assumes the Neck Chop stance!"), "Your next attack will be a Neck Chop.")
+ owner.balloon_alert(owner, "neck chop")
+ source.streak = "neck_chop"
+
+/datum/action/low_sweep
+ name = "Low Sweep"
+ desc = "Trips the victim, knocking them down for a brief moment."
+ button_icon = 'icons/mob/actions/actions_items.dmi'
+ button_icon_state = "legsweep"
+ check_flags = AB_CHECK_INCAPACITATED|AB_CHECK_HANDS_BLOCKED|AB_CHECK_CONSCIOUS
+
+/datum/action/low_sweep/Trigger(mob/clicker, trigger_flags)
+ . = ..()
+ if(!.)
+ return
+ var/datum/martial_art/source = target
+ if (source.streak == "low_sweep")
+ owner.visible_message(span_danger("[owner] assumes a neutral stance."), "Your next attack is cleared.")
+ owner.balloon_alert(owner, "cleared")
+ source.streak = ""
+ else
+ owner.visible_message(span_danger("[owner] assumes the Low Sweep stance!"), "Your next attack will be a Low Sweep.")
+ owner.balloon_alert(owner, "low sweep")
+ source.streak = "low_sweep"
+
+/datum/action/lung_punch//referred to internally as 'quick choke'
+ name = "Lung Punch"
+ desc = "Delivers a strong punch just above the victim's abdomen, constraining the lungs. The victim will be unable to breathe for a short time."
+ button_icon = 'icons/mob/actions/actions_items.dmi'
+ button_icon_state = "lungpunch"
+ check_flags = AB_CHECK_INCAPACITATED|AB_CHECK_HANDS_BLOCKED|AB_CHECK_CONSCIOUS
+
+/datum/action/lung_punch/Trigger(mob/clicker, trigger_flags)
+ . = ..()
+ if(!.)
+ return
+ var/datum/martial_art/source = target
+ if (source.streak == "quick_choke")
+ owner.visible_message(span_danger("[owner] assumes a neutral stance."), "Your next attack is cleared.")
+ owner.balloon_alert(owner, "cleared")
+ source.streak = ""
+ else
+ owner.visible_message(span_danger("[owner] assumes the Lung Punch stance!"), "Your next attack will be a Lung Punch.")
+ owner.balloon_alert(owner, "lung punch")
+ source.streak = "quick_choke"//internal name for lung punch
+
+/datum/martial_art/kaza_ruk/activate_style(mob/living/new_holder)
+ . = ..()
+ to_chat(new_holder, span_userdanger("You know the arts of [name]!"))
+ to_chat(new_holder, span_danger("Place your cursor over a move at the top of the screen to see what it does."))
+ neckchop.Grant(new_holder)
+ lowsweep.Grant(new_holder)
+ lungpunch.Grant(new_holder)
+
+/datum/martial_art/kaza_ruk/deactivate_style(mob/living/remove_from)
+ to_chat(remove_from, span_userdanger("You suddenly forget the arts of [name]..."))
+ neckchop?.Remove(remove_from)
+ lowsweep?.Remove(remove_from)
+ lungpunch?.Remove(remove_from)
+ return ..()
+
+/datum/martial_art/kaza_ruk/proc/check_streak(mob/living/attacker, mob/living/defender)
+ switch(streak)
+ if("neck_chop")
+ streak = ""
+ neck_chop(attacker, defender)
+ return TRUE
+ if("low_sweep")
+ streak = ""
+ low_sweep(attacker, defender)
+ return TRUE
+ if("quick_choke")//is actually lung punch
+ streak = ""
+ quick_choke(attacker, defender)
+ return TRUE
+ return FALSE
+
+/datum/martial_art/kaza_ruk/proc/low_sweep(mob/living/attacker, mob/living/defender)
+ if(defender.stat != CONSCIOUS || defender.IsParalyzed())
+ return MARTIAL_ATTACK_INVALID
+ if(HAS_TRAIT(attacker, TRAIT_PACIFISM))
+ return MARTIAL_ATTACK_INVALID // Does 5 damage, so we can't let pacifists leg sweep.
+
+ var/tail_sweeping = FALSE
+ var/sweeping_language = "leg"
+ if(ishuman(attacker))
+ var/mob/living/carbon/possible_human = attacker
+ var/obj/item/organ/tail/lizard/possible_lizard_tail = possible_human.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL)
+ if(possible_lizard_tail)
+ tail_sweeping = TRUE
+ sweeping_language = "tail"
+
+ defender.visible_message(
+ span_warning("[attacker] [sweeping_language] sweeps [defender]!"),
+ span_userdanger("Your legs are sweeped by [attacker]!"),
+ span_hear("You hear a sickening sound of flesh hitting flesh!"),
+ null,
+ attacker,
+ )
+ to_chat(attacker, span_danger("You [sweeping_language] sweep [defender]!"))
+ playsound(attacker, 'sound/effects/hit_kick.ogg', 50, TRUE, -1)
+
+ if(tail_sweeping)
+ attacker.emote("spin")
+
+ defender.apply_damage(5, BRUTE, BODY_ZONE_CHEST)
+ defender.Knockdown(6 SECONDS)
+ log_combat(attacker, defender, "leg sweeped")
+ return MARTIAL_ATTACK_SUCCESS
+
+/datum/martial_art/kaza_ruk/proc/quick_choke(mob/living/attacker, mob/living/defender)//is actually lung punch
+ attacker.do_attack_animation(defender)
+ defender.visible_message(
+ span_warning("[attacker] pounds [defender] on the chest!"),
+ span_userdanger("Your chest is slammed by [attacker]! You can't breathe!"),
+ span_hear("You hear a sickening sound of flesh hitting flesh!"),
+ COMBAT_MESSAGE_RANGE,
+ attacker,
+ )
+ to_chat(attacker, span_danger("You pound [defender] on the chest!"))
+ playsound(attacker, 'sound/effects/hit_punch.ogg', 50, TRUE, -1)
+ if(defender.losebreath <= 10)
+ defender.losebreath = clamp(defender.losebreath + 5, 0, 10)
+ defender.adjust_oxy_loss(10)
+ log_combat(attacker, defender, "quickchoked")
+ return MARTIAL_ATTACK_SUCCESS
+
+/datum/martial_art/kaza_ruk/proc/neck_chop(mob/living/attacker, mob/living/defender)
+ if(HAS_TRAIT(attacker, TRAIT_PACIFISM))
+ return MARTIAL_ATTACK_INVALID // Does 10 damage, so we can't let pacifists neck chop.
+ attacker.do_attack_animation(defender)
+ defender.visible_message(
+ span_warning("[attacker] karate chops [defender]'s neck!"),
+ span_userdanger("Your neck is karate chopped by [attacker], rendering you unable to speak!"),
+ span_hear("You hear a sickening sound of flesh hitting flesh!"),
+ COMBAT_MESSAGE_RANGE,
+ attacker,
+ )
+ to_chat(attacker, span_danger("You karate chop [defender]'s neck, rendering [defender.p_them()] unable to speak!"))
+ playsound(attacker, 'sound/effects/hit_punch.ogg', 50, TRUE, -1)
+ defender.apply_damage(10, attacker.get_attack_type(), BODY_ZONE_HEAD)
+ defender.adjust_silence_up_to(20 SECONDS, 20 SECONDS)
+ log_combat(attacker, defender, "neck chopped")
+ return MARTIAL_ATTACK_SUCCESS
+
+/datum/martial_art/kaza_ruk/harm_act(mob/living/attacker, mob/living/defender)
+ if(defender.check_block(attacker, 10, attacker.name, UNARMED_ATTACK))
+ return MARTIAL_ATTACK_FAIL
+
+ if(check_streak(attacker, defender))
+ return MARTIAL_ATTACK_SUCCESS
+
+ return MARTIAL_ATTACK_INVALID
+
+/datum/martial_art/kaza_ruk/disarm_act(mob/living/attacker, mob/living/defender)
+ if(defender.check_block(attacker, 0, attacker.name, UNARMED_ATTACK))
+ return MARTIAL_ATTACK_FAIL
+ if(check_streak(attacker, defender))
+ return MARTIAL_ATTACK_SUCCESS
+ var/obj/item/stuff_in_hand = defender.get_active_held_item()
+ if(prob(60) && stuff_in_hand && defender.temporarilyRemoveItemFromInventory(stuff_in_hand))
+ attacker.put_in_hands(stuff_in_hand)
+ defender.visible_message(
+ span_danger("[attacker] disarms [defender]!"),
+ span_userdanger("You're disarmed by [attacker]!"),
+ span_hear("You hear aggressive shuffling!"),
+ COMBAT_MESSAGE_RANGE,
+ attacker,
+ )
+ to_chat(attacker, span_danger("You disarm [defender]!"))
+ playsound(defender, 'sound/items/weapons/thudswoosh.ogg', 50, TRUE, -1)
+ log_combat(attacker, defender, "disarmed (Kaza Ruk)", addition = "(disarmed of [stuff_in_hand])")
+ return MARTIAL_ATTACK_INVALID // normal shove
+
+/// First, determine if we're going to execute our followup attack
+
+/datum/martial_art/kaza_ruk/proc/blow_followup(mob/living/source, mob/living/target, damage, attack_type, obj/item/bodypart/affecting, final_armor_block, kicking, limb_sharpness)
+ SIGNAL_HANDLER
+
+ if(!prob(50))
+ return
+
+ addtimer(CALLBACK(src, PROC_REF(execute_followup), source, target, damage, attack_type, affecting, final_armor_block, kicking, limb_sharpness), 0.25 SECONDS)
+
+/// After our delay, do the followup.
+
+/datum/martial_art/kaza_ruk/proc/execute_followup(mob/living/source, mob/living/target, damage, attack_type, obj/item/bodypart/affecting, final_armor_block, kicking, limb_sharpness)
+ if(QDELETED(source) || QDELETED(target))
+ return
+
+ if(!source.Adjacent(target))
+ return
+
+ var/tail_usage = FALSE
+ var/kick_language = "an axe kick"
+ var/strike_language = "an elbow strike"
+ if(ishuman(source))
+ var/mob/living/carbon/possible_human = source
+ var/obj/item/organ/tail/lizard/possible_lizard_tail = possible_human.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL)
+ if(possible_lizard_tail)
+ tail_usage = TRUE
+ kick_language = "a helmsplitter tail strike"
+ strike_language = "a whiplash tail spin"
+
+ source.visible_message(
+ span_warning("[source] follows up with [kicking ? kick_language : strike_language] against [target]!"),
+ span_notice("You deliver [kicking ? kick_language : strike_language] against [target]!"),
+ span_hear("You hear a sickening sound of flesh hitting flesh!"),
+ )
+ if(tail_usage)
+ source.emote(kicking ? "flip" : "spin")
+ playsound(source, 'sound/effects/hit_punch.ogg', 50, TRUE, -1)
+ source.do_attack_animation(target, ATTACK_EFFECT_KICK)
+ target.apply_damage(round(damage/3,1), attack_type, affecting, final_armor_block, wound_bonus = damage) //Ostensibly, apply a third of our damage again // We're not being too fussy about limb bonuses for this
+ log_combat(source, target, "auto-followup strike (Kaza Ruk)")
+
+//Kaza Ruk Gloves
+
+/obj/item/clothing/gloves/kaza_ruk
+ abstract_type = /obj/item/clothing/gloves/kaza_ruk
+ clothing_traits = list(TRAIT_FAST_CUFFING)
+
+/obj/item/clothing/gloves/kaza_ruk/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/martial_art_giver, /datum/martial_art/kaza_ruk)
+
+/datum/atom_skin/kaza_ruk
+ abstract_type = /datum/atom_skin/kaza_ruk
+ reset_missing = FALSE
+ /// Color (/matrix) applied with the skin. If null, no color is applied.
+ var/reskin_color
+
+/datum/atom_skin/kaza_ruk/apply(atom/apply_to)
+ . = ..()
+ if(reskin_color)
+ apply_to.add_atom_colour(color_matrix_filter(reskin_color), FIXED_COLOUR_PRIORITY)
+
+/datum/atom_skin/kaza_ruk/clear_skin(atom/clear_from)
+ . = ..()
+ if(reskin_color)
+ clear_from.remove_atom_colour(FIXED_COLOUR_PRIORITY, reskin_color)
+
+/datum/atom_skin/kaza_ruk/get_preview_icon(atom/for_atom)
+ var/image/generated = ..()
+ if(reskin_color)
+ generated.add_filter("preview_filter", 1, color_matrix_filter(reskin_color))
+ return generated
+
+/datum/atom_skin/kaza_ruk/red
+ preview_name = "Red"
+
+/datum/atom_skin/kaza_ruk/blue
+ preview_name = "Blue"
+ reskin_color = list(0.33, 0.33, 0.33, 0, 0, 0, 0, 0, 1)
+
+/obj/item/clothing/gloves/kaza_ruk/sec//more obviously named, given to sec
+ name = "kaza ruk gloves"
+ desc = "These gloves seem to guide you through a non-lizardperson friendly variant of the Tiziran martial art, Kaza Ruk. \
+ You're not entirely sure how they do that. Probably nanites."
+ icon_state = "fightgloves"
+ greyscale_colors = "#c41e0d"
+ cold_protection = HANDS
+ min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
+ heat_protection = HANDS
+ max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
+ resistance_flags = NONE
+
+/obj/item/clothing/gloves/kaza_ruk/sec/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/reskinable_item, /datum/atom_skin/kaza_ruk, infinite = TRUE)
+
+/obj/item/clothing/gloves/kaza_ruk/combatglovesplus
+ name = "combat gloves plus"
+ desc = "These tactical gloves are fireproof and electrically insulated. These gloves seem to guide you through a non-lizardperson friendly variant of the Tiziran martial art, Kaza Ruk."
+ icon_state = "black"
+ greyscale_colors = "#2f2e31"
+ siemens_coefficient = 0
+ strip_delay = 8 SECONDS
+ cold_protection = HANDS
+ min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
+ heat_protection = HANDS
+ max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
+ resistance_flags = NONE
+ armor_type = /datum/armor/kaza_ruk_combatglovesplus
+
+/datum/armor/kaza_ruk_combatglovesplus
+ bio = 90
+ fire = 80
+ acid = 50
diff --git a/code/datums/martial/krav_maga.dm b/code/datums/martial/krav_maga.dm
deleted file mode 100644
index 1df05ac15ad8..000000000000
--- a/code/datums/martial/krav_maga.dm
+++ /dev/null
@@ -1,252 +0,0 @@
-/datum/martial_art/krav_maga
- name = "Krav Maga"
- id = MARTIALART_KRAVMAGA
- VAR_PRIVATE/datum/action/neck_chop/neckchop
- VAR_PRIVATE/datum/action/leg_sweep/legsweep
- VAR_PRIVATE/datum/action/lung_punch/lungpunch
-
-/datum/martial_art/krav_maga/New()
- . = ..()
- neckchop = new(src)
- legsweep = new(src)
- lungpunch = new(src)
-
-/datum/martial_art/krav_maga/Destroy()
- neckchop = null
- legsweep = null
- lungpunch = null
- return ..()
-
-/datum/action/neck_chop
- name = "Neck Chop"
- desc = "Injures the neck, stopping the victim from speaking for a while."
- button_icon = 'icons/mob/actions/actions_items.dmi'
- button_icon_state = "neckchop"
- check_flags = AB_CHECK_INCAPACITATED|AB_CHECK_HANDS_BLOCKED|AB_CHECK_CONSCIOUS
-
-/datum/action/neck_chop/Trigger(mob/clicker, trigger_flags)
- . = ..()
- if(!.)
- return
- var/datum/martial_art/source = target
- if (source.streak == "neck_chop")
- owner.visible_message(span_danger("[owner] assumes a neutral stance."), "Your next attack is cleared.")
- source.streak = ""
- else
- owner.visible_message(span_danger("[owner] assumes the Neck Chop stance!"), "Your next attack will be a Neck Chop.")
- source.streak = "neck_chop"
-
-/datum/action/leg_sweep
- name = "Leg Sweep"
- desc = "Trips the victim, knocking them down for a brief moment."
- button_icon = 'icons/mob/actions/actions_items.dmi'
- button_icon_state = "legsweep"
- check_flags = AB_CHECK_INCAPACITATED|AB_CHECK_HANDS_BLOCKED|AB_CHECK_CONSCIOUS
-
-/datum/action/leg_sweep/Trigger(mob/clicker, trigger_flags)
- . = ..()
- if(!.)
- return
- var/datum/martial_art/source = target
- if (source.streak == "leg_sweep")
- owner.visible_message(span_danger("[owner] assumes a neutral stance."), "Your next attack is cleared.")
- source.streak = ""
- else
- owner.visible_message(span_danger("[owner] assumes the Leg Sweep stance!"), "Your next attack will be a Leg Sweep.")
- source.streak = "leg_sweep"
-
-/datum/action/lung_punch//referred to internally as 'quick choke'
- name = "Lung Punch"
- desc = "Delivers a strong punch just above the victim's abdomen, constraining the lungs. The victim will be unable to breathe for a short time."
- button_icon = 'icons/mob/actions/actions_items.dmi'
- button_icon_state = "lungpunch"
- check_flags = AB_CHECK_INCAPACITATED|AB_CHECK_HANDS_BLOCKED|AB_CHECK_CONSCIOUS
-
-/datum/action/lung_punch/Trigger(mob/clicker, trigger_flags)
- . = ..()
- if(!.)
- return
- var/datum/martial_art/source = target
- if (source.streak == "quick_choke")
- owner.visible_message(span_danger("[owner] assumes a neutral stance."), "Your next attack is cleared.")
- source.streak = ""
- else
- owner.visible_message(span_danger("[owner] assumes the Lung Punch stance!"), "Your next attack will be a Lung Punch.")
- source.streak = "quick_choke"//internal name for lung punch
-
-/datum/martial_art/krav_maga/activate_style(mob/living/new_holder)
- . = ..()
- to_chat(new_holder, span_userdanger("You know the arts of [name]!"))
- to_chat(new_holder, span_danger("Place your cursor over a move at the top of the screen to see what it does."))
- neckchop.Grant(new_holder)
- legsweep.Grant(new_holder)
- lungpunch.Grant(new_holder)
-
-/datum/martial_art/krav_maga/deactivate_style(mob/living/remove_from)
- to_chat(remove_from, span_userdanger("You suddenly forget the arts of [name]..."))
- neckchop?.Remove(remove_from)
- legsweep?.Remove(remove_from)
- lungpunch?.Remove(remove_from)
- return ..()
-
-/datum/martial_art/krav_maga/proc/check_streak(mob/living/attacker, mob/living/defender)
- switch(streak)
- if("neck_chop")
- streak = ""
- neck_chop(attacker, defender)
- return TRUE
- if("leg_sweep")
- streak = ""
- leg_sweep(attacker, defender)
- return TRUE
- if("quick_choke")//is actually lung punch
- streak = ""
- quick_choke(attacker, defender)
- return TRUE
- return FALSE
-
-/datum/martial_art/krav_maga/proc/leg_sweep(mob/living/attacker, mob/living/defender)
- if(defender.stat != CONSCIOUS || defender.IsParalyzed())
- return MARTIAL_ATTACK_INVALID
- if(HAS_TRAIT(attacker, TRAIT_PACIFISM))
- return MARTIAL_ATTACK_INVALID // Does 5 damage, so we can't let pacifists leg sweep.
- defender.visible_message(
- span_warning("[attacker] leg sweeps [defender]!"),
- span_userdanger("Your legs are sweeped by [attacker]!"),
- span_hear("You hear a sickening sound of flesh hitting flesh!"),
- null,
- attacker,
- )
- to_chat(attacker, span_danger("You leg sweep [defender]!"))
- playsound(attacker, 'sound/effects/hit_kick.ogg', 50, TRUE, -1)
- defender.apply_damage(5, BRUTE, BODY_ZONE_CHEST)
- defender.Knockdown(6 SECONDS)
- log_combat(attacker, defender, "leg sweeped")
- return MARTIAL_ATTACK_SUCCESS
-
-/datum/martial_art/krav_maga/proc/quick_choke(mob/living/attacker, mob/living/defender)//is actually lung punch
- attacker.do_attack_animation(defender)
- defender.visible_message(
- span_warning("[attacker] pounds [defender] on the chest!"),
- span_userdanger("Your chest is slammed by [attacker]! You can't breathe!"),
- span_hear("You hear a sickening sound of flesh hitting flesh!"),
- COMBAT_MESSAGE_RANGE,
- attacker,
- )
- to_chat(attacker, span_danger("You pound [defender] on the chest!"))
- playsound(attacker, 'sound/effects/hit_punch.ogg', 50, TRUE, -1)
- if(defender.losebreath <= 10)
- defender.losebreath = clamp(defender.losebreath + 5, 0, 10)
- defender.adjustOxyLoss(10)
- log_combat(attacker, defender, "quickchoked")
- return MARTIAL_ATTACK_SUCCESS
-
-/datum/martial_art/krav_maga/proc/neck_chop(mob/living/attacker, mob/living/defender)
- if(HAS_TRAIT(attacker, TRAIT_PACIFISM))
- return MARTIAL_ATTACK_INVALID // Does 10 damage, so we can't let pacifists neck chop.
- attacker.do_attack_animation(defender)
- defender.visible_message(
- span_warning("[attacker] karate chops [defender]'s neck!"),
- span_userdanger("Your neck is karate chopped by [attacker], rendering you unable to speak!"),
- span_hear("You hear a sickening sound of flesh hitting flesh!"),
- COMBAT_MESSAGE_RANGE,
- attacker,
- )
- to_chat(attacker, span_danger("You karate chop [defender]'s neck, rendering [defender.p_them()] unable to speak!"))
- playsound(attacker, 'sound/effects/hit_punch.ogg', 50, TRUE, -1)
- defender.apply_damage(10, attacker.get_attack_type(), BODY_ZONE_HEAD)
- defender.adjust_silence_up_to(20 SECONDS, 20 SECONDS)
- log_combat(attacker, defender, "neck chopped")
- return MARTIAL_ATTACK_SUCCESS
-
-/datum/martial_art/krav_maga/harm_act(mob/living/attacker, mob/living/defender)
- var/picked_hit_type = pick("punch", "kick")
- var/bonus_damage = 0
- if(defender.body_position == LYING_DOWN)
- bonus_damage += 5
- picked_hit_type = "stomp"
-
- if(defender.check_block(attacker, 10 + bonus_damage, "[attacker]'s [picked_hit_type]", UNARMED_ATTACK))
- return MARTIAL_ATTACK_FAIL
- if(check_streak(attacker, defender))
- return MARTIAL_ATTACK_SUCCESS
-
- log_combat(attacker, defender, "[picked_hit_type]ed")
- var/obj/item/bodypart/affecting = defender.get_bodypart(defender.get_random_valid_zone(attacker.zone_selected))
- defender.apply_damage(10 + bonus_damage, attacker.get_attack_type(), affecting)
- if(picked_hit_type == "kick" || picked_hit_type == "stomp")
- attacker.do_attack_animation(defender, ATTACK_EFFECT_KICK)
- playsound(defender, 'sound/effects/hit_kick.ogg', 50, TRUE, -1)
- else
- attacker.do_attack_animation(defender, ATTACK_EFFECT_PUNCH)
- playsound(defender, 'sound/effects/hit_punch.ogg', 50, TRUE, -1)
- defender.visible_message(
- span_danger("[attacker] [picked_hit_type]s [defender]!"),
- span_userdanger("You're [picked_hit_type]ed by [attacker]!"),
- span_hear("You hear a sickening sound of flesh hitting flesh!"),
- COMBAT_MESSAGE_RANGE,
- attacker,
- )
- to_chat(attacker, span_danger("You [picked_hit_type] [defender]!"))
- log_combat(attacker, defender, "[picked_hit_type] with [name]")
- return MARTIAL_ATTACK_SUCCESS
-
-/datum/martial_art/krav_maga/disarm_act(mob/living/attacker, mob/living/defender)
- if(defender.check_block(attacker, 0, attacker.name, UNARMED_ATTACK))
- return MARTIAL_ATTACK_FAIL
- if(check_streak(attacker, defender))
- return MARTIAL_ATTACK_SUCCESS
- var/obj/item/stuff_in_hand = defender.get_active_held_item()
- if(prob(60) && stuff_in_hand && defender.temporarilyRemoveItemFromInventory(stuff_in_hand))
- attacker.put_in_hands(stuff_in_hand)
- defender.visible_message(
- span_danger("[attacker] disarms [defender]!"),
- span_userdanger("You're disarmed by [attacker]!"),
- span_hear("You hear aggressive shuffling!"),
- COMBAT_MESSAGE_RANGE,
- attacker,
- )
- to_chat(attacker, span_danger("You disarm [defender]!"))
- playsound(defender, 'sound/items/weapons/thudswoosh.ogg', 50, TRUE, -1)
- log_combat(attacker, defender, "disarmed (Krav Maga)", addition = "(disarmed of [stuff_in_hand])")
- return MARTIAL_ATTACK_INVALID // normal shove
-
-//Krav Maga Gloves
-
-/obj/item/clothing/gloves/krav_maga
- abstract_type = /obj/item/clothing/gloves/krav_maga
- clothing_traits = list(TRAIT_FAST_CUFFING)
-
-/obj/item/clothing/gloves/krav_maga/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/martial_art_giver, /datum/martial_art/krav_maga)
-
-/obj/item/clothing/gloves/krav_maga/sec//more obviously named, given to sec
- name = "krav maga gloves"
- desc = "These gloves can teach you to perform Krav Maga using nanochips."
- icon_state = "fightgloves"
- greyscale_colors = "#c41e0d"
- cold_protection = HANDS
- min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
- heat_protection = HANDS
- max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
- resistance_flags = NONE
-
-/obj/item/clothing/gloves/krav_maga/combatglovesplus
- name = "combat gloves plus"
- desc = "These tactical gloves are fireproof and electrically insulated, and through the use of nanochip technology will teach you the martial art of krav maga."
- icon_state = "black"
- greyscale_colors = "#2f2e31"
- siemens_coefficient = 0
- strip_delay = 8 SECONDS
- cold_protection = HANDS
- min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
- heat_protection = HANDS
- max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
- resistance_flags = NONE
- armor_type = /datum/armor/krav_maga_combatglovesplus
-
-/datum/armor/krav_maga_combatglovesplus
- bio = 90
- fire = 80
- acid = 50
diff --git a/code/datums/martial/psychotic_brawl.dm b/code/datums/martial/psychotic_brawl.dm
index 99c2b0e22246..1578ff32152c 100644
--- a/code/datums/martial/psychotic_brawl.dm
+++ b/code/datums/martial/psychotic_brawl.dm
@@ -73,7 +73,7 @@
if(iscarbon(defender))
var/mob/living/carbon/carbon_defender = defender
if(!istype(carbon_defender.head, /obj/item/clothing/head/helmet/) && !istype(carbon_defender.head, /obj/item/clothing/head/utility/hardhat))
- carbon_defender.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5)
+ carbon_defender.adjust_organ_loss(ORGAN_SLOT_BRAIN, 5)
attacker.Stun(rand(1 SECONDS, 4.5 SECONDS))
defender.Stun(rand(0.5 SECONDS, 3 SECONDS))
if(HAS_TRAIT(attacker, TRAIT_PACIFISM))
diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm
index b4021fd0b402..b6f556e3aa83 100644
--- a/code/datums/martial/sleeping_carp.dm
+++ b/code/datums/martial/sleeping_carp.dm
@@ -1,66 +1,101 @@
-#define STRONG_PUNCH_COMBO "HH"
+#define WRIST_WRENCH_COMBO "HG"
#define LAUNCH_KICK_COMBO "HD"
#define DROP_KICK_COMBO "DD"
+#define KNEE_STOMACH_COMBO "GH"
/datum/martial_art/the_sleeping_carp
name = "The Sleeping Carp"
id = MARTIALART_SLEEPINGCARP
help_verb = /mob/living/proc/sleeping_carp_help
display_combos = TRUE
+ grab_state_modifier = 1
/// List of traits applied to users of this martial art.
- var/list/scarp_traits = list(TRAIT_NOGUNS, TRAIT_TOSS_GUN_HARD, TRAIT_HARDLY_WOUNDED, TRAIT_NODISMEMBER, TRAIT_HEAVY_SLEEPER)
+ var/list/scarp_traits = list(TRAIT_NOGUNS, TRAIT_TOSS_GUN_HARD, TRAIT_HARDLY_WOUNDED, TRAIT_NODISMEMBER, TRAIT_HEAVY_SLEEPER, TRAIT_PERFECT_ATTACKER)
+ /// List of objects exempt from reducing dodge probabilities
+ var/list/exempt_objects = list(
+ /obj/item/melee/baton/nunchaku,
+ /obj/item/staff/bostaff,
+ /obj/item/bambostaff,
+ /obj/item/cane,
+ /obj/item/nullrod/bostaff,
+ /obj/item/knife,
+ /obj/item/restraints/legcuffs/bola,
+ /obj/item/storage/toolbox,
+ /obj/item/spear,
+ /obj/item/claymore/shortsword,
+ /obj/item/nullrod/nullblade,
+ /obj/item/extendohand,
+ /obj/item/mop,
+ /obj/item/pushbroom,
+ /obj/item/melee/baseball_bat,
+ /obj/item/crowbar/hammer,
+ /obj/item/toy/plush/carpplushie,
+ )
/datum/martial_art/the_sleeping_carp/activate_style(mob/living/new_holder)
. = ..()
new_holder.add_traits(scarp_traits, SLEEPING_CARP_TRAIT)
RegisterSignal(new_holder, COMSIG_ATOM_ATTACKBY, PROC_REF(on_attackby))
RegisterSignal(new_holder, COMSIG_ATOM_PRE_BULLET_ACT, PROC_REF(hit_by_projectile))
+ RegisterSignal(new_holder, COMSIG_LIVING_CHECK_BLOCK, PROC_REF(check_dodge))
new_holder.faction |= FACTION_CARP //:D
new_holder.grant_language(/datum/language/carptongue, ALL, type)
/datum/martial_art/the_sleeping_carp/deactivate_style(mob/living/remove_from)
remove_from.remove_traits(scarp_traits, SLEEPING_CARP_TRAIT)
- UnregisterSignal(remove_from, list(COMSIG_ATOM_ATTACKBY, COMSIG_ATOM_PRE_BULLET_ACT))
+ UnregisterSignal(remove_from, list(COMSIG_ATOM_ATTACKBY, COMSIG_ATOM_PRE_BULLET_ACT, COMSIG_LIVING_CHECK_BLOCK))
remove_from.faction -= FACTION_CARP //:(
remove_from.remove_language(/datum/language/carptongue, ALL, type)
return ..()
/datum/martial_art/the_sleeping_carp/proc/check_streak(mob/living/attacker, mob/living/defender)
- if(findtext(streak,STRONG_PUNCH_COMBO))
+ if(findtext(streak,WRIST_WRENCH_COMBO))
reset_streak()
- return strongPunch(attacker, defender)
+ return wrist_wrench(attacker, defender)
if(findtext(streak,LAUNCH_KICK_COMBO))
reset_streak()
- return launchKick(attacker, defender)
+ return launch_kick(attacker, defender)
if(findtext(streak,DROP_KICK_COMBO))
reset_streak()
- return dropKick(attacker, defender)
+ return drop_kick(attacker, defender)
+
+ if(findtext(streak,KNEE_STOMACH_COMBO))
+ reset_streak()
+ return knee_stomach(attacker, defender)
return FALSE
-///Gnashing Teeth: Harm Harm, consistent 20 force punch on every second harm punch
-/datum/martial_art/the_sleeping_carp/proc/strongPunch(mob/living/attacker, mob/living/defender)
- // this var is so that the strong punch is always aiming for the body part the user is targeting and not trying to apply to the chest before deviating
- var/obj/item/bodypart/affecting = defender.get_bodypart(defender.get_random_valid_zone(attacker.zone_selected))
+/// Gnashing Teeth: Harm Grab, twists and possibly breaks the target's arm, disarming them.
+/datum/martial_art/the_sleeping_carp/proc/wrist_wrench(mob/living/attacker, mob/living/defender)
+ // Determine if our defender is a carbon. If not, we don't wrist wrench
+ if(!iscarbon(defender))
+ return FALSE
+
+ // Determine if our target has a functioning active arm. If not, return.
+ var/obj/item/bodypart/affecting = defender.get_active_hand()
+
+ if(!affecting)
+ return FALSE
+
attacker.do_attack_animation(defender, ATTACK_EFFECT_PUNCH)
- var/atk_verb = pick("precisely kick", "brutally chop", "cleanly hit", "viciously slam")
defender.visible_message(
- span_danger("[attacker] [atk_verb]s [defender]!"),
- span_userdanger("[attacker] [atk_verb]s you!"),
- span_hear("You hear a sickening sound of flesh hitting flesh!"),
+ span_danger("[attacker] violently twists [defender]'s [affecting]!"),
+ span_userdanger("[attacker] violently twists your [affecting]!"),
+ span_hear("You hear a sickening sound of bone snapping!"),
null,
attacker,
)
- to_chat(attacker, span_danger("You [atk_verb] [defender]!"))
+ to_chat(attacker, span_danger("You violently twist [defender]'s [affecting]!"))
playsound(defender, 'sound/items/weapons/punch1.ogg', 25, TRUE, -1)
- log_combat(attacker, defender, "strong punched (Sleeping Carp)")
- defender.apply_damage(20, attacker.get_attack_type(), affecting)
+ log_combat(attacker, defender, "wrist wrenched (Sleeping Carp)")
+ defender.apply_damage(20, BRUTE, affecting, wound_bonus = 30)
+ defender.drop_all_held_items()
return TRUE
-///Crashing Wave Kick: Harm Disarm combo, throws people seven tiles backwards
-/datum/martial_art/the_sleeping_carp/proc/launchKick(mob/living/attacker, mob/living/defender)
+/// Crashing Wave Kick: Harm Disarm combo, throws people seven tiles backwards
+/datum/martial_art/the_sleeping_carp/proc/launch_kick(mob/living/attacker, mob/living/defender)
attacker.do_attack_animation(defender, ATTACK_EFFECT_KICK)
defender.visible_message(
span_warning("[attacker] kicks [defender] square in the chest, sending them flying!"),
@@ -76,8 +111,8 @@
log_combat(attacker, defender, "launchkicked (Sleeping Carp)")
return TRUE
-///Keelhaul: Disarm Disarm combo, knocks people down and deals substantial stamina damage, and also discombobulates them. Knocks objects out of their hands if they're already on the ground.
-/datum/martial_art/the_sleeping_carp/proc/dropKick(mob/living/attacker, mob/living/defender)
+/// Keelhaul: Disarm Disarm combo, knocks people down and deals substantial stamina damage, and also discombobulates them. Knocks objects out of their hands if they're already on the ground.
+/datum/martial_art/the_sleeping_carp/proc/drop_kick(mob/living/attacker, mob/living/defender)
attacker.do_attack_animation(defender, ATTACK_EFFECT_KICK)
playsound(attacker, 'sound/effects/hit_kick.ogg', 50, TRUE, -1)
if(defender.body_position == STANDING_UP)
@@ -94,6 +129,25 @@
log_combat(attacker, defender, "dropkicked (Sleeping Carp)")
return TRUE
+/// Kraken Wrack: Grab Harm combo, causes them to be silenced and briefly stunned, as well as doing a moderate amount of stamina damage.
+/datum/martial_art/the_sleeping_carp/proc/knee_stomach(mob/living/attacker, mob/living/defender)
+ attacker.do_attack_animation(defender, ATTACK_EFFECT_KICK)
+ playsound(attacker, 'sound/effects/hit_kick.ogg', 50, TRUE, -1)
+ defender.visible_message(
+ span_warning("[attacker] violently slams [attacker.p_their()] knee into [defender]!"),
+ span_userdanger("You slam your knee straight into [defender]!"),
+ span_hear("You hear a sickening sound of flesh hitting flesh!"),
+ COMBAT_MESSAGE_RANGE,
+ attacker,
+ )
+ defender.apply_damage(20, STAMINA)
+ defender.Paralyze(1 SECONDS)
+ defender.adjust_silence_up_to(5 SECONDS, 5 SECONDS)
+ if(defender.losebreath <= 10)
+ defender.losebreath = clamp(defender.losebreath + 5, 0, 10)
+ log_combat(attacker, defender, "kneed in the stomach (Sleeping Carp)")
+ return TRUE
+
/datum/martial_art/the_sleeping_carp/grab_act(mob/living/attacker, mob/living/defender)
if(!can_deflect(attacker)) //allows for deniability
return MARTIAL_ATTACK_INVALID
@@ -108,7 +162,7 @@
var/grab_log_description = "grabbed"
attacker.do_attack_animation(defender, ATTACK_EFFECT_PUNCH)
playsound(defender, 'sound/items/weapons/punch1.ogg', 25, TRUE, -1)
- if(defender.stat != DEAD && !defender.IsUnconscious() && defender.getStaminaLoss() >= 80) //We put our target to sleep.
+ if(defender.stat != DEAD && !defender.IsUnconscious() && defender.get_stamina_loss() >= 80) //We put our target to sleep.
defender.visible_message(
span_danger("[attacker] carefully pinch a nerve in [defender]'s neck, knocking them out cold!"),
span_userdanger("[attacker] pinches something in your neck, and you fall unconscious!"),
@@ -142,29 +196,14 @@
defender.investigate_log("has had [defender.p_their()] neck snapped by [attacker].", INVESTIGATE_DEATHS)
return MARTIAL_ATTACK_SUCCESS
- var/atk_verb = pick("kick", "chop", "hit", "slam")
- var/final_damage = rand(10, 15)
- if(defender.check_block(attacker, final_damage, "[attacker]'s [atk_verb]", UNARMED_ATTACK))
+ if(defender.check_block(attacker, 10, attacker.name, UNARMED_ATTACK))
return MARTIAL_ATTACK_FAIL
add_to_streak("H", defender)
if(check_streak(attacker, defender))
return MARTIAL_ATTACK_SUCCESS
- var/obj/item/bodypart/affecting = defender.get_bodypart(defender.get_random_valid_zone(attacker.zone_selected))
- attacker.do_attack_animation(defender, ATTACK_EFFECT_PUNCH)
- defender.visible_message(
- span_danger("[attacker] [atk_verb]s [defender]!"),
- span_userdanger("[attacker] [atk_verb]s you!"),
- span_hear("You hear a sickening sound of flesh hitting flesh!"),
- null,
- attacker,
- )
- to_chat(attacker, span_danger("You [atk_verb] [defender]!"))
- defender.apply_damage(final_damage, attacker.get_attack_type(), affecting, wound_bonus = CANT_WOUND)
- playsound(defender, 'sound/items/weapons/punch1.ogg', 25, TRUE, -1)
- log_combat(attacker, defender, "punched (Sleeping Carp)")
- return MARTIAL_ATTACK_SUCCESS
+ return MARTIAL_ATTACK_INVALID // normal punch
/datum/martial_art/the_sleeping_carp/disarm_act(mob/living/attacker, mob/living/defender)
if(!can_deflect(attacker)) //allows for deniability
@@ -198,9 +237,25 @@
/datum/martial_art/the_sleeping_carp/proc/hit_by_projectile(mob/living/carp_user, obj/projectile/hitting_projectile, def_zone)
SIGNAL_HANDLER
+ var/determine_avoidance = 100
+ var/additional_adjustments = 0
+
+ if(istype(hitting_projectile, /obj/projectile/bullet/c38/match/true)) // 75% chance to ignore evasion
+ additional_adjustments -= 75
+
+ determine_avoidance = clamp(determine_avoidance + carp_style_check(carp_user) + additional_adjustments, 0, 100)
+
+ if(istype(hitting_projectile, /obj/projectile/bullet/harpoon)) // WHITE WHALE HOLY GRAIL
+ return NONE
+
if(!can_deflect(carp_user))
return NONE
+ if(!prob(determine_avoidance))
+ return NONE
+
+
+
carp_user.visible_message(
span_danger("[carp_user] effortlessly swats [hitting_projectile] aside! [carp_user.p_They()] can block bullets with [carp_user.p_their()] bare hands!"),
span_userdanger("You deflect [hitting_projectile]!"),
@@ -210,7 +265,7 @@
hitting_projectile.set_angle(rand(0, 360))//SHING
return COMPONENT_BULLET_PIERCED
-///Signal from getting attacked with an item, for a special interaction with touch spells
+/// Signal from getting attacked with an item, for a special interaction with touch spells
/datum/martial_art/the_sleeping_carp/proc/on_attackby(mob/living/carp_user, obj/item/attack_weapon, mob/attacker, list/modifiers)
SIGNAL_HANDLER
@@ -225,6 +280,98 @@
)
return COMPONENT_NO_AFTERATTACK
+/// If our user has committed to being as martial arty as they can be, they may be able to avoid incoming attacks.
+/datum/martial_art/the_sleeping_carp/proc/check_dodge(mob/living/carp_user, atom/movable/hitby, damage, attack_text, attack_type, ...)
+ SIGNAL_HANDLER
+
+ var/determine_avoidance = clamp(round(carp_style_check(carp_user) / (attack_type == OVERWHELMING_ATTACK ? 2 : 1), 1), 0, 75)
+
+ if(!can_deflect(carp_user))
+ return
+
+ if(attack_type == PROJECTILE_ATTACK || attack_type == THROWN_PROJECTILE_ATTACK)
+ return NONE
+
+ if(!prob(determine_avoidance))
+ return NONE
+
+ carp_user.visible_message(
+ span_danger("[carp_user] cleanly avoids [attack_text] with incredible speed!"),
+ span_userdanger("You dodge [attack_text]"),
+ )
+ playsound(carp_user.loc, 'sound/items/weapons/punchmiss.ogg', 25, TRUE, -1)
+ return SUCCESSFUL_BLOCK
+
+/* Determines how 'carp-y' or how 'martial arts-y' we are, granting us the ability to avoid attacks.
+* At a baseline, we will always avoid projectile attacks, but we may not necessarily avoid other attacks.
+* If we wear carp based clothing, or martial arts based clothing, we improve our style factor.
+* If we are a carp mutant, we improve our style factor.
+* If we literally are a carp, we just assume we're very carpy and return our max value.
+* If we wear a lot of armor, we reduce our style factor. Some martial arts or carp items may result in a net netural bonus.
+* If there is anything in our hands, we're also less likely to avoid attacks.
+*/
+/datum/martial_art/the_sleeping_carp/proc/carp_style_check(mob/living/carp_user)
+ // An evaluation of how 'carp' we are.
+ var/style_factor_points = 0
+
+ if(istype(carp_user, /mob/living/basic/space_dragon) || istype(carp_user, /mob/living/basic/carp))
+ return 100
+
+ if(!ishuman(carp_user)) // We're not concerned about nonhumans here, we can assume we've covered any relevant mobs by checking for carp.
+ return 0
+
+ var/mob/living/carbon/human/human_carp_user = carp_user
+
+ var/obj/item/bodypart/potential_head = human_carp_user.get_bodypart(BODY_ZONE_HEAD)
+ var/obj/item/bodypart/potential_chest = human_carp_user.get_bodypart(BODY_ZONE_CHEST)
+ var/obj/item/clothing/is_it_the_shoes = human_carp_user.get_item_by_slot(ITEM_SLOT_FEET)
+
+ // The presence of armor and heavy objects is a style malus
+ var/style_factor_malus = 0
+
+ // Lets look to see if any relevant headwear is armored or on theme
+ if(potential_head)
+ for(var/obj/item/clothing/possible_headbands in human_carp_user.get_clothing_on_part(potential_head))
+ if(possible_headbands.clothing_flags & CARP_STYLE_FACTOR)
+ style_factor_points += 20 // Basically, you only need one chest level item to contribute
+ style_factor_malus += human_carp_user.run_armor_check(potential_head, MELEE)
+
+ // Then let's look for any chest clothing that is either armored or on theme
+ if(potential_chest)
+ for(var/obj/item/clothing/possible_gi in human_carp_user.get_clothing_on_part(potential_chest))
+ if(possible_gi.clothing_flags & CARP_STYLE_FACTOR)
+ style_factor_points += 20 // Only need one head level item to contribute
+ style_factor_malus += human_carp_user.run_armor_check(potential_chest, MELEE)
+
+ // We also consider whether our footwear is appropriate
+ if(istype(is_it_the_shoes) && is_it_the_shoes.clothing_flags & CARP_STYLE_FACTOR)
+ style_factor_points += 20
+
+ // Achieved a carp state of mind.
+ if(human_carp_user.has_status_effect(/datum/status_effect/organ_set_bonus/carp))
+ style_factor_points += 20
+
+ // We check for wielded objects. If they're not abstract items or exempt items, we add their weight as a penalty. And their block chance.
+ for(var/obj/item/possibly_a_held_object in human_carp_user.held_items)
+ if(possibly_a_held_object.item_flags & (ABSTRACT|HAND_ITEM) && !possibly_a_held_object.block_chance)
+ continue
+
+ if(possibly_a_held_object in exempt_objects)
+ continue
+
+ if(possibly_a_held_object.w_class <= WEIGHT_CLASS_SMALL && !possibly_a_held_object.block_chance)
+ continue
+
+ style_factor_malus += possibly_a_held_object.block_chance
+ style_factor_malus += possibly_a_held_object.w_class * 10 * (HAS_TRAIT(possibly_a_held_object, TRAIT_WIELDED) ? 2 : 1)
+
+ if(human_carp_user.body_position != STANDING_UP) // this ain't monkey style
+ style_factor_points -= 30
+
+ style_factor_points -= style_factor_malus
+
+ return style_factor_points
+
/// Verb added to humans who learn the art of the sleeping carp.
/mob/living/proc/sleeping_carp_help()
set name = "Recall Teachings"
@@ -232,16 +379,19 @@
set category = "Sleeping Carp"
to_chat(usr, span_info("You retreat inward and recall the teachings of the Sleeping Carp...\n\
- [span_notice("Gnashing Teeth")]: Punch Punch. Deal additional damage every second (consecutive) punch! Very good chance to wound!\n\
+ [span_notice("Gnashing Teeth")]: Punch Grab. Violently twists your opponent's arm, dislocating or even shattering bone and forcing them to drop their held items.\n\
[span_notice("Crashing Wave Kick")]: Punch Shove. Launch your opponent away from you with incredible force!\n\
[span_notice("Keelhaul")]: Shove Shove. Nonlethally kick an opponent to the floor, knocking them down, discombobulating them and dealing substantial stamina damage. If they're already prone, disarm them as well.\n\
- [span_notice("Grabs and Shoves")]: While in combat mode, your typical grab and shove do decent stamina damage. If you grab someone who has substantial amounts of stamina damage, you knock them out!\n\
+ [span_notice("Kraken Wrack")]: Grab Punch. Deliver a knee jab into the opponent, dealing high stamina damage, as well as briefly stunning them, winding them and making it difficult for them to speak.\n\
+ [span_notice("Grabs and Shoves")]: While in combat mode, your typical grab and shove do decent stamina damage, and your grabs harder to break. If you grab someone who has substantial amounts of stamina damage, you knock them out!\n\
While in combat mode (and not stunned, not a hulk, and not in a mech), you can reflect all projectiles that come your way, sending them back at the people who fired them! \n\
+ However, your ability to avoid projectiles is negatively affected when your are burdened by armor, or whenever you are carrying normal-sized or heavier objects in your hands. \n\
+ But if you commmit fully to the martial arts lifestyle by wearing martial arts or carp-related regalia, you will feel empowered enough to potentially avoid attacks even from melee weapons or other unarmed combatants. \n\
+ Some melee weapons, such as bo starves, spears, short blades, knives, toolboxes, baseball bats and non-blocking small objects are safe to carry without affecting your ability to defend yourself. Exploit this for a tactical advantage. \n\
Also, you are more resilient against suffering wounds in combat, and your limbs cannot be dismembered. This grants you extra staying power during extended combat, especially against slashing and other bleeding weapons. \n\
You are not invincible, however- while you may not suffer debilitating wounds often, you must still watch your health and should have appropriate medical supplies for use during downtime. \n\
In addition, your training has imbued you with a loathing of guns, and you can no longer use them."))
-
/obj/item/staff/bostaff
name = "bo staff"
desc = "A long, tall staff made of polished wood. Traditionally used in ancient old-Earth martial arts. Can be wielded to both kill and incapacitate."
@@ -301,7 +451,7 @@
span_userdanger("[user] [pick(fluffmessages)]s you with [src]!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), null, user)
to_chat(user, span_danger("You [pick(fluffmessages)] [H] with [src]!"))
playsound(get_turf(user), 'sound/effects/woodhit.ogg', 75, TRUE, -1)
- H.adjustStaminaLoss(rand(13,20))
+ H.adjust_stamina_loss(rand(13,20))
if(prob(10))
H.visible_message(span_warning("[H] collapses!"), \
span_userdanger("Your legs give out!"))
@@ -313,7 +463,7 @@
span_userdanger("You're knocked unconscious by [user]!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), null, user)
to_chat(user, span_danger("You deliver a heavy hit to [H]'s head, knocking [H.p_them()] out cold!"))
H.SetSleeping(60 SECONDS)
- H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 15, 150)
+ H.adjust_organ_loss(ORGAN_SLOT_BRAIN, 15, 150)
else
return ..()
@@ -337,6 +487,7 @@
. = ..()
AddComponent(/datum/component/martial_art_giver, /datum/martial_art/the_sleeping_carp)
-#undef STRONG_PUNCH_COMBO
+#undef WRIST_WRENCH_COMBO
#undef LAUNCH_KICK_COMBO
#undef DROP_KICK_COMBO
+#undef KNEE_STOMACH_COMBO
diff --git a/code/datums/martial/wrestling.dm b/code/datums/martial/wrestling.dm
index 4c66f236525d..961f27b21047 100644
--- a/code/datums/martial/wrestling.dm
+++ b/code/datums/martial/wrestling.dm
@@ -330,11 +330,11 @@ If you make a derivative work from this code, you must include this notification
switch(rand(1,3))
if (2)
- defender.adjustBruteLoss(rand(20,30))
+ defender.adjust_brute_loss(rand(20,30))
if (3)
EX_ACT(defender, EXPLODE_LIGHT)
else
- defender.adjustBruteLoss(rand(10,20))
+ defender.adjust_brute_loss(rand(10,20))
else
EX_ACT(defender, EXPLODE_LIGHT)
@@ -368,7 +368,7 @@ If you make a derivative work from this code, you must include this notification
defender.visible_message(span_danger("[attacker] headbutts [defender]!"), \
span_userdanger("You're headbutted by [attacker]!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, attacker)
to_chat(attacker, span_danger("You headbutt [defender]!"))
- defender.adjustBruteLoss(rand(10,20))
+ defender.adjust_brute_loss(rand(10,20))
playsound(attacker.loc, SFX_SWING_HIT, 50, TRUE)
defender.Unconscious(2 SECONDS)
log_combat(attacker, defender, "headbutted")
@@ -384,7 +384,7 @@ If you make a derivative work from this code, you must include this notification
span_userdanger("You're roundhouse-kicked by [attacker]!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, attacker)
to_chat(attacker, span_danger("You roundhouse-kick [defender]!"))
playsound(attacker.loc, SFX_SWING_HIT, 50, TRUE)
- defender.adjustBruteLoss(rand(10,20))
+ defender.adjust_brute_loss(rand(10,20))
var/turf/T = get_edge_target_turf(attacker, get_dir(attacker, get_step_away(defender, attacker)))
if (T && isturf(T))
@@ -428,7 +428,7 @@ If you make a derivative work from this code, you must include this notification
if (falling == 1)
attacker.visible_message(span_danger("...and dives head-first into the ground, ouch!"), \
span_userdanger("...and dive head-first into the ground, ouch!"))
- attacker.adjustBruteLoss(rand(10,20))
+ attacker.adjust_brute_loss(rand(10,20))
attacker.Paralyze(60)
to_chat(attacker, span_warning("[defender] is too far away!"))
return
@@ -456,9 +456,9 @@ If you make a derivative work from this code, you must include this notification
if (prob(33) || defender.stat)
EX_ACT(defender, EXPLODE_LIGHT)
else
- defender.adjustBruteLoss(rand(20,30))
+ defender.adjust_brute_loss(rand(20,30))
else
- defender.adjustBruteLoss(rand(20,30))
+ defender.adjust_brute_loss(rand(20,30))
defender.Paralyze(4 SECONDS)
diff --git a/code/datums/components/material/material_container.dm b/code/datums/material/material_container.dm
similarity index 86%
rename from code/datums/components/material/material_container.dm
rename to code/datums/material/material_container.dm
index 6b1cda73099f..4990e5bf7649 100644
--- a/code/datums/components/material/material_container.dm
+++ b/code/datums/material/material_container.dm
@@ -12,7 +12,9 @@
//The full item was consumed
#define MATERIAL_INSERT_ITEM_SUCCESS 1
-/datum/component/material_container
+/datum/material_container
+ ///Parent to which this container is attached to
+ VAR_PRIVATE/atom/movable/parent
/// The maximum amount of materials this material container can contain
var/max_amount
/// Map of material ref -> amount
@@ -29,7 +31,8 @@
var/list/registered_signals
/// Sets up the proper signals and fills the list of materials with the appropriate references.
-/datum/component/material_container/Initialize(
+/datum/material_container/New(
+ target,
list/init_mats,
max_amt = 0,
_mat_container_flags = NONE,
@@ -38,8 +41,7 @@
list/container_signals
)
- if(!isatom(parent))
- return COMPONENT_INCOMPATIBLE
+ parent = target
materials = list()
max_amount = max(0, max_amt)
@@ -67,52 +69,34 @@
for(var/signal in container_signals)
parent.RegisterSignal(src, signal, container_signals[signal])
-/datum/component/material_container/Destroy(force)
- materials = null
- allowed_materials = null
- return ..()
-
-/datum/component/material_container/RegisterWithParent()
- . = ..()
-
- var/atom/atom_target = parent
-
//can we insert into this container
if(!(mat_container_flags & MATCONTAINER_NO_INSERT))
//to insert stuff into the container
- RegisterSignal(atom_target, COMSIG_ATOM_ITEM_INTERACTION, PROC_REF(on_item_insert))
- RegisterSignal(atom_target, COMSIG_ATOM_ITEM_INTERACTION_SECONDARY, PROC_REF(on_secondary_insert))
+ RegisterSignal(parent, COMSIG_ATOM_ITEM_INTERACTION, PROC_REF(on_item_insert))
+ RegisterSignal(parent, COMSIG_ATOM_ITEM_INTERACTION_SECONDARY, PROC_REF(on_secondary_insert))
//screen tips for inserting items
- atom_target.flags_1 |= HAS_CONTEXTUAL_SCREENTIPS_1
- RegisterSignal(atom_target, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(on_requesting_context_from_item))
+ parent.flags_1 |= HAS_CONTEXTUAL_SCREENTIPS_1
+ RegisterSignal(parent, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(on_requesting_context_from_item))
//to see available materials
if(mat_container_flags & MATCONTAINER_EXAMINE)
- RegisterSignal(atom_target, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine))
+ RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine))
//drop sheets when the object is deconstructed but not deleted
RegisterSignal(parent, COMSIG_OBJ_DECONSTRUCT, PROC_REF(drop_sheets))
-/datum/component/material_container/UnregisterFromParent()
- var/list/signals = list()
-
- if(!(mat_container_flags & MATCONTAINER_NO_INSERT))
- signals += COMSIG_ATOM_ITEM_INTERACTION
- signals += COMSIG_ATOM_ITEM_INTERACTION_SECONDARY
- signals += COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM
- if(mat_container_flags & MATCONTAINER_EXAMINE)
- signals += COMSIG_ATOM_EXAMINE
- signals += COMSIG_OBJ_DECONSTRUCT
-
- UnregisterSignal(parent, signals)
+/datum/material_container/Destroy(force)
+ materials = null
+ allowed_materials = null
+ return ..()
-/datum/component/material_container/proc/drop_sheets()
+/datum/material_container/proc/drop_sheets()
SIGNAL_HANDLER
retrieve_all()
-/datum/component/material_container/proc/on_examine(datum/source, mob/user, list/examine_texts)
+/datum/material_container/proc/on_examine(datum/source, mob/user, list/examine_texts)
SIGNAL_HANDLER
for(var/I in materials)
@@ -121,7 +105,7 @@
if(amt)
examine_texts += span_notice("It has [amt] sheets of [LOWER_TEXT(M.name)] stored.")
-/datum/component/material_container/vv_edit_var(var_name, var_value)
+/datum/material_container/vv_edit_var(var_name, var_value)
var/old_flags = mat_container_flags
. = ..()
if(var_name == NAMEOF(src, mat_container_flags) && parent)
@@ -162,7 +146,7 @@
* chance to process the item
* - user_data: in the form rendered by ID_DATA(user), for material logging (and if this component is connected to a silo, also for permission checking)
*/
-/datum/component/material_container/proc/insert_item_materials(obj/item/source, multiplier = 1, atom/context = parent, alist/user_data)
+/datum/material_container/proc/insert_item_materials(obj/item/source, multiplier = 1, atom/context = parent, alist/user_data)
var/primary_mat
var/max_mat_value = 0
var/material_amount = 0
@@ -194,7 +178,7 @@
* - amt: amount of said material to insert
* - mat: the material type to insert
*/
-/datum/component/material_container/proc/insert_amount_mat(amt, datum/material/mat)
+/datum/material_container/proc/insert_amount_mat(amt, datum/material/mat)
if(amt <= 0)
return 0
amt = OPTIMAL_COST(amt)
@@ -228,7 +212,7 @@
* * - delete_item: should we delete the item after its materials are consumed. does not apply to stacks if they were split due to lack of space
* * - user_data - in the form rendered by ID_DATA(user), for material logging (and if this component is connected to a silo, also for permission checking)
*/
-/datum/component/material_container/proc/insert_item(obj/item/weapon, multiplier = 1, atom/context = parent, delete_item = TRUE, alist/user_data)
+/datum/material_container/proc/insert_item(obj/item/weapon, multiplier = 1, atom/context = parent, delete_item = TRUE, alist/user_data)
if(QDELETED(weapon))
return MATERIAL_INSERT_ITEM_NO_MATS
multiplier = CEILING(multiplier, 0.01)
@@ -245,7 +229,7 @@
if(!space_left)
return MATERIAL_INSERT_ITEM_NO_SPACE
var/material_per_sheet = material_amount / item_stack.amount
- var/sheets_to_insert = round(space_left / material_per_sheet)
+ var/sheets_to_insert = floor(space_left / material_per_sheet)
if(!sheets_to_insert)
return MATERIAL_INSERT_ITEM_NO_SPACE
target = fast_split_stack(item_stack, sheets_to_insert)
@@ -278,7 +262,7 @@
* * user - the mob inserting this item
* * context - the atom performing the operation, this is the last argument sent in COMSIG_MATCONTAINER_ITEM_CONSUMED and is used mostly for silo logging
*/
-/datum/component/material_container/proc/user_insert(obj/item/held_item, mob/living/user, atom/context = parent)
+/datum/material_container/proc/user_insert(obj/item/held_item, mob/living/user, atom/context = parent)
set waitfor = FALSE
. = 0
@@ -489,18 +473,18 @@
if(!QDELETED(deleting)) //deleting parents also delete their children so we check
qdel(deleting)
-/datum/component/material_container/proc/on_item_insert(datum/source, mob/living/user, obj/item/weapon)
+/datum/material_container/proc/on_item_insert(datum/source, mob/living/user, obj/item/weapon)
SIGNAL_HANDLER
// Don't insert material items with left click
if (isstack(weapon))
return attempt_insert(user, weapon)
-/datum/component/material_container/proc/on_secondary_insert(datum/source, mob/living/user, obj/item/weapon)
+/datum/material_container/proc/on_secondary_insert(datum/source, mob/living/user, obj/item/weapon)
SIGNAL_HANDLER
return attempt_insert(user, weapon)
/// Proc that allows players to fill the parent with mats
-/datum/component/material_container/proc/attempt_insert(mob/living/user, obj/item/weapon)
+/datum/material_container/proc/attempt_insert(mob/living/user, obj/item/weapon)
//Allows you to attack the machine with iron sheets for e.g.
if(!(mat_container_flags & MATCONTAINER_ANY_INTENT) && user.combat_mode)
return
@@ -524,7 +508,7 @@
* Arguments:
* * amt - can this container hold this much amount of materials
*/
-/datum/component/material_container/proc/has_space(amt = 0)
+/datum/material_container/proc/has_space(amt = 0)
return (total_amount() + amt) <= max_amount
/**
@@ -533,7 +517,7 @@
* Arguments:
* - [mat][/atom/material]: The material we are checking for insertability.
*/
-/datum/component/material_container/proc/can_hold_material(datum/material/mat)
+/datum/material_container/proc/can_hold_material(datum/material/mat)
if(mat in allowed_materials)
return TRUE
if(istype(mat) && ((mat.id in allowed_materials) || (mat.type in allowed_materials)))
@@ -556,7 +540,7 @@
* b) If it's text then its an category material & there is no way to deal with it so return 0
* c) If normal material proceeds as usual
*/
-/datum/component/material_container/proc/get_material_amount(datum/material/mat)
+/datum/material_container/proc/get_material_amount(datum/material/mat)
if(!istype(mat))
mat = GET_MATERIAL_REF(mat)
return materials[mat]
@@ -568,7 +552,7 @@
* Arguments:
* - [I][obj/item]: the item whos materials must be retrieved
*/
-/datum/component/material_container/proc/get_item_material_amount(obj/item/item)
+/datum/material_container/proc/get_item_material_amount(obj/item/item)
if(!istype(item) || !item.custom_materials)
return 0
var/material_amount = 0
@@ -583,7 +567,7 @@
//=========================================HIGH LEVEL==========================================
/// returns the total amount of material in the container
-/datum/component/material_container/proc/total_amount()
+/datum/material_container/proc/total_amount()
. = 0
for(var/i in materials)
. += get_material_amount(i)
@@ -595,7 +579,7 @@
* - [req_mat][datum/material]: the material to check for
* - amount: how much material do we need
*/
-/datum/component/material_container/proc/has_enough_of_material(datum/material/req_mat, amount = 1)
+/datum/material_container/proc/has_enough_of_material(datum/material/req_mat, amount = 1)
return get_material_amount(req_mat) >= OPTIMAL_COST(amount)
@@ -608,7 +592,7 @@
* - coefficient: scaling applied to 1 unit of material in the mats list
* - multiplier: how many units(after scaling) do we require
*/
-/datum/component/material_container/proc/has_materials(list/mats, coefficient = 1, multiplier = 1)
+/datum/material_container/proc/has_materials(list/mats, coefficient = 1, multiplier = 1)
if(!length(mats))
return FALSE
@@ -632,7 +616,7 @@
* - amt: amount of said material to use
* - [mat][datum/material]: type of mat to use
*/
-/datum/component/material_container/proc/use_amount_mat(amt, datum/material/mat)
+/datum/material_container/proc/use_amount_mat(amt, datum/material/mat)
//round amount
amt = OPTIMAL_COST(amt)
@@ -658,7 +642,7 @@
* - coefficient: how much fraction of unit material in the mats list must be consumed. This is usually your machines efficiency
* - multiplier: how many units of material in the mats list(after each unit is multiplied and rounded with coefficient) must be consumed, This is usually your print quantity
*/
-/datum/component/material_container/proc/use_materials(list/mats, coefficient = 1, multiplier = 1)
+/datum/material_container/proc/use_materials(list/mats, coefficient = 1, multiplier = 1)
if(!mats || !length(mats))
return FALSE
@@ -673,16 +657,16 @@
//===========================================HIGH LEVEL=======================================
/**
- * For spawning mineral sheets at a specific location. Used by machines to output sheets.
+ * For spawning stacks (mineral sheets or ore) at a specific location. Used by machines to output sheets.
*
* Arguments:
- * sheet_amt: number of sheets to extract
+ * stack_amt: number of sheets to extract
* [material][datum/material]: type of sheets present in this container to extract
* [target][atom]: drop location
- * [atom][context]: context - the atom performing the operation, this is the last argument sent in COMSIG_MATCONTAINER_SHEETS_RETRIEVED and is used mostly for silo logging
+ * [atom][context]: context - the atom performing the operation, this is the last argument sent in COMSIG_MATCONTAINER_STACK_RETRIEVED and is used mostly for silo logging
* user_data - in the form rendered by ID_DATA(user), for material logging (and if this component is connected to a silo, also for permission checking)
*/
-/datum/component/material_container/proc/retrieve_sheets(sheet_amt, datum/material/material, atom/target = null, atom/context = parent, alist/user_data)
+/datum/material_container/proc/retrieve_stack(stack_amt, datum/material/material, atom/target = null, atom/context = parent, alist/user_data)
//do we support sheets of this material
if(!material.sheet_type)
return 0 //Add greyscale sheet handling here later
@@ -690,8 +674,8 @@
return 0
//requested amount greater than available amount or just an invalid value
- sheet_amt = min(round(materials[material] / SHEET_MATERIAL_AMOUNT), sheet_amt)
- if(sheet_amt <= 0)
+ stack_amt = min(floor(materials[material] / SHEET_MATERIAL_AMOUNT), stack_amt)
+ if(stack_amt <= 0)
return 0
//auto drop location
if(!target)
@@ -702,27 +686,30 @@
//eject sheets based on available amount after each iteration
var/count = 0
- while(sheet_amt > 0)
+ while(stack_amt > 0)
+ var/type_to_retrieve = material.sheet_type || material.ore_type
//don't merge yet. we need to do stuff with it first
- var/obj/item/stack/sheet/new_sheets = new material.sheet_type(target, min(sheet_amt, MAX_STACK_SIZE), FALSE)
- new_sheets.manufactured = TRUE
- count += new_sheets.amount
+ var/obj/item/stack/new_stack = new type_to_retrieve(target, min(stack_amt, MAX_STACK_SIZE), FALSE)
+ if(istype(new_stack, /obj/item/stack/sheet))
+ var/obj/item/stack/sheet/new_sheets = new_stack
+ new_sheets.manufactured = TRUE
+ count += new_stack.amount
//use material & deduct work needed
- use_amount_mat(new_sheets.amount * SHEET_MATERIAL_AMOUNT, material)
- sheet_amt -= new_sheets.amount
+ use_amount_mat(new_stack.amount * SHEET_MATERIAL_AMOUNT, material)
+ stack_amt -= new_stack.amount
//send signal
- SEND_SIGNAL(src, COMSIG_MATCONTAINER_SHEETS_RETRIEVED, new_sheets, context, user_data)
+ SEND_SIGNAL(src, COMSIG_MATCONTAINER_STACK_RETRIEVED, new_stack, context, user_data)
//no point merging anything into an already full stack
- if(new_sheets.amount == new_sheets.max_amount)
+ if(new_stack.amount == new_stack.max_amount)
continue
//now we can merge since we are done with it
for(var/obj/item/stack/item_stack in target)
- if(item_stack == new_sheets || item_stack.type != material.sheet_type) //don't merge with self or different type
+ if(item_stack == new_stack || item_stack.type != type_to_retrieve) //don't merge with self or different type
continue
//speed merge
- var/merge_amount = min(item_stack.amount, new_sheets.max_amount - new_sheets.get_amount())
+ var/merge_amount = min(item_stack.amount, new_stack.max_amount - new_stack.get_amount())
item_stack.use(merge_amount)
- new_sheets.add(merge_amount)
+ new_stack.add(merge_amount)
break
return count
@@ -733,21 +720,21 @@
* - target: drop location of the sheets
* - context: the atom which is ejecting the sheets. Used mostly in silo logging
*/
-/datum/component/material_container/proc/retrieve_all(target = null, atom/context = parent)
+/datum/material_container/proc/retrieve_all(target = null, atom/context = parent)
var/result = 0
for(var/MAT in materials)
- result += retrieve_sheets(amount2sheet(materials[MAT]), MAT, target, context, user_data = ID_DATA(null))
+ result += retrieve_stack(amount2sheet(materials[MAT]), MAT, target, context, user_data = ID_DATA(null))
return result
//============================================================================================
-/datum/component/material_container/ui_static_data(mob/user)
+/datum/material_container/ui_static_data(mob/user)
var/list/data = list()
data["SHEET_MATERIAL_AMOUNT"] = SHEET_MATERIAL_AMOUNT
return data
/// List format is list(material_name = list(amount = ..., ref = ..., etc.))
-/datum/component/material_container/ui_data(mob/user)
+/datum/material_container/ui_data(mob/user)
var/list/data = list()
for(var/datum/material/material as anything in materials)
@@ -770,7 +757,7 @@
* * held_item - refers to the item that has materials accepted by the material container
* * user - refers to user who will see the screentip when the proper context and tool are there
*/
-/datum/component/material_container/proc/on_requesting_context_from_item(datum/source, list/context, obj/item/held_item, mob/living/user)
+/datum/material_container/proc/on_requesting_context_from_item(datum/source, list/context, obj/item/held_item, mob/living/user)
SIGNAL_HANDLER
if(isnull(held_item))
diff --git a/code/datums/components/material/remote_materials.dm b/code/datums/material/remote_materials.dm
similarity index 83%
rename from code/datums/components/material/remote_materials.dm
rename to code/datums/material/remote_materials.dm
index f122bfb908b0..9f15f3d0cb54 100644
--- a/code/datums/components/material/remote_materials.dm
+++ b/code/datums/material/remote_materials.dm
@@ -5,16 +5,18 @@ fallback to a local material storage in case remote storage is unavailable, and
handles linking back and forth.
*/
-/datum/component/remote_materials
+/datum/remote_materials
// Three possible states:
// 1. silo exists, materials is parented to silo
// 2. silo is null, materials is parented to parent
// 3. silo is null, materials is null
+ ///Movable this connection is attached to
+ var/atom/movable/parent
///The silo machine this container is connected to
var/obj/machinery/ore_silo/silo
///Material container. the value is either the silo or local
- var/datum/component/material_container/mat_container
+ var/datum/material_container/mat_container
///Should we create a local storage if we can't connect to silo
var/allow_standalone
///Local size of container when silo = null
@@ -26,15 +28,15 @@ handles linking back and forth.
///Callback for round start silo connections. Have to cancel this if the parent gets destroyed before round start
VAR_PRIVATE/datum/callback/connection
-/datum/component/remote_materials/Initialize(
+/datum/remote_materials/New(
+ parent,
mapload,
allow_standalone = TRUE,
force_connect = FALSE,
mat_container_flags = NONE,
list/mat_container_signals = null,
)
- if (!isatom(parent))
- return COMPONENT_INCOMPATIBLE
+ src.parent = parent
src.allow_standalone = allow_standalone
src.mat_container_flags = mat_container_flags
@@ -60,7 +62,7 @@ handles linking back and forth.
* connect_to_silo- if true connect to global silo. If not successfull then go to local storage
* only if allow_standalone = TRUE, else you a null mat_container
*/
-/datum/component/remote_materials/proc/_PrepareStorage(connect_to_silo)
+/datum/remote_materials/proc/_PrepareStorage(connect_to_silo)
PRIVATE_PROC(TRUE)
connection = null
@@ -75,25 +77,24 @@ handles linking back and forth.
if (!mat_container && allow_standalone)
_MakeLocal()
-/datum/component/remote_materials/Destroy()
+/datum/remote_materials/Destroy()
if(connection)
LAZYREMOVE(SSticker.round_start_events, connection)
connection = null
if(silo)
allow_standalone = FALSE
disconnect()
- if(mat_container)
- mat_container = null
+ QDEL_NULL(mat_container)
return ..()
-/datum/component/remote_materials/proc/_MakeLocal()
+/datum/remote_materials/proc/_MakeLocal()
PRIVATE_PROC(TRUE)
silo = null
- mat_container = parent.AddComponent( \
- /datum/component/material_container, \
+ mat_container = new ( \
+ parent, \
SSmaterials.materials_by_category[MAT_CATEGORY_SILO], \
local_size, \
mat_container_flags, \
@@ -102,7 +103,7 @@ handles linking back and forth.
)
/// Adds/Removes this connection from the silo
-/datum/component/remote_materials/proc/toggle_holding()
+/datum/remote_materials/proc/toggle_holding()
if(isnull(silo))
return
@@ -117,13 +118,13 @@ handles linking back and forth.
*
* * size - the new size for local storage. measured in SHEET_MATERIAL_SIZE units
*/
-/datum/component/remote_materials/proc/set_local_size(size)
+/datum/remote_materials/proc/set_local_size(size)
local_size = size
if (!silo && mat_container)
mat_container.max_amount = size
///Disconnects this component from the silo
-/datum/component/remote_materials/proc/disconnect()
+/datum/remote_materials/proc/disconnect()
if(isnull(silo))
return
@@ -133,7 +134,7 @@ handles linking back and forth.
if (allow_standalone)
_MakeLocal()
-/datum/component/remote_materials/proc/OnMultitool(datum/source, mob/user, obj/item/multitool/M)
+/datum/remote_materials/proc/OnMultitool(datum/source, mob/user, obj/item/multitool/M)
SIGNAL_HANDLER
. = NONE
@@ -146,7 +147,7 @@ handles linking back and forth.
return ITEM_INTERACT_BLOCKING
var/obj/machinery/ore_silo/new_silo = M.buffer
- var/datum/component/material_container/new_container = new_silo.GetComponent(/datum/component/material_container)
+ var/datum/material_container/new_container = new_silo.materials
if (silo)
silo.disconnect_receptacle(src, parent)
else if (mat_container)
@@ -166,18 +167,18 @@ handles linking back and forth.
to_chat(user, span_notice("You connect [parent] to [silo] from the multitool's buffer."))
return ITEM_INTERACT_SUCCESS
-/datum/component/remote_materials/proc/on_item_insert(datum/source, mob/living/user, obj/item/target)
+/datum/remote_materials/proc/on_item_insert(datum/source, mob/living/user, obj/item/target)
SIGNAL_HANDLER
// Only insert stacks with left click
if(isstack(target))
return attempt_insert(user, target)
-/datum/component/remote_materials/proc/on_secondary_insert(datum/source, mob/living/user, obj/item/target)
+/datum/remote_materials/proc/on_secondary_insert(datum/source, mob/living/user, obj/item/target)
SIGNAL_HANDLER
return attempt_insert(user, target)
/// Insert mats into silo
-/datum/component/remote_materials/proc/attempt_insert(mob/living/user, obj/item/target)
+/datum/remote_materials/proc/attempt_insert(mob/living/user, obj/item/target)
if(!(mat_container_flags & MATCONTAINER_ANY_INTENT) && user.combat_mode)
return
@@ -194,14 +195,14 @@ handles linking back and forth.
*
* Returns true if both are on the station or same z level
*/
-/datum/component/remote_materials/proc/check_z_level(obj/silo_to_check = silo)
+/datum/remote_materials/proc/check_z_level(obj/silo_to_check = silo)
if(isnull(silo_to_check))
return FALSE
return is_valid_z_level(get_turf(silo_to_check), get_turf(parent))
/// returns TRUE if this connection put on hold by the silo
-/datum/component/remote_materials/proc/on_hold()
+/datum/remote_materials/proc/on_hold()
return check_z_level() ? silo.holds[src] : FALSE
/**
@@ -214,7 +215,7 @@ handles linking back and forth.
* * check_hold - should we check if the silo is on hold
* * user_data - in the form rendered by ID_DATA(user); used as a reference for silo bans and access checks
*/
-/datum/component/remote_materials/proc/can_use_resource(check_hold = TRUE, alist/user_data)
+/datum/remote_materials/proc/can_use_resource(check_hold = TRUE, alist/user_data)
var/atom/movable/movable_parent = parent
if (!istype(movable_parent))
return FALSE
@@ -240,7 +241,7 @@ handles linking back and forth.
* name- For logging only. the design you are trying to build e.g. matter bin, etc.
* user_data - in the form rendered by ID_DATA(user), for material logging and (if this component is connected to a silo), permission checking
*/
-/datum/component/remote_materials/proc/use_materials(list/mats, coefficient = 1, multiplier = 1, action = "processed", name = "design", alist/user_data)
+/datum/remote_materials/proc/use_materials(list/mats, coefficient = 1, multiplier = 1, action = "processed", name = "design", alist/user_data)
if(!can_use_resource(user_data = user_data))
return 0
@@ -263,7 +264,7 @@ handles linking back and forth.
* [drop_target][atom]- optional where to drop the sheets. null means it is dropped at this components parent location
* user_data - in the form rendered by ID_DATA(user), for material logging and (if this component is connected to a silo), permission checking
*/
-/datum/component/remote_materials/proc/eject_sheets(datum/material/material_ref, eject_amount, atom/drop_target = null, alist/user_data)
+/datum/remote_materials/proc/eject_sheets(datum/material/material_ref, eject_amount, atom/drop_target = null, alist/user_data)
if(!can_use_resource(user_data = user_data))
return 0
@@ -271,7 +272,7 @@ handles linking back and forth.
if(isnull(drop_target))
drop_target = movable_parent.drop_location()
- return mat_container.retrieve_sheets(eject_amount, material_ref, target = drop_target, context = parent, user_data = user_data)
+ return mat_container.retrieve_stack(eject_amount, material_ref, target = drop_target, context = parent, user_data = user_data)
/**
* Insert an item into the mat container, helper proc to insert items with the correct context
@@ -281,7 +282,7 @@ handles linking back and forth.
* * multiplier - the multiplier applied on the materials consumed
* * user_data - an alist in the form rendered by ID_DATA(user), for logging who/where/when the item was inserted
*/
-/datum/component/remote_materials/proc/insert_item(obj/item/weapon, multiplier = 1, alist/user_data)
+/datum/remote_materials/proc/insert_item(obj/item/weapon, multiplier = 1, alist/user_data)
// Inserting materials automatically shouldn't be permission-restricted
if(!islist(user_data))
user_data = ID_DATA(null)
diff --git a/code/datums/materials/basemats.dm b/code/datums/materials/basemats.dm
index 86e1d6d88b55..5c56a8a451d9 100644
--- a/code/datums/materials/basemats.dm
+++ b/code/datums/materials/basemats.dm
@@ -23,8 +23,9 @@
fishing_gravity_mult = 1.1
/datum/material/iron/on_accidental_mat_consumption(mob/living/carbon/victim, obj/item/source_item)
- victim.apply_damage(10, BRUTE, BODY_ZONE_HEAD, wound_bonus = 5)
- return TRUE
+ if(!HAS_TRAIT(victim, TRAIT_ROCK_EATER))
+ victim.apply_damage(10, BRUTE, BODY_ZONE_HEAD, wound_bonus = 5)
+ return TRUE
///Breaks extremely easily but is transparent.
/datum/material/glass
@@ -62,8 +63,9 @@
fishing_gravity_mult = 0.9
/datum/material/glass/on_accidental_mat_consumption(mob/living/carbon/victim, obj/item/source_item)
- victim.apply_damage(10, BRUTE, BODY_ZONE_HEAD, wound_bonus = 5, sharpness = TRUE) //cronch
- return TRUE
+ if(!HAS_TRAIT(victim, TRAIT_ROCK_EATER))
+ victim.apply_damage(10, BRUTE, BODY_ZONE_HEAD, wound_bonus = 5, sharpness = TRUE) //cronch
+ return TRUE
/datum/material/glass/on_main_applied(atom/source, mat_amount, multiplier)
. = ..()
@@ -110,8 +112,9 @@ Unless you know what you're doing, only use the first three numbers. They're in
fishing_gravity_mult = 1.1
/datum/material/silver/on_accidental_mat_consumption(mob/living/carbon/victim, obj/item/source_item)
- victim.apply_damage(10, BRUTE, BODY_ZONE_HEAD, wound_bonus = 5)
- return TRUE
+ if(!HAS_TRAIT(victim, TRAIT_ROCK_EATER))
+ victim.apply_damage(10, BRUTE, BODY_ZONE_HEAD, wound_bonus = 5)
+ return TRUE
///Slight force increase
/datum/material/gold
@@ -186,8 +189,9 @@ Unless you know what you're doing, only use the first three numbers. They're in
fishing_gravity_mult = 1.1
/datum/material/diamond/on_accidental_mat_consumption(mob/living/carbon/victim, obj/item/source_item)
- victim.apply_damage(15, BRUTE, BODY_ZONE_HEAD, wound_bonus = 7)
- return TRUE
+ if(!HAS_TRAIT(victim, TRAIT_ROCK_EATER))
+ victim.apply_damage(15, BRUTE, BODY_ZONE_HEAD, wound_bonus = 7)
+ return TRUE
///Is slightly radioactive
/datum/material/uranium
@@ -325,7 +329,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
SIGNAL_HANDLER
if(prob(67))
return
- var/list/elegible_fish_sources = flatten_list(GLOB.preset_fish_sources)
+ var/list/elegible_fish_sources = assoc_to_values(GLOB.preset_fish_sources)
for(var/datum/fish_source/source as anything in elegible_fish_sources)
if(source.fish_source_flags & FISH_SOURCE_FLAG_NO_BLUESPACE_ROD)
elegible_fish_sources -= source
@@ -444,8 +448,9 @@ Unless you know what you're doing, only use the first three numbers. They're in
fishing_gravity_mult = 1.1
/datum/material/titanium/on_accidental_mat_consumption(mob/living/carbon/victim, obj/item/source_item)
- victim.apply_damage(15, BRUTE, BODY_ZONE_HEAD, wound_bonus = 7)
- return TRUE
+ if(!HAS_TRAIT(victim, TRAIT_ROCK_EATER))
+ victim.apply_damage(15, BRUTE, BODY_ZONE_HEAD, wound_bonus = 7)
+ return TRUE
/datum/material/runite
name = "runite"
@@ -484,8 +489,9 @@ Unless you know what you're doing, only use the first three numbers. They're in
REMOVE_TRAIT(source, TRAIT_ROD_REMOVE_FISHING_DUD, REF(src)) //light-absorbing, environment-cancelling fishing rod.
/datum/material/runite/on_accidental_mat_consumption(mob/living/carbon/victim, obj/item/source_item)
- victim.apply_damage(20, BRUTE, BODY_ZONE_HEAD, wound_bonus = 10)
- return TRUE
+ if(!HAS_TRAIT(victim, TRAIT_ROCK_EATER))
+ victim.apply_damage(20, BRUTE, BODY_ZONE_HEAD, wound_bonus = 10)
+ return TRUE
///Force decrease
/datum/material/plastic
@@ -568,7 +574,8 @@ Unless you know what you're doing, only use the first three numbers. They're in
wooden.resistance_flags &= ~FLAMMABLE
/datum/material/wood/on_accidental_mat_consumption(mob/living/carbon/victim, obj/item/source_item)
- victim.apply_damage(5, BRUTE, BODY_ZONE_HEAD)
+ if(!HAS_TRAIT(victim, TRAIT_ROCK_EATER))
+ victim.apply_damage(5, BRUTE, BODY_ZONE_HEAD)
victim.reagents.add_reagent(/datum/reagent/cellulose, rand(8, 12))
source_item?.reagents?.add_reagent(/datum/reagent/cellulose, source_item.reagents.total_volume*(2/5))
@@ -613,8 +620,9 @@ Unless you know what you're doing, only use the first three numbers. They're in
REMOVE_TRAIT(source, TRAIT_ROD_REMOVE_FISHING_DUD, REF(src)) //light-absorbing, environment-cancelling fishing rod.
/datum/material/adamantine/on_accidental_mat_consumption(mob/living/carbon/victim, obj/item/source_item)
- victim.apply_damage(20, BRUTE, BODY_ZONE_HEAD, wound_bonus = 10)
- return TRUE
+ if(!HAS_TRAIT(victim, TRAIT_ROCK_EATER))
+ victim.apply_damage(20, BRUTE, BODY_ZONE_HEAD, wound_bonus = 10)
+ return TRUE
///RPG Magic.
/datum/material/mythril
@@ -657,8 +665,9 @@ Unless you know what you're doing, only use the first three numbers. They're in
qdel(source.GetComponent(/datum/component/fantasy))
/datum/material/mythril/on_accidental_mat_consumption(mob/living/carbon/victim, obj/item/source_item)
- victim.apply_damage(20, BRUTE, BODY_ZONE_HEAD, wound_bonus = 10)
- return TRUE
+ if(!HAS_TRAIT(victim, TRAIT_ROCK_EATER))
+ victim.apply_damage(20, BRUTE, BODY_ZONE_HEAD, wound_bonus = 10)
+ return TRUE
//formed when freon react with o2, emits a lot of plasma when heated
/datum/material/hot_ice
@@ -728,8 +737,9 @@ Unless you know what you're doing, only use the first three numbers. They're in
fishing_gravity_mult = 0.7
/datum/material/metalhydrogen/on_accidental_mat_consumption(mob/living/carbon/victim, obj/item/source_item)
- victim.apply_damage(15, BRUTE, BODY_ZONE_HEAD, wound_bonus = 7)
- return TRUE
+ if(!HAS_TRAIT(victim, TRAIT_ROCK_EATER))
+ victim.apply_damage(15, BRUTE, BODY_ZONE_HEAD, wound_bonus = 7)
+ return TRUE
//I don't like sand. It's coarse, and rough, and irritating, and it gets everywhere.
/datum/material/sand
@@ -749,6 +759,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
beauty_modifier = 0.25
turf_sound_override = FOOTSTEP_SAND
texture_layer_icon_state = "sand"
+ mat_rust_resistance = RUST_RESISTANCE_BASIC
fish_weight_modifier = 1.2
fishing_difficulty_modifier = 30 //Sand fishing rods? What the hell are you doing?
fishing_cast_range = -2
@@ -780,6 +791,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
beauty_modifier = 0.3
turf_sound_override = FOOTSTEP_WOOD
texture_layer_icon_state = "brick"
+ mat_rust_resistance = RUST_RESISTANCE_BASIC
fish_weight_modifier = 1.2
fishing_difficulty_modifier = 25 //Sand fishing rods? What the hell are you doing?
fishing_cast_range = -2
@@ -807,6 +819,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
beauty_modifier = 0.3
turf_sound_override = FOOTSTEP_SAND
texture_layer_icon_state = "sand"
+ mat_rust_resistance = RUST_RESISTANCE_ORGANIC
fish_weight_modifier = 0.8
fishing_difficulty_modifier = 25
fishing_cast_range = -2
@@ -847,7 +860,8 @@ Unless you know what you're doing, only use the first three numbers. They're in
/datum/material/runedmetal/on_accidental_mat_consumption(mob/living/carbon/victim, obj/item/source_item)
victim.reagents.add_reagent(/datum/reagent/fuel/unholywater, rand(8, 12))
- victim.apply_damage(10, BRUTE, BODY_ZONE_HEAD, wound_bonus = 5)
+ if(!HAS_TRAIT(victim, TRAIT_ROCK_EATER))
+ victim.apply_damage(10, BRUTE, BODY_ZONE_HEAD, wound_bonus = 5)
return TRUE
/datum/material/bronze
@@ -1079,6 +1093,7 @@ Unless you know what you're doing, only use the first three numbers. They're in
REMOVE_TRAIT(source, TRAIT_ROD_IGNORE_ENVIRONMENT, REF(src)) //light-absorbing, environment-cancelling fishing rod.
/datum/material/zaukerite/on_accidental_mat_consumption(mob/living/carbon/victim, obj/item/source_item)
- victim.apply_damage(30, BURN, BODY_ZONE_HEAD, wound_bonus = 5)
+ if(!HAS_TRAIT(victim, TRAIT_ROCK_EATER))
+ victim.apply_damage(30, BURN, BODY_ZONE_HEAD, wound_bonus = 5)
source_item?.reagents?.add_reagent(/datum/reagent/toxin/plasma, source_item.reagents.total_volume*5)
return TRUE
diff --git a/code/datums/materials/hauntium.dm b/code/datums/materials/hauntium.dm
index 1fc0de30c84a..e66116789322 100644
--- a/code/datums/materials/hauntium.dm
+++ b/code/datums/materials/hauntium.dm
@@ -27,10 +27,10 @@
/datum/material/hauntium/on_main_applied(atom/source, mat_amount, multiplier)
. = ..()
- if(!isobj(source))
+ if(!isitem(source))
return
- var/obj/obj = source
- obj.make_haunted(INNATE_TRAIT, "#f8f8ff")
+ var/obj/item/source_item = source
+ source_item.make_haunted(INNATE_TRAIT, "#f8f8ff")
if(isbodypart(source))
var/obj/item/bodypart/bodypart = source
if(!(bodypart::bodytype & BODYTYPE_GHOST))
@@ -42,10 +42,10 @@
/datum/material/hauntium/on_main_removed(atom/source, mat_amount, multiplier)
. = ..()
- if(!isobj(source))
+ if(!isitem(source))
return
- var/obj/obj = source
- obj.remove_haunted(INNATE_TRAIT)
+ var/obj/item/source_item = source
+ source_item.remove_haunted(INNATE_TRAIT)
if(isbodypart(source))
var/obj/item/bodypart/bodypart = source
if(!(bodypart::bodytype & BODYTYPE_GHOST))
diff --git a/code/datums/materials/pizza.dm b/code/datums/materials/pizza.dm
index dfd384348862..fbc54cf65c63 100644
--- a/code/datums/materials/pizza.dm
+++ b/code/datums/materials/pizza.dm
@@ -16,6 +16,7 @@
item_sound_override = 'sound/effects/meatslap.ogg'
turf_sound_override = FOOTSTEP_MEAT
texture_layer_icon_state = "pizza"
+ mat_rust_resistance = RUST_RESISTANCE_REINFORCED
fish_weight_modifier = 0.9
fishing_difficulty_modifier = 13
fishing_cast_range = -2
diff --git a/code/datums/memory/key_memories.dm b/code/datums/memory/key_memories.dm
index 27030a02a1df..21a46a77b716 100644
--- a/code/datums/memory/key_memories.dm
+++ b/code/datums/memory/key_memories.dm
@@ -99,6 +99,30 @@
/datum/memory/key/quirk_allergy/get_starts()
return list("[protagonist_name] sneezing after coming into contact with [allergy_string].")
+/// Tracks what kind of item the quirk user's heirloom is
+/datum/memory/key/quirk_heirloom
+ var/heirloom_name
+
+/datum/memory/key/quirk_heirloom/New(
+ datum/mind/memorizer_mind,
+ atom/protagonist,
+ atom/deuteragonist,
+ atom/antagonist,
+ heirloom_name,
+)
+ src.heirloom_name = heirloom_name
+ return ..()
+
+/datum/memory/key/quirk_heirloom/get_names()
+ return list("[protagonist_name]'s heirloom [heirloom_name].")
+
+/datum/memory/key/quirk_heirloom/get_starts()
+ return list(
+ "[protagonist_name] being bequeathed the heirloom [heirloom_name] by a dear relative.",
+ "[protagonist_name] discovering the heirloom [heirloom_name] in some long-forgotten boxes.",
+ "[protagonist_name] stealing the heirloom [heirloom_name] from an undeserving family member.",
+ )
+
/// Tracks what brand a smoker quirk user likes
/datum/memory/key/quirk_smoker
memory_flags = MEMORY_FLAG_NOLOCATION|MEMORY_FLAG_NOPERSISTENCE|MEMORY_SKIP_UNCONSCIOUS // Does not have nomood
diff --git a/code/datums/mind/_mind.dm b/code/datums/mind/_mind.dm
index 62b09f84adda..83af9390bb55 100644
--- a/code/datums/mind/_mind.dm
+++ b/code/datums/mind/_mind.dm
@@ -493,6 +493,8 @@
CRASH("set_assigned_role called with invalid role: [isnull(new_role) ? "null" : new_role]")
. = assigned_role
assigned_role = new_role
+ if(!isnull(current))
+ SEND_SIGNAL(current, COMSIG_MOB_MIND_SET_ROLE, new_role)
///Sets your holy role, giving/taking away traits related to if you're gaining/losing it.
/datum/mind/proc/set_holy_role(new_holy_role)
@@ -531,3 +533,13 @@
/mob/dead/observer/sync_mind()
return
+
+/// Iterates over this mind's assigned role's departments and returns a list of their primary work areas.
+/datum/mind/proc/get_work_areas()
+ var/list/work_areas = list()
+ for(var/department in assigned_role.departments_list)
+ var/datum/job_department/dep = SSjob.joinable_departments_by_type[department]
+ if(dep.primary_work_area)
+ work_areas += dep.primary_work_area
+
+ return work_areas
diff --git a/code/datums/mocking/client.dm b/code/datums/mocking/client.dm
index 9bd02f061ac6..5c684f085212 100644
--- a/code/datums/mocking/client.dm
+++ b/code/datums/mocking/client.dm
@@ -85,3 +85,6 @@
/datum/client_interface/proc/set_fullscreen(logging_in = FALSE)
return TRUE
+
+/datum/client_interface/proc/check_drag_proximity(atom/dragging, atom/over, src_location, over_location, src_control, over_control, params)
+ return FALSE
diff --git a/code/datums/mood.dm b/code/datums/mood.dm
index 43fa67907751..1fc07130b139 100644
--- a/code/datums/mood.dm
+++ b/code/datums/mood.dm
@@ -18,8 +18,18 @@
var/sanity = SANITY_NEUTRAL
/// the total combined value of all visible moodlets for the mob
var/shown_mood
- /// Moodlet value modifier
+ /// Multiplier to the sum total of mood the mob is experiencing
var/mood_modifier = 1
+ /// Multiplier to positive moodlet values. Stacks with mood_modifier
+ var/positive_mood_modifier = 1
+ /// Multiplier to negative moodlet values. Stacks with mood_modifier
+ var/negative_mood_modifier = 1
+ /// Multiplier to the length of positive moodlets.
+ /// Please don't set this to 0
+ var/positive_moodlet_length_modifier = 1
+ /// Multiplier to the length of negative moodlets.
+ /// Please don't set this to 0
+ var/negative_moodlet_length_modifier = 1
/// Used to track what stage of moodies they're on (1-9)
var/mood_level = MOOD_LEVEL_NEUTRAL
/// To track what stage of sanity they're on (1-6)
@@ -142,50 +152,95 @@
*
* Arguments:
* * category - (text) category of the mood event - see /datum/mood_event for category explanation
- * * type - (path) any /datum/mood_event
+ * * type - (path) any /datum/mood_event (besides /datum/mood_event/conditional)
*/
-/datum/mood/proc/add_mood_event(category, type, ...)
- // we may be passed an instantiated mood datum with a modified timeout
- // it is to be used as a vehicle to copy data from and then cleaned up afterwards.
- // why do it this way? because the params list may contain numbers, and we may not necessarily want those to be interpreted as a timeout modifier.
- // this is only used by the food quality system currently
- var/datum/mood_event/mood_to_copy_from
- if (istype(type, /datum/mood_event))
- mood_to_copy_from = type
- type = mood_to_copy_from.type
- if (!ispath(type, /datum/mood_event))
- CRASH("A non path ([type]), was used to add a mood event. This shouldn't be happening.")
+/datum/mood/proc/add_mood_event(category, new_type, ...)
+ if (!ispath(new_type, /datum/mood_event))
+ CRASH("A non path ([new_type]), was used to add a mood event. This shouldn't be happening.")
+ if (ispath(new_type, /datum/mood_event/conditional))
+ CRASH("A conditional mood event ([new_type]) was used in add_mood_event. Use add_conditional_mood_event instead.")
if (!istext(category))
category = REF(category)
- var/datum/mood_event/the_event
- if (mood_events[category])
- the_event = mood_events[category]
- if (the_event.type == type)
- if (the_event.timeout)
- if (!isnull(mood_to_copy_from))
- the_event.timeout = mood_to_copy_from.timeout
- addtimer(CALLBACK(src, PROC_REF(clear_mood_event), category), the_event.timeout, (TIMER_UNIQUE|TIMER_OVERRIDE))
- qdel(mood_to_copy_from)
- return // Don't need to update the event.
+ var/list/params = args.Copy(3)
+ var/datum/mood_event/new_event = new new_type(category)
+ if(!new_event.can_effect_mob(arglist(list(src, mob_parent) + params)))
+ qdel(new_event)
+ return
+
+ add_mood_event_instance(new_event, params)
+/**
+ * Handles adding a mood event instance, including replacing or refreshing existing events
+ */
+/datum/mood/proc/add_mood_event_instance(datum/mood_event/new_event, list/params)
+ PRIVATE_PROC(TRUE)
+ var/category = new_event.category
+ var/datum/mood_event/existing_event = mood_events[category]
+ if(existing_event)
+ var/continue_adding = FALSE
+ if(existing_event.type == new_event.type)
+ continue_adding = existing_event.be_refreshed(arglist(list(src) + params))
+ else
+ continue_adding = existing_event.be_replaced(arglist(list(src, new_event) + params))
+ if(!continue_adding)
+ update_mood()
+ qdel(new_event)
+ return
clear_mood_event(category)
- var/list/params = args.Copy(3)
- params.Insert(1, mob_parent)
- the_event = new type(arglist(params))
- if (QDELETED(the_event)) // the mood event has been deleted for whatever reason (requires a job, etc)
+ new_event.on_add(src, mob_parent, params)
+ mood_events[category] = new_event
+ update_mood()
+ if(new_event.mood_change == 0 || new_event.hidden)
return
+ if(new_event.mood_change > 0)
+ add_personality_mood_to_viewers(mob_parent, "other_good_moodlet", list(
+ /datum/personality/empathetic = /datum/mood_event/empathetic_happy,
+ /datum/personality/misanthropic = /datum/mood_event/misanthropic_sad
+ ), range = 4)
+ else
+ add_personality_mood_to_viewers(mob_parent, "other_bad_moodlet", list(
+ /datum/personality/empathetic = /datum/mood_event/empathetic_sad,
+ /datum/personality/misanthropic = /datum/mood_event/misanthropic_happy
+ ), range = 4)
- the_event.category = category
- if (!isnull(mood_to_copy_from))
- the_event.timeout = mood_to_copy_from.timeout
- qdel(mood_to_copy_from)
- mood_events[category] = the_event
- update_mood()
+/**
+ * Adds a conditional mood event to the mob
+ *
+ * Arguments:
+ * * category - (text) category of the mood event - see /datum/mood_event for category explanation
+ * * base_type - (path) any /datum/mood_event/conditional
+ */
+/datum/mood/proc/add_conditional_mood_event(category, datum/base_type, ...)
+ if (!ispath(base_type, /datum/mood_event/conditional))
+ if (ispath(base_type, /datum/mood_event))
+ CRASH("A non-conditional mood event ([base_type]) was used in add_conditional_mood_event. Use add_mood_event instead.")
+ CRASH("A non path ([base_type]), was used to add a mood event. This shouldn't be happening.")
+ if (!istext(category))
+ category = REF(category)
+
+ var/list/params = args.Copy(3)
+ var/list/datum/mood_event/conditional/all_valid_conditional_events = list()
+ for(var/event_subtype in valid_typesof(base_type))
+ var/datum/mood_event/potential_event = new event_subtype(category)
+ if(!potential_event.can_effect_mob(arglist(list(src, mob_parent) + params)))
+ qdel(potential_event)
+ continue
+
+ all_valid_conditional_events += potential_event
- if (the_event.timeout)
- addtimer(CALLBACK(src, PROC_REF(clear_mood_event), category), the_event.timeout, (TIMER_UNIQUE|TIMER_OVERRIDE))
+ if(!length(all_valid_conditional_events))
+ return //no valid events to add
+
+ var/datum/mood_event/conditional/highest_priority_event
+ for(var/datum/mood_event/conditional/checked_event as anything in all_valid_conditional_events)
+ if(!highest_priority_event || checked_event.priority > highest_priority_event.priority)
+ highest_priority_event = checked_event
+
+ add_mood_event_instance(highest_priority_event, params)
+ all_valid_conditional_events -= highest_priority_event // you are the chosen one
+ QDEL_LIST(all_valid_conditional_events) // clean up the losers
/**
* Removes a mood event from the mob
@@ -218,12 +273,14 @@
for(var/category in mood_events)
var/datum/mood_event/the_event = mood_events[category]
- mood += the_event.mood_change
+ var/event_mood = the_event.mood_change
+ event_mood *= max((event_mood > 0) ? positive_mood_modifier : negative_mood_modifier, 0)
+ mood += event_mood
if (!the_event.hidden)
- shown_mood += the_event.mood_change
+ shown_mood += event_mood
- mood *= mood_modifier
- shown_mood *= mood_modifier
+ mood *= max(mood_modifier, 0)
+ shown_mood *= max(mood_modifier, 0)
switch(mood)
if (-INFINITY to MOOD_SAD4)
@@ -250,7 +307,7 @@
/// Updates the mob's mood icon
/datum/mood/proc/update_mood_icon()
- if (!(mob_parent.client || mob_parent.hud_used))
+ if (!(mob_parent.client || mob_parent.hud_used) || isnull(mood_screen_object))
return
mood_screen_object.cut_overlays()
@@ -314,6 +371,7 @@
if(hud?.infodisplay)
hud.infodisplay -= mood_screen_object
QDEL_NULL(mood_screen_object)
+ UnregisterSignal(hud, COMSIG_QDELETING)
/// Handles clicking on the mood HUD object
/datum/mood/proc/hud_click(datum/source, location, control, params, mob/user)
@@ -561,6 +619,10 @@
update_mood_icon()
+/// Sets sanity to a specific amount, useful for callbacks
+/datum/mood/proc/reset_sanity(amount)
+ set_sanity(amount, override = TRUE)
+
/// Adjusts sanity by a value
/datum/mood/proc/adjust_sanity(amount, minimum = SANITY_INSANE, maximum = SANITY_GREAT, override = FALSE)
set_sanity(sanity + amount, minimum, maximum, override)
@@ -588,7 +650,6 @@
/**
* Returns true if you already have a mood from a provided category.
- * You may think to yourself, why am I trying to get a boolean from a component? Well, this system probably should not be a component.
*
* Arguments
* * category - Mood category to validate against.
diff --git a/code/datums/mood_events/_mood_event.dm b/code/datums/mood_events/_mood_event.dm
index 499b5f892e62..165753648671 100644
--- a/code/datums/mood_events/_mood_event.dm
+++ b/code/datums/mood_events/_mood_event.dm
@@ -12,7 +12,10 @@
* is active while another mood event (from the same category) is triggered it will remove
* the effects of the current mood event and replace it with the new one
*/
- var/category
+ VAR_FINAL/category
+ /// Flags that determine what kind of event this is
+ /// For example, you might have a "EVENT_FEAR" flag that denotes this mood event relates to being afraid of something
+ var/event_flags = NONE
/// Icon state of the unique mood event icon, if applicable
var/special_screen_obj
/// if false, it will be an overlay instead
@@ -22,21 +25,145 @@
/// List of required jobs for this mood event
var/list/required_job
-/datum/mood_event/New(mob/living/emotional_mob, ...)
- owner = emotional_mob
- var/list/params = args.Copy(2)
- if (LAZYLEN(required_job) && !is_type_in_list(owner.mind?.assigned_role, required_job))
- qdel(src)
- return
- add_effects(arglist(params))
+/datum/mood_event/New(category)
+ src.category = category
/datum/mood_event/Destroy()
- remove_effects()
- owner = null
+ if(owner)
+ remove_effects()
+ owner = null
return ..()
-/datum/mood_event/proc/add_effects(param)
+/**
+ * Called when this datum is created, checks if the passed mob can experience this mood event
+ *
+ * * home - the mood datum we are being added to
+ * * who - the mob to check
+ * * ... - any other arguments that are passed to the mood event
+ *
+ * Return TRUE if the mob can experience this mood event
+ * Return FALSE if the mob should be unaffected
+ */
+/datum/mood_event/proc/can_effect_mob(datum/mood/home, mob/living/who, ...)
+ SHOULD_CALL_PARENT(TRUE)
+ if(LAZYLEN(required_job) && !is_type_in_list(who.mind?.assigned_role, required_job))
+ return FALSE
+
+ if((event_flags & MOOD_EVENT_WHIMSY))
+ // Whimsical people get positive whimsical moodlets
+ // Non-whimsical people get negative whimsical moodlets
+ var/is_whimsical = HAS_PERSONALITY(who, /datum/personality/whimsical)
+ if(mood_change >= 0 && !is_whimsical)
+ return FALSE
+ if(mood_change < 0 && is_whimsical)
+ return FALSE
+
+ if((event_flags & MOOD_EVENT_ART) && HAS_PERSONALITY(who, /datum/personality/unimaginative))
+ return FALSE
+
+ if((event_flags & MOOD_EVENT_PAIN) && HAS_TRAIT(who, TRAIT_ANALGESIA))
+ return FALSE
+
+ return TRUE
+
+/**
+ * Wrapper for the mood event being added to a mob
+ *
+ * * home - the mood datum we are being added to
+ * * who - the mob to add the mood event to
+ * * mood_args - any other arguments that are passed to the mood event
+ */
+/datum/mood_event/proc/on_add(datum/mood/home, mob/living/who, list/mood_args)
+ SHOULD_NOT_OVERRIDE(TRUE)
+
+ owner = who
+
+ if((event_flags & MOOD_EVENT_ART) && HAS_PERSONALITY(who, /datum/personality/creative))
+ mood_change *= 1.2
+
+ if((event_flags & MOOD_EVENT_SPIRITUAL) && !HAS_TRAIT(who, TRAIT_SPIRITUAL))
+ mood_change *= 0.2
+
+ if(event_flags & MOOD_EVENT_FOOD)
+ if(HAS_PERSONALITY(owner, /datum/personality/ascetic))
+ mood_change *= 0.75
+ if(HAS_PERSONALITY(owner, /datum/personality/gourmand))
+ mood_change *= 1.25
+
+ if(event_flags & MOOD_EVENT_FEAR)
+ if(HAS_PERSONALITY(owner, /datum/personality/cowardly))
+ mood_change *= 1.25
+ if(HAS_PERSONALITY(owner, /datum/personality/brave))
+ mood_change *= 0.75
+
+ add_effects(arglist(mood_args))
+
+ mood_change = floor(mood_change)
+
+ timeout *= max((mood_change > 0) ? home.positive_moodlet_length_modifier : home.negative_moodlet_length_modifier, 0.1)
+ if(timeout)
+ addtimer(CALLBACK(home, TYPE_PROC_REF(/datum/mood, clear_mood_event), category), timeout, (TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_NO_HASH_WAIT))
+
+/**
+ * Called when added to a mob
+ *
+ * * ... - Any arguments passed to add_mood_event after the typepath are passed here
+ */
+/datum/mood_event/proc/add_effects(...)
return
+/**
+ * Called when the event is cleared from a mob
+ */
/datum/mood_event/proc/remove_effects()
return
+
+/**
+ * Called when we get added to a mood datum, but a mood of our type in our category already
+ *
+ * * home - the mood datum we are being added to
+ * * ... - any other arguments that are passed to the mood event
+ *
+ * Return BLOCK_NEW_MOOD to stop the new mood event from being added
+ * Return ALLOW_NEW_MOOD to allow the new mood event to be added - note this implicitly deletes [src]
+ */
+/datum/mood_event/proc/be_refreshed(datum/mood/home, ...)
+ // Base behavior is refresh the timer
+ if(timeout)
+ addtimer(CALLBACK(home, TYPE_PROC_REF(/datum/mood, clear_mood_event), category), timeout, (TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_NO_HASH_WAIT))
+ return BLOCK_NEW_MOOD
+
+/**
+ * Called when we get added to a mood datum, but a mood of a different type is in our category
+ *
+ * * home - the mood datum we are being added to
+ * * new_event - the new mood event that is being added
+ * * ... - any other arguments that are passed to the mood event
+ *
+ * Return BLOCK_NEW_MOOD to stop the new mood event from being added
+ * Return ALLOW_NEW_MOOD to allow the new mood event to be added - note this implicitly deletes [src]
+ */
+/datum/mood_event/proc/be_replaced(datum/mood/home, datum/mood_event/new_event, ...)
+ return ALLOW_NEW_MOOD
+
+/// Subtype of mood event that iterates over all subtypes of itself to find a suitable one to apply
+/datum/mood_event/conditional
+ abstract_type = /datum/mood_event/conditional
+ /// Priority of this condition over other conditions. Higher = more priority.
+ /// If two priorities are the same, the first one found is used, which would be the one defined first in code.
+ var/priority = 0
+
+/datum/mood_event/conditional/can_effect_mob(datum/mood/home, mob/living/who, ...)
+ return ..() && condition_fulfilled(arglist(args.Copy(2)))
+
+/**
+ * Is the condition for this mood event fulfilled for the given mob?
+ *
+ * * who - the mob to check
+ * * ... - any other arguments that are passed to the mood event
+ */
+/datum/mood_event/conditional/proc/condition_fulfilled(mob/living/who, ...)
+ return FALSE
+
+/datum/mood_event/conditional/be_replaced(datum/mood/home, datum/mood_event/conditional/new_event, ...)
+ return initial(new_event.priority) > initial(priority) ? ALLOW_NEW_MOOD : BLOCK_NEW_MOOD
diff --git a/code/datums/mood_events/death.dm b/code/datums/mood_events/death.dm
new file mode 100644
index 000000000000..947e9c74b8ce
--- /dev/null
+++ b/code/datums/mood_events/death.dm
@@ -0,0 +1,181 @@
+/datum/mood_event/conditional/see_death
+ mood_change = -8
+ timeout = 5 MINUTES
+
+/datum/mood_event/conditional/see_death/can_effect_mob(datum/mood/home, mob/living/who, mob/dead_mob, dusted, gibbed)
+ if(isnull(dead_mob))
+ stack_trace("Death mood event being applied with null dead_mob")
+ return FALSE
+
+ return ..()
+
+/datum/mood_event/conditional/see_death/condition_fulfilled(mob/living/who, mob/dead_mob, dusted, gibbed)
+ return TRUE
+
+/datum/mood_event/conditional/see_death/add_effects(mob/dead_mob, dusted, gibbed)
+ update_effect(dead_mob)
+
+ if(HAS_TRAIT(dead_mob, TRAIT_SPAWNED_MOB))
+ mood_change *= 0.25
+ timeout *= 0.2
+
+ if(HAS_PERSONALITY(owner, /datum/personality/compassionate) && mood_change < 0)
+ mood_change *= 1.5
+ timeout *= 1.5
+
+ if(gibbed || dusted)
+ mood_change *= 1.2
+ timeout *= 1.5
+
+ if(!description)
+ if(gibbed)
+ description = "%DEAD_MOB% just exploded in front of me!!"
+ else if(dusted)
+ description = "%DEAD_MOB% was just vaporized in front of me!!"
+ else
+ description = "I just saw %DEAD_MOB% die. How horrible..."
+
+ description = capitalize(replacetext(description, "%DEAD_MOB%", get_descriptor(dead_mob)))
+
+/// Blank proc which allows conditional effects to modify mood, timeout, or description before the main effect is applied
+/datum/mood_event/conditional/see_death/proc/update_effect(mob/dead_mob)
+ return
+
+/// Checks if the dead mob is a pet
+/datum/mood_event/conditional/see_death/proc/is_pet(mob/dead_mob)
+ return istype(dead_mob, /mob/living/basic/pet) || ismonkey(dead_mob)
+
+/datum/mood_event/conditional/see_death/be_refreshed(datum/mood/home, mob/dead_mob, dusted, gibbed)
+ if(can_stack_effect(dead_mob))
+ mood_change *= 1.5
+ return ..()
+
+/datum/mood_event/conditional/see_death/be_replaced(datum/mood/home, datum/mood_event/new_event, mob/dead_mob, dusted, gibbed)
+ . = ..()
+ // when blocking a new mood event (because it's lower priority), refresh ourselves instead
+ if(. == BLOCK_NEW_MOOD)
+ return be_refreshed(home, dead_mob, dusted, gibbed)
+
+/// Checks if our mood can get worse by seeing another death (or better if we're weird like that)
+/datum/mood_event/conditional/see_death/proc/can_stack_effect(mob/dead_mob)
+ // if we're desensitized, don't stack unless it's a buff
+ if(HAS_TRAIT(owner, TRAIT_DESENSITIZED) && mood_change > 0)
+ return FALSE
+ // if we're seeing a spawned mob die, don't stack
+ if(HAS_TRAIT(dead_mob, TRAIT_SPAWNED_MOB))
+ return FALSE
+ return TRUE
+
+/// Changes "I saw Joe x" to "I saw the engineer x"
+/datum/mood_event/conditional/see_death/proc/get_descriptor(mob/dead_mob)
+ if(is_pet(dead_mob))
+ return "[dead_mob]"
+ if(dead_mob.name != "Unknown" && dead_mob.mind?.assigned_role?.job_flags & JOB_CREW_MEMBER)
+ return "the [LOWER_TEXT(dead_mob.mind?.assigned_role.title)]"
+ return "someone"
+
+/// Highest priority: Clown naivety about death
+/datum/mood_event/conditional/see_death/naive
+ priority = 100
+ mood_change = 0
+
+/datum/mood_event/conditional/see_death/naive/condition_fulfilled(mob/living/who, mob/dead_mob, dusted, gibbed)
+ return HAS_TRAIT(who, TRAIT_NAIVE) && !dusted && !gibbed
+
+/datum/mood_event/conditional/see_death/naive/update_effect(mob/dead_mob)
+ description = "Have a good nap, [get_descriptor(dead_mob)]."
+
+/// Cultists are super brainwashed so they get buffs instead
+/datum/mood_event/conditional/see_death/cult
+ priority = 90
+ description = "More souls for the Geometer!"
+ mood_change = parent_type::mood_change * -0.5
+
+/datum/mood_event/conditional/see_death/cult/condition_fulfilled(mob/living/who, mob/dead_mob, dusted, gibbed)
+ if(!HAS_TRAIT(who, TRAIT_CULT_HALO))
+ return FALSE
+ if(HAS_TRAIT(dead_mob, TRAIT_CULT_HALO))
+ return FALSE
+ return TRUE
+
+/// Revs are also brainwashed but less so
+/datum/mood_event/conditional/see_death/revolutionary
+ priority = 85
+ mood_change = parent_type::mood_change * -0.5
+
+/datum/mood_event/conditional/see_death/revolutionary/condition_fulfilled(mob/living/who, mob/dead_mob, dusted, gibbed)
+ return IS_REVOLUTIONARY(who) && (dead_mob.mind?.assigned_role.job_flags & JOB_HEAD_OF_STAFF)
+
+/datum/mood_event/conditional/see_death/revolutionary/update_effect(mob/dead_mob)
+ var/datum/job/possible_head_job = dead_mob.mind?.assigned_role
+ description = "[possible_head_job.title ? "The [LOWER_TEXT(possible_head_job.title)]" : "Another head of staff"] is dead! Long live the revolution!"
+
+/// Then gamers
+/datum/mood_event/conditional/see_death/gamer
+ priority = 80
+ description = "Another one bites the dust!"
+ mood_change = parent_type::mood_change * -0.5
+
+/datum/mood_event/conditional/see_death/gamer/condition_fulfilled(mob/living/who, mob/dead_mob, dusted, gibbed)
+ return istype(who.mind?.assigned_role, /datum/job/bitrunning_glitch) || istype(who.mind?.assigned_role, /datum/job/bit_avatar)
+
+/// People who just don't gaf
+/datum/mood_event/conditional/see_death/dontcare
+ priority = 40
+ mood_change = 0
+ timeout = parent_type::timeout * 0.5
+
+/datum/mood_event/conditional/see_death/dontcare/condition_fulfilled(mob/living/who, mob/dead_mob, dusted, gibbed)
+ if(HAS_PERSONALITY(who, /datum/personality/callous))
+ return TRUE
+ if(HAS_PERSONALITY(who, /datum/personality/animal_disliker) && is_pet(dead_mob))
+ return TRUE
+ return FALSE
+
+/datum/mood_event/conditional/see_death/dontcare/update_effect(mob/dead_mob, dusted, gibbed)
+ if(gibbed)
+ description = "Oh, %DEAD_MOB% exploded. Now I have to get the mop."
+ else if(dusted)
+ description = "Oh, %DEAD_MOB% was vaporized. Now I have to get the dustpan."
+ else
+ description = "Oh, %DEAD_MOB% died. Shame, I guess."
+
+/// Pets take priority over normal death moodlets
+/datum/mood_event/conditional/see_death/pet
+ priority = 30
+
+/datum/mood_event/conditional/see_death/pet/condition_fulfilled(mob/living/who, mob/dead_mob, dusted, gibbed)
+ return is_pet(dead_mob)
+
+/datum/mood_event/conditional/see_death/pet/update_effect(mob/dead_mob, dusted, gibbed)
+ if(gibbed)
+ description = "%DEAD_MOB% just exploded!!"
+ else if(dusted)
+ description = "%DEAD_MOB% just vaporized!!"
+ else
+ description = "%DEAD_MOB% just died!!"
+
+ // future todo : make the hop care about ian, cmo runtime, etc.
+ if(HAS_PERSONALITY(owner, /datum/personality/animal_friend))
+ mood_change *= 1.5
+ timeout *= 1.25
+ else if(!HAS_PERSONALITY(owner, /datum/personality/compassionate))
+ mood_change *= 0.25
+ timeout *= 0.5
+
+/// Desensitized brings up the rear
+/datum/mood_event/conditional/see_death/desensitized
+ priority = 10
+ mood_change = parent_type::mood_change * 0.5
+ timeout = parent_type::timeout * 0.5
+
+/datum/mood_event/conditional/see_death/desensitized/condition_fulfilled(mob/living/who, mob/dead_mob, dusted, gibbed)
+ return HAS_TRAIT(who, TRAIT_DESENSITIZED)
+
+/datum/mood_event/conditional/see_death/desensitized/update_effect(mob/dead_mob, dusted, gibbed)
+ if(gibbed)
+ description = "I saw %DEAD_MOB% explode."
+ else if(dusted)
+ description = "I saw %DEAD_MOB% get vaporized."
+ else
+ description = "I saw %DEAD_MOB% die."
diff --git a/code/datums/mood_events/dna_infuser_events.dm b/code/datums/mood_events/dna_infuser_events.dm
index 26c07d76b111..be937d087a89 100644
--- a/code/datums/mood_events/dna_infuser_events.dm
+++ b/code/datums/mood_events/dna_infuser_events.dm
@@ -2,6 +2,7 @@
description = "Heh heh. \"It's on the mouse\". What a play on words."
mood_change = 1
timeout = 2 MINUTES
+ event_flags = MOOD_EVENT_WHIMSY
/datum/mood_event/gondola_serenity
description = "There's a lot that could be on your mind right now. But this feeling of contentedness, a universal calling to simply sit back and observe is washing over you..."
diff --git a/code/datums/mood_events/drink_events.dm b/code/datums/mood_events/drink_events.dm
index 8ecc19b6fc28..6c87a0626f2b 100644
--- a/code/datums/mood_events/drink_events.dm
+++ b/code/datums/mood_events/drink_events.dm
@@ -31,12 +31,22 @@
if(90 to INFINITY)
mood_change = 3 // crash out
description = "You're my BESSST frien'... You and me agains' th' world, buddy. Le's get another drink."
+ if(HAS_PERSONALITY(owner, /datum/personality/teetotal))
+ mood_change *= -1.5
+ description = "I don't like drinking... It makes me feel horrible."
+ if(HAS_PERSONALITY(owner, /datum/personality/bibulous))
+ mood_change *= 1.5
if(old_mood != mood_change)
owner.mob_mood.update_mood()
/datum/mood_event/drunk/remove_effects()
QDEL_NULL(blush_overlay)
+/datum/mood_event/drunk_after
+ mood_change = 2
+ description = "The buzz might be gone, but I still feel good."
+ timeout = 5 MINUTES
+
/datum/mood_event/wrong_brandy
description = "I hate that type of drink."
mood_change = -2
diff --git a/code/datums/mood_events/food_events.dm b/code/datums/mood_events/food_events.dm
index e64d975902ea..239e4b772932 100644
--- a/code/datums/mood_events/food_events.dm
+++ b/code/datums/mood_events/food_events.dm
@@ -2,55 +2,62 @@
description = "I really enjoyed eating that."
mood_change = 5
timeout = 4 MINUTES
+ event_flags = MOOD_EVENT_FOOD
/datum/mood_event/gross_food
description = "I really didn't like that food."
mood_change = -2
timeout = 4 MINUTES
+ event_flags = MOOD_EVENT_FOOD
/datum/mood_event/disgusting_food
description = "That food was disgusting!"
mood_change = -6
timeout = 4 MINUTES
+ event_flags = MOOD_EVENT_FOOD
/datum/mood_event/allergic_food
description = "My throat itches."
mood_change = -2
timeout = 4 MINUTES
+ event_flags = MOOD_EVENT_FOOD
/datum/mood_event/breakfast
description = "Nothing like a hearty breakfast to start the shift."
mood_change = 2
timeout = 10 MINUTES
+ event_flags = MOOD_EVENT_FOOD
/datum/mood_event/food
timeout = 5 MINUTES
- var/quality = FOOD_QUALITY_NORMAL
+ event_flags = MOOD_EVENT_FOOD
-/datum/mood_event/food/New(mob/M, ...)
- . = ..()
- mood_change = 2 + 2 * quality
+/datum/mood_event/food/add_effects(quality = FOOD_QUALITY_NORMAL, timeout_mod = 1)
+ mood_change = calculate_mood_change(quality)
+ timeout *= timeout_mod
description = "That food was [GLOB.food_quality_description[quality]]."
-/datum/mood_event/food/nice
- quality = FOOD_QUALITY_NICE
-
-/datum/mood_event/food/good
- quality = FOOD_QUALITY_GOOD
-
-/datum/mood_event/food/verygood
- quality = FOOD_QUALITY_VERYGOOD
-
-/datum/mood_event/food/fantastic
- quality = FOOD_QUALITY_FANTASTIC
-
-/datum/mood_event/food/amazing
- quality = FOOD_QUALITY_AMAZING
-
-/datum/mood_event/food/top
- quality = FOOD_QUALITY_TOP
+/datum/mood_event/food/be_refreshed(datum/mood/home, quality, timeout_mod)
+ var/old_mood = mood_change
+ // updates timeout (which is handled in parent call) and mood
+ timeout = max(timeout, initial(timeout) * timeout_mod)
+ mood_change = max(mood_change, calculate_mood_change(quality))
+ // if mood_change is the same, we don't need to update the description
+ if(old_mood != mood_change)
+ description = "That food was [GLOB.food_quality_description[quality]]."
+ return ..()
+
+/datum/mood_event/food/proc/calculate_mood_change(base_quality)
+ var/quality = 1 + 1.5 * base_quality
+ if(HAS_PERSONALITY(owner, /datum/personality/ascetic))
+ quality *= 0.5
+ if(HAS_PERSONALITY(owner, /datum/personality/gourmand))
+ if(quality <= FOOD_QUALITY_GOOD)
+ quality = FOOD_QUALITY_NORMAL
+ return ceil(quality)
/datum/mood_event/pacifist_eating_fish_item
description = "I shouldn't be eating living creatures..."
mood_change = -1 //The disgusting food moodlet already has a pretty big negative value, this is just for context.
timeout = 4 MINUTES
+ event_flags = MOOD_EVENT_FOOD
diff --git a/code/datums/mood_events/generic_negative_events.dm b/code/datums/mood_events/generic_negative_events.dm
index 2c5a97495509..8bce84f73b43 100644
--- a/code/datums/mood_events/generic_negative_events.dm
+++ b/code/datums/mood_events/generic_negative_events.dm
@@ -10,10 +10,12 @@
/datum/mood_event/on_fire
description = "I'M ON FIRE!!!"
mood_change = -12
+ event_flags = MOOD_EVENT_FEAR
/datum/mood_event/suffocation
description = "CAN'T... BREATHE..."
mood_change = -12
+ event_flags = MOOD_EVENT_FEAR
/datum/mood_event/burnt_thumb
description = "I shouldn't play with lighters..."
@@ -32,6 +34,7 @@
description = "I've been creamed. Tastes like pie flavor."
mood_change = -2
timeout = 3 MINUTES
+ event_flags = MOOD_EVENT_WHIMSY // if whimsical, no penalty
/datum/mood_event/inked
description = "I've been splashed with squid ink. Tastes like salt."
@@ -42,6 +45,7 @@
description = "I slipped. I should be more careful next time..."
mood_change = -2
timeout = 3 MINUTES
+ event_flags = MOOD_EVENT_WHIMSY // if whimsical, no penalty
/datum/mood_event/eye_stab
description = "I used to be an adventurer like you, until I took a screwdriver to the eye."
@@ -81,12 +85,7 @@
description = "Ouch! My limb feels like I fell asleep on it."
mood_change = -3
timeout = 2 MINUTES
-
-/datum/mood_event/reattachment/New(mob/M, ...)
- if(HAS_TRAIT(M, TRAIT_ANALGESIA))
- qdel(src)
- return
- return ..()
+ event_flags = MOOD_EVENT_PAIN
/datum/mood_event/reattachment/add_effects(obj/item/bodypart/limb)
if(limb)
@@ -117,12 +116,7 @@
description = "That fucking table, man that hurts..."
mood_change = -3
timeout = 3 MINUTES
-
-/datum/mood_event/table_limbsmash/New(mob/M, ...)
- if(HAS_TRAIT(M, TRAIT_ANALGESIA))
- qdel(src)
- return
- return ..()
+ event_flags = MOOD_EVENT_PAIN
/datum/mood_event/table_limbsmash/add_effects(obj/item/bodypart/banged_limb)
if(banged_limb)
@@ -147,15 +141,18 @@
/datum/mood_event/photophobia
description = "The lights are too bright..."
mood_change = -3
+ event_flags = MOOD_EVENT_FEAR
/datum/mood_event/nyctophobia
description = "It sure is dark around here..."
mood_change = -3
+ event_flags = MOOD_EVENT_FEAR
/datum/mood_event/claustrophobia
description = "Why do I feel trapped?! Let me out!!!"
mood_change = -7
timeout = 1 MINUTES
+ event_flags = MOOD_EVENT_FEAR
/datum/mood_event/bright_light
description = "I hate it in the light... I need to find a darker place..."
@@ -177,9 +174,14 @@
description = "I'm nervous and on edge and I can't stand still!!"
mood_change = -2
+/datum/mood_event/jittery/add_effects(...)
+ if(HAS_PERSONALITY(owner, /datum/personality/paranoid))
+ mood_change -= 1
+
/datum/mood_event/choke
description = "I CAN'T BREATHE!!!"
mood_change = -10
+ event_flags = MOOD_EVENT_FEAR
/datum/mood_event/vomit
description = "I just threw up. Gross."
@@ -195,27 +197,25 @@
description = "Medicine may be good for me but right now it stings like hell."
mood_change = -5
timeout = 60 SECONDS
-
-/datum/mood_event/painful_medicine/New(mob/M, ...)
- if(HAS_TRAIT(M, TRAIT_ANALGESIA))
- qdel(src)
- return
- return ..()
+ event_flags = MOOD_EVENT_PAIN
/datum/mood_event/startled
description = "Hearing that word made me think about something scary."
mood_change = -1
timeout = 1 MINUTES
+ event_flags = MOOD_EVENT_FEAR
/datum/mood_event/phobia
- description = "I saw something very frightening."
+ description = "I saw something very frightening!"
mood_change = -4
timeout = 4 MINUTES
+ event_flags = MOOD_EVENT_FEAR
/datum/mood_event/spooked
description = "The rattling of those bones... It still haunts me."
mood_change = -4
timeout = 4 MINUTES
+ event_flags = MOOD_EVENT_FEAR
/datum/mood_event/notcreeping
description = "The voices are not happy, and they painfully contort my thoughts into getting back on task."
@@ -243,30 +243,24 @@
/datum/mood_event/back_pain
description = "Bags never sit right on my back, this hurts like hell!"
mood_change = -15
-
-/datum/mood_event/back_pain/New(mob/M, ...)
- if(HAS_TRAIT(M, TRAIT_ANALGESIA))
- qdel(src)
- return
- return ..()
-
-/datum/mood_event/sad_empath
- description = "Someone seems upset..."
- mood_change = -1
- timeout = 60 SECONDS
-
-/datum/mood_event/sad_empath/add_effects(mob/sadtarget)
- description = "[sadtarget.name] seems upset..."
+ event_flags = MOOD_EVENT_PAIN
/datum/mood_event/sacrifice_bad
description = "Those darn savages!"
mood_change = -5
timeout = 2 MINUTES
+ event_flags = MOOD_EVENT_SPIRITUAL
/datum/mood_event/artbad
description = "I've produced better art than that from my ass."
mood_change = -2
timeout = 2 MINUTES
+ event_flags = MOOD_EVENT_ART
+
+/datum/mood_event/artbad/add_effects()
+ if(HAS_PERSONALITY(owner, /datum/personality/creative))
+ mood_change = 0
+ description = "Everyone has to start their art journey somewhere!"
/datum/mood_event/graverobbing
description = "I just desecrated someone's grave... I can't believe I did that..."
@@ -280,6 +274,7 @@
/datum/mood_event/gunpoint
description = "This guy is insane! I better be careful..."
mood_change = -10
+ event_flags = MOOD_EVENT_FEAR
/datum/mood_event/tripped
description = "I can't believe I fell for the oldest trick in the book!"
@@ -295,6 +290,7 @@
description = "I HAD A GLIMPSE OF THE HORROR BEYOND THIS WORLD. REALITY UNCOILED BEFORE MY EYES!"
mood_change = -25
timeout = 4 MINUTES
+ event_flags = MOOD_EVENT_FEAR
/datum/mood_event/high_five_full_hand
description = "Oh god, I don't even know how to high-five correctly..."
@@ -320,6 +316,7 @@
/datum/mood_event/surgery
description = "THEY'RE CUTTING ME OPEN!!"
mood_change = -8
+ event_flags = MOOD_EVENT_FEAR
var/surgery_completed = FALSE
/datum/mood_event/surgery/success
@@ -423,16 +420,19 @@
/datum/mood_event/gamer_withdrawal
description = "I wish I was gaming right now..."
mood_change = -5
+ event_flags = MOOD_EVENT_GAMING
/datum/mood_event/gamer_lost
description = "If I'm not good at video games, can I truly call myself a gamer?"
- mood_change = -10
+ mood_change = -6
timeout = 10 MINUTES
+ event_flags = MOOD_EVENT_GAMING
/datum/mood_event/lost_52_card_pickup
description = "This is really embarrassing! I'm ashamed to pick up all these cards off the floor..."
mood_change = -3
timeout = 3 MINUTES
+ event_flags = MOOD_EVENT_WHIMSY | MOOD_EVENT_GAMING
/datum/mood_event/russian_roulette_lose_cheater
description = "I gambled and lost! Good thing I wasn't aiming for my head..."
@@ -444,6 +444,12 @@
mood_change = -20
timeout = 10 MINUTES
+/datum/mood_event/russian_roulette_lose/add_effects()
+ if(HAS_PERSONALITY(owner, /datum/personality/gambler))
+ mood_change *= 0.5
+ description = "I gambled my life and lost! Truth is, the game was rigged from the start..."
+ return
+
/datum/mood_event/bad_touch_bear_hug
description = "I just got squeezed way too hard."
mood_change = -1
@@ -473,11 +479,17 @@
description = "THE MOON JUDGES AND FINDS ME WANTING!!!"
mood_change = -3
timeout = 5 MINUTES
+ event_flags = MOOD_EVENT_FEAR
+
+/datum/mood_event/moon_insanity/add_effects()
+ if(HAS_PERSONALITY(owner, /datum/personality/spiritual))
+ mood_change *= 2
/datum/mood_event/amulet_insanity
- description = "I sEe THe LiGHt, It mUsT BE stOPPed"
+ description = "I sEe THe LiGHt, It mUsT BE stOPPed!"
mood_change = -6
timeout = 5 MINUTES
+ event_flags = MOOD_EVENT_FEAR
/datum/mood_event/mallet_humiliation
description = "Getting hit by such a stupid weapon feels rather humiliating..."
@@ -535,7 +547,94 @@
description = "Blowing smoke in my face, really?"
mood_change = 0
+/datum/mood_event/slots/loss
+ description = "Aww dang it!"
+ mood_change = -2
+ timeout = 5 MINUTES
+ event_flags = MOOD_EVENT_GAMING
+
+/datum/mood_event/slots/loss/add_effects()
+ if(HAS_PERSONALITY(owner, /datum/personality/gambler))
+ mood_change = 0
+ description = "Aww dang it."
+ if(HAS_PERSONALITY(owner, /datum/personality/industrious) || HAS_PERSONALITY(owner, /datum/personality/slacking/diligent))
+ mood_change *= 1.5
+
/datum/mood_event/lost_control_of_life
description = "I've lost control of my life."
mood_change = -5
timeout = 5 MINUTES
+
+/datum/mood_event/empathetic_sad
+ description = "Seeing sad people makes me sad."
+ mood_change = -2
+ timeout = 3 MINUTES
+
+/datum/mood_event/misanthropic_sad
+ description = "Seeing happy people makes me uneasy."
+ mood_change = -2
+ timeout = 3 MINUTES
+
+/datum/mood_event/paranoid/one_on_one
+ description = "I'm alone with someone - what if they want to kill me?"
+ mood_change = -3
+ event_flags = MOOD_EVENT_FEAR
+
+/datum/mood_event/paranoid/large_group
+ description = "There are so many people around - any one of them could be out to get me!"
+ mood_change = -3
+ event_flags = MOOD_EVENT_FEAR
+
+/datum/mood_event/nt_disillusioned
+ description = "I hate the company, and everything it stands for."
+ mood_change = -2
+
+/datum/mood_event/disillusioned_revs_lost
+ description = "The revolution was defeated... greaaaat."
+ mood_change = -2
+ timeout = 10 MINUTES
+
+/datum/mood_event/loyalist_revs_win
+ description = "The revolution was a success... This will hurt quarterly profits."
+ mood_change = -2
+ timeout = 10 MINUTES
+
+/datum/mood_event/slacking_off_diligent
+ description = "I should get back to work."
+ mood_change = -1
+
+/datum/mood_event/unimaginative_patronage
+ description = "That felt like a waste of money."
+ mood_change = -2
+ timeout = 5 MINUTES
+
+/datum/mood_event/unimaginative_framing
+ description = "I could've hung something more useful there."
+ mood_change = -2
+ timeout = 5 MINUTES
+
+/datum/mood_event/unimaginative_sculpting
+ description = "That felt like a waste of materials."
+ mood_change = -2
+ timeout = 5 MINUTES
+
+/datum/mood_event/splattered_with_blood
+ description = "Eugh, I just got coated in blood!"
+ mood_change = -4
+ timeout = 4 MINUTES
+
+/datum/mood_event/splattered_with_blood/can_effect_mob(datum/mood/home, mob/living/who, ...)
+ if(isvampire(who))
+ return FALSE
+
+ return ..()
+
+/datum/mood_event/splattered_with_blood/add_effects(...)
+ if(HAS_TRAIT(owner, TRAIT_CULT_HALO))
+ mood_change = 2
+ description = "Blood, blood! The Geometer will be pleased."
+ return
+ if(HAS_TRAIT(owner, TRAIT_MORBID) || HAS_TRAIT(owner, TRAIT_EVIL))
+ mood_change = 0
+ description = "I just got coated in blood. Fascinating!"
+ return
diff --git a/code/datums/mood_events/generic_positive_events.dm b/code/datums/mood_events/generic_positive_events.dm
index 2c4ac282c64e..cb4aa022224b 100644
--- a/code/datums/mood_events/generic_positive_events.dm
+++ b/code/datums/mood_events/generic_positive_events.dm
@@ -3,17 +3,53 @@
mood_change = 1
timeout = 2 MINUTES
+/datum/mood_event/hug/add_effects()
+ if(HAS_PERSONALITY(owner, /datum/personality/aromantic))
+ mood_change = -1
+ description = "A hug? Call HR!"
+ return
+ if(HAS_PERSONALITY(owner, /datum/personality/aloof))
+ mood_change = -1
+ description = "I would prefer not to be touched."
+ return
+ if(HAS_PERSONALITY(owner, /datum/personality/callous))
+ mood_change = 0
+ description = "I hate hugs."
+ return
+
/datum/mood_event/bear_hug
description = "I got squeezed very tightly, but it was quite nice."
mood_change = 1
timeout = 2 MINUTES
+/datum/mood_event/bear_hug/add_effects()
+ if(HAS_PERSONALITY(owner, /datum/personality/aromantic) \
+ || HAS_PERSONALITY(owner, /datum/personality/aloof) \
+ || HAS_PERSONALITY(owner, /datum/personality/callous) \
+ )
+ mood_change = -2
+ description = "They're squeezing me too tightly!"
+ return
+
/datum/mood_event/betterhug
description = "Someone was very nice to me."
mood_change = 3
timeout = 4 MINUTES
/datum/mood_event/betterhug/add_effects(mob/friend)
+ if(HAS_PERSONALITY(owner, /datum/personality/aromantic))
+ mood_change = 1
+ description = "[friend.name] is nice, but that's it."
+ return
+ if(HAS_PERSONALITY(owner, /datum/personality/aloof))
+ mood_change = 1
+ description = "[friend.name] is nice, but I wish they'd stop touching me."
+ return
+ if(HAS_PERSONALITY(owner, /datum/personality/callous))
+ mood_change = 0
+ description = "[friend.name] is way too nice for this station."
+ return
+
description = "[friend.name] was very nice to me."
/datum/mood_event/besthug
@@ -22,6 +58,19 @@
timeout = 4 MINUTES
/datum/mood_event/besthug/add_effects(mob/friend)
+ if(HAS_PERSONALITY(owner, /datum/personality/aromantic))
+ mood_change = 2
+ description = "[friend.name] is great to be around, but that's it."
+ return
+ if(HAS_PERSONALITY(owner, /datum/personality/aloof))
+ mood_change = 2
+ description = "[friend.name] is great to be around, but I wish they'd stop touching me."
+ return
+ if(HAS_PERSONALITY(owner, /datum/personality/callous))
+ mood_change = 0
+ description = "[friend.name] is way too nice for this station."
+ return
+
description = "[friend.name] is great to be around, [friend.p_they()] makes me feel so happy!"
/datum/mood_event/warmhug
@@ -29,20 +78,49 @@
mood_change = 1
timeout = 2 MINUTES
+/datum/mood_event/warmhug/add_effects()
+ if(HAS_PERSONALITY(owner, /datum/personality/aromantic))
+ mood_change = 0
+ description = "I don't like hugs, but the warmth is nice...."
+ return
+ if(HAS_PERSONALITY(owner, /datum/personality/aloof))
+ mood_change = 0
+ description = "I would prefer not to be touched, but the warmth is nice...."
+ return
+ if(HAS_PERSONALITY(owner, /datum/personality/callous))
+ mood_change = 0
+ description = "I hate hugs. I can warm myself up."
+ return
+
/datum/mood_event/tailpulled
description = "I love getting my tail pulled!"
mood_change = 1
timeout = 2 MINUTES
+/datum/mood_event/tailpulled/add_effects()
+ if(HAS_PERSONALITY(owner, /datum/personality/aloof) \
+ || HAS_PERSONALITY(owner, /datum/personality/aromantic) \
+ || HAS_PERSONALITY(owner, /datum/personality/callous) \
+ )
+ mood_change = -2
+ description = "Who the hell is touching my tail?"
+
/datum/mood_event/arcade
description = "I beat the arcade game!"
mood_change = 3
timeout = 8 MINUTES
+ event_flags = MOOD_EVENT_GAMING
+
+/datum/mood_event/arcade/add_effects()
+ if(HAS_PERSONALITY(owner, /datum/personality/industrious) || HAS_PERSONALITY(owner, /datum/personality/slacking/diligent))
+ mood_change = -1
+ description = "Wow, I beat the game. I could've been doing anything productive instead."
/datum/mood_event/blessing
description = "I've been blessed."
- mood_change = 3
+ mood_change = 1
timeout = 8 MINUTES
+ event_flags = MOOD_EVENT_SPIRITUAL
/datum/mood_event/maintenance_adaptation
mood_change = 8
@@ -55,21 +133,67 @@
mood_change = 1
timeout = 5 MINUTES
+/datum/mood_event/book_nerd/add_effects()
+ if(HAS_PERSONALITY(owner, /datum/personality/erudite))
+ mood_change = 2
+ description = "I love reading books!"
+ if(HAS_PERSONALITY(owner, /datum/personality/uneducated))
+ mood_change = -1
+ description = "Who cares about books?"
+
/datum/mood_event/exercise
description = "Working out releases those endorphins!"
mood_change = 1
/datum/mood_event/exercise/add_effects(fitness_level)
mood_change = fitness_level // the more fit you are, the more you like to work out
- return ..()
+ if(HAS_PERSONALITY(owner, /datum/personality/slacking/lazy))
+ mood_change *= -0.5
+ description = "Working out, what a chore!"
+ else if(!HAS_PERSONALITY(owner, /datum/personality/athletic))
+ mood_change *= 0.5
+ description = "Working out is a bit of a chore, but it is pretty fulfilling."
/datum/mood_event/pet_animal
description = "Animals are adorable! I can't stop petting them!"
- mood_change = 2
timeout = 5 MINUTES
+ /// Tracks the typepath of animal we last petted
+ var/animal_type
/datum/mood_event/pet_animal/add_effects(mob/animal)
- description = "\The [animal.name] is adorable! I can't stop petting [animal.p_them()]!"
+ animal_type = animal?.type
+
+ if(HAS_PERSONALITY(owner, /datum/personality/animal_disliker))
+ mood_change = -1
+ description = "Ewww, [animal] is so dirty! I don't want to touch it!"
+ return
+
+ var/dog_fan = HAS_PERSONALITY(owner, /datum/personality/dog_fan)
+ var/isdog = istype(animal, /mob/living/basic/pet/dog)
+ var/cat_fan = HAS_PERSONALITY(owner, /datum/personality/cat_fan)
+ var/iscat = istype(animal, /mob/living/basic/pet/cat)
+ if((dog_fan && isdog) || (cat_fan && iscat) || HAS_PERSONALITY(owner, /datum/personality/animal_friend))
+ mood_change = 3
+ description = "I love [animal] so much, [animal.p_theyre()] so adorable! I can't stop petting [animal.p_them()]!"
+ return
+ if(dog_fan && iscat)
+ mood_change = -1
+ description = "I don't like [animal]! I prefer dogs!"
+ return
+ if(cat_fan && isdog)
+ mood_change = -1
+ description = "I don't like [animal]! I prefer cats!"
+ return
+
+ mood_change = 1
+ description = "[animal] is adorable!"
+
+// Change the moodlet if we get refreshed (we may have pet another type of animal)
+/datum/mood_event/pet_animal/be_refreshed(datum/mood/home, mob/animal)
+ . = ..()
+ if(animal_type == animal?.type)
+ return
+ add_effects(animal)
/datum/mood_event/honk
description = "I've been honked!"
@@ -77,12 +201,21 @@
timeout = 4 MINUTES
special_screen_obj = "honked_nose"
special_screen_replace = FALSE
+ event_flags = MOOD_EVENT_WHIMSY
/datum/mood_event/saved_life
description = "It feels good to save a life."
mood_change = 6
timeout = 8 MINUTES
+/datum/mood_event/saved_life/add_effects()
+ if(HAS_PERSONALITY(owner, /datum/personality/callous))
+ mood_change = 0
+ description = "I don't care much for saving lives."
+ if(HAS_PERSONALITY(owner, /datum/personality/misanthropic))
+ mood_change = -1
+ description = "Saving lives is a waste of time."
+
/datum/mood_event/oblivious
description = "What a lovely day."
mood_change = 3
@@ -94,16 +227,21 @@
/datum/mood_event/focused
description = "I have a goal, and I will reach it, whatever it takes!" //Used for syndies, nukeops etc so they can focus on their goals
- mood_change = 4
+ mood_change = 8
hidden = TRUE
/datum/mood_event/badass_antag
description = "I'm a fucking badass and everyone around me knows it. Just look at them; they're all fucking shaking at the mere thought of having me around."
- mood_change = 7
+ mood_change = 8
hidden = TRUE
special_screen_obj = "badass_sun"
special_screen_replace = FALSE
+/datum/mood_event/ling
+ description = "We have a goal, and we will reach it, whatever it takes!"
+ mood_change = 12
+ hidden = TRUE
+
/datum/mood_event/creeping
description = "The voices have released their hooks on my mind! I feel free again!" //creeps get it when they are around their obsession
mood_change = 18
@@ -117,17 +255,17 @@
/datum/mood_event/cult
description = "I have seen the truth, praise the almighty one!"
- mood_change = 10 //maybe being a cultist isn't that bad after all
+ mood_change = 12 //maybe being a cultist isn't that bad after all
hidden = TRUE
/datum/mood_event/heretics
description = "THE HIGHER I RISE, THE MORE I SEE."
- mood_change = 10 //maybe being a heretic isnt that bad after all
+ mood_change = 12 //maybe being a heretic isnt that bad after all
hidden = TRUE
/datum/mood_event/rift_fishing
description = "THE MORE I FISH, THE HIGHER I RISE."
- mood_change = 7
+ mood_change = 6
timeout = 5 MINUTES
/datum/mood_event/family_heirloom
@@ -146,6 +284,7 @@
description = "There is something soothing about this music."
mood_change = 3
timeout = 60 SECONDS
+ event_flags = MOOD_EVENT_ART
/datum/mood_event/chemical_euphoria
description = "Heh...hehehe...hehe..."
@@ -165,30 +304,35 @@
description = "I feel comforted by the presence of a holy person."
mood_change = 3
timeout = 5 MINUTES
+ event_flags = MOOD_EVENT_SPIRITUAL
/datum/mood_event/clownshoes
description = "The shoes are a clown's legacy, I never want to take them off!"
- mood_change = 5
+ mood_change = 3
/datum/mood_event/sacrifice_good
description = "The gods are pleased with this offering!"
mood_change = 5
timeout = 3 MINUTES
+ event_flags = MOOD_EVENT_SPIRITUAL
/datum/mood_event/artok
description = "It's nice to see people are making art around here."
mood_change = 2
timeout = 5 MINUTES
+ event_flags = MOOD_EVENT_ART
/datum/mood_event/artgood
description = "What a thought-provoking piece of art. I'll remember that for a while."
mood_change = 4
timeout = 5 MINUTES
+ event_flags = MOOD_EVENT_ART
/datum/mood_event/artgreat
description = "That work of art was so great it made me believe in the goodness of humanity. Says a lot in a place like this."
mood_change = 6
timeout = 5 MINUTES
+ event_flags = MOOD_EVENT_ART
/datum/mood_event/bottle_flip
description = "The bottle landing like that was satisfying."
@@ -199,6 +343,12 @@
description = "What a peculiar emblem. It makes me feel hopeful for my future."
mood_change = 6
+/datum/mood_event/hope_lavaland/add_effects(...)
+ if(HAS_PERSONALITY(owner, /datum/personality/pessimistic))
+ mood_change = 0
+ description = "This emblem is a lie. There is no hope for me."
+ return
+
/datum/mood_event/confident_mane
description = "I'm feeling confident with a head full of hair."
mood_change = 2
@@ -215,27 +365,45 @@
/datum/mood_event/helped_up
description = "Helping them up felt good!"
- mood_change = 2
timeout = 45 SECONDS
+/datum/mood_event/helped_up/can_effect_mob(datum/mood/home, mob/living/who, ...)
+ if(!HAS_PERSONALITY(owner, /datum/personality/compassionate) \
+ && !HAS_PERSONALITY(owner, /datum/personality/callous) \
+ && !HAS_PERSONALITY(owner, /datum/personality/misanthropic))
+ return FALSE
+
+ return ..()
+
/datum/mood_event/helped_up/add_effects(mob/other_person, helper)
if(!other_person)
return
- if(helper)
- description = "Helping [other_person] up felt good!"
- else
- description = "[other_person] helped me up, how nice of [other_person.p_them()]!"
+ if(HAS_PERSONALITY(owner, /datum/personality/callous) || HAS_PERSONALITY(owner, /datum/personality/misanthropic))
+ mood_change = -2
+ if(helper)
+ description = "They should have helped themselves."
+ else
+ description = "I could've gotten up myself."
+
+ else if(HAS_PERSONALITY(owner, /datum/personality/compassionate))
+ mood_change = 2
+ if(helper)
+ description = "Helping [other_person] up felt good!"
+ else
+ description = "[other_person] helped me up, how nice of [other_person.p_them()]!"
/datum/mood_event/high_ten
description = "AMAZING! A HIGH-TEN!"
mood_change = 3
timeout = 45 SECONDS
+ event_flags = MOOD_EVENT_WHIMSY
/datum/mood_event/down_low
description = "HA! What a rube, they never stood a chance..."
mood_change = 4
timeout = 90 SECONDS
+ event_flags = MOOD_EVENT_WHIMSY
/datum/mood_event/aquarium_positive
description = "Watching fish in an aquarium is calming."
@@ -252,6 +420,10 @@
timeout = 2 MINUTES
/datum/mood_event/kiss/add_effects(mob/beau, direct)
+ if(HAS_PERSONALITY(owner, /datum/personality/aromantic))
+ mood_change = -2
+ description = "A kiss? Call HR!"
+ return
if(!beau)
return
if(direct)
@@ -277,6 +449,7 @@
description = "Ahaha! It's always funny to see someone get sprayed by a can of soda."
mood_change = 2
timeout = 30 SECONDS
+ event_flags = MOOD_EVENT_WHIMSY
/datum/mood_event/observed_soda_spill/add_effects(mob/spilled_mob, atom/soda_can)
if(!spilled_mob)
@@ -288,17 +461,29 @@
description = "I'm enjoying a nice gaming session!"
mood_change = 2
timeout = 30 SECONDS
+ event_flags = MOOD_EVENT_GAMING
+
+/datum/mood_event/gaming/add_effects()
+ if(HAS_PERSONALITY(owner, /datum/personality/industrious) || HAS_PERSONALITY(owner, /datum/personality/slacking/diligent))
+ mood_change = -1
+ description = "Is now really the time to be playing games? I should be working."
/datum/mood_event/gamer_won
description = "I love winning video games!"
- mood_change = 10
+ mood_change = 6
timeout = 5 MINUTES
+ event_flags = MOOD_EVENT_GAMING
/datum/mood_event/love_reagent
description = "This food reminds me of the good ol' days."
mood_change = 5
/datum/mood_event/love_reagent/add_effects(duration)
+ if(HAS_PERSONALITY(owner, /datum/personality/pessimistic))
+ mood_change = 0
+ description = "This food is okay, I guess."
+ return
+
if(isnum(duration))
timeout = duration
@@ -306,11 +491,13 @@
description = "HA! That loser will be picking cards up for a long time!"
mood_change = 3
timeout = 3 MINUTES
+ event_flags = MOOD_EVENT_WHIMSY | MOOD_EVENT_GAMING
/datum/mood_event/playing_cards
description = "I'm enjoying playing cards with other people!"
mood_change = 2
timeout = 3 MINUTES
+ event_flags = MOOD_EVENT_GAMING
/datum/mood_event/playing_cards/add_effects(param)
var/card_players = 1
@@ -334,7 +521,8 @@
timeout = 5 MINUTES
/datum/mood_event/russian_roulette_win/add_effects(loaded_rounds)
- mood_change = 2 ** loaded_rounds
+ var/base = HAS_PERSONALITY(owner, /datum/personality/gambler) ? 2 : 1.8
+ mood_change = round(base ** loaded_rounds, 1)
/datum/mood_event/fishing
description = "Fishing is relaxing."
@@ -359,6 +547,7 @@
description = "It felt nice to pet the fish."
mood_change = 2
timeout = 2 MINUTES
+ event_flags = MOOD_EVENT_WHIMSY
/datum/mood_event/fish_petting/add_effects(obj/item/fish/fish, morbid)
if(!morbid)
@@ -391,11 +580,13 @@
description = "Swish! Nothing but net."
mood_change = 2
timeout = 5 MINUTES
+ event_flags = MOOD_EVENT_WHIMSY | MOOD_EVENT_GAMING
/datum/mood_event/basketball_dunk
description = "Slam dunk! Boom, shakalaka!"
mood_change = 2
timeout = 5 MINUTES
+ event_flags = MOOD_EVENT_WHIMSY | MOOD_EVENT_GAMING
/datum/mood_event/moon_smile
description = "THE MOON SHOWS ME THE TRUTH AND ITS SMILE IS FACED TOWARDS ME!!!"
@@ -410,3 +601,103 @@
/datum/mood_event/prophat
description = "This hat fills me with whimsical joy!"
mood_change = 2
+ event_flags = MOOD_EVENT_WHIMSY
+
+/datum/mood_event/slots
+ description = "Let's go gambling!"
+ mood_change = 1
+ timeout = 1 MINUTES
+ event_flags = MOOD_EVENT_GAMING
+
+/datum/mood_event/slots/add_effects()
+ if(HAS_PERSONALITY(owner, /datum/personality/gambler))
+ mood_change *= 2
+ else if(HAS_PERSONALITY(owner, /datum/personality/industrious) || HAS_PERSONALITY(owner, /datum/personality/slacking/diligent))
+ mood_change *= -1
+ description = "Why am I gambling my time and money away?"
+
+
+/datum/mood_event/slots/win
+ description = "Aw yeah I won!"
+ mood_change = 2
+ timeout = 5 MINUTES
+ event_flags = MOOD_EVENT_GAMING
+
+/datum/mood_event/slots/win/be_replaced(datum/mood/home, datum/mood_event/new_event, ...)
+ if(new_event.mood_change < mood_change)
+ return BLOCK_NEW_MOOD
+ return ..()
+
+/datum/mood_event/slots/win/big
+ mood_change = 3
+ timeout = 10 MINUTES
+
+/datum/mood_event/slots/win/jackpot
+ description = "JACKPOT! AW YEAH!"
+ mood_change = 6
+ timeout = 30 MINUTES
+
+/datum/mood_event/empathetic_happy
+ description = "Seeing happy people makes me happy."
+ mood_change = 2
+ timeout = 2 MINUTES
+
+/datum/mood_event/misanthropic_happy
+ description = "Seeing sad people makes me glad."
+ mood_change = 2
+ timeout = 2 MINUTES
+
+/datum/mood_event/paranoid/alone
+ description = "Peace and quiet, no one around to threaten me."
+ mood_change = 1
+
+/datum/mood_event/paranoid/small_group
+ description = "I feel safer in this small group. We've got each other's backs."
+ mood_change = 2
+
+/datum/mood_event/nt_loyalist
+ description = "I feel proud to be part of the NT™ family!"
+ mood_change = 2
+
+/datum/mood_event/loyalist_revs_lost
+ description = "The revolution was defeated! Long live the Nanotrasen!"
+ mood_change = 4
+ timeout = 10 MINUTES
+
+/datum/mood_event/disillusioned_revs_win
+ description = "The revolution was a success! Viva la revolution!"
+ mood_change = 4
+ timeout = 10 MINUTES
+
+/datum/mood_event/enjoying_department_area
+ description = "I love my job."
+ mood_change = 1
+
+/datum/mood_event/slacking_off_lazy
+ description = "Boss makes a dollar, I make a dime. That's why I slack on job time."
+ mood_change = 1
+
+/datum/mood_event/working_diligent
+ description = "Working hard is its own reward."
+ mood_change = 1
+
+/datum/mood_event/creative_patronage
+ description = "Support artists!"
+ mood_change = 2
+ timeout = 5 MINUTES
+
+/datum/mood_event/creative_framing
+ description = "Hanging up art really ties the room together."
+ mood_change = 2
+ timeout = 5 MINUTES
+
+/datum/mood_event/creative_sculpting
+ description = "Sculpting is a great creative outlet."
+ mood_change = 2
+ timeout = 5 MINUTES
+
+/datum/mood_event/whimsical_slip
+ description = "Haha! That guy fell over!"
+ mood_change = 3
+ timeout = 2 MINUTES
+ event_flags = MOOD_EVENT_WHIMSY
diff --git a/code/datums/mood_events/needs_events.dm b/code/datums/mood_events/needs_events.dm
index 96f35708a369..6d4560215d4a 100644
--- a/code/datums/mood_events/needs_events.dm
+++ b/code/datums/mood_events/needs_events.dm
@@ -74,6 +74,14 @@
mood_change = -6
timeout = 4 MINUTES
+/datum/mood_event/disgust/dirty_food/add_effects(...)
+ if(HAS_PERSONALITY(owner, /datum/personality/ascetic))
+ mood_change *= 0.25
+ description = "That food was dirty, but edible."
+ if(HAS_PERSONALITY(owner, /datum/personality/gourmand))
+ mood_change *= 1.5
+ description = "That food was filthy, was it made in a dumpster?!"
+
//Generic needs events
/datum/mood_event/shower
description = "I have recently had a nice shower."
diff --git a/code/datums/mutations/antenna.dm b/code/datums/mutations/antenna.dm
index 7f564d6fa04e..f38a03f933ab 100644
--- a/code/datums/mutations/antenna.dm
+++ b/code/datums/mutations/antenna.dm
@@ -68,10 +68,12 @@
if (!owner)
return
ADD_TRAIT(grant_to, TRAIT_MIND_READER, GENETIC_MUTATION)
+ RegisterSignal(grant_to, COMSIG_MOB_EXAMINATE, PROC_REF(on_examining))
/datum/action/cooldown/spell/pointed/mindread/Remove(mob/remove_from)
. = ..()
REMOVE_TRAIT(remove_from, TRAIT_MIND_READER, GENETIC_MUTATION)
+ UnregisterSignal(remove_from, COMSIG_MOB_EXAMINATE)
/datum/action/cooldown/spell/pointed/mindread/is_valid_target(atom/cast_on)
if(!isliving(cast_on))
@@ -83,12 +85,15 @@
if(living_cast_on.stat == DEAD)
to_chat(owner, span_warning("[cast_on] is dead!"))
return FALSE
+ if(living_cast_on.mob_biotypes & MOB_ROBOTIC)
+ to_chat(owner, span_warning("[cast_on] is robotic, you can't read [cast_on.p_their()] mind!"))
+ return FALSE
return TRUE
/datum/action/cooldown/spell/pointed/mindread/cast(mob/living/cast_on)
. = ..()
- if(cast_on.can_block_magic(MAGIC_RESISTANCE_MIND, charge_cost = 0))
+ if(cast_on.can_block_magic(antimagic_flags, charge_cost = 0))
to_chat(owner, span_warning("As you reach into [cast_on]'s mind, \
you are stopped by a mental blockage. It seems you've been foiled."))
return
@@ -97,26 +102,78 @@
to_chat(owner, span_warning("You plunge into your mind... Yep, it's your mind."))
return
+ if(cast_on.has_status_effect(/datum/status_effect/heretic_passive/moon))
+ to_chat(owner, span_hypnophrase(span_bolddanger("YOU SEEK THE TRUTH? I WILL SHOW YOU EVERYTHING.")))
+ if(isliving(owner))
+ var/mob/living/reader = owner
+ reader.apply_status_effect(/datum/status_effect/moon_converted)
+ return
+
if(HAS_TRAIT(cast_on, TRAIT_EVIL))
to_chat(owner, span_warning("As you reach into [cast_on]'s mind, \
you feel the overwhelming emptiness within. A truly evil being. \
[HAS_TRAIT(owner, TRAIT_EVIL) ? "It's nice to find someone who is like-minded." : "What is wrong with this person?"]"))
- to_chat(owner, span_boldnotice("You plunge into [cast_on]'s mind..."))
+ var/list/log_info = list()
+ var/list/discovered_info = list("You plunge into [cast_on]'s mind and discover...")
if(prob(20))
// chance to alert the read-ee
to_chat(cast_on, span_danger("You feel something foreign enter your mind."))
+ log_info += "Target alerted!"
var/list/recent_speech = cast_on.copy_recent_speech(copy_amount = 3, line_chance = 50)
if(length(recent_speech))
- to_chat(owner, span_boldnotice("You catch some drifting memories of their past conversations..."))
+ discovered_info += "...Drifting memories of past conversations:"
+ var/list/speech_block = list()
for(var/spoken_memory in recent_speech)
- to_chat(owner, span_notice("[spoken_memory]"))
+ speech_block += " \"[spoken_memory]\"..."
+ log_info += "Recent speech: \"[spoken_memory]\""
+ discovered_info += jointext(speech_block, " ")
if(iscarbon(cast_on))
var/mob/living/carbon/carbon_cast_on = cast_on
- to_chat(owner, span_boldnotice("You find that their intent is to [carbon_cast_on.combat_mode ? "harm" : "help"]..."))
- to_chat(owner, span_boldnotice("You uncover that [carbon_cast_on.p_their()] true identity is [carbon_cast_on.mind.name]."))
+ discovered_info += "...Intent to [carbon_cast_on.combat_mode ? "harm" : "help"]."
+ discovered_info += "...True identity of [carbon_cast_on.mind.name]."
+ log_info += "Intent: \"[carbon_cast_on.combat_mode ? "harm" : "help"]\""
+ log_info += "Identity: \"[carbon_cast_on.mind.name]\""
+
+ to_chat(owner, boxed_message(span_notice(jointext(discovered_info, " "))))
+ log_combat(owner, cast_on, "mind read (cast intentionally)", null, "info: [english_list(log_info, and_text = ", ")]")
+
+/datum/action/cooldown/spell/pointed/mindread/proc/on_examining(mob/examiner, atom/examining)
+ SIGNAL_HANDLER
+ if(!isliving(examining) || examiner == examining)
+ return
+
+ INVOKE_ASYNC(src, PROC_REF(read_mind), examiner, examining)
+
+/datum/action/cooldown/spell/pointed/mindread/proc/read_mind(mob/living/examiner, mob/living/examined)
+ if(examined.stat >= UNCONSCIOUS || isnull(examined.mind) || (examined.mob_biotypes & MOB_ROBOTIC))
+ return
+
+ var/antimagic = examined.can_block_magic(antimagic_flags, charge_cost = 0)
+ var/read_text = ""
+ if(!antimagic)
+ read_text = examined.get_typing_text()
+ if(!read_text)
+ return
+
+ sleep(0.5 SECONDS) // small pause so it comes after all examine text and effects
+ if(QDELETED(examiner))
+ return
+ if(antimagic)
+ to_chat(examiner, boxed_message(span_warning("You attempt to analyze [examined]'s current thoughts, but fail to penetrate [examined.p_their()] mind - It seems you've been foiled.")))
+ return
+
+ var/list/log_info = list()
+ if(prob(10))
+ to_chat(examined, span_danger("You feel something foreign enter your mind."))
+ log_info += "Target alerted!"
+
+ to_chat(examiner, boxed_message(span_notice("You analyze [examined]'s current thoughts... \"[read_text]\"...")))
+ log_info += "Current thought: \"[read_text]\""
+
+ log_combat(examiner, examined, "mind read (triggered on examine)", null, "info: [english_list(log_info, and_text = ", ")]")
/datum/mutation/mindreader/New(datum/mutation/copymut)
..()
diff --git a/code/datums/mutations/body.dm b/code/datums/mutations/body.dm
index 9b92da0dbdf8..2e633fef128d 100644
--- a/code/datums/mutations/body.dm
+++ b/code/datums/mutations/body.dm
@@ -703,9 +703,9 @@
return
// Gives you 30 seconds of being in soft crit... give or take
if(HAS_TRAIT(owner, TRAIT_TOXIMMUNE) || HAS_TRAIT(owner, TRAIT_TOXINLOVER))
- owner.adjustBruteLoss(1 * seconds_per_tick * GET_MUTATION_SYNCHRONIZER(src), forced = TRUE)
+ owner.adjust_brute_loss(1 * seconds_per_tick * GET_MUTATION_SYNCHRONIZER(src), forced = TRUE)
else
- owner.adjustToxLoss(0.5 * seconds_per_tick * GET_MUTATION_SYNCHRONIZER(src), forced = TRUE)
- owner.adjustBruteLoss(0.5 * seconds_per_tick * GET_MUTATION_SYNCHRONIZER(src), forced = TRUE)
+ owner.adjust_tox_loss(0.5 * seconds_per_tick * GET_MUTATION_SYNCHRONIZER(src), forced = TRUE)
+ owner.adjust_brute_loss(0.5 * seconds_per_tick * GET_MUTATION_SYNCHRONIZER(src), forced = TRUE)
// Offsets suffocation but not entirely
- owner.adjustOxyLoss(-0.5 * seconds_per_tick, forced = TRUE)
+ owner.adjust_oxy_loss(-0.5 * seconds_per_tick, forced = TRUE)
diff --git a/code/datums/mutations/hulk.dm b/code/datums/mutations/hulk.dm
index e2179630beb6..2649c2fcdec1 100644
--- a/code/datums/mutations/hulk.dm
+++ b/code/datums/mutations/hulk.dm
@@ -34,11 +34,14 @@
if(!.)
return
for(var/obj/item/bodypart/part as anything in owner.bodyparts)
- part.add_color_override(bodypart_color, LIMB_COLOR_HULK)
+ if (part.bodytype & BODYTYPE_ORGANIC)
+ part.add_color_override(bodypart_color, LIMB_COLOR_HULK)
owner.update_body_parts()
owner.add_mood_event("hulk", /datum/mood_event/hulk)
RegisterSignal(owner, COMSIG_LIVING_EARLY_UNARMED_ATTACK, PROC_REF(on_attack_hand))
RegisterSignal(owner, COMSIG_MOB_CLICKON, PROC_REF(check_swing))
+ RegisterSignal(owner, COMSIG_CARBON_ATTACH_LIMB, PROC_REF(texture_limb))
+ RegisterSignal(owner, COMSIG_CARBON_REMOVE_LIMB, PROC_REF(untexture_limb))
owner.add_movespeed_mod_immunities("hulk", /datum/movespeed_modifier/damage_slowdown)
/datum/mutation/hulk/proc/on_attack_hand(mob/living/carbon/human/source, atom/target, proximity, modifiers)
@@ -79,6 +82,15 @@
UnregisterSignal(owner, COMSIG_MOB_CLICKON)
owner.remove_movespeed_mod_immunities("hulk", /datum/movespeed_modifier/damage_slowdown)
+/datum/mutation/hulk/proc/texture_limb(atom/source, obj/item/bodypart/limb)
+ SIGNAL_HANDLER
+ if (limb.bodytype & BODYTYPE_ORGANIC)
+ limb.add_color_override(bodypart_color, LIMB_COLOR_HULK)
+
+/datum/mutation/hulk/proc/untexture_limb(atom/source, obj/item/bodypart/limb)
+ SIGNAL_HANDLER
+ limb.remove_color_override(LIMB_COLOR_HULK)
+
/// How many steps it takes to throw the mob
#define HULK_TAILTHROW_STEPS 28
@@ -184,7 +196,7 @@
if(!collateral_mob.density || collateral_mob == yeeted_person)
continue
- yeeted_person.adjustBruteLoss(step*0.5)
+ yeeted_person.adjust_brute_loss(step*0.5)
playsound(collateral_mob,'sound/items/weapons/punch1.ogg',50,TRUE)
log_combat(the_hulk, collateral_mob, "has smacked with tail swing victim")
log_combat(the_hulk, yeeted_person, "has smacked this person into someone while tail swinging") // i have no idea how to better word this
@@ -192,14 +204,14 @@
if(collateral_mob == the_hulk) // if the hulk moves wrong and crosses himself
the_hulk.visible_message(span_warning("[the_hulk] smacks [the_hulk.p_them()]self with [yeeted_person]!"), span_userdanger("You end up smacking [yeeted_person] into yourself!"), ignored_mobs = yeeted_person)
to_chat(yeeted_person, span_userdanger("[the_hulk] smacks you into [the_hulk.p_them()]self, turning you free!"))
- the_hulk.adjustBruteLoss(step)
+ the_hulk.adjust_brute_loss(step)
return
yeeted_person.visible_message(span_warning("[the_hulk] swings [yeeted_person] directly into [collateral_mob], sending [collateral_mob.p_them()] flying!"), \
span_userdanger("You're smacked into [collateral_mob]!"), ignored_mobs = collateral_mob)
to_chat(collateral_mob, span_userdanger("[the_hulk] swings [yeeted_person] directly into you, sending you flying!"))
- collateral_mob.adjustBruteLoss(step*0.5)
+ collateral_mob.adjust_brute_loss(step*0.5)
collateral_mob.throw_at(collat_throw_target, round(step * 0.25) + 1, round(step * 0.25) + 1)
step -= 5
delay += 5
@@ -261,6 +273,7 @@
TRAIT_PUSHIMMUNE,
TRAIT_STUNIMMUNE,
TRAIT_ANALGESIA,
+ TRAIT_NO_OXYLOSS_PASSOUT,
) // fight till your last breath
/datum/mutation/hulk/superhuman/on_life(seconds_per_tick, times_fired)
diff --git a/code/datums/mutations/reach.dm b/code/datums/mutations/reach.dm
index e5757346f9b9..24f2d5d37e85 100644
--- a/code/datums/mutations/reach.dm
+++ b/code/datums/mutations/reach.dm
@@ -53,15 +53,16 @@
. = ..()
if(!.)
return
- RegisterSignal(homan, COMSIG_ATOM_CANREACH, PROC_REF(on_canreach))
RegisterSignal(homan, COMSIG_LIVING_TRY_PUT_IN_HAND, PROC_REF(on_owner_equipping_item))
RegisterSignal(homan, COMSIG_LIVING_TRY_PULL, PROC_REF(on_owner_try_pull))
+ homan.reach_length++
/datum/mutation/elastic_arms/on_losing(mob/living/carbon/human/homan)
. = ..()
if(.)
return
- UnregisterSignal(homan, list(COMSIG_ATOM_CANREACH, COMSIG_LIVING_TRY_PUT_IN_HAND, COMSIG_LIVING_TRY_PULL))
+ UnregisterSignal(homan, list(COMSIG_LIVING_TRY_PUT_IN_HAND, COMSIG_LIVING_TRY_PULL))
+ homan.reach_length = min(1, homan.reach_length - 1)
/// signal sent when prompting if an item can be equipped
/datum/mutation/elastic_arms/proc/on_owner_equipping_item(mob/living/carbon/human/owner, obj/item/pick_item)
@@ -83,30 +84,3 @@
if(item_target.w_class > WEIGHT_CLASS_BULKY)
item_target.balloon_alert(owner, "arms too floppy to pull this!")
return COMSIG_LIVING_CANCEL_PULL
-
-// probably buggy. let's enlist our players as bug testers
-/datum/mutation/elastic_arms/proc/on_canreach(mob/source, atom/target)
- SIGNAL_HANDLER
-
- var/distance = get_dist(target, source)
-
- // We only care about handling the reach distance, anything closer or further is handled normally.
- // Also, no z-level shenanigans. Yet.
- if((distance != 2) || source.z != target.z)
- return
-
- var/direction = get_dir(source, target)
- if(!direction)
- return
- var/turf/open/adjacent_turf = get_step(source, direction)
-
- // Make sure it's an open turf we're trying to pass over.
- if(!istype(adjacent_turf))
- return
-
- // Check if there's something dense inbetween, then allow it.
- for(var/atom/thing in adjacent_turf)
- if(thing.density)
- return
-
- return COMPONENT_ALLOW_REACH
diff --git a/code/datums/mutations/sight.dm b/code/datums/mutations/sight.dm
index 3bbf1a1f2e6b..c618f1f0a339 100644
--- a/code/datums/mutations/sight.dm
+++ b/code/datums/mutations/sight.dm
@@ -107,7 +107,7 @@
if(iscarbon(cast_on))
var/mob/living/carbon/carbon_cast_on = cast_on
- carbon_cast_on.adjustOrganLoss(ORGAN_SLOT_EYES, eye_damage)
+ carbon_cast_on.adjust_organ_loss(ORGAN_SLOT_EYES, eye_damage)
///X-ray Vision lets you see through walls.
/datum/mutation/xray
diff --git a/code/datums/mutations/touch.dm b/code/datums/mutations/touch.dm
index 6ffcc79e8d67..ba24f4f30bc4 100644
--- a/code/datums/mutations/touch.dm
+++ b/code/datums/mutations/touch.dm
@@ -220,9 +220,9 @@
. = FALSE
// Damage to heal
- var/brute_to_heal = min(hurtguy.getBruteLoss(), 35 * heal_multiplier)
+ var/brute_to_heal = min(hurtguy.get_brute_loss(), 35 * heal_multiplier)
// no double dipping
- var/burn_to_heal = min(hurtguy.getFireLoss(), (35 - brute_to_heal) * heal_multiplier)
+ var/burn_to_heal = min(hurtguy.get_fire_loss(), (35 - brute_to_heal) * heal_multiplier)
// Get at least organic limb to transfer the damage to
var/list/mendicant_organic_limbs = list()
@@ -241,11 +241,11 @@
mendicant_transfer_limb.receive_damage(brute_to_heal * pain_multiplier, burn_to_heal * pain_multiplier, forced = TRUE, wound_bonus = CANT_WOUND)
if(brute_to_heal)
- hurtguy.adjustBruteLoss(-brute_to_heal)
+ hurtguy.adjust_brute_loss(-brute_to_heal)
. = TRUE
if(burn_to_heal)
- hurtguy.adjustFireLoss(-burn_to_heal)
+ hurtguy.adjust_fire_loss(-burn_to_heal)
. = TRUE
if(!.)
@@ -306,49 +306,43 @@
iter_wound.remove_wound()
iter_wound.apply_wound(mendicant_transfer_limb)
- if(HAS_TRAIT(mendicant, TRAIT_NOBLOOD))
+ if(!CAN_HAVE_BLOOD(mendicant) || !CAN_HAVE_BLOOD(hurtguy))
return .
// 10% base
var/max_blood_transfer = (BLOOD_VOLUME_NORMAL * 0.10) * heal_multiplier
// Too little blood
- if(hurtguy.blood_volume < BLOOD_VOLUME_NORMAL)
- var/max_blood_to_hurtguy = min(mendicant.blood_volume, BLOOD_VOLUME_NORMAL - hurtguy.blood_volume)
- var/blood_to_hurtguy = min(max_blood_transfer, max_blood_to_hurtguy)
- if(!blood_to_hurtguy)
- return .
-
+ if(hurtguy.get_blood_volume() < BLOOD_VOLUME_NORMAL)
// We ignore incompatibility here.
- if(!mendicant.transfer_blood_to(hurtguy, blood_to_hurtguy, forced = TRUE, ignore_incompatibility = TRUE))
+ var/blood_transferred = mendicant.transfer_blood_to(hurtguy, max_blood_transfer, ignore_low_blood = TRUE, ignore_incompatibility = TRUE)
+
+ if(!blood_transferred)
return
to_chat(mendicant, span_notice("Your veins (and brain) feel a bit lighter."))
. = TRUE
// Because we do our own spin on it!
if(hurtguy.get_blood_compatibility(mendicant) == FALSE)
- hurtguy.adjustToxLoss((blood_to_hurtguy * 0.1) * pain_multiplier) // 1 dmg per 10 blood
+ hurtguy.adjust_tox_loss((blood_transferred * 0.1) * pain_multiplier) // 1 dmg per 10 blood
to_chat(hurtguy, span_notice("Your veins feel thicker, but they itch a bit."))
else
to_chat(hurtguy, span_notice("Your veins feel thicker!"))
return
- if(hurtguy.blood_volume < BLOOD_VOLUME_MAXIMUM)
+ if(hurtguy.get_blood_volume() < BLOOD_VOLUME_EXCESS)
return
- // Too MUCH blood
- var/max_blood_to_mendicant = BLOOD_VOLUME_EXCESS - hurtguy.blood_volume
- var/blood_to_mendicant = min(max_blood_transfer, max_blood_to_mendicant)
- // mender always gonna have blood
-
// We ignore incompatibility here.
- if(!hurtguy.transfer_blood_to(mendicant, hurtguy.blood_volume - BLOOD_VOLUME_EXCESS, forced = TRUE, ignore_incompatibility = TRUE))
+ var/blood_received = hurtguy.transfer_blood_to(mendicant, hurtguy.get_blood_volume() - BLOOD_VOLUME_EXCESS, ignore_incompatibility = TRUE)
+
+ if(!blood_received)
return
to_chat(hurtguy, span_notice("Your veins don't feel quite so swollen anymore."))
. = TRUE
// Because we do our own spin on it!
if(mendicant.get_blood_compatibility(hurtguy) == FALSE)
- mendicant.adjustToxLoss((blood_to_mendicant * 0.1) * pain_multiplier) // 1 dmg per 10 blood
+ mendicant.adjust_tox_loss((blood_received * 0.1) * pain_multiplier) // 1 dmg per 10 blood
to_chat(mendicant, span_notice("Your veins swell and itch!"))
else
to_chat(mendicant, span_notice("Your veins swell!"))
@@ -356,6 +350,8 @@
/datum/action/cooldown/spell/touch/lay_on_hands/proc/determine_if_this_hurts_instead(mob/living/carbon/mendicant, mob/living/hurtguy)
+ var/hurtguy_smiteable = SEND_SIGNAL(hurtguy, COMSIG_ON_LAY_ON_HANDS, mendicant)
+
if(hurtguy.mob_biotypes & MOB_UNDEAD && mendicant.mob_biotypes & MOB_UNDEAD)
return FALSE //always return false if we're both undead //undead solidarity
@@ -365,10 +361,9 @@
if(HAS_TRAIT(hurtguy, TRAIT_EVIL) && !HAS_TRAIT(mendicant, TRAIT_EVIL)) //Is the guy evil and we're not evil? If so, hurt.
return TRUE
- if(!(hurtguy.mob_biotypes & MOB_UNDEAD) && HAS_TRAIT(hurtguy, TRAIT_EMPATH) && HAS_TRAIT(mendicant, TRAIT_EVIL)) //Is the guy not undead, they're an empath and we're evil? If so, hurt.
+ if(hurtguy_smiteable) //Is some other property of the target (like the empath component) causing them to be smited? If so, hurt.
return TRUE
-
- return FALSE
+ return (FALSE)
///If our target was undead or evil, we blast them with a firey beam rather than healing them. For, you know, 'holy' reasons. When did genes become so morally uptight?
diff --git a/code/datums/outfit.dm b/code/datums/outfit.dm
index 1badba3f160a..007f7a26daa9 100644
--- a/code/datums/outfit.dm
+++ b/code/datums/outfit.dm
@@ -24,20 +24,20 @@
var/id_trim = null
/// Type path of item to go in uniform slot
- var/uniform = null
+ var/obj/item/uniform = null
/// Type path of item to go in suit slot
- var/suit = null
+ var/obj/item/suit = null
/**
* Type path of item to go in suit storage slot
*
* (make sure it's valid for that suit)
*/
- var/suit_store = null
+ var/obj/item/suit_store = null
/// Type path of item to go in back slot
- var/back = null
+ var/obj/item/back = null
/**
* list of items that should go in the backpack of the user
@@ -47,7 +47,7 @@
var/list/backpack_contents = null
/// Type path of item to go in belt slot
- var/belt = null
+ var/obj/item/belt = null
/**
* list of items that should go in the belt of the user
@@ -505,7 +505,7 @@
for(var/item in beltpack)
var/itype = text2path(item)
if(itype)
- belt_contents[itype] = belt[item]
+ belt_contents[itype] = beltpack[item]
box = text2path(outfit_data["box"])
var/list/impl = outfit_data["implants"]
implants = list()
diff --git a/code/datums/personality/_personality.dm b/code/datums/personality/_personality.dm
new file mode 100644
index 000000000000..e5dc2da50562
--- /dev/null
+++ b/code/datums/personality/_personality.dm
@@ -0,0 +1,100 @@
+/**
+ * ## Personality Singleton
+ *
+ * Contains information about a personaility.
+ *
+ * A personality is designed to be a small modifier to the way a mob reacts to moodlets or world events.
+ *
+ * For example, a mob with the Callous personality would not receive a positive moodlet for saving someone's life.
+ *
+ * They're not meant to be full blown quirks that hold state and such.
+ * If you NEED state, consider making a quirk, or moving your behavior into a component the personality applies.
+ */
+/datum/personality
+ /// Required: Name of the personality
+ var/name
+ /// Required: Description of the personality.
+ /// Phrased to be "In character" - i.e. "I like to help people!"
+ /// Rather than OOC 0 i.e. "When helping people, I get a positive moodlet."
+ var/desc
+ /// Optional: Short blurb on what positive effects this personality has on gameplay, for ui
+ var/pos_gameplay_desc
+ /// Optional: Short blurb on what negative effects this personality has on gameplay, for ui
+ var/neg_gameplay_desc
+ /// Optional: Short blurb on what neutral effects this personality has on gameplay, for ui
+ var/neut_gameplay_desc
+ /// Easy way to apply a trait as a part of a personality.
+ var/personality_trait
+ /// Required: The key to use when saving this personality to a savefile.
+ /// Don't change it once it's set unless you want to write migration code
+ var/savefile_key
+ /// What groups does this personality belong to?
+ /// Personalities in the same group are mutually exclusive.
+ var/list/groups
+ /// Does this personality need to process every tick?
+ /// If true, you'll need to override on_tick() with logic
+ var/processes = FALSE
+
+/datum/personality/New()
+ . = ..()
+ if(processes)
+ SSpersonalities.processing_personalities[src] = list()
+ START_PROCESSING(SSpersonalities, src)
+
+/datum/personality/Destroy(force)
+ if(force)
+ STOP_PROCESSING(SSpersonalities, src)
+ SSpersonalities.processing_personalities -= src
+ SSpersonalities.personalities_by_type -= type
+ SSpersonalities.personalities_by_key -= savefile_key
+ return ..()
+
+ stack_trace("qdel called on a personality singleton!")
+ return QDEL_HINT_LETMELIVE
+
+/**
+ * Called when applying this personality to a mob.
+ *
+ * * who - The mob to apply this personality to.
+ * This mob is asserted to have `mob_mood`.
+ */
+/datum/personality/proc/apply_to_mob(mob/living/who)
+ SHOULD_CALL_PARENT(TRUE)
+ if(personality_trait)
+ ADD_TRAIT(who, personality_trait, PERSONALITY_TRAIT)
+ LAZYSET(who.personalities, type, TRUE)
+ if(processes)
+ SSpersonalities.processing_personalities[src] += who
+
+/**
+ * Called when removing this personality from a mob.
+ *
+ * This is not called as a part of the mob being deleted.
+ *
+ * * who - The mob to remove this personality from.
+ * This mob is asserted to have `mob_mood`.
+ */
+/datum/personality/proc/remove_from_mob(mob/living/who)
+ SHOULD_CALL_PARENT(TRUE)
+ if(personality_trait)
+ REMOVE_TRAIT(who, personality_trait, PERSONALITY_TRAIT)
+ LAZYREMOVE(who.personalities, type)
+ if(processes)
+ SSpersonalities.processing_personalities[src] -= who
+
+/datum/personality/process(seconds_per_tick)
+ for(var/mob/living/subject as anything in SSpersonalities.processing_personalities[src])
+ if(subject.stat >= UNCONSCIOUS || HAS_TRAIT(subject, TRAIT_NO_TRANSFORM))
+ continue
+ if(on_tick(subject, seconds_per_tick) != PROCESS_KILL)
+ continue
+ stack_trace("Personality [type] processed but did not override on_tick().")
+ SSpersonalities.processing_personalities -= src // stop tracking if we're done processing
+ return PROCESS_KILL
+
+ return null
+
+/// Called every SSpersonality tick if `processes` is TRUE.
+/// Don't call parent if you override this, that's for error checking
+/datum/personality/proc/on_tick(mob/living/subject, seconds_per_tick)
+ return PROCESS_KILL
diff --git a/code/datums/personality/_personality_groups.dm b/code/datums/personality/_personality_groups.dm
new file mode 100644
index 000000000000..efc5b1bab7c7
--- /dev/null
+++ b/code/datums/personality/_personality_groups.dm
@@ -0,0 +1,41 @@
+// These defines are for indicating incompatible personalities by group
+
+/// General Modification to moodlet length
+#define PERSONALITY_GROUP_MOOD_LENGTH "reaction_to_thought"
+/// General modification to moodlet power
+#define PERSONALITY_GROUP_MOOD_POWER "general_reaction"
+
+/// Changes how the person views death
+#define PERSONALITY_GROUP_DEATH "reaction_to_death"
+/// Changes how the person feels when generally afraid
+#define PERSONALITY_GROUP_GENERAL_FEAR "reaction_to_fear"
+/// Are we afraid of other people specifically
+#define PERSONALITY_GROUP_PEOPLE_FEAR "reaction_to_fear_others"
+/// Preferred department / job location
+#define PERSONALITY_GROUP_DEPARTMENT "reaction_to_department"
+/// Changes how the person views animals, specific or general
+#define PERSONALITY_GROUP_ANIMALS "reaction_to_animals"
+/// How they view Nanotrasen itself
+#define PERSONALITY_GROUP_NT "reaction_to_nt"
+/// Opinion of other crewmembers
+#define PERSONALITY_GROUP_OTHERS "reaction_to_others"
+/// What type of interactions they prefer
+#define PERSONALITY_GROUP_INTERACTION "reaction_to_interaction"
+/// How they feel about slacking off
+#define PERSONALITY_GROUP_RECREATION "reaction_to_recreation"
+/// How they feel about the opposite of slacking off
+#define PERSONALITY_GROUP_WORK "reaction_to_work"
+/// Changes how they react to imbibing alcohol
+#define PERSONALITY_GROUP_ALCOHOL "reaction_to_alcohol"
+/// Modifies moodlets from food
+#define PERSONALITY_GROUP_FOOD "reaction_to_food"
+/// How hopeful vs pessimistic they are
+#define PERSONALITY_GROUP_HOPE "reaction_to_hope"
+/// Specifically how they feel about humanity
+#define PERSONALITY_GROUP_MISANTHROPY "reaction_to_misanthropy"
+/// Whether they enjoy working out or not
+#define PERSONALITY_GROUP_ATHLETICS "reaction_to_athletics"
+/// Whether they enjoy art out or not
+#define PERSONALITY_GROUP_ART "reaction_to_art"
+/// Whether they enjoy reading out or not
+#define PERSONALITY_GROUP_READING "reaction_to_reading"
diff --git a/code/datums/personality/personality_preference.dm b/code/datums/personality/personality_preference.dm
new file mode 100644
index 000000000000..b33fe3818068
--- /dev/null
+++ b/code/datums/personality/personality_preference.dm
@@ -0,0 +1,46 @@
+/datum/preference/personality
+ savefile_key = "personalities"
+ savefile_identifier = PREFERENCE_CHARACTER
+ can_randomize = TRUE
+ randomize_by_default = FALSE
+
+/datum/preference/personality/apply_to_human(mob/living/carbon/human/target, value)
+ if(isdummy(target) || !ishuman(target) || isnull(target.mob_mood))
+ return
+ if(CONFIG_GET(flag/disable_human_mood) || !CONFIG_GET(flag/roundstart_traits))
+ return
+ for(var/personality_key in value)
+ var/datum/personality/personality = SSpersonalities.personalities_by_key[personality_key]
+ personality.apply_to_mob(target)
+
+/datum/preference/personality/is_valid(value)
+ return islist(value) || isnull(value)
+
+/datum/preference/personality/deserialize(input, datum/preferences/preferences)
+ if(!LAZYLEN(input))
+ return null
+
+ if(!SSpersonalities.initialized)
+ SSpersonalities.init_personalities()
+
+ var/list/input_sanitized
+ for(var/personality_key in input)
+ var/datum/personality/personality = SSpersonalities.personalities_by_key[personality_key]
+ if(!istype(personality))
+ continue
+ if(SSpersonalities.is_incompatible(input_sanitized, personality.type))
+ continue
+ if(LAZYLEN(input_sanitized) >= CONFIG_GET(number/max_personalities))
+ break
+ LAZYADD(input_sanitized, personality_key)
+
+ return input_sanitized
+
+/datum/preference/personality/create_default_value()
+ return null
+
+/datum/preference/personality/create_random_value(datum/preferences/preferences)
+ var/list/random_personalities
+ for(var/datum/personality/personality_type as anything in SSpersonalities.select_random_personalities())
+ LAZYADD(random_personalities, initial(personality_type.savefile_key))
+ return random_personalities
diff --git a/code/datums/personality/reaction_generic.dm b/code/datums/personality/reaction_generic.dm
new file mode 100644
index 000000000000..e0dd27abdeb6
--- /dev/null
+++ b/code/datums/personality/reaction_generic.dm
@@ -0,0 +1,102 @@
+/datum/personality/apathetic
+ savefile_key = "apathetic"
+ name = "Apathetic"
+ desc = "I don't care about much. Not the good, nor the bad, and certainly not the ugly."
+ neut_gameplay_desc = "All moodlets affect you less"
+ groups = list(PERSONALITY_GROUP_MOOD_POWER)
+
+/datum/personality/apathetic/apply_to_mob(mob/living/who)
+ . = ..()
+ who.mob_mood?.mood_modifier -= 0.2
+
+/datum/personality/apathetic/remove_from_mob(mob/living/who)
+ . = ..()
+ who.mob_mood?.mood_modifier += 0.2
+
+/datum/personality/sensitive
+ savefile_key = "sensitive"
+ name = "Sensitive"
+ desc = "I am easily influenced by the world around me."
+ neut_gameplay_desc = "All moodlets affect you more"
+ groups = list(PERSONALITY_GROUP_MOOD_POWER)
+
+/datum/personality/sensitive/apply_to_mob(mob/living/who)
+ . = ..()
+ who.mob_mood?.mood_modifier += 0.2
+
+/datum/personality/sensitive/remove_from_mob(mob/living/who)
+ . = ..()
+ who.mob_mood?.mood_modifier -= 0.2
+
+/datum/personality/resilient
+ savefile_key = "resilient"
+ name = "Resilient"
+ desc = "It's whatever. I can take it!"
+ pos_gameplay_desc = "Negative moodlets expire faster"
+ groups = list(PERSONALITY_GROUP_MOOD_LENGTH)
+
+/datum/personality/resilient/apply_to_mob(mob/living/who)
+ . = ..()
+ who.mob_mood?.negative_moodlet_length_modifier -= 0.2
+
+/datum/personality/resilient/remove_from_mob(mob/living/who)
+ . = ..()
+ who.mob_mood?.negative_moodlet_length_modifier += 0.2
+
+/datum/personality/brooding
+ savefile_key = "brooding"
+ name = "Brooding"
+ desc = "Everything gets to me and I can't help but think about it."
+ neg_gameplay_desc = "Negative moodlets last longer"
+ groups = list(PERSONALITY_GROUP_MOOD_LENGTH)
+
+/datum/personality/brooding/apply_to_mob(mob/living/who)
+ . = ..()
+ who.mob_mood?.negative_moodlet_length_modifier += 0.2
+
+/datum/personality/brooding/remove_from_mob(mob/living/who)
+ . = ..()
+ who.mob_mood?.negative_moodlet_length_modifier -= 0.2
+
+/datum/personality/hopeful
+ savefile_key = "hopeful"
+ name = "Hopeful"
+ desc = "I believe things will always get better."
+ pos_gameplay_desc = "Positive moodlets last longer"
+ groups = list(PERSONALITY_GROUP_HOPE)
+
+/datum/personality/hopeful/apply_to_mob(mob/living/who)
+ . = ..()
+ who.mob_mood?.positive_moodlet_length_modifier += 0.2
+
+/datum/personality/hopeful/remove_from_mob(mob/living/who)
+ . = ..()
+ who.mob_mood?.positive_moodlet_length_modifier -= 0.2
+
+/datum/personality/pessimistic
+ savefile_key = "pessimistic"
+ name = "Pessimistic"
+ desc = "I believe our best days are behind us."
+ neg_gameplay_desc = "Positive moodlets last shorter"
+ groups = list(PERSONALITY_GROUP_HOPE)
+
+/datum/personality/pessimistic/apply_to_mob(mob/living/who)
+ . = ..()
+ who.mob_mood?.positive_moodlet_length_modifier -= 0.2
+
+/datum/personality/pessimistic/remove_from_mob(mob/living/who)
+ . = ..()
+ who.mob_mood?.positive_moodlet_length_modifier += 0.2
+
+/datum/personality/whimsical
+ savefile_key = "whimsical"
+ name = "Whimsical"
+ desc = "This station is too serious sometimes, lighten up!"
+ pos_gameplay_desc = "Likes ostensibly pointless but silly things, and does not mind clownish pranks"
+
+/datum/personality/snob
+ savefile_key = "snob"
+ name = "Snobbish"
+ desc = "I expect only the best out of this station - anything less is unacceptable!"
+ neut_gameplay_desc = "Room quality affects your mood"
+ personality_trait = TRAIT_SNOB
diff --git a/code/datums/personality/reaction_to_animals.dm b/code/datums/personality/reaction_to_animals.dm
new file mode 100644
index 000000000000..2d3589c50a79
--- /dev/null
+++ b/code/datums/personality/reaction_to_animals.dm
@@ -0,0 +1,30 @@
+/datum/personality/animal_friend
+ savefile_key = "animal_friend"
+ name = "Animal Friend"
+ desc = "I love animals! They'll never leave my side."
+ pos_gameplay_desc = "Likes being around pets"
+ neg_gameplay_desc = "Seeing a pet's death affects your mood more"
+ groups = list(PERSONALITY_GROUP_ANIMALS)
+
+/datum/personality/cat_fan
+ savefile_key = "cat_fan"
+ name = "Cat Person"
+ desc = "Cats are so cute!"
+ pos_gameplay_desc = "Likes being around cats"
+ neg_gameplay_desc = "Dislikes being around dogs"
+ groups = list(PERSONALITY_GROUP_ANIMALS)
+
+/datum/personality/dog_fan
+ savefile_key = "dog_fan"
+ name = "Dog Person"
+ desc = "Dogs are the best!"
+ pos_gameplay_desc = "Likes being around dogs"
+ neg_gameplay_desc = "Dislikes being around cats"
+ groups = list(PERSONALITY_GROUP_ANIMALS)
+
+/datum/personality/animal_disliker
+ savefile_key = "animal_disliker"
+ name = "Animal Averse"
+ desc = "We can barely survive on this station, and you want to keep a pet?"
+ neg_gameplay_desc = "Dislikes being around pets"
+ groups = list(PERSONALITY_GROUP_ANIMALS)
diff --git a/code/datums/personality/reaction_to_art.dm b/code/datums/personality/reaction_to_art.dm
new file mode 100644
index 000000000000..ed4fb8ecd046
--- /dev/null
+++ b/code/datums/personality/reaction_to_art.dm
@@ -0,0 +1,13 @@
+/datum/personality/creative
+ savefile_key = "creative"
+ name = "Creative"
+ desc = "I like expressing myself, especially in a chaotic place like this."
+ pos_gameplay_desc = "Likes making and seeing art or playing music"
+ groups = list(PERSONALITY_GROUP_ART)
+
+/datum/personality/unimaginative
+ savefile_key = "unimaginative"
+ name = "Unimaginative"
+ desc = "I'm not good at thinking outside the box. The box is there for a reason."
+ neg_gameplay_desc = "Ignores art or music and dislikes making new art"
+ groups = list(PERSONALITY_GROUP_ART)
diff --git a/code/datums/personality/reaction_to_fear.dm b/code/datums/personality/reaction_to_fear.dm
new file mode 100644
index 000000000000..c9eeed5f8b37
--- /dev/null
+++ b/code/datums/personality/reaction_to_fear.dm
@@ -0,0 +1,13 @@
+/datum/personality/brave
+ savefile_key = "brave"
+ name = "Brave"
+ desc = "It'll take a lot more than a little blood to scare me."
+ pos_gameplay_desc = "Accumulate fear slower, and moodlets related to fear are weaker"
+ groups = list(PERSONALITY_GROUP_GENERAL_FEAR, PERSONALITY_GROUP_PEOPLE_FEAR)
+
+/datum/personality/cowardly
+ savefile_key = "cowardly"
+ name = "Cowardly"
+ desc = "Everything is a danger around here! Even the air!"
+ neg_gameplay_desc = "Accumulate fear faster, and moodlets related to fear are stronger"
+ groups = list(PERSONALITY_GROUP_GENERAL_FEAR)
diff --git a/code/datums/personality/reaction_to_food.dm b/code/datums/personality/reaction_to_food.dm
new file mode 100644
index 000000000000..aedc30d82685
--- /dev/null
+++ b/code/datums/personality/reaction_to_food.dm
@@ -0,0 +1,29 @@
+/datum/personality/ascetic
+ savefile_key = "ascetic"
+ name = "Ascetic"
+ desc = "I don't care much for luxurious foods - It's all fuel for the body."
+ pos_gameplay_desc = "Sorrow from eating disliked food is reduced"
+ neg_gameplay_desc = "Enjoyment from eating liked food is limited"
+ groups = list(PERSONALITY_GROUP_FOOD)
+
+/datum/personality/gourmand
+ savefile_key = "gourmand"
+ name = "Gourmand"
+ desc = "Food means everything to me!"
+ pos_gameplay_desc = "Enjoyment from eating liked food is strengthened"
+ neg_gameplay_desc = "Sadness from eating food you dislike is increased, and mediocre food is less enjoyable"
+ groups = list(PERSONALITY_GROUP_FOOD)
+
+/datum/personality/teetotal
+ savefile_key = "teetotal"
+ name = "Teetotaler"
+ desc = "Alcohol isn't for me."
+ neg_gameplay_desc = "Dislikes drinking alcohol"
+ groups = list(PERSONALITY_GROUP_ALCOHOL)
+
+/datum/personality/bibulous
+ savefile_key = "bibulous"
+ name = "Bibulous"
+ desc = "I'll always go for another round of drinks!"
+ pos_gameplay_desc = "Fulfillment from drinking lasts longer, even after you are no longer drunk"
+ groups = list(PERSONALITY_GROUP_ALCOHOL)
diff --git a/code/datums/personality/reaction_to_groups.dm b/code/datums/personality/reaction_to_groups.dm
new file mode 100644
index 000000000000..825ce6ca14df
--- /dev/null
+++ b/code/datums/personality/reaction_to_groups.dm
@@ -0,0 +1,56 @@
+/datum/personality/introvert
+ savefile_key = "introvert"
+ name = "Introverted"
+ desc = "I prefer to be alone, reading or painting in the library."
+ pos_gameplay_desc = "Likes being in the library"
+ // neg_gameplay_desc = "Dislikes large groups"
+ personality_trait = TRAIT_INTROVERT
+ groups = list(PERSONALITY_GROUP_INTERACTION)
+
+/datum/personality/extrovert
+ savefile_key = "extrovert"
+ name = "Extroverted"
+ desc = "I prefer to be surrounded by people, having a drink at the Bar."
+ pos_gameplay_desc = "Likes being in the bar"
+ // neg_gameplay_desc = "Dislikes being alone"
+ personality_trait = TRAIT_EXTROVERT
+ groups = list(PERSONALITY_GROUP_INTERACTION, PERSONALITY_GROUP_OTHERS)
+
+/datum/personality/paranoid
+ savefile_key = "paranoid"
+ name = "Paranoid"
+ desc = "Everyone and everything is out to get me! This place is a deathtrap!"
+ pos_gameplay_desc = "Likes being alone or in moderately-sized groups"
+ neg_gameplay_desc = "Stressed when with one other person, or in large groups"
+ processes = TRUE
+ groups = list(PERSONALITY_GROUP_PEOPLE_FEAR)
+
+/datum/personality/paranoid/remove_from_mob(mob/living/who)
+ . = ..()
+ who.clear_mood_event("paranoia_personality")
+
+/datum/personality/paranoid/on_tick(mob/living/subject, seconds_per_tick)
+ var/list/nearby_people = list()
+ for(var/mob/living/carbon/human/nearby in view(subject, 5))
+ if(nearby == subject || !is_dangerous_mob(subject, nearby))
+ continue
+ nearby_people += nearby
+
+ switch(length(nearby_people))
+ if(0)
+ subject.add_mood_event("paranoia_personality", /datum/mood_event/paranoid/alone)
+ if(1)
+ subject.add_mood_event("paranoia_personality", /datum/mood_event/paranoid/one_on_one)
+ if(2 to 6) // 6 people is roughly the size of the larger jobs like meddoc or secoff
+ subject.add_mood_event("paranoia_personality", /datum/mood_event/paranoid/small_group)
+ else
+ subject.add_mood_event("paranoia_personality", /datum/mood_event/paranoid/large_group)
+
+/datum/personality/paranoid/proc/is_dangerous_mob(mob/living/subject, mob/living/carbon/human/target)
+ if(target.stat >= UNCONSCIOUS)
+ return FALSE
+ if(target.invisibility > subject.see_invisible || target.alpha < 20)
+ return FALSE
+ // things that are threatening: other players
+ // things that are also threatening: monkeys
+ return TRUE
diff --git a/code/datums/personality/reaction_to_job.dm b/code/datums/personality/reaction_to_job.dm
new file mode 100644
index 000000000000..3ebc5f75631f
--- /dev/null
+++ b/code/datums/personality/reaction_to_job.dm
@@ -0,0 +1,45 @@
+/datum/personality/department
+ groups = list(PERSONALITY_GROUP_DEPARTMENT)
+ /// List of areas this personality applies to
+ var/list/applicable_areas
+
+/datum/personality/department/apply_to_mob(mob/living/who)
+ . = ..()
+ RegisterSignals(who, list(COMSIG_MOB_MIND_TRANSFERRED_INTO, COMSIG_MOB_MIND_SET_ROLE), PROC_REF(update_effect))
+ // Unfortunate side effect here in that IC job changes, IE HoP are missed
+ who.apply_status_effect(/datum/status_effect/moodlet_in_area, /datum/mood_event/enjoying_department_area, applicable_areas & who.mind?.get_work_areas())
+
+/datum/personality/department/remove_from_mob(mob/living/who)
+ . = ..()
+ UnregisterSignal(who, list(COMSIG_MOB_MIND_TRANSFERRED_INTO, COMSIG_MOB_MIND_SET_ROLE))
+ who.remove_status_effect(/datum/status_effect/moodlet_in_area, /datum/mood_event/enjoying_department_area)
+
+/// Signal handler to update our status effect when our job changes
+/datum/personality/department/proc/update_effect(mob/living/source, ...)
+ SIGNAL_HANDLER
+
+ source.remove_status_effect(/datum/status_effect/moodlet_in_area, /datum/mood_event/enjoying_department_area)
+ source.apply_status_effect(/datum/status_effect/moodlet_in_area, /datum/mood_event/enjoying_department_area, applicable_areas & source.mind.get_work_areas())
+
+/datum/personality/department/analytical
+ savefile_key = "analytical"
+ name = "Analytical"
+ desc = "When it comes to making decisions, I tend to be more impersonal."
+ neut_gameplay_desc = "Prefers working in systemic environments like engineering, research, or medical"
+ applicable_areas = list(
+ /datum/job_department/engineering::primary_work_area,
+ /datum/job_department/science::primary_work_area,
+ /datum/job_department/medical::primary_work_area,
+ )
+
+/datum/personality/department/impulsive
+ savefile_key = "impulsive"
+ name = "Impulsive"
+ desc = "I'm better making stuff up as I go along."
+ neut_gameplay_desc = "Prefers working in social environments like cargo, command, security, or service"
+ applicable_areas = list(
+ /datum/job_department/cargo::primary_work_area,
+ /datum/job_department/command::primary_work_area,
+ /datum/job_department/security::primary_work_area,
+ /datum/job_department/service::primary_work_area,
+ )
diff --git a/code/datums/personality/reaction_to_nt.dm b/code/datums/personality/reaction_to_nt.dm
new file mode 100644
index 000000000000..b5c2d6fff320
--- /dev/null
+++ b/code/datums/personality/reaction_to_nt.dm
@@ -0,0 +1,38 @@
+/datum/personality/nt
+ groups = list(PERSONALITY_GROUP_NT)
+ processes = TRUE
+ /// What mood event to apply when seeing NT propaganda
+ var/mood_event_type
+
+/datum/personality/nt/proc/can_see_nt_propaganda(mob/living/subject)
+ for(var/obj/structure/sign/nearby in view(subject, 5))
+ if(istype(nearby, /obj/structure/sign/nanotrasen))
+ return TRUE
+ if(istype(nearby, /obj/structure/sign/poster/official/nanotrasen_logo))
+ return TRUE
+
+ return FALSE
+
+/datum/personality/nt/on_tick(mob/living/subject, seconds_per_tick)
+ if(can_see_nt_propaganda(subject))
+ subject.add_mood_event("nt_personality", mood_event_type)
+ else
+ subject.clear_mood_event("nt_personality")
+
+/datum/personality/nt/remove_from_mob(mob/living/who)
+ . = ..()
+ who.clear_mood_event("nt_personality")
+
+/datum/personality/nt/loyalist
+ savefile_key = "loyalist"
+ name = "Loyal"
+ desc = "I believe in the station and in Central Command, till the very end!"
+ pos_gameplay_desc = "Likes company posters and signs"
+ mood_event_type = /datum/mood_event/nt_loyalist
+
+/datum/personality/nt/disillusioned
+ savefile_key = "disillusioned"
+ name = "Disillusioned"
+ desc = "Nanotrasen isn't what it used to be. This isn't what I signed up for."
+ neg_gameplay_desc = "Dislikes company posters and signs"
+ mood_event_type = /datum/mood_event/nt_disillusioned
diff --git a/code/datums/personality/reaction_to_others.dm b/code/datums/personality/reaction_to_others.dm
new file mode 100644
index 000000000000..2f7506f9315f
--- /dev/null
+++ b/code/datums/personality/reaction_to_others.dm
@@ -0,0 +1,66 @@
+/datum/personality/callous
+ savefile_key = "callous"
+ name = "Callous"
+ desc = "I don't care much about what happens to other people."
+ pos_gameplay_desc = "Does not mind seeing death"
+ neg_gameplay_desc = "Prefers not to help people"
+ groups = list(PERSONALITY_GROUP_DEATH)
+
+/datum/personality/compassionate
+ savefile_key = "compassionate"
+ name = "Compassionate"
+ desc = "I like giving a hand to those in need."
+ pos_gameplay_desc = "Likes helping people"
+ neg_gameplay_desc = "Seeing death affects your mood more"
+ groups = list(PERSONALITY_GROUP_DEATH, PERSONALITY_GROUP_MISANTHROPY)
+
+/datum/personality/empathetic
+ savefile_key = "empathetic"
+ name = "Empathetic" // according to google "empathic" means you understand other people, while "empathetic" means you feel what they feel
+ desc = "Other people's feelings are important to me."
+ pos_gameplay_desc = "Likes seeing other people happy"
+ neg_gameplay_desc = "Dislikes seeing other people sad"
+ groups = list(PERSONALITY_GROUP_OTHERS)
+
+/datum/personality/misanthropic
+ savefile_key = "misanthropic"
+ name = "Misanthropic"
+ desc = "We should have never entered the stars."
+ pos_gameplay_desc = "Likes seeing other people sad"
+ neg_gameplay_desc = "Dislikes seeing other people happy"
+ groups = list(PERSONALITY_GROUP_OTHERS, PERSONALITY_GROUP_MISANTHROPY)
+
+/datum/personality/aloof
+ savefile_key = "aloof"
+ name = "Aloof"
+ desc = "Why is everyone so touchy? I'd rather be left alone."
+ neg_gameplay_desc = "Dislikes being grabbed, touched, or hugged"
+ personality_trait = TRAIT_BADTOUCH
+
+/datum/personality/aloof/apply_to_mob(mob/living/who)
+ . = ..()
+ RegisterSignals(who, list(COMSIG_LIVING_GET_PULLED, COMSIG_CARBON_HELP_ACT), PROC_REF(uncomfortable_touch))
+
+/datum/personality/aloof/remove_from_mob(mob/living/who)
+ . = ..()
+ UnregisterSignal(who, list(COMSIG_LIVING_GET_PULLED, COMSIG_CARBON_HELP_ACT))
+
+/// Causes a negative moodlet to our quirk holder on signal
+/datum/personality/aloof/proc/uncomfortable_touch(mob/living/source)
+ SIGNAL_HANDLER
+
+ if(source.stat == DEAD)
+ return
+
+ new /obj/effect/temp_visual/annoyed(source.loc)
+ if(source.mob_mood.sanity <= SANITY_NEUTRAL)
+ source.add_mood_event("bad_touch", /datum/mood_event/very_bad_touch)
+ else
+ source.add_mood_event("bad_touch", /datum/mood_event/bad_touch)
+
+/datum/personality/aromantic
+ savefile_key = "aromantic"
+ name = "Aromantic"
+ desc = "Romance has no place on the station."
+ neg_gameplay_desc = "Dislikes kisses and hugs"
+ personality_trait = TRAIT_BADTOUCH
diff --git a/code/datums/personality/reaction_to_recreation.dm b/code/datums/personality/reaction_to_recreation.dm
new file mode 100644
index 000000000000..49bd1be3db3d
--- /dev/null
+++ b/code/datums/personality/reaction_to_recreation.dm
@@ -0,0 +1,109 @@
+/datum/personality/gambler
+ savefile_key = "gambler"
+ name = "Gambler"
+ desc = "Throwing the dice is always worth it!"
+ pos_gameplay_desc = "Likes gambling and card games, and content with losing when gambling"
+
+/datum/personality/slacking
+ /// Areas which are considered "slacking off"
+ var/list/slacker_areas = list(
+ /area/station/commons/fitness,
+ /area/station/commons/lounge,
+ /area/station/service/bar,
+ /area/station/service/cafeteria,
+ /area/station/service/library,
+ /area/station/service/minibar,
+ /area/station/service/theater,
+ )
+ /// Mood event applied when in a slacking area
+ var/mood_event_type
+
+/datum/personality/slacking/apply_to_mob(mob/living/who)
+ . = ..()
+ who.apply_status_effect(/datum/status_effect/moodlet_in_area, mood_event_type, slacker_areas, CALLBACK(src, PROC_REF(is_slacking)))
+
+/datum/personality/slacking/remove_from_mob(mob/living/who)
+ . = ..()
+ who.remove_status_effect(/datum/status_effect/moodlet_in_area, mood_event_type)
+
+/// Callback for the moodlet_in_area status effect to determine if we're slacking off
+/datum/personality/slacking/proc/is_slacking(mob/living/who, area/new_area)
+ if(!istype(new_area, /area/station/service))
+ return TRUE
+ // Service workers don't slack in service
+ if(who.mind?.assigned_role.departments_bitflags & DEPARTMENT_BITFLAG_SERVICE)
+ return FALSE
+
+ return TRUE
+
+/datum/personality/slacking/lazy
+ savefile_key = "lazy"
+ name = "Lazy"
+ desc = "I don't really feel like working today."
+ pos_gameplay_desc = "Happy in the bar or recreation areas"
+ mood_event_type = /datum/mood_event/slacking_off_lazy
+ groups = list(PERSONALITY_GROUP_RECREATION, PERSONALITY_GROUP_WORK, PERSONALITY_GROUP_ATHLETICS)
+
+/datum/personality/slacking/diligent
+ savefile_key = "diligent"
+ name = "Diligent"
+ desc = "Things need to get done around here!"
+ pos_gameplay_desc = "Happy when in their department"
+ neg_gameplay_desc = "Unhappy when slacking off in the bar or recreation areas"
+ mood_event_type = /datum/mood_event/slacking_off_diligent
+ groups = list(PERSONALITY_GROUP_RECREATION)
+
+/datum/personality/slacking/diligent/apply_to_mob(mob/living/who)
+ . = ..()
+ RegisterSignals(who, list(COMSIG_MOB_MIND_TRANSFERRED_INTO, COMSIG_MOB_MIND_SET_ROLE), PROC_REF(update_effect))
+ // Unfortunate side effect here in that IC job changes, IE HoP are missed
+ who.apply_status_effect(/datum/status_effect/moodlet_in_area, /datum/mood_event/working_diligent, who.mind?.get_work_areas())
+
+/datum/personality/slacking/diligent/remove_from_mob(mob/living/who)
+ . = ..()
+ UnregisterSignal(who, list(COMSIG_MOB_MIND_TRANSFERRED_INTO, COMSIG_MOB_MIND_SET_ROLE))
+ who.remove_status_effect(/datum/status_effect/moodlet_in_area, /datum/mood_event/working_diligent)
+
+/// Signal handler to update our status effect when our job changes
+/datum/personality/slacking/diligent/proc/update_effect(mob/living/source, ...)
+ SIGNAL_HANDLER
+
+ source.remove_status_effect(/datum/status_effect/moodlet_in_area, /datum/mood_event/working_diligent)
+ source.apply_status_effect(/datum/status_effect/moodlet_in_area, /datum/mood_event/working_diligent, source.mind.get_work_areas())
+
+/datum/personality/industrious
+ savefile_key = "industrious"
+ name = "Industrious"
+ desc = "Everyone needs to be working - otherwise we're all wasting our time."
+ neg_gameplay_desc = "Dislikes playing games"
+ groups = list(PERSONALITY_GROUP_WORK)
+
+/datum/personality/athletic
+ savefile_key = "athletic"
+ name = "Athletic"
+ desc = "Can't just sit around all day! Have to keep moving."
+ pos_gameplay_desc = "Likes exercising"
+ neg_gameplay_desc = "Dislikes being lazy"
+ groups = list(PERSONALITY_GROUP_ATHLETICS)
+
+/datum/personality/erudite
+ savefile_key = "erudite"
+ name = "Erudite"
+ desc = "Knowledge is power. Especially this deep in space."
+ pos_gameplay_desc = "Likes reading books"
+ groups = list(PERSONALITY_GROUP_READING)
+
+/datum/personality/uneducated
+ savefile_key = "uneducated"
+ name = "Uneducated"
+ desc = "I don't care much for books - I already know everything I need to know."
+ neg_gameplay_desc = "Dislikes reading books"
+ groups = list(PERSONALITY_GROUP_READING)
+
+/datum/personality/spiritual
+ savefile_key = "spiritual"
+ name = "Spiritual"
+ desc = "I believe in a higher power."
+ pos_gameplay_desc = "Likes the Chapel and the Chaplain, and has special prayers"
+ neg_gameplay_desc = "Dislikes unholy things"
+ personality_trait = TRAIT_SPIRITUAL
diff --git a/code/datums/pod_style.dm b/code/datums/pod_style.dm
index 8888048980cd..77fc2a4d1509 100644
--- a/code/datums/pod_style.dm
+++ b/code/datums/pod_style.dm
@@ -33,7 +33,7 @@
/datum/pod_style/centcom
name = "\improper CentCom supply pod"
ui_name = "Nanotrasen"
- desc = "A Nanotrasen supply pod, this one has been marked with Central Command's designations. Teleports back to CentCom after delivery."
+ desc = "A Nanotrasen supply pod. This one has been marked with Central Command's designations. Teleports back to CentCom after delivery."
decal_icon = "centcom"
glow_color = "blue"
id = "centcom"
diff --git a/code/datums/proximity_monitor/fields/gravity.dm b/code/datums/proximity_monitor/fields/gravity.dm
index b89f2a6085cc..f79ac17b95aa 100644
--- a/code/datums/proximity_monitor/fields/gravity.dm
+++ b/code/datums/proximity_monitor/fields/gravity.dm
@@ -95,7 +95,7 @@
if(-INFINITY to -1)
particle_type = /particles/grav_field_up
if (particle_type)
- add_shared_particles(/particles/grav_field_down/strong)
+ add_shared_particles(particle_type)
color = particle_type::color
RegisterSignal(src, COMSIG_ATOM_SMOOTHED_ICON, PROC_REF(smoothed))
diff --git a/code/datums/proximity_monitor/fields/heretic_arena.dm b/code/datums/proximity_monitor/fields/heretic_arena.dm
index fc89fe824d14..432a9dfbd7bb 100644
--- a/code/datums/proximity_monitor/fields/heretic_arena.dm
+++ b/code/datums/proximity_monitor/fields/heretic_arena.dm
@@ -63,7 +63,8 @@ GLOBAL_LIST_EMPTY(heretic_arenas)
var/obj/item/melee/sickly_blade/training/new_blade = new(get_turf(human_in_range))
welfare_blades += new_blade
INVOKE_ASYNC(human_in_range, TYPE_PROC_REF(/mob, put_in_hands), new_blade)
- human_in_range.mind?.add_antag_datum(/datum/antagonist/heretic_arena_participant)
+ to_chat(human_in_range, span_boldbig("Escape is impossible. The only way out is to defeat another participant in this battle to the death."))
+ human_in_range.balloon_alert(human_in_range, "start killing!")
human_in_range.apply_status_effect(/datum/status_effect/arena_tracker)
RegisterSignal(human_in_range, COMSIG_CAN_Z_MOVE, PROC_REF(on_try_z_move))
RegisterSignal(human_in_range, COMSIG_LADDER_TRAVEL, PROC_REF(on_try_ladder))
@@ -75,8 +76,8 @@ GLOBAL_LIST_EMPTY(heretic_arenas)
mob.remove_traits(given_immunities, HERETIC_ARENA_TRAIT)
mob.remove_status_effect(/datum/status_effect/arena_tracker)
UnregisterSignal(mob, list(COMSIG_CAN_Z_MOVE, COMSIG_LADDER_TRAVEL, COMSIG_MOVABLE_PRE_MOVE, COMSIG_MOVABLE_POST_TELEPORT))
- if(mob.mind?.has_antag_datum(/datum/antagonist/heretic_arena_participant))
- mob.mind.remove_antag_datum(/datum/antagonist/heretic_arena_participant)
+ to_chat(mob, span_boldbig("Your bloodlust is sated."))
+ mob.balloon_alert(mob, "escape the arena!")
for(var/turf/to_restore in border_walls)
to_restore.ChangeTurf(border_walls[to_restore])
for(var/obj/to_refund as anything in welfare_blades)
@@ -161,8 +162,8 @@ GLOBAL_LIST_EMPTY(heretic_arenas)
// The mansus celebrates your efforts
if(IS_HERETIC(owner))
owner.heal_overall_damage(60, 60, 60)
- owner.adjustToxLoss(-60, forced = TRUE) // Slime heretics everywhere...
- owner.adjustOxyLoss(-60)
+ owner.adjust_tox_loss(-60, forced = TRUE) // Slime heretics everywhere...
+ owner.adjust_oxy_loss(-60)
if(iscarbon(owner))
var/mob/living/carbon/carbon_owner = owner
for(var/datum/wound/wound as anything in carbon_owner.all_wounds)
diff --git a/code/datums/quirks/_quirk.dm b/code/datums/quirks/_quirk.dm
index dc36c5ba0ce6..b26482ada7ba 100644
--- a/code/datums/quirks/_quirk.dm
+++ b/code/datums/quirks/_quirk.dm
@@ -80,7 +80,7 @@
CRASH("Attempted to add quirk to a holder when it already has a holder.")
quirk_holder = new_holder
- quirk_holder.quirks += src
+ LAZYADD(quirk_holder.quirks, src)
// If we weren't passed a client source try to use a present one
client_source ||= quirk_holder.client
@@ -121,7 +121,7 @@
if(process_update_signals)
UnregisterSignal(quirk_holder, process_update_signals)
- quirk_holder.quirks -= src
+ LAZYREMOVE(quirk_holder.quirks, src)
if(!quirk_transfer && lose_text)
to_chat(quirk_holder, lose_text)
@@ -278,7 +278,7 @@
return medical ? dat.Join(" ") : dat.Join(", ")
/mob/living/proc/cleanse_quirk_datums() //removes all trait datums
- QDEL_LIST(quirks)
+ QDEL_LAZYLIST(quirks)
/mob/living/proc/transfer_quirk_datums(mob/living/to_mob)
// We could be done before the client was moved or after the client was moved
diff --git a/code/datums/quirks/negative_quirks/addict.dm b/code/datums/quirks/negative_quirks/addict.dm
index 2136e3192449..b1a51f689fda 100644
--- a/code/datums/quirks/negative_quirks/addict.dm
+++ b/code/datums/quirks/negative_quirks/addict.dm
@@ -16,7 +16,7 @@
var/process_interval = 30 SECONDS //! how frequently the quirk processes
COOLDOWN_DECLARE(next_process) //! ticker for processing
-/datum/quirk/item_quirk/addict/add_unique(client/client_source)
+/datum/quirk/item_quirk/addict/add(client/client_source)
var/mob/living/carbon/human/human_holder = quirk_holder
if(!reagent_type)
@@ -27,6 +27,7 @@
for(var/addiction in reagent_instance.addiction_types)
human_holder.last_mind?.add_addiction_points(addiction, 1000)
+/datum/quirk/item_quirk/addict/add_unique(client/client_source)
var/current_turf = get_turf(quirk_holder)
if(!drug_container_type)
diff --git a/code/datums/quirks/negative_quirks/allergic.dm b/code/datums/quirks/negative_quirks/allergic.dm
index 25621f7970e1..394a0a584f6e 100644
--- a/code/datums/quirks/negative_quirks/allergic.dm
+++ b/code/datums/quirks/negative_quirks/allergic.dm
@@ -26,7 +26,7 @@
)
var/allergy_string
-/datum/quirk/item_quirk/allergic/add_unique(client/client_source)
+/datum/quirk/item_quirk/allergic/add(client/client_source)
var/list/chem_list = subtypesof(/datum/reagent/medicine) - blacklist
var/list/allergy_chem_names = list()
for(var/i in 0 to 5)
@@ -37,34 +37,33 @@
allergy_string = allergy_chem_names.Join(", ")
name = "Extreme [allergy_string] Allergies"
medical_record_text = "Patient's immune system responds violently to [allergy_string]"
+ RegisterSignal(quirk_holder, COMSIG_MOB_REAGENT_TICK, PROC_REF(block_metab))
+/datum/quirk/item_quirk/allergic/add_unique(client/client_source)
var/mob/living/carbon/human/human_holder = quirk_holder
var/obj/item/clothing/accessory/dogtag/allergy/dogtag = new(get_turf(human_holder), allergy_string)
give_item_to_holder(dogtag, list(LOCATION_BACKPACK, LOCATION_HANDS), flavour_text = "Make sure medical staff can see this...", notify_player = TRUE)
+/datum/quirk/item_quirk/allergic/remove()
+ UnregisterSignal(quirk_holder, COMSIG_MOB_REAGENT_TICK)
+
/datum/quirk/item_quirk/allergic/post_add()
quirk_holder.add_mob_memory(/datum/memory/key/quirk_allergy, allergy_string = allergy_string)
to_chat(quirk_holder, span_boldnotice("You are allergic to [allergy_string], make sure not to consume any of these!"))
-/datum/quirk/item_quirk/allergic/process(seconds_per_tick)
- var/mob/living/carbon/carbon_quirk_holder = quirk_holder
- //Just halts the progression, I'd suggest you run to medbay asap to get it fixed
- if(carbon_quirk_holder.reagents.has_reagent(/datum/reagent/medicine/epinephrine))
- for(var/allergy in allergies)
- var/datum/reagent/instantiated_med = carbon_quirk_holder.reagents.has_reagent(allergy)
- if(!instantiated_med)
- continue
- instantiated_med.reagent_removal_skip_list |= ALLERGIC_REMOVAL_SKIP
- return //block damage so long as epinephrine exists
+/datum/quirk/item_quirk/allergic/proc/block_metab(mob/living/carbon/source, datum/reagent/chem, seconds_per_tick, times_fired)
+ SIGNAL_HANDLER
- for(var/allergy in allergies)
- var/datum/reagent/instantiated_med = carbon_quirk_holder.reagents.has_reagent(allergy)
- if(!instantiated_med)
- continue
- instantiated_med.reagent_removal_skip_list -= ALLERGIC_REMOVAL_SKIP
- carbon_quirk_holder.adjustToxLoss(3 * seconds_per_tick)
- carbon_quirk_holder.reagents.add_reagent(/datum/reagent/toxin/histamine, 3 * seconds_per_tick)
- if(SPT_PROB(10, seconds_per_tick))
- carbon_quirk_holder.vomit(VOMIT_CATEGORY_DEFAULT)
- carbon_quirk_holder.adjustOrganLoss(pick(ORGAN_SLOT_BRAIN,ORGAN_SLOT_APPENDIX,ORGAN_SLOT_LUNGS,ORGAN_SLOT_HEART,ORGAN_SLOT_LIVER,ORGAN_SLOT_STOMACH),10)
+ if(!is_type_in_list(chem, allergies))
+ return NONE
+ // Having epinephrine stops metabolization of an allergen, but doesn't remove it from the system
+ if(source.reagents.has_reagent(/datum/reagent/medicine/epinephrine))
+ return COMSIG_MOB_STOP_REAGENT_METABOLISM
+ // Otherwise the allergen causes a ton of damage though otherwise processes normally
+ source.apply_damage(3 * seconds_per_tick, TOX)
+ source.reagents.add_reagent(/datum/reagent/toxin/histamine, 3 * seconds_per_tick)
+ if(SPT_PROB(10, seconds_per_tick))
+ source.vomit(VOMIT_CATEGORY_DEFAULT)
+ source.adjust_organ_loss(pick(ORGAN_SLOT_BRAIN, ORGAN_SLOT_APPENDIX, ORGAN_SLOT_LUNGS, ORGAN_SLOT_HEART, ORGAN_SLOT_LIVER, ORGAN_SLOT_STOMACH), 10)
+ return NONE
diff --git a/code/datums/quirks/negative_quirks/asthma.dm b/code/datums/quirks/negative_quirks/asthma.dm
index 6683869a6467..08ae561dc6d4 100644
--- a/code/datums/quirks/negative_quirks/asthma.dm
+++ b/code/datums/quirks/negative_quirks/asthma.dm
@@ -60,18 +60,19 @@
/datum/disease/asthma_attack/critical = 1, // this can quickly kill you, so its rarity is justified
)
-/datum/quirk/item_quirk/asthma/add_unique(client/client_source)
- . = ..()
-
- var/obj/item/inhaler/albuterol/asthma/rescue_inhaler = new(get_turf(quirk_holder))
- give_item_to_holder(rescue_inhaler, list(LOCATION_BACKPACK, LOCATION_HANDS), flavour_text = "You can use this to quickly relieve the symptoms of your asthma.")
-
+/datum/quirk/item_quirk/asthma/add(client/client_source)
RegisterSignal(quirk_holder, COMSIG_CARBON_EXPOSED_TO_SMOKE, PROC_REF(holder_exposed_to_smoke))
RegisterSignal(quirk_holder, COMSIG_CARBON_LOSE_ORGAN, PROC_REF(organ_removed))
RegisterSignal(quirk_holder, COMSIG_ATOM_EXPOSE_REAGENTS, PROC_REF(exposed_to_reagents))
RegisterSignal(quirk_holder, COMSIG_LIVING_POST_FULLY_HEAL, PROC_REF(on_full_heal))
RegisterSignal(quirk_holder, COMSIG_LIVING_LIFE, PROC_REF(on_life))
+/datum/quirk/item_quirk/asthma/add_unique(client/client_source)
+ . = ..()
+
+ var/obj/item/inhaler/albuterol/asthma/rescue_inhaler = new(get_turf(quirk_holder))
+ give_item_to_holder(rescue_inhaler, list(LOCATION_BACKPACK, LOCATION_HANDS), flavour_text = "You can use this to quickly relieve the symptoms of your asthma.")
+
COOLDOWN_START(src, next_attack_cooldown, time_first_attack_can_happen)
/datum/quirk/item_quirk/asthma/remove()
diff --git a/code/datums/quirks/negative_quirks/bad_touch.dm b/code/datums/quirks/negative_quirks/bad_touch.dm
deleted file mode 100644
index f3a5d967a019..000000000000
--- a/code/datums/quirks/negative_quirks/bad_touch.dm
+++ /dev/null
@@ -1,31 +0,0 @@
-/datum/quirk/bad_touch
- name = "Bad Touch"
- desc = "You don't like hugs. You'd really prefer if people just left you alone."
- icon = "tg-bad-touch"
- mob_trait = TRAIT_BADTOUCH
- value = -1
- gain_text = span_danger("You just want people to leave you alone.")
- lose_text = span_notice("You could use a big hug.")
- medical_record_text = "Patient has disdain for being touched. Potentially has undiagnosed haphephobia."
- quirk_flags = QUIRK_HUMAN_ONLY|QUIRK_MOODLET_BASED
- hardcore_value = 1
- mail_goodies = list(/obj/item/reagent_containers/spray/pepper) // show me on the doll where the bad man touched you
-
-/datum/quirk/bad_touch/add(client/client_source)
- RegisterSignals(quirk_holder, list(COMSIG_LIVING_GET_PULLED, COMSIG_CARBON_HELP_ACT), PROC_REF(uncomfortable_touch))
-
-/datum/quirk/bad_touch/remove()
- UnregisterSignal(quirk_holder, list(COMSIG_LIVING_GET_PULLED, COMSIG_CARBON_HELP_ACT))
-
-/// Causes a negative moodlet to our quirk holder on signal
-/datum/quirk/bad_touch/proc/uncomfortable_touch(datum/source)
- SIGNAL_HANDLER
-
- if(quirk_holder.stat == DEAD)
- return
-
- new /obj/effect/temp_visual/annoyed(quirk_holder.loc)
- if(quirk_holder.mob_mood.sanity <= SANITY_NEUTRAL)
- quirk_holder.add_mood_event("bad_touch", /datum/mood_event/very_bad_touch)
- else
- quirk_holder.add_mood_event("bad_touch", /datum/mood_event/bad_touch)
diff --git a/code/datums/quirks/negative_quirks/blindness.dm b/code/datums/quirks/negative_quirks/blindness.dm
index 8dafede1fe15..42517e053443 100644
--- a/code/datums/quirks/negative_quirks/blindness.dm
+++ b/code/datums/quirks/negative_quirks/blindness.dm
@@ -20,6 +20,11 @@
blindfold.colored_before = TRUE
give_item_to_holder(blindfold, list(LOCATION_EYES, LOCATION_HANDS))
+/datum/quirk/item_quirk/blindness/is_species_appropriate(datum/species/mob_species)
+ if(ispath(mob_species, /datum/species/dullahan))
+ return FALSE
+ return ..()
+
/datum/quirk/item_quirk/blindness/add(client/client_source)
quirk_holder.become_blind(QUIRK_TRAIT)
diff --git a/code/datums/quirks/negative_quirks/blood_deficiency.dm b/code/datums/quirks/negative_quirks/blood_deficiency.dm
index bacdcff80ea5..7dfd01131dd3 100644
--- a/code/datums/quirks/negative_quirks/blood_deficiency.dm
+++ b/code/datums/quirks/negative_quirks/blood_deficiency.dm
@@ -35,11 +35,11 @@
SIGNAL_HANDLER
var/mob/living/carbon/human/human_holder = quirk_holder
- if(human_holder.stat == DEAD || human_holder.blood_volume <= min_blood)
+
+ if(human_holder.stat == DEAD)
return
- if(!HAS_TRAIT(quirk_holder, TRAIT_NOBLOOD))
- human_holder.blood_volume = max(min_blood, human_holder.blood_volume - human_holder.dna.species.blood_deficiency_drain_rate * seconds_per_tick)
+ human_holder.adjust_blood_volume(-human_holder.dna.species.blood_deficiency_drain_rate * seconds_per_tick, minimum = min_blood)
/// Try to update the mail goodies to match the quirk holder's blood type. If we fail for whatever reason then it will just default to the initial O- blood pack that we start with.
/datum/quirk/blooddeficiency/proc/update_mail(mob/living/carbon/human/human_quirk_holder, datum/blood_type/new_blood_type, update_cached_blood_dna_info)
diff --git a/code/datums/quirks/negative_quirks/brain_problems.dm b/code/datums/quirks/negative_quirks/brain_problems.dm
index 8bafa07b9dd2..d9257a33c6b4 100644
--- a/code/datums/quirks/negative_quirks/brain_problems.dm
+++ b/code/datums/quirks/negative_quirks/brain_problems.dm
@@ -29,5 +29,10 @@
notify_player = TRUE,
)
+/datum/quirk/item_quirk/brainproblems/is_species_appropriate(datum/species/mob_species)
+ if(ispath(mob_species, /datum/species/dullahan))
+ return FALSE
+ return ..()
+
/datum/quirk/item_quirk/brainproblems/process(seconds_per_tick)
- quirk_holder.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.2 * seconds_per_tick)
+ quirk_holder.adjust_organ_loss(ORGAN_SLOT_BRAIN, 0.2 * seconds_per_tick)
diff --git a/code/datums/quirks/negative_quirks/erratic.dm b/code/datums/quirks/negative_quirks/erratic.dm
new file mode 100644
index 000000000000..e8b1f6b6384b
--- /dev/null
+++ b/code/datums/quirks/negative_quirks/erratic.dm
@@ -0,0 +1,60 @@
+/datum/quirk/erratic
+ name = "Erratic"
+ desc = "You mood swings like a pendulum, causing your personality to change on a whim every so often."
+ icon = FA_ICON_MASKS_THEATER
+ value = -3
+ gain_text = span_danger("You feel erratic.") // say that again?
+ lose_text = span_notice("You feel more stable.")
+ medical_record_text = "Patient has a bipolar personality disorder."
+ quirk_flags = QUIRK_HUMAN_ONLY|QUIRK_MOODLET_BASED|QUIRK_PROCESSES
+ hardcore_value = 3
+ mail_goodies = list(/obj/item/storage/pill_bottle/psicodine)
+ /// Cooldown between personality randomizations
+ COOLDOWN_DECLARE(randomize_cooldown)
+ /// Personalities before the quirk was applied
+ VAR_PRIVATE/list/base_personalities
+ /// Every other randomization, revert to base personality
+ var/random_index = 0
+
+/datum/quirk/erratic/add(client/client_source)
+ base_personalities = LAZYCOPY(quirk_holder.personalities)
+ COOLDOWN_START(src, randomize_cooldown, rand(5, 10) MINUTES)
+
+/datum/quirk/erratic/remove()
+ replace_personalities(base_personalities)
+ if(!QDELING(quirk_holder))
+ announce_personality_change()
+
+/datum/quirk/erratic/process(seconds_per_tick)
+ if(!COOLDOWN_FINISHED(src, randomize_cooldown))
+ return
+ if(HAS_TRAIT(quirk_holder, TRAIT_FEARLESS) || quirk_holder.stat >= UNCONSCIOUS)
+ return
+
+ COOLDOWN_START(src, randomize_cooldown, rand(6, 12) MINUTES)
+ randomize_personalities()
+
+/datum/quirk/erratic/proc/randomize_personalities()
+ random_index += 1
+ if(random_index % 2 == 0)
+ random_index = 0
+ replace_personalities(base_personalities)
+ to_chat(quirk_holder, span_notice("You feel... normal."))
+ announce_personality_change()
+ return
+
+ var/max = CONFIG_GET(number/max_personalities)
+ var/list/new_personality = prob(1) ? list() : SSpersonalities.select_random_personalities(max - 2, max + 1)
+ replace_personalities(new_personality)
+ to_chat(quirk_holder, span_notice("You feel... different."))
+ announce_personality_change()
+
+/datum/quirk/erratic/proc/replace_personalities(list/new_personalities)
+ quirk_holder.clear_personalities()
+ quirk_holder.add_personalities(new_personalities)
+
+/datum/quirk/erratic/proc/announce_personality_change()
+ var/list/new_personality = list()
+ for(var/datum/personality/personality_type as anything in quirk_holder.personalities)
+ new_personality += initial(personality_type.name)
+ to_chat(quirk_holder, span_green("Your personality is now: [english_list(new_personality)]."))
diff --git a/code/datums/quirks/negative_quirks/family_heirloom.dm b/code/datums/quirks/negative_quirks/family_heirloom.dm
index 8b3d826cb84f..98951368cab6 100644
--- a/code/datums/quirks/negative_quirks/family_heirloom.dm
+++ b/code/datums/quirks/negative_quirks/family_heirloom.dm
@@ -52,6 +52,7 @@
to_chat(quirk_holder, span_boldnotice("A wave of existential dread runs over you as you realize your precious family heirloom is missing. Perhaps the Gods will show mercy on your cursed soul?"))
return
family_heirloom.AddComponent(/datum/component/heirloom, quirk_holder.mind, family_name)
+ quirk_holder.add_mob_memory(/datum/memory/key/quirk_heirloom, protagonist = quirk_holder, heirloom_name = initial(family_heirloom.name))
return ..()
diff --git a/code/datums/quirks/negative_quirks/fluoride_stare.dm b/code/datums/quirks/negative_quirks/fluoride_stare.dm
index 97b9c75f3e97..c14efee30143 100644
--- a/code/datums/quirks/negative_quirks/fluoride_stare.dm
+++ b/code/datums/quirks/negative_quirks/fluoride_stare.dm
@@ -10,6 +10,11 @@
quirk_flags = QUIRK_HUMAN_ONLY
mail_goodies = list(/obj/item/reagent_containers/cup/bottle/salglu_solution, /obj/item/light/bulb)
+/datum/quirk/item_quirk/fluoride_stare/is_species_appropriate(datum/species/mob_species)
+ if(ispath(mob_species, /datum/species/dullahan))
+ return FALSE
+ return ..()
+
/datum/quirk/item_quirk/fluoride_stare/add_unique(client/client_source)
var/obj/item/reagent_containers/cup/bottle/salglu_solution/saline = new(get_turf(quirk_holder))
give_item_to_holder(saline, list(
diff --git a/code/datums/quirks/negative_quirks/food_allergy.dm b/code/datums/quirks/negative_quirks/food_allergy.dm
index ba2c17110326..1f8a6e9e829c 100644
--- a/code/datums/quirks/negative_quirks/food_allergy.dm
+++ b/code/datums/quirks/negative_quirks/food_allergy.dm
@@ -39,7 +39,7 @@ GLOBAL_LIST_INIT(possible_food_allergies, list(
if(target_foodtypes != NONE) // Got a preference, don't care
return
- target_foodtypes = pick(flatten_list(GLOB.possible_food_allergies))
+ target_foodtypes = pick(assoc_to_values(GLOB.possible_food_allergies))
/datum/quirk/item_quirk/food_allergic/add_unique(client/client_source)
var/what_are_we_actually_killed_by = english_list(bitfield_to_list(target_foodtypes, FOOD_FLAGS_IC)) // This should never be more than one thing but just in case we can support it
diff --git a/code/datums/quirks/negative_quirks/indebted.dm b/code/datums/quirks/negative_quirks/indebted.dm
index eac2cdf5192d..9d643654d311 100644
--- a/code/datums/quirks/negative_quirks/indebted.dm
+++ b/code/datums/quirks/negative_quirks/indebted.dm
@@ -15,7 +15,7 @@
var/debt = PAYCHECK_CREW * rand(275, 325)
account.account_debt += debt
RegisterSignal(account, COMSIG_BANK_ACCOUNT_DEBT_PAID, PROC_REF(on_debt_paid))
- to_chat(client_source.mob, span_warning("You remember, you've a hefty, [debt] credits debt to pay..."))
+ to_chat(client_source.mob, span_warning("You remember, you've a hefty, [debt] [MONEY_NAME_SINGULAR] debt to pay..."))
///Once the debt is extinguished, award an achievement and a pin for actually taking care of it.
/datum/quirk/indebted/proc/on_debt_paid(datum/bank_account/source)
diff --git a/code/datums/quirks/negative_quirks/monophobia.dm b/code/datums/quirks/negative_quirks/monophobia.dm
new file mode 100644
index 000000000000..5c0d732826c3
--- /dev/null
+++ b/code/datums/quirks/negative_quirks/monophobia.dm
@@ -0,0 +1,16 @@
+/datum/quirk/monophobia
+ name = "Monophobia"
+ desc = "You have an extreme fear of loneliness, and have always tried to stick to large groups."
+ icon = FA_ICON_PEOPLE_GROUP
+ value = -3
+ medical_record_text = "Patient has a severe fear of being left alone."
+ hardcore_value = 5
+ mail_goodies = list(/obj/effect/spawner/random/entertainment/plushie)
+
+/datum/quirk/monophobia/add(client/client_source)
+ var/mob/living/carbon/human/human_holder = quirk_holder
+ human_holder.gain_trauma(new /datum/brain_trauma/severe/monophobia(), TRAUMA_RESILIENCE_ABSOLUTE)
+
+/datum/quirk/monophobia/remove()
+ var/mob/living/carbon/human/human_holder = quirk_holder
+ human_holder.cure_trauma_type(/datum/brain_trauma/severe/monophobia, TRAUMA_RESILIENCE_ABSOLUTE)
diff --git a/code/datums/quirks/negative_quirks/narcolepsy.dm b/code/datums/quirks/negative_quirks/narcolepsy.dm
index 13643b48a8f4..2f1d01f59ee3 100644
--- a/code/datums/quirks/negative_quirks/narcolepsy.dm
+++ b/code/datums/quirks/negative_quirks/narcolepsy.dm
@@ -11,10 +11,11 @@
/obj/item/storage/pill_bottle/prescription_stimulant,
)
-/datum/quirk/item_quirk/narcolepsy/add_unique(client/client_source)
+/datum/quirk/item_quirk/narcolepsy/add(client/client_source)
var/mob/living/carbon/carbon_user = quirk_holder
carbon_user.gain_trauma(/datum/brain_trauma/severe/narcolepsy/permanent, TRAUMA_RESILIENCE_ABSOLUTE)
+/datum/quirk/item_quirk/narcolepsy/add_unique(client/client_source)
give_item_to_holder(
/obj/item/storage/pill_bottle/prescription_stimulant,
list(
diff --git a/code/datums/quirks/negative_quirks/nearsighted.dm b/code/datums/quirks/negative_quirks/nearsighted.dm
index a9e945861d72..3c0b8f78c53b 100644
--- a/code/datums/quirks/negative_quirks/nearsighted.dm
+++ b/code/datums/quirks/negative_quirks/nearsighted.dm
@@ -14,6 +14,11 @@
associated_typepath = /datum/quirk/item_quirk/nearsighted
customization_options = list(/datum/preference/choiced/glasses)
+/datum/quirk/item_quirk/nearsighted/is_species_appropriate(datum/species/mob_species)
+ if(ispath(mob_species, /datum/species/dullahan))
+ return FALSE
+ return ..()
+
/datum/quirk/item_quirk/nearsighted/add_unique(client/client_source)
var/glasses_name = client_source?.prefs.read_preference(/datum/preference/choiced/glasses) || "Regular"
var/obj/item/clothing/glasses/glasses_type
diff --git a/code/datums/quirks/negative_quirks/prosthetic_organ.dm b/code/datums/quirks/negative_quirks/prosthetic_organ.dm
index 7877e177b39f..dddba8a28e22 100644
--- a/code/datums/quirks/negative_quirks/prosthetic_organ.dm
+++ b/code/datums/quirks/negative_quirks/prosthetic_organ.dm
@@ -29,7 +29,7 @@
preferred_organ = GLOB.organ_choice[pick(GLOB.organ_choice)]
var/list/possible_organ_slots = organ_slots.Copy()
- if(HAS_TRAIT(human_holder, TRAIT_NOBLOOD))
+ if(!CAN_HAVE_BLOOD(human_holder))
possible_organ_slots -= ORGAN_SLOT_HEART
if(HAS_TRAIT(human_holder, TRAIT_NOBREATH))
possible_organ_slots -= ORGAN_SLOT_LUNGS
diff --git a/code/datums/quirks/negative_quirks/quadruple_amputee.dm b/code/datums/quirks/negative_quirks/quadruple_amputee.dm
index 716ec9ef2399..82bb0f8deb5e 100644
--- a/code/datums/quirks/negative_quirks/quadruple_amputee.dm
+++ b/code/datums/quirks/negative_quirks/quadruple_amputee.dm
@@ -17,12 +17,12 @@
/datum/quirk/quadruple_amputee/post_add()
to_chat(quirk_holder, span_bolddanger("All your limbs have been replaced with surplus prosthetics. They are fragile and will easily come apart under duress. \
- Additionally, you need to use a welding tool and cables to repair them, instead of bruise packs and ointment."))
+ Additionally, you need to use a welding tool and cables to repair them, instead of sutures and regenerative mesh."))
/datum/quirk/quadruple_amputee/remove()
if(QDELING(quirk_holder))
return
-
+
var/mob/living/carbon/human/human_holder = quirk_holder
human_holder.reset_to_original_bodypart(BODY_ZONE_L_ARM)
human_holder.reset_to_original_bodypart(BODY_ZONE_R_ARM)
diff --git a/code/datums/quirks/negative_quirks/tin_man.dm b/code/datums/quirks/negative_quirks/tin_man.dm
index a75cbbedd766..054a5eecf06d 100644
--- a/code/datums/quirks/negative_quirks/tin_man.dm
+++ b/code/datums/quirks/negative_quirks/tin_man.dm
@@ -17,7 +17,7 @@
ORGAN_SLOT_STOMACH = /obj/item/organ/stomach/cybernetic/surplus,
)
var/list/possible_organ_slots = organ_slots.Copy()
- if(HAS_TRAIT(human_holder, TRAIT_NOBLOOD))
+ if(!CAN_HAVE_BLOOD(human_holder))
possible_organ_slots -= ORGAN_SLOT_HEART
if(HAS_TRAIT(human_holder, TRAIT_NOBREATH))
possible_organ_slots -= ORGAN_SLOT_LUNGS
diff --git a/code/datums/quirks/neutral_quirks/extrovert.dm b/code/datums/quirks/neutral_quirks/extrovert.dm
deleted file mode 100644
index 5622956ba5b5..000000000000
--- a/code/datums/quirks/neutral_quirks/extrovert.dm
+++ /dev/null
@@ -1,10 +0,0 @@
-/datum/quirk/extrovert
- name = "Extrovert"
- desc = "You are energized by talking to others, and enjoy spending your free time in the bar."
- icon = FA_ICON_USERS
- value = 0
- mob_trait = TRAIT_EXTROVERT
- gain_text = span_notice("You feel like hanging out with other people.")
- lose_text = span_danger("You feel like you're over the bar scene.")
- medical_record_text = "Patient will not shut the hell up."
- mail_goodies = list(/obj/item/reagent_containers/cup/glass/flask)
diff --git a/code/datums/quirks/neutral_quirks/introvert.dm b/code/datums/quirks/neutral_quirks/introvert.dm
deleted file mode 100644
index 51f6f3e785e4..000000000000
--- a/code/datums/quirks/neutral_quirks/introvert.dm
+++ /dev/null
@@ -1,10 +0,0 @@
-/datum/quirk/introvert
- name = "Introvert"
- desc = "You are energized by having time to yourself, and enjoy spending your free time in the library."
- icon = FA_ICON_BOOK_READER
- value = 0
- mob_trait = TRAIT_INTROVERT
- gain_text = span_notice("You feel like reading a good book quietly.")
- lose_text = span_danger("You feel like libraries are boring.")
- medical_record_text = "Patient doesn't seem to say much."
- mail_goodies = list(/obj/item/book/random)
diff --git a/code/datums/quirks/neutral_quirks/snob.dm b/code/datums/quirks/neutral_quirks/snob.dm
deleted file mode 100644
index fa32cbd5f2aa..000000000000
--- a/code/datums/quirks/neutral_quirks/snob.dm
+++ /dev/null
@@ -1,10 +0,0 @@
-/datum/quirk/snob
- name = "Snob"
- desc = "You care about the finer things, if a room doesn't look nice it's just not really worth it, is it?"
- icon = FA_ICON_USER_TIE
- value = 0
- gain_text = span_notice("You feel like you understand what things should look like.")
- lose_text = span_notice("Well who cares about deco anyways?")
- medical_record_text = "Patient seems to be rather stuck up."
- mob_trait = TRAIT_SNOB
- mail_goodies = list(/obj/item/chisel, /obj/item/paint_palette)
diff --git a/code/datums/quirks/neutral_quirks/transhumanist.dm b/code/datums/quirks/neutral_quirks/transhumanist.dm
index cbd85150e767..82570e6cf21c 100644
--- a/code/datums/quirks/neutral_quirks/transhumanist.dm
+++ b/code/datums/quirks/neutral_quirks/transhumanist.dm
@@ -46,6 +46,31 @@
COMSIG_CARBON_GAIN_ORGAN,
COMSIG_CARBON_LOSE_ORGAN,
))
+ if(isnull(old_part))
+ quirk_holder.clear_mood_event(MOOD_CATEGORY_TRANSHUMANIST_BODYPART)
+ quirk_holder.clear_mood_event(MOOD_CATEGORY_TRANSHUMANIST_PEOPLE)
+ return
+
+ if(QDELETED(quirk_holder)) // We don't ever want to be adding organs to qdeleting mobs
+ QDEL_NULL(old_part)
+ return
+
+ var/mob/living/carbon/human/human_holder = quirk_holder
+ if(isbodypart(old_part))
+ var/obj/item/bodypart/old_bodypart = old_part
+ human_holder.del_and_replace_bodypart(old_bodypart, special = TRUE)
+ old_bodypart = null
+ else if(isorgan(old_part))
+ var/obj/item/organ/old_organ = old_part
+ old_part = human_holder.get_organ_slot(ORGAN_SLOT_TONGUE)
+ old_organ.Insert(quirk_holder, special = TRUE)
+ old_part.moveToNullspace()
+ STOP_PROCESSING(SSobj, old_part)
+ old_organ = null
+ old_part = null
+
+ quirk_holder.clear_mood_event(MOOD_CATEGORY_TRANSHUMANIST_BODYPART)
+ quirk_holder.clear_mood_event(MOOD_CATEGORY_TRANSHUMANIST_PEOPLE)
/datum/quirk/transhumanist/proc/get_bodypart_score(mob/living/carbon/target, limbs_only = FALSE)
var/organic_bodytypes = 0
@@ -66,7 +91,7 @@
else if(organ.organ_flags & ORGAN_ORGANIC)
organic_bodytypes += 0.02
- return list(
+ return alist(
BODYPART_SCORE_ORGANIC = organic_bodytypes,
BODYPART_SCORE_SILICON = silicon_bodytypes,
BODYPART_SCORE_OTHER_BODYTYPES = other_bodytypes,
@@ -76,7 +101,7 @@
/datum/quirk/transhumanist/proc/calculate_bodypart_score()
SIGNAL_HANDLER
- var/list/score = get_bodypart_score(quirk_holder)
+ var/alist/score = get_bodypart_score(quirk_holder)
var/organic_bodytypes = score[BODYPART_SCORE_ORGANIC]
var/silicon_bodytypes = score[BODYPART_SCORE_SILICON]
var/other_bodytypes = score[BODYPART_SCORE_OTHER_BODYTYPES]
@@ -142,29 +167,6 @@
else if (isorgan(old_part))
to_chat(quirk_holder, span_bolddanger("Your [slot_string] brings you one step closer to silicon perfection, but you feel you're not quite there yet."))
-/datum/quirk/transhumanist/remove()
- if(isnull(old_part))
- quirk_holder.clear_mood_event(MOOD_CATEGORY_TRANSHUMANIST_BODYPART)
- quirk_holder.clear_mood_event(MOOD_CATEGORY_TRANSHUMANIST_PEOPLE)
- return
-
- var/mob/living/carbon/human/human_holder = quirk_holder
- if(isbodypart(old_part))
- var/obj/item/bodypart/old_bodypart = old_part
- human_holder.del_and_replace_bodypart(old_bodypart, special = TRUE)
- old_bodypart = null
- else if(isorgan(old_part))
- var/obj/item/organ/old_organ = old_part
- old_part = human_holder.get_organ_slot(ORGAN_SLOT_TONGUE)
- old_organ.Insert(quirk_holder, special = TRUE)
- old_part.moveToNullspace()
- STOP_PROCESSING(SSobj, old_part)
- old_organ = null
- old_part = null
-
- quirk_holder.clear_mood_event(MOOD_CATEGORY_TRANSHUMANIST_BODYPART)
- quirk_holder.clear_mood_event(MOOD_CATEGORY_TRANSHUMANIST_PEOPLE)
-
/datum/quirk/transhumanist/process(seconds_per_tick)
var/organics_nearby = 0
var/silicons_nearby = 0
@@ -177,7 +179,7 @@
continue
if(iscarbon(target))
- var/list/score = get_bodypart_score(target, limbs_only = TRUE)
+ var/alist/score = get_bodypart_score(target, limbs_only = TRUE)
// For an average human, they'll need 2 augmented limbs to not get counted as an organic nor a silicon.
// If some monstrosity has 20-30 organic limbs, they'll likely need more.
if(score[BODYPART_SCORE_OVERALL] < 1)
diff --git a/code/datums/quirks/positive_quirks/apathetic.dm b/code/datums/quirks/positive_quirks/apathetic.dm
deleted file mode 100644
index 170cb6f5d448..000000000000
--- a/code/datums/quirks/positive_quirks/apathetic.dm
+++ /dev/null
@@ -1,14 +0,0 @@
-/datum/quirk/apathetic
- name = "Apathetic"
- desc = "You just don't care as much as other people. That's nice to have in a place like this, I guess."
- icon = FA_ICON_MEH
- value = 4
- quirk_flags = QUIRK_HUMAN_ONLY|QUIRK_MOODLET_BASED
- medical_record_text = "Patient was administered the Apathy Evaluation Scale but did not bother to complete it."
- mail_goodies = list(/obj/item/hourglass)
-
-/datum/quirk/apathetic/add(client/client_source)
- quirk_holder.mob_mood?.mood_modifier -= 0.2
-
-/datum/quirk/apathetic/remove()
- quirk_holder.mob_mood?.mood_modifier += 0.2
diff --git a/code/datums/quirks/positive_quirks/bilingual.dm b/code/datums/quirks/positive_quirks/bilingual.dm
index bfc6db677a41..991d5653741f 100644
--- a/code/datums/quirks/positive_quirks/bilingual.dm
+++ b/code/datums/quirks/positive_quirks/bilingual.dm
@@ -19,12 +19,12 @@
/datum/quirk/bilingual/add(client/client_source)
var/wanted_language = client_source?.prefs.read_preference(/datum/preference/choiced/language)
var/datum/language/language_type
- if(wanted_language == "Random")
- language_type = pick(GLOB.uncommon_roundstart_languages)
- else if(wanted_language)
+ // DARKPACK EDIT CHANGE START - LANGUAGES
+ if(wanted_language)
language_type = GLOB.language_types_by_name[wanted_language]
+ // DARKPACK EDIT CHANGE END
if(!language_type || quirk_holder.has_language(language_type))
- language_type = /datum/language/uncommon
+ language_type = /datum/language/spanish // DARKPACK EDIT CHANGE - LANGUAGES
if(quirk_holder.has_language(language_type))
to_chat(quirk_holder, span_boldnotice("You are already familiar with the quirk in your preferences, so you did not learn one."))
return
diff --git a/code/datums/quirks/positive_quirks/chipped.dm b/code/datums/quirks/positive_quirks/chipped.dm
index 484cf5ed3821..96bd668ecce0 100644
--- a/code/datums/quirks/positive_quirks/chipped.dm
+++ b/code/datums/quirks/positive_quirks/chipped.dm
@@ -3,19 +3,16 @@
desc = "You got caught up in the skillchip craze a few years back, and had one of the commercially available chips implanted into yourself."
icon = FA_ICON_MICROCHIP
value = 2
- gain_text = span_notice("The chip in your head itches a bit.")
- lose_text = span_danger("You don't feel so chipped anymore..")
- medical_record_text = "Patient explained how they got caught up in 'the skillchip chase' recently, and now the chip in their head itches every so often. Dumbass."
+ gain_text = span_notice("You suddenly feels chipped.")
+ lose_text = span_danger("You don't feel so chipped anymore.")
+ medical_record_text = "Patient explained how they got caught up in 'the skillchip chase' recently, and now they have some useless chip in their head. Dumbass."
mail_goodies = list(
/obj/item/skillchip/matrix_taunt,
/obj/item/skillchip/big_pointer,
/obj/item/skillchip/acrobatics,
- /obj/item/storage/pill_bottle/mannitol/braintumor,
)
/// Variable that holds the chip, used on removal.
var/obj/item/skillchip/installed_chip
- ///itchy status effect we give our owner
- var/datum/itchy_effect
/datum/quirk_constant_data/chipped
associated_typepath = /datum/quirk/chipped
@@ -27,8 +24,8 @@
if(isnull(chip_pref))
return ..()
installed_chip = GLOB.quirk_chipped_choice[chip_pref] || GLOB.quirk_chipped_choice[pick(GLOB.quirk_chipped_choice)]
- gain_text = span_notice("The [installed_chip::name] in your head itches a bit.")
- lose_text = span_notice("Your head stops itching so much.")
+ gain_text = span_notice("The [installed_chip::name] in your head buzzes with knowledge.")
+ lose_text = span_notice("You stop feeling the chip inside your head.")
return ..()
/datum/quirk/chipped/add_unique(client/client_source)
@@ -37,48 +34,9 @@
var/mob/living/carbon/quirk_holder_carbon = quirk_holder
installed_chip = new installed_chip()
-
- RegisterSignals(installed_chip, list(COMSIG_QDELETING, COMSIG_SKILLCHIP_REMOVED), PROC_REF(remove_effect))
- RegisterSignal(installed_chip, COMSIG_SKILLCHIP_IMPLANTED, PROC_REF(apply_effect))
-
quirk_holder_carbon.implant_skillchip(installed_chip, force = TRUE)
installed_chip.try_activate_skillchip(silent = FALSE, force = TRUE)
-/datum/quirk/chipped/proc/apply_effect(datum/source, obj/item/brain_applied)
- SIGNAL_HANDLER
- var/mob/living/carbon/quirk_holder_carbon = quirk_holder
- if(brain_applied == quirk_holder_carbon.get_organ_slot(ORGAN_SLOT_BRAIN))
- itchy_effect = quirk_holder.apply_status_effect(/datum/status_effect/itchy_skillchip_quirk)
-
-/datum/quirk/chipped/proc/remove_effect(datum/source, obj/item/brain_removed)
- SIGNAL_HANDLER
- var/mob/living/carbon/quirk_holder_carbon = quirk_holder
- if(QDELING(source) || brain_removed == quirk_holder_carbon.get_organ_slot(ORGAN_SLOT_BRAIN))
- quirk_holder.remove_status_effect(itchy_effect)
- itchy_effect = null
-
/datum/quirk/chipped/remove()
QDEL_NULL(installed_chip)
- if(itchy_effect)
- quirk_holder.remove_status_effect(itchy_effect)
- itchy_effect = null
return ..()
-
-/datum/status_effect/itchy_skillchip_quirk
- id = "itchy skillchip"
- tick_interval_lowerbound = 5 SECONDS
- tick_interval_upperbound = 10 MINUTES
- alert_type = null
- ///lower damage we apply to our itchy owner
- var/minimum_damage = 1
- ///upper damage we apply to our itchy owner
- var/maximum_damage = 5
-
-/datum/status_effect/itchy_skillchip_quirk/tick(seconds_between_ticks)
- var/mob/living/carbon/carbon_owner = owner
- var/obj/item/organ/brain/itchy_brain = carbon_owner.get_organ_slot(ORGAN_SLOT_BRAIN)
- if(isnull(itchy_brain))
- return
- itchy_brain.apply_organ_damage(rand(minimum_damage, maximum_damage), maximum = itchy_brain.maxHealth * 0.3)
- if(owner.stat == CONSCIOUS && !owner.incapacitated && owner.get_empty_held_indexes())
- to_chat(owner, span_warning("You scratch the itch in your head."))
diff --git a/code/datums/quirks/positive_quirks/clown_enjoyer.dm b/code/datums/quirks/positive_quirks/clown_enjoyer.dm
index 79dd6e0c6bfd..cccea9d074e3 100644
--- a/code/datums/quirks/positive_quirks/clown_enjoyer.dm
+++ b/code/datums/quirks/positive_quirks/clown_enjoyer.dm
@@ -25,7 +25,3 @@
/datum/quirk/item_quirk/clown_enjoyer/add_unique(client/client_source)
give_item_to_holder(/obj/item/clothing/accessory/clown_enjoyer_pin, list(LOCATION_BACKPACK, LOCATION_HANDS))
-
-/datum/quirk/item_quirk/clown_enjoyer/add(client/client_source)
- var/datum/atom_hud/fan = GLOB.huds[DATA_HUD_FAN]
- fan.show_to(quirk_holder)
diff --git a/code/datums/quirks/positive_quirks/drunk_healing.dm b/code/datums/quirks/positive_quirks/drunk_healing.dm
index e1c4ba911255..a0b5f47cfe8d 100644
--- a/code/datums/quirks/positive_quirks/drunk_healing.dm
+++ b/code/datums/quirks/positive_quirks/drunk_healing.dm
@@ -13,13 +13,13 @@
var/need_mob_update = FALSE
switch(quirk_holder.get_drunk_amount())
if (6 to 40)
- need_mob_update += quirk_holder.adjustBruteLoss(-0.1 * seconds_per_tick, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
- need_mob_update += quirk_holder.adjustFireLoss(-0.05 * seconds_per_tick, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
+ need_mob_update += quirk_holder.adjust_brute_loss(-0.1 * seconds_per_tick, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
+ need_mob_update += quirk_holder.adjust_fire_loss(-0.05 * seconds_per_tick, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
if (41 to 60)
- need_mob_update += quirk_holder.adjustBruteLoss(-0.4 * seconds_per_tick, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
- need_mob_update += quirk_holder.adjustFireLoss(-0.2 * seconds_per_tick, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
+ need_mob_update += quirk_holder.adjust_brute_loss(-0.4 * seconds_per_tick, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
+ need_mob_update += quirk_holder.adjust_fire_loss(-0.2 * seconds_per_tick, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
if (61 to INFINITY)
- need_mob_update += quirk_holder.adjustBruteLoss(-0.8 * seconds_per_tick, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
- need_mob_update += quirk_holder.adjustFireLoss(-0.4 * seconds_per_tick, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
+ need_mob_update += quirk_holder.adjust_brute_loss(-0.8 * seconds_per_tick, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
+ need_mob_update += quirk_holder.adjust_fire_loss(-0.4 * seconds_per_tick, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
if(need_mob_update)
quirk_holder.updatehealth()
diff --git a/code/datums/quirks/positive_quirks/empath.dm b/code/datums/quirks/positive_quirks/empath.dm
index f80ce3b5ef18..0cb5704ad4f2 100644
--- a/code/datums/quirks/positive_quirks/empath.dm
+++ b/code/datums/quirks/positive_quirks/empath.dm
@@ -3,8 +3,13 @@
desc = "Whether it's a sixth sense or careful study of body language, it only takes you a quick glance at someone to understand how they feel."
icon = FA_ICON_SMILE_BEAM
value = 8
- mob_trait = TRAIT_EMPATH
gain_text = span_notice("You feel in tune with those around you.")
lose_text = span_danger("You feel isolated from others.")
medical_record_text = "Patient is highly perceptive of and sensitive to social cues, or may possibly have ESP. Further testing needed."
mail_goodies = list(/obj/item/toy/foamfinger)
+
+/datum/quirk/empath/add(client/client_source)
+ quirk_holder.AddComponentFrom(REF(src), /datum/component/empathy)
+
+/datum/quirk/empath/remove(client/client_source)
+ quirk_holder.RemoveComponentSource(REF(src), /datum/component/empathy)
diff --git a/code/datums/quirks/positive_quirks/mime_fan.dm b/code/datums/quirks/positive_quirks/mime_fan.dm
index fea992202595..fb971d105790 100644
--- a/code/datums/quirks/positive_quirks/mime_fan.dm
+++ b/code/datums/quirks/positive_quirks/mime_fan.dm
@@ -23,7 +23,3 @@
/datum/quirk/item_quirk/mime_fan/add_unique(client/client_source)
give_item_to_holder(/obj/item/clothing/accessory/mime_fan_pin, list(LOCATION_BACKPACK, LOCATION_HANDS))
-
-/datum/quirk/item_quirk/mime_fan/add(client/client_source)
- var/datum/atom_hud/fan = GLOB.huds[DATA_HUD_FAN]
- fan.show_to(quirk_holder)
diff --git a/code/datums/quirks/positive_quirks/spiritual.dm b/code/datums/quirks/positive_quirks/spiritual.dm
deleted file mode 100644
index 56f760e98a93..000000000000
--- a/code/datums/quirks/positive_quirks/spiritual.dm
+++ /dev/null
@@ -1,20 +0,0 @@
-/datum/quirk/item_quirk/spiritual
- name = "Spiritual"
- desc = "You hold a spiritual belief, whether in God, nature or the arcane rules of the universe. You gain comfort from the presence of holy people, and believe that your prayers are more special than others. Being in the chapel makes you happy."
- icon = FA_ICON_BIBLE
- value = 4
- mob_trait = TRAIT_SPIRITUAL
- gain_text = span_notice("You have faith in a higher power.")
- lose_text = span_danger("You lose faith!")
- medical_record_text = "Patient reports a belief in a higher power."
- mail_goodies = list(
- /obj/item/book/bible/booze,
- /obj/item/reagent_containers/cup/glass/bottle/holywater,
- /obj/item/bedsheet/chaplain,
- /obj/item/toy/cards/deck/tarot,
- /obj/item/storage/fancy/candle_box,
- )
-
-/datum/quirk/item_quirk/spiritual/add_unique(client/client_source)
- give_item_to_holder(/obj/item/storage/fancy/candle_box, list(LOCATION_BACKPACK, LOCATION_HANDS))
- give_item_to_holder(/obj/item/storage/box/matches, list(LOCATION_BACKPACK, LOCATION_HANDS))
diff --git a/code/datums/records/manifest.dm b/code/datums/records/manifest.dm
index 2a7fc26a90d2..8a5e41c0c7f6 100644
--- a/code/datums/records/manifest.dm
+++ b/code/datums/records/manifest.dm
@@ -18,7 +18,7 @@ GLOBAL_DATUM_INIT(manifest, /datum/manifest, new)
log_manifest(readied_player.ckey, readied_player.new_character.mind, readied_player.new_character)
players_to_log[readied_player.ckey] = readied_player.new_character
if(ishuman(readied_player.new_character))
- inject(readied_player.new_character)
+ inject(readied_player.new_character, person_client = readied_player.client) // DARKPACK EDIT - Flavor Text - ORIGINAL: inject(readied_player.new_character)
CHECK_TICK
if(length(players_to_log))
SSblackbox.ReportRoundstartManifest(players_to_log)
@@ -103,7 +103,7 @@ GLOBAL_DATUM_INIT(manifest, /datum/manifest, new)
/// Injects a record into the manifest.
-/datum/manifest/proc/inject(mob/living/carbon/human/person, atom/appearance_proxy)
+/datum/manifest/proc/inject(mob/living/carbon/human/person, atom/appearance_proxy, client/person_client) // DARKPACKED EDIT CHANGE - FLAVOR TEXT - ORIGINAL: /datum/manifest/proc/inject(mob/living/carbon/human/person, atom/appearance_proxy)
set waitfor = FALSE
if(!(person.mind?.assigned_role.job_flags & JOB_CREW_MANIFEST))
return
@@ -141,7 +141,7 @@ GLOBAL_DATUM_INIT(manifest, /datum/manifest, new)
new /datum/record/crew(
age = person.age,
blood_type = person.get_bloodtype()?.name || "UNKNOWN",
- character_appearance = character_appearance,
+ character_appearance = null, // DARKPACK EDIT - RECORDS, ORIGINAL: character_appearance = character_appearance
dna_string = record_dna.unique_enzymes,
fingerprint = md5(record_dna.unique_identity),
gender = person_gender,
@@ -157,6 +157,12 @@ GLOBAL_DATUM_INIT(manifest, /datum/manifest, new)
minor_disabilities = person.get_quirk_string(FALSE, CAT_QUIRK_MINOR_DISABILITY, from_scan = TRUE),
minor_disabilities_desc = person.get_quirk_string(TRUE, CAT_QUIRK_MINOR_DISABILITY),
quirk_notes = person.get_quirk_string(TRUE, CAT_QUIRK_NOTES),
+ // DARKPACK EDIT START - FLAVOR TEXT
+ background_information = person_client?.prefs.read_preference(/datum/preference/text/background) || "",
+ exploitable_information = person_client?.prefs.read_preference(/datum/preference/text/exploitable) || "",
+ past_medical_records = person_client?.prefs.read_preference(/datum/preference/text/medical) || "",
+ past_criminal_records = person_client?.prefs.read_preference(/datum/preference/text/criminal) || "",
+ // DARKPACK EDIT END
)
/// Edits the rank and trim of the found record.
diff --git a/code/datums/records/record.dm b/code/datums/records/record.dm
index 9785ac8ffcb0..22dd5b21a72b 100644
--- a/code/datums/records/record.dm
+++ b/code/datums/records/record.dm
@@ -108,6 +108,12 @@
physical_status = PHYSICAL_ACTIVE,
mental_status = MENTAL_STABLE,
quirk_notes,
+ // DARKPACK EDIT START - FLAVOR TEXT
+ background_information = "",
+ exploitable_information = "",
+ past_medical_records = "",
+ past_criminal_records = "",
+ // DARKPACK EDIT END
)
. = ..()
src.lock_ref = lock_ref
@@ -118,6 +124,12 @@
src.physical_status = physical_status
src.mental_status = mental_status
src.quirk_notes = quirk_notes
+ // DARKPACK EDIT START - FLAVOR TEXT
+ src.background_information = background_information
+ src.exploitable_information = exploitable_information
+ src.past_medical_records = past_medical_records
+ src.past_criminal_records = past_criminal_records
+ // DARKPACK EDIT END
GLOB.manifest.general += src
diff --git a/code/datums/shuttles/cargo.dm b/code/datums/shuttles/cargo.dm
index 0dba61fdeddc..b3fadeaaa75b 100644
--- a/code/datums/shuttles/cargo.dm
+++ b/code/datums/shuttles/cargo.dm
@@ -3,6 +3,10 @@
name = "Base Shuttle Template (Cargo)"
who_can_purchase = null
+/datum/map_template/shuttle/cargo/mini
+ suffix ="mini"
+ name = "supply shuttle (Mini)"
+
/datum/map_template/shuttle/cargo/kilo
suffix = "kilo"
name = "supply shuttle (Kilo)"
diff --git a/code/datums/sprite_accessories.dm b/code/datums/sprite_accessories.dm
index 2c7b862dc6b1..88f1a4043e66 100644
--- a/code/datums/sprite_accessories.dm
+++ b/code/datums/sprite_accessories.dm
@@ -50,7 +50,7 @@
/datum/sprite_accessory/blank
name = SPRITE_ACCESSORY_NONE
- icon_state = "None"
+ icon_state = SPRITE_ACCESSORY_NONE
////////////////
// Hair Masks //
@@ -2114,6 +2114,11 @@ GLOBAL_LIST_EMPTY(blended_hair_icons_cache)
name = "Round"
icon_state = "round"
+/datum/sprite_accessory/ears/cat/cybernetic
+ name = "Cybernetic"
+ icon_state = "cyber"
+ locked = TRUE
+
/datum/sprite_accessory/ears/fox
icon = 'icons/mob/human/fox_features.dmi'
name = "Fox"
diff --git a/code/datums/station_traits/admin_panel.dm b/code/datums/station_traits/admin_panel.dm
index 67669027c54d..5d222402c91a 100644
--- a/code/datums/station_traits/admin_panel.dm
+++ b/code/datums/station_traits/admin_panel.dm
@@ -28,7 +28,11 @@ ADMIN_VERB(station_traits_panel, R_FUN, "Modify Station Traits", "Modify the sta
var/list/valid_station_traits = list()
- for (var/datum/station_trait/station_trait_path as anything in subtypesof(/datum/station_trait))
+ for (var/datum/station_trait/station_trait_path as anything in valid_subtypesof(/datum/station_trait))
+ // DARKPACK EDIT ADD - CITY_TRAITS
+ if(!initial(station_trait_path.darkpack_allowed))
+ continue
+ // DARKPACK EDIT END
valid_station_traits += list(list(
"name" = initial(station_trait_path.name),
"path" = station_trait_path,
diff --git a/code/datums/station_traits/job_traits.dm b/code/datums/station_traits/job_traits.dm
index 9cbccd6129cd..4c463c3a3e17 100644
--- a/code/datums/station_traits/job_traits.dm
+++ b/code/datums/station_traits/job_traits.dm
@@ -200,7 +200,7 @@
/// Gives the AI SAT a fax machine if it doesn't have one. This is copy pasted from Bridge Assistant's coffee maker.
/datum/station_trait/job/human_ai/proc/give_fax_machine(datum/source)
SIGNAL_HANDLER
- var/area/sat_area = GLOB.areas_by_type[/area/station/ai_monitored/turret_protected/ai]
+ var/area/sat_area = GLOB.areas_by_type[/area/station/ai/satellite/chamber]
if(isnull(sat_area))
return
var/list/fax_machines = SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/fax)
diff --git a/code/datums/station_traits/negative_traits.dm b/code/datums/station_traits/negative_traits.dm
index c26325904910..da87d2a7b789 100644
--- a/code/datums/station_traits/negative_traits.dm
+++ b/code/datums/station_traits/negative_traits.dm
@@ -594,7 +594,7 @@
//Let people order more nebula shielding
var/datum/supply_pack/pack = SSshuttle.supply_packs[/datum/supply_pack/engineering/rad_nebula_shielding_kit]
- pack.special_enabled = TRUE
+ pack.order_flags |= ORDER_SPECIAL_ENABLED
//Give robotics some radiation protection modules for modsuits
var/datum/supply_pack/supply_pack_modsuits = new /datum/supply_pack/engineering/rad_protection_modules()
diff --git a/code/datums/status_effects/_status_effect.dm b/code/datums/status_effects/_status_effect.dm
index 17eb45e168fc..4a569858655b 100644
--- a/code/datums/status_effects/_status_effect.dm
+++ b/code/datums/status_effects/_status_effect.dm
@@ -3,19 +3,16 @@
/datum/status_effect
/// The ID of the effect. ID is used in adding and removing effects to check for duplicates, among other things.
var/id = "effect"
- /// When set initially / in on_creation, this is how long the status effect lasts in deciseconds.
- /// While processing, this becomes the world.time when the status effect will expire.
- /// -1 = infinite duration.
+ /// This is how long the status effect lasts in deciseconds.
+ /// You can put STATUS_EFFECT_PERMANENT (or INFINITY) here for infinite duration.
var/duration = STATUS_EFFECT_PERMANENT
- /// When set initially / in on_creation, this is how long between [proc/tick] calls in deciseconds.
- /// Note that this cannot be faster than the processing subsystem you choose to fire the effect on. (See: [var/processing_speed])
- /// While processing, this becomes the world.time when the next tick will occur.
- /// -1 = will prevent ticks, and if duration is also unlimited (-1), stop processing wholesale.
+ /// This is how long between [proc/tick] calls in deciseconds.
+ /// This has to be a multiple of the [var/wait] of the subsystem this status effect is running on, which is based on [var/processing_speed].
+ /// Putting STATUS_EFFECT_NO_TICK here will stop [proc/tick] calls, and if [var/duration] is STATUS_EFFECT_PERMANENT, it stops processing entirely.
+ /// Putting STATUS_EFFECT_AUTO_TICK here will make every subsystem tick call [proc/tick], making the tick interval depend entirely on [var/processing_speed]
var/tick_interval = 1 SECONDS
- ///If our tick intervals are set to be a dynamic value within a range, the lowerbound of said range
- var/tick_interval_lowerbound
- ///If our tick intervals are set to be a dynamic value within a range, the upperbound of said range
- var/tick_interval_upperbound
+ /// The time until the next [proc/tick] call, gets set to [var/tick_interval] after every [proc/tick] call and decrements on every [proc/process] call.
+ var/time_until_next_tick
/// The mob affected by the status effect.
VAR_FINAL/mob/living/owner
/// How many of the effect can be on one mob, and/or what happens when you try to add a duplicate.
@@ -58,10 +55,9 @@
// we will optionally allow INFINITY, because i imagine it'll be convenient in some places,
// but we'll still set it to -1 / STATUS_EFFECT_PERMANENT for proper unified handling
duration = STATUS_EFFECT_PERMANENT
- if(duration != STATUS_EFFECT_PERMANENT)
- duration = world.time + duration
+
if(tick_interval != STATUS_EFFECT_NO_TICK)
- tick_interval = world.time + tick_interval
+ time_until_next_tick = tick_interval
if(alert_type)
var/atom/movable/screen/alert/status_effect/new_alert = owner.throw_alert(id, alert_type)
@@ -69,7 +65,7 @@
linked_alert = new_alert //so we can reference the alert, if we need to
update_shown_duration()
- if(duration > world.time || tick_interval > world.time) //don't process if we don't care
+ if(duration != STATUS_EFFECT_PERMANENT || tick_interval != STATUS_EFFECT_NO_TICK) //don't process if we don't care
switch(processing_speed)
if(STATUS_EFFECT_FAST_PROCESS)
START_PROCESSING(SSfastprocess, src)
@@ -108,7 +104,7 @@
if(!linked_alert || !show_duration)
return
- linked_alert.maptext = MAPTEXT_TINY_UNICODE("[round((duration - world.time)/10, 1)]s")
+ linked_alert.maptext = MAPTEXT_TINY_UNICODE("[round(duration / 10, 1)]s")
// Status effect process. Handles adjusting its duration and ticks.
// If you're adding processed effects, put them in [proc/tick]
@@ -120,19 +116,23 @@
qdel(src)
return
+ if (duration != STATUS_EFFECT_PERMANENT)
+ duration = max(0, duration - (seconds_per_tick SECONDS)) // doing it first means its more up to date for ticks to read
+
+ if (tick_interval != STATUS_EFFECT_NO_TICK)
+ time_until_next_tick = max(0, time_until_next_tick - (seconds_per_tick SECONDS)) // same here
+
if(tick_interval == STATUS_EFFECT_AUTO_TICK)
tick(seconds_per_tick)
- else if(tick_interval != STATUS_EFFECT_NO_TICK && tick_interval < world.time)
- var/tick_length = (tick_interval_upperbound && tick_interval_lowerbound) ? rand(tick_interval_lowerbound, tick_interval_upperbound) : initial(tick_interval)
- tick(tick_length / (1 SECONDS))
- tick_interval = world.time + tick_length
+ else if(tick_interval != STATUS_EFFECT_NO_TICK && time_until_next_tick <= 0)
+ time_until_next_tick = tick_interval // same here as well
+ tick(tick_interval / 10)
if(QDELING(src))
- // tick deleted us, no need to continue
- return
+ return // tick deleted us, no need to continue
if(duration != STATUS_EFFECT_PERMANENT)
- if(duration < world.time)
+ if(duration <= 0)
qdel(src)
return
update_shown_duration()
@@ -179,16 +179,13 @@
/// Called before being fully removed (before on_remove)
/// Returning FALSE will cancel removal
-/datum/status_effect/proc/before_remove()
+/datum/status_effect/proc/before_remove(...)
return TRUE
/// Called when a status effect of status_type STATUS_EFFECT_REFRESH
/// has its duration refreshed in apply_status_effect - is passed New() args
/datum/status_effect/proc/refresh(effect, ...)
- var/original_duration = initial(duration)
- if(original_duration == STATUS_EFFECT_PERMANENT)
- return
- duration = world.time + original_duration
+ duration = initial(duration)
/// Adds nextmove modifier multiplicatively to the owner while applied
/datum/status_effect/proc/nextmove_modifier()
@@ -208,13 +205,14 @@
if(!heal_flag_necessary || (heal_flags & heal_flag_necessary))
qdel(src)
-/// Remove [seconds] of duration from the status effect, qdeling / ending if we eclipse the current world time.
+/// Removes [seconds] of duration from the status effect.
+/// Returns whether or not the status effect was qdeleted due to running out of duration.
/datum/status_effect/proc/remove_duration(seconds)
if(duration == STATUS_EFFECT_PERMANENT) // Infinite duration
return FALSE
- duration -= seconds
- if(duration <= world.time)
+ duration -= (seconds SECONDS)
+ if(duration <= 0)
qdel(src)
return TRUE
diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm
index 6b15ee87de9b..3a999b01e6fe 100644
--- a/code/datums/status_effects/buffs.dm
+++ b/code/datums/status_effects/buffs.dm
@@ -66,10 +66,10 @@
return
var/grace_heal = bloodlust * 0.02
var/need_mob_update = FALSE
- need_mob_update += owner.adjustBruteLoss(-grace_heal * seconds_between_ticks, updating_health = FALSE, forced = TRUE)
- need_mob_update += owner.adjustFireLoss(-grace_heal * seconds_between_ticks, updating_health = FALSE, forced = TRUE)
- need_mob_update += owner.adjustToxLoss(-grace_heal * seconds_between_ticks, forced = TRUE)
- need_mob_update += owner.adjustOxyLoss(-(grace_heal * 2) * seconds_between_ticks, updating_health = FALSE, forced = TRUE)
+ need_mob_update += owner.adjust_brute_loss(-grace_heal * seconds_between_ticks, updating_health = FALSE, forced = TRUE)
+ need_mob_update += owner.adjust_fire_loss(-grace_heal * seconds_between_ticks, updating_health = FALSE, forced = TRUE)
+ need_mob_update += owner.adjust_tox_loss(-grace_heal * seconds_between_ticks, forced = TRUE)
+ need_mob_update += owner.adjust_oxy_loss(-(grace_heal * 2) * seconds_between_ticks, updating_health = FALSE, forced = TRUE)
if(need_mob_update)
owner.updatehealth()
@@ -160,9 +160,9 @@
return
var/need_mob_update = FALSE
- need_mob_update += owner.adjustBruteLoss(-4 * seconds_between_ticks, updating_health = FALSE)
- need_mob_update += owner.adjustFireLoss(-2 * seconds_between_ticks, updating_health = FALSE)
- need_mob_update += owner.adjustOxyLoss(-4 * seconds_between_ticks, updating_health = FALSE)
+ need_mob_update += owner.adjust_brute_loss(-4 * seconds_between_ticks, updating_health = FALSE)
+ need_mob_update += owner.adjust_fire_loss(-2 * seconds_between_ticks, updating_health = FALSE)
+ need_mob_update += owner.adjust_oxy_loss(-4 * seconds_between_ticks, updating_health = FALSE)
if(need_mob_update)
owner.updatehealth()
@@ -236,7 +236,7 @@
var/skill_level_boost = (new_owner.mind?.get_skill_level(/datum/skill/athletics) - 1) * 2 SECONDS
bonus_time = (bonus_time + food_boost + skill_level_boost) * modifier
- var/exhaustion_limit = new_owner.mind?.get_skill_modifier(/datum/skill/athletics, SKILL_VALUE_MODIFIER) + world.time
+ var/exhaustion_limit = new_owner.mind?.get_skill_modifier(/datum/skill/athletics, SKILL_VALUE_MODIFIER)
if(duration + bonus_time >= exhaustion_limit)
duration = exhaustion_limit
to_chat(new_owner, span_userdanger("Your muscles are exhausted! Might be a good idea to sleep..."))
@@ -266,14 +266,15 @@
/atom/movable/screen/alert/status_effect/exercised
name = "Exercise"
desc = "You feel well exercised! Sleeping will improve your fitness."
- icon_state = "exercised"
+ use_user_hud_icon = TRUE
+ overlay_state = "exercised"
//Hippocratic Oath: Applied when the Rod of Asclepius is activated.
/datum/status_effect/hippocratic_oath
id = "Hippocratic Oath"
status_type = STATUS_EFFECT_UNIQUE
duration = STATUS_EFFECT_PERMANENT
- tick_interval = 2.5 SECONDS
+ tick_interval = 2.6 SECONDS
alert_type = null
var/datum/component/aura_healing/aura_healing
@@ -299,16 +300,12 @@
)
//Makes the user passive, it's in their oath not to harm!
- owner.add_traits(list(TRAIT_PACIFISM, TRAIT_HIPPOCRATIC_OATH), HIPPOCRATIC_OATH_TRAIT)
- var/datum/atom_hud/med_hud = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
- med_hud.show_to(owner)
+ owner.add_traits(list(TRAIT_PACIFISM, TRAIT_HIPPOCRATIC_OATH, TRAIT_MEDICAL_HUD), HIPPOCRATIC_OATH_TRAIT)
return ..()
/datum/status_effect/hippocratic_oath/on_remove()
QDEL_NULL(aura_healing)
- owner.remove_traits(list(TRAIT_PACIFISM, TRAIT_HIPPOCRATIC_OATH), HIPPOCRATIC_OATH_TRAIT)
- var/datum/atom_hud/med_hud = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
- med_hud.hide_from(owner)
+ owner.remove_traits(list(TRAIT_PACIFISM, TRAIT_HIPPOCRATIC_OATH, TRAIT_MEDICAL_HUD), HIPPOCRATIC_OATH_TRAIT)
/datum/status_effect/hippocratic_oath/get_examine_text()
return span_notice("[owner.p_They()] seem[owner.p_s()] to have an aura of healing and helpfulness about [owner.p_them()].")
@@ -343,12 +340,12 @@
if(itemUser.health < itemUser.maxHealth)
new /obj/effect/temp_visual/heal(get_turf(itemUser), "#375637")
var/need_mob_update = FALSE
- need_mob_update += itemUser.adjustBruteLoss(-0.6 * seconds_between_ticks, updating_health = FALSE, forced = TRUE)
- need_mob_update += itemUser.adjustFireLoss(-0.6 * seconds_between_ticks, updating_health = FALSE, forced = TRUE)
- need_mob_update += itemUser.adjustToxLoss(-0.6 * seconds_between_ticks, updating_health = FALSE, forced = TRUE) //Because Slime People are people too
- need_mob_update += itemUser.adjustOxyLoss(-0.6 * seconds_between_ticks, updating_health = FALSE, forced = TRUE)
- need_mob_update += itemUser.adjustStaminaLoss(-3 * seconds_between_ticks, updating_stamina = FALSE, forced = TRUE)
- need_mob_update += itemUser.adjustOrganLoss(ORGAN_SLOT_BRAIN, -0.6 * seconds_between_ticks)
+ need_mob_update += itemUser.adjust_brute_loss(-0.6 * seconds_between_ticks, updating_health = FALSE, forced = TRUE)
+ need_mob_update += itemUser.adjust_fire_loss(-0.6 * seconds_between_ticks, updating_health = FALSE, forced = TRUE)
+ need_mob_update += itemUser.adjust_tox_loss(-0.6 * seconds_between_ticks, updating_health = FALSE, forced = TRUE) //Because Slime People are people too
+ need_mob_update += itemUser.adjust_oxy_loss(-0.6 * seconds_between_ticks, updating_health = FALSE, forced = TRUE)
+ need_mob_update += itemUser.adjust_stamina_loss(-3 * seconds_between_ticks, updating_stamina = FALSE, forced = TRUE)
+ need_mob_update += itemUser.adjust_organ_loss(ORGAN_SLOT_BRAIN, -0.6 * seconds_between_ticks)
if(need_mob_update)
itemUser.updatehealth()
@@ -381,7 +378,9 @@
/atom/movable/screen/alert/status_effect/regenerative_core
name = "Regenerative Core Tendrils"
desc = "You can move faster than your broken body could normally handle!"
- icon_state = "regenerative_core"
+ use_user_hud_icon = TRUE
+ overlay_icon = 'icons/obj/medical/organs/mining_organs.dmi'
+ overlay_state = "legion_core_stable"
/datum/status_effect/regenerative_core
id = "Regenerative Core"
@@ -392,8 +391,8 @@
/datum/status_effect/regenerative_core/on_apply()
owner.add_movespeed_mod_immunities(id, /datum/movespeed_modifier/damage_slowdown)
- owner.adjustBruteLoss(-25)
- owner.adjustFireLoss(-25)
+ owner.adjust_brute_loss(-25)
+ owner.adjust_fire_loss(-25)
owner.fully_heal(HEAL_CC_STATUS)
owner.bodytemperature = owner.get_body_temp_normal()
if(ishuman(owner))
@@ -423,7 +422,8 @@
/atom/movable/screen/alert/status_effect/lightningorb
name = "Lightning Orb"
desc = "The speed surges through you!"
- icon_state = "lightningorb"
+ use_user_hud_icon = TRUE
+ overlay_state = "lightningorb"
/datum/status_effect/mayhem
id = "Mayhem"
@@ -529,7 +529,7 @@
var/mob/living/simple_animal/healthy_animal = owner
healthy_animal.adjustHealth(-(health_increase * healing_modifier))
else
- owner.adjustBruteLoss(-(health_increase * healing_modifier))
+ owner.adjust_brute_loss(-(health_increase * healing_modifier))
/datum/status_effect/limited_buff/health_buff/maxed_out()
. = ..()
@@ -549,10 +549,10 @@
return
var/need_mob_update = FALSE
- need_mob_update += owner.adjustBruteLoss(-2 * seconds_between_ticks, updating_health = FALSE)
- need_mob_update += owner.adjustFireLoss(-2 * seconds_between_ticks, updating_health = FALSE)
- need_mob_update += owner.adjustOxyLoss(-4 * seconds_between_ticks, updating_health = FALSE)
- need_mob_update += owner.adjustStaminaLoss(-4 * seconds_between_ticks, updating_stamina = FALSE)
+ need_mob_update += owner.adjust_brute_loss(-2 * seconds_between_ticks, updating_health = FALSE)
+ need_mob_update += owner.adjust_fire_loss(-2 * seconds_between_ticks, updating_health = FALSE)
+ need_mob_update += owner.adjust_oxy_loss(-4 * seconds_between_ticks, updating_health = FALSE)
+ need_mob_update += owner.adjust_stamina_loss(-4 * seconds_between_ticks, updating_stamina = FALSE)
if(need_mob_update)
owner.updatehealth()
owner.adjust_bodytemperature(BODYTEMP_NORMAL, 0, BODYTEMP_NORMAL) //Won't save you from the void of space, but it will stop you from freezing or suffocating in low pressure
@@ -561,7 +561,8 @@
/atom/movable/screen/alert/status_effect/nest_sustenance
name = "Nest Vitalization"
desc = "The resin seems to pulsate around you. It seems to be sustaining your vital functions. You feel ill..."
- icon_state = "nest_life"
+ use_user_hud_icon = TRUE
+ overlay_state = "nest_life"
/**
* Granted to wizards upon satisfying the cheese sacrifice during grand rituals.
@@ -571,12 +572,7 @@
id = "blessing_of_insanity"
duration = STATUS_EFFECT_PERMANENT
tick_interval = STATUS_EFFECT_NO_TICK
- alert_type = /atom/movable/screen/alert/status_effect/blessing_of_insanity
-
-/atom/movable/screen/alert/status_effect/blessing_of_insanity
- name = "Blessing of Insanity"
- desc = "Your devotion to madness has improved your resilience to all damage and you gain the power to levitate!"
- //no screen alert - the gravity already throws one
+ alert_type = null
/datum/status_effect/blessing_of_insanity/on_apply()
if(ishuman(owner))
@@ -645,7 +641,8 @@
/atom/movable/screen/alert/status_effect/radiation_immunity
name = "Radiation shielding"
desc = "You're immune to radiation, get settled quick!"
- icon_state = "radiation_shield"
+ use_user_hud_icon = TRUE
+ overlay_state = "radiation_shield"
/// Throw an alert we're in darkness!! Nightvision can make it hard to tell so this is useful
/datum/status_effect/shadow
@@ -676,4 +673,5 @@
/atom/movable/screen/alert/status_effect/shadow_regeneration
name = "Shadow Regeneration"
desc = "Bathed in soothing darkness, you will slowly heal yourself"
- icon_state = "lightless"
+ use_user_hud_icon = TRUE
+ overlay_state = "lightless"
diff --git a/code/datums/status_effects/buffs/food/_food_effect.dm b/code/datums/status_effects/buffs/food/_food_effect.dm
index fe63df29e3a8..15e6d9149294 100644
--- a/code/datums/status_effects/buffs/food/_food_effect.dm
+++ b/code/datums/status_effects/buffs/food/_food_effect.dm
@@ -14,10 +14,10 @@
if(isnum(timeout_mod))
duration *= timeout_mod
if(istype(linked_alert, /atom/movable/screen/alert/status_effect/food))
- linked_alert.icon_state = "[linked_alert.base_icon_state]_[strength]"
+ linked_alert.overlay_state = "food_buff_[strength]"
/atom/movable/screen/alert/status_effect/food
name = "Hand-crafted meal"
desc = "Eating it made me feel better."
- icon_state = "food_buff_1"
- base_icon_state = "food_buff"
+ use_user_hud_icon = TRUE
+ overlay_state = "food_buff_1"
diff --git a/code/datums/status_effects/buffs/food/chilling.dm b/code/datums/status_effects/buffs/food/chilling.dm
index 0827ac5a4afd..d2fb089f11fb 100644
--- a/code/datums/status_effects/buffs/food/chilling.dm
+++ b/code/datums/status_effects/buffs/food/chilling.dm
@@ -9,6 +9,7 @@
/atom/movable/screen/alert/status_effect/icecream_chilling
name = "Cooling Off"
- desc = "Nothing beats a cup of ice cream during hot, plasma-floody day..."
- icon_state = "food_icecream"
+ desc = "Nothing beats a cup of ice cream during hot, plasma-flooded day..."
+ use_user_hud_icon = TRUE
+ overlay_state = "food_icecream"
diff --git a/code/datums/status_effects/buffs/food/grant_trait.dm b/code/datums/status_effects/buffs/food/grant_trait.dm
index 46d4b060739d..0b1e65dc848b 100644
--- a/code/datums/status_effects/buffs/food/grant_trait.dm
+++ b/code/datums/status_effects/buffs/food/grant_trait.dm
@@ -22,7 +22,8 @@
/atom/movable/screen/alert/status_effect/shockimmune
name = "Grounded"
desc = "That meal made me feel like a superconductor..."
- icon_state = "shock_immune"
+ use_user_hud_icon = TRUE
+ overlay_state = "shock_immune"
/datum/status_effect/food/trait/mute
alert_type = /atom/movable/screen/alert/status_effect/mute
@@ -31,7 +32,8 @@
/atom/movable/screen/alert/status_effect/mute
name = "..."
desc = "..."
- icon_state = "mute"
+ use_user_hud_icon = TRUE
+ overlay_state = "mute"
/datum/status_effect/food/trait/ashstorm_immune
alert_type = /atom/movable/screen/alert/status_effect/ashstorm_immune
@@ -40,7 +42,8 @@
/atom/movable/screen/alert/status_effect/ashstorm_immune
name = "Ashstorm-proof"
desc = "That meal makes me feel born on Lavaland."
- icon_state = "ashstorm_immune"
+ use_user_hud_icon = TRUE
+ overlay_state = "ashstorm_immune"
/datum/status_effect/food/trait/waddle
alert_type = /atom/movable/screen/alert/status_effect/waddle
@@ -53,4 +56,6 @@
/atom/movable/screen/alert/status_effect/waddle
name = "Waddling"
desc = "That meal makes me want to joke around."
- icon_state = "waddle"
+ use_user_hud_icon = TRUE
+ overlay_icon = /obj/item/clothing/mask/gas/clown_hat::icon
+ overlay_state = /obj/item/clothing/mask/gas/clown_hat::icon_state
diff --git a/code/datums/status_effects/buffs/food/speech.dm b/code/datums/status_effects/buffs/food/speech.dm
index 9878f0ebf35b..95598c03bb93 100644
--- a/code/datums/status_effects/buffs/food/speech.dm
+++ b/code/datums/status_effects/buffs/food/speech.dm
@@ -28,7 +28,8 @@
/atom/movable/screen/alert/status_effect/italian_speech
name = "Linguini Embrace"
desc = "You feel a sudden urge to gesticulate wildly."
- icon_state = "food_italian"
+ use_user_hud_icon = TRUE
+ overlay_state = "food_italian"
/datum/status_effect/food/speech/french
alert_type = /atom/movable/screen/alert/status_effect/french_speech
@@ -56,4 +57,5 @@
/atom/movable/screen/alert/status_effect/french_speech
name = "Café Chic"
desc = "Suddenly, everything seems worthy of a passionate debate."
- icon_state = "food_french"
+ use_user_hud_icon = TRUE
+ overlay_state = "food_french"
diff --git a/code/datums/status_effects/buffs/stop_drop_roll.dm b/code/datums/status_effects/buffs/stop_drop_roll.dm
index e7ff393a1dd5..a7ca2109769a 100644
--- a/code/datums/status_effects/buffs/stop_drop_roll.dm
+++ b/code/datums/status_effects/buffs/stop_drop_roll.dm
@@ -3,13 +3,14 @@
alert_type = null
tick_interval = 0.8 SECONDS
processing_speed = STATUS_EFFECT_PRIORITY
+ /// bar updates depending on how "on fire" you are
+ VAR_FINAL/datum/progressbar/bar
/datum/status_effect/stop_drop_roll/on_apply()
if(!iscarbon(owner))
return FALSE
- var/actual_interval = initial(tick_interval)
- if(!owner.Knockdown(actual_interval * 2, ignore_canstun = TRUE) || owner.body_position != LYING_DOWN)
+ if(!owner.Knockdown(tick_interval * 2, ignore_canstun = TRUE) || owner.body_position != LYING_DOWN)
to_chat(owner, span_warning("You try to stop, drop, and roll - but you can't get on the ground!"))
return FALSE
@@ -17,6 +18,7 @@
RegisterSignal(owner, COMSIG_LIVING_SET_BODY_POSITION, PROC_REF(body_position_changed))
ADD_TRAIT(owner, TRAIT_HANDS_BLOCKED, TRAIT_STATUS_EFFECT(id)) // they're kinda busy!
+ bar = new(owner, MAX_FIRE_STACKS, owner, get_bar_progress())
start_rolling()
for (var/obj/item/dropped in owner.loc)
@@ -26,6 +28,12 @@
/datum/status_effect/stop_drop_roll/on_remove()
UnregisterSignal(owner, list(COMSIG_MOVABLE_MOVED, COMSIG_LIVING_SET_BODY_POSITION))
REMOVE_TRAIT(owner, TRAIT_HANDS_BLOCKED, TRAIT_STATUS_EFFECT(id))
+ bar.end_progress()
+ bar = null
+
+/// Get the current progress for the progress bar
+/datum/status_effect/stop_drop_roll/proc/get_bar_progress()
+ return MAX_FIRE_STACKS - max(0, owner.fire_stacks)
/datum/status_effect/stop_drop_roll/proc/start_rolling()
owner.visible_message(
@@ -40,12 +48,11 @@
qdel(src)
return
- var/actual_interval = initial(tick_interval)
- if(!owner.Knockdown(actual_interval * 1.2, ignore_canstun = TRUE))
+ if(!owner.Knockdown(tick_interval * 1.2, ignore_canstun = TRUE))
stop_rolling()
return
- owner.spin(spintime = actual_interval, speed = actual_interval / 4)
+ owner.spin(spintime = tick_interval, speed = tick_interval / 4)
if(!reduce_firestacks(1))
return
@@ -54,6 +61,7 @@
/// Return TRUE to stop the us from rolling.
/datum/status_effect/stop_drop_roll/proc/reduce_firestacks(amt = 1)
owner.adjust_fire_stacks(-1 * amt)
+ bar.update(get_bar_progress())
return owner.fire_stacks <= 0
/// Called when we just, stop rolling, due to movement or other reasons. Maybe still on fire, maybe not.
@@ -87,6 +95,10 @@
src.hallucination_weakref = hallucination_weakref
return ..()
+/datum/status_effect/stop_drop_roll/hallucinating/get_bar_progress()
+ var/datum/hallucination/fire/hallucination = hallucination_weakref?.resolve()
+ return 20 - max(0, hallucination?.fake_firestacks)
+
/datum/status_effect/stop_drop_roll/hallucinating/start_rolling()
owner.visible_message(
span_danger("[owner] starts rolling around on the floor, flailing about!"),
@@ -100,6 +112,7 @@
return TRUE
hallucination.fake_firestacks += (-1 * amt)
+ bar.update(get_bar_progress())
if(hallucination.fake_firestacks <= 0)
hallucination.clear_fire()
return TRUE
diff --git a/code/datums/status_effects/buffs/xray.dm b/code/datums/status_effects/buffs/xray.dm
new file mode 100644
index 000000000000..cdeb909d6234
--- /dev/null
+++ b/code/datums/status_effects/buffs/xray.dm
@@ -0,0 +1,30 @@
+/**
+ * Effectively grants a temporary form of x-ray with a cooldown period.
+ */
+/datum/status_effect/temporary_xray
+ id = "temp xray"
+ status_type = STATUS_EFFECT_UNIQUE
+ alert_type = null
+ duration = 10 SECONDS
+ show_duration = TRUE
+
+/datum/status_effect/temporary_xray/on_apply()
+ ADD_TRAIT(owner, TRAIT_XRAY_VISION, TRAIT_STATUS_EFFECT(id))
+ owner.update_sight()
+ return TRUE
+
+/datum/status_effect/temporary_xray/on_remove()
+ REMOVE_TRAIT(owner, TRAIT_XRAY_VISION, TRAIT_STATUS_EFFECT(id))
+ owner.update_sight()
+
+/datum/status_effect/temporary_xray/eldritch // Heretic subtype that plays a sound and screen alert
+ alert_type = /atom/movable/screen/alert/status_effect/temporary_xray
+
+/datum/status_effect/temporary_xray/eldritch/on_apply()
+ . = ..()
+ SEND_SOUND(owner, 'sound/effects/hallucinations/i_see_you1.ogg')
+
+/atom/movable/screen/alert/status_effect/temporary_xray
+ name = "Eldritch Sight"
+ desc = "You get a glimpse of something new..."
+ icon_state = "influence"
diff --git a/code/datums/status_effects/cuffed_item.dm b/code/datums/status_effects/cuffed_item.dm
new file mode 100644
index 000000000000..c356f377f3d5
--- /dev/null
+++ b/code/datums/status_effects/cuffed_item.dm
@@ -0,0 +1,164 @@
+/**
+ * The status effect given by the cuffable_item.
+ * It basically binds an item to your arm, basically making it undroppable until the cuffs or item are removed, usually done by one of:
+ * - clicking the status alert
+ * - using the topic hyperlink
+ * - strip menu for others
+ * - alternatively, dismemberment or destroying the item
+ */
+/datum/status_effect/cuffed_item
+ id = "cuffed_item"
+ status_type = STATUS_EFFECT_MULTIPLE
+ alert_type = /atom/movable/screen/alert/status_effect/cuffed_item
+ ///Reference to the item stuck into the player's hand
+ var/obj/item/cuffed
+ ///Reference to the pair of handcuffs used to bind the item
+ var/obj/item/restraints/handcuffs/cuffs
+
+/datum/status_effect/cuffed_item/on_creation(mob/living/new_owner, obj/item/cuffed, obj/item/restraints/handcuffs/cuffs)
+ src.cuffed = cuffed
+ src.cuffs = cuffs
+ . = ..() //throws the alert and all
+ linked_alert.update_appearance(UPDATE_OVERLAYS)
+
+/datum/status_effect/cuffed_item/on_apply()
+ if(HAS_TRAIT_FROM(cuffed, TRAIT_NODROP, CUFFED_ITEM_TRAIT))
+ qdel(src)
+ return FALSE
+ owner.temporarilyRemoveItemFromInventory(cuffs, force = TRUE)
+ if(!owner.is_holding(cuffed) && !owner.put_in_hands(cuffed))
+ owner.put_in_hands(cuffs)
+ qdel(src)
+ return FALSE
+
+ ADD_TRAIT(cuffed, TRAIT_NODROP, CUFFED_ITEM_TRAIT)
+
+ RegisterSignals(cuffed, list(COMSIG_ITEM_DROPPED, COMSIG_MOVABLE_MOVED, COMSIG_QDELETING), PROC_REF(on_displaced))
+ RegisterSignal(cuffed, COMSIG_ATOM_UPDATE_APPEARANCE, PROC_REF(on_item_update_appearance))
+ RegisterSignal(cuffed, COMSIG_ATOM_EXAMINE, PROC_REF(cuffed_reminder))
+ RegisterSignal(cuffed, COMSIG_TOPIC, PROC_REF(topic_handler))
+ RegisterSignal(cuffed, COMSIG_ITEM_GET_STRIPPABLE_ALT_ACTIONS, PROC_REF(get_strippable_action))
+ RegisterSignal(cuffed, COMSIG_ITEM_STRIPPABLE_ALT_ACTION, PROC_REF(do_strippable_action))
+
+ RegisterSignals(cuffs, list(COMSIG_ITEM_EQUIPPED, COMSIG_MOVABLE_MOVED, COMSIG_QDELETING), PROC_REF(on_displaced))
+ RegisterSignal(cuffs, COMSIG_ATOM_UPDATE_APPEARANCE, PROC_REF(on_item_update_appearance))
+
+ RegisterSignal(owner, COMSIG_ATOM_EXAMINE_MORE, PROC_REF(on_examine_more))
+
+ owner.log_message("bound [src] to themselves with restraints", LOG_GAME)
+
+ return TRUE
+
+/datum/status_effect/cuffed_item/on_remove()
+ //Prevent possible recursions from these signals
+ UnregisterSignal(cuffed, list(COMSIG_ITEM_DROPPED, COMSIG_MOVABLE_MOVED, COMSIG_QDELETING))
+ UnregisterSignal(cuffs, list(COMSIG_ITEM_EQUIPPED, COMSIG_MOVABLE_MOVED, COMSIG_QDELETING))
+
+ REMOVE_TRAIT(cuffed, TRAIT_NODROP, CUFFED_ITEM_TRAIT)
+ cuffed = null
+
+ if(!QDELETED(cuffs))
+ cuffs.on_uncuffed(wearer = owner)
+ if(!QDELETED(owner) && cuffs.loc == owner && !(cuffs in owner.get_equipped_items(INCLUDE_POCKETS | INCLUDE_HELD)))
+ cuffs.forceMove(owner.drop_location())
+ cuffs = null
+
+///Called when someone examines the owner twice, so they can know if someone has a cuffed item
+/datum/status_effect/cuffed_item/proc/on_examine_more(datum/source, mob/user, list/examine_list)
+ SIGNAL_HANDLER
+
+ examine_list += span_warning("[cuffed.examine_title(user)] is bound to [owner.p_their()] [owner.get_held_index_name(owner.get_held_index_of_item(cuffed))] by [cuffs.examine_title(user)]")
+
+///What happens if one of the items is moved away from the mob
+/datum/status_effect/cuffed_item/proc/on_displaced(datum/source)
+ SIGNAL_HANDLER
+ qdel(src)
+
+///Tell the player that the item is stuck to their hands someway. Also another way to trigger the try_remove_cuffs proc.
+/datum/status_effect/cuffed_item/proc/cuffed_reminder(obj/item/item, mob/user, list/examine_texts)
+ SIGNAL_HANDLER
+
+ if(user == owner)
+ examine_texts += span_notice("[item.p_Theyre()] cuffed to you by \a [cuffs]. You can remove them.")
+
+/// This mainly exists as a fallback in the rare case the alert icon is not reachable (too many alerts?). You should be somewhat able to examine items while blind so all good.
+/datum/status_effect/cuffed_item/proc/topic_handler(atom/source, user, href_list)
+ SIGNAL_HANDLER
+
+ if(user == owner && href_list["remove_cuffs_item"])
+ INVOKE_ASYNC(src, PROC_REF(try_remove_cuffs), user)
+
+/datum/status_effect/cuffed_item/proc/get_strippable_action(obj/item/source, atom/owner, mob/user, list/alt_actions)
+ SIGNAL_HANDLER
+ alt_actions += "remove_item_cuffs"
+
+/datum/status_effect/cuffed_item/proc/do_strippable_action(obj/item/source, atom/owner, mob/user, action_key)
+ SIGNAL_HANDLER
+ if(action_key != "remove_item_cuffs")
+ return NONE
+ if(source != cuffed || !isliving(user))
+ return NONE
+
+ INVOKE_ASYNC(src, PROC_REF(try_remove_cuffs), user)
+ return COMPONENT_ALT_ACTION_DONE
+
+///The main proc responsible for attempting to remove the hancfuss.
+/datum/status_effect/cuffed_item/proc/try_remove_cuffs(mob/living/user)
+
+ var/interaction_key = REF(src)
+ if(LAZYACCESS(user.do_afters, interaction_key))
+ return FALSE
+
+ if(!(user.mobility_flags & MOBILITY_USE) || (user != owner && !owner.IsReachableBy(user)))
+ owner.balloon_alert(user, "can't do it right now!")
+ return FALSE
+
+ if(user != owner)
+ owner.visible_message(span_notice("[user] tries to remove [cuffs] binding [cuffed] to [owner]"), span_warning("[user] is trying to remove [cuffs] binding [cuffed] to you."))
+
+ owner.balloon_alert(user, "removing cuffs...")
+ playsound(owner, cuffs.cuffsound, 30, TRUE, -2)
+ if(!do_after(user, cuffs.get_handcuff_time(user) * 1.5, owner, interaction_key = interaction_key) || QDELETED(src))
+ owner.balloon_alert(user, "interrupted!")
+ return FALSE
+
+ if(user != owner)
+ owner.visible_message(span_notice("[user] removes [cuffs] binding [cuffed] to [owner]"), span_warning("[user] removes [cuffs] binding [cuffed] to you."))
+
+ log_combat(user, owner, "removed restraints binding [cuffed] to")
+
+ var/obj/item/restraints/handcuffs/ref_cuffs = cuffs
+ ref_cuffs.forceMove(owner.drop_location()) //This will cause the status effect to delete itself, which unsets the 'cuffs' var
+ user.put_in_hands(ref_cuffs)
+ owner.balloon_alert(user, "cuffs removed from item")
+
+ return TRUE
+
+///Whenever the appearance of one of either cuffed or cuffs is updated, update the alert appearance
+/datum/status_effect/cuffed_item/proc/on_item_update_appearance(datum/source)
+ SIGNAL_HANDLER
+ linked_alert.update_appearance(UPDATE_OVERLAYS)
+
+///The status alert linked to the cuffed_item status effect
+/atom/movable/screen/alert/status_effect/cuffed_item
+ name = "Cuffed Item"
+ desc = "You've an item firmly cuffed to your arm. You probably won't be accidentally dropping it somewhere anytime soon."
+ use_user_hud_icon = TRUE
+ clickable_glow = TRUE
+ click_master = FALSE
+
+/atom/movable/screen/alert/status_effect/cuffed_item/update_overlays()
+ . = ..()
+ if(!attached_effect)
+ return
+ var/datum/status_effect/cuffed_item/effect = attached_effect
+ . += add_atom_icon(effect.cuffed)
+ var/mutable_appearance/cuffs_appearance = add_atom_icon(effect.cuffs)
+ cuffs_appearance.transform *= 0.8
+ . += cuffs_appearance
+
+/atom/movable/screen/alert/status_effect/cuffed_item/Click(location, control, params)
+ . = ..()
+ if(.)
+ var/datum/status_effect/cuffed_item/effect = attached_effect
+ effect?.try_remove_cuffs(owner)
diff --git a/code/datums/status_effects/debuffs/choke.dm b/code/datums/status_effects/debuffs/choke.dm
index e8af4b1b94dc..7f87fba7abda 100644
--- a/code/datums/status_effects/debuffs/choke.dm
+++ b/code/datums/status_effects/debuffs/choke.dm
@@ -66,7 +66,7 @@
if(flaming)
ash = new(owner, /particles/smoke/ash, PARTICLE_ATTACH_MOB)
var/clear_in = rand(15 SECONDS, 25 SECONDS)
- if(duration != -1)
+ if(duration != STATUS_EFFECT_PERMANENT)
clear_in = min(duration, clear_in)
addtimer(CALLBACK(src, PROC_REF(clear_flame)), clear_in)
return TRUE
@@ -163,7 +163,7 @@
/datum/status_effect/choke/proc/attempt_eat(mob/source, atom/eating)
SIGNAL_HANDLER
source.balloon_alert(source, "can't get it down!")
- return COMSIG_CARBON_BLOCK_EAT
+ return BLOCK_EAT_ATTEMPT
/datum/status_effect/choke/proc/helped(mob/source, mob/helping)
SIGNAL_HANDLER
@@ -264,7 +264,7 @@
// If we ain't starting, deal a tad bit of brute, as a treat
// Note, we attempt to process 10 times a second, so over 7 seconds this'll deal 14 brute
if(!before_work)
- victim.adjustBruteLoss(0.2)
+ victim.adjust_brute_loss(0.2)
return TRUE
/datum/status_effect/choke/tick(seconds_between_ticks)
diff --git a/code/datums/status_effects/debuffs/confusion.dm b/code/datums/status_effects/debuffs/confusion.dm
index 881eb6a5c36c..d7e6f47af4a2 100644
--- a/code/datums/status_effects/debuffs/confusion.dm
+++ b/code/datums/status_effects/debuffs/confusion.dm
@@ -27,7 +27,7 @@
SIGNAL_HANDLER
// How much time is left in the duration, in seconds.
- var/time_left = (duration - world.time) / 10
+ var/time_left = duration / 10
var/direction = move_args[MOVE_ARG_DIRECTION]
var/new_dir
diff --git a/code/datums/status_effects/debuffs/cursed.dm b/code/datums/status_effects/debuffs/cursed.dm
index 083bd678635e..da3a5371910c 100644
--- a/code/datums/status_effects/debuffs/cursed.dm
+++ b/code/datums/status_effects/debuffs/cursed.dm
@@ -2,7 +2,7 @@
/// Status effect that gives the target miscellanous debuffs while throwing a status alert and causing them to smoke from the damage they're incurring.
/// Purposebuilt for cursed slot machines.
-/datum/status_effect/grouped/cursed
+/datum/status_effect/slot_machine_curse
id = "cursed"
alert_type = /atom/movable/screen/alert/status_effect/cursed
remove_on_fullheal = TRUE
@@ -20,7 +20,7 @@
/// The cached path of the particles we're using to smoke
var/smoke_path = null
-/datum/status_effect/grouped/cursed/on_apply()
+/datum/status_effect/slot_machine_curse/on_apply()
RegisterSignal(owner, COMSIG_MOB_STATCHANGE, PROC_REF(on_stat_changed))
RegisterSignal(owner, COMSIG_LIVING_DEATH, PROC_REF(on_death))
RegisterSignal(owner, COMSIG_CURSED_SLOT_MACHINE_USE, PROC_REF(check_curses))
@@ -28,7 +28,7 @@
RegisterSignal(SSdcs, COMSIG_GLOB_CURSED_SLOT_MACHINE_WON, PROC_REF(clear_curses))
return ..()
-/datum/status_effect/grouped/cursed/Destroy()
+/datum/status_effect/slot_machine_curse/Destroy()
UnregisterSignal(SSdcs, COMSIG_GLOB_CURSED_SLOT_MACHINE_WON)
branded_hand = null
if (smoke_path)
@@ -36,7 +36,7 @@
return ..()
/// Checks the number of curses we have and returns information back to the slot machine. `max_curse_amount` is set by the slot machine itself.
-/datum/status_effect/grouped/cursed/proc/check_curses(mob/user, max_curse_amount)
+/datum/status_effect/slot_machine_curse/proc/check_curses(mob/user, max_curse_amount)
SIGNAL_HANDLER
if(curse_count >= max_curse_amount)
return SLOT_MACHINE_USE_CANCEL
@@ -46,7 +46,7 @@
return SLOT_MACHINE_USE_POSTPONE
/// Handles the debuffs of this status effect and incrementing the number of curses we have.
-/datum/status_effect/grouped/cursed/proc/update_curse_count()
+/datum/status_effect/slot_machine_curse/proc/update_curse_count()
SIGNAL_HANDLER
curse_count++
@@ -55,7 +55,7 @@
addtimer(CALLBACK(src, PROC_REF(handle_after_effects), 1 SECONDS)) // give it a second to let the failure sink in before we exact our toll
/// Makes a nice lorey message about the curse level we're at. I think it's nice
-/datum/status_effect/grouped/cursed/proc/handle_after_effects()
+/datum/status_effect/slot_machine_curse/proc/handle_after_effects()
if(QDELETED(src))
return
@@ -114,7 +114,7 @@
monologuing = FALSE
/// Cleans ourselves up and removes our curses. Meant to be done in a "positive" way, when the curse is broken. Directly use qdel otherwise.
-/datum/status_effect/grouped/cursed/proc/clear_curses()
+/datum/status_effect/slot_machine_curse/proc/clear_curses()
SIGNAL_HANDLER
if(!isnull(branded_hand))
@@ -128,7 +128,7 @@
qdel(src)
/// If our owner's stat changes, rapidly surge the damage chance.
-/datum/status_effect/grouped/cursed/proc/on_stat_changed()
+/datum/status_effect/slot_machine_curse/proc/on_stat_changed()
SIGNAL_HANDLER
if(owner.stat == CONSCIOUS || owner.stat == DEAD) // reset on these two states
damage_chance = initial(damage_chance)
@@ -138,13 +138,13 @@
damage_chance += 75 //ruh roh raggy
/// If our owner dies without getting gibbed (as in of other causes), stop smoking because we've "expended all the life energy".
-/datum/status_effect/grouped/cursed/proc/on_death(mob/living/source, gibbed)
+/datum/status_effect/slot_machine_curse/proc/on_death(mob/living/source, gibbed)
SIGNAL_HANDLER
if(!gibbed && smoke_path)
owner.remove_shared_particles(smoke_path)
-/datum/status_effect/grouped/cursed/update_particles()
+/datum/status_effect/slot_machine_curse/update_particles()
var/particle_path = /particles/smoke/steam/mild
switch(curse_count)
if(2 to 3)
@@ -160,7 +160,7 @@
owner.add_shared_particles(particle_path)
smoke_path = particle_path
-/datum/status_effect/grouped/cursed/tick(seconds_between_ticks)
+/datum/status_effect/slot_machine_curse/tick(seconds_between_ticks)
if(curse_count <= 1)
return // you get one "freebie" (single damage) to nudge you into thinking this is a bad idea before the house begins to win.
@@ -178,12 +178,13 @@
/atom/movable/screen/alert/status_effect/cursed
name = "Cursed!"
desc = "The brand on your hand reminds you of your greed, yet you seem to be okay otherwise."
- icon_state = "cursed_by_slots"
+ use_user_hud_icon = TRUE
+ overlay_state = "cursed_by_slots"
/atom/movable/screen/alert/status_effect/cursed/update_desc()
. = ..()
- var/datum/status_effect/grouped/cursed/linked_effect = attached_effect
- var/curses = linked_effect.curse_count
+ var/datum/status_effect/slot_machine_curse/linked_effect = attached_effect
+ var/curses = linked_effect?.curse_count
switch(curses)
if(2)
desc = "Your greed is catching up to you..."
diff --git a/code/datums/status_effects/debuffs/debuffs.dm b/code/datums/status_effects/debuffs/debuffs.dm
index 3ae33be7acd2..c39670d25a8d 100644
--- a/code/datums/status_effects/debuffs/debuffs.dm
+++ b/code/datums/status_effects/debuffs/debuffs.dm
@@ -124,8 +124,8 @@
return ..()
/datum/status_effect/incapacitating/unconscious/tick(seconds_between_ticks)
- if(owner.getStaminaLoss())
- owner.adjustStaminaLoss(-0.3) //reduce stamina loss by 0.3 per tick, 6 per 2 seconds
+ if(owner.get_stamina_loss())
+ owner.adjust_stamina_loss(-0.3) //reduce stamina loss by 0.3 per tick, 6 per 2 seconds
//SLEEPING
@@ -233,10 +233,10 @@
to_chat(carbon_owner, span_notice("You feel your fitness improving!"))
if(health_ratio > 0.8) // only heals minor physical damage
- need_mob_update += owner.adjustBruteLoss(-0.4 * sleep_quality * seconds_between_ticks, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
- need_mob_update += owner.adjustFireLoss(-0.4 * sleep_quality * seconds_between_ticks, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
- need_mob_update += owner.adjustToxLoss(-0.2 * sleep_quality * seconds_between_ticks, updating_health = FALSE, forced = TRUE, required_biotype = MOB_ORGANIC)
- need_mob_update += owner.adjustStaminaLoss(min(-0.4 * sleep_quality * seconds_between_ticks, -0.4 * HEALING_SLEEP_DEFAULT * seconds_between_ticks), updating_stamina = FALSE)
+ need_mob_update += owner.adjust_brute_loss(-0.4 * sleep_quality * seconds_between_ticks, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
+ need_mob_update += owner.adjust_fire_loss(-0.4 * sleep_quality * seconds_between_ticks, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
+ need_mob_update += owner.adjust_tox_loss(-0.2 * sleep_quality * seconds_between_ticks, updating_health = FALSE, forced = TRUE, required_biotype = MOB_ORGANIC)
+ need_mob_update += owner.adjust_stamina_loss(min(-0.4 * sleep_quality * seconds_between_ticks, -0.4 * HEALING_SLEEP_DEFAULT * seconds_between_ticks), updating_stamina = FALSE)
if(need_mob_update)
owner.updatehealth()
// Drunkenness gets reduced by 0.3% per tick (6% per 2 seconds)
@@ -252,7 +252,8 @@
/atom/movable/screen/alert/status_effect/asleep
name = "Asleep"
desc = "You've fallen asleep. Wait a bit and you should wake up. Unless you don't, considering how helpless you are."
- icon_state = "asleep"
+ use_user_hud_icon = TRUE
+ overlay_state = "asleep"
//STASIS
/datum/status_effect/grouped/stasis
@@ -305,7 +306,8 @@
/atom/movable/screen/alert/status_effect/stasis
name = "Stasis"
desc = "Your biological functions have halted. You could live forever this way, but it's pretty boring."
- icon_state = "stasis"
+ use_user_hud_icon = TRUE
+ overlay_state = "stasis"
/datum/status_effect/his_wrath //does minor damage over time unless holding His Grace
id = "his_wrath"
@@ -330,9 +332,9 @@
qdel(src)
return
var/need_mob_update
- need_mob_update = owner.adjustBruteLoss(0.04 * seconds_between_ticks, updating_health = FALSE)
- need_mob_update += owner.adjustFireLoss(0.04 * seconds_between_ticks, updating_health = FALSE)
- need_mob_update += owner.adjustToxLoss(0.08 * seconds_between_ticks, updating_health = FALSE, forced = TRUE)
+ need_mob_update = owner.adjust_brute_loss(0.04 * seconds_between_ticks, updating_health = FALSE)
+ need_mob_update += owner.adjust_fire_loss(0.04 * seconds_between_ticks, updating_health = FALSE)
+ need_mob_update += owner.adjust_tox_loss(0.08 * seconds_between_ticks, updating_health = FALSE, forced = TRUE)
if(need_mob_update)
owner.updatehealth()
@@ -370,8 +372,8 @@
return FALSE
marked_underlay = new()
- marked_underlay.pixel_w = -owner.pixel_x
- marked_underlay.pixel_z = -owner.pixel_y
+ marked_underlay.pixel_w = -(owner.base_pixel_x + owner.base_pixel_w)
+ marked_underlay.pixel_z = -(owner.base_pixel_y + owner.base_pixel_z)
marked_underlay.transform *= 0.5
owner.vis_contents += marked_underlay
animate(marked_underlay, ready_delay, transform = matrix() * 1.2, flags = CIRCULAR_EASING | EASE_IN)
@@ -410,7 +412,7 @@
new /obj/effect/temp_visual/bleed(get_turf(owner))
/datum/status_effect/stacking/saw_bleed/threshold_cross_effect()
- owner.adjustBruteLoss(bleed_damage)
+ owner.adjust_brute_loss(bleed_damage)
new /obj/effect/temp_visual/bleed/explode(get_turf(owner))
for(var/splatter_dir in GLOB.alldirs)
owner.create_splatter(splatter_dir)
@@ -445,7 +447,7 @@
for(var/datum/wound/bleeding_thing as anything in throat.wounds)
var/datum/wound_pregen_data/pregen_data = GLOB.all_wound_pregen_data[bleeding_thing.type]
- if(pregen_data.wounding_types_valid(list(WOUND_SLASH)) && bleeding_thing.severity > WOUND_SEVERITY_MODERATE && bleeding_thing.blood_flow > 0)
+ if(pregen_data.wounding_types_valid(WOUND_SLASH) && bleeding_thing.severity > WOUND_SEVERITY_MODERATE && bleeding_thing.blood_flow > 0)
still_bleeding = TRUE
break
if(!still_bleeding)
@@ -522,7 +524,7 @@
wasting_effect.alpha = 255
animate(wasting_effect, alpha = 0, time = 32)
playsound(owner, 'sound/effects/curse/curse5.ogg', 20, TRUE, -1)
- owner.adjustFireLoss(0.75)
+ owner.adjust_fire_loss(0.75)
if(curse_flags & CURSE_GRASPING)
if(effect_next_activation > world.time)
@@ -566,7 +568,8 @@
/atom/movable/screen/alert/status_effect/trance
name = "Trance"
desc = "Everything feels so distant, and you can feel your thoughts forming loops inside your head..."
- icon_state = "high"
+ use_user_hud_icon = TRUE
+ overlay_state = "high"
/datum/status_effect/trance/tick(seconds_between_ticks)
if(stun)
@@ -692,7 +695,8 @@
/atom/movable/screen/alert/status_effect/convulsing
name = "Shaky Hands"
desc = "You've been zapped with something and your hands can't stop shaking! You can't seem to hold on to anything."
- icon_state = "convulsing"
+ use_user_hud_icon = TRUE
+ overlay_state = "convulsing"
/datum/status_effect/dna_melt
id = "dna_melt"
@@ -715,7 +719,8 @@
/atom/movable/screen/alert/status_effect/dna_melt
name = "Genetic Breakdown"
desc = "I don't feel so good. Your body can't handle the mutations! You have one minute to remove your mutations, or you will be met with a horrible fate."
- icon_state = "dna_melt"
+ use_user_hud_icon = TRUE
+ overlay_state = "dna_melt"
/datum/status_effect/go_away
id = "go_away"
@@ -763,7 +768,8 @@
/atom/movable/screen/alert/status_effect/go_away
name = "TO THE STARS AND BEYOND!"
desc = "I must go, my people need me!"
- icon_state = "high"
+ use_user_hud_icon = TRUE
+ overlay_state = "high"
/datum/status_effect/fake_virus
id = "fake_virus"
@@ -910,7 +916,8 @@
/atom/movable/screen/alert/status_effect/ants
name = "Ants!"
desc = span_warning("JESUS FUCKING CHRIST! CLICK TO GET THOSE THINGS OFF!")
- icon_state = "antalert"
+ use_user_hud_icon = TRUE
+ overlay_state = "antalert"
clickable_glow = TRUE
/atom/movable/screen/alert/status_effect/ants/Click()
@@ -990,7 +997,8 @@
/atom/movable/screen/alert/status_effect/discoordinated
name = "Discoordinated"
desc = "You can't seem to properly use anything..."
- icon_state = "convulsing"
+ use_user_hud_icon = TRUE
+ overlay_state = "convulsing"
/datum/status_effect/discoordinated/on_apply()
ADD_TRAIT(owner, TRAIT_DISCOORDINATED_TOOL_USER, TRAIT_STATUS_EFFECT(id))
@@ -1028,7 +1036,8 @@
/atom/movable/screen/alert/status_effect/careful_driving
name = "Careful Driving"
desc = "That was close! You almost ran that one over!"
- icon_state = "paralysis"
+ use_user_hud_icon = TRUE
+ overlay_state = "paralysis"
/datum/movespeed_modifier/careful_driving
multiplicative_slowdown = 3
@@ -1054,13 +1063,13 @@
/atom/movable/screen/alert/status_effect/midas_blight
name = "Midas Blight"
desc = "Your blood is being turned to gold, slowing your movements!"
- icon_state = "midas_blight"
+ use_user_hud_icon = TRUE
+ overlay_state = "midas_blight"
/datum/status_effect/midas_blight/tick(seconds_between_ticks)
var/mob/living/carbon/human/victim = owner
// We're transmuting blood, time to lose some.
- if(victim.blood_volume > BLOOD_VOLUME_SURVIVE + 50 && !HAS_TRAIT(victim, TRAIT_NOBLOOD))
- victim.blood_volume -= 5 * seconds_between_ticks
+ victim.adjust_blood_volume(-5 * seconds_between_ticks, minimum = BLOOD_VOLUME_SURVIVE + 50)
// This has been hell to try and balance so that you'll actually get anything out of it
victim.reagents.add_reagent(/datum/reagent/gold/cursed, amount = seconds_between_ticks * goldscale, no_react = TRUE)
var/current_gold_amount = victim.reagents.get_reagent_amount(/datum/reagent/gold, type_check = REAGENT_SUB_TYPE)
@@ -1104,7 +1113,8 @@
/atom/movable/screen/alert/status_effect/designated_target
name = "Designated Target"
desc = "You've been lit up by some kind of bright energy! Wash it off to get rid of it, or you'll be a lot easier to hit!"
- icon_state = "designated_target"
+ use_user_hud_icon = TRUE
+ overlay_state = "designated_target"
/datum/status_effect/designated_target
id = "designated_target"
diff --git a/code/datums/status_effects/debuffs/decloning.dm b/code/datums/status_effects/debuffs/decloning.dm
index 0f76f10f470d..074fc8ec1fc9 100644
--- a/code/datums/status_effects/debuffs/decloning.dm
+++ b/code/datums/status_effects/debuffs/decloning.dm
@@ -77,7 +77,8 @@
/atom/movable/screen/alert/status_effect/decloning
name = "Cellular Meltdown"
desc = "Your body is deforming, and doesn't feel like it's going to hold up much longer. You are going to need treatment soon."
- icon_state = "dna_melt"
+ use_user_hud_icon = TRUE
+ overlay_state = "dna_melt"
/datum/movespeed_modifier/decloning
multiplicative_slowdown = 0.7
diff --git a/code/datums/status_effects/debuffs/dizziness.dm b/code/datums/status_effects/debuffs/dizziness.dm
index b47083aa5e37..547ba44df502 100644
--- a/code/datums/status_effects/debuffs/dizziness.dm
+++ b/code/datums/status_effects/debuffs/dizziness.dm
@@ -26,7 +26,7 @@
/datum/status_effect/dizziness/tick(seconds_between_ticks)
// How much time is left, in seconds
- var/amount = (duration - world.time) / 10
+ var/amount = duration / 10
if(amount <= 0)
return
diff --git a/code/datums/status_effects/debuffs/dna_transformation.dm b/code/datums/status_effects/debuffs/dna_transformation.dm
index 46e125a391e8..bd2a079d6f8b 100644
--- a/code/datums/status_effects/debuffs/dna_transformation.dm
+++ b/code/datums/status_effects/debuffs/dna_transformation.dm
@@ -82,10 +82,10 @@
if(duration == STATUS_EFFECT_PERMANENT)
return // Already paused
- time_before_pause = duration - world.time
+ time_before_pause = duration
duration = STATUS_EFFECT_PERMANENT
// Resume if we're none of the above and also were paused
else if(time_before_pause != -1)
- duration = time_before_pause + world.time
+ duration = time_before_pause
time_before_pause = -1
diff --git a/code/datums/status_effects/debuffs/drugginess.dm b/code/datums/status_effects/debuffs/drugginess.dm
index 8730e0ccd6ec..e0b7a4da57f3 100644
--- a/code/datums/status_effects/debuffs/drugginess.dm
+++ b/code/datums/status_effects/debuffs/drugginess.dm
@@ -36,4 +36,5 @@
/atom/movable/screen/alert/status_effect/high
name = "High"
desc = "Whoa man, you're tripping balls! Careful you don't get addicted... if you aren't already."
- icon_state = "high"
+ use_user_hud_icon = TRUE
+ overlay_state = "high"
diff --git a/code/datums/status_effects/debuffs/drunk.dm b/code/datums/status_effects/debuffs/drunk.dm
index 8202f526f26b..ca8a1ef98a2a 100644
--- a/code/datums/status_effects/debuffs/drunk.dm
+++ b/code/datums/status_effects/debuffs/drunk.dm
@@ -18,8 +18,8 @@
alert_type = null
/// The level of drunkness we are currently at.
var/drunk_value = 0
- /// If TRUE, drunk_value will be capped at 51, preventing serious damage
- var/iron_liver = FALSE
+ /// If TRUE, drunk_value will be capped at 51, preventing serious damage
+ var/iron_liver = FALSE
/datum/status_effect/inebriated/on_creation(mob/living/new_owner, drunk_value = 0)
. = ..()
@@ -108,6 +108,7 @@
. = ..()
owner.sound_environment_override = SOUND_ENVIRONMENT_PSYCHOTIC
owner.add_mood_event(id, /datum/mood_event/drunk, drunk_value)
+ owner.clear_mood_event("[id]_after")
RegisterSignal(owner, COMSIG_MOB_FIRED_GUN, PROC_REF(drunk_gun_fired))
/datum/status_effect/inebriated/drunk/on_remove()
@@ -122,6 +123,8 @@
/// Clears any side effects we set due to being drunk.
/datum/status_effect/inebriated/drunk/proc/clear_effects()
owner.clear_mood_event(id)
+ if(!QDELING(owner) && HAS_PERSONALITY(owner, /datum/personality/bibulous))
+ owner.add_mood_event("[id]_after", /datum/mood_event/drunk_after)
if(owner.sound_environment_override == SOUND_ENVIRONMENT_PSYCHOTIC)
owner.sound_environment_override = SOUND_ENVIRONMENT_NONE
@@ -198,20 +201,20 @@
// Over 81, we will gain constant toxloss
if(drunk_value >= 81)
- owner.adjustToxLoss(1)
+ owner.adjust_tox_loss(1)
if(owner.stat == CONSCIOUS && prob(5))
to_chat(owner, span_warning("Maybe you should lie down for a bit..."))
// Over 91, we gain even more toxloss, brain damage, and have a chance of dropping into a long sleep
if(drunk_value >= 91)
- owner.adjustToxLoss(1)
- owner.adjustOrganLoss(ORGAN_SLOT_BRAIN, 0.4)
+ owner.adjust_tox_loss(1)
+ owner.adjust_organ_loss(ORGAN_SLOT_BRAIN, 0.4)
if(owner.stat == CONSCIOUS)
attempt_to_blackout()
// And finally, over 100 - let's be honest, you shouldn't be alive by now.
if(drunk_value >= 101)
- owner.adjustToxLoss(2)
+ owner.adjust_tox_loss(2)
/datum/status_effect/inebriated/drunk/proc/attempt_to_blackout()
var/mob/living/carbon/drunkard = owner
@@ -233,7 +236,8 @@
name = "Drunk"
desc = "All that alcohol you've been drinking is impairing your speech, \
motor skills, and mental cognition. Make sure to act like it."
- icon_state = "drunk"
+ use_user_hud_icon = TRUE
+ overlay_state = "drunk"
#undef BALLMER_PEAK_LOW_END
#undef BALLMER_PEAK_HIGH_END
diff --git a/code/datums/status_effects/debuffs/fire_stacks.dm b/code/datums/status_effects/debuffs/fire_stacks.dm
index 3367eb8176ca..b4b46a8a1c25 100644
--- a/code/datums/status_effects/debuffs/fire_stacks.dm
+++ b/code/datums/status_effects/debuffs/fire_stacks.dm
@@ -170,6 +170,7 @@
var/decay_multiplier = HAS_TRAIT(owner, TRAIT_HUSK) ? 2 : 1 // husks decay twice as fast
adjust_stacks(owner.fire_stack_decay_rate * decay_multiplier * seconds_between_ticks)
+ SEND_SIGNAL(owner, COMSIG_FIRE_STACKS_UPDATED, stacks)
if(stacks <= 0)
qdel(src)
@@ -280,7 +281,7 @@
owner.clear_mood_event("on_fire")
SEND_SIGNAL(owner, COMSIG_LIVING_EXTINGUISHED, owner)
cache_stacks()
- for(var/obj/item/equipped in (owner.get_equipped_items(INCLUDE_HELD)))
+ for(var/obj/item/equipped as anything in owner.get_equipped_items(INCLUDE_HELD|INCLUDE_PROSTHETICS|INCLUDE_ABSTRACT))
equipped.extinguish()
/datum/status_effect/fire_handler/fire_stacks/on_remove()
diff --git a/code/datums/status_effects/debuffs/genetic_damage.dm b/code/datums/status_effects/debuffs/genetic_damage.dm
index 9eb90b917b7a..c0ae16d4082e 100644
--- a/code/datums/status_effects/debuffs/genetic_damage.dm
+++ b/code/datums/status_effects/debuffs/genetic_damage.dm
@@ -39,7 +39,7 @@
return
if(total_damage >= minimum_before_tox_damage)
- owner.adjustToxLoss(toxin_damage_per_second * seconds_between_ticks)
+ owner.adjust_tox_loss(toxin_damage_per_second * seconds_between_ticks)
total_damage -= remove_per_second * seconds_between_ticks
if(total_damage <= 0)
diff --git a/code/datums/status_effects/debuffs/hallucination.dm b/code/datums/status_effects/debuffs/hallucination.dm
index e5528a663821..9c40203c1dd7 100644
--- a/code/datums/status_effects/debuffs/hallucination.dm
+++ b/code/datums/status_effects/debuffs/hallucination.dm
@@ -94,7 +94,7 @@
var/lower_cd = lower_tick_interval
var/upper_cd = upper_tick_interval
if(variable_tier)
- var/seconds_left = (duration - world.time) / 10
+ var/seconds_left = duration / 10
switch(seconds_left)
if(0 to 20)
max_hallucination_tier = HALLUCINATION_TIER_COMMON
diff --git a/code/datums/status_effects/debuffs/heart_attack.dm b/code/datums/status_effects/debuffs/heart_attack.dm
index 520443f15849..592162ea0f89 100644
--- a/code/datums/status_effects/debuffs/heart_attack.dm
+++ b/code/datums/status_effects/debuffs/heart_attack.dm
@@ -47,12 +47,12 @@
if(time_until_stoppage > ATTACK_STAGE_THREE)
if(SPT_PROB(5, seconds_between_ticks))
owner.playsound_local(owner, 'sound/effects/singlebeat.ogg', 25, FALSE, use_reverb = FALSE)
- owner.adjustStaminaLoss(5)
+ owner.adjust_stamina_loss(5)
if(time_until_stoppage <= ATTACK_STAGE_TWO && time_until_stoppage > ATTACK_STAGE_THREE) //This coughing gets replaced with worse coughing, no need to stack it.
if(SPT_PROB(10, seconds_between_ticks))
owner.emote("cough")
- owner.adjustStaminaLoss(10)
+ owner.adjust_stamina_loss(10)
oxyloss_sum += 4
if(time_until_stoppage <= ATTACK_STAGE_THREE) //At this point, we start with chat messages and make it clear that something is very wrong.
@@ -69,7 +69,7 @@
if(SPT_PROB(8, seconds_between_ticks))
to_chat(owner, span_danger("You feel very weak and dizzy..."))
owner.adjust_confusion_up_to(6 SECONDS, 10 SECONDS)
- owner.adjustStaminaLoss(20)
+ owner.adjust_stamina_loss(20)
owner.emote("cough")
oxyloss_sum += 8
@@ -79,7 +79,7 @@
to_chat(owner, span_userdanger("It feels like you're shutting down..."))
owner.adjust_dizzy_up_to(4 SECONDS, 10 SECONDS)
owner.adjust_eye_blur_up_to(4 SECONDS, 20 SECONDS)
- owner.adjustStaminaLoss(20)
+ owner.adjust_stamina_loss(20)
if(SPT_PROB(5, seconds_between_ticks))
owner.emote("cough")
@@ -94,8 +94,8 @@
owner.Paralyze(1 SECONDS)
oxyloss_sum += 3
- if(owner.getOxyLoss() < OXYLOSS_MAXIMUM) //A bad enough roll on the verge of passing out might still push you over into unconciousness for a few seconds...?
- owner.adjustOxyLoss(oxyloss_sum)
+ if(owner.get_oxy_loss() < OXYLOSS_MAXIMUM) //A bad enough roll on the verge of passing out might still push you over into unconciousness for a few seconds...?
+ owner.adjust_oxy_loss(oxyloss_sum)
if(time_until_stoppage <= 0)
if(owner.stat == CONSCIOUS)
diff --git a/code/datums/status_effects/debuffs/hooked.dm b/code/datums/status_effects/debuffs/hooked.dm
index 41583e8b5f4d..cc5aa30fadba 100644
--- a/code/datums/status_effects/debuffs/hooked.dm
+++ b/code/datums/status_effects/debuffs/hooked.dm
@@ -22,7 +22,8 @@
/atom/movable/screen/alert/status_effect/hooked
name = "Snagged By Hook"
desc = "You're being caught like a fish by some asshat! Click to safely remove the hook or move away far enough to snap it off."
- icon_state = "hooked"
+ use_user_hud_icon = TRUE
+ overlay_state = "hooked"
clickable_glow = TRUE
/atom/movable/screen/alert/status_effect/hooked/Click()
@@ -58,4 +59,5 @@
/atom/movable/screen/alert/status_effect/hooked/jaws
name = "Snagged By Jaws"
desc = "You've been snagged by some sort of beartrap-slash-fishing-hook-gizmo! Click to safely remove the hook or move away far enough to snap it off."
- icon_state = "hooked_jaws"
+ use_user_hud_icon = TRUE
+ overlay_state = "hooked_jaws"
diff --git a/code/datums/status_effects/debuffs/jitteriness.dm b/code/datums/status_effects/debuffs/jitteriness.dm
index ad9a7625133c..50bb8b5e09f4 100644
--- a/code/datums/status_effects/debuffs/jitteriness.dm
+++ b/code/datums/status_effects/debuffs/jitteriness.dm
@@ -25,7 +25,7 @@
owner.update_offsets()
/datum/status_effect/jitter/get_examine_text()
- switch(duration - world.time)
+ switch(duration)
if(5 MINUTES to INFINITY)
return span_boldwarning("[owner.p_They()] [owner.p_are()] convulsing violently!")
if(3 MINUTES to 5 MINUTES)
@@ -47,7 +47,7 @@
if(owner.resting && remove_duration(4 * seconds_between_ticks))
return
- var/time_left_in_seconds = (duration - world.time) / 10
+ var/time_left_in_seconds = duration / 10
owner.do_jitter_animation(time_left_in_seconds)
/// Helper proc that causes the mob to do a jittering animation by jitter_amount.
diff --git a/code/datums/status_effects/debuffs/phobia.dm b/code/datums/status_effects/debuffs/phobia.dm
deleted file mode 100644
index 76520e4dc588..000000000000
--- a/code/datums/status_effects/debuffs/phobia.dm
+++ /dev/null
@@ -1,77 +0,0 @@
-/// Basically a cooldown which makes you emote when it starts, but allows it to be easily shared between multiple phobias
-/datum/status_effect/minor_phobia_reaction
- id = "phobia_minor"
- duration = 12 SECONDS
- alert_type = null
-
-/datum/status_effect/minor_phobia_reaction/on_apply()
- . = ..()
- owner.emote("scream")
- owner.set_jitter_if_lower(6 SECONDS)
- owner.add_mood_event("phobia_minor", /datum/mood_event/startled)
-
-/// Stacking severity of phobic reaction
-/// The more stacks you are the more scared you are
-/datum/status_effect/stacking/phobia_reaction
- id = "phobia"
- status_type = STATUS_EFFECT_REFRESH
- stacks = 1
- max_stacks = 6
- tick_interval = 40 SECONDS
- consumed_on_threshold = FALSE
-
-/datum/status_effect/stacking/phobia_reaction/on_creation(mob/living/new_owner, stacks_to_apply = 1, mood_event_type)
- . = ..()
- if (!.)
- return FALSE
-
- if (mood_event_type)
- owner.add_mood_event("phobia", mood_event_type)
- return TRUE
-
-/datum/status_effect/stacking/phobia_reaction/refresh(effect, stacks_to_add)
- . = ..()
- add_stacks(stacks_to_add)
-
-/datum/status_effect/stacking/phobia_reaction/add_stacks(stacks_added)
- . = ..()
- if (stacks_added <= 0 || stacks <= 0)
- return
-
- var/reaction = rand(1,4)
- switch(reaction)
- if(1)
- to_chat(owner, span_warning("You are startled!"))
- owner.emote("jump")
- owner.Immobilize(0.1 SECONDS * stacks)
-
- if(2)
- owner.emote("scream")
- owner.say("AAAAH!!", forced = "phobia")
-
- if(stacks >= 5)
- var/held_item = owner.get_active_held_item()
- if (owner.dropItemToGround(held_item))
- owner.visible_message(
- span_danger("[owner.name] drops \the [held_item]!"),
- span_warning("You drop \the [held_item]!"), null, COMBAT_MESSAGE_RANGE)
-
- if(3)
- to_chat(owner, span_warning("You lose your balance!"))
- owner.adjust_staggered_up_to(2 SECONDS * stacks, 20 SECONDS)
- owner.add_movespeed_modifier(/datum/movespeed_modifier/status_effect/spooked)
- // We're relying on the fact that there's a 12 second application cooldown to not have to bother cancelling and replacing this timer
- // So if you adjust the duration keep that in mind
- addtimer(CALLBACK(src, PROC_REF(speed_up)), 1 SECONDS * stacks, TIMER_STOPPABLE | TIMER_DELETE_ME)
-
- if(4)
- to_chat(owner, span_warning("You feel faint with fright!"))
- owner.adjust_dizzy_up_to(2 SECONDS * stacks, 20 SECONDS)
- owner.adjust_eye_blur_up_to(1.5 SECONDS * stacks, 6 SECONDS)
-
-/datum/status_effect/stacking/phobia_reaction/fadeout_effect()
- to_chat(owner, span_notice("You calm down."))
-
-/// Remove our active movespeed modifier
-/datum/status_effect/stacking/phobia_reaction/proc/speed_up()
- owner.remove_movespeed_modifier(/datum/movespeed_modifier/status_effect/spooked)
diff --git a/code/datums/status_effects/debuffs/rust_corruption.dm b/code/datums/status_effects/debuffs/rust_corruption.dm
index 6ba9d6a4ee95..6692ef111a08 100644
--- a/code/datums/status_effects/debuffs/rust_corruption.dm
+++ b/code/datums/status_effects/debuffs/rust_corruption.dm
@@ -5,8 +5,14 @@
remove_on_fullheal = TRUE
/datum/status_effect/rust_corruption/tick(seconds_between_ticks)
- if(issilicon(owner))
- owner.adjustBruteLoss(10 * seconds_between_ticks)
+ if(issilicon(owner) || isbot(owner))
+ owner.adjust_brute_loss(10 * seconds_between_ticks)
return
owner.adjust_disgust(5 * seconds_between_ticks)
owner.reagents?.remove_all(0.75 * seconds_between_ticks)
+ if(!iscarbon(owner))
+ return
+ var/mob/living/carbon/carbon_owner = owner
+ for(var/obj/item/bodypart/robotic_limb as anything in carbon_owner.bodyparts)
+ if(IS_ROBOTIC_LIMB(robotic_limb))
+ robotic_limb.receive_damage(10)
diff --git a/code/datums/status_effects/debuffs/screen_blur.dm b/code/datums/status_effects/debuffs/screen_blur.dm
index acdce13b5a08..ee893610c12c 100644
--- a/code/datums/status_effects/debuffs/screen_blur.dm
+++ b/code/datums/status_effects/debuffs/screen_blur.dm
@@ -49,7 +49,7 @@
game_plane_master_controller.remove_filter("eye_blur")
return
- var/time_left_in_seconds = (duration - world.time) / (1 SECONDS)
+ var/time_left_in_seconds = duration / 10
var/amount_of_blur = clamp(time_left_in_seconds * BLUR_DURATION_TO_INTENSITY, 0.6, 3)
game_plane_master_controller.add_filter("eye_blur", 1, gauss_blur_filter(amount_of_blur))
diff --git a/code/datums/status_effects/debuffs/slime/slime_leech.dm b/code/datums/status_effects/debuffs/slime/slime_leech.dm
index 00c907d8d95e..661b73a203af 100644
--- a/code/datums/status_effects/debuffs/slime/slime_leech.dm
+++ b/code/datums/status_effects/debuffs/slime/slime_leech.dm
@@ -1,7 +1,8 @@
/atom/movable/screen/alert/status_effect/slime_leech
name = "Covered in Slime"
desc = "A slime is draining your very lifeforce! Remove it by hand, by hitting it, or by water."
- icon_state = "slime_leech"
+ use_user_hud_icon = TRUE
+ overlay_state = "slime_leech"
/datum/status_effect/slime_leech
id = "slime_leech"
@@ -59,18 +60,18 @@
var/totaldamage = 0 //total damage done to this unfortunate soul
if(iscarbon(owner))
- totaldamage += owner.adjustBruteLoss(rand(2, 4) * 0.5 * seconds_between_ticks)
- totaldamage += owner.adjustToxLoss(rand(1, 2) * 0.5 * seconds_between_ticks)
+ totaldamage += owner.adjust_brute_loss(rand(2, 4) * 0.5 * seconds_between_ticks)
+ totaldamage += owner.adjust_tox_loss(rand(1, 2) * 0.5 * seconds_between_ticks)
if(isanimal_or_basicmob(owner))
var/need_mob_update
- need_mob_update = totaldamage += owner.adjustBruteLoss(rand(2, 4) * 0.5 * seconds_between_ticks, updating_health = FALSE)
- need_mob_update += totaldamage += owner.adjustToxLoss(rand(1, 2) * 0.5 * seconds_between_ticks, updating_health = FALSE)
+ need_mob_update = totaldamage += owner.adjust_brute_loss(rand(2, 4) * 0.5 * seconds_between_ticks, updating_health = FALSE)
+ need_mob_update += totaldamage += owner.adjust_tox_loss(rand(1, 2) * 0.5 * seconds_between_ticks, updating_health = FALSE)
if(need_mob_update)
owner.updatehealth()
- if(totaldamage >= 0) // AdjustBruteLoss returns a negative value on successful damage adjustment
+ if(totaldamage >= 0) // adjust_brute_loss() returns a negative value on successful damage adjustment
our_slime.balloon_alert(our_slime, "not food!")
our_slime.stop_feeding()
return
@@ -94,4 +95,4 @@
our_slime.adjust_nutrition(-1 * 1.8 * totaldamage) //damage is already modified by seconds_between_ticks
//Heal yourself.
- our_slime.adjustBruteLoss(-1.5 * seconds_between_ticks)
+ our_slime.adjust_brute_loss(-1.5 * seconds_between_ticks)
diff --git a/code/datums/status_effects/debuffs/slime/slimed.dm b/code/datums/status_effects/debuffs/slime/slimed.dm
index 32fa90482233..b02d1dcc71fb 100644
--- a/code/datums/status_effects/debuffs/slime/slimed.dm
+++ b/code/datums/status_effects/debuffs/slime/slimed.dm
@@ -6,7 +6,8 @@
/atom/movable/screen/alert/status_effect/slimed
name = "Covered in Slime"
desc = "You are covered in slime and it's eating away at you! Click to start cleaning it off, or find a faster way to wash it away!"
- icon_state = "slimed"
+ use_user_hud_icon = TRUE
+ overlay_state = "slimed"
clickable_glow = TRUE
/atom/movable/screen/alert/status_effect/slimed/Click()
diff --git a/code/datums/status_effects/debuffs/spacer.dm b/code/datums/status_effects/debuffs/spacer.dm
index ed14fd285968..e2e8b8be1d40 100644
--- a/code/datums/status_effects/debuffs/spacer.dm
+++ b/code/datums/status_effects/debuffs/spacer.dm
@@ -41,7 +41,7 @@
if(seconds_in_nograv >= 3 MINUTES)
// This has some interesting side effects with gravitum or similar negating effects that may be worth nothing
- owner.adjustStaminaLoss(-1 * stamina_heal_per_tick)
+ owner.adjust_stamina_loss(-1 * stamina_heal_per_tick)
owner.AdjustAllImmobility(-1 * stun_heal_per_tick)
// For comparison: Ephedrine heals 4 stamina per tick / 2 per second
// and Nicotine heals 5 seconds of stun per tick / 2.5 per second
@@ -74,8 +74,8 @@
var/minutes_active = round(seconds_active / (1 MINUTES))
// Sit at a passive amount of stamina damage depending on how long it's been
- if(!the_spacer.getStaminaLoss())
- the_spacer.adjustStaminaLoss(min(25, 5 * minutes_active))
+ if(!the_spacer.get_stamina_loss())
+ the_spacer.adjust_stamina_loss(min(25, 5 * minutes_active))
// Max disgust increases over time as well
max_disgust = min(DISGUST_LEVEL_VERYGROSS + 5, initial(max_disgust) + 5 * minutes_active)
// And your lungs can't really handle it good
@@ -85,10 +85,10 @@
/atom/movable/screen/alert/status_effect/gravity_sickness
name = "Gravity Sickness"
desc = "The gravity of the planet around you is making you feel sick and tired."
- icon_state = "paralysis"
+ use_user_hud_icon = TRUE
+ overlay_state = "paralysis"
/datum/mood_event/spacer
- category = "spacer"
/datum/mood_event/spacer/in_space
description = "Space is long and dark and empty, but it's my home."
diff --git a/code/datums/status_effects/debuffs/staggered.dm b/code/datums/status_effects/debuffs/staggered.dm
index 9919a156c319..4d640b643313 100644
--- a/code/datums/status_effects/debuffs/staggered.dm
+++ b/code/datums/status_effects/debuffs/staggered.dm
@@ -51,7 +51,7 @@
/datum/status_effect/dazed
id = "dazed"
status_type = STATUS_EFFECT_UNIQUE
- tick_interval = 0.5 SECONDS
+ tick_interval = 0.6 SECONDS
alert_type = null
remove_on_fullheal = TRUE
/// Our visual cue for the vulnerable state this status effect puts us in.
@@ -121,9 +121,9 @@
/// Only applied by shoving someone to paralyze them
/datum/status_effect/no_side_kick
id = "no side kick"
- duration = 3.5 SECONDS
+ duration = 3.6 SECONDS
status_type = STATUS_EFFECT_UNIQUE
- tick_interval = 0.5 SECONDS
+ tick_interval = 0.6 SECONDS
alert_type = null
remove_on_fullheal = TRUE
diff --git a/code/datums/status_effects/debuffs/stamcrit.dm b/code/datums/status_effects/debuffs/stamcrit.dm
index 5c8c2b462345..fb5b5e309203 100644
--- a/code/datums/status_effects/debuffs/stamcrit.dm
+++ b/code/datums/status_effects/debuffs/stamcrit.dm
@@ -16,9 +16,9 @@
// This should be in on apply but we need it to happen AFTER being added to the mob
// (Because we need to wait until the status effect is in their status effect list, or we'll add two)
- if(owner.getStaminaLoss() < 120)
+ if(owner.get_stamina_loss() < 120)
// Puts you a little further into the initial stamcrit, makes stamcrit harder to outright counter with chems.
- owner.adjustStaminaLoss(30, FALSE)
+ owner.adjust_stamina_loss(30, FALSE)
// Same
RegisterSignal(owner, COMSIG_LIVING_ADJUST_STAMINA_DAMAGE, PROC_REF(update_diminishing_return))
@@ -80,5 +80,5 @@
qdel(src)
return
- if(owner.maxHealth - owner.getStaminaLoss() > owner.crit_threshold)
+ if(owner.maxHealth - owner.get_stamina_loss() > owner.crit_threshold)
qdel(src)
diff --git a/code/datums/status_effects/debuffs/terrified.dm b/code/datums/status_effects/debuffs/terrified.dm
index dcbe2f1f80ee..b0c984622e8b 100644
--- a/code/datums/status_effects/debuffs/terrified.dm
+++ b/code/datums/status_effects/debuffs/terrified.dm
@@ -26,7 +26,8 @@
/atom/movable/screen/alert/status_effect/terrified
name = "Terrified!"
desc = "You feel a supernatural darkness settle in around you, overwhelming you with panic! Get into the light!"
- icon_state = "terrified"
+ use_user_hud_icon = TRUE
+ overlay_state = "terrified"
#undef TERROR_INITIAL_AMOUNT
#undef STACK_TERROR_AMOUNT
diff --git a/code/datums/status_effects/debuffs/tower_of_babel.dm b/code/datums/status_effects/debuffs/tower_of_babel.dm
index fb6f61a55364..16bc92c25152 100644
--- a/code/datums/status_effects/debuffs/tower_of_babel.dm
+++ b/code/datums/status_effects/debuffs/tower_of_babel.dm
@@ -56,4 +56,5 @@
/atom/movable/screen/alert/status_effect/tower_of_babel
name = "Tower of babel"
desc = "You seem to be babbling in a strange language..."
- icon_state = "mind_control"
+ use_user_hud_icon = TRUE
+ overlay_state = "mind_control"
diff --git a/code/datums/status_effects/debuffs/vision/blindness.dm b/code/datums/status_effects/debuffs/vision/blindness.dm
index caf8e98a2b07..35c643c34e21 100644
--- a/code/datums/status_effects/debuffs/vision/blindness.dm
+++ b/code/datums/status_effects/debuffs/vision/blindness.dm
@@ -25,36 +25,41 @@
return FALSE
RegisterSignals(owner, update_signals, PROC_REF(update_blindness))
- update_blindness()
return ..()
/datum/status_effect/grouped/blindness/source_added(source, ...)
- update_blindness()
+ update_blindness(source)
/datum/status_effect/grouped/blindness/source_removed(source, removing)
if (!removing)
- update_blindness()
+ update_blindness(source)
-/datum/status_effect/grouped/blindness/proc/update_blindness()
+/datum/status_effect/grouped/blindness/proc/update_blindness(changed_source)
if (!CAN_BE_BLIND(owner)) // future proofing
qdel(src)
return
if (!HAS_TRAIT(owner, TRAIT_SIGHT_BYPASS))
- make_blind()
+ make_blind(changed_source)
return
for (var/blocker in blocking_sources)
if (owner.is_blind_from(blocker))
- make_blind()
+ make_blind(changed_source)
return
make_unblind()
-/datum/status_effect/grouped/blindness/proc/make_blind()
- owner.overlay_fullscreen(id, /atom/movable/screen/fullscreen/blind)
+/datum/status_effect/grouped/blindness/proc/make_blind(changed_source)
+ // have some extra logic to determine what overlay to use
+ // by default we use the noflicker overlay
+ // but if our one and only source is from "temp blindness", use flicker overlay
+ var/overlay_to_use = /atom/movable/screen/fullscreen/blind/noflicker
+ if(changed_source == /datum/status_effect/temporary_blindness::id && length(sources) == 1)
+ overlay_to_use = /atom/movable/screen/fullscreen/blind
+ owner.overlay_fullscreen(id, overlay_to_use )
// You are blind - at most, able to make out shapes near you
- owner.add_client_colour(/datum/client_colour/monochrome, REF(src))
+ owner.add_client_colour(/datum/client_colour/blindness, REF(src))
/datum/status_effect/grouped/blindness/proc/make_unblind()
owner.clear_fullscreen(id)
@@ -68,7 +73,8 @@
/atom/movable/screen/alert/status_effect/blind
name = "Blind"
desc = "You can't see! This may be caused by a genetic defect, eye trauma, being unconscious, or something covering your eyes."
- icon_state = "blind"
+ use_user_hud_icon = TRUE
+ overlay_state = "blind"
/// This status effect handles applying a temporary blind to the mob.
/datum/status_effect/temporary_blindness
diff --git a/code/datums/status_effects/drug_effects.dm b/code/datums/status_effects/drug_effects.dm
index 71739ade1812..b498e3d39810 100644
--- a/code/datums/status_effects/drug_effects.dm
+++ b/code/datums/status_effects/drug_effects.dm
@@ -10,7 +10,8 @@
/atom/movable/screen/alert/status_effect/woozy
name = "Woozy"
desc = "You feel a bit slower than usual, it seems doing things with your hands takes longer than it usually does."
- icon_state = "woozy"
+ use_user_hud_icon = TRUE
+ overlay_state = "woozy"
/datum/status_effect/high_blood_pressure
id = "high_blood_pressure"
@@ -36,7 +37,8 @@
/atom/movable/screen/alert/status_effect/high_blood_pressure
name = "High blood pressure"
desc = "Your blood pressure is real high right now ... You'd probably bleed like a stuck pig."
- icon_state = "highbloodpressure"
+ use_user_hud_icon = TRUE
+ overlay_state = "highbloodpressure"
/datum/status_effect/seizure
id = "seizure"
@@ -58,7 +60,8 @@
/atom/movable/screen/alert/status_effect/seizure
name = "Seizure"
desc = "FJOIWEHUWQEFGYUWDGHUIWHUIDWEHUIFDUWGYSXQHUIODSDBNJKVBNKDML <--- this is you right now"
- icon_state = "paralysis"
+ use_user_hud_icon = TRUE
+ overlay_state = "paralysis"
/datum/status_effect/stoned
id = "stoned"
diff --git a/code/datums/status_effects/grouped_effect.dm b/code/datums/status_effects/grouped_effect.dm
index caddfe17fcab..ceb76fd4f86f 100644
--- a/code/datums/status_effects/grouped_effect.dm
+++ b/code/datums/status_effects/grouped_effect.dm
@@ -11,6 +11,11 @@
//Get our supplied arguments, without new_owner
var/list/new_source_args = args.Copy(2)
+ if(isnull(source))
+ stack_trace("Grouped status effect applied without a source")
+ qdel(src)
+ return FALSE
+
var/datum/status_effect/grouped/existing = new_owner.has_status_effect(type)
if(existing)
existing.sources |= source
diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm
index b07ab1339ab4..93e6f89219c6 100644
--- a/code/datums/status_effects/neutral.dm
+++ b/code/datums/status_effects/neutral.dm
@@ -67,7 +67,8 @@
/atom/movable/screen/alert/status_effect/in_love
name = "In Love"
desc = "You feel so wonderfully in love!"
- icon_state = "in_love"
+ use_user_hud_icon = TRUE
+ overlay_state = "in_love"
/datum/status_effect/in_love
id = "in_love"
@@ -151,10 +152,10 @@
spell.reset_spell_cooldown()
var/need_mob_update = FALSE
- need_mob_update += rewarded.adjustBruteLoss(-25, updating_health = FALSE)
- need_mob_update += rewarded.adjustFireLoss(-25, updating_health = FALSE)
- need_mob_update += rewarded.adjustToxLoss(-25, updating_health = FALSE)
- need_mob_update += rewarded.adjustOxyLoss(-25, updating_health = FALSE)
+ need_mob_update += rewarded.adjust_brute_loss(-25, updating_health = FALSE)
+ need_mob_update += rewarded.adjust_fire_loss(-25, updating_health = FALSE)
+ need_mob_update += rewarded.adjust_tox_loss(-25, updating_health = FALSE)
+ need_mob_update += rewarded.adjust_oxy_loss(-25, updating_health = FALSE)
if(need_mob_update)
rewarded.updatehealth()
@@ -169,7 +170,8 @@
/atom/movable/screen/alert/status_effect/heldup
name = "Held Up"
desc = "Making any sudden moves would probably be a bad idea!"
- icon_state = "aimed"
+ use_user_hud_icon = TRUE
+ overlay_state = "aimed"
/datum/status_effect/grouped/heldup/on_apply()
owner.apply_status_effect(/datum/status_effect/grouped/surrender, REF(src))
@@ -190,7 +192,8 @@
/atom/movable/screen/alert/status_effect/holdup
name = "Holding Up"
desc = "You're currently pointing a gun at someone. Click to cancel."
- icon_state = "aimed"
+ use_user_hud_icon = TRUE
+ overlay_state = "aimed"
clickable_glow = TRUE
/atom/movable/screen/alert/status_effect/holdup/Click(location, control, params)
@@ -265,7 +268,7 @@
/// One of our possible takers moved, see if they left us hanging
/datum/status_effect/offering/proc/check_taker_in_range(mob/living/taker)
SIGNAL_HANDLER
- if(owner.CanReach(taker) && !IS_DEAD_OR_INCAP(taker))
+ if(taker.IsReachableBy(owner) || ((owner.pulling == taker) || (taker.pulling == owner)) && !IS_DEAD_OR_INCAP(taker))
return
to_chat(taker, span_warning("You moved out of range of [owner]!"))
@@ -276,7 +279,7 @@
SIGNAL_HANDLER
for(var/mob/living/checking_taker as anything in possible_takers)
- if(!istype(checking_taker) || !owner.CanReach(checking_taker) || IS_DEAD_OR_INCAP(checking_taker))
+ if(!istype(checking_taker) || (!checking_taker.IsReachableBy(owner) && !((owner.pulling == checking_taker) || (checking_taker.pulling == owner))) || IS_DEAD_OR_INCAP(checking_taker))
remove_candidate(checking_taker)
/// We lost the item, give it up
@@ -291,7 +294,7 @@
* Returns `TRUE` if the taker is valid as a target for the offering.
*/
/datum/status_effect/offering/proc/is_taker_elligible(mob/living/taker)
- return owner.CanReach(taker) && !IS_DEAD_OR_INCAP(taker) && additional_taker_check(taker)
+ return taker.IsReachableBy(owner) && !IS_DEAD_OR_INCAP(taker) && additional_taker_check(taker)
/**
* Additional checks added to `CanReach()` and `IS_DEAD_OR_INCAP()` in `is_taker_elligible()`.
@@ -373,7 +376,8 @@
/atom/movable/screen/alert/status_effect/surrender
name = "Surrender"
desc = "Looks like you're in trouble now, bud. Click here to surrender. (Warning: You will be incapacitated.)"
- icon_state = "surrender"
+ use_user_hud_icon = TRUE
+ overlay_state = "surrender"
clickable_glow = TRUE
/atom/movable/screen/alert/status_effect/surrender/Click(location, control, params)
@@ -679,11 +683,11 @@
var/healed = 0
if(recovery) //very mild healing for those with the water adaptation trait (fish infusion)
- healed += owner.adjustOxyLoss(recovery * (water_adaptation ? 1.5 : 1), updating_health = FALSE, required_biotype = MOB_ORGANIC)
- healed += owner.adjustFireLoss(recovery, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
- healed += owner.adjustToxLoss(recovery, updating_health = FALSE, required_biotype = MOB_ORGANIC)
- healed += owner.adjustBruteLoss(recovery, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
- healed += owner.adjustStaminaLoss(stam_recovery, updating_stamina = FALSE)
+ healed += owner.adjust_oxy_loss(recovery * (water_adaptation ? 1.5 : 1), updating_health = FALSE, required_biotype = MOB_ORGANIC)
+ healed += owner.adjust_fire_loss(recovery, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
+ healed += owner.adjust_tox_loss(recovery, updating_health = FALSE, required_biotype = MOB_ORGANIC)
+ healed += owner.adjust_brute_loss(recovery, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
+ healed += owner.adjust_stamina_loss(stam_recovery, updating_stamina = FALSE)
if(healed)
owner.updatehealth()
else if(istype(shower_reagent, /datum/reagent/blood))
@@ -801,3 +805,53 @@
id = "divine_spotlight"
#undef BEAM_ALPHA
+
+/datum/status_effect/moodlet_in_area
+ id = "moodlet_in_area"
+ duration = STATUS_EFFECT_PERMANENT
+ tick_interval = STATUS_EFFECT_NO_TICK
+ status_type = STATUS_EFFECT_MULTIPLE
+ alert_type = null
+ /// Moodlet to apply while in the area
+ VAR_PRIVATE/moodlet_type
+ /// Typecache of areas that will trigger the moodlet while in them
+ VAR_PRIVATE/list/allowed_areas
+ /// Optional callback to run when checking if the moodlet should be applied. Should return TRUE to apply, FALSE to not.
+ VAR_PRIVATE/datum/callback/special_check
+
+/datum/status_effect/moodlet_in_area/on_creation(mob/living/new_owner, moodlet_type, list/allowed_areas, datum/callback/special_check)
+ src.moodlet_type = moodlet_type
+ src.allowed_areas = typecacheof(allowed_areas)
+ src.special_check = special_check
+ return ..()
+
+/datum/status_effect/moodlet_in_area/before_remove(moodlet_type, ...)
+ return moodlet_type == src.moodlet_type
+
+/datum/status_effect/moodlet_in_area/on_apply()
+ if(!length(allowed_areas))
+ return FALSE
+
+ for(var/datum/status_effect/moodlet_in_area/other_effect in owner.status_effects)
+ if(other_effect.moodlet_type == moodlet_type)
+ return FALSE
+
+ owner.become_area_sensitive("[id]_[moodlet_type]")
+ RegisterSignal(owner, COMSIG_ENTER_AREA, PROC_REF(check_area))
+ return TRUE
+
+/datum/status_effect/moodlet_in_area/on_remove()
+ UnregisterSignal(owner, COMSIG_ENTER_AREA)
+ owner.lose_area_sensitivity("[id]_[moodlet_type]")
+ owner.clear_mood_event("[id]_[moodlet_type]")
+
+/datum/status_effect/moodlet_in_area/proc/check_area(datum/source, area/new_area)
+ SIGNAL_HANDLER
+
+ if(special_check && !special_check.Invoke(owner, new_area))
+ return
+
+ if(is_type_in_typecache(new_area, allowed_areas))
+ owner.add_mood_event("[id]_[moodlet_type]", moodlet_type)
+ else
+ owner.clear_mood_event("[id]_[moodlet_type]")
diff --git a/code/datums/status_effects/reagent_effect.dm b/code/datums/status_effects/reagent_effect.dm
new file mode 100644
index 000000000000..82475d90dd2b
--- /dev/null
+++ b/code/datums/status_effects/reagent_effect.dm
@@ -0,0 +1,84 @@
+/// Status effect that is tied to the existence of a reagent in a mob's system
+/datum/status_effect/reagent_effect
+ abstract_type = /datum/status_effect/reagent_effect
+ id = STATUS_EFFECT_ID_ABSTRACT
+ alert_type = null
+ tick_interval = STATUS_EFFECT_NO_TICK
+ /// We need this reagent type
+ var/reagent_typepath
+ /// Whether subtypes of the reagent are allowed to keep the effect active
+ var/subtypes_allowed
+
+/datum/status_effect/reagent_effect/on_creation(mob/living/new_owner, reagent_typepath, subtypes_allowed = TRUE)
+ if(isnull(src.reagent_typepath))
+ if(isnull(reagent_typepath))
+ stack_trace("Reagent effect [src] created without a reagent typepath!")
+ src.reagent_typepath = reagent_typepath
+ if(isnull(src.subtypes_allowed))
+ src.subtypes_allowed = subtypes_allowed
+ return ..()
+
+/datum/status_effect/reagent_effect/on_apply()
+ if(isnull(owner.reagents) || isnull(reagent_typepath) || !can_effect())
+ return FALSE
+
+ RegisterSignal(owner.reagents, COMSIG_REAGENTS_HOLDER_UPDATED, PROC_REF(check_reagents))
+ add_effect()
+ return TRUE
+
+/datum/status_effect/reagent_effect/on_remove()
+ remove_effect()
+ UnregisterSignal(owner.reagents, COMSIG_REAGENTS_HOLDER_UPDATED)
+
+/datum/status_effect/reagent_effect/proc/check_reagents(datum/reagents/updated_reagents)
+ SIGNAL_HANDLER
+
+ if(owner.reagents?.has_reagent(reagent_typepath, check_subtypes = subtypes_allowed))
+ return
+ qdel(src)
+
+/// Can we add this effect to the owner?
+/datum/status_effect/reagent_effect/proc/can_effect()
+ return TRUE
+
+/// Add the side effect to the owner
+/datum/status_effect/reagent_effect/proc/add_effect()
+ return
+
+/// Remove the side effect from the owner
+/datum/status_effect/reagent_effect/proc/remove_effect()
+ return
+
+/datum/status_effect/reagent_effect/fakedeath
+ id = "reagent_fake_death"
+
+/datum/status_effect/reagent_effect/fakedeath/add_effect()
+ owner.fakedeath(type)
+
+/datum/status_effect/reagent_effect/fakedeath/remove_effect()
+ owner.cure_fakedeath(type)
+
+/datum/status_effect/reagent_effect/freeze
+ id = "reagent_freeze"
+
+/datum/status_effect/reagent_effect/freeze/can_effect()
+ return !HAS_TRAIT(owner, TRAIT_RESISTCOLD)
+
+/datum/status_effect/reagent_effect/freeze/add_effect()
+ owner.apply_status_effect(/datum/status_effect/frozenstasis/irresistable)
+ owner.apply_status_effect(/datum/status_effect/grouped/stasis, type)
+ RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(escape_prison))
+
+/datum/status_effect/reagent_effect/freeze/remove_effect()
+ owner.remove_status_effect(/datum/status_effect/frozenstasis/irresistable)
+ owner.remove_status_effect(/datum/status_effect/grouped/stasis, type)
+ UnregisterSignal(owner, COMSIG_MOVABLE_MOVED)
+
+/datum/status_effect/reagent_effect/freeze/proc/escape_prison(...)
+ SIGNAL_HANDLER
+
+ if(isturf(owner.loc)) // we escaped ice prison
+ owner.reagents?.del_reagent(reagent_typepath)
+ if(!QDELETED(src))
+ stack_trace("Despite nuking the reagent from the mob, [owner] still has [type]")
+ qdel(src)
diff --git a/code/datums/status_effects/stacking_effect.dm b/code/datums/status_effects/stacking_effect.dm
index 287419028b07..327c614f8de7 100644
--- a/code/datums/status_effects/stacking_effect.dm
+++ b/code/datums/status_effects/stacking_effect.dm
@@ -123,7 +123,7 @@
on_threshold_drop()
if(stacks_added > 0)
- tick_interval += delay_before_decay // refreshes time until decay
+ time_until_next_tick += delay_before_decay // refreshes time until decay
if (status_overlay)
status_overlay.icon_state = "[overlay_state][stacks]"
diff --git a/code/datums/status_effects/wound_effects.dm b/code/datums/status_effects/wound_effects.dm
index 727ef357ac4e..331ae61a5f08 100644
--- a/code/datums/status_effects/wound_effects.dm
+++ b/code/datums/status_effects/wound_effects.dm
@@ -3,7 +3,8 @@
/atom/movable/screen/alert/status_effect/determined
name = "Determined"
desc = "The serious wounds you've sustained have put your body into fight-or-flight mode! Now's the time to look for an exit!"
- icon_state = "wounded"
+ use_user_hud_icon = TRUE
+ overlay_state = "wounded"
/datum/status_effect/determined
id = "determined"
@@ -67,6 +68,7 @@
/atom/movable/screen/alert/status_effect/limp
name = "Limping"
desc = "One or more of your legs has been wounded, slowing down steps with that leg! Get it fixed, or at least in a sling of gauze!"
+ icon_state = "injury"
/datum/status_effect/limp/proc/check_step(mob/whocares, OldLoc, Dir, forced)
SIGNAL_HANDLER
diff --git a/code/datums/stock_market_events.dm b/code/datums/stock_market_events.dm
index b29e52ab0ee1..1c96671c8985 100644
--- a/code/datums/stock_market_events.dm
+++ b/code/datums/stock_market_events.dm
@@ -8,7 +8,7 @@
"MODular Solutions",
"SolGov",
"Australicus Industrial Mining",
- "Vey-Medical",
+ "Nanotrasen-DeForest Corporation",
"Aussec Armory",
"Dreamland Robotics"
)
@@ -147,5 +147,3 @@
SSstock_market.materials_quantity[mat] = initial(mat.tradable_base_quantity) //Force the material to be available again.
SSstock_market.materials_prices[mat] = initial(mat.value_per_unit) * SHEET_MATERIAL_AMOUNT //Force the price to be reset once the lockdown is over.
create_news()
-
-
diff --git a/code/datums/storage/storage.dm b/code/datums/storage/storage.dm
index f9ca006c9a49..41b7a61949f1 100644
--- a/code/datums/storage/storage.dm
+++ b/code/datums/storage/storage.dm
@@ -171,6 +171,16 @@
remove_all(update_storage = FALSE)
+/// Ran on items instantiated inside the storage, basically a chopped down version of handle_enter
+/datum/storage/proc/item_init(datum/source, obj/item/inited)
+ SIGNAL_HANDLER
+
+ if(!istype(inited))
+ return
+
+ inited.item_flags |= IN_STORAGE
+ RegisterSignal(inited, COMSIG_MOUSEDROPPED_ONTO, PROC_REF(mousedrop_receive))
+
/// Automatically ran on all object insertions: flag marking and view refreshing.
/datum/storage/proc/handle_enter(datum/source, obj/item/arrived)
SIGNAL_HANDLER
@@ -223,6 +233,7 @@
RegisterSignal(parent, COMSIG_ATOM_EMP_ACT, PROC_REF(on_emp_act))
RegisterSignal(parent, COMSIG_ATOM_CONTENTS_WEIGHT_CLASS_CHANGED, PROC_REF(contents_changed_w_class))
RegisterSignal(parent, COMSIG_CLICK_ALT, PROC_REF(on_click_alt))
+ RegisterSignal(parent, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON, PROC_REF(item_init))
/**
* Sets where items are physically being stored in the case it shouldn't be on the parent.
@@ -476,14 +487,20 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches)
if(!can_insert(to_insert, user, messages = messages, force = force))
return FALSE
+ if(SEND_SIGNAL(parent, COMSIG_ATOM_PRE_STORED_ITEM, to_insert, user, force, messages) & BLOCK_STORAGE_INSERT)
+ return FALSE
SEND_SIGNAL(parent, COMSIG_ATOM_STORED_ITEM, to_insert, user, force)
SEND_SIGNAL(src, COMSIG_STORAGE_STORED_ITEM, to_insert, user, force)
- to_insert.forceMove(real_location)
- item_insertion_feedback(user, to_insert, override)
- parent.update_appearance()
+ if(ismob(to_insert.loc))
+ var/mob/item_carrier = to_insert.loc
+ item_carrier.transferItemToLoc(to_insert, real_location, animated = FALSE) // This allows has_unequipped() to be properly called.
+ else
+ to_insert.forceMove(real_location)
if(get(real_location, /mob) != user)
to_insert.do_pickup_animation(real_location, user)
+ item_insertion_feedback(user, to_insert, override)
+ parent.update_appearance()
return TRUE
/// Since items inside storages ignore transparency for QOL reasons, we're tracking when things are dropped onto them instead of our UI elements
@@ -650,7 +667,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches)
*/
/datum/storage/proc/remove_type(type, atom/destination, amount = INFINITY, check_adjacent = FALSE, force = FALSE, mob/user, list/inserted)
if(!force && check_adjacent)
- if(isnull(user) || !user.CanReach(destination) || !user.CanReach(parent))
+ if(isnull(user) || !destination.IsReachableBy(user) || !parent.IsReachableBy(user))
return FALSE
var/list/taking = typecache_filter_list(real_location.contents, typecacheof(type))
@@ -701,9 +718,11 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches)
SIGNAL_HANDLER
for(var/mob/user as anything in is_using)
- if(user.client)
- var/client/cuser = user.client
- cuser.screen -= gone
+ user.hud_used?.open_containers -= gone
+ if(!user.client)
+ continue
+ var/client/cuser = user.client
+ cuser.screen -= gone
reset_item(gone)
refresh_views()
@@ -726,8 +745,6 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches)
return
if(collection_mode == COLLECT_ONE)
- if(thing.loc == user)
- user.dropItemToGround(thing, silent = TRUE) //this is nessassary to update any inventory slot it is attached to
attempt_insert(thing, user)
return COMPONENT_CANCEL_ATTACK_CHAIN
@@ -773,40 +790,50 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches)
SIGNAL_HANDLER
if(ismecha(user.loc) || user.incapacitated || !user.canUseStorage())
- return
+ return NONE
if(istype(over_object, /atom/movable/screen/inventory/hand))
- if(real_location.loc != user || !user.can_perform_action(parent, FORBID_TELEKINESIS_REACH | ALLOW_RESTING))
- return
+ if(parent.loc != user || !user.can_perform_action(parent, FORBID_TELEKINESIS_REACH | ALLOW_RESTING))
+ return NONE
+
+ if(isitem(parent))
+ var/obj/item/item_parent = parent
+ if(!item_parent.can_mob_unequip(user))
+ return COMPONENT_CANCEL_MOUSEDROP_ONTO
var/atom/movable/screen/inventory/hand/hand = over_object
user.putItemFromInventoryInHandIfPossible(parent, hand.held_index)
parent.add_fingerprint(user)
return COMPONENT_CANCEL_MOUSEDROP_ONTO
- if(ismob(over_object))
- if(over_object != user || !user.can_perform_action(parent, FORBID_TELEKINESIS_REACH | ALLOW_RESTING))
- return
+ if(over_object == user)
+ if(!user.can_perform_action(parent, FORBID_TELEKINESIS_REACH | ALLOW_RESTING))
+ return NONE
+
+ if(isliving(parent) && user.pulling == parent)
+ var/mob/living/as_living = parent
+ if(as_living.can_be_held)
+ return
parent.add_fingerprint(user)
INVOKE_ASYNC(src, PROC_REF(open_storage), user)
return COMPONENT_CANCEL_MOUSEDROP_ONTO
- if(istype(over_object, /atom/movable/screen))
- return
+ if(istype(over_object, /atom/movable/screen) || ismob(over_object))
+ return NONE
if(!user.can_perform_action(over_object, FORBID_TELEKINESIS_REACH))
- return
+ return NONE
parent.add_fingerprint(user)
var/atom/dump_loc = over_object.get_dumping_location()
if(isnull(dump_loc))
- return
+ return NONE
/// Don't dump *onto* objects in the same storage as ourselves
if (over_object.loc == parent.loc && !isnull(parent.loc.atom_storage) && isnull(over_object.atom_storage))
- return
+ return NONE
INVOKE_ASYNC(src, PROC_REF(dump_content_at), over_object, dump_loc, user)
return COMPONENT_CANCEL_MOUSEDROP_ONTO
@@ -821,7 +848,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches)
if(locked)
user.balloon_alert(user, "closed!")
return
- if(!user.CanReach(parent) || !user.CanReach(dest_object))
+ if(!parent.IsReachableBy(user) || !dest_object.IsReachableBy(user))
return
if(SEND_SIGNAL(dest_object, COMSIG_STORAGE_DUMP_CONTENT, src, user) & STORAGE_DUMP_HANDLED)
@@ -983,9 +1010,13 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches)
SIGNAL_HANDLER
for(var/mob/user in can_see_contents())
- if (!user.CanReach(parent))
+ if (!can_be_reached_by(user))
hide_contents(user)
+/// Relay for parent.IsReachableBy
+/datum/storage/proc/can_be_reached_by(mob/user)
+ return parent.IsReachableBy(user)
+
/// Close the storage UI for everyone viewing us.
/datum/storage/proc/close_all()
for(var/mob/user as anything in is_using)
@@ -1082,10 +1113,11 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches)
is_using -= to_hide
if(to_hide.client)
- to_hide.hud_used.open_containers -= storage_interfaces[to_hide].list_ui_elements()
to_hide.client.screen -= storage_interfaces[to_hide].list_ui_elements()
- to_hide.hud_used.open_containers -= real_location.contents
to_hide.client.screen -= real_location.contents
+ if(to_hide.hud_used)
+ to_hide.hud_used.open_containers -= storage_interfaces[to_hide].list_ui_elements()
+ to_hide.hud_used.open_containers -= real_location.contents
QDEL_NULL(storage_interfaces[to_hide])
storage_interfaces -= to_hide
@@ -1158,8 +1190,10 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches)
/datum/storage/proc/contents_changed_w_class(datum/source, obj/item/changed, old_w_class, new_w_class)
SIGNAL_HANDLER
- if(new_w_class <= max_specific_storage && new_w_class + get_total_weight() <= max_total_storage)
+ // If old weight already overloaded the storage, don't drop the item out just in case we're inside of a premade box
+ if(new_w_class <= max_specific_storage && (get_total_weight() <= max_total_storage || get_total_weight() - new_w_class + old_w_class > max_total_storage))
return
+
if(!attempt_remove(changed, parent.drop_location()))
return
diff --git a/code/datums/storage/subtypes/bags.dm b/code/datums/storage/subtypes/bags.dm
index 95ae354bcfda..73e6670e5674 100644
--- a/code/datums/storage/subtypes/bags.dm
+++ b/code/datums/storage/subtypes/bags.dm
@@ -232,7 +232,7 @@
. = ..()
set_holdable(/obj/item/ammo_casing/harpoon)
-///Rebar quiber bag
+///Rebar quiver bag
/datum/storage/bag/rebar_quiver
max_specific_storage = WEIGHT_CLASS_TINY
max_slots = 10
@@ -268,12 +268,51 @@
/datum/storage/bag/garment
numerical_stacking = FALSE
max_total_storage = 200
- max_slots = 15
+ max_slots = 20
insert_preposition = "in"
+ allow_big_nesting = TRUE
/datum/storage/bag/garment/New(atom/parent, max_slots, max_specific_storage, max_total_storage, rustle_sound, remove_rustle_sound)
. = ..()
- set_holdable(/obj/item/clothing)
+ set_holdable(
+ can_hold_list = list(/obj/item/clothing, /obj/item/storage/backpack),
+ exception_hold_list = list(/obj/item/storage/backpack),
+ )
+
+/datum/storage/bag/garment/can_insert(obj/item/to_insert, mob/user, messages, force)
+ . = ..()
+ if(!.)
+ return FALSE
+
+ if(istype(to_insert, /obj/item/storage/backpack) && length(to_insert.contents))
+ if(messages && user)
+ parent.balloon_alert(user, "can't store filled backpacks!")
+ return FALSE
+
+ return TRUE
+
+/datum/storage/bag/garment/item_init(datum/source, obj/item/inited)
+ . = ..()
+ if(!istype(inited, /obj/item/storage/backpack))
+ return
+ RegisterSignal(inited, COMSIG_ATOM_PRE_STORED_ITEM, PROC_REF(block_inner_storage))
+
+/datum/storage/bag/garment/handle_enter(datum/source, obj/item/arrived)
+ . = ..()
+ if(!istype(arrived, /obj/item/storage/backpack))
+ return
+ RegisterSignal(arrived, COMSIG_ATOM_PRE_STORED_ITEM, PROC_REF(block_inner_storage))
+
+/datum/storage/bag/garment/handle_exit(datum/source, obj/item/gone)
+ . = ..()
+ UnregisterSignal(gone, COMSIG_ATOM_PRE_STORED_ITEM)
+
+/datum/storage/bag/garment/proc/block_inner_storage(obj/item/backpack, to_insert, user, force, messages)
+ SIGNAL_HANDLER
+
+ if(user && messages)
+ parent.balloon_alert(user, "garment bag is in the way!")
+ return BLOCK_STORAGE_INSERT
///Quiver bag
/datum/storage/bag/quiver
diff --git a/code/datums/storage/subtypes/belts.dm b/code/datums/storage/subtypes/belts.dm
index 3f3470a0e4c5..48c20789f7de 100644
--- a/code/datums/storage/subtypes/belts.dm
+++ b/code/datums/storage/subtypes/belts.dm
@@ -74,6 +74,7 @@
/obj/item/flesh_shears,
/obj/item/blood_scanner,
/obj/item/reflexhammer,
+ /obj/item/crowbar/power/paramedic,
))
///Security belt
@@ -293,6 +294,16 @@
. = ..()
set_holdable(/obj/item/melee/parsnip_sabre)
+/datum/storage/gladius_belt
+ max_slots = 1
+ do_rustle = FALSE
+ max_specific_storage = WEIGHT_CLASS_BULKY
+ click_alt_open = FALSE
+
+/datum/storage/gladius_belt/New(atom/parent, max_slots, max_specific_storage, max_total_storage, rustle_sound, remove_rustle_sound)
+ . = ..()
+ set_holdable(/obj/item/claymore/gladius)
+
///Plant belt
/datum/storage/plant_belt
max_slots = 6
diff --git a/code/datums/storage/subtypes/boxes.dm b/code/datums/storage/subtypes/boxes.dm
index a8acd98884b0..2a50119749f1 100644
--- a/code/datums/storage/subtypes/boxes.dm
+++ b/code/datums/storage/subtypes/boxes.dm
@@ -16,6 +16,13 @@
. = ..()
set_holdable(/obj/item/food/donkpocket)
+/datum/storage/box/donk_bullets/New(atom/parent, max_slots, max_specific_storage, max_total_storage, rustle_sound, remove_rustle_sound)
+ . = ..()
+ set_holdable(list(
+ /obj/item/food/donkpocket,
+ /obj/item/ammo_casing/shotgun,
+ ))
+
///Coffee box
/datum/storage/box/coffee
max_slots = 5
diff --git a/code/datums/storage/subtypes/holsters.dm b/code/datums/storage/subtypes/holsters.dm
index e82007fea711..fd0ee9f50402 100644
--- a/code/datums/storage/subtypes/holsters.dm
+++ b/code/datums/storage/subtypes/holsters.dm
@@ -19,6 +19,7 @@
/obj/item/gun/energy/dueling,
/obj/item/food/grown/banana,
/obj/item/gun/energy/laser/thermal,
+ /obj/item/gun/energy/laser/pistol,
/obj/item/gun/ballistic/rifle/boltaction, //fits if you make it an obrez
/obj/item/gun/energy/laser/captain,
/obj/item/gun/energy/e_gun/hos,
@@ -37,6 +38,7 @@
/obj/item/gun/energy/laser/thermal,
/obj/item/gun/energy/recharge/ebow,
/obj/item/gun/energy/laser/captain,
+ /obj/item/gun/energy/laser/pistol,
/obj/item/gun/energy/e_gun/hos,
)
@@ -62,6 +64,7 @@
/obj/item/gun/energy/dueling,
/obj/item/gun/energy/laser/thermal,
/obj/item/gun/energy/laser/captain,
+ /obj/item/gun/energy/laser/pistol,
/obj/item/gun/energy/e_gun/hos,
/obj/item/gun/ballistic/rifle/boltaction, //fits if you make it an obrez
)
@@ -89,6 +92,7 @@
/obj/item/gun/energy/disabler,
/obj/item/gun/energy/dueling,
/obj/item/gun/energy/laser/captain,
+ /obj/item/gun/energy/laser/pistol,
/obj/item/gun/energy/e_gun/hos,
)
diff --git a/code/datums/storage/subtypes/others/misc.dm b/code/datums/storage/subtypes/others/misc.dm
index ead768ca9338..1b1011b769dc 100644
--- a/code/datums/storage/subtypes/others/misc.dm
+++ b/code/datums/storage/subtypes/others/misc.dm
@@ -32,6 +32,7 @@
/obj/item/reagent_containers/medigel/sterilizine,
/obj/item/retractor,
/obj/item/scalpel,
+ /obj/item/shears,
/obj/item/stack/medical/bone_gel,
/obj/item/stack/sticky_tape/surgical,
/obj/item/surgical_drapes,
diff --git a/code/datums/weather/weather.dm b/code/datums/weather/weather.dm
index 270d85f24d4b..c8498923e92f 100644
--- a/code/datums/weather/weather.dm
+++ b/code/datums/weather/weather.dm
@@ -57,19 +57,19 @@
/// Types of area to affect
var/area_type = /area/space
/// Areas to be affected by the weather, calculated when the weather begins
- var/list/impacted_areas = list()
+ VAR_FINAL/list/impacted_areas = list()
/// A weighted list of areas impacted by weather, where weights reflect the total turf count in each area.
- var/list/impacted_areas_weighted = list()
+ VAR_FINAL/list/impacted_areas_weighted = list()
/// The total number of turfs impacted by weather across all z-levels and areas.
- var/total_impacted_turfs = 0
+ VAR_FINAL/total_impacted_turfs = 0
/// Areas affected by weather have their blend modes changed
- var/list/impacted_areas_blend_modes = list()
+ VAR_FINAL/list/impacted_areas_blend_modes = list()
/// Areas that are protected and excluded from the affected areas.
var/list/protected_areas = list()
/// The list of z-levels that this weather is actively affecting
- var/impacted_z_levels
+ VAR_FINAL/impacted_z_levels
/// A weighted list of z-levels impacted by weather, where weights reflect the total turf count on each level
- var/list/impacted_z_levels_weighted = list()
+ VAR_FINAL/list/impacted_z_levels_weighted = list()
/// Since it's above everything else, this is the layer used by default.
var/overlay_layer = AREA_LAYER
@@ -109,15 +109,15 @@
var/weather_flags = NONE
/// List of current mobs being processed by weather
- var/list/current_mobs = list()
+ VAR_FINAL/list/current_mobs = list()
/// The weather turf counter to keep track of how many turfs we have processed so far
- var/turf_iteration = 0
+ VAR_FINAL/turf_iteration = 0
/// The weather thunder counter to keep track of how much thunder we have processed so far
- var/thunder_iteration = 0
+ VAR_FINAL/thunder_iteration = 0
/// Index of the current section our weather subsystem is processing from our subsystem_tasks
- var/task_index = 1
+ VAR_FINAL/task_index = 1
/// The list of allowed tasks our weather subsystem is allowed to process (determined by weather_flags)
- var/list/subsystem_tasks = list()
+ VAR_FINAL/list/subsystem_tasks = list()
/// The temperature of our weather that is applied to weather reagents and mobs using adjust_bodytemperature()
var/weather_temperature = T20C
@@ -137,11 +137,12 @@
..()
impacted_z_levels = z_levels
- area_type = weather_data?["area"] || area_type
- weather_flags = weather_data?["weather_flags"] || weather_flags
- turf_thunder_chance = isnull(weather_data?["thunder_chance"]) ? turf_thunder_chance : weather_data?["thunder_chance"]
+ weather_flags = isnull(weather_data?[WEATHER_FORCED_FLAGS]) ? weather_flags : weather_data?[WEATHER_FORCED_FLAGS]
+ turf_thunder_chance = isnull(weather_data?[WEATHER_FORCED_THUNDER]) ? turf_thunder_chance : weather_data?[WEATHER_FORCED_THUNDER]
+ telegraph_duration = isnull(weather_data?[WEATHER_FORCED_TELEGRAPH]) ? telegraph_duration : weather_data?[WEATHER_FORCED_TELEGRAPH]
+ end_duration = isnull(weather_data?[WEATHER_FORCED_END]) ? end_duration : weather_data?[WEATHER_FORCED_END]
- var/datum/reagent/custom_reagent = weather_data?["reagent"]
+ var/datum/reagent/custom_reagent = weather_data?[WEATHER_FORCED_REAGENT]
var/reagent_id
if(custom_reagent)
reagent_id = custom_reagent
@@ -165,7 +166,7 @@
if(weather_flags & (WEATHER_THUNDER))
subsystem_tasks += SSWEATHER_THUNDER
- setup_weather_areas()
+ setup_weather_areas(weather_data?[WEATHER_FORCED_AREAS])
setup_weather_turfs()
/datum/weather/Destroy()
@@ -179,26 +180,94 @@
* Calculates duration and hit areas, and makes a callback for the actual weather to start
*
*/
-/datum/weather/proc/telegraph()
+/datum/weather/proc/telegraph(list/weather_data)
if(stage == STARTUP_STAGE)
return
stage = STARTUP_STAGE
SEND_GLOBAL_SIGNAL(COMSIG_WEATHER_TELEGRAPH(type), src)
-
- weather_duration = rand(weather_duration_lower, weather_duration_upper)
+ weather_duration = isnull(weather_data?[WEATHER_FORCED_DURATION]) ? rand(weather_duration_lower, weather_duration_upper) : weather_data?[WEATHER_FORCED_DURATION]
SSweather.processing |= src
update_areas()
if(telegraph_duration)
send_alert(telegraph_message, telegraph_sound, telegraph_sound_vol)
- addtimer(CALLBACK(src, PROC_REF(start)), telegraph_duration)
-
-/datum/weather/proc/setup_weather_areas()
- var/list/affectareas = list()
- for(var/area/selected_area as anything in get_areas(area_type))
- affectareas += selected_area
- for(var/area/protected_area as anything in protected_areas)
- affectareas -= get_areas(protected_area)
- for(var/area/affected_area as anything in affectareas)
+ addtimer(CALLBACK(src, PROC_REF(start)), telegraph_duration, TIMER_UNIQUE)
+
+ // so /datum/element/weather_listener relies on z traits to determine when to set up sound managers
+ // thus if we force weather on a z level that doesn't match the target trait, we need to manually set up sound managers
+ if(target_trait)
+ manually_setup_sound_manager()
+
+/// Manually add a sound manager to all mobs
+/datum/weather/proc/manually_setup_sound_manager()
+ var/list/filtered_zs = get_impacted_zs_without_trait()
+ var/list/playlist = get_playlist_ref()
+ // we only need to manually handle sound managers if there are zs without the trait being affected, fortunately
+ if(!length(filtered_zs) || isnull(playlist))
+ return
+
+ // add in dead mobs so we can get observers covered too
+ for(var/mob/living/affected as anything in GLOB.mob_living_list | GLOB.dead_mob_list)
+ if(isnull(affected.client))
+ // this registers 400+ odd signals... maybe we should reconsider
+ RegisterSignal(affected, COMSIG_MOB_LOGIN, PROC_REF(handle_mob_log_in))
+ continue
+
+ manually_setup_sound_manager_on_mob(affected, playlist, filtered_zs)
+
+ RegisterSignal(SSdcs, COMSIG_GLOB_MOB_CREATED, PROC_REF(handle_new_mob_sound_manager))
+
+/// Returns a reference to the "sound playlist" for this weather type
+/datum/weather/proc/get_playlist_ref()
+ return null
+
+/// Returns a list of z-levels impacted that do not have the target trait
+/datum/weather/proc/get_impacted_zs_without_trait()
+ var/list/zs_without_trait = list()
+ for(var/z in impacted_z_levels)
+ if(!SSmapping.level_trait(z, target_trait))
+ zs_without_trait += z
+ return zs_without_trait
+
+/datum/weather/proc/handle_new_mob_sound_manager(datum/source, mob/the_mob)
+ SIGNAL_HANDLER
+
+ if(isnull(the_mob.client))
+ RegisterSignal(the_mob, COMSIG_MOB_LOGIN, PROC_REF(handle_mob_log_in))
+ return
+
+ manually_setup_sound_manager_on_mob(the_mob)
+
+/datum/weather/proc/handle_mob_log_in(mob/source)
+ SIGNAL_HANDLER
+
+ if(stage >= END_STAGE)
+ stack_trace("Attempted to add a sound manager to a mob after weather ended")
+ UnregisterSignal(source, COMSIG_MOB_LOGIN)
+ return
+
+ manually_setup_sound_manager_on_mob(source)
+
+/datum/weather/proc/manually_setup_sound_manager_on_mob(mob/living/affected, list/playlist = get_playlist_ref(), list/filtered_zs = get_impacted_zs_without_trait())
+ PRIVATE_PROC(TRUE)
+
+ var/list/sound_change_signals = list(
+ COMSIG_WEATHER_TELEGRAPH(type),
+ COMSIG_WEATHER_START(type),
+ COMSIG_WEATHER_WINDDOWN(type),
+ )
+
+ var/datum/component/our_comp = affected.AddComponent( \
+ /datum/component/area_sound_manager, \
+ area_loop_pairs = playlist, \
+ acceptable_zs = filtered_zs, \
+ )
+ our_comp.RegisterSignals(SSdcs, sound_change_signals, TYPE_PROC_REF(/datum/component/area_sound_manager, handle_change))
+ our_comp.RegisterSignal(SSdcs, COMSIG_WEATHER_END(type), TYPE_PROC_REF(/datum/component/area_sound_manager, handle_removal))
+
+/datum/weather/proc/setup_weather_areas(list/forced_areas)
+ for(var/area/affected_area as anything in (forced_areas || get_areas(area_type)))
+ if(is_type_in_list(affected_area, protected_areas))
+ continue
if(!(weather_flags & WEATHER_INDOORS) && !affected_area.outdoors)
continue
@@ -263,7 +332,7 @@
update_areas()
send_alert(weather_message, weather_sound)
if(!(weather_flags & (WEATHER_ENDLESS)))
- addtimer(CALLBACK(src, PROC_REF(wind_down)), weather_duration)
+ addtimer(CALLBACK(src, PROC_REF(wind_down)), weather_duration, TIMER_UNIQUE)
for(var/area/impacted_area as anything in impacted_areas)
SEND_SIGNAL(impacted_area, COMSIG_WEATHER_BEGAN_IN_AREA(type), src)
@@ -281,7 +350,7 @@
stage = WIND_DOWN_STAGE
update_areas()
send_alert(end_message, end_sound, end_sound_vol)
- addtimer(CALLBACK(src, PROC_REF(end)), end_duration)
+ addtimer(CALLBACK(src, PROC_REF(end)), end_duration, TIMER_UNIQUE)
/**
* Fully ends the weather
@@ -294,12 +363,17 @@
if(stage == END_STAGE)
return
SEND_GLOBAL_SIGNAL(COMSIG_WEATHER_END(type), src)
+ UnregisterSignal(SSdcs, COMSIG_GLOB_MOB_CREATED)
stage = END_STAGE
SSweather.processing -= src
update_areas()
for(var/area/impacted_area as anything in impacted_areas)
SEND_SIGNAL(impacted_area, COMSIG_WEATHER_ENDED_IN_AREA(type), src)
+ if(target_trait)
+ for(var/mob/living/affected as anything in GLOB.mob_living_list | GLOB.dead_mob_list)
+ UnregisterSignal(affected, COMSIG_MOB_LOGIN)
+
// handles sending all alerts
/datum/weather/proc/send_alert(alert_msg, alert_sfx, alert_sfx_vol = 100)
for(var/z_level in impacted_z_levels)
@@ -315,7 +389,24 @@
// the checks for if a mob should receive alerts, returns TRUE if can
/datum/weather/proc/can_get_alert(mob/player)
var/turf/mob_turf = get_turf(player)
- return !isnull(mob_turf)
+ if(isnull(mob_turf))
+ return FALSE
+
+ if((weather_flags & WEATHER_STRICT_ALERT) && !can_see_weather(player))
+ return FALSE
+
+ return TRUE
+
+/// Checks if the player is in or can see an area affected by the weather
+/datum/weather/proc/can_see_weather(mob/player)
+ if(HAS_MIND_TRAIT(player, TRAIT_DETECT_STORM))
+ return TRUE
+
+ for(var/area/nearby in view(player))
+ if(nearby in impacted_areas)
+ return TRUE
+
+ return FALSE
/**
* Returns TRUE if the living mob can be affected by the weather
@@ -427,19 +518,16 @@
to_chat(hit_mob, span_userdanger("You've been struck by lightning!"))
hit_mob.electrocute_act(50, "thunder", flags = SHOCK_TESLA|SHOCK_NOGLOVES)
- for(var/obj/hit_thing in weather_turf)
- if(QDELETED(hit_thing)) // stop, it's already dead
+ for(var/obj/item/stack/ore/hit_ore in weather_turf)
+ if(QDELETED(hit_ore))
continue
- if(!hit_thing.uses_integrity)
- continue
- if(hit_thing.invisibility != INVISIBILITY_NONE)
- continue
- if(HAS_TRAIT(hit_thing, TRAIT_UNDERFLOOR))
- continue
- hit_thing.take_damage(20, BURN, ENERGY, FALSE)
- playsound(weather_turf, 'sound/effects/magic/lightningbolt.ogg', 100, extrarange = 10, falloff_distance = 10)
+ // ores that get struck by thunder are smelted
+ // a bolt of lightning can reach temperatures of 30,000 Kelvin which is 5x hotter than the sun
+ hit_ore.fire_act(30000)
+
+ playsound(weather_turf, 'modular_darkpack/master_files/sounds/lightning.ogg', 100, extrarange = 50, falloff_distance = 50) // DARKPACK EDIT CHANGE
weather_turf.visible_message(span_danger("A thunderbolt strikes [weather_turf]!"))
- explosion(weather_turf, light_impact_range = 1, flame_range = 1, silent = TRUE, adminlog = FALSE)
+ new /obj/effect/hotspot(weather_turf)
/**
* Updates the overlays on impacted areas
diff --git a/code/datums/weather/weather_types/ash_storm.dm b/code/datums/weather/weather_types/ash_storm.dm
index 2eb77ff33f0f..367977a90bca 100644
--- a/code/datums/weather/weather_types/ash_storm.dm
+++ b/code/datums/weather/weather_types/ash_storm.dm
@@ -28,6 +28,9 @@
var/list/weak_sounds = list()
var/list/strong_sounds = list()
+/datum/weather/ash_storm/get_playlist_ref()
+ return GLOB.ash_storm_sounds
+
/datum/weather/ash_storm/telegraph()
for(var/area/impacted_area as anything in impacted_areas)
if(impacted_area.outdoors)
@@ -61,7 +64,7 @@
return TRUE
/datum/weather/ash_storm/weather_act_mob(mob/living/victim)
- victim.adjustFireLoss(4, required_bodytype = BODYTYPE_ORGANIC)
+ victim.adjust_fire_loss(4, required_bodytype = BODYTYPE_ORGANIC)
return ..()
/datum/weather/ash_storm/end()
diff --git a/code/datums/weather/weather_types/floor_is_lava.dm b/code/datums/weather/weather_types/floor_is_lava.dm
index 14130421e6e4..2dcbbed0aa75 100644
--- a/code/datums/weather/weather_types/floor_is_lava.dm
+++ b/code/datums/weather/weather_types/floor_is_lava.dm
@@ -44,5 +44,5 @@
return FALSE
/datum/weather/floor_is_lava/weather_act_mob(mob/living/victim)
- victim.adjustFireLoss(3)
+ victim.adjust_fire_loss(3)
return ..()
diff --git a/code/datums/weather/weather_types/radiation_storm.dm b/code/datums/weather/weather_types/radiation_storm.dm
index 671dedfa428b..d55938e2bd9d 100644
--- a/code/datums/weather/weather_types/radiation_storm.dm
+++ b/code/datums/weather/weather_types/radiation_storm.dm
@@ -17,10 +17,29 @@
end_message = span_notice("The air seems to be cooling off again.")
area_type = /area
- protected_areas = list(/area/station/maintenance, /area/station/ai_monitored/turret_protected/ai_upload, /area/station/ai_monitored/turret_protected/ai_upload_foyer,
- /area/station/ai_monitored/turret_protected/aisat/maint, /area/station/ai_monitored/command/storage/satellite,
- /area/station/ai_monitored/turret_protected/ai, /area/station/commons/storage/emergency/starboard, /area/station/commons/storage/emergency/port,
- /area/shuttle, /area/station/security/prison/safe, /area/station/security/prison/toilet, /area/mine/maintenance, /area/icemoon/underground, /area/ruin/comms_agent/maint)
+ protected_areas = list(
+ // General areas
+ /area/station/maintenance, // This is where we tell people to go
+ /area/shuttle, // Would be quite rude
+
+ // AI
+ /area/station/ai/satellite/maintenance, // Duh...
+ /area/station/ai/upload,
+ /area/station/ai/satellite/chamber,
+
+ // Rad shelters
+ /area/station/commons/storage/emergency/starboard,
+ /area/station/commons/storage/emergency/port,
+
+ // Prison
+ /area/station/security/prison/safe,
+ /area/station/security/prison/toilet,
+
+ // Off-station
+ /area/mine/maintenance,
+ /area/ruin/comms_agent/maint,
+ /area/icemoon/underground,
+ )
target_trait = ZTRAIT_STATION
immunity_type = TRAIT_RADSTORM_IMMUNE
diff --git a/code/datums/weather/weather_types/rain_storm.dm b/code/datums/weather/weather_types/rain_storm.dm
index 1a4da05eb2af..4516112824c4 100644
--- a/code/datums/weather/weather_types/rain_storm.dm
+++ b/code/datums/weather/weather_types/rain_storm.dm
@@ -27,10 +27,20 @@
weather_flags = (WEATHER_TURFS | WEATHER_MOBS | WEATHER_THUNDER | WEATHER_BAROMETER)
whitelist_weather_reagents = list(/datum/reagent/water)
+/datum/weather/rain_storm/get_playlist_ref()
+ return GLOB.rain_storm_sounds
+
/datum/weather/rain_storm/telegraph()
GLOB.rain_storm_sounds.Cut()
for(var/area/impacted_area as anything in impacted_areas)
GLOB.rain_storm_sounds[impacted_area] = /datum/looping_sound/rain/start
+
+ // change the message for if rain is triggered inside the station (no canopy of course)
+ for(var/z in impacted_z_levels)
+ if(is_station_level(z))
+ telegraph_message = span_warning("Thunder rumbles from above. You hear droplets hitting the floor around you.")
+ break
+
return ..()
/datum/weather/rain_storm/start()
@@ -92,14 +102,7 @@
desc = "A magical thunderstorm rains down below, drenching anyone caught in it with mysterious rain."
telegraph_message = span_danger("A magical rain cloud appears above. You hear droplets falling down.")
- protected_areas = list(
- /area/station/maintenance, /area/station/ai_monitored/turret_protected/ai_upload,
- /area/station/ai_monitored/turret_protected/ai_upload_foyer, /area/station/ai_monitored/turret_protected/aisat/maint,
- /area/station/ai_monitored/command/storage/satellite, /area/station/ai_monitored/turret_protected/ai,
- /area/station/commons/storage/emergency/starboard, /area/station/commons/storage/emergency/port,
- /area/shuttle, /area/station/security/prison/safe, /area/station/security/prison/toilet, /area/mine/maintenance,
- /area/icemoon/underground, /area/ruin/comms_agent/maint
- )
+ protected_areas = /datum/weather/rad_storm::protected_areas
// same time durations as floor_is_lava event
telegraph_duration = 15 SECONDS
diff --git a/code/datums/weather/weather_types/sand_storm.dm b/code/datums/weather/weather_types/sand_storm.dm
index 89d71c09ae54..fdac54739e3d 100644
--- a/code/datums/weather/weather_types/sand_storm.dm
+++ b/code/datums/weather/weather_types/sand_storm.dm
@@ -24,6 +24,9 @@
weather_flags = (WEATHER_MOBS | WEATHER_BAROMETER)
+/datum/weather/sand_storm/get_playlist_ref()
+ return GLOB.sand_storm_sounds
+
/datum/weather/sand_storm/telegraph()
GLOB.sand_storm_sounds.Cut()
for(var/area/impacted_area as anything in impacted_areas)
@@ -43,7 +46,7 @@
return ..()
/datum/weather/sand_storm/weather_act_mob(mob/living/victim)
- victim.adjustBruteLoss(5, required_bodytype = BODYTYPE_ORGANIC)
+ victim.adjust_brute_loss(5, required_bodytype = BODYTYPE_ORGANIC)
return ..()
/datum/weather/sand_storm/harmless
diff --git a/code/datums/weather/weather_types/snow_storm.dm b/code/datums/weather/weather_types/snow_storm.dm
index 01a07df61336..f4a3baaa1900 100644
--- a/code/datums/weather/weather_types/snow_storm.dm
+++ b/code/datums/weather/weather_types/snow_storm.dm
@@ -28,7 +28,10 @@
// snowstorms should be colder than default icebox atmos
weather_temperature = ICEBOX_MIN_TEMPERATURE - 40
// snowstorms temperature ignores any clothing insulation
- weather_flags = (WEATHER_MOBS | WEATHER_BAROMETER | WEATHER_TEMPERATURE_BYPASS_CLOTHING)
+ weather_flags = (WEATHER_MOBS | WEATHER_BAROMETER | WEATHER_TEMPERATURE_BYPASS_CLOTHING | WEATHER_STRICT_ALERT)
+
+/datum/weather/snow_storm/get_playlist_ref()
+ return GLOB.snowstorm_sounds
/datum/weather/snow_storm/start()
GLOB.snowstorm_sounds.Cut() // it's passed by ref
@@ -40,29 +43,6 @@
GLOB.snowstorm_sounds.Cut()
return ..()
-// since snowstorm is on a station z level, add extra checks to not annoy everyone
-/datum/weather/snow_storm/can_get_alert(mob/player)
- if(!..())
- return FALSE
-
- if(!is_station_level(player.z))
- return TRUE // bypass checks
-
- if(isobserver(player))
- return TRUE
-
- if(HAS_MIND_TRAIT(player, TRAIT_DETECT_STORM))
- return TRUE
-
- if(istype(get_area(player), /area/mine))
- return TRUE
-
- for(var/area/snow_area in impacted_areas)
- if(locate(snow_area) in view(player))
- return TRUE
-
- return FALSE
-
///A storm that doesn't stop storming, and is a bit stronger
/datum/weather/snow_storm/forever_storm
telegraph_duration = 0 SECONDS
diff --git a/code/datums/wires/_wires.dm b/code/datums/wires/_wires.dm
index b53bb64183bb..739b5e8adecd 100644
--- a/code/datums/wires/_wires.dm
+++ b/code/datums/wires/_wires.dm
@@ -22,9 +22,9 @@
return FALSE
/atom/proc/attempt_wire_interaction(mob/user)
- if(!wires)
+ if(isnull(wires))
return WIRE_INTERACTION_FAIL
- if(!user.CanReach(src))
+ if(!IsReachableBy(user))
return WIRE_INTERACTION_FAIL
INVOKE_ASYNC(wires, TYPE_PROC_REF(/datum/wires, interact), user)
return WIRE_INTERACTION_BLOCK
@@ -43,13 +43,13 @@
var/wire_behavior = WIRES_INPUT
/// List of all wires.
- var/list/wires = list()
+ var/list/wires
/// List of cut wires.
- var/list/cut_wires = list() // List of wires that have been cut.
+ var/list/cut_wires // List of wires that have been cut.
/// Dictionary of colours to wire.
- var/list/colors = list()
+ var/list/colors
/// List of attached assemblies.
- var/list/assemblies = list()
+ var/list/assemblies
/// If every instance of these wires should be random. Prevents wires from showing up in station blueprints.
var/randomize = FALSE
@@ -103,10 +103,10 @@
holder = null
//properly clear refs to avoid harddels & other problems
for(var/color in assemblies)
- var/obj/item/assembly/assembly = assemblies[color]
+ var/obj/item/assembly/assembly = LAZYACCESS(assemblies, color)
assembly.holder = null
assembly.connected = null
- LAZYCLEARLIST(assemblies)
+ LAZYNULL(assemblies)
return ..()
/// Adds a number of wires which do absolutely nothing.
@@ -115,7 +115,7 @@
var/dud = WIRE_DUD_PREFIX + "[--duds]"
if(dud in wires)
continue
- wires += dud
+ LAZYADD(wires, dud)
///Called when holder is qdeleted for us to clean ourselves as not to leave any unlawful references.
/datum/wires/proc/on_holder_qdel(atom/source, force)
@@ -124,7 +124,7 @@
qdel(src)
/datum/wires/proc/randomize()
- if(length(wires) > length(default_possible_colors))
+ if(LAZYLEN(wires) > length(default_possible_colors))
stack_trace("Wire type [type] has more wires than possible colors, consider adding more colors or removing wires.")
var/list/possible_colors = default_possible_colors.Copy()
@@ -132,10 +132,10 @@
for(var/wire in shuffle(wires))
if(!length(possible_colors))
possible_colors = default_possible_colors.Copy()
- colors[pick_n_take(possible_colors)] = wire
+ LAZYSET(colors, pick_n_take(possible_colors), wire)
/datum/wires/proc/shuffle_wires()
- colors.Cut()
+ LAZYCLEARLIST(colors)
randomize()
/datum/wires/proc/repair()
@@ -143,7 +143,7 @@
cut(wire) // I KNOW I KNOW OK
/datum/wires/proc/get_wire(color)
- return colors[color]
+ return LAZYACCESS(colors, color)
/datum/wires/proc/get_color_of_wire(wire_type)
for(var/color in colors)
@@ -152,12 +152,12 @@
return color
/datum/wires/proc/get_attached(color)
- if(assemblies[color])
- return assemblies[color]
+ if(LAZYACCESS(assemblies, color))
+ return LAZYACCESS(assemblies, color)
return null
/datum/wires/proc/is_attached(color)
- if(assemblies[color])
+ if(LAZYACCESS(assemblies, color))
return TRUE
/datum/wires/proc/is_cut(wire)
@@ -167,7 +167,7 @@
return is_cut(get_wire(color))
/datum/wires/proc/is_all_cut()
- if(cut_wires.len == wires.len)
+ if(LAZYLEN(cut_wires) == LAZYLEN(wires))
return TRUE
/datum/wires/proc/is_dud(wire)
@@ -178,11 +178,11 @@
/datum/wires/proc/cut(wire, mob/living/source)
if(is_cut(wire))
- cut_wires -= wire
+ LAZYREMOVE(cut_wires, wire)
SEND_SIGNAL(src, COMSIG_MEND_WIRE(wire), wire)
on_cut(wire, mend = TRUE, source = source)
else
- cut_wires += wire
+ LAZYADD(cut_wires, wire)
SEND_SIGNAL(src, COMSIG_CUT_WIRE(wire), wire)
on_cut(wire, mend = FALSE, source = source)
@@ -190,7 +190,7 @@
cut(get_wire(color), source)
/datum/wires/proc/cut_random(source)
- cut(wires[rand(1, wires.len)], source)
+ cut(LAZYACCESS(wires, rand(1, LAZYLEN(wires))), source)
/datum/wires/proc/cut_all(source)
for(var/wire in wires)
@@ -205,26 +205,26 @@
/datum/wires/proc/pulse_color(color, mob/living/user, force=FALSE)
pulse(get_wire(color), user, force)
-/datum/wires/proc/pulse_assembly(obj/item/assembly/S)
- for(var/color in assemblies)
- if(S == assemblies[color])
+/datum/wires/proc/pulse_assembly(obj/item/assembly/assembly)
+ for(var/color, our_assembly in assemblies)
+ if(assembly == our_assembly)
pulse_color(color, force=TRUE)
return TRUE
-/datum/wires/proc/attach_assembly(color, obj/item/assembly/S)
- if(S && istype(S) && S.assembly_behavior && !is_attached(color) && !(SEND_SIGNAL(S, COMSIG_ASSEMBLY_PRE_ATTACH, holder) & COMPONENT_CANCEL_ATTACH))
- assemblies[color] = S
- S.forceMove(holder)
- S.connected = src
- S.on_attach() // Notify assembly that it is attached
- return S
+/datum/wires/proc/attach_assembly(color, obj/item/assembly/assembly)
+ if(assembly && istype(assembly) && assembly.assembly_behavior && !is_attached(color) && !(SEND_SIGNAL(assembly, COMSIG_ASSEMBLY_PRE_ATTACH, holder) & COMPONENT_CANCEL_ATTACH))
+ LAZYSET(assemblies, color, assembly)
+ assembly.forceMove(holder)
+ assembly.connected = src
+ assembly.on_attach() // Notify assembly that it is attached
+ return assembly
/datum/wires/proc/detach_assembly(color)
- var/obj/item/assembly/S = get_attached(color)
- if(S && istype(S))
- assemblies -= color
- S.on_detach() // Notify the assembly. This should remove the reference to our holder
- return S
+ var/obj/item/assembly/assembly = get_attached(color)
+ if(assembly && istype(assembly))
+ LAZYREMOVE(assemblies, color)
+ assembly.on_detach() // Notify the assembly. This should remove the reference to our holder
+ return assembly
/// Called from [/atom/proc/emp_act]
/datum/wires/proc/emp_pulse()
@@ -259,9 +259,9 @@
if(!interactable(user))
return FALSE
ui_interact(user)
- for(var/A in assemblies)
- var/obj/item/I = assemblies[A]
- if(istype(I) && I.on_found(user))
+ for(var/color, assembly in assemblies)
+ var/obj/item/assembly_item = assembly
+ if(istype(assembly_item) && assembly_item.on_found(user))
break
return TRUE
diff --git a/code/datums/wires/airlock.dm b/code/datums/wires/airlock.dm
index 8c09520cab09..1c7000c916cf 100644
--- a/code/datums/wires/airlock.dm
+++ b/code/datums/wires/airlock.dm
@@ -94,7 +94,7 @@
status += "The speed light is [A.normalspeed ? "on" : "off"]."
status += "The emergency light is [A.emergency ? "on" : "off"]."
- if(A.unres_sensor)
+ if(A.unres_latch)
status += "The unrestricted exit display is [A.unres_sides ? "indicating that it is letting people pass from the [dir2text(REVERSE_DIR(A.unres_sides))]" : "faintly flickering"]."
else
status += "The unrestricted exit display is completely inactive."
@@ -150,7 +150,7 @@
A.feedback = !A.feedback
A.update_appearance()
if(WIRE_UNRESTRICTED_EXIT) // Pulse to switch the direction around by 180 degrees (North goes to South, East goes to West, vice-versa)
- if(!A.unres_sensor) //only works if the "sensor" is installed (a variable that we assign to the door either upon creation of a door with unrestricted directions or if an unrestricted helper is added to a door in mapping)
+ if(!A.unres_latch) //only works if the "latch" is installed (a variable that we assign to the door either upon creation of a door with unrestricted directions or if an unrestricted helper is added to a door in mapping)
return
A.unres_sides = REVERSE_DIR(A.unres_sides)
A.update_appearance()
@@ -217,7 +217,7 @@
if(isliving(usr))
A.shock(usr, 50)
if(WIRE_UNRESTRICTED_EXIT) // If this wire is cut, the unrestricted helper goes away. If you mend it, it'll go "haywire" and pick a new direction at random. Might have to cut/mend a time or two to get the direction you want.
- if(!A.unres_sensor) //only works if the "sensor" is installed (a variable that we assign to the door either upon creation of a door with unrestricted directions, or if an unrestricted helper is added to a door in mapping)
+ if(!A.unres_latch) //only works if the "latch" is installed (a variable that we assign to the door either upon creation of a door with unrestricted directions, or if an unrestricted helper is added to a door in mapping)
return
if(mend)
A.unres_sides = pick(NORTH, SOUTH, EAST, WEST)
diff --git a/code/datums/wires/mulebot.dm b/code/datums/wires/mulebot.dm
index 31bfe164b549..c3b4efe3460e 100644
--- a/code/datums/wires/mulebot.dm
+++ b/code/datums/wires/mulebot.dm
@@ -30,7 +30,7 @@
if(is_cut(WIRE_MOTOR1) && is_cut(WIRE_MOTOR2))
ADD_TRAIT(mule, TRAIT_IMMOBILIZED, MOTOR_LACK_TRAIT)
holder.audible_message(span_hear("The motors of [mule] go silent."), null, 1)
- else
+ else if(HAS_TRAIT_FROM(mule, TRAIT_IMMOBILIZED, MOTOR_LACK_TRAIT))
REMOVE_TRAIT(mule, TRAIT_IMMOBILIZED, MOTOR_LACK_TRAIT)
holder.audible_message(span_hear("The motors of [mule] whir to life!"), null, 1)
diff --git a/code/datums/wounds/_wound_static_data.dm b/code/datums/wounds/_wound_static_data.dm
index cd8d2a78caf6..f0da2a822886 100644
--- a/code/datums/wounds/_wound_static_data.dm
+++ b/code/datums/wounds/_wound_static_data.dm
@@ -26,10 +26,9 @@
/// A list of bodyzones we are applicable to.
var/list/viable_zones = list(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
- /// The types of attack that can generate this wound. E.g. WOUND_SLASH = A sharp attack can cause this, WOUND_BLUNT = an attack with no sharpness/an attack with sharpness against a limb with mangled exterior can cause this.
- var/list/required_wounding_types
- /// If true, this wound can only be generated by all [required_wounding_types] at once, not just any.
- var/match_all_wounding_types = FALSE
+ /// The type of attack that can generate this wound.
+ /// E.g. WOUND_SLASH = A sharp attack can cause this, WOUND_BLUNT = an attack with no sharpness/an attack with sharpness against a limb with mangled exterior can cause this.
+ var/required_wounding_type
/// The weight that will be used if, by the end of wound selection, there are multiple valid wounds. This will be inserted into pick_weight, so use integers.
var/weight = WOUND_DEFAULT_WEIGHT
@@ -40,12 +39,10 @@
/// The series of wounds this is in. See wounds.dm (the defines file) for a more detailed explanation - but tldr is that no 2 wounds of the same series can be on a limb.
var/wound_series
- /// If true, we will attempt to, during a random wound roll, overpower and remove other wound typepaths from the possible wounds list using [competition_mode] and [overpower_wounds_of_even_severity].
+ /// If true, we will attempt to, during a random wound roll, overpower and remove other wound typepaths from the possible wounds list using competition_mode.
var/compete_for_wounding = TRUE
/// The competition mode with which we will remove other wounds from a possible wound roll assuming [compete_for_wounding] is TRUE. See wounds.dm, the defines file, for more information on what these do.
var/competition_mode = WOUND_COMPETITION_OVERPOWER_LESSERS
- /// If this and [compete_for_wounding] is true, we will remove wounds of an even severity to us during a random wound roll.
- var/overpower_wounds_of_even_severity = FALSE
/// A list of BIO_ defines that will be iterated over in order to determine the scar file our wound will generate.
/// Use generate_scar_priorities to create a custom list.
@@ -77,7 +74,7 @@
/**
* Args:
* * obj/item/bodypart/limb: The limb we are considering.
- * * list/suggested_wounding_types: The wounding types to be checked against the wounding types we require. Defaults to required_wounding_types.
+ * * suggested_wounding_typs: The wounding type to be checked against the wounding type we require. Defaults to required_wounding_type.
* * datum/wound/old_wound: If we would replace a wound, this would be said wound. Nullable.
* * random_roll = FALSE: If this is in the context of a random wound generation, and this wound wasn't specifically checked.
*
@@ -86,19 +83,16 @@
* if we have a biotype mismatch, if the limb isn't in a viable zone, or if there's any duplicate wound types.
* TRUE otherwise.
*/
-/datum/wound_pregen_data/proc/can_be_applied_to(obj/item/bodypart/limb, list/suggested_wounding_types = required_wounding_types, datum/wound/old_wound, random_roll = FALSE, duplicates_allowed = src.duplicates_allowed, care_about_existing_wounds = TRUE)
+/datum/wound_pregen_data/proc/can_be_applied_to(obj/item/bodypart/limb, suggested_wounding_type = required_wounding_type, datum/wound/old_wound, random_roll = FALSE, duplicates_allowed = src.duplicates_allowed, care_about_existing_wounds = TRUE)
SHOULD_BE_PURE(TRUE)
- if (!istype(limb) || !limb.owner)
+ if (!istype(limb))
return FALSE
if (random_roll && !can_be_randomly_generated)
return FALSE
- if (HAS_TRAIT(limb.owner, TRAIT_NEVER_WOUNDED) || HAS_TRAIT(limb.owner, TRAIT_GODMODE))
- return FALSE
-
- if (!wounding_types_valid(suggested_wounding_types))
+ if (!wounding_types_valid(suggested_wounding_type))
return FALSE
if (care_about_existing_wounds)
@@ -151,22 +145,11 @@
/datum/wound_pregen_data/proc/get_weight(obj/item/bodypart/limb, woundtype, damage, attack_direction, damage_source)
return weight
-/// Returns TRUE if we use WOUND_ALL, or we require all types and have all/if we require any and have any, FALSE otherwise.
-/datum/wound_pregen_data/proc/wounding_types_valid(list/suggested_wounding_types)
- if (WOUND_ALL in required_wounding_types)
+/// Returns TRUE if we use WOUND_ALL or our wounding type
+/datum/wound_pregen_data/proc/wounding_types_valid(suggested_wounding_type)
+ if (required_wounding_type == WOUND_ALL)
return TRUE
- if (!length(suggested_wounding_types))
- return FALSE
-
- for (var/iter_wounding_type in suggested_wounding_types)
- if (!(iter_wounding_type in required_wounding_types))
- if (match_all_wounding_types)
- return FALSE
- else
- if (!match_all_wounding_types)
- return TRUE
-
- return match_all_wounding_types // if we get here, we've matched everything
+ return suggested_wounding_type == required_wounding_type
/**
* A simple getter for [threshold_minimum], with arguments supplied to allow custom behavior.
diff --git a/code/datums/wounds/_wounds.dm b/code/datums/wounds/_wounds.dm
index 52afebe24078..5941718110a2 100644
--- a/code/datums/wounds/_wounds.dm
+++ b/code/datums/wounds/_wounds.dm
@@ -63,8 +63,6 @@
/// Specific items such as bandages or sutures that can try directly treating this wound
var/list/treatable_by
- /// Specific items such as bandages or sutures that can try directly treating this wound only if the user has the victim in an aggressive grab or higher
- var/list/treatable_by_grabbed
/// Any tools with any of the flags in this list will be usable to try directly treating this wound
var/list/treatable_tools
/// How long it will take to treat this wound with a standard effective tool, assuming it doesn't need surgery
@@ -93,8 +91,6 @@
/// What status effect we assign on application
var/status_effect_type
- /// If we're operating on this wound and it gets healed, we'll nix the surgery too
- var/datum/surgery/attached_surgery
/// if you're a lazy git and just throw them in cryo, the wound will go away after accumulating severity * [base_xadone_progress_to_qdel] power
var/cryo_progress
@@ -123,9 +119,8 @@
update_actionspeed_modifier()
/datum/wound/Destroy()
- QDEL_NULL(attached_surgery)
if (limb)
- remove_wound()
+ remove_wound(destroying = QDELING(limb))
QDEL_NULL(actionspeed_mod)
@@ -177,16 +172,15 @@
*
*
* Arguments:
- * * L: The bodypart we're wounding, we don't care about the person, we can get them through the limb
+ * * limb: The bodypart we're wounding, we don't care about the person, we can get them through the limb
* * silent: Not actually necessary I don't think, was originally used for demoting wounds so they wouldn't make new messages, but I believe old_wound took over that, I may remove this shortly
* * old_wound: If our new wound is a replacement for one of the same time (promotion or demotion), we can reference the old one just before it's removed to copy over necessary vars
* * smited- If this is a smite, we don't care about this wound for stat tracking purposes (not yet implemented)
* * attack_direction: For bloodsplatters, if relevant
* * wound_source: The source of the wound, such as a weapon.
*/
-/datum/wound/proc/apply_wound(obj/item/bodypart/L, silent = FALSE, datum/wound/old_wound = null, smited = FALSE, attack_direction = null, wound_source = "Unknown", replacing = FALSE)
-
- if (!can_be_applied_to(L, old_wound))
+/datum/wound/proc/apply_wound(obj/item/bodypart/limb, silent = FALSE, datum/wound/old_wound = null, smited = FALSE, attack_direction = null, wound_source = "Unknown", replacing = FALSE)
+ if (!limb.is_woundable() || !can_be_applied_to(limb, old_wound))
qdel(src)
return FALSE
@@ -198,8 +192,8 @@
else
src.wound_source = "Unknown"
- set_victim(L.owner)
- set_limb(L, replacing)
+ set_victim(limb.owner)
+ set_limb(limb, replacing)
LAZYADD(victim.all_wounds, src)
LAZYADD(limb.wounds, src)
update_descriptions()
@@ -226,7 +220,7 @@
victim.visible_message(msg, span_userdanger("Your [limb.plaintext_zone] [occur_text]!"), vision_distance = vis_dist)
if(sound_effect)
- playsound(L.owner, sound_effect, sound_volume + (20 * severity), TRUE, falloff_exponent = SOUND_FALLOFF_EXPONENT + 2, ignore_walls = FALSE, falloff_distance = 0)
+ playsound(limb.owner, sound_effect, sound_volume + (20 * severity), TRUE, falloff_exponent = SOUND_FALLOFF_EXPONENT + 2, ignore_walls = FALSE, falloff_distance = 0)
wound_injury(old_wound, attack_direction = attack_direction)
if(!demoted)
@@ -235,13 +229,13 @@
return TRUE
/// Returns TRUE if we can be applied to the limb.
-/datum/wound/proc/can_be_applied_to(obj/item/bodypart/L, datum/wound/old_wound)
+/datum/wound/proc/can_be_applied_to(obj/item/bodypart/limb, datum/wound/old_wound)
var/datum/wound_pregen_data/pregen_data = GLOB.all_wound_pregen_data[type]
// We assume we aren't being randomly applied - we have no reason to believe we are
// And, besides, if we were, you could just as easily check our pregen data rather than run this proc
// Generally speaking this proc is called in apply_wound, which is called when the caller is already confidant in its ability to be applied
- return pregen_data.can_be_applied_to(L, old_wound = old_wound)
+ return pregen_data.can_be_applied_to(limb, old_wound = old_wound)
/// Returns the zones we can be applied to.
/datum/wound/proc/get_viable_zones()
@@ -270,6 +264,7 @@
UnregisterSignal(victim, COMSIG_QDELETING)
UnregisterSignal(victim, COMSIG_MOB_SWAP_HANDS)
UnregisterSignal(victim, COMSIG_CARBON_POST_REMOVE_LIMB)
+ UnregisterSignal(victim, COMSIG_ATOM_ITEM_INTERACTION)
if (actionspeed_mod)
victim.remove_actionspeed_modifier(actionspeed_mod) // no need to qdelete it, just remove it from our victim
@@ -278,13 +273,15 @@
if(victim)
RegisterSignal(victim, COMSIG_QDELETING, PROC_REF(null_victim))
RegisterSignals(victim, list(COMSIG_MOB_SWAP_HANDS, COMSIG_CARBON_POST_REMOVE_LIMB, COMSIG_CARBON_POST_ATTACH_LIMB), PROC_REF(add_or_remove_actionspeed_mod))
-
+ RegisterSignal(victim, COMSIG_ATOM_ITEM_INTERACTION, PROC_REF(interact_try_treating))
if (limb)
start_limping_if_we_should() // the status effect already handles removing itself
add_or_remove_actionspeed_mod()
/// Proc called to change the variable `limb` and react to the event.
-/datum/wound/proc/set_limb(obj/item/bodypart/new_value, replaced = FALSE)
+/// * replaced - Is the wound being overriden by another (stronger) wound?
+/// * destroying - Is this coming from a limb's Destroy() call? If so, cut down on updates we cause
+/datum/wound/proc/set_limb(obj/item/bodypart/new_value, replaced = FALSE, destroying = FALSE)
if(limb == new_value)
return FALSE //Limb can either be a reference to something or `null`. Returning the number variable makes it clear no change was made.
. = limb
@@ -292,7 +289,8 @@
UnregisterSignal(limb, COMSIG_QDELETING)
UnregisterSignal(limb, list(COMSIG_BODYPART_GAUZED, COMSIG_BODYPART_UNGAUZED))
LAZYREMOVE(limb.wounds, src)
- limb.update_wounds(replaced)
+ if (!destroying)
+ limb.update_wounds(replaced)
if (disabling)
limb.remove_traits(list(TRAIT_PARALYSIS, TRAIT_DISABLED_BY_WOUND), REF(src))
@@ -328,14 +326,17 @@
SIGNAL_HANDLER
qdel(src)
-/// Remove the wound from whatever it's afflicting, and cleans up whatever status effects it had or modifiers it had on interaction times. ignore_limb is used for detachments where we only want to forget the victim
-/datum/wound/proc/remove_wound(ignore_limb, replaced = FALSE)
+/// Remove the wound from whatever it's afflicting, and cleans up whatever status effects it had or modifiers it had on interaction times.
+/// * ignore_limb - Used for detachments where we only want to forget the victim
+/// * replaced - If the wound is being replaced by another type
+/// * destroying - If we're being removed by a limb getting destroyed
+/datum/wound/proc/remove_wound(ignore_limb, replaced = FALSE, destroying = FALSE)
//TODO: have better way to tell if we're getting removed without replacement (full heal) scar stuff
var/old_victim = victim
var/old_limb = limb
set_disabling(FALSE)
- if(limb && can_scar && !already_scarred && !replaced)
+ if(limb && can_scar && !already_scarred && !replaced && !destroying)
already_scarred = TRUE
var/datum/scar/new_scar = new
new_scar.generate(limb, src)
@@ -345,12 +346,12 @@
null_victim() // we use the proc here because some behaviors may depend on changing victim to some new value
if(limb && !ignore_limb)
- set_limb(null, replaced) // since we're removing limb's ref to us, we should do the same
+ set_limb(null, replaced, destroying) // since we're removing limb's ref to us, we should do the same
// if you want to keep the ref, do it externally, there's no reason for us to remember it
if (ismob(old_victim))
var/mob/mob_victim = old_victim
- SEND_SIGNAL(mob_victim, COMSIG_CARBON_POST_LOSE_WOUND, src, old_limb, ignore_limb, replaced)
+ SEND_SIGNAL(mob_victim, COMSIG_CARBON_POST_LOSE_WOUND, src, old_limb, ignore_limb, replaced, destroying)
if(!replaced && !limb)
mob_victim.update_health_hud()
@@ -460,69 +461,78 @@
if(WOUND_SEVERITY_LOSS)
victim.reagents.add_reagent(/datum/reagent/determination, WOUND_DETERMINATION_LOSS)
+/datum/wound/proc/interact_try_treating(datum/source, mob/living/user, obj/item/tool, ...)
+ SIGNAL_HANDLER
+
+ return try_treating(tool, user)
+
/**
- * try_treating() is an intercept run from [/mob/living/carbon/proc/attackby] right after surgeries but before anything else. Return TRUE here if the item is something that is relevant to treatment to take over the interaction.
+ * Attempt to treat the wound with the given item/tool by the given user
+ * This proc leads into [/datum/wound/proc/treat]
*
- * This proc leads into [/datum/wound/proc/treat] and probably shouldn't be added onto in children types. You can specify what items or tools you want to be intercepted
- * with var/list/treatable_by and var/treatable_tool, then if an item fulfills one of those requirements and our wound claims it first, it goes over to treat() and treat_self().
+ * You can specify what items or tools you want to be intercepted
+ * with var/list/treatable_by and var/treatable_tool,
+ * then if an item fulfills one of those requirements and our wound claims it first,
+ * it goes over to treat() and treat_self().
*
* Arguments:
* * I: The item we're trying to use
* * user: The mob trying to use it on us
*/
-/datum/wound/proc/try_treating(obj/item/I, mob/user)
- // first we weed out if we're not dealing with our wound's bodypart, or if it might be an attack
- if(!I || limb.body_zone != user.zone_selected)
- return FALSE
+/datum/wound/proc/try_treating(obj/item/tool, mob/living/user)
+ SHOULD_NOT_OVERRIDE(TRUE)
- if(isliving(user))
- var/mob/living/tendee = user
- if(I.force && tendee.combat_mode)
- return FALSE
+ if(limb.body_zone != user.zone_selected)
+ return NONE
- if(!item_can_treat(I, user))
- return FALSE
+ if(user.combat_mode && tool.force)
+ return NONE
+
+ if(!item_can_treat(tool, user))
+ return NONE
- // now that we've determined we have a valid attempt at treating, we can stomp on their dreams if we're already interacting with the patient or if their part is obscured
+ // now that we've determined we have a valid attempt at treating,
+ // we can stomp on their dreams if we're already interacting with the patient or if their part is obscured
if(DOING_INTERACTION_WITH_TARGET(user, victim))
to_chat(user, span_warning("You're already interacting with [victim]!"))
- return TRUE
+ return ITEM_INTERACT_BLOCKING
// next we check if the bodypart in actually accessible (not under thick clothing). We skip the species trait check since skellies
// & such may need to use bone gel but may be wearing a space suit for..... whatever reason a skeleton would wear a space suit for
if(ishuman(victim))
var/mob/living/carbon/human/victim_human = victim
if(!victim_human.try_inject(user, injection_flags = INJECT_CHECK_IGNORE_SPECIES | INJECT_TRY_SHOW_ERROR_MESSAGE))
- return TRUE
+ return ITEM_INTERACT_BLOCKING
- // lastly, treat them
- return treat(I, user) // we allow treat to return a value so it can control if the item does its normal interaction or not
+ INVOKE_ASYNC(src, PROC_REF(treat), tool, user)
+ return ITEM_INTERACT_SUCCESS
/// Returns TRUE if the item can be used to treat our wounds. Hooks into treat() - only things that return TRUE here may be used there.
/datum/wound/proc/item_can_treat(obj/item/potential_treater, mob/user)
// check if we have a valid treatable tool
if(potential_treater.tool_behaviour in treatable_tools)
return TRUE
- if((TOOL_CAUTERY in treatable_tools) && potential_treater.get_temperature() && (user == victim)) // allow improvised cauterization on yourself without an aggro grab
- return TRUE
// failing that, see if we're aggro grabbing them and if we have an item that works for aggro grabs only
- if(user.pulling == victim && user.grab_state >= GRAB_AGGRESSIVE && check_grab_treatments(potential_treater, user))
+ if((user == victim || (user.pulling == victim && user.grab_state >= GRAB_AGGRESSIVE)) && check_grab_treatments(potential_treater, user))
return TRUE
// failing THAT, we check if we have a generally allowed item
- for(var/allowed_type in treatable_by)
- if(istype(potential_treater, allowed_type))
- return TRUE
+ if(is_type_in_list(potential_treater, treatable_by))
+ return TRUE
+ return FALSE
-/// Return TRUE if we have an item that can only be used while aggro grabbed (unhanded aggro grab treatments go in [/datum/wound/proc/try_handling]). Treatment is still is handled in [/datum/wound/proc/treat]
-/datum/wound/proc/check_grab_treatments(obj/item/I, mob/user)
+/// Return TRUE if we have an item that can only be used while aggro grabbed
+/// (unhanded aggro grab treatments go in [/datum/wound/proc/try_handling]).
+/// Treatment is still is handled in [/datum/wound/proc/treat]
+/datum/wound/proc/check_grab_treatments(obj/item/tool, mob/user)
return FALSE
-/// Like try_treating() but for unhanded interactions, used by joint dislocations for manual bodypart chiropractice for example. Ignores thick material checks since you can pop an arm into place through a thick suit unlike using sutures
+/// Like try_treating() but for unhanded interactions, used by joint dislocations for manual bodypart chiropractice for example.
+/// Ignores thick material checks since you can pop an arm into place through a thick suit unlike using sutures
/datum/wound/proc/try_handling(mob/living/user)
return FALSE
/// Someone is using something that might be used for treating the wound on this limb
-/datum/wound/proc/treat(obj/item/I, mob/user)
+/datum/wound/proc/treat(obj/item/tool, mob/user)
return
/// If var/processing is TRUE, this is run on each life tick
@@ -743,7 +753,7 @@
var/datum/wound_pregen_data/pregen_data = get_pregen_data()
- if ((WOUND_BLUNT in pregen_data.required_wounding_types) && severity >= WOUND_SEVERITY_CRITICAL)
+ if (pregen_data.required_wounding_type == WOUND_BLUNT && severity >= WOUND_SEVERITY_CRITICAL)
return WOUND_CRITICAL_BLUNT_DISMEMBER_BONUS // we only require mangled bone (T2 blunt), but if there's a critical blunt, we'll add 15% more
/// Returns our pregen data, which is practically guaranteed to exist, so this proc can safely be used raw.
diff --git a/code/datums/wounds/bones.dm b/code/datums/wounds/bones.dm
index 8103f7047f1a..b3e3051fefdd 100644
--- a/code/datums/wounds/bones.dm
+++ b/code/datums/wounds/bones.dm
@@ -8,7 +8,7 @@
abstract = TRUE
required_limb_biostate = BIO_BONE
- required_wounding_types = list(WOUND_BLUNT)
+ required_wounding_type = WOUND_BLUNT
wound_series = WOUND_SERIES_BONE_BLUNT_BASIC
@@ -69,7 +69,7 @@
return ..()
-/datum/wound/blunt/bone/remove_wound(ignore_limb, replaced)
+/datum/wound/blunt/bone/remove_wound(ignore_limb, replaced, destroying)
limp_slowdown = 0
limp_chance = 0
QDEL_NULL(active_trauma)
@@ -88,7 +88,7 @@
active_trauma = victim.gain_trauma_type(brain_trauma_group, TRAUMA_RESILIENCE_WOUND)
next_trauma_cycle = world.time + (rand(100-WOUND_BONE_HEAD_TIME_VARIANCE, 100+WOUND_BONE_HEAD_TIME_VARIANCE) * 0.01 * trauma_cycle_cooldown)
- var/is_bone_limb = ((limb.biological_state & BIO_BONE) && !(limb.biological_state & BIO_FLESH))
+ var/is_bone_limb = ((limb.biological_state & BIO_BONE) && !(limb.biological_state & (BIO_FLESH|BIO_CHITIN)))
if(!gelled || (!taped && !is_bone_limb))
return
@@ -101,7 +101,7 @@
if(!is_bone_limb && SPT_PROB(severity * 1.5, seconds_per_tick))
victim.take_bodypart_damage(rand(1, severity * 2), wound_bonus=CANT_WOUND)
- victim.adjustStaminaLoss(rand(2, severity * 2.5))
+ victim.adjust_stamina_loss(rand(2, severity * 2.5))
if(prob(33))
to_chat(victim, span_danger("You feel a sharp pain in your body as your bones are reforming!"))
@@ -169,7 +169,7 @@
if(!victim || wounding_dmg < WOUND_MINIMUM_DAMAGE || !victim.can_bleed())
return
- if(limb.body_zone == BODY_ZONE_CHEST && victim.blood_volume && prob(internal_bleeding_chance + wounding_dmg))
+ if(limb.body_zone == BODY_ZONE_CHEST && victim.get_blood_volume() && prob(internal_bleeding_chance + wounding_dmg))
var/blood_bled = rand(1, wounding_dmg * (severity == WOUND_SEVERITY_CRITICAL ? 2 : 1.5)) // 12 brute toolbox can cause up to 18/24 bleeding with a severe/critical chest wound
switch(blood_bled)
if(1 to 6)
@@ -338,19 +338,19 @@
victim.apply_damage(10, BRUTE, limb, wound_bonus = CANT_WOUND)
malpractice(user)
-/datum/wound/blunt/bone/moderate/treat(obj/item/I, mob/user)
+/datum/wound/blunt/bone/moderate/treat(obj/item/tool, mob/user)
var/scanned = HAS_TRAIT(src, TRAIT_WOUND_SCANNED)
var/self_penalty_mult = user == victim ? 1.5 : 1
var/scanned_mult = scanned ? 0.5 : 1
var/treatment_delay = base_treat_time * self_penalty_mult * scanned_mult
if(victim == user)
- victim.visible_message(span_danger("[user] begins [scanned ? "expertly" : ""] resetting [victim.p_their()] [limb.plaintext_zone] with [I]."), span_warning("You begin resetting your [limb.plaintext_zone] with [I][scanned ? ", keeping the holo-image's indications in mind" : ""]..."))
+ victim.visible_message(span_danger("[user] begins [scanned ? "expertly" : ""] resetting [victim.p_their()] [limb.plaintext_zone] with [tool]."), span_warning("You begin resetting your [limb.plaintext_zone] with [tool][scanned ? ", keeping the holo-image's indications in mind" : ""]..."))
else
- user.visible_message(span_danger("[user] begins [scanned ? "expertly" : ""] resetting [victim]'s [limb.plaintext_zone] with [I]."), span_notice("You begin resetting [victim]'s [limb.plaintext_zone] with [I][scanned ? ", keeping the holo-image's indications in mind" : ""]..."))
+ user.visible_message(span_danger("[user] begins [scanned ? "expertly" : ""] resetting [victim]'s [limb.plaintext_zone] with [tool]."), span_notice("You begin resetting [victim]'s [limb.plaintext_zone] with [tool][scanned ? ", keeping the holo-image's indications in mind" : ""]..."))
if(!do_after(user, treatment_delay, target = victim, extra_checks=CALLBACK(src, PROC_REF(still_exists))))
- return TRUE
+ return
if(victim == user)
victim.apply_damage(15, BRUTE, limb, wound_bonus = CANT_WOUND)
@@ -362,7 +362,6 @@
victim.emote("scream")
qdel(src)
- return TRUE
/*
Severe (Hairline Fracture)
@@ -436,6 +435,9 @@
simple_treat_text = "Bandaging the wound will slightly reduce its impact until surgically treated with bone gel and surgical tape."
homemade_treat_text = "Although this is extremely difficult and slow to function, Bone gel and surgical tape may be applied directly to the wound, though this is nigh-impossible for most people to do so individually unless they've dosed themselves with one or more painkillers (Morphine and Miner's Salve have been known to help)"
+ /// Tracks if a surgeon has reset the bone (part one of the surgical treatment process)
+ VAR_FINAL/reset = FALSE
+
/datum/wound_pregen_data/bone/compound
abstract = FALSE
@@ -453,7 +455,7 @@
/// if someone is using bone gel on our wound
/datum/wound/blunt/bone/proc/gel(obj/item/stack/medical/bone_gel/I, mob/user)
// skellies get treated nicer with bone gel since their "reattach dismembered limbs by hand" ability sucks when it's still critically wounded
- if((limb.biological_state & BIO_BONE) && !(limb.biological_state & BIO_FLESH))
+ if((limb.biological_state & BIO_BONE) && !(limb.biological_state & (BIO_FLESH|BIO_CHITIN)))
return skelly_gel(I, user)
if(gelled)
@@ -533,11 +535,15 @@
processes = TRUE
return TRUE
-/datum/wound/blunt/bone/treat(obj/item/I, mob/user)
- if(istype(I, /obj/item/stack/medical/bone_gel))
- return gel(I, user)
- else if(istype(I, /obj/item/stack/sticky_tape/surgical))
- return tape(I, user)
+/datum/wound/blunt/bone/item_can_treat(obj/item/potential_treater, mob/user)
+ // assume that - if working on a ready-to-operate limb - the surgery wants to do the real surgery instead of bone regeneration
+ return ..() && !HAS_TRAIT(limb, TRAIT_READY_TO_OPERATE)
+
+/datum/wound/blunt/bone/treat(obj/item/tool, mob/user)
+ if(istype(tool, /obj/item/stack/medical/bone_gel))
+ gel(tool, user)
+ if(istype(tool, /obj/item/stack/sticky_tape/surgical))
+ tape(tool, user)
/datum/wound/blunt/bone/get_scanner_description(mob/user)
. = ..()
@@ -545,7 +551,7 @@
. += "
"
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 +566,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 5fae2f77e7a9..870df194c537 100644
--- a/code/datums/wounds/burns.dm
+++ b/code/datums/wounds/burns.dm
@@ -18,23 +18,21 @@
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)
@@ -44,7 +42,7 @@
. = ..()
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,19 +239,18 @@
/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)
@@ -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
@@ -277,7 +274,7 @@
/datum/wound_pregen_data/flesh_burn
abstract = TRUE
- required_wounding_types = list(WOUND_BURN)
+ required_wounding_type = WOUND_BURN
required_limb_biostate = BIO_FLESH
wound_series = WOUND_SERIES_FLESH_BURN_BASIC
@@ -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 6cda116df216..f61e5386fb56 100644
--- a/code/datums/wounds/cranial_fissure.dm
+++ b/code/datums/wounds/cranial_fissure.dm
@@ -2,7 +2,7 @@
wound_path_to_generate = /datum/wound/cranial_fissure
required_limb_biostate = BIO_BONE
- required_wounding_types = list(WOUND_ALL)
+ required_wounding_type = WOUND_ALL
wound_series = WOUND_SERIES_CRANIAL_FISSURE
@@ -40,6 +40,9 @@
severity = WOUND_SEVERITY_CRITICAL
sound_effect = 'sound/effects/dismember.ogg'
+ /// If TRUE we have been prepped for surgery (to repair)
+ VAR_FINAL/prepped = FALSE
+
#define CRANIAL_FISSURE_FILTER_DISPLACEMENT "cranial_fissure_displacement"
/datum/wound/cranial_fissure/wound_injury(datum/wound/old_wound = null, attack_direction = null)
@@ -50,7 +53,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 4fb5cad387f1..ea6eefca691e 100644
--- a/code/datums/wounds/loss.dm
+++ b/code/datums/wounds/loss.dm
@@ -5,7 +5,7 @@
required_limb_biostate = NONE
require_any_biostate = TRUE
- required_wounding_types = list(WOUND_ALL)
+ required_wounding_type = WOUND_ALL
wound_series = WOUND_SERIES_LOSS_BASIC
@@ -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 676f8c89f4b4..0a2e98dcf8fa 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)
@@ -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,14 +181,13 @@
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_wounding_types = list(WOUND_PIERCE)
+ 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,8 +397,8 @@
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
diff --git a/code/datums/wounds/slash.dm b/code/datums/wounds/slash.dm
index 0e88f7cee5d1..23fda75c902a 100644
--- a/code/datums/wounds/slash.dm
+++ b/code/datums/wounds/slash.dm
@@ -25,7 +25,7 @@
/datum/wound_pregen_data/flesh_slash
abstract = TRUE
- required_wounding_types = list(WOUND_SLASH)
+ required_wounding_type = WOUND_SLASH
required_limb_biostate = BIO_FLESH
wound_series = WOUND_SERIES_FLESH_SLASH_BLEED
@@ -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)
@@ -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))
@@ -253,9 +252,8 @@
if(!lasgun.process_fire(victim, victim, TRUE, null, limb.body_zone))
return
victim.emote("scream")
- adjust_blood_flow(-1 * (damage / (5 * self_penalty_mult))) // 20 / 5 = 4 bloodflow removed, p good
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,9 +335,9 @@
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
@@ -371,9 +368,9 @@
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
diff --git a/code/game/area/ai_monitored.dm b/code/game/area/ai_monitored.dm
deleted file mode 100644
index f6559d344c4a..000000000000
--- 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 cbe227905f37..c9692021a01b 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 4e63479987e8..000000000000
--- 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 648ef4c8d316..39d7ebce1dbe 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 06a87345f9cf..58d0439eed33 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 9f0bcfab8f6d..3d97da72c39a 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 df3fbe4b18fc..94c826a729b1 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 f2ecc7ac73e3..92fff19386da 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 7dff4bdba551..80f8f6bb33ae 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 4e806bf1c103..cef9e3d308a3 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 c2e32c86bee0..24bd482633ce 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 c37d53de1517..9a651fb5e3dc 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 000000000000..ff12a728f282
--- /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 ee4325d94aef..30f126dc42cb 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 2280215ab6ee..1b6eba4dc25e 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 71fe6024d887..feb565ecd534 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 9512f20c709c..12a5ba6816b4 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 5e636719e7a0..a6fa76cd80e9 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 be99950c7361..fde6b00bf5f2 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 57623ee6183d..b64e7efe75a4 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 1faf889684cc..8c15638c7f02 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 f315a055f2e9..355406563264 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
@@ -112,7 +112,7 @@
/area/station/service/chapel
name = "\improper Chapel"
icon_state = "chapel"
- mood_bonus = 5
+ mood_bonus = 4
mood_message = "Being in the chapel brings me peace."
mood_trait = TRAIT_SPIRITUAL
ambience_index = AMBIENCE_HOLY
@@ -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 8d3a81420e7d..569a7f0a169e 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 ce77ca09ada3..2519189fdece 100644
--- a/code/game/atom/_atom.dm
+++ b/code/game/atom/_atom.dm
@@ -336,11 +336,12 @@
return FALSE
/**
- * Ensure a list of atoms/reagents exists inside this atom
+ * Called whenever an item is crafted, either via stack recipes or crafting recipes from the crafting menu
*
- * Cycles through the list of movables used up in the recipe and calls used_in_craft() for each of them
- * then it either moves them inside the object or deletes
- * them depending on whether they're in the list of parts for the recipe or not
+ * By default, it just cycles through the list of movables used in the recipe and calls used_in_craft() for each of them,
+ * then it either moves them inside the object if they're in the list of parts for the recipe
+ * or deletes them if they're not.
+ * The proc can be overriden by subtypes, as long as it always call parent.
*/
/atom/proc/on_craft_completion(list/components, datum/crafting_recipe/current_recipe, atom/crafter)
SHOULD_CALL_PARENT(TRUE)
@@ -349,17 +350,17 @@
var/list/parts_by_type = remaining_parts?.Copy()
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/obj/item/item in components) // machinery or structure objects in the list are guaranteed to be used up. We only check items.
- item.used_in_craft(src, current_recipe)
- var/matched_type = is_type_in_list(item, parts_by_type, zebra = TRUE)
+ 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.
+ movable.used_in_craft(src, current_recipe)
+ var/matched_type = is_type_in_list(movable, parts_by_type, zebra = TRUE)
if(!matched_type)
continue
- if(isliving(item.loc))
- var/mob/living/living = item.loc
- living.transferItemToLoc(item, src)
+ if(isliving(movable.loc) && isitem(movable))
+ var/mob/living/living = movable.loc
+ living.transferItemToLoc(movable, src)
else
- item.forceMove(src)
+ movable.forceMove(src)
if(matched_type)
remaining_parts[matched_type] -= 1
@@ -428,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
@@ -653,7 +654,10 @@
/atom/proc/StartProcessingAtom(mob/living/user, obj/item/process_item, list/chosen_option)
var/processing_time = chosen_option[TOOL_PROCESSING_TIME]
+ var/sound_to_play = chosen_option[TOOL_PROCESSING_SOUND]
to_chat(user, span_notice("You start working on [src]."))
+ if(sound_to_play)
+ playsound(src, sound_to_play, 50, TRUE)
if(!process_item.use_tool(src, user, processing_time, volume=50))
return
var/atom/atom_to_create = chosen_option[TOOL_PROCESSING_RESULT]
diff --git a/code/game/atom/alternate_appearance.dm b/code/game/atom/alternate_appearance.dm
index 1bc5ae0d6415..e642de36fe35 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
@@ -228,7 +229,7 @@ GLOBAL_LIST_EMPTY(active_alternate_appearances)
/datum/atom_hud/alternate_appearance/basic/heretic
-/datum/atom_hud/alternate_appearance/basic/heretic/mobShouldSee(mob/M)
- if(IS_HERETIC(M))
+/datum/atom_hud/alternate_appearance/basic/heretic/mobShouldSee(mob/viewer)
+ if(IS_HERETIC_OR_MONSTER(viewer))
return TRUE
return FALSE
diff --git a/code/game/atom/atom_act.dm b/code/game/atom/atom_act.dm
index 197d6c9e38b4..2a0475302b4a 100644
--- a/code/game/atom/atom_act.dm
+++ b/code/game/atom/atom_act.dm
@@ -72,6 +72,14 @@
if(!(protection & EMP_PROTECT_WIRES) && istype(wires))
wires.emp_pulse()
+ if(flags_1 & HOLOGRAM_1) // holograms should ignore EMP_PROTECT flags (since the protection itself is also a hologram)
+ if(prob(75 / severity))
+ // avoid spamming messages for anything inside the holodeck directly
+ if(!istype(get_area(src), /area/station/holodeck))
+ visible_message(span_warning("[src] fades away!"))
+ animate(alpha = 0, time = 1 SECONDS)
+ QDEL_IN(src, 1 SECONDS)
+
SEND_SIGNAL(src, COMSIG_ATOM_EMP_ACT, severity, protection)
return protection // Pass the protection value collected here upwards
@@ -85,8 +93,18 @@
*/
/atom/proc/projectile_hit(obj/projectile/hitting_projectile, def_zone, piercing_hit = FALSE, blocked = null)
+ var/sigreturn = SEND_SIGNAL(src, COMSIG_ATOM_PRE_BULLET_ACT, hitting_projectile, def_zone, piercing_hit)
+
+ if(sigreturn & COMPONENT_BULLET_PIERCED)
+ return BULLET_ACT_FORCE_PIERCE
+ if(sigreturn & COMPONENT_BULLET_BLOCKED)
+ return BULLET_ACT_BLOCK
+ if(sigreturn & COMPONENT_BULLET_ACTED)
+ return BULLET_ACT_HIT
+
if (isnull(blocked))
blocked = check_projectile_armor(def_zone, hitting_projectile)
+
return bullet_act(hitting_projectile, def_zone, piercing_hit, blocked)
/**
@@ -100,15 +118,6 @@
*/
/atom/proc/bullet_act(obj/projectile/hitting_projectile, def_zone, piercing_hit = FALSE, blocked = 0)
SHOULD_CALL_PARENT(TRUE)
-
- var/sigreturn = SEND_SIGNAL(src, COMSIG_ATOM_PRE_BULLET_ACT, hitting_projectile, def_zone, piercing_hit, blocked)
- if(sigreturn & COMPONENT_BULLET_PIERCED)
- return BULLET_ACT_FORCE_PIERCE
- if(sigreturn & COMPONENT_BULLET_BLOCKED)
- return BULLET_ACT_BLOCK
- if(sigreturn & COMPONENT_BULLET_ACTED)
- return BULLET_ACT_HIT
-
SEND_SIGNAL(src, COMSIG_ATOM_BULLET_ACT, hitting_projectile, def_zone, piercing_hit, blocked)
if(QDELETED(hitting_projectile)) // Signal deleted it?
return BULLET_ACT_BLOCK
@@ -221,8 +230,9 @@
*
* Override this if you want custom behaviour in whatever gets hit by the rust
* /turf/rust_turf should be used instead for overriding rust on turfs
+ * rust_strength (optional) - if you want to vary the effect based on the users' strength
*/
-/atom/proc/rust_heretic_act()
+/atom/proc/rust_heretic_act(rust_strength)
return
///wrapper proc that passes our mob's rust_strength to the target we are rusting
@@ -243,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_examine.dm b/code/game/atom/atom_examine.dm
index 7b6260758d0b..4053c3dc1cf2 100644
--- a/code/game/atom/atom_examine.dm
+++ b/code/game/atom/atom_examine.dm
@@ -153,7 +153,7 @@
return "\a [src]"
/mob/living/get_examine_name(mob/user)
- var/visible_name = get_visible_name()
+ var/visible_name = get_visible_name(examiner = user) // DARKPACK EDIT, ORIGINAL: var/visible_name = get_visible_name()
var/list/name_override = list(visible_name)
if(SEND_SIGNAL(user, COMSIG_LIVING_PERCEIVE_EXAMINE_NAME, src, visible_name, name_override) & COMPONENT_EXAMINE_NAME_OVERRIDEN)
return name_override[1]
@@ -193,5 +193,5 @@
* * add_id_name - If TRUE, ID information such as honorifics or name (if mismatched) are appended
* * force_real_name - If TRUE, will always return real_name and add (as face_name/id_name) if it doesn't match their appearance
*/
-/atom/proc/get_visible_name(add_id_name = TRUE, force_real_name = FALSE)
+/atom/proc/get_visible_name(add_id_name = TRUE, force_real_name = FALSE, mob/examiner) // DARKPACK EDIT, ORIGINAL: /atom/proc/get_visible_name(add_id_name = TRUE, force_real_name = FALSE)
return name
diff --git a/code/game/atom/atom_materials.dm b/code/game/atom/atom_materials.dm
index 542930919ce5..a4200fd418f1 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,19 +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
-
- var/most_common_material = null
- var/max_amount = 0
- for(var/material in cached_materials)
- if(cached_materials[material] > max_amount)
- most_common_material = material
- max_amount = cached_materials[material]
-
- if(most_common_material)
- return GET_MATERIAL_REF(most_common_material)
+ 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.
@@ -396,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
@@ -410,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)
@@ -421,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 92f8be528c64..176ee8e5248f 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/atoms_movable.dm b/code/game/atoms_movable.dm
index 3a984ee64f9f..5377dccfddc7 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -174,6 +174,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
@@ -577,7 +579,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))
@@ -1328,13 +1330,13 @@
return ..()
// Calls throw_at after checking that the move strength is greater than the thrown atom's move resist. Identical args.
-/atom/movable/proc/safe_throw_at(atom/target, range, speed, mob/thrower, spin = TRUE, diagonals_first = FALSE, datum/callback/callback, force = MOVE_FORCE_STRONG, gentle = FALSE)
+/atom/movable/proc/safe_throw_at(atom/target, range, speed, atom/thrower, spin = TRUE, diagonals_first = FALSE, datum/callback/callback, force = MOVE_FORCE_STRONG, gentle = FALSE)
if((force < (move_resist * MOVE_FORCE_THROW_RATIO)) || (move_resist == INFINITY))
return
return throw_at(target, range, speed, thrower, spin, diagonals_first, callback, force, gentle)
///If this returns FALSE then callback will not be called.
-/atom/movable/proc/throw_at(atom/target, range, speed, mob/thrower, spin = TRUE, diagonals_first = FALSE, datum/callback/callback, force = MOVE_FORCE_STRONG, gentle = FALSE, quickstart = TRUE, throw_datum_typepath = /datum/thrownthing)
+/atom/movable/proc/throw_at(atom/target, range, speed, atom/thrower, spin = TRUE, diagonals_first = FALSE, datum/callback/callback, force = MOVE_FORCE_STRONG, gentle = FALSE, quickstart = TRUE, throw_datum_typepath = /datum/thrownthing)
. = FALSE
if(QDELETED(src))
@@ -1350,36 +1352,38 @@
pulledby.stop_pulling()
//They are moving! Wouldn't it be cool if we calculated their momentum and added it to the throw?
- if (thrower && thrower.last_move && thrower.client && thrower.client.move_delay >= world.time + world.tick_lag*2)
- var/user_momentum = thrower.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
-
- user_momentum = 1 / user_momentum // convert from ds to the tiles per ds that throw_at uses.
-
- if (get_dir(thrower, target) & last_move)
- user_momentum = user_momentum //basically a noop, but needed
- else if (get_dir(target, thrower) & last_move)
- user_momentum = -user_momentum //we are moving away from the target, lets slowdown the throw accordingly
- else
- user_momentum = 0
-
+ if(ismob(thrower))
+ var/mob/thrower_mob = thrower
+ 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
+
+ user_momentum = 1 / user_momentum // convert from ds to the tiles per ds that throw_at uses.
+
+ if (get_dir(thrower_mob, target) & last_move)
+ user_momentum = user_momentum //basically a noop, but needed
+ else if (get_dir(target, thrower_mob) & last_move)
+ user_momentum = -user_momentum //we are moving away from the target, lets slowdown the throw accordingly
+ else
+ user_momentum = 0
- if (user_momentum)
- //first lets add that momentum to range.
- range *= (user_momentum / speed) + 1
- //then lets add it to speed
- speed += user_momentum
- if (speed <= 0)
- return//no throw speed, the user was moving too fast.
+ if (user_momentum)
+ //first lets add that momentum to range.
+ range *= (user_momentum / speed) + 1
+ //then lets add it to speed
+ speed += user_momentum
+ if (speed <= 0)
+ return//no throw speed, the user was moving too fast.
. = TRUE // No failure conditions past this point.
var/target_zone
if(QDELETED(thrower))
thrower = null //Let's not pass a qdeleting reference if any.
- else
- target_zone = thrower.zone_selected
+ else if(ismob(thrower))
+ var/mob/thrower_mob = thrower
+ target_zone = thrower_mob.zone_selected
var/datum/thrownthing/thrown_thing = new throw_datum_typepath(src, target, get_dir(src, target), range, speed, thrower, diagonals_first, force, gentle, callback, target_zone)
diff --git a/code/game/communications.dm b/code/game/communications.dm
index 9e40080a49d2..52bfc922e378 100644
--- a/code/game/communications.dm
+++ b/code/game/communications.dm
@@ -110,6 +110,14 @@ GLOBAL_LIST_INIT(default_radio_channels, list(
RADIO_CHANNEL_CTF_RED = FREQ_CTF_RED,
RADIO_CHANNEL_CTF_YELLOW = FREQ_CTF_YELLOW,
STATUS_DISPLAY_RELAY = FREQ_STATUS_DISPLAYS,
+ // DARKPACK EDIT ADD START
+ RADIO_CHANNEL_POLICE = FREQ_POLICE,
+ RADIO_CHANNEL_CLINIC = FREQ_CLINIC,
+ RADIO_CHANNEL_MILITARY = FREQ_MILITARY,
+ RADIO_CHANNEL_CAMARILLA = FREQ_CAMARILLA,
+ RADIO_CHANNEL_ANARCH = FREQ_ANARCH,
+ RADIO_CHANNEL_ENDRON = FREQ_ENDRON,
+ // DARKPACK EDIT ADD END
))
GLOBAL_LIST_INIT(reserved_radio_frequencies, list(
diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm
index 959716d230da..190e7f66f50c 100644
--- a/code/game/data_huds.dm
+++ b/code/game/data_huds.dm
@@ -8,48 +8,35 @@
/* 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
/datum/atom_hud/data/human/medical
hud_icons = list(STATUS_HUD, HEALTH_HUD)
+/// Sees health (0-100) status (alive, dead), but relies on suit sensors being on
/datum/atom_hud/data/human/medical/basic
-/datum/atom_hud/data/human/medical/basic/proc/check_sensors(mob/living/carbon/human/human)
- if(!istype(human))
- return FALSE
- if(HAS_TRAIT(human, HUMAN_SENSORS_VISIBLE_WITHOUT_SUIT))
- return TRUE
- var/obj/item/clothing/under/undersuit = human.w_uniform
- if(!istype(undersuit))
- return FALSE
- if(undersuit.has_sensor < HAS_SENSORS)
- return FALSE
- if(undersuit.sensor_mode <= SENSOR_VITALS)
- return FALSE
- return TRUE
-
-/datum/atom_hud/data/human/medical/basic/add_atom_to_single_mob_hud(mob/M, mob/living/carbon/H)
- if(check_sensors(H))
- ..()
-
-/datum/atom_hud/data/human/medical/basic/proc/update_suit_sensors(mob/living/carbon/H)
- check_sensors(H) ? add_atom_to_hud(H) : remove_atom_from_hud(H)
+/datum/atom_hud/data/human/medical/basic/add_atom_to_single_mob_hud(mob/requesting_mob, atom/hud_atom)
+ if(HAS_TRAIT(hud_atom, TRAIT_BASIC_HEALTH_HUD_VISIBLE))
+ return ..()
+/// Sees health (0-100) status (alive, dead), always
/datum/atom_hud/data/human/medical/advanced
/datum/atom_hud/data/human/security
+/// Only sees ID card job
/datum/atom_hud/data/human/security/basic
hud_icons = list(ID_HUD)
+/// Sees ID card job, implants, and wanted status
/datum/atom_hud/data/human/security/advanced
hud_icons = list(ID_HUD, IMPSEC_FIRST_HUD, IMPLOYAL_HUD, IMPSEC_SECOND_HUD, WANTED_HUD)
@@ -165,11 +152,6 @@ Medical HUD! Basic mode needs suit sensors on.
//HOOKS
-//called when a human changes suit sensors
-/mob/living/carbon/proc/update_suit_sensors()
- var/datum/atom_hud/data/human/medical/basic/B = GLOB.huds[DATA_HUD_MEDICAL_BASIC]
- B.update_suit_sensors(src)
-
//called when a living mob changes health
/mob/living/proc/med_hud_set_health()
set_hud_image_state(HEALTH_HUD, "hud[RoundHealth(src)]")
@@ -385,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
@@ -418,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)
@@ -489,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 a98b03d9c831..171086b06b65 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 904646f24085..33256f6d3909 100644
--- a/code/game/gamemodes/objective_items.dm
+++ b/code/game/gamemodes/objective_items.dm
@@ -295,11 +295,10 @@ GLOBAL_DATUM_INIT(steal_item_handler, /datum/objective_item_handler, new())
steal_hint = "A self-defense weapon standard-issue for all heads of staffs barring the Head of Security. Rarely found off of their person."
/datum/objective_item/steal/traitor/telebaton/check_special_completion(obj/item/thing)
- return thing.type == /obj/item/melee/baton/telescopic
+ return !istype(thing, /obj/item/melee/baton/telescopic/contractor_baton)
/obj/item/melee/baton/telescopic/add_stealing_item_objective()
- if(type == /obj/item/melee/baton/telescopic)
- return add_item_to_steal(src, /obj/item/melee/baton/telescopic)
+ return add_item_to_steal(src, /obj/item/melee/baton/telescopic)
/datum/objective_item/steal/traitor/cargo_budget
name = "cargo's departmental budget"
@@ -402,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"
@@ -912,6 +911,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 c97d4d4fbe11..c3fc2b6fbfa2 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
@@ -396,7 +402,7 @@
var/turf/this_turf = get_turf(src)
for(var/atom/movable/movable_atom in contents)
//so machines like microwaves dont dump out signalers after cooking
- if(wires && (movable_atom in flatten_list(wires.assemblies)))
+ if(wires && (movable_atom in assoc_to_values(wires.assemblies)))
continue
if(subset && !(movable_atom in subset))
@@ -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 ..()
@@ -1237,8 +1243,9 @@
dropped_atom.pixel_x = -8 + ((.%3)*8)
dropped_atom.pixel_y = -8 + (round( . / 3)*8)
-/obj/machinery/rust_heretic_act()
- take_damage(500, BRUTE, MELEE, 1)
+/obj/machinery/rust_heretic_act(rust_strength)
+ var/damage = 500 + rust_strength * 200
+ take_damage(damage, BRUTE, BOMB, 1)
/obj/machinery/vv_edit_var(vname, vval)
if(vname == NAMEOF(src, occupant))
diff --git a/code/game/machinery/ai_core/_core.dm b/code/game/machinery/ai_core/_core.dm
new file mode 100644
index 000000000000..512e193ac121
--- /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 000000000000..df1a36782daa
--- /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 745971011946..a66cd3209a21 100644
--- a/code/game/machinery/announcement_system.dm
+++ b/code/game/machinery/announcement_system.dm
@@ -29,10 +29,10 @@ GLOBAL_LIST_EMPTY(announcement_systems)
var/errorlight = "Error_Red"
/obj/machinery/announcement_system/Initialize(mapload)
+ config_entries = init_subtypes(/datum/aas_config_entry, list())
. = ..()
- GLOB.announcement_systems += src
radio = new radio_type(src)
- config_entries = init_subtypes(/datum/aas_config_entry, list())
+ GLOB.announcement_systems += src
update_appearance()
/obj/machinery/announcement_system/randomize_language_if_on_station()
@@ -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)
@@ -168,13 +175,14 @@ GLOBAL_LIST_EMPTY(announcement_systems)
/obj/machinery/announcement_system/proc/has_supported_channels(list/channels)
if (!LAZYLEN(channels) || (RADIO_CHANNEL_COMMON in channels))
// Okay, I am not proud of this, but I don't want CentCom or Syndie AASs to broadcast on Common.
- return src.type == /obj/machinery/announcement_system
+ // Because our overrides can just change radio withour creating new subtype we prefer to check both.
+ return src.type == /obj/machinery/announcement_system && src.radio_type == /obj/machinery/announcement_system::radio_type
for(var/channel in channels)
if(radio.channels[channel])
return TRUE
return FALSE
-/// Can AAS receive request for broadcast from you?
+/// Can AAS receive request for broadcast from you? Null source means yes.
/obj/machinery/announcement_system/proc/can_be_reached_from(atom/source)
if(!source || !istype(source))
return TRUE
@@ -182,6 +190,7 @@ GLOBAL_LIST_EMPTY(announcement_systems)
if (!source_turf)
return TRUE
// Keep updated with broadcasting.dm (/datum/signal/subspace/vocal/New)
+ // FFF (For Future Feature): think about adding radio relay support. Maybe implementing /datum/signal/subspace/aas_event or something similar.
return z in SSmapping.get_connected_levels(source_turf)
/// Compiles the announcement message with the provided variables. Announcement line is optional.
@@ -205,13 +214,13 @@ GLOBAL_LIST_EMPTY(announcement_systems)
for(var/channel in channels)
radio.talk_into(src, message, channel, command_span ? list(speech_span, SPAN_COMMAND) : null)
-/// Announces configs entry message with the provided variables. Channels and announcement_line are optional.
+/// Announces configs entry message with the provided variables. Channels, announcement_line and command_span are optional.
/obj/machinery/announcement_system/proc/announce(aas_config_entry_type, list/variables_map, list/channels, announcement_line, command_span)
var/msg = compile_config_message(aas_config_entry_type, variables_map, announcement_line, TRUE)
if (msg)
broadcast(msg, channels, command_span)
-/// Returns a random announcement system that is operational, has the specified config entry, signal can reach source and radio supports any channel in list. Config entry, source and channels are optional.
+/// Returns a random announcement system that is operational, has the specified config entry, signal can reach source and radio supports any channel in list. All args are optional.
/proc/get_announcement_system(aas_config_entry_type, source, list/channels)
if (!GLOB.announcement_systems.len)
return null
@@ -225,7 +234,7 @@ GLOBAL_LIST_EMPTY(announcement_systems)
intact_aass += announce
return intact_aass.len ? pick(intact_aass) : null
-/// Announces the provided message with the provided variables and config entry type. Channels, announcement_line, command_span and source are optional.
+/// Announces the provided message with the provided variables and config entry type. Only aas_config_entry_type and variables_map are mandatory. Other args are optional.
/proc/aas_config_announce(aas_config_entry_type, list/variables_map, source, list/channels, announcement_line, command_span)
var/obj/machinery/announcement_system/announcer = get_announcement_system(aas_config_entry_type, source, channels)
if (!announcer)
@@ -245,7 +254,7 @@ GLOBAL_LIST_EMPTY(announcement_systems)
// Can be changed or disabled by players
var/modifiable = TRUE
-/// Compiles the announcement message with the provided variables. Announcement line is optional.
+/// Compiles the announcement message with the provided variables. Announcement line is optional, may be both index or line key.
/datum/aas_config_entry/proc/compile_announce(list/variables_map, announcement_line)
var/announcement_message = LAZYACCESS(announcement_lines_map, announcement_line)
// If index was provided LAZYACCESS will return us a key, not value
@@ -273,7 +282,7 @@ GLOBAL_LIST_EMPTY(announcement_systems)
*/
/datum/aas_config_entry/arrival
- name = "Arrival Announcement"
+ name = "Global: Arrival Announcement"
announcement_lines_map = list(
"Message" = "%PERSON has signed up as %RANK")
vars_and_tooltips_map = list(
@@ -291,7 +300,7 @@ GLOBAL_LIST_EMPTY(announcement_systems)
"ERR)#: DA#AB@#E NOT F(*ND!")
/datum/aas_config_entry/newhead
- name = "Departmental Head Announcement"
+ name = "Departmental: Head Announcement"
announcement_lines_map = list(
"Message" = "%PERSON, %RANK, is the department head.")
vars_and_tooltips_map = list(
@@ -309,7 +318,7 @@ GLOBAL_LIST_EMPTY(announcement_systems)
"AAS.exe is not responding. NanoOS is searching for a solution to the problem.")
/datum/aas_config_entry/researched_node
- name = "Research Node Announcement"
+ name = "Science Alert: Research Node Announcement"
announcement_lines_map = list(
"Message" = "The %NODE techweb node has been researched")
vars_and_tooltips_map = list(
@@ -328,7 +337,7 @@ GLOBAL_LIST_EMPTY(announcement_systems)
"ERR)#R - B*@ TEXT F*O(ND!")
/datum/aas_config_entry/arrivals_broken
- name = "Arrivals Shuttle Malfunction Announcement"
+ name = "Engineering Alert: Arrivals Shuttle Malfunction Announcement"
announcement_lines_map = list(
"Message" = "The arrivals shuttle has been damaged. Docking for repairs...")
general_tooltip = "Broadcasted, when arrivals shuttle docks for repairs. No replacable variables provided."
diff --git a/code/game/machinery/atmos_field_gen.dm b/code/game/machinery/atmos_field_gen.dm
index 72a0c4a9d05f..004728d39143 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 2f5d5a49073c..1636380afe3d 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)
@@ -302,6 +302,13 @@
target_location = get_turf(src)
else
target_location = get_turf(src)
+
+ //give achievement for using unique material
+ if(design.materials[MAT_CATEGORY_ITEM_MATERIAL])
+ for(var/datum/material/material in materials_needed)
+ if(!istype(material, /datum/material/glass) && !istype(material, /datum/material/iron))
+ ui.user.client.give_award(/datum/award/achievement/misc/getting_an_upgrade, ui.user)
+ break
addtimer(CALLBACK(src, PROC_REF(do_make_item), design, build_count, build_time_per_item, material_cost_coefficient, charge_per_item, materials_needed, target_location), build_time_per_item)
return TRUE
diff --git a/code/game/machinery/bank_machine.dm b/code/game/machinery/bank_machine.dm
index c6ff98ec3719..2c6f88fde4e9 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 2b1b6fc4b852..cabbc744c134 100644
--- a/code/game/machinery/barsigns.dm
+++ b/code/game/machinery/barsigns.dm
@@ -30,7 +30,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/barsign, 32)
//Roundstart/map specific barsigns "belong" in their area and should be renaming it, signs created from wallmounts will not.
change_area_name = mapload
set_sign(new /datum/barsign/hiddensigns/signoff)
- find_and_hang_on_wall()
+ if(mapload)
+ find_and_mount_on_atom()
/obj/machinery/barsign/proc/set_sign(datum/barsign/sign)
if(!istype(sign))
diff --git a/code/game/machinery/botlaunchpad.dm b/code/game/machinery/botlaunchpad.dm
index e044bb1e2968..9cd9c647accf 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 e1ae2b9c4415..c0a7ef8278c4 100644
--- a/code/game/machinery/buttons.dm
+++ b/code/game/machinery/buttons.dm
@@ -44,16 +44,12 @@
* INITIALIZATION
*/
-/obj/machinery/button/Initialize(mapload, ndir = 0, built = 0)
+/obj/machinery/button/Initialize(mapload)
. = ..()
- if(built)
- setDir(ndir)
+ if(!mapload)
set_panel_open(TRUE)
update_appearance()
- if(!built && !device && device_type)
- device = new device_type(src)
-
check_access(null)
if(length(req_access) || length(req_one_access))
@@ -64,8 +60,9 @@
board.one_access = 1
board.accesses = req_one_access
- setup_device()
- find_and_hang_on_wall()
+ setup_device(mapload)
+ if(mapload)
+ find_and_mount_on_atom()
register_context()
/obj/machinery/button/Destroy()
@@ -73,7 +70,9 @@
QDEL_NULL(board)
return ..()
-/obj/machinery/button/proc/setup_device()
+/obj/machinery/button/proc/setup_device(mapload)
+ if(mapload && !device && device_type)
+ device = new device_type(src)
if(id && istype(device, /obj/item/assembly/control))
var/obj/item/assembly/control/control_device = device
control_device.id = id
@@ -401,17 +400,17 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/button/door, 24)
/obj/machinery/button/door/indestructible
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
-/obj/machinery/button/door/setup_device()
- if(!device)
- if(normaldoorcontrol)
- var/obj/item/assembly/control/airlock/airlock_device = new(src)
- airlock_device.specialfunctions = specialfunctions
- device = airlock_device
- else
- var/obj/item/assembly/control/control_device = new(src)
- control_device.sync_doors = sync_doors
- device = control_device
- ..()
+/obj/machinery/button/door/setup_device(mapload)
+ if(mapload)
+ device = normaldoorcontrol ? new /obj/item/assembly/control/airlock(src) : new /obj/item/assembly/control(src)
+
+ if(istype(device, /obj/item/assembly/control/airlock))
+ var/obj/item/assembly/control/airlock/airlock_device = device
+ airlock_device.specialfunctions = specialfunctions
+ else if(istype(device, /obj/item/assembly/control))
+ var/obj/item/assembly/control/control_device = device
+ control_device.sync_doors = sync_doors
+ return ..()
/obj/machinery/button/door/incinerator_vent_ordmix
name = "combustion chamber vent control"
@@ -499,10 +498,11 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/button/door, 24)
device_type = /obj/item/assembly/control/curtain
var/sync_doors = TRUE
-/obj/machinery/button/curtain/setup_device()
+/obj/machinery/button/curtain/setup_device(mapload)
+ . = ..()
var/obj/item/assembly/control/curtain = device
- curtain.sync_doors = sync_doors
- return ..()
+ if(istype(curtain))
+ curtain.sync_doors = sync_doors
/obj/machinery/button/crematorium
name = "crematorium igniter"
@@ -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 ac76ab76194e..a0146c341b77 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 SecurEYE-Always-Watching-You cameras." // DARKPACK EDIT CHANGE
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)
@@ -103,22 +112,19 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0)
fire = 90
acid = 50
-/obj/machinery/camera/Initialize(mapload, ndir, building)
+/obj/machinery/camera/Initialize(mapload)
. = ..()
- if(building)
- setDir(ndir)
-
for(var/network_name in network)
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()
@@ -128,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)
- find_and_hang_on_wall(directional = TRUE, \
- custom_drop_callback = CALLBACK(src, PROC_REF(deconstruct), FALSE))
+ if(mapload)
+ 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)
@@ -181,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)
@@ -222,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)
@@ -249,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))
@@ -262,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))
@@ -339,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)
@@ -347,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"
@@ -368,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.
@@ -392,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)
@@ -400,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
@@ -452,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 ba5e793d68ce..a9923b8117ec 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 a8e20505387b..45ec252b98df 100644
--- a/code/game/machinery/camera/presets.dm
+++ b/code/game/machinery/camera/presets.dm
@@ -149,23 +149,26 @@
/obj/machinery/camera/proc/upgradeEmpProof(malf_upgrade, ignore_malf_upgrades)
if(isEmpProof(ignore_malf_upgrades)) //pass a malf upgrade to ignore_malf_upgrades so we can replace the malf module with the normal one
return //that way if someone tries to upgrade an already malf-upgraded camera, it'll just upgrade it to a normal version.
- AddElement(/datum/element/empprotection, EMP_PROTECT_ALL)
if(malf_upgrade)
malf_emp_firmware_active = TRUE //don't add parts to drop, update icon, ect. reconstructing it will also retain the upgrade.
malf_emp_firmware_present = TRUE //so the upgrade is retained after incompatible parts are removed.
+ AddElement(/datum/element/empprotection, EMP_PROTECT_ALL|EMP_NO_EXAMINE)
else if(!emp_module) //only happens via upgrading in camera/attackby()
emp_module = new(src)
- if(malf_emp_firmware_active)
- malf_emp_firmware_active = FALSE //make it appear like it's just normally upgraded so the icons and examine texts are restored.
+ malf_emp_firmware_active = FALSE //make it appear like it's just normally upgraded so the icons and examine texts are restored.
+ 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.
return
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))
@@ -184,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
@@ -203,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")
@@ -210,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 62f591711346..d573c59f6320 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 0b24fb8ebe10..9f2254a28ce7 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
@@ -347,7 +347,7 @@
var/nag_message = "[src] is unsent in [get_area(src)]."
//nag on Supply channel and reduce the speed bonus multiplier to nothing
- var/obj/machinery/announcement_system/aas = get_announcement_system(/datum/aas_config_entry/bounty_cube_unsent, src)
+ var/obj/machinery/announcement_system/aas = get_announcement_system(/datum/aas_config_entry/bounty_cube_unsent, src, list(RADIO_CHANNEL_SUPPLY))
if (aas)
nag_message = aas.compile_config_message(/datum/aas_config_entry/bounty_cube_unsent, list("LOCATION" = get_area_name(src), "COST" = bounty_value), "Regular Message")
if (speed_bonus)
@@ -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 75a890d382ac..878c450e8194 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 6c6b41da72c5..dd76cd1efb71 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 892113713617..6c56f6e2aa60 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/arcade/orion.dm b/code/game/machinery/computer/arcade/orion.dm
index 6c2945cb1260..ce26a9b50fbe 100644
--- a/code/game/machinery/computer/arcade/orion.dm
+++ b/code/game/machinery/computer/arcade/orion.dm
@@ -546,7 +546,7 @@
/datum/aas_config_entry/orion_violent_behavior_alert
// Well we don't want to show that only Orion Trails reports violent behavior, eh-h?
- name = "Violent Behavior Alert"
+ name = "Global: Violent Behavior Alert"
announcement_lines_map = list(
RADIO_CHANNEL_SECURITY = "SECURITY ALERT: Crewmember %PERSON recorded displaying antisocial tendencies in %LOCATION by %SOURCE. Please watch for violent behavior.",
RADIO_CHANNEL_MEDICAL = "PSYCH ALERT: Crewmember %PERSON recorded displaying antisocial tendencies in %LOCATION by %SOURCE. Please schedule psych evaluation.",
diff --git a/code/game/machinery/computer/atmos_computers/_air_sensor.dm b/code/game/machinery/computer/atmos_computers/_air_sensor.dm
index ad870c9520b7..bb40f34fcf6c 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 5dd9ec491279..d5f6b8210069 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)
@@ -106,9 +106,6 @@
if(state != FRAME_COMPUTER_STATE_EMPTY)
balloon_alert(user, "circuit already installed!")
return FALSE
- if(!anchored && istype(board))
- balloon_alert(user, "frame must be anchored!")
- return FALSE
. = ..()
if(. && !by_hand) // Installing via RPED auto-secures it
state = FRAME_COMPUTER_STATE_BOARD_SECURED
@@ -194,8 +191,6 @@
if(FRAME_COMPUTER_STATE_GLASSED)
if(finalize_construction(user, tool))
return ITEM_INTERACT_SUCCESS
-
- balloon_alert(user, "missing components!")
return ITEM_INTERACT_BLOCKING
/obj/structure/frame/computer/crowbar_act(mob/living/user, obj/item/tool)
@@ -295,6 +290,10 @@
return TRUE
/obj/structure/frame/computer/finalize_construction(mob/living/user, obj/item/tool)
+ if(!anchored)
+ balloon_alert(user, "frame must be anchored!")
+ return FALSE
+
tool.play_tool_sound(src)
var/obj/machinery/new_machine = new circuit.build_path(loc)
new_machine.balloon_alert(user, "monitor connected")
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index 8725bda22f5e..f33cff0c7ea0 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 bb034b1a3220..42188e251a26 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 ca41ef3e4bb2..69a4ccc765f8 100644
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -261,7 +261,7 @@
if (can_buy_shuttles_or_fail_reason != FALSE)
to_chat(user, span_alert("[can_buy_shuttles_or_fail_reason]"))
return
- var/list/shuttles = flatten_list(SSmapping.shuttle_templates)
+ var/list/shuttles = assoc_to_values(SSmapping.shuttle_templates)
var/datum/map_template/shuttle/shuttle = locate(params["shuttle"]) in shuttles
if (!istype(shuttle))
return
@@ -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].")
diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm
index 61965fe25aa0..e8f700fd966c 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"
@@ -258,16 +256,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 1502e5af5062..dcbd6499ec7f 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 0c7498888a6d..e31d028d95f1 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 97e9e74b5ce1..f6df92dd4442 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,
@@ -94,6 +94,7 @@
name = "mining point transfer card"
desc = "A small, reusable card for transferring mining points. Swipe your ID card over it to start the process."
icon_state = "data_1"
+ slot_flags = NONE // DARKPACK EDIT ADD
///Amount of points this card contains.
var/points = 0
@@ -127,6 +128,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 a83b930eada4..d89dd05c4349 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
@@ -235,7 +234,7 @@ GLOBAL_LIST_EMPTY(order_console_products)
return
/datum/aas_config_entry/order_console
- name = "Local Ordering Console Announcements"
+ name = "Cargo Alert: Local Ordering Console Announcements"
announcement_lines_map = list()
general_tooltip = "Used to make announces, when consoles listed here placing new order"
@@ -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 41c52d9b0a0e..f9247d039ce7 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 65bbee24ead6..c253b8d51bac 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/medical.dm b/code/game/machinery/computer/records/medical.dm
index 9bc1bcdbc26a..8e80223c1725 100644
--- a/code/game/machinery/computer/records/medical.dm
+++ b/code/game/machinery/computer/records/medical.dm
@@ -66,6 +66,7 @@
rank = target.rank,
species = target.species,
trim = target.trim,
+ past_medical_records = target.past_medical_records, // DARKPACK EDIT - FLAVOR TEXT
))
data["records"] = records
diff --git a/code/game/machinery/computer/records/security.dm b/code/game/machinery/computer/records/security.dm
index 9bda57e15d38..41afa732ebba 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)
. = ..()
@@ -130,6 +132,7 @@
species = target.species,
trim = target.trim,
wanted_status = target.wanted_status,
+ past_criminal_records = target.past_criminal_records, // DARKPACK EDIT - FLAVOR TEXT
))
data["records"] = records
@@ -209,7 +212,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
@@ -231,7 +234,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/station_alert.dm b/code/game/machinery/computer/station_alert.dm
index b879669317b4..f102f185ffcf 100644
--- a/code/game/machinery/computer/station_alert.dm
+++ b/code/game/machinery/computer/station_alert.dm
@@ -8,19 +8,18 @@
/// Station alert datum for showing alerts UI
var/datum/station_alert/alert_control
-/obj/machinery/computer/station_alert/examine(mob/user)
- . = ..()
- var/obj/item/circuitboard/computer/station_alert/my_circuit = circuit
- . += span_info("The console is set to [my_circuit.station_only ? "track all station and mining alarms" : "track alarms on the same z-level"].")
-
/obj/machinery/computer/station_alert/Initialize(mapload)
- link_alerts()
+ if(is_station_level(z))
+ var/static/list/alert_areas
+ if(isnull(alert_areas))
+ alert_areas = (GLOB.the_station_areas + typesof(/area/mine))
+ alert_control = new(src, list(ALARM_ATMOS, ALARM_FIRE, ALARM_POWER), SSmapping.levels_by_trait(ZTRAIT_STATION), alert_areas)
+ else
+ name = "local alert console"
+ alert_control = new(src, list(ALARM_ATMOS, ALARM_FIRE, ALARM_POWER), list(z), title = name)
+ RegisterSignals(alert_control.listener, list(COMSIG_ALARM_LISTENER_TRIGGERED, COMSIG_ALARM_LISTENER_CLEARED), PROC_REF(update_alarm_display))
return ..()
-/obj/machinery/computer/station_alert/on_construction(mob/user)
- . = ..()
- link_alerts()
-
/obj/machinery/computer/station_alert/Destroy()
QDEL_NULL(alert_control)
return ..()
@@ -42,26 +41,6 @@
if(length(alert_control.listener.alarms))
. += "alert:2"
-/**
- * Clears out any active alert_control listeners, then sets up a new one based on the circuit settings
- */
-/obj/machinery/computer/station_alert/proc/link_alerts()
- //Start from scratch, clear out the existing alert listeners
- QDEL_NULL(alert_control)
-
- //Then we check the circuit to determine if it should show alarms from Station & Mining areas,
- //or Local (z-level) areas
- var/obj/item/circuitboard/computer/station_alert/my_circuit = circuit
- if(my_circuit.station_only)
- name = "station alert console"
- var/list/alert_areas
- alert_areas = (GLOB.the_station_areas + typesof(/area/mine))
- alert_control = new(src, list(ALARM_ATMOS, ALARM_FIRE, ALARM_POWER), listener_areas = alert_areas, title = name)
- else
- name = "local alert console"
- alert_control = new(src, list(ALARM_ATMOS, ALARM_FIRE, ALARM_POWER), list(z), title = name)
- RegisterSignals(alert_control.listener, list(COMSIG_ALARM_LISTENER_TRIGGERED, COMSIG_ALARM_LISTENER_CLEARED), PROC_REF(update_alarm_display))
-
/**
* Signal handler for calling an icon update in case an alarm is added or cleared
*
@@ -71,7 +50,3 @@
/obj/machinery/computer/station_alert/proc/update_alarm_display(datum/source)
SIGNAL_HANDLER
update_icon()
-
-// Subtype which only checks station areas and the mining station
-/obj/machinery/computer/station_alert/station_only
- circuit = /obj/item/circuitboard/computer/station_alert/station_only
diff --git a/code/game/machinery/computer/teleporter.dm b/code/game/machinery/computer/teleporter.dm
index 7e34dae70257..b17589bb4bac 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 12bafc3f73ec..6f5f335a54d0 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,7 +75,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/security/telescreen/entertai
/obj/machinery/computer/security/telescreen/entertainment/Initialize(mapload)
. = ..()
- find_and_hang_on_wall()
register_context()
RegisterSignal(SSdcs, COMSIG_GLOB_NETWORK_BROADCAST_UPDATED, PROC_REF(on_network_broadcast_updated))
speakers = new(src)
@@ -106,7 +110,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/security/telescreen/entertai
if(HAS_SILICON_ACCESS(user) || (user.interaction_range && user.interaction_range >= get_dist(user, src)))
can_range = TRUE
- if((can_range || user.CanReach(src)) && ISADVANCEDTOOLUSER(user))
+ if((can_range || IsReachableBy(user)) && ISADVANCEDTOOLUSER(user))
if(user.incapacitated)
return UI_UPDATE
if(!can_range && user.can_hold_items() && (user.usable_hands <= 0 || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED)))
@@ -298,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)
@@ -310,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)
@@ -346,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)
@@ -550,3 +557,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 7e66c748917b..dd85df26060a 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 880313d09fb1..5012c0eb1aa3 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 da0c67f3cf1a..65796e0cc7f3 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 8ad4b148f25c..d5ca3b4f7661 100644
--- a/code/game/machinery/defibrillator_mount.dm
+++ b/code/game/machinery/defibrillator_mount.dm
@@ -21,10 +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)
- find_and_hang_on_wall()
/obj/machinery/defibrillator_mount/Destroy()
QDEL_NULL(defib)
@@ -227,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 e88fc78f4083..2fea89c46050 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 edf6f480253e..57c58083aae7 100644
--- a/code/game/machinery/digital_clock.dm
+++ b/code/game/machinery/digital_clock.dm
@@ -80,7 +80,8 @@
/obj/machinery/digital_clock/Initialize(mapload)
. = ..()
- find_and_hang_on_wall()
+ if(mapload)
+ 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/dna_infuser.dm b/code/game/machinery/dna_infuser/dna_infuser.dm
index 1e64561c9be4..8c8c0512bc33 100644
--- a/code/game/machinery/dna_infuser/dna_infuser.dm
+++ b/code/game/machinery/dna_infuser/dna_infuser.dm
@@ -226,10 +226,10 @@
/obj/machinery/dna_infuser/click_alt(mob/user)
if(infusing)
balloon_alert(user, "not while it's on!")
- return
+ return CLICK_ACTION_BLOCKING
if(!infusing_from)
balloon_alert(user, "no sample to eject!")
- return
+ return CLICK_ACTION_BLOCKING
balloon_alert(user, "ejected sample")
infusing_from.forceMove(get_turf(src))
infusing_from = null
diff --git a/code/game/machinery/dna_infuser/dna_infusion.dm b/code/game/machinery/dna_infuser/dna_infusion.dm
index 2ea3b09ca7c4..b2de63a3a2d3 100644
--- a/code/game/machinery/dna_infuser/dna_infusion.dm
+++ b/code/game/machinery/dna_infuser/dna_infusion.dm
@@ -25,7 +25,7 @@
///returns /datum/infuser_entry that matches an item being used for infusion, returns a fly mutation on failure
/atom/movable/proc/get_infusion_entry() as /datum/infuser_entry
var/datum/infuser_entry/found
- for(var/datum/infuser_entry/entry as anything in flatten_list(GLOB.infuser_entries))
+ for(var/datum/infuser_entry/entry as anything in assoc_to_values(GLOB.infuser_entries))
if(entry.tier == DNA_MUTANT_UNOBTAINABLE)
continue
if(is_type_in_list(src, entry.input_obj_or_mob))
diff --git a/code/game/machinery/dna_infuser/infuser_book.dm b/code/game/machinery/dna_infuser/infuser_book.dm
index 416ed038d640..370d7a87c1eb 100644
--- a/code/game/machinery/dna_infuser/infuser_book.dm
+++ b/code/game/machinery/dna_infuser/infuser_book.dm
@@ -29,7 +29,7 @@
var/list/data = list()
// Collect all info from each intry.
var/list/entry_data = list()
- for(var/datum/infuser_entry/entry as anything in flatten_list(GLOB.infuser_entries))
+ for(var/datum/infuser_entry/entry as anything in assoc_to_values(GLOB.infuser_entries))
if(entry.tier == DNA_MUTANT_UNOBTAINABLE)
continue
var/list/individual_entry_data = list()
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 d4e9618ccc01..fa9d0032a499 100644
--- a/code/game/machinery/dna_infuser/organ_sets/carp_organs.dm
+++ b/code/game/machinery/dna_infuser/organ_sets/carp_organs.dm
@@ -119,6 +119,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 cf5e93f07acc..8c5b91a1a358 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
@@ -220,7 +220,7 @@
greyscale_colors = FISH_ORGAN_COLOR
bodypart_overlay = /datum/bodypart_overlay/mutant/tail/fish
- dna_block = /datum/dna_block/feature/tail_fish
+ dna_block = /datum/dna_block/feature/accessory/tail_fish
wag_flags = NONE
organ_traits = list(TRAIT_FLOPPING, TRAIT_SWIMMER)
restyle_flags = EXTERNAL_RESTYLE_FLESH
@@ -288,9 +288,9 @@
/datum/bodypart_overlay/mutant/tail/fish/on_mob_insert(obj/item/organ/parent, mob/living/carbon/receiver)
//Initialize the related dna feature block if we don't have any so it doesn't error out.
//This isn't tied to any species, but I kinda want it to be mutable instead of having a fixed sprite accessory.
- if(imprint_on_next_insertion && !receiver.dna.features[FEATURE_TAIL_FISH])
- receiver.dna.features[FEATURE_TAIL_FISH] = pick(SSaccessories.tails_list_fish)
- receiver.dna.update_uf_block(/datum/dna_block/feature/tail_fish)
+ if(imprint_on_next_insertion && !receiver.dna.features[feature_key])
+ receiver.dna.features[feature_key] = pick(SSaccessories.feature_list[feature_key])
+ receiver.dna.update_uf_block(/datum/dna_block/feature/accessory/tail_fish)
return ..()
@@ -301,9 +301,6 @@
else //otherwise get one from a set of faded out blue and some greys colors.
return pick("#B4B8DD", "#85C7D0", "#67BBEE", "#2F4450", "#55CCBB", "#999FD0", "#345066", "#585B69", "#7381A0", "#B6DDE5", "#4E4E50")
-/datum/bodypart_overlay/mutant/tail/fish/get_global_feature_list()
- return SSaccessories.tails_list_fish
-
/datum/bodypart_overlay/mutant/tail/fish/get_image(image_layer, obj/item/bodypart/limb)
var/mutable_appearance/appearance = ..()
// We add all appearances the parent bodypart has to the tail to inherit scales and fancy effects
@@ -377,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/fish/proc/on_low_water(mob/living/carbon/breather, datum/gas_mixture/breath, water_pp)
@@ -470,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
@@ -500,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
@@ -511,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 1d9c8bdc743e..1af4ad7f2ee3 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/fox_organs.dm b/code/game/machinery/dna_infuser/organ_sets/fox_organs.dm
index 68a0ca007968..3986994762cf 100644
--- a/code/game/machinery/dna_infuser/organ_sets/fox_organs.dm
+++ b/code/game/machinery/dna_infuser/organ_sets/fox_organs.dm
@@ -6,6 +6,6 @@
visual = TRUE
damage_multiplier = 2
- dna_block = /datum/dna_block/feature/ears
+ dna_block = /datum/dna_block/feature/accessory/ears
bodypart_overlay = /datum/bodypart_overlay/mutant/cat_ears
sprite_accessory_override = /datum/sprite_accessory/ears/fox
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 900f566f0576..6f2e35b32198 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 71922f1b3a9f..7d17f1bb477e 100644
--- a/code/game/machinery/dna_infuser/organ_sets/rat_organs.dm
+++ b/code/game/machinery/dna_infuser/organ_sets/rat_organs.dm
@@ -107,8 +107,19 @@
AddElement(/datum/element/noticable_organ, "%PRONOUN_Their teeth are oddly shaped and yellowing.", BODY_ZONE_PRECISE_MOUTH)
AddElement(/datum/element/organ_set_bonus, /datum/status_effect/organ_set_bonus/rat)
+/obj/item/organ/tongue/rat/proc/whimsy_check(mob/living/checking)
+ if(check_holidays(APRIL_FOOLS))
+ return TRUE
+ if(HAS_PERSONALITY(checking, /datum/personality/whimsical))
+ return TRUE
+ if(prob(1))
+ return TRUE
+ return FALSE
+
/obj/item/organ/tongue/rat/modify_speech(datum/source, list/speech_args)
. = ..()
+ if(!whimsy_check(source))
+ return
var/message = LOWER_TEXT(speech_args[SPEECH_MESSAGE])
if(message == "hi" || message == "hi.")
speech_args[SPEECH_MESSAGE] = "Cheesed to meet you!"
@@ -125,6 +136,8 @@
/obj/item/organ/tongue/rat/proc/on_item_given(mob/living/carbon/offerer, mob/living/taker, obj/item/given)
SIGNAL_HANDLER
+ if(!whimsy_check(offerer))
+ return
INVOKE_ASYNC(src, PROC_REF(its_on_the_mouse), offerer, taker)
/obj/item/organ/tongue/rat/proc/its_on_the_mouse(mob/living/carbon/offerer, mob/living/taker)
diff --git a/code/game/machinery/dna_scanner.dm b/code/game/machinery/dna_scanner.dm
index ab14767479fe..1ad319486c8e 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 5f67b791e906..d3fc1574cc67 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -179,13 +179,13 @@
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()
// Click on the floor to close airlocks
- AddComponent(/datum/component/redirect_attack_hand_from_turf)
+ AddComponent(/datum/component/redirect_attack_hand_from_turf, interact_check = CALLBACK(src, PROC_REF(drag_check)))
AddElement(/datum/element/nav_computer_icon, 'icons/effects/nav_computer_indicators.dmi', "airlock", TRUE)
@@ -193,6 +193,12 @@
RegisterSignal(SSdcs, COMSIG_GLOB_GREY_TIDE, PROC_REF(grey_tide))
+// if dragging, block 'Click on the floor to close airlocks'
+/obj/machinery/door/airlock/proc/drag_check(mob/user)
+ if (user.pulling)
+ return FALSE
+ return TRUE
+
/obj/machinery/door/airlock/proc/grey_tide(datum/source, list/grey_tide_areas)
SIGNAL_HANDLER
@@ -308,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)
@@ -503,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
@@ -521,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
@@ -736,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.")
@@ -928,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
@@ -943,7 +959,7 @@
security_level = AIRLOCK_SECURITY_PLASTEEL_O
return .
if(note)
- if(user.CanReach(src))
+ if(IsReachableBy(user))
user.visible_message(span_notice("[user] cuts down [note] from [src]."), span_notice("You remove [note] from [src]."))
else //telekinesis
visible_message(span_notice("[tool] cuts down [note] from [src]."))
@@ -1151,7 +1167,7 @@
return
if(atom_integrity < max_integrity)
- if(!W.tool_start_check(user, amount=1))
+ if(!W.tool_start_check(user, amount=1, heat_required = HIGH_TEMPERATURE_REQUIRED))
return
user.visible_message(span_notice("[user] begins welding the airlock."), \
span_notice("You begin repairing the airlock..."), \
@@ -1166,7 +1182,7 @@
to_chat(user, span_notice("The airlock doesn't need repairing."))
/obj/machinery/door/airlock/try_to_weld_secondary(obj/item/weldingtool/tool, mob/user)
- if(!tool.tool_start_check(user, amount=1))
+ if(!tool.tool_start_check(user, amount=1, heat_required = HIGH_TEMPERATURE_REQUIRED))
return
user.visible_message(span_notice("[user] begins [welded ? "unwelding":"welding"] the airlock."), \
span_notice("You begin [welded ? "unwelding":"welding"] the airlock..."), \
@@ -1288,6 +1304,11 @@
prying_so_hard = FALSE
return
+ if(!isnull(tool))
+ if(SEND_SIGNAL(tool, COMSIG_TOOL_FORCE_OPEN_AIRLOCK, user, src) & COMPONENT_TOOL_DO_NOT_ALLOW_FORCE_OPEN)
+ prying_so_hard = FALSE
+ return
+
prying_so_hard = FALSE
if(check_electrified && shock(user, 100))
@@ -1338,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)
@@ -1428,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)
@@ -1512,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
@@ -1666,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
@@ -2422,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 2973579153a8..5e25742d4dc5 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 9cb7dea5cc66..b18a82c0677f 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
@@ -632,7 +705,13 @@
/obj/machinery/door/morgue/Initialize(mapload)
. = ..()
- AddComponent(/datum/component/redirect_attack_hand_from_turf)
+ AddComponent(/datum/component/redirect_attack_hand_from_turf, interact_check = CALLBACK(src, PROC_REF(drag_check)))
+
+// if dragging, block redirect_Attack_hand_from_turf
+/obj/machinery/door/morgue/proc/drag_check(mob/user)
+ if (user.pulling)
+ return FALSE
+ return TRUE
/obj/machinery/door/get_dumping_location()
return null
@@ -706,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 8b3f9f6e5fce..b14a54f29777 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -586,7 +586,7 @@
SIGNAL_HANDLER
- if(!QDELETED(crowbar_owner) && crowbar_owner.CanReach(src))
+ if(!QDELETED(crowbar_owner) && IsReachableBy(crowbar_owner))
if(!ismob(crowbar_owner))
return
var/mob/living/mob_user = crowbar_owner
@@ -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/passworddoor.dm b/code/game/machinery/doors/passworddoor.dm
index 3a7225419b51..16cf0bf509e4 100644
--- a/code/game/machinery/doors/passworddoor.dm
+++ b/code/game/machinery/doors/passworddoor.dm
@@ -44,7 +44,7 @@
/obj/machinery/door/password/get_save_vars()
return ..() + NAMEOF(src, password)
-/obj/machinery/door/password/Hear(atom/movable/speaker, message_language, raw_message, radio_freq, radio_freq_name, radio_freq_color, list/spans, list/message_mods = list(), message_range)
+/obj/machinery/door/password/Hear(atom/movable/speaker, message_language, raw_message, radio_freq, radio_freq_name, radio_freq_color, list/spans, list/message_mods = list(), message_range, source) // DARKPACK EDIT, ORIGINAL: /obj/machinery/door/password/Hear(atom/movable/speaker, message_language, raw_message, radio_freq, radio_freq_name, radio_freq_color, list/spans, list/message_mods = list(), message_range)
. = ..()
if(!density || !voice_activated || radio_freq)
return
diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm
index b3804ff010b6..cfd1f99ba9b6 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 04ced0d2ea7a..c09dae310ceb 100644
--- a/code/game/machinery/doors/shutters.dm
+++ b/code/game/machinery/doors/shutters.dm
@@ -3,12 +3,13 @@
name = "shutters"
desc = "Heavy duty mechanical shutters with an atmospheric seal that keeps them airtight once closed."
icon = 'modular_darkpack/master_files/icons/obj/doors/shutters.dmi' // DARKPACK EDIT CHANGE
- layer = SHUTTER_LAYER
- closingLayer = SHUTTER_LAYER
+ layer = ABOVE_ALL_MOB_LAYER // DARKPACK EDIT CHANGE
+ closingLayer = ABOVE_ALL_MOB_LAYER // DARKPACK EDIT CHANGE
damage_deflection = 20
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
@@ -45,6 +46,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 429b648624a2..65fbe58e7e76 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)
@@ -464,6 +462,13 @@
return ..()
/obj/machinery/door/window/try_to_crowbar(obj/item/I, mob/user, forced = FALSE)
+ if(istype(I, /obj/item/crowbar/power))
+ var/obj/item/crowbar/power/power_tool = I
+ if(power_tool.limit_jaws_access && forced)
+ playsound(src.loc, 'sound/machines/buzz/buzz-sigh.ogg', 50, FALSE)
+ user.balloon_alert(user, "cannot pry open!")
+ return
+
if(!hasPower() || forced)
if(density)
open(BYPASS_DOOR_CHECKS)
@@ -479,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
@@ -542,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()
@@ -557,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 53ff9597b847..5189ffe4b9b4 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) // DARKPACK EDIT REMOVAL
/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 7f94df42b72a..6c7de7e50976 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 96168a953ad2..cbd7fda5aba9 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 1b5e012d2fb0..74600bab3841 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."
@@ -49,10 +56,10 @@
fire = 90
acid = 30
-/obj/machinery/firealarm/Initialize(mapload, dir, building)
+/obj/machinery/firealarm/Initialize(mapload)
. = ..()
id_tag = assign_random_name()
- if(building)
+ if(!mapload)
buildstage = FIRE_ALARM_BUILD_NO_CIRCUIT
set_panel_open(TRUE)
if(name == initial(name))
@@ -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, \
@@ -78,10 +83,10 @@
)
register_context()
- find_and_hang_on_wall()
+ if(mapload)
+ find_and_mount_on_atom()
update_appearance()
-
/obj/machinery/firealarm/Destroy()
if(my_area)
LAZYREMOVE(my_area.firealarms, src)
@@ -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 1d98eb41bcdb..f08fc0046820 100644
--- a/code/game/machinery/flasher.dm
+++ b/code/game/machinery/flasher.dm
@@ -16,7 +16,7 @@
var/flash_range = 2 //this is roughly the size of a brig cell.
/// How strong Paralyze()'d targets are when flashed.
- var/strength = 10 SECONDS
+ var/strength = 5 SECONDS
COOLDOWN_DECLARE(flash_cooldown)
/// Duration of time between flashes.
@@ -24,11 +24,11 @@
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/flasher, 26)
-/obj/machinery/flasher/Initialize(mapload, ndir = 0, built = 0)
- . = ..() // ..() is EXTREMELY IMPORTANT, never forget to add it
- if(!built)
+/obj/machinery/flasher/Initialize(mapload)
+ . = ..()
+ if(mapload)
bulb = new(src)
- find_and_hang_on_wall()
+ find_and_mount_on_atom()
/obj/machinery/flasher/vv_edit_var(vname, vval)
. = ..()
@@ -120,8 +120,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/flasher, 26)
if (get_dist(src, living_mob) > flash_range)
continue
- if(living_mob.flash_act(affect_silicon = TRUE))
- living_mob.log_message("was AOE flashed by an automated portable flasher", LOG_ATTACK)
+ if(bulb.flash_mob(living_mob, confusion_duration = strength * 1.5, extra_log = "by [src]"))
living_mob.Paralyze(strength)
flashed = TRUE
@@ -161,7 +160,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/flasher, 26)
icon = 'icons/obj/machines/sec.dmi'
icon_state = "pflash1-p"
base_icon_state = "pflash"
- strength = 8 SECONDS
+ strength = 4 SECONDS
anchored = FALSE
density = TRUE
///Proximity monitor associated with this atom, needed for proximity checks.
@@ -171,14 +170,19 @@ 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
- if(iscarbon(proximity_check_mob))
- var/mob/living/carbon/proximity_carbon = proximity_check_mob
- if (proximity_carbon.move_intent != MOVE_INTENT_WALK && anchored)
- flash()
+ if(!isliving(proximity_check_mob))
+ return
+
+ var/mob/living/proximity_living = proximity_check_mob
+ if (proximity_living.move_intent != MOVE_INTENT_WALK && anchored)
+ flash()
/obj/machinery/flasher/portable/vv_edit_var(vname, vval)
. = ..()
diff --git a/code/game/machinery/flatpacker.dm b/code/game/machinery/flatpacker.dm
index 07f76e3bd078..011ddf7f1b1a 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))
@@ -373,7 +373,7 @@
say("No power to dispense sheets")
return
- materials.retrieve_sheets(amount, material)
+ materials.retrieve_stack(amount, material)
return TRUE
/**
diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index 993372e72e2a..b50fc10e723e 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -575,7 +575,7 @@ Possible to do for anyone motivated enough:
/*This is the proc for special two-way communication between AI and holopad/people talking near holopad.
For the other part of the code, check silicon say.dm. Particularly robot talk.*/
-/obj/machinery/holopad/Hear(atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, radio_freq_name, radio_freq_color, list/spans, list/message_mods = list(), message_range)
+/obj/machinery/holopad/Hear(atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, radio_freq_name, radio_freq_color, list/spans, list/message_mods = list(), message_range, source) // DARKPACK EDIT, ORIGINAL: /obj/machinery/holopad/Hear(atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, radio_freq_name, radio_freq_color, list/spans, list/message_mods = list(), message_range)
. = ..()
if(speaker && LAZYLEN(masters) && !radio_freq)//Master is mostly a safety in case lag hits or something. Radio_freq so AIs dont hear holopad stuff through radios.
for(var/mob/living/silicon/ai/master in masters)
diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm
index 887c04ebedee..285b19b6c4bb 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
@@ -163,7 +164,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/sparker, 26)
spark_system.set_up(2, 1, src)
spark_system.attach(src)
register_context()
- find_and_hang_on_wall()
+ if(mapload)
+ 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 d606556985b3..8e400fc964a0 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 471e43f94130..e45daf7a98e5 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 ceb5716849a7..58e5bdf209e3 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))
@@ -34,7 +32,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light_switch, 26)
area = get_area(src)
if(autoname)
name = "light switch ([area.name])"
- find_and_hang_on_wall(custom_drop_callback = CALLBACK(src, PROC_REF(deconstruct), TRUE))
+ if(mapload)
+ find_and_mount_on_atom()
register_context()
update_appearance()
diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm
index f3d8e236c73c..39564a41609c 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 a10aff9f448f..3b8ef7cd22f7 100644
--- a/code/game/machinery/medical_kiosk.dm
+++ b/code/game/machinery/medical_kiosk.dm
@@ -10,8 +10,6 @@
/// Shows if the machine is being used for a reagent scan.
#define KIOSK_SCANNING_REAGENTS (1<<3)
-
-
/obj/machinery/medical_kiosk
name = "medical kiosk"
desc = "A freestanding medical kiosk, which can provide a wide range of medical analysis for diagnosis."
@@ -114,34 +112,40 @@
return board.custom_cost
-/obj/machinery/medical_kiosk/attackby(obj/item/O, mob/user, list/modifiers, list/attack_modifiers)
- if(default_deconstruction_screwdriver(user, "[base_icon_state]_open", "[base_icon_state]_off", O))
- return
- else if(default_deconstruction_crowbar(O))
- return
-
- if(istype(O, /obj/item/scanner_wand))
- var/obj/item/scanner_wand/W = O
- if(scanner_wand)
- balloon_alert(user, "already has a wand!")
- return
- if(HAS_TRAIT(O, TRAIT_NODROP) || !user.transferItemToLoc(O, src))
- balloon_alert(user, "stuck to your hand!")
- return
- user.visible_message(span_notice("[user] snaps [O] onto [src]!"))
- balloon_alert(user, "wand returned")
- //This will be the scanner returning scanner_wand's selected_target variable and assigning it to the altPatient var
- if(W.selected_target)
- var/datum/weakref/target_ref = WEAKREF(W.return_patient())
- if(patient_ref != target_ref)
- clearScans()
- patient_ref = target_ref
- user.visible_message(span_notice("[W.return_patient()] has been set as the current patient."))
- W.selected_target = null
- playsound(src, 'sound/machines/click.ogg', 50, TRUE)
- scanner_wand = O
- return
- return ..()
+/obj/machinery/medical_kiosk/screwdriver_act(mob/living/user, obj/item/tool)
+ if(default_deconstruction_screwdriver(user, "[base_icon_state]_open", "[base_icon_state]_off", tool))
+ return ITEM_INTERACT_SUCCESS
+ return ITEM_INTERACT_BLOCKING
+
+/obj/machinery/medical_kiosk/crowbar_act(mob/living/user, obj/item/tool)
+ if(default_deconstruction_crowbar(tool))
+ return ITEM_INTERACT_SUCCESS
+ return ITEM_INTERACT_BLOCKING
+
+/obj/machinery/medical_kiosk/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+ if(!istype(tool, /obj/item/scanner_wand))
+ return NONE
+
+ var/obj/item/scanner_wand/wand = tool
+ if(scanner_wand)
+ balloon_alert(user, "already has a wand!")
+ return ITEM_INTERACT_BLOCKING
+ if(!user.transferItemToLoc(tool, src))
+ balloon_alert(user, "stuck to your hand!")
+ return ITEM_INTERACT_BLOCKING
+ user.visible_message(span_notice("[user] snaps [tool] onto [src]!"))
+ balloon_alert(user, "wand returned")
+ //This will be the scanner returning scanner_wand's selected_target variable and assigning it to the altPatient var
+ if(wand.selected_target)
+ var/datum/weakref/target_ref = WEAKREF(wand.return_patient())
+ if(patient_ref != target_ref)
+ clearScans()
+ patient_ref = target_ref
+ user.visible_message(span_notice("[wand.return_patient()] has been set as the current patient."))
+ wand.selected_target = null
+ playsound(src, 'sound/machines/click.ogg', 50, TRUE)
+ scanner_wand = tool
+ return ITEM_INTERACT_SUCCESS
/obj/machinery/medical_kiosk/attack_hand_secondary(mob/user, list/modifiers)
. = ..()
@@ -221,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."
@@ -232,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 3f365ff3b1de..336554771f54 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 a3f1859fe26e..a1e6726b129a 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_data.dm b/code/game/machinery/newscaster/newscaster_data.dm
index 59b8f09db477..b10f0fd74f64 100644
--- a/code/game/machinery/newscaster/newscaster_data.dm
+++ b/code/game/machinery/newscaster/newscaster_data.dm
@@ -165,8 +165,8 @@ GLOBAL_LIST_EMPTY(request_list)
var/message_count = 0
/datum/feed_network/New()
- create_feed_channel(NEWSCASTER_STATION_ANNOUNCEMENTS, "SS13", "Company news, staff announcements, and all the latest information. Have a secure shift!", locked = TRUE)
- create_feed_channel(NEWSCASTER_SPACE_BETTING, "NtOS", "News from the SpaceBet PDA App! Download now and make your own bets!", locked = TRUE)
+ create_feed_channel(NEWSCASTER_STATION_ANNOUNCEMENTS, NEWSPAPER_COMPANY, "Local news, Help Wanted, and all the hottest stories!", locked = TRUE) // DARKPACK EDIT CHANGE
+ // create_feed_channel(NEWSCASTER_SPACE_BETTING, "NtOS", "News from the SpaceBet PDA App! Download now and make your own bets!", locked = TRUE) // DARKPACK EDIT REMOVAL
wanted_issue = new /datum/wanted_message
/datum/feed_network/proc/add_feed_channel(datum/feed_channel/new_channel)
diff --git a/code/game/machinery/newscaster/newscaster_machine.dm b/code/game/machinery/newscaster/newscaster_machine.dm
index bea301dbc647..08180d53a91b 100644
--- a/code/game/machinery/newscaster/newscaster_machine.dm
+++ b/code/game/machinery/newscaster/newscaster_machine.dm
@@ -72,12 +72,13 @@
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/newscaster, 30)
-/obj/machinery/newscaster/Initialize(mapload, ndir, building)
+/obj/machinery/newscaster/Initialize(mapload)
. = ..()
GLOB.allCasters += src
GLOB.allbountyboards += src
update_appearance()
- find_and_hang_on_wall()
+ if(mapload)
+ find_and_mount_on_atom()
/obj/machinery/newscaster/Destroy()
GLOB.allCasters -= src
@@ -877,7 +878,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/newscaster/newspaper.dm b/code/game/machinery/newscaster/newspaper.dm
index 481964066dce..bb85ffbd89d3 100644
--- a/code/game/machinery/newscaster/newspaper.dm
+++ b/code/game/machinery/newscaster/newspaper.dm
@@ -5,7 +5,7 @@
*/
/obj/item/newspaper
name = "newspaper"
- desc = "An issue of The Griffon, the newspaper circulating in the city." // DARKPACK EDIT CHANGE
+ desc = "An issue of " + NEWSPAPER_COMPANY + ", the newspaper circulating around " + CITY_NAME + " and surrounding cities." // DARKPACK EDIT CHANGE
icon = 'icons/obj/service/bureaucracy.dmi'
icon_state = "newspaper"
inhand_icon_state = "newspaper"
@@ -234,6 +234,7 @@
"name" = news_channels.channel_name,
"page_number" = news_content.Find(news_channels),
))
+ data["newspaper_company"] = NEWSPAPER_COMPANY // DARKPACK EDIT ADD
return data
/obj/item/newspaper/ui_data(mob/user)
diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm
index a4b4ef8af319..cc52f2793dfd 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
*/ // DARKPACK EDIT REMOVE
/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 58123bc23232..e7a9826b1832 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,212 +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, ndir = 0, built = 0)
- . = ..()
- if(built)
- locked = FALSE
- power_change() //Checks power and initial settings
- find_and_hang_on_wall()
-
-/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
@@ -1175,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()
@@ -1183,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()
@@ -1239,7 +1033,7 @@ DEFINE_BITFIELD(turret_flags, list(
/obj/machinery/porta_turret/lasertag/bullet_act(obj/projectile/projectile)
. = ..()
- if(!on)
+ if(!on || . != BULLET_ACT_HIT)
return
if(team_color == "blue" && istype(projectile, /obj/projectile/beam/lasertag/redtag))
set_disabled(10 SECONDS)
diff --git a/code/game/machinery/porta_turret/portable_turret_construct.dm b/code/game/machinery/porta_turret/portable_turret_construct.dm
index 93b0ada37fad..6b06894e0106 100644
--- a/code/game/machinery/porta_turret/portable_turret_construct.dm
+++ b/code/game/machinery/porta_turret/portable_turret_construct.dm
@@ -15,7 +15,9 @@
desc = "An unfinished covered turret frame."
anchored = FALSE
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
@@ -192,6 +194,12 @@
return
return ..()
+/obj/machinery/porta_turret_construct/nameformat(input, user)
+ finish_name = input
+ return input
+
+/obj/machinery/porta_turret_construct/rename_reset()
+ finish_name = initial(finish_name)
/obj/machinery/porta_turret_construct/attack_hand(mob/user, list/modifiers)
. = ..()
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 000000000000..c1b436f3dcc1
--- /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 4f13690290e1..d09f2af6e7a6 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 a655972eb3be..2b5196b947e7 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,
@@ -71,7 +69,6 @@
charging = arrived
START_PROCESSING(SSmachines, src)
update_use_power(ACTIVE_POWER_USE)
- finished_recharging = FALSE
using_power = TRUE
update_appearance()
return ..()
@@ -156,17 +153,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
@@ -179,18 +184,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 e8a0a823871b..3eacf7b7f9f3 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 dcbc5aa0e410..9ce642b513ff 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,135 +125,144 @@
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))
+
+ 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)
else
// 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 44d6ebbffde0..018bfd65e500 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -128,7 +128,8 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments)
if(dept_key)
LAZYADD(GLOB.reta_consoles_by_origin[dept_key], src)
- find_and_hang_on_wall()
+ if(mapload)
+ find_and_mount_on_atom()
/obj/machinery/requests_console/Destroy()
QDEL_LIST(messages)
@@ -190,7 +191,7 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments)
// Check if user can call this emergency (prevent self-calls) RETA
var/user_dept = reta_get_user_department(usr)
- if(user_dept == target_dept)
+ if(user_dept == target_dept && !isAdminGhostAI(usr))
to_chat(usr, span_alert("You cannot call your own department for emergency assistance."))
return
@@ -201,6 +202,28 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments)
emergency = emergency_type
+ // Enhanced announcement with caller info
+ var/caller_info = ""
+ // Aghosts have no IDs, but they hold authorithy so instead calling them Unknowns just drop caller info completely
+ if(usr && isliving(usr))
+ caller_info = "(Identification not provided)"
+ var/mob/living/caller_mob = usr
+ var/obj/item/card/id/ID = caller_mob.get_idcard()
+ if(ID)
+ caller_info = "(Called by [ID.registered_name], [ID.assignment])"
+ // Centcom still refuses to provide IDs to their silicons
+ else if (issilicon(caller_mob))
+ caller_info = "(Called by [caller_mob.name], [caller_mob.job])"
+ // Cyborgs do not have their job var set, and this is wrong
+ if(iscyborg(caller_mob) && caller_mob?.mind?.assigned_role)
+ caller_info = "(Called by [caller_mob.name], [caller_mob.mind.assigned_role.title])"
+
+ // If someone swiped their ID before
+ else if (message_verified_by)
+ caller_info = "(Last authentication: [message_verified_by])"
+ message_stamped_by = ""
+ message_verified_by = ""
+
// Grant RETA if conditions are met
if(origin_dept && target_dept && CONFIG_GET(flag/reta_enabled))
// Set cooldown
@@ -214,66 +237,56 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments)
// Track this call for multiple department analysis
reta_track_call(origin_dept, target_dept)
- // Enhanced announcement with caller info
- var/caller_info = ""
- if(usr)
- var/caller_name = usr.real_name || "Unknown"
- var/caller_title = "Unknown Position"
- if(usr?.mind?.assigned_role)
- caller_title = usr.mind.assigned_role.title
- caller_info = " (Called by [caller_name], [caller_title])"
-
- var/enhanced_location = "[department][caller_info]"
-
switch(emergency_type)
if(REQ_EMERGENCY_SECURITY)
- aas_config_announce(/datum/aas_config_entry/rc_emergency, list("LOCATION" = enhanced_location), null, list(RADIO_CHANNEL_SECURITY), REQ_EMERGENCY_SECURITY)
+ aas_config_announce(/datum/aas_config_entry/rc_emergency, list("LOCATION" = department, "CALLER" = caller_info, "RETARESPONDERS" = granted_count), src, list(RADIO_CHANNEL_SECURITY), "Security")
if(REQ_EMERGENCY_ENGINEERING)
- aas_config_announce(/datum/aas_config_entry/rc_emergency, list("LOCATION" = enhanced_location), null, list(RADIO_CHANNEL_ENGINEERING), REQ_EMERGENCY_ENGINEERING)
+ aas_config_announce(/datum/aas_config_entry/rc_emergency, list("LOCATION" = department, "CALLER" = caller_info, "RETARESPONDERS" = granted_count), src, list(RADIO_CHANNEL_ENGINEERING), "Engineering")
if(REQ_EMERGENCY_MEDICAL)
- aas_config_announce(/datum/aas_config_entry/rc_emergency, list("LOCATION" = enhanced_location), null, list(RADIO_CHANNEL_MEDICAL), REQ_EMERGENCY_MEDICAL)
+ aas_config_announce(/datum/aas_config_entry/rc_emergency, list("LOCATION" = department, "CALLER" = caller_info, "RETARESPONDERS" = granted_count), src, list(RADIO_CHANNEL_MEDICAL), "Medical")
// Send confirmation to the calling department about the RETA activation
- var/calling_message = "RETA activated[caller_info]. [target_dept] personnel now have temporary access to your areas."
-
- // Get an announcement system to send simple radio messages
- var/obj/machinery/announcement_system/announcer = get_announcement_system(null, null, list(RADIO_CHANNEL_COMMON))
- if(announcer)
- switch(origin_dept)
- if("Security")
- announcer.radio.talk_into(announcer, calling_message, RADIO_CHANNEL_SECURITY)
- if("Engineering")
- announcer.radio.talk_into(announcer, calling_message, RADIO_CHANNEL_ENGINEERING)
- if("Medical")
- announcer.radio.talk_into(announcer, calling_message, RADIO_CHANNEL_MEDICAL)
- if("Science")
- announcer.radio.talk_into(announcer, calling_message, RADIO_CHANNEL_SCIENCE)
- if("Service")
- announcer.radio.talk_into(announcer, calling_message, RADIO_CHANNEL_SERVICE)
- if("Command")
- announcer.radio.talk_into(announcer, calling_message, RADIO_CHANNEL_COMMAND)
- if("Cargo")
- announcer.radio.talk_into(announcer, calling_message, RADIO_CHANNEL_SUPPLY)
- if("Mining")
- announcer.radio.talk_into(announcer, calling_message, RADIO_CHANNEL_SUPPLY)
-
+ var/list/target_channels = list()
+ switch(origin_dept)
+ if("Security")
+ target_channels += RADIO_CHANNEL_SECURITY
+ if("Engineering")
+ target_channels += RADIO_CHANNEL_ENGINEERING
+ if("Medical")
+ target_channels += RADIO_CHANNEL_MEDICAL
+ if("Science")
+ target_channels += RADIO_CHANNEL_SCIENCE
+ if("Service")
+ target_channels += RADIO_CHANNEL_SERVICE
+ if("Command")
+ target_channels += RADIO_CHANNEL_COMMAND
+ if("Cargo")
+ target_channels += RADIO_CHANNEL_SUPPLY
+ if("Mining")
+ target_channels += RADIO_CHANNEL_SUPPLY
+
+ // Do not announce if RETA failed to activate
+ if (granted_count)
+ aas_config_announce(/datum/aas_config_entry/rc_reta_announcement, list("GRANTEE" = target_dept, "CALLER" = caller_info), src, target_channels)
// Log RETA activity
log_game("RETA: [origin_dept] called [target_dept] emergency, granted access to [granted_count] responder IDs for [duration_ds/10] seconds")
// Push UI updates to consoles in the same origin department
reta_push_ui_updates(origin_dept, target_dept)
+ // Making sure our emergency is synced with RETA timers
+ addtimer(CALLBACK(src, PROC_REF(clear_emergency)), duration_ds)
else
// Normal emergency call without RETA
switch(emergency_type)
if(REQ_EMERGENCY_SECURITY)
- aas_config_announce(/datum/aas_config_entry/rc_emergency, list("LOCATION" = department), null, list(RADIO_CHANNEL_SECURITY), REQ_EMERGENCY_SECURITY)
+ aas_config_announce(/datum/aas_config_entry/rc_emergency, list("LOCATION" = department, "CALLER" = caller_info), null, list(RADIO_CHANNEL_SECURITY), "Security")
if(REQ_EMERGENCY_ENGINEERING)
- aas_config_announce(/datum/aas_config_entry/rc_emergency, list("LOCATION" = department), null, list(RADIO_CHANNEL_ENGINEERING), REQ_EMERGENCY_ENGINEERING)
+ aas_config_announce(/datum/aas_config_entry/rc_emergency, list("LOCATION" = department, "CALLER" = caller_info), null, list(RADIO_CHANNEL_ENGINEERING), "Engineering")
if(REQ_EMERGENCY_MEDICAL)
- aas_config_announce(/datum/aas_config_entry/rc_emergency, list("LOCATION" = department), null, list(RADIO_CHANNEL_MEDICAL), REQ_EMERGENCY_MEDICAL)
+ aas_config_announce(/datum/aas_config_entry/rc_emergency, list("LOCATION" = department, "CALLER" = caller_info), null, list(RADIO_CHANNEL_MEDICAL), "Medical")
+ addtimer(CALLBACK(src, PROC_REF(clear_emergency)), 5 MINUTES)
update_appearance()
- addtimer(CALLBACK(src, PROC_REF(clear_emergency)), 5 MINUTES)
return TRUE
if("send_announcement")
if(!COOLDOWN_FINISHED(src, announcement_cooldown))
@@ -534,20 +547,96 @@ 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"
+ name = "RC Alert: Emergency Request"
announcement_lines_map = list(
- "Security" = "SECURITY EMERGENCY in %LOCATION - RETA door access granted to responders!",
- "Engineering" = "ENGINEERING EMERGENCY in %LOCATION - RETA door access granted to responders!",
- "Medical" = "MEDICAL EMERGENCY in %LOCATION - RETA door access granted to responders!",
+ REQ_EMERGENCY_SECURITY = "SECURITY EMERGENCY in %LOCATION %CALLER!!!",
+ REQ_EMERGENCY_ENGINEERING = "ENGINEERING EMERGENCY in %LOCATION %CALLER!!!",
+ REQ_EMERGENCY_MEDICAL = "MEDICAL EMERGENCY in %LOCATION %CALLER!!!",
)
+
vars_and_tooltips_map = list(
- "LOCATION" = "will be replaced with the department name and caller information (Name, Job Title)",
+ "LOCATION" = "will be replaced with the department name",
+ "CALLER" = "with caller name and job if applicable",
)
+/datum/aas_config_entry/rc_emergency/New()
+ . = ..()
+ // If RETA enabled change config lines to include RETA info
+ if(CONFIG_GET(flag/reta_enabled))
+ // Non sec/engi/med personnel may be called by CC or AI (I hope) for anomaly removal and etc. Mostly admin triggered calls
+ announcement_lines_map = list(
+ "RETA Granted" = "- RETA door access granted to responders",
+ "RETA Failed" = "- no RETA access provided",
+ "Security" = "SECURITY EMERGENCY in %LOCATION %CALLER %RETA!!!",
+ "Engineering" = "ENGINEERING EMERGENCY in %LOCATION %CALLER %RETA!!!",
+ "Medical" = "MEDICAL EMERGENCY in %LOCATION %CALLER, %RETA!!!",
+ "Science" = "Science personnel was requested in %LOCATION %CALLER %RETA.",
+ "Service" = "Service personnel was requested in %LOCATION %CALLER %RETA.",
+ "Command" = "Command personnel was requested in %LOCATION %CALLER %RETA.",
+ "Cargo" = "Cargo personnel was requested in %LOCATION %CALLER %RETA.",
+ "Mining" = "Miners were requested in %LOCATION %CALLER %RETA.",
+ )
+ vars_and_tooltips_map = list(
+ "LOCATION" = "will be replaced with the department name",
+ "CALLER" = "with caller name and job if applicable",
+ "RETA" = "with RETA Granted or RETA Failed lines depending on RETA system report",
+ )
+
+/datum/aas_config_entry/rc_emergency/compile_announce(list/variables_map, announcement_line)
+ if (!variables_map["CALLER"])
+ variables_map["CALLER"] = "(Caller placeholder)"
+
+ variables_map["RETA"] = variables_map["RETARESPONDERS"] ? announcement_lines_map["RETA Granted"] : announcement_lines_map["RETA Failed"]
+ . = ..()
+ // In case - someone expands RETA departments, but forgets to add announcement lines for them
+ if (!announcement_lines_map[announcement_line])
+ . = "ERROR: UNKNOWN DEPARTMENT \[[announcement_line]\] CALLED IN [variables_map["LOCATION"] || "\[NO DATA\]"] [variables_map["CALLER"]]. PLEASE REPORT THIS TO NT TECH SUPPORT."
+
+ var/list/exploded_string = splittext_char(., "(Caller placeholder)")
+ var/list/trimed_message = list()
+ for (var/line in exploded_string)
+ line = trim(line)
+ if (line)
+ trimed_message += line
+ // Rebuild the string without empty lines
+ . = trimed_message.Join(" ")
+
+/datum/aas_config_entry/rc_reta_announcement
+ name = "RC Alert: RETA Granted"
+ announcement_lines_map = list(
+ "Message" = "RETA activated %CALLER. %GRANTEE personnel now have temporary access to your areas."
+ )
+
+ vars_and_tooltips_map = list(
+ "CALLER" = "will be replaced with caller info if applicable",
+ "GRANTEE" = "with who may now access targeted areas",
+ )
+
+/datum/aas_config_entry/rc_reta_announcement/New()
+ . = ..()
+ // If RETA disabled - we should be down
+ if(!CONFIG_GET(flag/reta_enabled))
+ announcement_lines_map["Message"] = "RETA system is disabled."
+ enabled = FALSE
+ modifiable = FALSE
+
+/datum/aas_config_entry/rc_reta_announcement/compile_announce(list/variables_map, announcement_line)
+ if (!variables_map["CALLER"])
+ variables_map["CALLER"] = "(Caller placeholder)"
+ var/list/exploded_string = splittext_char(..(), "(Caller placeholder)")
+ var/list/trimed_message = list()
+ for (var/line in exploded_string)
+ line = trim(line)
+ if (line)
+ trimed_message += line
+ // Rebuild the string without empty lines
+ . = trimed_message.Join(" ")
+
/datum/aas_config_entry/rc_new_message
- name = "RC Alert: New Message "
+ name = "RC Alert: New Message"
// Yes, players can't use html tags, however they can use speech mods like | or +, but sh-sh-sh, don't tell them!
announcement_lines_map = list(
"Unauthenticated" = "Message from %SENDER to %RECEIVER: %MESSAGE",
diff --git a/code/game/machinery/roulette_machine.dm b/code/game/machinery/roulette_machine.dm
index a73576f36615..e9e94686f7f2 100644
--- a/code/game/machinery/roulette_machine.dm
+++ b/code/game/machinery/roulette_machine.dm
@@ -220,11 +220,14 @@
cut_overlays()
update_appearance()
set_light(0)
+ if(isliving(user))
+ var/mob/living/living_user = user
+ living_user.add_mood_event("roulette", /datum/mood_event/slots)
var/rolled_number = rand(0, 36)
playsound(src, 'sound/machines/roulette/roulettewheel.ogg', 50)
- addtimer(CALLBACK(src, PROC_REF(finish_play), player_id, bet_type, bet_amount, payout, rolled_number), 34) //4 deciseconds more so the animation can play
+ addtimer(CALLBACK(src, PROC_REF(finish_play), player_id, bet_type, bet_amount, payout, rolled_number, user), 34) //4 deciseconds more so the animation can play
addtimer(CALLBACK(src, PROC_REF(finish_play_animation)), 3 SECONDS)
use_energy(active_power_usage)
@@ -235,7 +238,7 @@
playsound(src, 'sound/machines/piston/piston_lower.ogg', 70)
///Ran after a while to check if the player won or not.
-/obj/machinery/roulette/proc/finish_play(obj/item/card/id/player_id, bet_type, bet_amount, potential_payout, rolled_number)
+/obj/machinery/roulette/proc/finish_play(obj/item/card/id/player_id, bet_type, bet_amount, potential_payout, rolled_number, mob/user)
last_spin = rolled_number
var/is_winner = check_win(bet_type, bet_amount, rolled_number) //Predetermine if we won
@@ -249,17 +252,22 @@
handle_color_light(color)
if(!is_winner)
- say("You lost! Better luck next time")
+ say("You lost! Better luck next time.")
playsound(src, 'sound/machines/synth/synth_no.ogg', 50)
+ if(isliving(user) && (user in viewers(src)))
+ var/mob/living/living_user = user
+ living_user.add_mood_event("roulette", /datum/mood_event/slots/loss)
return FALSE
// Prevents money generation exploits. Doesn't prevent the owner being a scrooge and running away with the money.
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
+ living_user.add_mood_event("roulette", potential_payout >= ROULETTE_JACKPOT_AMOUNT ? /datum/mood_event/slots/win/jackpot : /datum/mood_event/slots/win/big)
dispense_prize(potential_payout)
///Fills a list of coins that should be dropped.
diff --git a/code/game/machinery/scanner_gate.dm b/code/game/machinery/scanner_gate.dm
index 49475d53f951..27271f3c4b16 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 815b35213b9e..c689318ddc47 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/shieldgen.dm b/code/game/machinery/shieldgen.dm
index 24057c27a346..e3e1e54f046f 100644
--- a/code/game/machinery/shieldgen.dm
+++ b/code/game/machinery/shieldgen.dm
@@ -58,7 +58,7 @@
/obj/structure/emergency_shield/regenerating/Initialize(mapload)
. = ..()
- AddElement(/datum/element/empprotection, EMP_PROTECT_SELF)
+ AddElement(/datum/element/empprotection, EMP_PROTECT_SELF|EMP_NO_EXAMINE)
/obj/structure/emergency_shield/regenerating/Destroy()
STOP_PROCESSING(SSobj, src)
@@ -84,7 +84,7 @@
/obj/structure/emergency_shield/cult/Initialize(mapload)
. = ..()
- AddElement(/datum/element/empprotection, EMP_PROTECT_SELF)
+ AddElement(/datum/element/empprotection, EMP_PROTECT_SELF|EMP_NO_EXAMINE)
/obj/structure/emergency_shield/cult/narsie
name = "sanguine barrier"
diff --git a/code/game/machinery/sleepers.dm b/code/game/machinery/sleepers.dm
index 9b843cd55061..1715ead99680 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 470d791080a7..ded188b82bd1 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
@@ -227,6 +227,9 @@
if(user)
the_name = user.real_name
visible_message(span_notice("[user] pulls the lever and the slot machine starts spinning!"))
+ if(isliving(user))
+ var/mob/living/living_user = user
+ living_user.add_mood_event("slots_spin", /datum/mood_event/slots)
else
the_name = "Exaybachay"
@@ -306,8 +309,11 @@
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
+ living_user.add_mood_event("slots", /datum/mood_event/slots/win/jackpot)
jackpots += 1
money = 0
if(paymode == HOLOCHIP)
@@ -321,12 +327,18 @@
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
+ living_user.add_mood_event("slots", /datum/mood_event/slots/win)
else if(linelength == 3)
to_chat(user, span_notice("You win three free games!"))
@@ -337,6 +349,9 @@
balloon_alert(user, "no luck!")
playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 50)
did_player_win = FALSE
+ if(isliving(user) && (user in viewers(src)))
+ var/mob/living/living_user = user
+ living_user.add_mood_event("slots", /datum/mood_event/slots/loss)
if(did_player_win)
add_filter("jackpot_rays", 3, ray_filter)
diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm
index 0e1f8ae06298..3010b84b19ea 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 a360c9229c01..69a8555f3e1a 100644
--- a/code/game/machinery/status_display.dm
+++ b/code/game/machinery/status_display.dm
@@ -51,7 +51,7 @@ GLOBAL_DATUM_INIT(status_font, /datum/font, new /datum/font/tiny_unicode/size_12
pixel_shift = 32
//makes it go on the wall when built
-/obj/machinery/status_display/Initialize(mapload, ndir, building)
+/obj/machinery/status_display/Initialize(mapload)
. = ..()
update_appearance()
@@ -403,11 +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))
- find_and_hang_on_wall()
+ if(mapload)
+ find_and_mount_on_atom()
/obj/machinery/status_display/evac/Destroy()
SSradio.remove_object(src,frequency)
@@ -591,7 +590,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/status_display/evac, 32)
LAZYOR(active_displays, new_display)
set_display_with_priority(SD_GREENSCREEN, DISPLAY_PRIORITY_MESSAGE, force_override = TRUE)
if("friendcomputer")
- friendc = !friendc
+ // Friend Computer should only affect AI displays, not evac displays
+ return
update()
/obj/machinery/status_display/evac/vv_edit_var(vname, vval)
@@ -732,32 +732,68 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/status_display/evac, 32)
desc = "A small screen which the AI can use to present itself."
current_mode = SD_PICTURE
var/emotion = AI_DISPLAY_DONT_GLOW
+ var/frequency = FREQ_STATUS_DISPLAYS
+ var/friendc = FALSE // track if Friend Computer mode
+ var/last_picture // For when Friend Computer mode is undone
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/status_display/ai, 32)
+/obj/machinery/status_display/ai/Initialize(mapload)
+ . = ..()
+ // register for radio system to receive AI emote signals
+ SSradio.add_object(src, frequency)
+ if(mapload)
+ find_and_mount_on_atom()
+
+/obj/machinery/status_display/ai/Destroy()
+ SSradio.remove_object(src, frequency)
+ return ..()
+
/obj/machinery/status_display/ai/attack_ai(mob/living/silicon/ai/user)
if(!isAI(user))
return
- var/list/choices = list()
- for(var/emotion_const in GLOB.ai_status_display_emotes)
- var/icon_state = GLOB.ai_status_display_emotes[emotion_const]
- choices[emotion_const] = image(icon = 'icons/obj/machines/status_display.dmi', icon_state = icon_state)
-
- var/emotion_result = show_radial_menu(user, src, choices, tooltips = TRUE)
- for(var/_emote in typesof(/datum/emote/ai/emotion_display))
- var/datum/emote/ai/emotion_display/emote = _emote
- if(initial(emote.emotion) == emotion_result)
- user.emote(initial(emote.key))
- break
+
+ // Open the TGUI interface for selecting status display options
+ if(!user.status_display_picker)
+ user.status_display_picker = new(user, src)
+ user.status_display_picker.ui_interact(user)
/obj/machinery/status_display/ai/process()
if(machine_stat & NOPOWER)
update_appearance()
return PROCESS_KILL
- set_picture(GLOB.ai_status_display_emotes[emotion])
+ if(!length(GLOB.ai_status_display_all_options))
+ init_ai_status_display_options()
+
+ var/icon_state
+ // First try the combined list
+ if(emotion in GLOB.ai_status_display_all_options)
+ icon_state = GLOB.ai_status_display_all_options[emotion]
+ // Then try the original emotes list
+ else if(emotion in GLOB.ai_status_display_emotes)
+ icon_state = GLOB.ai_status_display_emotes[emotion]
+ // Default fallback
+ else
+ icon_state = "ai_download"
+
+ set_picture(icon_state)
return PROCESS_KILL
+/obj/machinery/status_display/ai/receive_signal(datum/signal/signal)
+ switch(signal.data["command"])
+ if("friendcomputer")
+ friendc = !friendc
+ if(friendc)
+ last_picture = emotion // Save current display
+ emotion = AI_EMOTION_FRIEND_COMPUTER
+ else
+ if(last_picture)
+ emotion = last_picture // Restore previous display
+ else
+ emotion = AI_DISPLAY_DONT_GLOW
+ update_appearance()
+
/obj/item/circuit_component/status_display
display_name = "Status Display"
desc = "Output text and pictures to a status display."
@@ -842,7 +878,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/status_display/ai, 32)
/// list to pick the first line from
var/list/firstline_to_secondline = list()
-/obj/machinery/status_display/random_message/Initialize(mapload, ndir, building)
+/obj/machinery/status_display/random_message/Initialize(mapload)
if(firstline_to_secondline?.len)
message1 = pick(firstline_to_secondline)
message2 = firstline_to_secondline[message1]
@@ -993,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 5ca275106b01..64e4e735afd0 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -7,8 +7,8 @@
icon_state = "classic"
base_icon_state = "classic"
power_channel = AREA_USAGE_EQUIP
- density = TRUE
- obj_flags = CAN_BE_HIT | BLOCKS_CONSTRUCTION // Becomes undense when the unit is open
+ density = TRUE // Becomes undense when the unit is open
+ obj_flags = CAN_BE_HIT | BLOCKS_CONSTRUCTION | UNIQUE_RENAME | RENAME_NO_DESC
interaction_flags_mouse_drop = NEED_DEXTERITY
max_integrity = 250
req_access = list()
@@ -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.emote("scream")
@@ -697,33 +697,6 @@
balloon_alert(user, "set to [choice]")
return ITEM_INTERACT_SUCCESS
- if(!state_open && IS_WRITING_UTENSIL(tool))
- if(locked)
- balloon_alert(user, "unlock first!")
- return ITEM_INTERACT_BLOCKING
- if(isnull(id_card))
- balloon_alert(user, "not yours to rename!")
- return ITEM_INTERACT_BLOCKING
-
- var/name_set = FALSE
- var/desc_set = FALSE
- var/str = tgui_input_text(user, "Personal Unit Name", "Unit Name", max_length = MAX_NAME_LEN)
- if(!isnull(str))
- name = str
- name_set = TRUE
- str = tgui_input_text(user, "Personal Unit Description", "Unit Description", max_length = MAX_DESC_LEN)
- if(!isnull(str))
- desc = str
- desc_set = TRUE
- var/bit_flag = NONE
- if(name_set)
- bit_flag |= UPDATE_NAME
- if(desc_set)
- bit_flag |= UPDATE_DESC
- if(bit_flag)
- update_appearance(bit_flag)
- return ITEM_INTERACT_SUCCESS
-
if(state_open && is_operational)
if(istype(tool, /obj/item/clothing/suit))
if(suit)
@@ -804,6 +777,15 @@
if(.)
return ..()
+/obj/machinery/suit_storage_unit/rename_checks(mob/living/user)
+ . = TRUE
+ if(locked)
+ balloon_alert(user, "unlock first!")
+ return FALSE
+ if(!access_check(user))
+ balloon_alert(user, "not yours to rename!")
+ return FALSE
+
/// If the SSU needs to have any communications wires cut.
/obj/machinery/suit_storage_unit/proc/disable_modlink()
if(isnull(mod))
diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm
index 224345a8f6d0..d28b9b5694ca 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
@@ -69,6 +70,12 @@
if(!active)
return PROCESS_KILL
+ for(var/obj/effect/forcefield/cosmic_field/potential_field as anything in GLOB.active_cosmic_fields)
+ if(get_dist(potential_field, src) < 3)
+ new /obj/effect/temp_visual/revenant(get_turf(src))
+ defuse()
+ return
+
if(!isnull(next_beep) && (next_beep <= world.time))
var/volume
switch(seconds_remaining())
@@ -270,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(
@@ -350,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
@@ -446,7 +454,8 @@
/obj/item/bombcore/badmin/summon/detonate()
var/obj/machinery/syndicatebomb/B = loc
- spawn_and_random_walk(summon_path, src, amt_summon, walk_chance=50, admin_spawn=TRUE, cardinals_only = FALSE)
+ for(var/atom/spawned as anything in spawn_and_random_walk(summon_path, src, amt_summon, walk_chance=50, admin_spawn=TRUE, cardinals_only = FALSE))
+ ADD_TRAIT(spawned, TRAIT_SPAWNED_MOB, INNATE_TRAIT)
qdel(B)
qdel(src)
diff --git a/code/game/machinery/telecomms/broadcasting.dm b/code/game/machinery/telecomms/broadcasting.dm
index 53d217f6cb75..ad3a0a80db1c 100644
--- a/code/game/machinery/telecomms/broadcasting.dm
+++ b/code/game/machinery/telecomms/broadcasting.dm
@@ -180,7 +180,7 @@
stack_trace("null found in the hearers list returned by the spatial grid. this is bad")
continue
spans -= blacklisted_spans
- hearer.Hear(virt, language, message, frequency, data["frequency_name"], data["frequency_color"], spans, message_mods, message_range = INFINITY)
+ hearer.Hear(virt, language, message, frequency, data["frequency_name"], data["frequency_color"], spans, message_mods, message_range = INFINITY, source = source) // DARKPACK EDIT, ORIGINAL: hearer.Hear(virt, language, message, frequency, data["frequency_name"], data["frequency_color"], spans, message_mods, message_range = INFINITY)
// This following recording is intended for research and feedback in the use of department radio channels
if(length(receive))
@@ -194,7 +194,10 @@
spans_part = "[spans_part] ) "
var/lang_name = data["language"]
- var/log_text = "\[[get_radio_name(frequency)]\] [spans_part]\"[message]\" (language: [lang_name])"
+ // DARKPACK EDIT ADD START
+ var/obj/item/radio/radio = source
+ var/log_text = "\[[get_radio_name(frequency)]\] [radio.radio_id][spans_part]\"[message]\" (language: [lang_name])"
+ // DARKPACK EDIT ADD END
var/mob/source_mob = virt.source
diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm
index 7a606d426419..39ac4b438422 100644
--- a/code/game/machinery/telecomms/machine_interactions.dm
+++ b/code/game/machinery/telecomms/machine_interactions.dm
@@ -13,6 +13,7 @@
FREQ_CTF_YELLOW,
FREQ_CTF_GREEN,
FREQ_CTF_BLUE,
+ FREQ_MILITARY, // DARKPACK EDIT ADD
)
/obj/machinery/telecomms/attackby(obj/item/attacking_item, mob/user, list/modifiers, list/attack_modifiers)
@@ -322,7 +323,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 +342,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/telecomms/machines/allinone.dm b/code/game/machinery/telecomms/machines/allinone.dm
index 63668487de75..5e0e7877d981 100644
--- a/code/game/machinery/telecomms/machines/allinone.dm
+++ b/code/game/machinery/telecomms/machines/allinone.dm
@@ -52,7 +52,31 @@
"[FREQ_SECURITY]" = list(
"name" = RADIO_CHANNEL_SECURITY,
"color" = RADIO_COLOR_SECURITY
- )
+ ), // DARKPACK EDIT ADD START
+ "[FREQ_POLICE]" = list(
+ "name" = RADIO_CHANNEL_POLICE,
+ "color" = RADIO_COLOR_POLICE
+ ),
+ "[FREQ_CLINIC]" = list(
+ "name" = RADIO_CHANNEL_CLINIC,
+ "color" = RADIO_COLOR_CLINIC
+ ),
+ "[FREQ_MILITARY]" = list(
+ "name" = RADIO_CHANNEL_MILITARY,
+ "color" = RADIO_COLOR_MILITARY
+ ),
+ "[FREQ_CAMARILLA]" = list(
+ "name" = RADIO_CHANNEL_CAMARILLA,
+ "color" = RADIO_COLOR_CAMARILLA
+ ),
+ "[FREQ_ANARCH]" = list(
+ "name" = RADIO_CHANNEL_ANARCH,
+ "color" = RADIO_COLOR_ANARCH
+ ),
+ "[FREQ_ENDRON]" = list(
+ "name" = RADIO_CHANNEL_ENDRON,
+ "color" = RADIO_COLOR_ENDRON
+ ) // DARKPACK EDIT ADD END
)
/obj/machinery/telecomms/allinone/nuclear
diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm
index 6b705fa3dc58..c2da8bd27808 100644
--- a/code/game/machinery/transformer.dm
+++ b/code/game/machinery/transformer.dm
@@ -92,7 +92,7 @@
playsound(src.loc, 'sound/items/tools/welder.ogg', 50, TRUE)
victim.emote("scream") // It is painful
- victim.adjustBruteLoss(max(0, 80 - victim.getBruteLoss())) // Hurt the human, don't try to kill them though.
+ 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 89de765ecbe1..3bcef5c124ae 100644
--- a/code/game/machinery/wall_healer.dm
+++ b/code/game/machinery/wall_healer.dm
@@ -69,6 +69,8 @@
update_appearance()
init_payment()
register_context()
+ if(mapload)
+ find_and_mount_on_atom()
/obj/machinery/wall_healer/Destroy()
clear_using_mob()
@@ -485,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)
@@ -500,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)
@@ -526,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 33208d160e6e..b88f0f9c1dd2 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 3babf33eb9ef..ad6b4259f414 100644
--- a/code/game/objects/buckling.dm
+++ b/code/game/objects/buckling.dm
@@ -104,7 +104,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)
@@ -351,7 +358,7 @@
* user - The mob unbuckling buckled_mob
*/
/atom/movable/proc/user_unbuckle_mob(mob/living/buckled_mob, mob/user)
- if(!(buckled_mob in buckled_mobs) || !user.CanReach(buckled_mob))
+ if(!(buckled_mob in buckled_mobs) || !buckled_mob.IsReachableBy(user))
return
var/mob/living/M = unbuckle_mob(buckled_mob)
if(M)
diff --git a/code/game/objects/effects/anomalies/_anomalies.dm b/code/game/objects/effects/anomalies/_anomalies.dm
index 3cf2ee6a8f5a..57aa83b532e7 100644
--- a/code/game/objects/effects/anomalies/_anomalies.dm
+++ b/code/game/objects/effects/anomalies/_anomalies.dm
@@ -24,7 +24,7 @@
///Chance per second that we will move
var/move_chance = ANOMALY_MOVECHANCE
-/obj/effect/anomaly/Initialize(mapload, new_lifespan)
+/obj/effect/anomaly/Initialize(mapload, new_lifespan, drops_core = TRUE)
. = ..()
if(!mapload)
@@ -36,6 +36,9 @@
if (!impact_area)
return INITIALIZE_HINT_QDEL
+ if(!drops_core)
+ anomaly_core = null
+
if(anomaly_core)
anomaly_core = new anomaly_core(src)
anomaly_core.code = rand(1,100)
diff --git a/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm b/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm
index 234e5e740ffb..75b07ba9c1e4 100644
--- a/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm
+++ b/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm
@@ -157,8 +157,8 @@
var/obj/machinery/door/airlock/airlock = object
var/obj/machinery/door/new_airlock = new_object
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()
+ new_airlock.req_access = airlock.req_access?.Copy()
+ new_airlock.req_one_access = airlock.req_one_access?.Copy()
new_airlock.locked = airlock.locked
new_airlock.emergency = airlock.emergency
new_airlock.update_appearance()
diff --git a/code/game/objects/effects/anomalies/anomalies_flux.dm b/code/game/objects/effects/anomalies/anomalies_flux.dm
index 1d823d00b60b..ddf7b0367336 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 000000000000..ea407acfa3af
--- /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 540be85db4ed..f4f9ea381400 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/ants.dm b/code/game/objects/effects/decals/cleanable/ants.dm
index b6a3fa38c3fa..465cbe391bb6 100644
--- a/code/game/objects/effects/decals/cleanable/ants.dm
+++ b/code/game/objects/effects/decals/cleanable/ants.dm
@@ -1,6 +1,6 @@
/obj/effect/decal/cleanable/ants
- name = "space ants"
- desc = "A small colony of space ants. They're normally used to the vacuum of space, so they can't climb too well."
+ name = "ants" // DARKPACK EDIT CHANGE
+ desc = "A small colony of ants. Do not let them in your pants." // DARKPACK EDIT CHANGE
icon = 'icons/obj/debris.dmi'
icon_state = "ants"
beauty = -150
diff --git a/code/game/objects/effects/decals/cleanable/blood.dm b/code/game/objects/effects/decals/cleanable/blood.dm
index 488c1b610d9c..c6b342cb7bc5 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
@@ -852,6 +850,9 @@
if(splatter_strength <= 0)
break
iter_atom.add_blood_DNA(GET_ATOM_BLOOD_DNA(src))
+ if(isliving(iter_atom))
+ var/mob/living/splatted = iter_atom
+ splatted.add_mood_event("splattered_with_blood", /datum/mood_event/splattered_with_blood)
splatter_strength--
// we used all our blood so go away
diff --git a/code/game/objects/effects/decals/cleanable/fuel.dm b/code/game/objects/effects/decals/cleanable/fuel.dm
index e372e93c43d6..ced0b5376b1b 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 660b4180b226..a67190083ac0 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
@@ -194,7 +194,8 @@
if(. || !ishuman(user))
return
var/mob/living/carbon/human/as_human = user
- if(!isflyperson(as_human))
+ var/obj/item/organ/tongue/user_tongue = user.get_organ_slot(ORGAN_SLOT_TONGUE)
+ if(!istype(user_tongue, /obj/item/organ/tongue/fly))
return
playsound(get_turf(src), 'sound/items/drink.ogg', 50, TRUE) //slurp
as_human.visible_message(span_alert("[as_human] extends a small proboscis into the vomit pool, sucking it with a slurping sound."))
@@ -354,7 +355,7 @@ GLOBAL_LIST_EMPTY(nebula_vomits)
/obj/effect/decal/cleanable/garbage
name = "trash bag" // DARKPACK EDIT CHANGE - ORIGINAL: name = "decomposing garbage"
desc = "Holds garbage inside." // DARKPACK EDIT CHANGE - ORIGINAL: desc = "A split open garbage bag, its stinking content seems to be partially liquified. Yuck!"
- icon = 'modular_darkpack/modules/deprecated/icons/props.dmi' // DARKPACK EDIT CHANGE - ORIGINAL: icon = 'icons/obj/debris.dmi'
+ icon = 'modular_darkpack/modules/decor/icons/trash.dmi' // DARKPACK EDIT CHANGE - ORIGINAL: icon = 'icons/obj/debris.dmi'
icon_state = "garbage1" // DARKPACK EDIT CHANGE - ORIGINAL: icon_state = "garbage"
plane = GAME_PLANE
layer = CLEANABLE_OBJECT_LAYER
@@ -383,3 +384,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 be3e03d5e6e6..b8069b0ab41a 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 a527317b4766..16254e9610c6 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 53815dd6457f..df0b3f4c0fa7 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
@@ -383,6 +382,28 @@
/obj/effect/turf_decal/siding/wood/end
icon_state = "siding_wood_end"
+// DARKPACK EDIT ADD START
+// Matches the floor colors we use alot more then the default
+/obj/effect/turf_decal/siding/wood/dark
+ color = "#4a3925"
+
+/obj/effect/turf_decal/siding/wood/dark/corner
+ icon_state = "siding_wood_corner"
+
+/obj/effect/turf_decal/siding/wood/dark/end
+ icon_state = "siding_wood_end"
+
+/obj/effect/turf_decal/siding/wood/light
+ color = "#9a704a"
+
+/obj/effect/turf_decal/siding/wood/light/corner
+ icon_state = "siding_wood_corner"
+
+/obj/effect/turf_decal/siding/wood/light/end
+ icon_state = "siding_wood_end"
+
+// DARKPACK EDIT ADD END
+
/obj/effect/turf_decal/siding/thinplating
icon_state = "siding_thinplating"
color = "#aaaaaa"
diff --git a/code/game/objects/effects/effect_system/effect_system.dm b/code/game/objects/effects/effect_system/effect_system.dm
index 6ddd65f12cfc..73ffc52a2bdb 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 6d71edad180b..83ef6e552938 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/forcefields.dm b/code/game/objects/effects/forcefields.dm
index 377bf58fda69..08f996081a15 100644
--- a/code/game/objects/effects/forcefields.dm
+++ b/code/game/objects/effects/forcefields.dm
@@ -95,12 +95,15 @@
receive_ricochet_chance_mod = INFINITY //we do ricochet a lot!
initial_duration = 10 SECONDS
+GLOBAL_LIST_EMPTY_TYPED(active_cosmic_fields, /obj/effect/forcefield/cosmic_field)
+
/// The cosmic heretics forcefield
/obj/effect/forcefield/cosmic_field
name = "Cosmic Field"
desc = "A field that cannot be passed by people marked with a cosmic star."
icon = 'icons/effects/eldritch.dmi'
icon_state = "cosmic_carpet"
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
anchored = TRUE
layer = GIB_LAYER
density = FALSE
@@ -108,10 +111,27 @@
initial_duration = 30 SECONDS
/// Flags for what antimagic can just ignore our forcefields
var/antimagic_flags = MAGIC_RESISTANCE
+ /// If we are able to slow down projectiles
+ var/slows_projectiles = FALSE
/obj/effect/forcefield/cosmic_field/Initialize(mapload, flags = MAGIC_RESISTANCE)
. = ..()
antimagic_flags = flags
+ var/static/list/loc_connections = list(
+ COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
+ COMSIG_ATOM_EXITED = PROC_REF(on_loc_exited),
+ )
+ AddElement(/datum/element/connect_loc, loc_connections)
+ // Make sure that if we create a field, we apply whatever effects
+ for(var/atom/movable/thing in get_turf(src))
+ on_entered(src, thing)
+
+/obj/effect/forcefield/cosmic_field/Destroy(force)
+ // Make sure when the field goes away that the effects don't persist
+ for(var/atom/movable/thing in get_turf(src))
+ on_loc_exited(src, thing)
+ GLOB.active_cosmic_fields -= src
+ return ..()
/obj/effect/forcefield/cosmic_field/CanAllowThrough(atom/movable/mover, border_dir)
if(!isliving(mover))
@@ -119,10 +139,68 @@
var/mob/living/living_mover = mover
if(living_mover.can_block_magic(antimagic_flags, charge_cost = 0))
return ..()
+ // Being buckled/pulled by a cosmic heretic will allow you through cosmic fields EVEN IF you have a star mark
+ if(ismob(living_mover.buckled))
+ var/mob/living/fireman = living_mover.buckled
+ if(fireman.has_status_effect(/datum/status_effect/heretic_passive/cosmic))
+ return ..()
+ if(living_mover.pulledby?.has_status_effect(/datum/status_effect/heretic_passive/cosmic))
+ return ..()
if(living_mover.has_status_effect(/datum/status_effect/star_mark))
return FALSE
return ..()
+/obj/effect/forcefield/cosmic_field/proc/on_entered(datum/source, atom/movable/thing)
+ SIGNAL_HANDLER
+ if(isprojectile(thing) && slows_projectiles)
+ var/obj/projectile/bullet = thing
+ if(istype(bullet, /obj/projectile/magic/star_ball)) // Don't slow down star balls
+ return
+ bullet.speed *= 0.2 // 80% Slowdown
+ return
+
+ if(!isliving(thing))
+ return
+ var/mob/living/living_mover = thing
+ var/datum/status_effect/heretic_passive/cosmic/cosmic_passive = living_mover.has_status_effect(/datum/status_effect/heretic_passive/cosmic)
+ if(!cosmic_passive)
+ return
+ living_mover.add_movespeed_modifier(/datum/movespeed_modifier/cosmic_field)
+
+/obj/effect/forcefield/cosmic_field/proc/on_loc_exited(datum/source, atom/movable/thing)
+ SIGNAL_HANDLER
+ if(isprojectile(thing) && slows_projectiles)
+ var/obj/projectile/bullet = thing
+ if(istype(bullet, /obj/projectile/magic/star_ball)) // Don't speed up star balls
+ return
+ bullet.speed /= 0.2 // 80% Slowdown
+ return
+
+ if(!isliving(thing))
+ return
+ var/mob/living/living_mover = thing
+ var/datum/status_effect/heretic_passive/cosmic/cosmic_passive = living_mover.has_status_effect(/datum/status_effect/heretic_passive/cosmic)
+ if(!cosmic_passive)
+ return
+ living_mover.remove_movespeed_modifier(/datum/movespeed_modifier/cosmic_field)
+
+/// Adds the ability to slow down any projectiles that enters any turf we occupy
+/obj/effect/forcefield/cosmic_field/proc/slows_projectiles()
+ slows_projectiles = TRUE
+
+/// Adds our cosmic field to the global list which bombs check to see if they have to stop exploding
+/obj/effect/forcefield/cosmic_field/proc/prevents_explosions()
+ GLOB.active_cosmic_fields += src
+
+/datum/movespeed_modifier/cosmic_field
+ multiplicative_slowdown = -0.25
+
+/obj/effect/forcefield/cosmic_field/star_blast
+ initial_duration = 5 SECONDS
+
+/obj/effect/forcefield/cosmic_field/star_touch
+ initial_duration = 30 SECONDS
+
/obj/effect/forcefield/cosmic_field/fast
initial_duration = 5 SECONDS
diff --git a/code/game/objects/effects/info.dm b/code/game/objects/effects/info.dm
index c9295a090c18..9ffb49a84f79 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/landmarks.dm b/code/game/objects/effects/landmarks.dm
index 347bc96faa89..f7e04e3d04eb 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -555,22 +555,14 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player)
return
/obj/effect/landmark/start/hangover/JoinPlayerHere(mob/joining_mob, buckle)
- . = ..()
- make_hungover(joining_mob)
-
-/obj/effect/landmark/start/hangover/closet
- name = "hangover spawn closet"
- icon_state = "hangover_spawn_closet"
-
-/obj/effect/landmark/start/hangover/closet/JoinPlayerHere(mob/joining_mob, buckle)
+ var/mob/created_joining_mob = ..()
+ make_hungover(created_joining_mob)
for(var/obj/structure/closet/closet in get_turf(src))
if(closet.opened)
continue
- joining_mob.forceMove(closet)
- make_hungover(joining_mob)
- return
-
- return ..() //Call parent as fallback
+ created_joining_mob.forceMove(closet)
+ return created_joining_mob
+ return created_joining_mob
//Landmark that creates destinations for the navigate verb to path to
/obj/effect/landmark/navigate_destination
diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm
index 28ebbd5cf3e6..aaa2b2858b8e 100644
--- a/code/game/objects/effects/mines.dm
+++ b/code/game/objects/effects/mines.dm
@@ -226,7 +226,7 @@
/obj/effect/mine/sound/bwoink
name = "bwoink mine"
- sound = 'sound/effects/adminhelp.ogg'
+ sound = 'modular_darkpack/master_files/sounds/adminhelp.ogg' // DARKPACK EDIT CHANGE
/// These mines spawn pellet_clouds around them when triggered
/obj/effect/mine/shrapnel
diff --git a/code/game/objects/effects/misc.dm b/code/game/objects/effects/misc.dm
index 84b1e5ad1253..cdae1ecbe19d 100644
--- a/code/game/objects/effects/misc.dm
+++ b/code/game/objects/effects/misc.dm
@@ -99,3 +99,8 @@
/obj/effect/abstract/marker/powernet
name = "powernet run marker"
var/powernet_owner
+
+/// Used by RangedReachCheck
+/obj/effect/abstract/reach_checker
+ pass_flags = PASSTABLE
+ invisibility = INVISIBILITY_ABSTRACT
diff --git a/code/game/objects/effects/particles/brimdust.dm b/code/game/objects/effects/particles/brimdust.dm
new file mode 100644
index 000000000000..1b6cb338fbad
--- /dev/null
+++ b/code/game/objects/effects/particles/brimdust.dm
@@ -0,0 +1,17 @@
+/particles/brimdust
+ icon = 'icons/effects/particles/generic.dmi'
+ icon_state = "cross"
+ width = 100
+ height = 100
+ count = 1000
+ color = "#88304e"
+ spawning = 3
+ lifespan = 0.7 SECONDS
+ fade = 1 SECONDS
+ velocity = list(0, 0)
+ position = generator(GEN_CIRCLE, 0, 16, NORMAL_RAND)
+ drift = generator(GEN_VECTOR, list(-0.2, 0), list(0.2, 0))
+ gravity = list(0, -0.5)
+ scale = generator(GEN_VECTOR, list(0.3, 0.3), list(1,1), NORMAL_RAND)
+ rotation = 30
+ spin = generator(GEN_NUM, -20, 20)
diff --git a/code/game/objects/effects/phased_mob.dm b/code/game/objects/effects/phased_mob.dm
index 69fe4cb22506..f2a275117da8 100644
--- a/code/game/objects/effects/phased_mob.dm
+++ b/code/game/objects/effects/phased_mob.dm
@@ -82,8 +82,7 @@
/obj/effect/dummy/phased_mob/ex_act()
return FALSE
-/obj/effect/dummy/phased_mob/bullet_act(obj/projectile/hitting_projectile, def_zone, piercing_hit = FALSE)
- SHOULD_CALL_PARENT(FALSE)
+/obj/effect/dummy/phased_mob/projectile_hit(obj/projectile/hitting_projectile, def_zone, piercing_hit, blocked)
return BULLET_ACT_FORCE_PIERCE
/obj/effect/dummy/phased_mob/relaymove(mob/living/user, direction)
diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm
index 8acf36f6e6fe..a42cab19b022 100644
--- a/code/game/objects/effects/portals.dm
+++ b/code/game/objects/effects/portals.dm
@@ -135,10 +135,10 @@
return ..()
return BULLET_ACT_FORCE_PIERCE
-/obj/effect/portal/bullet_act(obj/projectile/hitting_projectile, def_zone, piercing_hit)
- if (!teleport(hitting_projectile, force = TRUE))
- return ..()
- return BULLET_ACT_FORCE_PIERCE
+/obj/effect/portal/projectile_hit(obj/projectile/hitting_projectile, def_zone, piercing_hit, blocked)
+ if (teleport(hitting_projectile, force = TRUE))
+ return BULLET_ACT_FORCE_PIERCE
+ return ..()
/obj/effect/portal/proc/teleport(atom/movable/moving, force = FALSE)
if(!force && (!istype(moving) || iseffect(moving) || (ismecha(moving) && !mech_sized) || (!isobj(moving) && !ismob(moving)))) //Things that shouldn't teleport.
diff --git a/code/game/objects/effects/poster_motivational.dm b/code/game/objects/effects/poster_motivational.dm
index 42100144f7af..702cdfdde8a3 100644
--- a/code/game/objects/effects/poster_motivational.dm
+++ b/code/game/objects/effects/poster_motivational.dm
@@ -105,8 +105,6 @@
/datum/mood_event/poster_mood
description = "That poster is really motivating me!"
mood_change = 2
- category = POSTER_MOOD_CAT
-
// random posters
@@ -154,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 137e9c64b6fd..94da3e99fcb8 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 070036e009cf..ef5ad4ae8561 100644
--- a/code/game/objects/effects/posters/official.dm
+++ b/code/game/objects/effects/posters/official.dm
@@ -429,3 +429,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 ebfc3a791bb2..1fe4e3656917 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,45 +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.
- 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 32f5bcd4fc8f..a679783c4b2b 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 d4a142405399..3661a510ad06 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 7a6b62618e6f..ea66c109a10a 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,
)
@@ -42,6 +42,7 @@
icon_state = "paper"
loot = list(
/obj/item/paper = 20,
+ /obj/item/paperplane = 2,
/obj/item/paper/crumpled = 2,
/obj/item/paper/crumpled/bloody = 2,
/obj/item/paper/crumpled/muddy = 2,
diff --git a/code/game/objects/effects/spawners/random/engineering.dm b/code/game/objects/effects/spawners/random/engineering.dm
index 8075b5fc8af3..0b628f3ee33f 100644
--- a/code/game/objects/effects/spawners/random/engineering.dm
+++ b/code/game/objects/effects/spawners/random/engineering.dm
@@ -118,8 +118,118 @@
/obj/effect/spawner/random/engineering/vending_restock
name = "vending restock spawner"
icon_state = "vending_restock"
- loot_subtype_path = /obj/item/vending_refill
- loot = list()
+ loot = list(
+ /obj/effect/spawner/random/engineering/vending_restock/common = 935,
+ /obj/effect/spawner/random/engineering/vending_restock/rare = 60,
+ /obj/effect/spawner/random/engineering/vending_restock/oddity = 5,
+ )
+
+/obj/effect/spawner/random/engineering/vending_restock/wardrobe
+ name = "wardrobe vending restock spawner"
+ icon_state = "vending_restock"
+ loot = list(
+ /obj/item/vending_refill/wardrobe/det_wardrobe = 1,
+ /obj/item/vending_refill/wardrobe/medi_wardrobe = 1,
+ /obj/item/vending_refill/wardrobe/chem_wardrobe = 1,
+ /obj/item/vending_refill/wardrobe/viro_wardrobe = 1,
+ /obj/item/vending_refill/wardrobe/sec_wardrobe = 1,
+ /obj/item/vending_refill/wardrobe/science_wardrobe = 1,
+ /obj/item/vending_refill/wardrobe/robo_wardrobe = 1,
+ /obj/item/vending_refill/wardrobe/gene_wardrobe = 1,
+ /obj/item/vending_refill/wardrobe/engi_wardrobe = 1,
+ /obj/item/vending_refill/wardrobe/atmos_wardrobe = 1,
+ /obj/item/vending_refill/wardrobe/cargo_wardrobe = 1,
+ /obj/item/vending_refill/wardrobe/hydro_wardrobe = 1,
+ /obj/item/vending_refill/wardrobe/chap_wardrobe = 1,
+ /obj/item/vending_refill/wardrobe/chef_wardrobe = 1,
+ /obj/item/vending_refill/wardrobe/chap_wardrobe = 1,
+ /obj/item/vending_refill/wardrobe/curator_wardrobe= 1,
+ /obj/item/vending_refill/wardrobe/jani_wardrobe = 1,
+ /obj/item/vending_refill/wardrobe/law_wardrobe = 1,
+
+ )
+
+
+/obj/effect/spawner/random/engineering/vending_restock/food_and_drink
+ name = "food & drink vending restock spawner"
+ icon_state = "vending_restock"
+ loot = list(
+ /obj/item/vending_refill/cigarette = 1,
+ /obj/item/vending_refill/cola = 1,
+ /obj/item/vending_refill/coffee = 1,
+ /obj/item/vending_refill/snack = 1,
+ /obj/item/vending_refill/boozeomat = 1,
+ /obj/item/vending_refill/sustenance = 1,
+ /obj/item/vending_refill/sovietsoda = 1,
+ /obj/item/vending_refill/cola/shamblers = 1,
+ )
+
+/obj/effect/spawner/random/engineering/vending_restock/medical
+ name = "medical vending restock spawner"
+ icon_state = "vending_restock"
+ loot = list(
+ /obj/item/vending_refill/wallmed = 1,
+ /obj/item/vending_refill/medical = 1,
+ /obj/item/vending_refill/drugs = 1,
+ )
+
+/obj/effect/spawner/random/engineering/vending_restock/engineering
+ name = "engineering vending restock spawner"
+ icon_state = "vending_restock"
+ loot = list(
+ /obj/item/vending_refill/engivend = 1,
+ /obj/item/vending_refill/engineering = 1,
+ /obj/item/vending_refill/youtool = 1,
+ /obj/item/vending_refill/modularpc = 1,
+ /obj/item/vending_refill/robotics = 1,
+ /obj/item/vending_refill/assist = 1,
+ )
+
+//common everyday vendors
+/obj/effect/spawner/random/engineering/vending_restock/common
+ name = "common vending restock spawner"
+ icon_state = "vending_restock"
+ loot = list(
+ /obj/effect/spawner/random/engineering/vending_restock/wardrobe = 8, //roughtly reduced to half weight due to lameness of drobe contents
+ /obj/effect/spawner/random/engineering/vending_restock/food_and_drink = 8,
+ /obj/effect/spawner/random/engineering/vending_restock/engineering = 6,
+ /obj/effect/spawner/random/engineering/vending_restock/medical = 3,
+ /obj/item/vending_refill/cart = 1,
+ /obj/item/vending_refill/clothing = 1,
+ /obj/item/vending_refill/autodrobe = 1,
+ /obj/item/vending_refill/security = 1,
+ /obj/item/vending_refill/custom = 1,
+ /obj/item/vending_refill/dinnerware = 1,
+ /obj/item/vending_refill/cytopro = 1,
+ /obj/item/vending_refill/hydronutrients = 1,
+ /obj/item/vending_refill/hydroseeds = 1,
+ /obj/item/vending_refill/games = 1,
+ )
+
+//vendors that should feel rare and special but are unlikely to warp the shift too much
+/obj/effect/spawner/random/engineering/vending_restock/rare
+ name = "rare vending restock spawner"
+ icon_state = "vending_restock"
+ loot = list(
+ /obj/item/vending_refill/syndichem = 1,
+ /obj/item/vending_refill/cigarette/syndicate = 1,
+ /obj/item/vending_refill/plasmaresearch = 1,
+ /obj/item/vending_refill/donksnackvendor = 1,
+ /obj/item/vending_refill/donksoft = 1,
+ /obj/item/vending_refill/hotdog = 1,
+ )
+
+//high chance to derail the shift, use cautiously
+/obj/effect/spawner/random/engineering/vending_restock/oddity
+ name = "oddity vending restock spawner"
+ icon_state = "vending_restock"
+ loot = list(
+
+ /obj/item/vending_refill/magivend = 1,
+ /obj/item/vending_refill/liberation = 1,
+ /obj/item/vending_refill/wardrobe/cent_wardrobe = 1,
+
+ )
/obj/effect/spawner/random/engineering/atmospherics_portable
name = "portable atmospherics machine spawner"
diff --git a/code/game/objects/effects/spawners/random/entertainment.dm b/code/game/objects/effects/spawners/random/entertainment.dm
index 1af5f2ee53be..ea4343512857 100644
--- a/code/game/objects/effects/spawners/random/entertainment.dm
+++ b/code/game/objects/effects/spawners/random/entertainment.dm
@@ -285,10 +285,13 @@
/obj/item/toy/plush/shark = 3,
/obj/item/toy/plush/unicorn = 3,
/obj/item/toy/plush/monkey = 3,
+ /obj/item/toy/plush/donkpocket = 3,
// super rare plushies
/obj/item/toy/plush/bubbleplush = 2,
/obj/item/toy/plush/ratplush = 2,
/obj/item/toy/plush/narplush = 2,
+ /obj/item/toy/plush/whiny_plushie = 2,
+ /obj/item/toy/plush/rouny = 2,
)
/obj/effect/spawner/random/entertainment/colorful_grenades
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 9ec343953f54..c4e89a169dd4 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 4c6cf0353245..4fa771c7d778 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 a83b88c3a986..3e2b64212272 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 efb4d5c10dbf..d5a510a071d6 100644
--- a/code/game/objects/effects/spawners/random/trash.dm
+++ b/code/game/objects/effects/spawners/random/trash.dm
@@ -9,7 +9,7 @@
loot = list(
/obj/effect/spawner/random/trash/food_packaging = 26,
/obj/effect/decal/cleanable/garbage = 20,
- /obj/item/trash/can = 8,
+ /obj/effect/spawner/random/trash/crushed_can = 8,
/obj/item/shard = 8,
/obj/effect/spawner/random/trash/botanical_waste = 8,
/obj/effect/spawner/random/trash/cigbutt = 8,
@@ -37,11 +37,11 @@
/obj/item/broken_bottle = 3,
/obj/item/reagent_containers/cup/soda_cans/grey_bull = 1,
/obj/effect/spawner/random/engineering/tool = 1,
- /mob/living/basic/mouse = 1,
+ /obj/effect/spawner/random/trash/rat = 1, // DARKPACK EDIT CHANGE
/mob/living/basic/snail = 1,
/obj/item/food/grown/cannabis = 1,
/obj/item/rag = 1,
- /obj/effect/spawner/random/entertainment/drugs= 1,
+ /obj/effect/spawner/random/entertainment/drugs = 1,
/obj/item/modular_computer/pda = 1,
/obj/item/reagent_containers/syringe = 1,
/obj/effect/spawner/random/entertainment/cigar = 1,
@@ -51,10 +51,33 @@
if(mapload)
var/turf/location = get_turf(loc)
if(location.initial_gas_mix != OPENTURF_DEFAULT_ATMOS && location.initial_gas_mix != OPENTURF_DIRTY_ATMOS)
- loot -= /mob/living/basic/mouse
+ loot -= /obj/effect/spawner/random/trash/rat
loot -= /mob/living/basic/snail
return ..()
+/obj/effect/spawner/random/trash/cigpack
+ name = "empty cigarette pack spawner"
+ loot = list(
+ /obj/item/storage/fancy/cigarettes/empty = 5,
+ /obj/item/storage/fancy/cigarettes/cigpack_uplift/empty = 5,
+ /obj/item/storage/fancy/cigarettes/cigpack_robust/empty = 5,
+ /obj/item/storage/fancy/cigarettes/cigpack_robustgold/empty = 5,
+ /obj/item/storage/fancy/cigarettes/cigpack_carp/empty = 5,
+ /obj/item/storage/fancy/cigarettes/cigpack_midori/empty = 5,
+ /obj/item/storage/fancy/rollingpapers/empty = 3,
+ /obj/item/storage/fancy/cigarettes/cigars/empty = 3,
+ /obj/item/storage/fancy/cigarettes/cigars/cohiba/empty = 3,
+ /obj/item/storage/fancy/cigarettes/cigars/havana/empty = 3,
+ /obj/item/storage/fancy/cigarettes/cigpack_greytide/empty = 3,
+ /obj/item/storage/fancy/cigarettes/dromedaryco/empty = 2,
+ /obj/item/storage/fancy/cigarettes/cigpack_shadyjims/empty = 2,
+ /obj/item/storage/fancy/cigarettes/cigpack_xeno/empty = 2,
+ /obj/item/storage/fancy/cigarettes/cigpack_candy/empty = 2,
+ /obj/item/storage/fancy/cigarettes/cigpack_cannabis/empty = 1,
+ /obj/item/storage/fancy/cigarettes/cigpack_mindbreaker/empty = 1,
+ /obj/item/storage/fancy/cigarettes/cigpack_syndicate/empty = 1,
+ )
+
/obj/effect/spawner/random/trash/cigbutt
name = "cigarette butt spawner"
loot = list(
@@ -72,25 +95,52 @@
/obj/item/trash/raisins = 2,
/obj/item/trash/cheesie = 2,
/obj/item/trash/candy = 2,
- /obj/item/trash/chips = 2,
+ /obj/item/trash/chips = 10, // DARKPACK EDIT CHANGE
/obj/item/trash/sosjerky = 2,
/obj/item/trash/pistachios = 2,
/obj/item/trash/peanuts = 2,
+ /obj/item/reagent_containers/cup/glass/sillycup = 2,
/obj/item/trash/boritos = 1,
/obj/item/trash/boritos/green = 1,
/obj/item/trash/boritos/purple = 1,
/obj/item/trash/boritos/red = 1,
/obj/item/trash/can/food/beans = 1,
/obj/item/trash/can/food/peaches = 1,
+ /obj/item/trash/can/food/peaches/maint = 1,
+ /obj/item/trash/can/food/tomatoes = 1,
/obj/item/trash/can/food/envirochow = 1,
+ /obj/item/trash/can/food/squid_ink = 1,
+ /obj/item/trash/can/food/chap = 1,
+ /obj/item/trash/can/food/jellyfish = 1,
+ /obj/item/trash/can/food/desert_snails = 1,
+ /obj/item/trash/can/food/larvae = 1,
+ /obj/item/trash/can/food/pine_nuts = 1,
/obj/item/trash/popcorn = 1,
+ /obj/item/trash/popcorn/salty = 1,
/obj/item/trash/energybar = 1,
- /obj/item/trash/can/food/peaches/maint = 1,
/obj/item/trash/semki = 1,
+ /obj/item/trash/semki/healthy = 1,
/obj/item/trash/cnds = 1,
/obj/item/trash/syndi_cakes = 1,
/obj/item/trash/shrimp_chips = 1,
+ /obj/item/trash/hot_shots = 1,
+ /obj/item/trash/sticko = 1,
+ /obj/item/trash/sticko/matcha = 1,
+ /obj/item/trash/sticko/nutty = 1,
+ /obj/item/trash/sticko/pineapple = 1,
+ /obj/item/trash/sticko/yuyake = 1,
+ /obj/item/trash/shok_roks = 1,
+ /obj/item/trash/shok_roks/citrus = 1,
+ /obj/item/trash/shok_roks/berry = 1,
+ /obj/item/trash/shok_roks/tropical = 1,
+ /obj/item/trash/shok_roks/lanternfruit = 1,
+ /obj/item/trash/fleet_ration = 1,
+ /obj/item/trash/spacers_sidekick = 1,
+ /obj/item/popsicle_stick = 1,
+ /obj/item/trash/ready_donk = 1,
/obj/item/trash/tray = 1,
+ /obj/item/trash/vampirebar = 5, // DARKPACK EDIT ADD START
+ /obj/item/trash/vampirenugget = 1, // DARKPACK EDIT ADD END
)
/obj/effect/spawner/random/trash/botanical_waste
@@ -136,6 +186,9 @@
name = "gross decal spawner"
icon_state = "vomit"
loot = list(
+ /obj/effect/decal/cleanable/trash = 20, // DARKPACK EDIT ADD START
+ /obj/effect/decal/cleanable/litter = 6,
+ /obj/effect/decal/cleanable/cardboard = 6, // DARKPACK EDIT ADD END
/obj/effect/decal/cleanable/dirt = 6,
/obj/effect/decal/cleanable/garbage = 3,
/obj/effect/decal/cleanable/vomit/old = 3,
@@ -154,19 +207,20 @@
spawn_scatter_radius = 2
loot = list( // This spawner will scatter garbage around a dirty site.
/obj/effect/spawner/random/trash/garbage = 6,
- // DARKPACK EDIT CHANGE START
- /mob/living/basic/cockroach = 4,
+// DARKPACK EDIT CHANGE START
/obj/effect/decal/cleanable/garbage = 4,
/obj/effect/decal/cleanable/vomit/old = 3,
/obj/effect/spawner/random/trash/cigbutt = 2,
+ /mob/living/basic/cockroach = 1,
)
/obj/effect/spawner/random/trash/grime/Initialize(mapload)
if(mapload)
var/turf/location = get_turf(loc)
if(location.initial_gas_mix != OPENTURF_DEFAULT_ATMOS && location.initial_gas_mix != OPENTURF_DIRTY_ATMOS)
- loot -= list(/mob/living/basic/cockroach, /mob/living/basic/cockroach/bloodroach)
+ loot -= /mob/living/basic/cockroach
return ..()
+// DARKPACK EDIT CHANGE END
/obj/effect/spawner/random/trash/moisture
name = "water hazard spawner"
@@ -285,7 +339,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 6dd8729cf977..271cdaaf69ea 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 247a372fcb65..55239756339c 100644
--- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm
+++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
@@ -245,8 +245,10 @@
setDir(mimiced_atom.dir)
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
-/obj/effect/temp_visual/decoy/fading/Initialize(mapload, atom/mimiced_atom)
+/obj/effect/temp_visual/decoy/fading/Initialize(mapload, atom/mimiced_atom, start_alpha)
. = ..()
+ if (start_alpha)
+ alpha = start_alpha
animate(src, alpha = 0, time = duration)
/obj/effect/temp_visual/decoy/fading/threesecond
@@ -802,3 +804,24 @@
color = COLOR_FULL_TONER_BLACK
duration = 12 SECONDS
amount_to_scale = 12
+
+/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 e7246fd04ef6..640e08da102f 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 16afa2cd7634..269211ab1f79 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -184,7 +184,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
@@ -225,11 +225,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
@@ -240,14 +235,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
@@ -283,8 +270,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
@@ -299,19 +284,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)
@@ -610,7 +582,7 @@
if(throwing)
throwing.finalize(FALSE)
if(loc == user && outside_storage)
- if(!allow_attack_hand_drop(user) || !user.temporarilyRemoveItemFromInventory(src))
+ if(!can_mob_unequip(user) || !user.temporarilyRemoveItemFromInventory(src))
return
. = FALSE
@@ -620,7 +592,9 @@
user.dropItemToGround(src)
return TRUE
-/obj/item/proc/allow_attack_hand_drop(mob/user)
+/// Called when a mob is manually attempting to unequip the item
+/// Returning FALSE will prevent the unequip from happening
+/obj/item/proc/can_mob_unequip(mob/user)
return TRUE
/obj/item/attack_paw(mob/user, list/modifiers)
@@ -737,10 +711,10 @@
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)
- if(!silent)
+ SEND_SIGNAL(user, COMSIG_MOB_DROPPED_ITEM, src)
+ if(!silent && drop_sound)
play_drop_sound(DROP_SOUND_VOLUME)
/// called just as an item is picked up (loc is not yet changed)
@@ -748,7 +722,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)
@@ -806,7 +779,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()))
@@ -973,7 +945,7 @@
/obj/item/proc/update_slot_icon()
SIGNAL_HANDLER
- if(!ismob(loc))
+ if(!ismob(loc) || QDELETED(loc))
return
var/mob/owner = loc
owner.update_clothing(slot_flags | owner.get_slot_by_item(src))
@@ -1006,6 +978,13 @@
location = get_turf(pyromanic)
if(isturf(location))
location.hotspot_expose(flame_heat, 5)
+ // DARKPACK EDIT ADD START - TURF_FIRE
+ if(SEND_SIGNAL(location, COMSIG_TURF_OPEN_FLAME, flame_heat) & BLOCK_TURF_IGNITION)
+ return
+ var/turf/open/open_location = loc // NOT the location variable used earlier else cigarettes in mouths start fires
+ if(isopenturf(open_location) && open_location.flammability >= 1 && prob(open_location.flammability))
+ open_location.ignite_turf(2) // if there's enough flammability for a fire to sustain itself..
+ // DARKPACK EDIT ADD END
/// If an object can successfully be used as a fire starter it will return a message
/obj/item/proc/ignition_effect(atom/A, mob/user)
@@ -1053,6 +1032,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)
@@ -1086,18 +1071,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)
@@ -1131,9 +1124,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))
@@ -1213,9 +1208,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)
@@ -1318,28 +1317,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)
@@ -1779,7 +1776,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)
@@ -2094,3 +2091,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 f8824861dba0..ce9d9be36860 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/binoculars.dm b/code/game/objects/items/binoculars.dm
index 5557d457d4a7..f84c41475438 100644
--- a/code/game/objects/items/binoculars.dm
+++ b/code/game/objects/items/binoculars.dm
@@ -9,6 +9,7 @@
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
slot_flags = ITEM_SLOT_NECK | ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_SMALL
+ custom_price = 300 // DARKPACK EDIT ADD - ECONOMY
/obj/item/binoculars/Initialize(mapload)
. = ..()
diff --git a/code/game/objects/items/broom.dm b/code/game/objects/items/broom.dm
index 970bb5a55261..1456913b6125 100644
--- a/code/game/objects/items/broom.dm
+++ b/code/game/objects/items/broom.dm
@@ -18,6 +18,7 @@
attack_verb_continuous = list("sweeps", "brushes off", "bludgeons", "whacks")
attack_verb_simple = list("sweep", "brush off", "bludgeon", "whack")
resistance_flags = FLAMMABLE
+ custom_price = 20 // DARKPACK EDIT ADD - ECONOMY
/obj/item/pushbroom/Initialize(mapload)
. = ..()
diff --git a/code/game/objects/items/busts_and_figurines.dm b/code/game/objects/items/busts_and_figurines.dm
index 592302cab677..660fffa2d833 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 36efc61481d6..89f9a14d99cb 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 edca8559a20a..ebe92fe1e71e 100644
--- a/code/game/objects/items/cards_ids.dm
+++ b/code/game/objects/items/cards_ids.dm
@@ -29,6 +29,7 @@
pickup_sound = 'sound/items/handling/id_card/id_card_pickup1.ogg'
drop_sound = 'sound/items/handling/id_card/id_card_drop1.ogg'
sound_vary = TRUE
+ slot_flags = ITEM_SLOT_ID // DARKPACK EDIT ADD
/// Cached icon that has been built for this card. Intended to be displayed in chat. Cardboards IDs and actual IDs use it.
var/icon/cached_flat_icon
@@ -141,7 +142,7 @@
/obj/item/card/id/Initialize(mapload)
. = ..()
- /* DARKPACK EDIT REMOVAL - ECONOMY
+ /* // DARKPACK EDIT REMOVAL - ECONOMY
var/datum/bank_account/blank_bank_account = new("Unassigned", SSjob.get_job_type(/datum/job/unassigned), player_account = FALSE)
registered_account = blank_bank_account
registered_account.replaceable = TRUE
@@ -549,11 +550,11 @@
else if(istype(held_item, /obj/item/rupee))
context[SCREENTIP_CONTEXT_LMB] = "Insert?"
- /* DARKPACK EDIT REMOVAL - ECONOMY
+ /* // DARKPACK EDIT REMOVAL - ECONOMY
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"
@@ -680,7 +681,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
@@ -707,13 +708,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
@@ -740,7 +741,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
@@ -776,12 +777,15 @@
account.account_balance += old_account.account_balance
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)
if(!alt_click_can_use_id(user))
return NONE
+ if (registered_account.being_dumped)
+ registered_account.bank_card_talk(span_warning("内部服务器错误"), TRUE)
+ return CLICK_ACTION_SUCCESS
if(registered_account.account_debt)
var/choice = tgui_alert(user, "Choose An Action", "Bank Account", list("Withdraw", "Pay Debt"))
if(!choice || QDELETED(user) || QDELETED(src) || !alt_click_can_use_id(user) || loc != user)
@@ -789,9 +793,6 @@
if(choice == "Pay Debt")
pay_debt(user)
return CLICK_ACTION_SUCCESS
- if (registered_account.being_dumped)
- registered_account.bank_card_talk(span_warning("内部服务器错误"), TRUE)
- return CLICK_ACTION_SUCCESS
if(loc != user)
to_chat(user, span_warning("You must be holding the ID to continue!"))
return CLICK_ACTION_BLOCKING
@@ -802,22 +803,22 @@
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/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."))
- SSblackbox.record_feedback("amount", "credits_removed", amount_to_remove)
- log_econ("[amount_to_remove] credits were removed from [src] owned by [src.registered_name]")
- return CLICK_ACTION_SUCCESS
- else
+ 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] [MONEY_NAME] into a holochip."))
+ SSblackbox.record_feedback("amount", "credits_removed", amount_to_remove)
+ log_econ("[amount_to_remove] [MONEY_NAME] were removed from [src] owned by [registered_name]")
+ return CLICK_ACTION_SUCCESS
+
/obj/item/card/id/click_alt_secondary(mob/user)
if(!alt_click_can_use_id(user))
@@ -826,15 +827,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)
@@ -842,19 +843,19 @@
if(!user.can_read(src))
return
- /* DARKPACK EDIT REMOVAL - ECONOMY
+ /* // DARKPACK EDIT REMOVAL - ECONOMY
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.")
*/
if(HAS_TRAIT(user, TRAIT_ID_APPRAISER))
. += HAS_TRAIT(src, TRAIT_JOB_FIRST_ID_CARD) ? span_boldnotice("Hmm... yes, this ID was issued from Central Command!") : span_boldnotice("This ID was created in this sector, not by Central Command.")
- if(HAS_TRAIT(src, TRAIT_TASTEFULLY_THICK_ID_CARD) && (user.is_holding(src) || (user.CanReach(src) && user.put_in_hands(src, ignore_animation = FALSE))))
+ if(HAS_TRAIT(src, TRAIT_TASTEFULLY_THICK_ID_CARD) && (user.is_holding(src) || (IsReachableBy(user) && user.put_in_hands(src, ignore_animation = FALSE))))
ADD_TRAIT(src, TRAIT_NODROP, "psycho")
. += span_hypnophrase("Look at that subtle coloring... The tasteful thickness of it. Oh my God, it even has a watermark...")
var/sound/slowbeat = sound('sound/effects/health/slowbeat.ogg', repeat = TRUE)
@@ -885,19 +886,19 @@
if(registered_age)
. += "The card indicates that the holder is [registered_age] years old. [(registered_age < AGE_MINOR) ? "There's a holographic stripe that reads [span_danger("'MINOR: DO NOT SERVE ALCOHOL OR TOBACCO'")] along the bottom of the card." : ""]"
- /* DARKPACK EDIT REMOVAL - ECONOMY
+ /* // DARKPACK EDIT REMOVAL - ECONOMY
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)
@@ -1940,8 +1941,11 @@
var/target_occupation = tgui_input_text(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels.", "Agent card job assignment", assignment ? assignment : "Assistant", max_length = MAX_NAME_LEN)
if(!after_input_check(user))
return TRUE
-
- var/new_age = tgui_input_number(user, "Choose the ID's age", "Agent card age", AGE_MIN, AGE_MAX, AGE_MIN)
+ var/default_age = AGE_MIN
+ if(ishuman(user))
+ var/mob/living/carbon/human/human_user = user
+ default_age = human_user.age ? clamp(human_user.age, AGE_MIN, AGE_MAX) : AGE_MIN
+ var/new_age = tgui_input_number(user, "Choose the ID's age", "Agent card age", default_age, AGE_MAX, AGE_MIN)
if(!after_input_check(user))
return TRUE
@@ -2063,6 +2067,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.
@@ -2139,7 +2144,7 @@
/obj/item/card/cardboard/proc/after_input_check(mob/living/user, obj/item/item, input, value)
if(!input || (value && input == value))
return FALSE
- if(QDELETED(user) || QDELETED(item) || QDELETED(src) || user.incapacitated || !user.is_holding(item) || !user.CanReach(src) || !user.can_write(item))
+ if(QDELETED(user) || QDELETED(item) || QDELETED(src) || user.incapacitated || !user.is_holding(item) || !IsReachableBy(user) || !user.can_write(item))
return FALSE
return TRUE
diff --git a/code/game/objects/items/chainsaw.dm b/code/game/objects/items/chainsaw.dm
index d316725fbfea..ed5a62cc562a 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 098cd7a05351..e0c1bf290965 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)
. = ..()
@@ -198,7 +203,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
@@ -423,16 +427,29 @@ CIGARETTE PACKETS ARE IN FANCY.DM
damtype = BURN
force = 4
- if(reagents && reagents.has_reagent(/datum/reagent/drug/methamphetamine))
+ if(reagents?.has_reagent(/datum/reagent/flash_powder))
+ if(!isliving(loc))
+ loc.visible_message(span_hear("\The [src] burns up!"))
+ qdel(src)
+ return
+ var/mob/living/user = loc
+ loc.visible_message(span_hear("[user]'s [name] burns up as [p_they(user)] fall to the ground!"), span_danger("The solution violently explodes!"))
+ user.flash_act(INFINITY, visual = TRUE, length = 5 SECONDS)
+ user.playsound_local(get_turf(user), SFX_EXPLOSION, 50, TRUE)
+ user.cause_hallucination(/datum/hallucination/death, "trick trick [name]")
+ qdel(src)
+ return
+
+ if(reagents?.has_reagent(/datum/reagent/drug/methamphetamine))
reagents.flags |= NO_REACT
- if(reagents.get_reagent_amount(/datum/reagent/toxin/plasma)) // the plasma explodes when exposed to fire
+ if(reagents?.get_reagent_amount(/datum/reagent/toxin/plasma)) // the plasma explodes when exposed to fire
var/datum/effect_system/reagents_explosion/e = new()
e.set_up(round(reagents.get_reagent_amount(/datum/reagent/toxin/plasma) / 2.5, 1), get_turf(src), 0, 0)
e.start(src)
qdel(src)
return
- if(reagents.get_reagent_amount(/datum/reagent/fuel)) // the fuel explodes, too, but much less violently
+ if(reagents?.get_reagent_amount(/datum/reagent/fuel)) // the fuel explodes, too, but much less violently
var/datum/effect_system/reagents_explosion/e = new()
e.set_up(round(reagents.get_reagent_amount(/datum/reagent/fuel) / 5, 1), get_turf(src), 0, 0)
e.start(src)
@@ -552,7 +569,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)
@@ -711,6 +728,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM
lung_harm = 2
list_reagents = list (/datum/reagent/drug/nicotine = 20, /datum/reagent/medicine/regen_jelly = 15, /datum/reagent/drug/krokodil = 4)
+/obj/item/cigarette/flash_powder
+ desc = /obj/item/cigarette/space_cigarette::desc
+ list_reagents = list (/datum/reagent/drug/nicotine = 9, /datum/reagent/flash_powder = 5)
+
// Rollies.
/obj/item/cigarette/rollie
@@ -892,7 +913,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"
@@ -916,6 +939,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
@@ -993,7 +1017,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 97b2a1441b9f..df4d12233213 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 aa1680b63d6e..b1a7e0bb445c 100644
--- a/code/game/objects/items/circuitboards/computer_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm
@@ -247,20 +247,6 @@
name = "Station Alerts"
greyscale_colors = CIRCUIT_COLOR_ENGINEERING
build_path = /obj/machinery/computer/station_alert
- var/station_only = FALSE
-
-/obj/item/circuitboard/computer/station_alert/station_only
- station_only = TRUE
-
-/obj/item/circuitboard/computer/station_alert/examine(mob/user)
- . = ..()
- . += span_info("The board is configured to [station_only ? "track all station and mining alarms" : "track alarms on the same z-level"].")
- . += span_notice("The board mode can be changed with a [EXAMINE_HINT("multitool")].")
-
-/obj/item/circuitboard/computer/station_alert/multitool_act(mob/living/user)
- station_only = !station_only
- balloon_alert(user, "tracking set to [station_only ? "station" : "z-level"]")
- return TRUE
/obj/item/circuitboard/computer/turbine_computer
name = "Turbine Computer"
@@ -443,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)
. = ..()
@@ -459,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
@@ -467,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 ededd868fb7e..3306f4d5b740 100644
--- a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm
@@ -659,7 +659,7 @@
if(!valid_vendor_names_paths)
valid_vendor_names_paths = list()
for(var/obj/machinery/vending/vendor_type as anything in subtypesof(/obj/machinery/vending))
- if(vendor_type::allow_custom)
+ if(vendor_type::allow_custom && vendor_type::refill_canister)
valid_vendor_names_paths[vendor_type::name] = vendor_type
/obj/item/circuitboard/machine/vendor/screwdriver_act(mob/living/user, obj/item/tool)
@@ -688,27 +688,6 @@
set_type(machine.type)
return ..()
-/obj/item/circuitboard/machine/vending/donksofttoyvendor
- name = "Donksoft Toy Vendor"
- build_path = /obj/machinery/vending/donksofttoyvendor
- req_components = list(
- /obj/item/stack/sheet/glass = 1,
- /obj/item/vending_refill/donksoft = 1)
-
-/obj/item/circuitboard/machine/vending/syndicatedonksofttoyvendor
- name = "Syndicate Donksoft Toy Vendor"
- build_path = /obj/machinery/vending/toyliberationstation
- req_components = list(
- /obj/item/stack/sheet/glass = 1,
- /obj/item/vending_refill/donksoft = 1)
-
-/obj/item/circuitboard/machine/vending/donksnackvendor
- name = "Donk Co Snack Vendor"
- build_path = /obj/machinery/vending/donksnack
- req_components = list(
- /obj/item/stack/sheet/glass = 1,
- /obj/item/vending_refill/donksnackvendor = 1)
-
/obj/item/circuitboard/machine/bountypad
name = "Civilian Bounty Pad"
greyscale_colors = CIRCUIT_COLOR_GENERIC
@@ -1402,13 +1381,6 @@
greyscale_colors = CIRCUIT_COLOR_SERVICE
build_path = /obj/machinery/rnd/production/techfab/department/service
-/obj/item/circuitboard/machine/vendatray
- name = "Vend-A-Tray"
- greyscale_colors = CIRCUIT_COLOR_SERVICE
- build_path = /obj/structure/displaycase/forsale
- req_components = list(
- /datum/stock_part/card_reader = 1)
-
/obj/item/circuitboard/machine/fishing_portal_generator
name = "Fishing Portal Generator"
greyscale_colors = CIRCUIT_COLOR_SERVICE
@@ -1914,3 +1886,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 d41afbc303e6..0115af303849 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 e3b994bd834c..06604a872fdf 100644
--- a/code/game/objects/items/control_wand.dm
+++ b/code/game/objects/items/control_wand.dm
@@ -1,6 +1,8 @@
#define WAND_OPEN "open"
#define WAND_BOLT "bolt"
#define WAND_EMERGENCY "emergency"
+#define WAND_SHOCK "shock"
+#define WAND_DEPOWER "depower"
/obj/item/door_remote
icon_state = "remote"
@@ -12,6 +14,8 @@
name = "control wand"
desc = "A remote for controlling a set of airlocks."
w_class = WEIGHT_CLASS_TINY
+ drop_sound = 'sound/items/door_remote/door_remote_drop1.ogg'
+ pickup_sound = 'sound/items/door_remote/door_remote_pick_up1.ogg'
var/department = "civilian"
var/mode = WAND_OPEN
@@ -26,11 +30,15 @@
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
+ var/mode_switch_sound = SFX_REMOTE_MODE_SWITCH
+ /// sound played when an action is done
+ var/action_sound = SFX_REMOTE_ACTION
/obj/item/door_remote/Initialize(mapload)
. = ..()
@@ -50,17 +58,35 @@
return TRUE
return FALSE
+/obj/item/door_remote/emag_act(mob/user, obj/item/card/emag/emag_card)
+ . = ..()
+ if(obj_flags & EMAGGED)
+ return FALSE
+ balloon_alert(user, "restricted functions unlocked")
+ obj_flags |= EMAGGED
+ update_icon_state()
+ return TRUE
+
/obj/item/door_remote/attack_self(mob/user)
- var/static/list/ops = list(WAND_OPEN = "Open Door", WAND_BOLT = "Toggle Bolts", WAND_EMERGENCY = "Toggle Emergency Access")
+ var/static/list/ops = list(WAND_OPEN = "Open Door", WAND_BOLT = "Toggle Bolts", WAND_EMERGENCY = "Toggle Emergency Access", WAND_SHOCK = "Shock Door", WAND_DEPOWER = "Depower Door")
switch(mode)
if(WAND_OPEN)
mode = WAND_BOLT
if(WAND_BOLT)
mode = WAND_EMERGENCY
if(WAND_EMERGENCY)
+ if(!(obj_flags & EMAGGED))
+ mode = WAND_OPEN
+ else
+ mode = WAND_SHOCK
+ if(WAND_SHOCK)
+ mode = WAND_DEPOWER
+ if(WAND_DEPOWER)
mode = WAND_OPEN
update_icon_state()
balloon_alert(user, "mode: [ops[mode]]")
+ if(mode_switch_sound)
+ playsound(src, mode_switch_sound, 50, TRUE)
/obj/item/door_remote/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
if(!istype(interacting_with, /obj/machinery/door) && !isturf(interacting_with))
@@ -100,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
@@ -120,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"
@@ -140,6 +165,8 @@
/obj/item/door_remote/ranged_interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
var/obj/machinery/door/door
+ if(action_sound)
+ playsound(src, action_sound, 50, TRUE)
if (istype(interacting_with, /obj/machinery/door))
door = interacting_with
@@ -176,6 +203,7 @@
door.open()
else
door.close()
+
if (WAND_BOLT)
if (!istype(airlock))
interacting_with.balloon_alert(user, "only airlocks!")
@@ -187,6 +215,7 @@
else
airlock.bolt()
log_combat(user, airlock, "bolted", src)
+
if (WAND_EMERGENCY)
if (!istype(airlock))
interacting_with.balloon_alert(user, "only airlocks!")
@@ -195,17 +224,43 @@
airlock.emergency = !airlock.emergency
airlock.update_appearance(UPDATE_ICON)
+ if (WAND_SHOCK)
+ if (!istype(airlock))
+ interacting_with.balloon_alert(user, "only airlocks!")
+ return ITEM_INTERACT_BLOCKING
+ if (!COOLDOWN_FINISHED(src, shock_cooldown))
+ interacting_with.balloon_alert(user, "shock pulse resetting!")
+ return ITEM_INTERACT_BLOCKING
+ if (airlock.isElectrified())
+ interacting_with.balloon_alert(user, "already electrified!")
+ else
+ airlock.set_electrified(MACHINE_DEFAULT_ELECTRIFY_TIME, user)
+ COOLDOWN_START(src, shock_cooldown, 10 SECONDS)
+
+ if (WAND_DEPOWER)
+ if (!istype(airlock))
+ interacting_with.balloon_alert(user, "only airlocks!")
+ return ITEM_INTERACT_BLOCKING
+ // First hit disrupts main power, backup comes back in ten seconds, if you stick around you can hit backup for 60 more seconds of downtime.
+ if (!airlock.main_power_timer)
+ airlock.loseMainPower()
+ else if (!airlock.backup_power_time)
+ airlock.loseBackupPower()
+
return ITEM_INTERACT_SUCCESS
/obj/item/door_remote/update_icon_state()
var/icon_state_mode
- switch(mode)
- if(WAND_OPEN)
- icon_state_mode = "open"
- if(WAND_BOLT)
- icon_state_mode = "bolt"
- if(WAND_EMERGENCY)
- icon_state_mode = "emergency"
+ if(!(obj_flags & EMAGGED))
+ switch(mode)
+ if(WAND_OPEN)
+ icon_state_mode = "open"
+ if(WAND_BOLT)
+ icon_state_mode = "bolt"
+ if(WAND_EMERGENCY)
+ icon_state_mode = "emergency"
+ else
+ icon_state_mode = "emergency"
icon_state = "[base_icon_state]_[department]_[icon_state_mode]"
return ..()
@@ -213,3 +268,5 @@
#undef WAND_OPEN
#undef WAND_BOLT
#undef WAND_EMERGENCY
+#undef WAND_SHOCK
+#undef WAND_DEPOWER
diff --git a/code/game/objects/items/cosmetics.dm b/code/game/objects/items/cosmetics.dm
index a96f38cf99fb..d20d3fc60bad 100644
--- a/code/game/objects/items/cosmetics.dm
+++ b/code/game/objects/items/cosmetics.dm
@@ -194,6 +194,10 @@
inhand_icon_state = "razor"
obj_flags = CONDUCTS_ELECTRICITY
w_class = WEIGHT_CLASS_TINY
+ sound_vary = TRUE
+ pickup_sound = SFX_GENERIC_DEVICE_PICKUP
+ drop_sound = SFX_GENERIC_DEVICE_DROP
+ custom_price = 50 // DARKPACK EDIT ADD - ECONOMY
/obj/item/razor/suicide_act(mob/living/carbon/user)
user.visible_message(span_suicide("[user] begins shaving [user.p_them()]self without the razor guard! It looks like [user.p_theyre()] trying to commit suicide!"))
@@ -229,8 +233,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!"))
@@ -247,8 +252,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!"))
@@ -285,7 +291,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))
@@ -301,7 +307,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/crab17.dm b/code/game/objects/items/crab17.dm
index 2664cff95d4a..b2254fa2e657 100644
--- a/code/game/objects/items/crab17.dm
+++ b/code/game/objects/items/crab17.dm
@@ -22,7 +22,7 @@
var/turf/targetturf = get_safe_random_station_turf_equal_weight()
if (!targetturf)
return FALSE
- var/list/accounts_to_rob = flatten_list(SSeconomy.bank_accounts_by_id)
+ var/list/accounts_to_rob = assoc_to_values(SSeconomy.bank_accounts_by_id)
var/mob/living/L
if(isliving(user))
L = user
@@ -201,7 +201,7 @@
* Grabs the accounts to be robbed and puts them in accounts_to_rob, tells the accounts they're being drained and calls dump() to start draining.
*/
/obj/structure/checkoutmachine/proc/start_dumping()
- accounts_to_rob = flatten_list(SSeconomy.bank_accounts_by_id)
+ accounts_to_rob = assoc_to_values(SSeconomy.bank_accounts_by_id)
accounts_to_rob -= bogdanoff?.get_bank_account()
for(var/i in accounts_to_rob)
var/datum/bank_account/B = i
diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm
index 30731e086b53..f055aa108bd7 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,7 +214,10 @@
drawtype = pick(all_drawables)
AddElement(/datum/element/venue_price, FOOD_PRICE_EXOTIC)
- 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()
@@ -809,6 +811,10 @@
)
register_context()
register_item_context()
+ // If default crayon red colour, pick a more fun spraycan colour
+ if(!paint_color)
+ set_painting_tool_color(pick(COLOR_CRAYON_RED, COLOR_CRAYON_ORANGE, COLOR_CRAYON_YELLOW, COLOR_CRAYON_GREEN, COLOR_CRAYON_BLUE, COLOR_CRAYON_PURPLE))
+ refill()
/obj/item/toy/crayon/spraycan/add_context(atom/source, list/context, obj/item/held_item, mob/living/user)
. = ..()
@@ -859,13 +865,6 @@
reagents.trans_to(user, used, volume_multiplier, transferred_by = user, methods = VAPOR)
return OXYLOSS
-/obj/item/toy/crayon/spraycan/Initialize(mapload)
- . = ..()
- // If default crayon red colour, pick a more fun spraycan colour
- if(!paint_color)
- set_painting_tool_color(pick(COLOR_CRAYON_RED, COLOR_CRAYON_ORANGE, COLOR_CRAYON_YELLOW, COLOR_CRAYON_GREEN, COLOR_CRAYON_BLUE, COLOR_CRAYON_PURPLE))
- refill()
-
/obj/item/toy/crayon/spraycan/examine(mob/user)
. = ..()
if(charges != INFINITE_CHARGES)
diff --git a/code/game/objects/items/credit_holochip.dm b/code/game/objects/items/credit_holochip.dm
index 59c5339c3140..8da91ef371af 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 354e628895d0..a382733560d7 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 205a47e9cb62..ea2c0a38692d 100644
--- a/code/game/objects/items/defib.dm
+++ b/code/game/objects/items/defib.dm
@@ -56,6 +56,7 @@
paddles = new paddle_type(src)
update_power()
RegisterSignal(paddles, COMSIG_DEFIBRILLATOR_SUCCESS, PROC_REF(on_defib_success))
+ AddElement(/datum/element/drag_pickup)
/obj/item/defibrillator/loaded/Initialize(mapload) //starts with hicap
. = ..()
@@ -120,30 +121,15 @@
//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
return ..()
-/obj/item/defibrillator/mouse_drop_dragged(atom/over_object, mob/user, src_location, over_location, params)
- if(!ismob(loc))
- return
- var/mob/living_mob = loc
- if(!living_mob.incapacitated && istype(over_object, /atom/movable/screen/inventory/hand))
- var/atom/movable/screen/inventory/hand/hand = over_object
- living_mob.putItemFromInventoryInHandIfPossible(src, hand.held_index)
-
/obj/item/defibrillator/screwdriver_act(mob/living/user, obj/item/tool)
if(!cell || !cell_removable)
return FALSE
@@ -273,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"
@@ -287,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."
@@ -348,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
@@ -515,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)
@@ -615,25 +608,31 @@
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."
+ // DARKPACK EDIT START
+ if (DEFIB_FAIL_STAKED)
+ fail_reason = "Patient's heart has external embedded items, repair and try again."
+ // DARKPACK EDIT END
+ 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."))
@@ -676,6 +675,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/dehy_carp.dm b/code/game/objects/items/dehy_carp.dm
index 6c25f9db9fab..71c9211d28e4 100644
--- a/code/game/objects/items/dehy_carp.dm
+++ b/code/game/objects/items/dehy_carp.dm
@@ -5,6 +5,7 @@
//Child of carpplushie because this should do everything the toy does and more
/obj/item/toy/plush/carpplushie/dehy_carp
+ offspring_type = /obj/item/toy/plush/carpplushie
var/mob/owner = null //Carp doesn't attack owner, set when using in hand
var/mobtype = /mob/living/basic/carp //So admins can change what mob spawns via var fuckery
var/swelling = FALSE
@@ -19,9 +20,6 @@
owner = user
RegisterSignal(owner, COMSIG_QDELETING, PROC_REF(owner_deleted))
-/obj/item/toy/plush/carpplushie/dehy_carp/plop(obj/item/toy/plush/Daddy)
- return FALSE
-
/obj/item/toy/plush/carpplushie/dehy_carp/proc/Swell()
if(swelling)
return
diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm
index 759790ab1558..1f9a78e3f3fb 100644
--- a/code/game/objects/items/devices/aicard.dm
+++ b/code/game/objects/items/devices/aicard.dm
@@ -11,6 +11,9 @@
w_class = WEIGHT_CLASS_SMALL
slot_flags = ITEM_SLOT_BELT
item_flags = NOBLUDGEON
+ sound_vary = TRUE
+ pickup_sound = SFX_GENERIC_DEVICE_PICKUP
+ drop_sound = SFX_GENERIC_DEVICE_DROP
var/flush = FALSE
var/mob/living/silicon/ai/AI
@@ -32,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!"))
@@ -156,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 b63ecf25870c..0c9f0c6f9c48 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/beacon.dm b/code/game/objects/items/devices/beacon.dm
index a7c34a92c0df..4e4bdcbf885d 100644
--- a/code/game/objects/items/devices/beacon.dm
+++ b/code/game/objects/items/devices/beacon.dm
@@ -6,6 +6,7 @@
inhand_icon_state = "beacon"
lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi'
+ obj_flags = UNIQUE_RENAME
var/enabled = TRUE
var/renamed = FALSE
@@ -46,15 +47,3 @@
/obj/item/beacon/attack_hand_secondary(mob/user, list/modifiers)
attack_self(user)
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
-
-/obj/item/beacon/attackby(obj/item/W, mob/user)
- if(IS_WRITING_UTENSIL(W)) // needed for things that use custom names like the locator
- var/new_name = tgui_input_text(user, "What would you like the name to be?", "Beacon", max_length = MAX_NAME_LEN)
- if(!user.can_perform_action(src))
- return
- if(new_name)
- name = new_name
- renamed = TRUE
- return
- else
- return ..()
diff --git a/code/game/objects/items/devices/blood_scanner.dm b/code/game/objects/items/devices/blood_scanner.dm
index 5add88050f51..4a32545b0a45 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/desynchronizer.dm b/code/game/objects/items/devices/desynchronizer.dm
index cd7c745a168c..31006c8dc1d9 100644
--- a/code/game/objects/items/devices/desynchronizer.dm
+++ b/code/game/objects/items/devices/desynchronizer.dm
@@ -41,7 +41,7 @@
/obj/item/desynchronizer/click_alt(mob/living/user)
var/new_duration = tgui_input_number(user, "Set the duration", "Desynchronizer", duration / 10, max_duration, 5)
- if(!new_duration || QDELETED(user) || QDELETED(src) || !usr.can_perform_action(src, NEED_DEXTERITY))
+ if(!new_duration || QDELETED(user) || QDELETED(src) || !user.can_perform_action(src, NEED_DEXTERITY))
return CLICK_ACTION_BLOCKING
duration = new_duration
to_chat(user, span_notice("You set the duration to [DisplayTimeText(duration)]."))
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 6dc9c157b96d..43daebf8a3e9 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -8,7 +8,7 @@
desc = "A hand-held emergency light."
custom_price = PAYCHECK_CREW
icon = 'modular_darkpack/master_files/icons/obj/lighting.dmi' // DARKPACK EDIT CHANGE
- ONFLOOR_ICON_HELPER('modular_darkpack/modules/deprecated/icons/onfloor.dmi') // DARKPACK EDIT ADD
+ ONFLOOR_ICON_HELPER('modular_darkpack/master_files/icons/obj/lighting_onfoor.dmi') // DARKPACK EDIT ADD
dir = WEST
icon_state = "flashlight"
inhand_icon_state = "flashlight"
@@ -18,7 +18,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
@@ -26,6 +29,10 @@
light_range = 4
light_power = 1
light_on = FALSE
+ sound_vary = TRUE
+ pickup_sound = SFX_GENERIC_DEVICE_PICKUP
+ drop_sound = SFX_GENERIC_DEVICE_DROP
+
/// If we've been forcibly disabled for a temporary amount of time.
COOLDOWN_DECLARE(disabled_time)
/// Can we toggle this light on and off (used for contexual screentips only)
@@ -38,9 +45,14 @@
var/start_on = FALSE
/// When true, painting the flashlight won't change its light color
var/ignore_base_color = FALSE
+ /// This simply means if the flashlight can be cuffed to your hand (why?)
+ var/has_closed_handle = TRUE
+ custom_price = 10 // DARKPACK EDIT ADD - ECONOMY
/obj/item/flashlight/Initialize(mapload)
. = ..()
+ if(has_closed_handle)
+ AddElement(/datum/element/cuffable_item)
if(start_on)
set_light_on(TRUE)
update_brightness()
@@ -225,7 +237,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)
@@ -244,9 +256,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
@@ -330,6 +344,7 @@
light_range = 2
light_power = 0.8
light_color = "#CCFFFF"
+ has_closed_handle = FALSE
COOLDOWN_DECLARE(holosign_cooldown)
/obj/item/flashlight/pen/ranged_interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
@@ -387,6 +402,7 @@
light_power = 0.8
light_color = "#99ccff"
hitsound = 'sound/items/weapons/genhit1.ogg'
+ has_closed_handle = FALSE
// the desk lamps are a bit special
/obj/item/flashlight/lamp
@@ -404,6 +420,7 @@
obj_flags = CONDUCTS_ELECTRICITY
custom_materials = null
start_on = TRUE
+ has_closed_handle = FALSE
// green-shaded desk lamp
/obj/item/flashlight/lamp/green
@@ -433,9 +450,9 @@
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
/// How many seconds of fuel we have left
var/fuel = 0
/// Do we randomize the fuel when initialized
@@ -446,7 +463,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)
. = ..()
@@ -460,6 +481,9 @@
damtype = BURN
update_brightness()
+/obj/item/flashlight/flare/grind_results()
+ return list(/datum/reagent/sulfur = 15)
+
/obj/item/flashlight/flare/init_slapcrafting()
return
@@ -552,6 +576,7 @@
name = "red candle"
desc = "In Greek myth, Prometheus stole fire from the Gods and gave it to \
humankind. The jewelry he kept for himself."
+ ONFLOOR_ICON_HELPER(null) // DARKPACK EDIT ADD
icon = 'icons/obj/candle.dmi'
icon_state = "candle1"
inhand_icon_state = "candle"
@@ -703,6 +728,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
@@ -714,6 +740,7 @@
fuel = INFINITY
randomize_fuel = FALSE
start_on = TRUE
+ custom_materials = null
/obj/item/flashlight/flare/torch/red
color = "#ff0000"
@@ -772,6 +799,7 @@
light_range = 6 //luminosity when on
light_color = "#ffff66"
light_system = OVERLAY_LIGHT
+ has_closed_handle = FALSE
/obj/item/flashlight/emp
var/emp_max_charges = 4
@@ -842,10 +870,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"
@@ -874,6 +903,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)
@@ -913,7 +947,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?
@@ -1025,6 +1058,7 @@
plane = FLOOR_PLANE
anchored = TRUE
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+ has_closed_handle = FALSE
///Boolean that switches when a full color flip ends, so the light can appear in all colors.
var/even_cycle = FALSE
///Base light_range that can be set on Initialize to use in smooth light range expansions and contractions.
diff --git a/code/game/objects/items/devices/geiger_counter.dm b/code/game/objects/items/devices/geiger_counter.dm
index 25bae4306091..2f65c72436fe 100644
--- a/code/game/objects/items/devices/geiger_counter.dm
+++ b/code/game/objects/items/devices/geiger_counter.dm
@@ -112,9 +112,9 @@
/obj/item/geiger_counter/click_alt(mob/living/user)
if(!scanning)
- to_chat(usr, span_warning("[src] must be on to reset its radiation level!"))
+ to_chat(user, span_warning("[src] must be on to reset its radiation level!"))
return CLICK_ACTION_BLOCKING
- to_chat(usr, span_notice("You flush [src]'s radiation counts, resetting it to normal."))
+ to_chat(user, span_notice("You flush [src]'s radiation counts, resetting it to normal."))
last_perceived_radiation_danger = null
update_appearance(UPDATE_ICON)
return CLICK_ACTION_SUCCESS
diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm
index 16bf5b9f2434..35ab6e546792 100644
--- a/code/game/objects/items/devices/gps.dm
+++ b/code/game/objects/items/devices/gps.dm
@@ -11,7 +11,13 @@
w_class = WEIGHT_CLASS_SMALL
slot_flags = ITEM_SLOT_BELT
obj_flags = UNIQUE_RENAME
+ sound_vary = TRUE
+ pickup_sound = SFX_GENERIC_DEVICE_PICKUP
+ drop_sound = SFX_GENERIC_DEVICE_DROP
var/gpstag
+ var/tracking_on = TRUE
+ var/debug_mode = FALSE
+ var/overlay_icon = "working"
/obj/item/gps/Initialize(mapload)
. = ..()
@@ -19,7 +25,7 @@
/// Adds the GPS component to this item.
/obj/item/gps/proc/add_gps_component()
- AddComponent(/datum/component/gps/item, gpstag)
+ AddComponent(/datum/component/gps/item, gpstag, tracking_on, overlay_state = overlay_icon, debug = debug_mode)
/obj/item/gps/spaceruin
gpstag = SPACE_SIGNAL_GPSTAG
@@ -60,33 +66,8 @@
name = "visible GPS"
gpstag = "ADMIN"
desc = "This admin-spawn GPS unit leaves the coordinates visible \
- on any turf that it passes over, for debugging. Especially useful \
+ on any turf that it passes over while being dragged on the floor. Especially useful \
for marking the area around the transition edges."
- var/list/turf/tagged
-
-/obj/item/gps/visible_debug/Initialize(mapload)
- . = ..()
- tagged = list()
- START_PROCESSING(SSfastprocess, src)
-
-/obj/item/gps/visible_debug/process()
- var/turf/T = get_turf(src)
- if(T)
- // I assume it's faster to color,tag and OR the turf in, rather
- // then checking if its there
- T.color = RANDOM_COLOUR
- T.maptext = MAPTEXT("[T.x],[T.y],[T.z]")
- tagged |= T
-
-/obj/item/gps/visible_debug/proc/clear()
- while(tagged.len)
- var/turf/T = pop(tagged)
- T.color = initial(T.color)
- T.maptext = initial(T.maptext)
-
-/obj/item/gps/visible_debug/Destroy()
- if(tagged)
- clear()
- tagged = null
- STOP_PROCESSING(SSfastprocess, src)
- . = ..()
+ tracking_on = FALSE
+ debug_mode = TRUE
+ overlay_icon = FALSE
diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm
index ab35b3c08fec..c15b6083dc61 100644
--- a/code/game/objects/items/devices/lightreplacer.dm
+++ b/code/game/objects/items/devices/lightreplacer.dm
@@ -323,15 +323,63 @@
icon_state = "lightreplacer_high"
max_uses = 50
+#define BLIGHTREPLACER_SPOT_COOLDOWN (BLIGHTREPLACER_SPOT_LIFE + 1 SECONDS)
+#define BLIGHTREPLACER_SPOT_RANGE 7
+#define BLIGHTREPLACER_SPOT_LIFE (5 SECONDS)
+
/obj/item/lightreplacer/blue
name = "bluespace light replacer"
desc = "A modified light replacer that zaps lights into place. Refill with broken or working lightbulbs, or sheets of glass."
icon_state = "lightreplacer_blue"
bluespace_toggle = TRUE
+ actions_types = list(/datum/action/item_action/lightreplacer_scan)
+ action_slots = ALL
+ COOLDOWN_DECLARE(lightreplacer_spot_cooldown)
/obj/item/lightreplacer/blue/emag_act()
return FALSE // balancing against longrange explosions
+/obj/item/lightreplacer/blue/ui_action_click(mob/user, actiontype)
+ if(!COOLDOWN_FINISHED(src, lightreplacer_spot_cooldown))
+ balloon_alert(user, "on cooldown!")
+ return
+ COOLDOWN_START(src, lightreplacer_spot_cooldown, BLIGHTREPLACER_SPOT_COOLDOWN)
+ lightreplacer_scan()
+
+/// Scans the area in search of fixtures with broken bulbs in the BLIGHTREPLACER_SPOT_RANGE range, and also marks them with the blue_firefly effect.
+/obj/item/lightreplacer/blue/proc/lightreplacer_scan()
+ var/turf/source_turf = get_turf(src)
+ for(var/obj/machinery/light/broken_light in dview(BLIGHTREPLACER_SPOT_RANGE, source_turf))
+ if(broken_light.status == LIGHT_OK)
+ continue
+ var/obj/effect/temp_visual/blue_firefly/firefly = new(get_turf(broken_light))
+ animate(firefly, alpha = 0, time = BLIGHTREPLACER_SPOT_LIFE, easing = CIRCULAR_EASING | EASE_IN)
+
+/datum/action/item_action/lightreplacer_scan
+ name = "Scan for broken lamps"
+ desc = "Scans the surrounding area for fixtures with broken light bulbs and marks them."
+
+/obj/effect/temp_visual/blue_firefly
+ name = "bluespace firefly"
+ icon = 'icons/effects/effects.dmi'
+ icon_state = "bluespace_firefly"
+ light_power = 1
+ light_range = 2
+ light_color = LIGHT_COLOR_DARK_BLUE
+ duration = BLIGHTREPLACER_SPOT_LIFE
+
+/obj/effect/temp_visual/blue_firefly/Initialize(mapload)
+ . = ..()
+ update_appearance(UPDATE_OVERLAYS)
+
+/obj/effect/temp_visual/blue_firefly/update_overlays()
+ . = ..()
+ . += emissive_appearance(icon, icon_state, src, alpha = src.alpha)
+
+#undef BLIGHTREPLACER_SPOT_COOLDOWN
+#undef BLIGHTREPLACER_SPOT_RANGE
+#undef BLIGHTREPLACER_SPOT_LIFE
+
#undef GLASS_SHEET_USES
#undef LIGHTBULB_COST
#undef BULB_SHARDS_REQUIRED
diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm
index e72444914232..626c42d65a44 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 d75682d72a4c..d1bff2e74328 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 c815cc41ef1e..abe5d99b55d8 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,
@@ -45,9 +45,10 @@
/obj/item/quantum_keycard/click_alt(mob/living/user)
to_chat(user, span_notice("You start pressing [src]'s unlink button..."))
- if(do_after(user, 4 SECONDS, target = src))
- to_chat(user, span_notice("The keycard beeps twice and disconnects the quantum link."))
- set_pad()
+ if(!do_after(user, 4 SECONDS, target = src))
+ return CLICK_ACTION_BLOCKING
+ to_chat(user, span_notice("The keycard beeps twice and disconnects the quantum link."))
+ set_pad()
return CLICK_ACTION_SUCCESS
/obj/item/quantum_keycard/proc/set_pad(obj/machinery/quantumpad/new_pad)
diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm
index 3867ace4fc1f..c7507b31bd07 100644
--- a/code/game/objects/items/devices/radio/electropack.dm
+++ b/code/game/objects/items/devices/radio/electropack.dm
@@ -9,6 +9,9 @@
obj_flags = CONDUCTS_ELECTRICITY
slot_flags = ITEM_SLOT_BACK
w_class = WEIGHT_CLASS_HUGE
+ sound_vary = TRUE
+ pickup_sound = SFX_GENERIC_DEVICE_PICKUP
+ drop_sound = SFX_GENERIC_DEVICE_DROP
custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT *5, /datum/material/glass=SHEET_MATERIAL_AMOUNT * 1.25)
var/on = TRUE
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 9e81f9b9d2b0..111551e653ad 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -13,6 +13,14 @@ GLOBAL_LIST_INIT(channel_tokens, list(
MODE_BINARY = MODE_TOKEN_BINARY,
RADIO_CHANNEL_AI_PRIVATE = RADIO_TOKEN_AI_PRIVATE,
RADIO_CHANNEL_ENTERTAINMENT = RADIO_TOKEN_ENTERTAINMENT,
+ // DARKPACK EDIT ADD START
+ RADIO_CHANNEL_POLICE = RADIO_TOKEN_POLICE,
+ RADIO_CHANNEL_CLINIC = RADIO_TOKEN_CLINIC,
+ RADIO_CHANNEL_MILITARY = RADIO_TOKEN_MILITARY,
+ RADIO_CHANNEL_CAMARILLA = RADIO_TOKEN_CAMARILLA,
+ RADIO_CHANNEL_ANARCH = RADIO_TOKEN_ANARCH,
+ RDAIO_CHANNEL_ENDRON = RADIO_TOKEN_ENDRON,
+ // DARKPACK EDIT ADD END
))
/obj/item/radio/headset
@@ -49,6 +57,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
/obj/item/radio/headset/examine(mob/user)
. = ..()
+ /* // DARKPACK EDIT REMOVAL START
if(!(item_flags & IN_INVENTORY) || loc != user)
. += span_notice("A small screen on the headset flashes, it's too small to read without holding or wearing the headset.")
return
@@ -71,6 +80,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
. += span_notice("A small screen on the headset displays the following available frequencies:")
. += span_notice("
[available_channels.Join()]
")
+ */ // DARKPACK EDIT REMOVAL END
if(command)
. += span_info("Alt-click to toggle the high-volume mode.")
@@ -268,12 +278,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 +299,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 +325,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 +465,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 5aa33a87672f..c354b29c518c 100644
--- a/code/game/objects/items/devices/radio/intercom.dm
+++ b/code/game/objects/items/devices/radio/intercom.dm
@@ -28,24 +28,23 @@
icon_state = "intercom_prison"
icon_off = "intercom_prison-p"
-/obj/item/radio/intercom/prison/Initialize(mapload, ndir, building)
+/obj/item/radio/intercom/prison/Initialize(mapload)
. = ..()
wires?.cut(WIRE_TX)
-/obj/item/radio/intercom/Initialize(mapload, ndir, building)
+/obj/item/radio/intercom/Initialize(mapload)
. = ..()
var/area/current_area = get_area(src)
if(!current_area)
return
RegisterSignal(current_area, COMSIG_AREA_POWER_CHANGE, PROC_REF(AreaPowerCheck))
+ if(mapload)
+ find_and_mount_on_atom()
GLOB.intercoms_list += src
- if(!unscrewed)
- find_and_hang_on_wall(directional = TRUE, \
- custom_drop_callback = CALLBACK(src, PROC_REF(knock_down)))
/obj/item/radio/intercom/Destroy()
- . = ..()
GLOB.intercoms_list -= src
+ return ..()
/obj/item/radio/intercom/examine(mob/user)
. = ..()
@@ -87,7 +86,7 @@
if(tool.use_tool(src, user, 80))
user.visible_message(span_notice("[user] unsecures [src]!"), span_notice("You detach [src] from the wall."))
playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE)
- knock_down()
+ deconstruct(TRUE)
/**
* Override attack_tk_grab instead of attack_tk because we actually want attack_tk's
@@ -126,7 +125,7 @@
return TRUE
-/obj/item/radio/intercom/Hear(atom/movable/speaker, message_langs, raw_message, radio_freq, radio_freq_name, radio_freq_color, list/spans, list/message_mods = list(), message_range)
+/obj/item/radio/intercom/Hear(atom/movable/speaker, message_langs, raw_message, radio_freq, radio_freq_name, radio_freq_color, list/spans, list/message_mods = list(), message_range, source) // DARKPACK EDIT, ORIGINAL: /obj/item/radio/intercom/Hear(atom/movable/speaker, message_langs, raw_message, radio_freq, radio_freq_name, radio_freq_color, list/spans, list/message_mods = list(), message_range)
if(message_mods[RADIO_EXTENSION] == MODE_INTERCOM)
return // Avoid hearing the same thing twice
return ..()
@@ -187,9 +186,8 @@
/**
* Called by the wall mount component and reused during the tool deconstruction proc.
*/
-/obj/item/radio/intercom/proc/knock_down()
+/obj/item/radio/intercom/atom_deconstruct(disassembled)
new/obj/item/wallframe/intercom(get_turf(src))
- qdel(src)
//Created through the autolathe or through deconstructing intercoms. Can be applied to wall to make a new intercom on it!
/obj/item/wallframe/intercom
@@ -199,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)
@@ -209,7 +207,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/item/radio/intercom, 27)
anonymize = TRUE
freqlock = RADIO_FREQENCY_EMAGGABLE_LOCK
-/obj/item/radio/intercom/chapel/Initialize(mapload, ndir, building)
+/obj/item/radio/intercom/chapel/Initialize(mapload)
. = ..()
set_frequency(1481)
set_broadcasting(TRUE)
@@ -233,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/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index d2d479693f9e..df539b62bb5f 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -2,7 +2,7 @@
/obj/item/radio
icon = 'icons/obj/devices/voice.dmi'
- name = "station bounced radio"
+ name = "city bounced radio" // DARKPACK EDIT, ORIGINAL: name = "station bounced radio"
icon_state = "walkietalkie"
inhand_icon_state = "walkietalkie"
lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'
@@ -11,6 +11,9 @@
desc = "A basic handheld radio that communicates with local telecommunication networks."
dog_fashion = /datum/dog_fashion/back
interaction_flags_atom = parent_type::interaction_flags_atom | INTERACT_ATOM_ALLOW_USER_LOCATION | INTERACT_ATOM_IGNORE_MOBILITY
+ sound_vary = TRUE
+ pickup_sound = SFX_GENERIC_DEVICE_PICKUP
+ drop_sound = SFX_GENERIC_DEVICE_DROP
obj_flags = CONDUCTS_ELECTRICITY
slot_flags = ITEM_SLOT_BELT
@@ -336,6 +339,11 @@
if(is_within_radio_jammer_range(src) && !(special_channels & RADIO_SPECIAL_SYNDIE))
return
+ // DARKPACK EDIT START
+ if(get_area(src) == typesof(/area/vtm/interior/sewer)) // If we're in the sewers, consider the radio JAMMED. https://www.youtube.com/watch?v=FcArnepkhv0
+ return
+ // DARKPACK EDIT END
+
// Determine the identity information which will be attached to the signal.
var/atom/movable/virtualspeaker/speaker = new(null, talking_movable, src)
@@ -343,7 +351,7 @@
var/datum/signal/subspace/vocal/signal = new(src, freq, speaker, language, radio_message, spans, message_mods)
// Independent radios, on the CentCom frequency, reach all independent radios
- if ((special_channels & RADIO_SPECIAL_CENTCOM) && (freq == FREQ_CENTCOM || freq == FREQ_STATUS_DISPLAYS))
+ if ((special_channels & RADIO_SPECIAL_CENTCOM) && (freq == FREQ_CENTCOM || freq == FREQ_STATUS_DISPLAYS || freq == FREQ_MILITARY)) // DARKPACK EDIT, ORIGINAL: if ((special_channels & RADIO_SPECIAL_CENTCOM) && (freq == FREQ_CENTCOM || freq == FREQ_STATUS_DISPLAYS))
signal.data["compression"] = 0
signal.transmission_method = TRANSMISSION_SUPERSPACE
signal.levels = list(0)
@@ -381,7 +389,7 @@
signal.levels = SSmapping.get_connected_levels(T)
signal.broadcast()
-/obj/item/radio/Hear(atom/movable/speaker, message_language, raw_message, radio_freq, radio_freq_name, radio_freq_color, list/spans, list/message_mods = list(), message_range)
+/obj/item/radio/Hear(atom/movable/speaker, message_language, raw_message, radio_freq, radio_freq_name, radio_freq_color, list/spans, list/message_mods = list(), message_range, source) // DARKPACK EDIT, ORIGINAL: /obj/item/radio/Hear(atom/movable/speaker, message_language, raw_message, radio_freq, radio_freq_name, radio_freq_color, list/spans, list/message_mods = list(), message_range)
. = ..()
if(radio_freq || !broadcasting || get_dist(src, speaker) > canhear_range || message_mods[MODE_RELAY])
return
diff --git a/code/game/objects/items/devices/reverse_bear_trap.dm b/code/game/objects/items/devices/reverse_bear_trap.dm
index 8e3c1cfbbf13..c95d7f9333dd 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 af0ff55abd19..40835bc79202 100644
--- a/code/game/objects/items/devices/scanners/autopsy_scanner.dm
+++ b/code/game/objects/items/devices/scanners/autopsy_scanner.dm
@@ -13,6 +13,9 @@
w_class = WEIGHT_CLASS_NORMAL
custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*2)
custom_price = PAYCHECK_COMMAND
+ sound_vary = TRUE
+ pickup_sound = SFX_GENERIC_DEVICE_PICKUP
+ drop_sound = SFX_GENERIC_DEVICE_DROP
/obj/item/autopsy_scanner/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
if(!isliving(interacting_with))
@@ -64,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:\
\
@@ -184,31 +187,32 @@
// 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, 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 2e9352d2c2ff..b7a7ce648068 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,\
) */ // DARKPACK EDIT REMOVE
+/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 90d4d9bcc8f6..c70ce933df49 100644
--- a/code/game/objects/items/devices/scanners/health_analyzer.dm
+++ b/code/game/objects/items/devices/scanners/health_analyzer.dm
@@ -21,13 +21,16 @@
throw_range = 7
custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT *2)
interaction_flags_click = NEED_LITERACY|NEED_LIGHT|ALLOW_RESTING
+ custom_price = PAYCHECK_COMMAND
+ sound_vary = TRUE
+ pickup_sound = SFX_GENERIC_DEVICE_PICKUP
+ drop_sound = SFX_GENERIC_DEVICE_DROP
/// Verbose/condensed
var/mode = SCANNER_VERBOSE
/// HEALTH/WOUND
var/scanmode = SCANMODE_HEALTH
/// Advanced health analyzer
var/advanced = FALSE
- custom_price = PAYCHECK_COMMAND
/// If this analyzer will give a bonus to wound treatments apon woundscan.
var/give_wound_treatment_bonus = FALSE
var/last_scan_text
@@ -153,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)
@@ -175,22 +178,22 @@
// 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, 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. "
-
+
// Check for brain - both organic (carbon) and synthetic (cyborg MMI)
var/has_brain = FALSE
if(target.get_organ_slot(ORGAN_SLOT_BRAIN))
@@ -199,7 +202,7 @@
var/mob/living/silicon/robot/cyborg_target = target
if(cyborg_target.mmi?.brain)
has_brain = TRUE
-
+
if(!has_brain) // kept exclusively for soul purposes
render_list += "Subject lacks a brain. "
@@ -368,15 +371,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"
@@ -388,7 +392,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()]"
@@ -398,7 +402,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)
@@ -691,7 +695,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))
@@ -759,7 +763,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 fcce33141dfd..4adfec936299 100644
--- a/code/game/objects/items/devices/scanners/plant_analyzer.dm
+++ b/code/game/objects/items/devices/scanners/plant_analyzer.dm
@@ -13,6 +13,9 @@
w_class = WEIGHT_CLASS_TINY
slot_flags = ITEM_SLOT_BELT
custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.3, /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.2)
+ sound_vary = TRUE
+ pickup_sound = SFX_GENERIC_DEVICE_PICKUP
+ drop_sound = SFX_GENERIC_DEVICE_DROP
/// Cached data from ui_interact
var/list/last_scan_data
/// Weakref to the last thing we scanned
@@ -262,16 +265,16 @@
if(graft)
last_scan_data["graft_data"] = list(
- "name" = graft.parent_name,
+ "name" = graft.plant_dna.name,
"icon" = graft.icon,
"icon_state" = graft.icon_state,
- "yield" = graft.yield,
- "production" = graft.production,
- "lifespan" = graft.lifespan,
- "endurance" = graft.endurance,
- "weed_rate" = graft.weed_rate,
- "weed_chance" = graft.weed_chance,
- "graft_gene" = graft.stored_trait.type,
+ "yield" = graft.plant_dna.yield,
+ "production" = graft.plant_dna.production,
+ "lifespan" = graft.plant_dna.lifespan,
+ "endurance" = graft.plant_dna.endurance,
+ "weed_rate" = graft.plant_dna.weed_rate,
+ "weed_chance" = graft.plant_dna.weed_chance,
+ "graft_gene" = graft.plant_dna.graft_gene.type
)
if(user)
@@ -323,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/scanners/sequence_scanner.dm b/code/game/objects/items/devices/scanners/sequence_scanner.dm
index d22372fa1089..938c5637b74e 100644
--- a/code/game/objects/items/devices/scanners/sequence_scanner.dm
+++ b/code/game/objects/items/devices/scanners/sequence_scanner.dm
@@ -15,6 +15,9 @@
throw_speed = 3
throw_range = 7
custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*2)
+ sound_vary = TRUE
+ pickup_sound = SFX_GENERIC_DEVICE_PICKUP
+ drop_sound = SFX_GENERIC_DEVICE_DROP
var/list/discovered = list() //hit a dna console to update the scanners database
var/list/buffer
diff --git a/code/game/objects/items/devices/scanners/t_scanner.dm b/code/game/objects/items/devices/scanners/t_scanner.dm
index 0e8e2c441829..30083139abd2 100644
--- a/code/game/objects/items/devices/scanners/t_scanner.dm
+++ b/code/game/objects/items/devices/scanners/t_scanner.dm
@@ -11,6 +11,9 @@
lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi'
custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT * 1.5)
+ sound_vary = TRUE
+ pickup_sound = SFX_GENERIC_DEVICE_PICKUP
+ drop_sound = SFX_GENERIC_DEVICE_DROP
/// Is this T-Ray scanner currently on?
var/on = FALSE
diff --git a/code/game/objects/items/devices/sensor_device.dm b/code/game/objects/items/devices/sensor_device.dm
index e68c8095fe01..9eb9ee94255c 100644
--- a/code/game/objects/items/devices/sensor_device.dm
+++ b/code/game/objects/items/devices/sensor_device.dm
@@ -11,6 +11,13 @@
slot_flags = ITEM_SLOT_BELT
custom_price = PAYCHECK_CREW * 5
custom_premium_price = PAYCHECK_CREW * 6
+ sound_vary = TRUE
+ pickup_sound = SFX_GENERIC_DEVICE_PICKUP
+ drop_sound = SFX_GENERIC_DEVICE_DROP
/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/table_clock.dm b/code/game/objects/items/devices/table_clock.dm
index 0d8195363668..3184ed43857f 100644
--- a/code/game/objects/items/devices/table_clock.dm
+++ b/code/game/objects/items/devices/table_clock.dm
@@ -32,7 +32,7 @@
. += span_info("It appears to be currently broken. You can use it in-hand to repair it.")
else
. += span_info("The current CST (local) time is: [station_time_timestamp()].")
- . += span_info("The current TCT (galactic) time is: [time2text(world.realtime, "hh:mm:ss", NO_TIMEZONE)].")
+ //. += span_info("The current TCT (galactic) time is: [time2text(world.realtime, "hh:mm:ss", NO_TIMEZONE)].") DARKPACK EDIT REMOVAL
/obj/item/table_clock/attackby(obj/item/attacking_item, mob/user, list/modifiers, list/attack_modifiers)
. = ..()
diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm
index 149015ce2925..fd2a5e5607bc 100644
--- a/code/game/objects/items/devices/taperecorder.dm
+++ b/code/game/objects/items/devices/taperecorder.dm
@@ -29,6 +29,7 @@
var/time_left_warning = 60 SECONDS
///Sound loop that plays when recording or playing back.
var/datum/looping_sound/tape_recorder_hiss/soundloop
+ custom_price = 50 // DARKPACK EDIT ADD - ECONOMY
/obj/item/taperecorder/Initialize(mapload)
. = ..()
@@ -109,8 +110,8 @@
update_appearance()
/obj/item/taperecorder/fire_act(exposed_temperature, exposed_volume)
- mytape.unspool() //Fires unspool the tape, which makes sense if you don't think about it
- ..()
+ mytape?.unspool() //Fires unspool the tape, which makes sense if you don't think about it
+ return ..()
//ATTACK HAND IGNORING PARENT RETURN VALUE
/obj/item/taperecorder/attack_hand(mob/user, list/modifiers)
@@ -153,7 +154,7 @@
return ..()
-/obj/item/taperecorder/Hear(atom/movable/speaker, message_langs, raw_message, radio_freq, radio_freq_name, radio_freq_color, spans, list/message_mods = list(), message_range)
+/obj/item/taperecorder/Hear(atom/movable/speaker, message_langs, raw_message, radio_freq, radio_freq_name, radio_freq_color, spans, list/message_mods = list(), message_range, source) // DARKPACK EDIT, ORIGINAL: /obj/item/taperecorder/Hear(atom/movable/speaker, message_langs, raw_message, radio_freq, radio_freq_name, radio_freq_color, spans, list/message_mods = list(), message_range)
. = ..()
if(message_mods[MODE_RELAY] || !mytape || istype(speaker, /obj/item/taperecorder))
return
@@ -396,6 +397,7 @@
var/unspooled = FALSE
var/list/icons_available = list()
var/radial_icon_file = 'icons/hud/radial_tape.dmi'
+ custom_price = 10 // DARKPACK EDIT ADD - ECONOMY
/obj/item/tape/Initialize(mapload)
. = ..()
diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm
index f5b569b55324..b4c9c628c05a 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/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm
index aee6e25b8327..0b5574de31c0 100644
--- a/code/game/objects/items/devices/transfer_valve.dm
+++ b/code/game/objects/items/devices/transfer_valve.dm
@@ -24,6 +24,7 @@
/obj/item/transfer_valve/Initialize(mapload)
. = ..()
+ AddElement(/datum/element/cuffable_item)
RegisterSignal(src, COMSIG_ITEM_FRIED, PROC_REF(on_fried))
register_context()
register_item_context()
@@ -234,6 +235,11 @@
if(!istype(target) || (target != tank_one && target != tank_two))
return FALSE
+ for(var/obj/effect/forcefield/cosmic_field/potential_field as anything in GLOB.active_cosmic_fields)
+ if(get_dist(potential_field, src) < 3)
+ new /obj/effect/temp_visual/revenant(get_turf(src))
+ return FALSE
+
// Throw both tanks into processing queue
var/datum/gas_mixture/target_mix = target.return_air()
var/datum/gas_mixture/other_mix
diff --git a/code/game/objects/items/dice.dm b/code/game/objects/items/dice.dm
index b563e70cb2c9..416abb3064e9 100644
--- a/code/game/objects/items/dice.dm
+++ b/code/game/objects/items/dice.dm
@@ -70,7 +70,7 @@
/obj/item/dice/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
var/mob/thrown_by = throwingdatum?.get_thrower()
- if(thrown_by)
+ if(istype(thrown_by))
diceroll(thrown_by)
return ..()
@@ -355,7 +355,7 @@
if(4)
//Destroy Equipment
selected_turf.visible_message(span_userdanger("Everything [user] is holding and wearing disappears!"))
- var/list/belongings = user.get_all_gear()
+ var/list/belongings = user.get_all_gear(NONE) //don't delete prosthetics or abstract items.
QDEL_LIST(belongings)
if(5)
//Monkeying
@@ -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_probe.dm b/code/game/objects/items/dna_probe.dm
index 9e3be2dce40c..1f7307a8d75b 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 bea5cec30fa2..1fd6a788894e 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 f6edc5da9018..3f2aea409c75 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 c0c3f8bf6143..a62a17f43520 100644
--- a/code/game/objects/items/dyespray.dm
+++ b/code/game/objects/items/dyespray.dm
@@ -57,8 +57,8 @@
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
- if(!new_grad_color || !user.can_perform_action(src, NEED_DEXTERITY) || !user.CanReach(target))
+ 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
to_chat(user, span_notice("You start applying the hair dye..."))
@@ -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 219e1a3e144d..9bce1d09fdd0 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 4c8507dd88f3..ff9a9453d124 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
@@ -358,7 +358,7 @@
/obj/item/extinguisher/click_alt(mob/user)
if(!user.is_holding(src))
- to_chat(user, span_notice("You must be holding the [src] in your hands do this!"))
+ to_chat(user, span_notice("You must be holding [src] in your hands to do this!"))
return CLICK_ACTION_BLOCKING
EmptyExtinguisher(user)
return CLICK_ACTION_SUCCESS
@@ -367,17 +367,21 @@
if(loc == user && reagents.total_volume)
reagents.expose(user.loc, TOUCH)
reagents.clear_reagents()
- user.visible_message(span_notice("[user] empties out \the [src] onto the floor using the release valve."), span_info("You quietly empty out \the [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
- ..()
+ 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/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 ed88848ea6d4..23cd24c375c5 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 015423ac6e02..04cf93803c52 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
@@ -25,7 +25,9 @@
var/lit = FALSE //on or off
var/operating = FALSE//cooldown
var/obj/item/weldingtool/weldtool = null
+ /// The igniter stored in the flamethrower
var/obj/item/assembly/igniter/igniter = null
+ /// The plasma tank that we shoot gas from
var/obj/item/tank/internals/plasma/ptank = null
var/warned_admins = FALSE //for the message_admins() when lit
//variables for prebuilt flamethrowers
@@ -94,9 +96,9 @@
return ITEM_INTERACT_SUCCESS
/obj/item/flamethrower/wrench_act(mob/living/user, obj/item/tool)
- . = TRUE
+ . = ITEM_INTERACT_SUCCESS
if(status)
- return FALSE
+ return ITEM_INTERACT_BLOCKING
tool.play_tool_sound(src)
var/turf/T = get_turf(src)
if(weldtool)
@@ -119,34 +121,34 @@
update_appearance()
return TRUE
-/obj/item/flamethrower/attackby(obj/item/W, mob/user, list/modifiers, list/attack_modifiers)
- if(isigniter(W))
- var/obj/item/assembly/igniter/I = W
- if(I.secured)
- return
+/obj/item/flamethrower/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+ if(isigniter(tool))
+ var/obj/item/assembly/igniter/inserting_igniter = tool
+ if(inserting_igniter.secured)
+ return ITEM_INTERACT_BLOCKING
if(igniter)
- return
- if(!user.transferItemToLoc(W, src))
- return
- igniter = I
+ return ITEM_INTERACT_BLOCKING
+ if(!user.transferItemToLoc(tool, src))
+ return ITEM_INTERACT_BLOCKING
+ igniter = inserting_igniter
update_appearance()
- return
-
- else if(istype(W, /obj/item/tank/internals/plasma))
+ balloon_alert(user, "attached")
+ return ITEM_INTERACT_SUCCESS
+ if(istype(tool, /obj/item/tank/internals/plasma))
if(ptank)
- if(user.transferItemToLoc(W,src))
- ptank.forceMove(get_turf(src))
- ptank = W
- to_chat(user, span_notice("You swap the plasma tank in [src]!"))
- return
- if(!user.transferItemToLoc(W, src))
- return
- ptank = W
+ if(!user.transferItemToLoc(tool, src))
+ return ITEM_INTERACT_BLOCKING
+ ptank.forceMove(get_turf(src))
+ ptank = tool
+ to_chat(user, span_notice("You swap the plasma tank in [src]!"))
+ return ITEM_INTERACT_SUCCESS
+ if(!user.transferItemToLoc(tool, src))
+ return ITEM_INTERACT_BLOCKING
+ ptank = tool
update_appearance()
- return
+ return ITEM_INTERACT_SUCCESS
- else
- return ..()
+ return NONE
/obj/item/flamethrower/return_analyzable_air()
if(ptank)
diff --git a/code/game/objects/items/flatpacks.dm b/code/game/objects/items/flatpacks.dm
index 8894b05f7b80..b2a49a517875 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 604b6c3c5abe..7475a8c18ba6 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/bread.dm b/code/game/objects/items/food/bread.dm
index a100c0be1bfe..a16c67f8127c 100644
--- a/code/game/objects/items/food/bread.dm
+++ b/code/game/objects/items/food/bread.dm
@@ -22,7 +22,7 @@
/obj/item/food/bread/make_processable()
if (slice_type)
- AddElement(/datum/element/processable, TOOL_KNIFE, slice_type, yield, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice")
+ AddElement(/datum/element/processable, TOOL_KNIFE, slice_type, yield, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice", sound_to_play = SFX_KNIFE_SLICE)
AddElement(/datum/element/processable, TOOL_SAW, slice_type, yield, 4 SECONDS, table_required = TRUE, screentip_verb = "Slice")
// Abstract parent object for sliced bread items. Should not be made obtainable in game.
diff --git a/code/game/objects/items/food/burgers.dm b/code/game/objects/items/food/burgers.dm
index 6b69b12d814b..0f01fbd439da 100644
--- a/code/game/objects/items/food/burgers.dm
+++ b/code/game/objects/items/food/burgers.dm
@@ -686,7 +686,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/cake.dm b/code/game/objects/items/food/cake.dm
index 91340435ab63..b53063672542 100644
--- a/code/game/objects/items/food/cake.dm
+++ b/code/game/objects/items/food/cake.dm
@@ -21,7 +21,7 @@
/obj/item/food/cake/make_processable()
if (slice_type)
- AddElement(/datum/element/processable, TOOL_KNIFE, slice_type, yield, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice")
+ AddElement(/datum/element/processable, TOOL_KNIFE, slice_type, yield, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice", sound_to_play = SFX_KNIFE_SLICE)
/obj/item/food/cakeslice
icon = 'icons/obj/food/piecake.dmi'
diff --git a/code/game/objects/items/food/cheese.dm b/code/game/objects/items/food/cheese.dm
index 74af37742e7c..78d590fa10a4 100644
--- a/code/game/objects/items/food/cheese.dm
+++ b/code/game/objects/items/food/cheese.dm
@@ -59,7 +59,7 @@
AddComponent(/datum/component/food_storage)
/obj/item/food/cheese/wheel/make_processable()
- AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cheese/wedge, 5, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice")
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cheese/wedge, 5, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice", sound_to_play = SFX_KNIFE_SLICE)
/obj/item/food/cheese/wheel/make_bakeable()
AddComponent(/datum/component/bakeable, /obj/item/food/baked_cheese, rand(20 SECONDS, 25 SECONDS), TRUE, TRUE)
@@ -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
@@ -131,7 +132,7 @@
crafting_complexity = FOOD_COMPLEXITY_3
/obj/item/food/cheese/firm_cheese/make_processable()
- AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cheese/firm_cheese_slice, 3, 3 SECONDS, screentip_verb = "Slice")
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cheese/firm_cheese_slice, 3, 3 SECONDS, screentip_verb = "Slice", sound_to_play = SFX_KNIFE_SLICE)
/obj/item/food/cheese/firm_cheese_slice
name = "firm cheese slice"
diff --git a/code/game/objects/items/food/donuts.dm b/code/game/objects/items/food/donuts.dm
index 3cfe6410adde..f074e88800d1 100644
--- a/code/game/objects/items/food/donuts.dm
+++ b/code/game/objects/items/food/donuts.dm
@@ -18,7 +18,7 @@
var/extra_reagent = null
var/decorated_adjective = "sprinkled"
crafting_complexity = FOOD_COMPLEXITY_2
- custom_price = 1 // DARKPACK EDIT ADD - FOOD
+ custom_price = 1 // DARKPACK EDIT ADD - ECONOMY
/obj/item/food/donut/Initialize(mapload)
. = ..()
diff --git a/code/game/objects/items/food/dough.dm b/code/game/objects/items/food/dough.dm
index fe58ad5b09ec..9997b457befc 100644
--- a/code/game/objects/items/food/dough.dm
+++ b/code/game/objects/items/food/dough.dm
@@ -15,7 +15,7 @@
// Dough + rolling pin = flat dough
/obj/item/food/dough/make_processable()
- AddElement(/datum/element/processable, TOOL_ROLLINGPIN, /obj/item/food/flatdough, 1, 3 SECONDS, table_required = TRUE, screentip_verb = "Flatten")
+ AddElement(/datum/element/processable, TOOL_ROLLINGPIN, /obj/item/food/flatdough, 1, 3 SECONDS, table_required = TRUE, screentip_verb = "Flatten", sound_to_play = SFX_ROLLING_PIN_ROLLING)
/obj/item/food/flatdough
name = "flat dough"
@@ -32,7 +32,7 @@
// sliceable into 3xdoughslices
/obj/item/food/flatdough/make_processable()
- AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/doughslice, 3, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice")
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/doughslice, 3, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice", sound_to_play = SFX_KNIFE_SLICE)
/obj/item/food/pizzabread
name = "pizza bread"
@@ -63,7 +63,7 @@
AddComponent(/datum/component/bakeable, /obj/item/food/bun, rand(20 SECONDS, 25 SECONDS), TRUE, TRUE)
/obj/item/food/doughslice/make_processable()
- AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/bait/doughball, 5, 3 SECONDS, screentip_verb = "Slice")
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/bait/doughball, 5, 3 SECONDS, screentip_verb = "Slice", sound_to_play = SFX_KNIFE_SLICE)
/obj/item/food/bun
name = "bun"
@@ -94,7 +94,7 @@
AddComponent(/datum/component/bakeable, /obj/item/food/cake/plain, rand(70 SECONDS, 90 SECONDS), TRUE, TRUE)
/obj/item/food/cakebatter/make_processable()
- AddElement(/datum/element/processable, TOOL_ROLLINGPIN, /obj/item/food/piedough, 1, 3 SECONDS, table_required = TRUE, screentip_verb = "Flatten")
+ AddElement(/datum/element/processable, TOOL_ROLLINGPIN, /obj/item/food/piedough, 1, 3 SECONDS, table_required = TRUE, screentip_verb = "Flatten", sound_to_play = SFX_ROLLING_PIN_ROLLING)
/obj/item/food/piedough
name = "pie dough"
@@ -110,7 +110,7 @@
AddComponent(/datum/component/bakeable, /obj/item/food/pie/plain, rand(30 SECONDS, 45 SECONDS), TRUE, TRUE)
/obj/item/food/piedough/make_processable()
- AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/rawpastrybase, 6, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice")
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/rawpastrybase, 6, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice", sound_to_play = SFX_KNIFE_SLICE)
/obj/item/food/rawpastrybase
name = "raw pastry base"
diff --git a/code/game/objects/items/food/lizard.dm b/code/game/objects/items/food/lizard.dm
index 4b6230303a2a..ee1ca09e882f 100644
--- a/code/game/objects/items/food/lizard.dm
+++ b/code/game/objects/items/food/lizard.dm
@@ -73,7 +73,7 @@
custom_materials = list(/datum/material/meat = MEATSLAB_MATERIAL_AMOUNT)
/obj/item/food/headcheese/make_processable()
- AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/headcheese_slice, 5, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice")
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/headcheese_slice, 5, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice", sound_to_play = SFX_KNIFE_SLICE)
/obj/item/food/headcheese_slice
name = "headcheese slice"
@@ -451,7 +451,7 @@
AddComponent(/datum/component/bakeable, bread_type, rand(15 SECONDS, 25 SECONDS), TRUE, TRUE)
/obj/item/food/rootdough/make_processable()
- AddElement(/datum/element/processable, TOOL_ROLLINGPIN, flat_type, 1, 3 SECONDS, table_required = TRUE, screentip_verb = "Flatten")
+ AddElement(/datum/element/processable, TOOL_ROLLINGPIN, flat_type, 1, 3 SECONDS, table_required = TRUE, screentip_verb = "Flatten", sound_to_play = SFX_ROLLING_PIN_ROLLING)
/obj/item/food/rootdough/egg
desc = "A root based dough, made with nuts, tubers and eggs. Used in a wide range of Tiziran cooking."
@@ -472,7 +472,7 @@
var/grill_type = /obj/item/food/root_flatbread
/obj/item/food/flatrootdough/make_processable()
- AddElement(/datum/element/processable, TOOL_KNIFE, process_type, 3, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice")
+ AddElement(/datum/element/processable, TOOL_KNIFE, process_type, 3, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice", sound_to_play = SFX_KNIFE_SLICE)
/obj/item/food/flatrootdough/make_grillable()
AddComponent(/datum/component/grillable, grill_type, rand(15 SECONDS, 25 SECONDS), TRUE, TRUE)
@@ -499,7 +499,7 @@
foodtypes = parent_type::foodtypes | MEAT
/obj/item/food/rootdoughslice/make_processable()
- AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/spaghetti/nizaya, 1, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice")
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/spaghetti/nizaya, 1, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice", sound_to_play = SFX_KNIFE_SLICE)
/obj/item/food/rootdoughslice/make_bakeable()
AddComponent(/datum/component/bakeable, /obj/item/food/rootroll, rand(15 SECONDS, 25 SECONDS), TRUE, TRUE)
diff --git a/code/game/objects/items/food/martian.dm b/code/game/objects/items/food/martian.dm
index b83e28ec0767..24f1729257f7 100644
--- a/code/game/objects/items/food/martian.dm
+++ b/code/game/objects/items/food/martian.dm
@@ -409,7 +409,7 @@
// Burgers and Sandwiches
/obj/item/food/burger/big_blue
name = "\improper Big Blue burger"
- desc = "The original and best Big Blue, straight outta Mars' favourite burger joint. Catch the wave, brother!"
+ desc = "The original and best Big Blue, straight outta Hawaii's favourite burger joint. Catch the wave, brother!" // DARKPACK EDIT CHANGE
icon = 'icons/obj/food/martian.dmi'
icon_state = "big_blue_burger"
food_reagents = list(
@@ -425,7 +425,7 @@
/obj/item/food/burger/chappy
name = "\improper Chappy patty"
- desc = "Originally born of a night of drinking in a Big Blue Burger's kitchen, the Chappy patty has since become a staple of both Big Blue's menu and Hawaiian (or at least, faux-Hawaiian) cuisine galaxy-wide. Given Big Kahuna operates most of its stores on Mars, it's perhaps no wonder this dish is popular there."
+ desc = "Originally born of a night of drinking in a Big Blue Burger's kitchen, the Chappy Patty has since become a staple of both Big Blue's menu and Hawaiian (or at least, faux-Hawaiian) cuisine world-wide. Given Big Kahuna operates most of its stores in Hawaii, it's perhaps no wonder this dish is popular there." // DARKPACK EDIT CHANGE
icon = 'icons/obj/food/martian.dmi'
icon_state = "chappy_patty"
food_reagents = list(
@@ -489,7 +489,7 @@
/obj/item/food/croque_martienne
name = "croque-martienne"
- desc = "The quintessential Martian breakfast sandwich. Egg, belly pork, pineapple, cheese. Simple. Classic. Available in every cafe across New Osaka."
+ desc = "The quintessential breakfast sandwich with a fruity twist. Egg, belly pork, pineapple, cheese. Simple. Classic." // DARKPACK EDIT CHANGE
icon = 'icons/obj/food/martian.dmi'
icon_state = "croque_martienne"
food_reagents = list(
@@ -587,7 +587,7 @@
/obj/item/food/brat_kimchi
name = "brat-kimchi"
- desc = "Fried kimchi, mixed with sugar and topped with bratwurst. A popular dish at izakayas on Mars."
+ desc = "Fried kimchi, mixed with sugar and topped with bratwurst. A popular dish at non-traditional izakayas." // DARKPACK EDIT CHANGE
icon = 'icons/obj/food/martian.dmi'
icon_state = "brat_kimchi"
food_reagents = list(
@@ -650,7 +650,7 @@
/obj/item/food/epok_epok
name = "epok-epok"
- desc = "A fried pastry snack from Malaysia, which migrated via Singapore into the Martian diet. Stuffed with curried chicken and potatoes, alongside a slice of hard boiled egg, it's a popular street food on the Red Planet."
+ desc = "A fried pastry snack from Malaysia. Stuffed with curried chicken and potatoes, alongside a slice of hard boiled egg, it's a popular street food in San Francisco." // DARKPACK EDIT CHANGE
icon = 'icons/obj/food/martian.dmi'
icon_state = "epok_epok"
food_reagents = list(
@@ -887,7 +887,7 @@
/obj/item/food/feizhou_ji
name = "fēizhōu jī"
- desc = "Considered a Macanese variant on piri-piri, fēizhōu jī, or galinha à africana, or African chicken (if you're feeling like speaking Common), is a popular dish in the TID, and subsequently also on Mars due to its influx of Macanese settlers."
+ desc = "Considered a Macanese variant on piri-piri, fēizhōu jī, or galinha à africana, or African chicken (if you're feeling like speaking English), is a popular dish in the region, and subsequently also in San Francisco due to its influx of Macanese immigrants." // DARKPACK EDIT CHANGE - not satisfied with this one
icon = 'icons/obj/food/martian.dmi'
icon_state = "feizhou_ji"
food_reagents = list(
@@ -1166,7 +1166,7 @@
/obj/item/food/popsicle/pineapple_pop
name = "frozen pineapple pop"
- desc = "Few cultures love pineapple as much as the Martians, and this dessert proves that- frozen pineapple, on a stick, with just a little dunk of dark chocolate."
+ desc = "Frozen pineapple, on a stick, with just a little dunk of dark chocolate." // DARKPACK EDIT CHANGE
overlay_state = "pineapple_pop"
food_reagents = list(
/datum/reagent/consumable/pineapplejuice = 4,
@@ -1250,7 +1250,7 @@
/obj/item/food/frickles
name = "frickles"
- desc = "Spicy fried pickle spears? Such a bold combination can surely come only from one place- Martian ballparks? Well, not really, but they are a popular snack there."
+ desc = "Spicy fried pickle spears? Such a bold combination can surely come only from one place- American ballparks? Well, not really, but they are a popular snack there." // DARKPACK EDIT CHANGE
icon = 'icons/obj/food/martian.dmi'
icon_state = "frickles"
food_reagents = list(
@@ -1285,7 +1285,7 @@
/obj/item/food/ballpark_pretzel
name = "ballpark pretzel"
- desc = "A classic German bread, transformed by the hand of American imperialism into a game-day snack, and then carried to the Red Planet on the backs of Japanese settlers. How multicultural."
+ desc = "A classic German bread transformed by the hand of American imperialism into a game-day snack." // DARKPACK EDIT CHANGE
icon = 'icons/obj/food/martian.dmi'
icon_state = "ballpark_pretzel"
food_reagents = list(
@@ -1317,7 +1317,7 @@
/obj/item/food/kebab/ballpark_tsukune
name = "ballpark tsukune"
- desc = "Skewered chicken meatballs in a sweet-and-savoury yakitori sauce. A common sight at Martian ballparks."
+ desc = "Skewered chicken meatballs in a sweet-and-savoury yakitori sauce. A common sight at Japanese ballparks." // DARKPACK EDIT CHANGE
icon = 'icons/obj/food/martian.dmi'
icon_state = "ballpark_tsukune"
food_reagents = list(
diff --git a/code/game/objects/items/food/meatdish.dm b/code/game/objects/items/food/meatdish.dm
index 98469b34709d..e9dff6900def 100644
--- a/code/game/objects/items/food/meatdish.dm
+++ b/code/game/objects/items/food/meatdish.dm
@@ -359,7 +359,7 @@
// sliceable into 4xtempehslices
/obj/item/food/tempeh/make_processable()
- AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/tempehslice, 4, 5 SECONDS, table_required = TRUE, screentip_verb = "Slice")
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/tempehslice, 4, 5 SECONDS, table_required = TRUE, screentip_verb = "Slice", sound_to_play = SFX_KNIFE_SLICE)
//add an icon for slices
/obj/item/food/tempehslice
@@ -466,7 +466,7 @@
AddComponent(/datum/component/grillable, meatball_type, rand(30 SECONDS, 40 SECONDS), TRUE)
/obj/item/food/raw_meatball/make_processable()
- AddElement(/datum/element/processable, TOOL_ROLLINGPIN, patty_type, 1, table_required = TRUE, screentip_verb = "Flatten")
+ AddElement(/datum/element/processable, TOOL_ROLLINGPIN, patty_type, 1, table_required = TRUE, screentip_verb = "Flatten", sound_to_play = SFX_ROLLING_PIN_ROLLING)
/obj/item/food/raw_meatball/human
name = "strange raw meatball"
@@ -638,8 +638,8 @@
custom_materials = list(/datum/material/meat = MEATSLAB_MATERIAL_AMOUNT)
/obj/item/food/sausage/make_processable()
- AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/salami, 6, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice")
- AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/sausage/american, 1, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice")
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/salami, 6, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice", sound_to_play = SFX_KNIFE_SLICE)
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/sausage/american, 1, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice", sound_to_play = SFX_KNIFE_SLICE)
/obj/item/food/sausage/american
name = "american sausage"
diff --git a/code/game/objects/items/food/meatslab.dm b/code/game/objects/items/food/meatslab.dm
index 6e3f124cc8ea..55fa78c32955 100644
--- a/code/game/objects/items/food/meatslab.dm
+++ b/code/game/objects/items/food/meatslab.dm
@@ -52,7 +52,7 @@
AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/plain, rand(30 SECONDS, 90 SECONDS), TRUE, TRUE) //Add medium rare later maybe?
/obj/item/food/meat/slab/make_processable()
- AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/plain, MEATSLAB_PROCESSED_AMOUNT, 3 SECONDS, table_required = TRUE, screentip_verb = "Cut")
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/plain, MEATSLAB_PROCESSED_AMOUNT, 3 SECONDS, table_required = TRUE, screentip_verb = "Cut", sound_to_play = SFX_KNIFE_SLICE)
///////////////////////////////////// HUMAN MEATS //////////////////////////////////////////////////////
@@ -66,7 +66,7 @@
AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/plain/human, rand(30 SECONDS, 90 SECONDS), TRUE, TRUE) //Add medium rare later maybe?
/obj/item/food/meat/slab/human/make_processable()
- AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/plain/human, 3, 3 SECONDS, table_required = TRUE, screentip_verb = "Cut")
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/plain/human, 3, 3 SECONDS, table_required = TRUE, screentip_verb = "Cut", sound_to_play = SFX_KNIFE_SLICE)
/obj/item/food/meat/slab/human/mutant
abstract_type = /obj/item/food/meat/slab/human/mutant
@@ -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."
@@ -262,7 +266,7 @@
AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/killertomato, rand(70 SECONDS, 85 SECONDS), TRUE, TRUE)
/obj/item/food/meat/slab/killertomato/make_processable()
- AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/killertomato, 3, 3 SECONDS, table_required = TRUE, screentip_verb = "Cut")
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/killertomato, 3, 3 SECONDS, table_required = TRUE, screentip_verb = "Cut", sound_to_play = SFX_KNIFE_SLICE)
/obj/item/food/meat/slab/bear
name = "bear meat"
@@ -278,7 +282,7 @@
foodtypes = RAW | MEAT
/obj/item/food/meat/slab/bear/make_processable()
- AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/bear, 3, 3 SECONDS, table_required = TRUE, screentip_verb = "Cut")
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/bear, 3, 3 SECONDS, table_required = TRUE, screentip_verb = "Cut", sound_to_play = SFX_KNIFE_SLICE)
/obj/item/food/meat/slab/bear/make_grillable()
AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/bear, rand(40 SECONDS, 70 SECONDS), TRUE, TRUE)
@@ -301,7 +305,7 @@
blood_decal_type = /obj/effect/decal/cleanable/blood/xeno
/obj/item/food/meat/slab/xeno/make_processable()
- AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/xeno, 3, 3 SECONDS, table_required = TRUE, screentip_verb = "Cut")
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/xeno, 3, 3 SECONDS, table_required = TRUE, screentip_verb = "Cut", sound_to_play = SFX_KNIFE_SLICE)
/obj/item/food/meat/slab/xeno/make_grillable()
AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/xeno, rand(40 SECONDS, 70 SECONDS), TRUE, TRUE)
@@ -320,7 +324,7 @@
blood_decal_type = /obj/effect/decal/cleanable/insectguts
/obj/item/food/meat/slab/spider/make_processable()
- AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/spider, 3, 3 SECONDS, table_required = TRUE, screentip_verb = "Cut")
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/spider, 3, 3 SECONDS, table_required = TRUE, screentip_verb = "Cut", sound_to_play = SFX_KNIFE_SLICE)
/obj/item/food/meat/slab/spider/make_grillable()
AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/spider, rand(40 SECONDS, 70 SECONDS), TRUE, TRUE)
@@ -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)
@@ -403,7 +411,7 @@
foodtypes = RAW | MEAT | GORE
/obj/item/food/meat/slab/gondola/make_processable()
- AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/gondola, 3, 3 SECONDS, table_required = TRUE, screentip_verb = "Cut")
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/gondola, 3, 3 SECONDS, table_required = TRUE, screentip_verb = "Cut", sound_to_play = SFX_KNIFE_SLICE)
/obj/item/food/meat/slab/gondola/make_grillable()
AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/gondola, rand(30 SECONDS, 90 SECONDS), TRUE, TRUE) //Add medium rare later maybe?
@@ -420,7 +428,7 @@
/obj/item/food/meat/slab/penguin/make_processable()
. = ..()
- AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/penguin, 3, 3 SECONDS, table_required = TRUE, screentip_verb = "Cut")
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/penguin, 3, 3 SECONDS, table_required = TRUE, screentip_verb = "Cut", sound_to_play = SFX_KNIFE_SLICE)
/obj/item/food/meat/slab/penguin/make_grillable()
AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/penguin, rand(30 SECONDS, 90 SECONDS), TRUE, TRUE) //Add medium rare later maybe?
@@ -463,7 +471,7 @@
starting_reagent_purity = 1
/obj/item/food/meat/slab/chicken/make_processable()
- AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/chicken, 3, 3 SECONDS, table_required = TRUE, screentip_verb = "Cut")
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/chicken, 3, 3 SECONDS, table_required = TRUE, screentip_verb = "Cut", sound_to_play = SFX_KNIFE_SLICE)
/obj/item/food/meat/slab/chicken/make_grillable()
AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/chicken, rand(30 SECONDS, 90 SECONDS), TRUE, TRUE) //Add medium rare later maybe? (no this is chicken)
@@ -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 97b59fa0475a..afb2f506685c 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."
@@ -390,7 +403,7 @@
to_chat(user, span_notice("You stick the rod into the stick of butter."))
user.temporarilyRemoveItemFromInventory(src)
var/obj/item/food/butter/on_a_stick/new_item = new(drop_location())
- if (user.CanReach(new_item))
+ if (new_item.IsReachableBy(user))
user.put_in_hands(new_item)
qdel(src)
return TRUE
@@ -405,7 +418,7 @@
can_stick = FALSE
/obj/item/food/butter/make_processable()
- AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/butterslice, 3, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice")
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/butterslice, 3, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice", sound_to_play = SFX_KNIFE_SLICE)
/obj/item/food/butterslice
name = "butter slice"
@@ -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/monkeycube.dm b/code/game/objects/items/food/monkeycube.dm
index bfb9ccc0f4e0..e2f797918178 100644
--- a/code/game/objects/items/food/monkeycube.dm
+++ b/code/game/objects/items/food/monkeycube.dm
@@ -31,6 +31,7 @@
var/mob/spammer = get_mob_by_key(fingerprintslast)
var/mob/living/bananas = new spawned_mob(drop_location(), TRUE, spammer) // funny that we pass monkey init args to non-monkey mobs, that's totally a future issue
if (!QDELETED(bananas))
+ ADD_TRAIT(bananas, TRAIT_SPAWNED_MOB, INNATE_TRAIT)
if(faction)
bananas.faction = faction
diff --git a/code/game/objects/items/food/moth.dm b/code/game/objects/items/food/moth.dm
index 92587947a6bb..1982690339fd 100644
--- a/code/game/objects/items/food/moth.dm
+++ b/code/game/objects/items/food/moth.dm
@@ -194,7 +194,7 @@
crafting_complexity = FOOD_COMPLEXITY_5
/obj/item/food/green_lasagne/make_processable()
- AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/green_lasagne_slice, 6, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice")
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/green_lasagne_slice, 6, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice", sound_to_play = SFX_KNIFE_SLICE)
/obj/item/food/green_lasagne_slice
name = "green lasagne al forno slice"
@@ -229,8 +229,8 @@
/obj/item/food/big_baked_rice
name = "big baked rice"
- desc = "A mothic favourite, baked rice can be filled with a variety of vegetable fillings to make a delicious meal to share. \
- Potatoes are also often layered on the bottom of the cooking vessel to create a flavourful crust which is hotly contested amongst diners."
+ desc = "An iconic favourite, baked rice can be filled with a variety of vegetable fillings to make a delicious meal to share. \
+ Potatoes are also often layered on the bottom of the cooking vessel to create a flavourful crust which is hotly contested amongst diners." // DARKPACK EDIT CHANGE
icon = 'icons/obj/food/moth.dmi'
icon_state = "big_baked_rice"
food_reagents = list(
diff --git a/code/game/objects/items/food/packaged.dm b/code/game/objects/items/food/packaged.dm
index 5b5f45a8d28a..1458c3c101dd 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/pastries.dm b/code/game/objects/items/food/pastries.dm
index bfb01a76cd72..2b5e56eefd83 100644
--- a/code/game/objects/items/food/pastries.dm
+++ b/code/game/objects/items/food/pastries.dm
@@ -15,7 +15,7 @@
food_flags = FOOD_FINGER_FOOD
w_class = WEIGHT_CLASS_SMALL
crafting_complexity = FOOD_COMPLEXITY_2
- custom_price = 1 // DARKPACK EDIT ADD - FOOD
+ custom_price = 1 // DARKPACK EDIT ADD - ECONOMY
/obj/item/food/muffin/berry
name = "berry muffin"
@@ -471,7 +471,7 @@
crafting_complexity = FOOD_COMPLEXITY_2
/obj/item/food/brownie_sheet/make_processable()
- AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/brownie, 4, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice")
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/brownie, 4, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice", sound_to_play = SFX_KNIFE_SLICE)
/obj/item/food/brownie
name = "brownie"
@@ -520,7 +520,7 @@
crafting_complexity = FOOD_COMPLEXITY_3
/obj/item/food/peanut_butter_brownie_sheet/make_processable()
- AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/peanut_butter_brownie, 4, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice")
+ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/peanut_butter_brownie, 4, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice", sound_to_play = SFX_KNIFE_SLICE)
/obj/item/food/peanut_butter_brownie
name = "peanut butter brownie"
diff --git a/code/game/objects/items/food/pie.dm b/code/game/objects/items/food/pie.dm
index e7535c7ee05c..2e29b2a33451 100644
--- a/code/game/objects/items/food/pie.dm
+++ b/code/game/objects/items/food/pie.dm
@@ -16,7 +16,7 @@
/obj/item/food/pie/make_processable()
if (slice_type)
- AddElement(/datum/element/processable, TOOL_KNIFE, slice_type, yield, table_required = TRUE, screentip_verb = "Slice")
+ AddElement(/datum/element/processable, TOOL_KNIFE, slice_type, yield, table_required = TRUE, screentip_verb = "Slice", sound_to_play = SFX_KNIFE_SLICE)
/obj/item/food/pieslice
name = "pie slice"
diff --git a/code/game/objects/items/food/pizza.dm b/code/game/objects/items/food/pizza.dm
index 411c76097d51..ab8267e7ea4a 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
@@ -134,7 +134,7 @@
crafting_complexity = FOOD_COMPLEXITY_2
/obj/item/food/pizzaslice/make_processable()
- AddElement(/datum/element/processable, TOOL_ROLLINGPIN, /obj/item/stack/sheet/pizza, 1, 1 SECONDS, table_required = TRUE, screentip_verb = "Flatten")
+ AddElement(/datum/element/processable, TOOL_ROLLINGPIN, /obj/item/stack/sheet/pizza, 1, 1 SECONDS, table_required = TRUE, screentip_verb = "Flatten", sound_to_play = SFX_ROLLING_PIN_ROLLING)
/obj/item/food/pizza/margherita
name = "pizza margherita"
diff --git a/code/game/objects/items/food/sandwichtoast.dm b/code/game/objects/items/food/sandwichtoast.dm
index 62d766839a9c..6e92d4013782 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 9da40b24807b..7caf726e8123 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 d1f65dc4b2ad..8c95ef4951bc 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 1843431f3d2a..03fefc39ee18 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 988d17aa13ba..0210227d3b0b 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 4fff32623c86..4fb39673e9c8 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 88123439725f..17db0d9ba147 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/_grenade.dm b/code/game/objects/items/grenades/_grenade.dm
index 262a493cc753..11e7f3683e28 100644
--- a/code/game/objects/items/grenades/_grenade.dm
+++ b/code/game/objects/items/grenades/_grenade.dm
@@ -180,6 +180,13 @@
update_appearance()
return FALSE
+ for(var/obj/effect/forcefield/cosmic_field/potential_field as anything in GLOB.active_cosmic_fields)
+ if(get_dist(potential_field, src) < 3)
+ new /obj/effect/temp_visual/revenant(get_turf(src))
+ active = FALSE
+ update_appearance()
+ return FALSE
+
dud_flags |= GRENADE_USED // Don't detonate if we have already detonated.
if(shrapnel_type && shrapnel_radius && !shrapnel_initialized) // add a second check for adding the component in case whatever triggered the grenade went straight to prime (badminnery for example)
shrapnel_initialized = TRUE
diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm
index 98b7edf19ae2..b5780ea8406a 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/clusterbuster.dm b/code/game/objects/items/grenades/clusterbuster.dm
index 33f0c8774836..13ceb593cc02 100644
--- a/code/game/objects/items/grenades/clusterbuster.dm
+++ b/code/game/objects/items/grenades/clusterbuster.dm
@@ -106,25 +106,12 @@
/obj/effect/payload_spawner/random_slime/volatile
volatile = TRUE
-/obj/item/slime_extract/proc/activate_slime()
- var/list/slime_chems = src.activate_reagents
- if(!QDELETED(src))
- var/chem = pick(slime_chems)
- var/amount = 5
- if(chem == "lesser plasma") //In the rare case we get another rainbow.
- chem = /datum/reagent/toxin/plasma
- amount = 4
- if(chem == "holy water and uranium")
- chem = /datum/reagent/uranium
- reagents.add_reagent(/datum/reagent/water/holywater)
- reagents.add_reagent(chem, amount)
-
/obj/effect/payload_spawner/random_slime/spawn_payload(type, numspawned)
for(var/_ in 1 to numspawned)
var/chosen = pick(subtypesof(/obj/item/slime_extract))
var/obj/item/slime_extract/slime_extract = new chosen(loc)
if(volatile)
- addtimer(CALLBACK(slime_extract, TYPE_PROC_REF(/obj/item/slime_extract, activate_slime)), rand(RANDOM_DETONATE_MIN_TIME, RANDOM_DETONATE_MAX_TIME))
+ addtimer(CALLBACK(slime_extract, TYPE_PROC_REF(/obj/item/slime_extract, auto_activate_reaction)), rand(RANDOM_DETONATE_MIN_TIME, RANDOM_DETONATE_MAX_TIME))
var/steps = rand(1, 4)
for(var/step in 1 to steps)
step_away(src, loc)
diff --git a/code/game/objects/items/grenades/emgrenade.dm b/code/game/objects/items/grenades/emgrenade.dm
index 4f3b9d2e4849..295faeb98097 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 41d370d7bdd8..cf7c11ade6a7 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 1a7dc6f4fffc..dec21fdc1f4c 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 d77049419abc..13bdf7351ab4 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/spawnergrenade.dm b/code/game/objects/items/grenades/spawnergrenade.dm
index e479d7d818a0..0c7962675788 100644
--- a/code/game/objects/items/grenades/spawnergrenade.dm
+++ b/code/game/objects/items/grenades/spawnergrenade.dm
@@ -29,6 +29,8 @@
// Spawn some hostile syndicate critters and spread them out
var/list/spawned = spawn_and_random_walk(spawner_type, target_turf, deliveryamt, walk_chance = 50, admin_spawn = ((flags_1 & ADMIN_SPAWNED_1) ? TRUE : FALSE))
afterspawn(spawned)
+ for(var/mob/living/created as anything in spawned)
+ ADD_TRAIT(created, TRAIT_SPAWNED_MOB, INNATE_TRAIT)
qdel(src)
diff --git a/code/game/objects/items/grenades/syndieminibomb.dm b/code/game/objects/items/grenades/syndieminibomb.dm
index 6e874f9d864b..02fb27777bcd 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 77ba80352910..d580d37fe253 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 ca6aee647f02..1e5ef4bd23e9 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 328552a28f08..cd986a7e4517 100644
--- a/code/game/objects/items/handcuffs.dm
+++ b/code/game/objects/items/handcuffs.dm
@@ -55,17 +55,16 @@
///How long it takes to handcuff someone
var/handcuff_time = 4 SECONDS
- ///Multiplier for handcuff time
- var/handcuff_time_mod = 1
///Sound that plays when starting to put handcuffs on someone
var/cuffsound = 'sound/items/weapons/handcuffs.ogg'
///Sound that plays when restrain is successful
var/cuffsuccesssound = 'sound/items/handcuff_finish.ogg'
- ///If set, handcuffs will be destroyed on application and leave behind whatever this is set to.
- var/trashtype = null
/// How strong the cuffs are. Weak cuffs can be broken with wirecutters or boxcutters.
var/restraint_strength = HANDCUFFS_TYPE_STRONG
+ /// Is this pair of cuff being actually used?
+ var/used = FALSE
+
/obj/item/restraints/handcuffs/apply_fantasy_bonuses(bonus)
. = ..()
handcuff_time = modify_fantasy_variable("handcuff_time", handcuff_time, -bonus * 2, minimum = 0.3 SECONDS)
@@ -79,7 +78,7 @@
acid = 50
/obj/item/restraints/handcuffs/attack(mob/living/target_mob, mob/living/user)
- if(!iscarbon(target_mob))
+ if(!iscarbon(target_mob) || used)
return
attempt_to_cuff(target_mob, user)
@@ -90,9 +89,7 @@
victim.balloon_alert(user, "can't be handcuffed!")
return
- if(iscarbon(user) && (HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))) //Clumsy people have a 50% chance to handcuff themselves instead of their target.
- to_chat(user, span_warning("Uh... how do those things work?!"))
- apply_cuffs(user, user)
+ if(handcuffs_clumsiness_check(user))
return
if(!isnull(victim.handcuffed))
@@ -114,12 +111,7 @@
playsound(loc, cuffsound, 30, TRUE, -2)
log_combat(user, victim, "attempted to handcuff")
- if(HAS_TRAIT(user, TRAIT_FAST_CUFFING))
- handcuff_time_mod = 0.75
- else
- handcuff_time_mod = 1
-
- if(!do_after(user, handcuff_time * handcuff_time_mod, victim, timed_action_flags = IGNORE_SLOWDOWNS) || !victim.canBeHandcuffed())
+ if(!do_after(user, get_handcuff_time(user), victim, timed_action_flags = IGNORE_SLOWDOWNS) || !victim.canBeHandcuffed())
victim.balloon_alert(user, "failed to handcuff!")
to_chat(user, span_warning("You fail to handcuff [victim]!"))
log_combat(user, victim, "failed to handcuff")
@@ -136,7 +128,16 @@
log_combat(user, victim, "successfully handcuffed")
SSblackbox.record_feedback("tally", "handcuffs", 1, type)
+///Return the amount of time the user would spend cuffing someone or something
+/obj/item/restraints/handcuffs/proc/get_handcuff_time(mob/user)
+ return handcuff_time * (HAS_TRAIT(user, TRAIT_FAST_CUFFING) ? 0.75 : 1)
+/obj/item/restraints/handcuffs/proc/handcuffs_clumsiness_check(mob/user)
+ if(!iscarbon(user) || !HAS_TRAIT(user, TRAIT_CLUMSY) || prob(50)) //Clumsy people have a 50% chance to handcuff themselves instead of their target.
+ return FALSE
+ to_chat(user, span_warning("Uh... how do those things work?!"))
+ apply_cuffs(user, user)
+ return TRUE
/**
* When called, this instantly puts handcuffs on someone (if actually possible)
*
@@ -153,16 +154,24 @@
return
var/obj/item/restraints/handcuffs/cuffs = src
- if(trashtype)
- cuffs = new trashtype()
- else if(dispense)
+ if(dispense)
cuffs = new type()
target.equip_to_slot(cuffs, ITEM_SLOT_HANDCUFFED)
- if(trashtype && !dispense)
+ if(dispense)
qdel(src)
+/obj/item/restraints/handcuffs/equipped(mob/living/user, slot)
+ . = ..()
+ if(slot == ITEM_SLOT_HANDCUFFED)
+ RegisterSignal(src, COMSIG_ITEM_DROPPED, PROC_REF(on_uncuffed)) //Make sure zipties are no longer usable the next time someone removes them
+
+/obj/item/restraints/handcuffs/proc/on_uncuffed(datum/source, mob/living/wearer)
+ SIGNAL_HANDLER
+ SHOULD_CALL_PARENT(TRUE)
+ UnregisterSignal(src, COMSIG_ITEM_DROPPED)
+
/**
* # Alien handcuffs
*
@@ -199,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
@@ -342,10 +351,15 @@
righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
custom_materials = null
breakouttime = 45 SECONDS
- trashtype = /obj/item/restraints/handcuffs/cable/zipties/used
color = null
cable_color = null
+/obj/item/restraints/handcuffs/cable/zipties/on_uncuffed(datum/source, mob/living/wearer)
+ . = ..()
+ desc = "A pair of broken zipties."
+ icon_state = "cuff_used"
+ used = TRUE
+
/**
* # Used zipties
*
@@ -354,9 +368,7 @@
/obj/item/restraints/handcuffs/cable/zipties/used
desc = "A pair of broken zipties."
icon_state = "cuff_used"
-
-/obj/item/restraints/handcuffs/cable/zipties/used/attack()
- return
+ used = TRUE
/**
* # Fake Zipties
@@ -372,6 +384,21 @@
/obj/item/restraints/handcuffs/cable/zipties/fake/used
desc = "A pair of broken fake zipties."
icon_state = "cuff_used"
+ used = TRUE
+
+///handcuffs applied by cult magic and heretics sacrifice
+/obj/item/restraints/handcuffs/cult
+ name = "shadow shackles"
+ desc = "Shackles that bind the wrists with sinister magic."
+ breakouttime = 45 SECONDS
+ icon_state = "cult_shackles"
+ flags_1 = NONE
+
+/obj/item/restraints/handcuffs/cult/on_uncuffed(datum/source, mob/living/wearer)
+ . = ..()
+ wearer.visible_message(span_danger("[wearer]'s shackles shatter in a discharge of dark magic!"), span_userdanger("Your [src] shatters in a discharge of dark magic!"))
+ qdel(src)
+
/**
* # Generic leg cuffs
@@ -545,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
@@ -597,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.
@@ -612,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 367aba1e8643..e9e49d0c6f24 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/holosign_creator.dm b/code/game/objects/items/holosign_creator.dm
index 23db75e850c6..6e46cdb2a4df 100644
--- a/code/game/objects/items/holosign_creator.dm
+++ b/code/game/objects/items/holosign_creator.dm
@@ -13,6 +13,9 @@
throw_speed = 3
throw_range = 7
item_flags = NOBLUDGEON
+ sound_vary = TRUE
+ pickup_sound = SFX_GENERIC_DEVICE_PICKUP
+ drop_sound = SFX_GENERIC_DEVICE_DROP
var/list/signs
var/max_signs = 10
//time to create a holosign in deciseconds.
diff --git a/code/game/objects/items/implants/implant_explosive.dm b/code/game/objects/items/implants/implant_explosive.dm
index 1714010ae036..832eca03a786 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 000000000000..ce26fb1b678b
--- /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 5dd821a683d6..000000000000
--- 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 ceccbe1b729e..6e053a1a44b4 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/implants/implantcase.dm b/code/game/objects/items/implants/implantcase.dm
index 87fca49be899..d034bc47f15e 100644
--- a/code/game/objects/items/implants/implantcase.dm
+++ b/code/game/objects/items/implants/implantcase.dm
@@ -13,6 +13,7 @@
throw_range = 5
w_class = WEIGHT_CLASS_TINY
custom_materials = list(/datum/material/glass= SMALL_MATERIAL_AMOUNT * 5)
+ obj_flags = UNIQUE_RENAME | RENAME_NO_DESC
///the implant within the case
var/obj/item/implant/imp = null
///Type of implant this will spawn as imp upon being spawned
@@ -36,18 +37,7 @@
return ..()
/obj/item/implantcase/attackby(obj/item/used_item, mob/living/user, list/modifiers, list/attack_modifiers)
- if(IS_WRITING_UTENSIL(used_item))
- if(!user.can_write(used_item))
- return
- var/new_name = tgui_input_text(user, "What would you like the label to be?", name, max_length = MAX_NAME_LEN)
- if((user.get_active_held_item() != used_item) || !user.can_perform_action(src))
- return
- if(new_name)
- playsound(src, SFX_WRITING_PEN, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE, SOUND_FALLOFF_EXPONENT + 3, ignore_walls = FALSE)
- name = "implant case - '[new_name]'"
- else
- name = "implant case"
- else if(istype(used_item, /obj/item/implanter))
+ if(istype(used_item, /obj/item/implanter))
var/obj/item/implanter/used_implanter = used_item
if(used_implanter.imp && !imp)
//implanter to case implant transfer
@@ -68,6 +58,8 @@
else
return ..()
+/obj/item/implantcase/nameformat(input, user)
+ return "implant case[input? " - '[input]'" : null]"
///An implant case that spawns with a tracking implant, as well as an appropriate name and description.
/obj/item/implantcase/tracking
diff --git a/code/game/objects/items/implants/implanter.dm b/code/game/objects/items/implants/implanter.dm
index 5d249d95587a..971365abea4f 100644
--- a/code/game/objects/items/implants/implanter.dm
+++ b/code/game/objects/items/implants/implanter.dm
@@ -12,6 +12,7 @@
throw_speed = 3
throw_range = 5
w_class = WEIGHT_CLASS_SMALL
+ obj_flags = UNIQUE_RENAME | RENAME_NO_DESC
custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT * 6, /datum/material/glass=SMALL_MATERIAL_AMOUNT *2)
///The implant in our implanter
var/obj/item/implant/imp = null
@@ -44,24 +45,11 @@
else
to_chat(user, span_warning("[src] fails to implant [target]."))
-/obj/item/implanter/attackby(obj/item/I, mob/living/user, list/modifiers, list/attack_modifiers)
- if(IS_WRITING_UTENSIL(I))
- return ..()
- if(!user.can_write(I))
- return
-
- var/new_name = tgui_input_text(user, "What would you like the label to be?", name, max_length = MAX_NAME_LEN)
- if(user.get_active_held_item() != I)
- return
- if(!user.can_perform_action(src))
- return
- if(new_name)
- name = "implanter ([new_name])"
- else
- name = "implanter"
-
/obj/item/implanter/Initialize(mapload)
. = ..()
if(!imp && imp_type)
imp = new imp_type(src)
update_appearance()
+
+/obj/item/implanter/nameformat(input, user)
+ return "implanter[input? " ([input])" : null]"
diff --git a/code/game/objects/items/implants/security/implant_chem.dm b/code/game/objects/items/implants/security/implant_chem.dm
index 178dfcae2a60..d957100ce700 100644
--- a/code/game/objects/items/implants/security/implant_chem.dm
+++ b/code/game/objects/items/implants/security/implant_chem.dm
@@ -95,9 +95,7 @@
desc = "A glass case containing a remote chemical implant."
imp_type = /obj/item/implant/chem
-/obj/item/implantcase/chem/attackby(obj/item/W, mob/user, list/modifiers, list/attack_modifiers)
- if(istype(W, /obj/item/reagent_containers/syringe) && imp)
- W.interact_with_atom(imp, user, modifiers)
- return TRUE
- else
- return ..()
+/obj/item/implantcase/chem/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+ if(!istype(tool, /obj/item/reagent_containers/syringe) && imp)
+ return NONE
+ return tool.interact_with_atom(imp, user, modifiers)
diff --git a/code/game/objects/items/inspector.dm b/code/game/objects/items/inspector.dm
index d0feef1471e9..56e63994c223 100644
--- a/code/game/objects/items/inspector.dm
+++ b/code/game/objects/items/inspector.dm
@@ -22,6 +22,9 @@
interaction_flags_click = NEED_DEXTERITY
throw_range = 1
throw_speed = 1
+ sound_vary = TRUE
+ pickup_sound = SFX_GENERIC_DEVICE_PICKUP
+ drop_sound = SFX_GENERIC_DEVICE_DROP
///How long it takes to print on time each mode, ordered NORMAL, FAST, HONK
var/list/time_list = list(5 SECONDS, 1 SECONDS, 0.1 SECONDS)
///Which print time mode we're on.
@@ -333,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
@@ -455,18 +459,22 @@
* 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
make_plane(user, /obj/item/paperplane/syndicate)
- else if(do_after(user, 1 SECONDS, target = src, progress=TRUE))
- var/turf/open/target = get_turf(src)
- target.MakeSlippery(TURF_WET_WATER, min_wet_time = 10 SECONDS, wet_time_to_add = 5 SECONDS)
- to_chat(user, span_notice("As you try to fold [src] into the shape of a plane, it disintegrates into water!"))
- qdel(src)
+ return CLICK_ACTION_SUCCESS
+ if(!do_after(user, 1 SECONDS, target = src, progress=TRUE))
+ return CLICK_ACTION_BLOCKING
+ var/turf/open/target = get_turf(src)
+ target.MakeSlippery(TURF_WET_WATER, min_wet_time = 10 SECONDS, wet_time_to_add = 5 SECONDS)
+ to_chat(user, span_notice("As you try to fold [src] into the shape of a plane, it disintegrates into water!"))
+ qdel(src)
return CLICK_ACTION_SUCCESS
#undef ENERGY_TO_SPEAK
diff --git a/code/game/objects/items/kirby_plants/kirbyplants.dm b/code/game/objects/items/kirby_plants/kirbyplants.dm
index d0d5b179adc4..08989ccb3636 100644
--- a/code/game/objects/items/kirby_plants/kirbyplants.dm
+++ b/code/game/objects/items/kirby_plants/kirbyplants.dm
@@ -1,6 +1,6 @@
/obj/item/kirbyplants
name = "potted plant"
- icon = 'icons/obj/fluff/flora/plants.dmi'
+ icon = 'modular_darkpack/master_files/icons/obj/fluff/flora/plants.dmi' // DARKPACK EDIT CHANGE
icon_state = "plant-01"
base_icon_state = "plant-01"
desc = "A little bit of nature contained in a pot."
@@ -11,6 +11,8 @@
throw_speed = 2
throw_range = 4
item_flags = NO_PIXEL_RANDOM_DROP
+ drop_sound = SFX_POTTED_PLANT_DROP
+ pickup_sound = SFX_POTTED_PLANT_PICKUP
/// Can this plant be trimmed by someone with TRAIT_BONSAI
var/trimmable = TRUE
@@ -19,6 +21,7 @@
///If it's a special named plant, set this to true to prevent dead-name overriding.
var/custom_plant_name = FALSE
var/static/list/random_plant_states
+ var/static/list/random_darkpack_states // DARKPACK EDIT ADD
/obj/item/kirbyplants/Initialize(mapload)
. = ..()
@@ -176,3 +179,45 @@
/obj/item/kirbyplants/fern/Initialize(mapload)
. = ..()
AddElement(/datum/element/swabable, CELL_LINE_TABLE_ALGAE, CELL_VIRUS_TABLE_GENERIC, rand(2,4), 5)
+
+// DARKPACK EDIT ADD START
+/obj/item/kirbyplants/darkpack
+ icon_state = "plant0"
+ base_icon_state = "plant0"
+
+/obj/item/kirbyplants/darkpack/generate_states()
+ var/list/plant_states = list()
+ for(var/i in 1 to 5)
+ var/number = "[i]"
+ plant_states += "plant[number]"
+
+ return plant_states
+
+/obj/item/kirbyplants/darkpack/random
+
+/obj/item/kirbyplants/darkpack/random/proc/randomize_base_icon_state()
+ if(isnull(random_darkpack_states))
+ random_darkpack_states = generate_states()
+ base_icon_state = pick(random_darkpack_states)
+ if(!dead) //no need to update the icon if we're already dead.
+ update_appearance(UPDATE_ICON)
+
+/obj/item/kirbyplants/darkpack/random/Initialize(mapload)
+ . = ..()
+ randomize_base_icon_state()
+
+/obj/item/kirbyplants/darkpack/plant1
+ icon_state = "plant1"
+
+/obj/item/kirbyplants/darkpack/plant2
+ icon_state = "plant2"
+
+/obj/item/kirbyplants/darkpack/plant3
+ icon_state = "plant3"
+
+/obj/item/kirbyplants/darkpack/plant4
+ icon_state = "plant4"
+
+/obj/item/kirbyplants/darkpack/plant5
+ icon_state = "plant5"
+// DARKPACK EDIT ADD END
diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm
index b756f593ec43..687b1518e538 100644
--- a/code/game/objects/items/kitchen.dm
+++ b/code/game/objects/items/kitchen.dm
@@ -38,6 +38,9 @@
sharpness = SHARP_POINTY
var/datum/reagent/forkload //used to eat omelette
custom_price = PAYCHECK_LOWER
+ sound_vary = TRUE
+ pickup_sound = SFX_CUTLERY_PICKUP
+ drop_sound = SFX_CUTLERY_DROP
/datum/armor/kitchen_fork
fire = 50
@@ -77,6 +80,8 @@
throwforce = 0
custom_materials = list(/datum/material/plastic = SMALL_MATERIAL_AMOUNT * 0.8)
custom_price = PAYCHECK_LOWER * 1
+ pickup_sound = null
+ drop_sound = null
/obj/item/kitchen/fork/plastic/Initialize(mapload)
. = ..()
@@ -100,6 +105,8 @@
attack_verb_simple = list("prod", "whiff", "scratch", "poke")
sharpness = SHARP_EDGED
custom_price = PAYCHECK_LOWER * 2
+ pickup_sound = null
+ drop_sound = null
/obj/item/knife/plastic/Initialize(mapload)
. = ..()
@@ -124,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)
@@ -160,13 +167,16 @@
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")
attack_verb_simple = list("bash", "batter", "bludgeon", "thrash", "whack")
custom_price = PAYCHECK_CREW * 1.5
tool_behaviour = TOOL_ROLLINGPIN
+ sound_vary = TRUE
+ pickup_sound = SFX_ROLLING_PIN_PICKUP
+ drop_sound = SFX_ROLLING_PIN_DROP
/obj/item/kitchen/rollingpin/illegal
name = "metal rolling pin"
@@ -202,6 +212,9 @@
custom_price = PAYCHECK_LOWER * 2
tool_behaviour = TOOL_MINING
toolspeed = 25 // Literally 25 times worse than the base pickaxe
+ sound_vary = TRUE
+ pickup_sound = SFX_CUTLERY_PICKUP
+ drop_sound = SFX_CUTLERY_DROP
var/spoon_sip_size = 5
@@ -316,6 +329,8 @@
custom_materials = list(/datum/material/plastic = SMALL_MATERIAL_AMOUNT * 1.2)
toolspeed = 75 // The plastic spoon takes 5 minutes to dig through a single mineral turf... It's one, continuous, breakable, do_after...
custom_price = PAYCHECK_LOWER * 1
+ pickup_sound = null
+ drop_sound = null
/datum/armor/kitchen_spoon
fire = 50
diff --git a/code/game/objects/items/knives.dm b/code/game/objects/items/knives.dm
index 4f34b4cf4f47..fcda07ed8975 100644
--- a/code/game/objects/items/knives.dm
+++ b/code/game/objects/items/knives.dm
@@ -27,6 +27,10 @@
tool_behaviour = TOOL_KNIFE
var/list/alt_continuous = list("stabs", "pierces", "shanks")
var/list/alt_simple = list("stab", "pierce", "shank")
+ sound_vary = TRUE
+ operating_sound = SFX_KNIFE_SLICE
+ pickup_sound = SFX_KNIFE_PICKUP
+ drop_sound = SFX_KNIFE_DROP
/datum/armor/item_knife
fire = 50
@@ -213,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
@@ -241,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)
@@ -254,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
@@ -274,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
@@ -297,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 e08080504dd8..3439e6867f5d 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
@@ -98,7 +99,6 @@
/obj/item/latexballoon/bullet_act(obj/projectile/projectile)
if(projectile.damage > 0)
burst()
-
return ..()
/obj/item/latexballoon/attackby(obj/item/item, mob/user, list/modifiers, list/attack_modifiers)
diff --git a/code/game/objects/items/lighter.dm b/code/game/objects/items/lighter.dm
index ceb9ebb243a5..9d1f9c655605 100644
--- a/code/game/objects/items/lighter.dm
+++ b/code/game/objects/items/lighter.dm
@@ -9,8 +9,7 @@
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 = 20 // DARKPACK EDIT CHANGE
+ custom_price = 20 // DARKPACK EDIT CHANGE - ECONOMY
light_system = OVERLAY_LIGHT
light_range = 2
light_power = 1.3
@@ -37,11 +36,14 @@
"thirteen",
"snake",
)
+ /// Whether the lighter starts with fuel
+ var/spawns_with_reagent = TRUE
/obj/item/lighter/Initialize(mapload)
. = ..()
create_reagents(maximum_fuel, REFILLABLE | DRAINABLE)
- reagents.add_reagent(/datum/reagent/fuel, maximum_fuel)
+ if(spawns_with_reagent)
+ reagents.add_reagent(/datum/reagent/fuel, maximum_fuel)
if(!overlay_state)
overlay_state = pick(overlay_list)
AddComponent(\
@@ -52,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)
@@ -227,12 +232,11 @@
/obj/item/lighter/process(seconds_per_tick)
if(lit)
+ open_flame(heat)
burned_fuel_for += seconds_per_tick
if(burned_fuel_for >= TOOL_FUEL_BURN_INTERVAL)
use(used = 0.25)
- open_flame(heat)
-
/obj/item/lighter/get_temperature()
return lit * heat
@@ -313,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"
@@ -325,13 +331,15 @@
desc = "In lieu of fuel, performative spirit can be used to light cigarettes."
icon_state = "mlighter" //These ones don't show a flame.
light_color = LIGHT_COLOR_HALOGEN
- heat_while_on = 0 //I swear it's a real lighter dude you just can't see the flame dude I promise
+ 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!")
@@ -341,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)
. = ..()
@@ -367,3 +377,9 @@
/obj/item/lighter/mime,
/obj/item/lighter/bright,
)
+
+/obj/item/lighter/empty
+ spawns_with_reagent = FALSE
+
+/obj/item/lighter/greyscale/empty
+ spawns_with_reagent = FALSE
diff --git a/code/game/objects/items/maintenance_loot.dm b/code/game/objects/items/maintenance_loot.dm
index 9ad0c206bbca..9a87976932ce 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 f798fa66ad84..611a035acba9 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 5c883ddda084..7b3cf5c969e0 100644
--- a/code/game/objects/items/melee/baton.dm
+++ b/code/game/objects/items/melee/baton.dm
@@ -30,7 +30,7 @@
/// How much stamina damage we deal on a successful hit against a living, non-cyborg mob.
var/stamina_damage = 55
/// How much armor does our baton ignore? This operates as armour penetration, but only applies to the stun attack.
- var/stun_armour_penetration = 15
+ var/stun_armour_penetration = 15 // pens very light / cosmetic armor
/// What armor does our stun attack check before delivering the attack?
var/armour_type_against_stun = MELEE
/// Chance of causing force_say() when stunning a human mob
@@ -76,6 +76,7 @@
. = ..()
register_item_context()
+ add_deep_lore()
/obj/item/melee/baton/add_weapon_description()
AddElement(/datum/element/weapon_description, attached_proc = PROC_REF(add_baton_notes))
@@ -96,70 +97,100 @@
readout += "\nThe effects of each strike can be mitigated by utilizing [span_warning("[armour_type_against_stun]")] armor."
- readout += "\nIt has a stun armor-piercing capability of [span_warning("[get_stun_penetration_value()]%")]."
+ readout += "\nIt has a stun armor-piercing capability of [span_warning("[stun_armour_penetration]%")]."
return readout.Join("\n")
-/// Checks if we can actually USE the baton. Impure
-/obj/item/melee/baton/proc/can_baton(mob/living/target, mob/living/user)
+/obj/item/melee/baton/proc/add_deep_lore()
+ return
+
+#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))
@@ -205,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))
@@ -229,8 +260,7 @@
var/mob/living/carbon/human/human_target = target
if(prob(force_say_chance))
human_target.force_say()
- var/effective_armour_penetration = get_stun_penetration_value()
- var/armour_block = target.run_armor_check(null, armour_type_against_stun, null, null, effective_armour_penetration)
+ var/armour_block = target.run_armor_check(null, 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))
@@ -275,38 +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)
-
-/// Handles the penetration value of our baton, called during baton_effect()
-/obj/item/melee/baton/proc/get_stun_penetration_value()
- return stun_armour_penetration
+#undef STUN_ATTACK
/obj/item/conversion_kit
name = "conversion kit"
@@ -410,23 +409,22 @@
name = "bronze-capped telescopic baton"
desc = "A compact yet robust personal defense weapon. Can be concealed when folded. This one is ranked BRONZE, and thus has mediocre penetrative power."
icon_state = "telebaton_bronze"
- stun_armour_penetration = 20
/obj/item/melee/baton/telescopic/silver
name = "silver-capped telescopic baton"
desc = "A compact yet robust personal defense weapon. Can be concealed when folded. This one is ranked SILVER, and thus has decent penetrative power."
icon_state = "telebaton_silver"
- stun_armour_penetration = 40
+ stun_armour_penetration = 30 // strong enough to pen sec armor
/obj/item/melee/baton/telescopic/gold
name = "gold-capped telescopic baton"
desc = "A compact yet robust personal defense weapon. Can be concealed when folded. This one is ranked GOLD, and thus has exceptional penetrative power."
icon_state = "telebaton_gold"
- stun_armour_penetration = 60
+ stun_armour_penetration = 50 // strong enough to pen syndicate modsuits
/obj/item/melee/baton/telescopic/contractor_baton
name = "contractor baton"
- desc = "A compact, specialised baton assigned to Syndicate contractors. Applies light electrical shocks to targets."
+ desc = "A high tech telescopic stun baton, as developed by Cybersun Industries. Delivers a precise shock to a target's central nervous system to incapacitate them."
icon = 'icons/obj/weapons/baton.dmi'
icon_state = "contractor_baton"
worn_icon_state = "contractor_baton"
@@ -440,7 +438,7 @@
cooldown = 2.5 SECONDS
force_say_chance = 80 //very high force say chance because it's funny
stamina_damage = 85
- stun_armour_penetration = 40
+ stun_armour_penetration = 30 // strong enough to pen sec armor
clumsy_knockdown_time = 24 SECONDS
affect_cyborg = TRUE
wait_desc = "still charging!"
@@ -459,7 +457,7 @@
/obj/item/melee/baton/security
name = "stun baton"
- desc = "A stun baton for incapacitating people with."
+ desc = "The Secure Apprehension Device, as developed by Nanotrasen. Delivers a precise shock to a target's central nervous system to incapacitate them."
desc_controls = "Left click to stun, right click to harm."
icon = 'icons/obj/weapons/baton.dmi'
icon_state = "stunbaton"
@@ -476,8 +474,6 @@
force_say_chance = 50
stamina_damage = 60
armour_type_against_stun = ENERGY
- // This value is added to our stun armour penetration when called by get_stun_penetration_value(). For giving some batons extra OOMPH.
- var/additional_stun_armour_penetration = 0
knockdown_time = 5 SECONDS
clumsy_knockdown_time = 15 SECONDS
cooldown = 2.5 SECONDS
@@ -509,8 +505,6 @@
var/convertible = TRUE //if it can be converted with a conversion kit
///Whether or not our inhand changes when active.
var/active_changes_inhand = TRUE
- ///Whether or not our baton visibly changes the inhand sprite based on inserted cell
- var/tip_changes_color = TRUE
///When set, inhand_icon_state defaults to this instead of base_icon_state
var/base_inhand_state = null
@@ -581,10 +575,7 @@
if(active)
icon_state = "[base_icon_state]_active"
if(active_changes_inhand)
- if(tip_changes_color)
- inhand_icon_state = "[base_inhand]_active_[get_baton_tip_color()]"
- else
- inhand_icon_state = "[base_inhand]_active"
+ inhand_icon_state = "[base_inhand]_active"
return ..()
if(!cell)
icon_state = "[base_icon_state]_nocell"
@@ -646,35 +637,7 @@
/// Toggles the stun baton's light
/obj/item/melee/baton/security/proc/toggle_light()
- set_light_color(get_baton_tip_color(TRUE))
set_light_on(!light_on)
- return
-
-/// Change our baton's top color based on the contained cell.
-/obj/item/melee/baton/security/proc/get_baton_tip_color(set_light = FALSE)
- var/tip_type_to_set
- var/tip_light_to_set
-
- if(cell)
- var/chargepower = cell.maxcharge
- var/zap_value = clamp(chargepower/STANDARD_CELL_CHARGE, 0, 100)
- switch(zap_value)
- if(-INFINITY to 10)
- tip_type_to_set = "orange"
- tip_light_to_set = LIGHT_COLOR_ORANGE
- if(11 to 20)
- tip_type_to_set = "red"
- tip_light_to_set = LIGHT_COLOR_INTENSE_RED
- if(21 to 30)
- tip_type_to_set = "green"
- tip_light_to_set = LIGHT_COLOR_GREEN
- if(31 to INFINITY)
- tip_type_to_set = "blue"
- tip_light_to_set = LIGHT_COLOR_BLUE
- else
- tip_type_to_set = "orange"
-
- return set_light ? tip_light_to_set : tip_type_to_set
/obj/item/melee/baton/security/proc/turn_on(mob/user)
active = TRUE
@@ -703,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))
@@ -734,13 +687,6 @@
stun_override = 0 //Avoids knocking people down prematurely.
return ..()
-/obj/item/melee/baton/security/get_stun_penetration_value()
- if(cell)
- var/chargepower = cell.maxcharge
- var/zap_pen = clamp(chargepower/STANDARD_CELL_CHARGE, 0, 100)
- return zap_pen + additional_stun_armour_penetration
- return stun_armour_penetration + additional_stun_armour_penetration
-
/*
* After a target is hit, we apply some status effects.
* After a period of time, we then check to see what stun duration we give.
@@ -808,6 +754,56 @@
/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"
+ desc = "It's a sword. It stuns. What more could you want?"
+ icon_state = "stunsword"
+ inhand_icon_state = "stunsword"
+ base_icon_state = "stunsword"
+ lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/64x64_righthand.dmi'
+ hitsound = 'sound/items/weapons/bladeslice.ogg'
+ attack_verb_continuous = list("attacks", "slashes", "slices", "tears", "lacerates", "rips", "dices", "cuts")
+ attack_verb_simple = list("attack", "slash", "slice", "tear", "lacerate", "rip", "dice", "cut")
+ inhand_x_dimension = 64
+ inhand_y_dimension = 64
+ w_class = WEIGHT_CLASS_HUGE
+ sharpness = SHARP_EDGED
+ force = 30
+ throwforce = 10
+ wound_bonus = 0
+ exposed_wound_bonus = 30
+ stun_armour_penetration = 40
+ throw_stun_chance = 60
+ convertible = FALSE
+
+ obj_flags = UNIQUE_RENAME
+
+/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
+ preload_cell_type = /obj/item/stock_parts/power_store/cell/bluespace // 40% stun_armour_penetration
+
//Makeshift stun baton. Replacement for stun gloves.
/obj/item/melee/baton/security/cattleprod
name = "stunprod"
@@ -830,7 +826,7 @@
slot_flags = ITEM_SLOT_BACK
convertible = FALSE
active_changes_inhand = FALSE
- tip_changes_color = 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
@@ -839,6 +835,9 @@
. = ..()
sparkler = new (src)
+/obj/item/melee/baton/security/cattleprod/add_deep_lore()
+ return
+
/obj/item/melee/baton/security/cattleprod/attackby(obj/item/item, mob/user, list/modifiers, list/attack_modifiers)//handles sticking a crystal onto a stunprod to make an improved cattleprod
if(!istype(item, /obj/item/stack))
return ..()
@@ -871,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!"
@@ -896,13 +895,15 @@
throw_stun_chance = 99 //Have you prayed today?
convertible = FALSE
active_changes_inhand = FALSE
- tip_changes_color = FALSE
custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5, /datum/material/glass = SHEET_MATERIAL_AMOUNT*2, /datum/material/silver = SHEET_MATERIAL_AMOUNT*5, /datum/material/gold = SHEET_MATERIAL_AMOUNT)
/obj/item/melee/baton/security/boomerang/Initialize(mapload)
. = ..()
AddComponent(/datum/component/boomerang, throw_range + 2, TRUE)
+/obj/item/melee/baton/security/boomerang/add_deep_lore()
+ return
+
/obj/item/melee/baton/security/boomerang/loaded //Same as above, comes with a cell.
preload_cell_type = /obj/item/stock_parts/power_store/cell/high
@@ -915,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"
@@ -939,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
@@ -958,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"
@@ -977,7 +969,7 @@
knockdown_time = 0.25 SECONDS
demolition_mod = 1.5
stamina_damage = 30 // 4 hit stamcrit
- stun_armour_penetration = 30 // bronze-silver telescopic
+ stun_armour_penetration = 25 // bronze-silver telescopic
force = 16 // 7 hit crit
exposed_wound_bonus = 5
@@ -1000,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
@@ -1010,3 +1002,56 @@
melee_attack_chain(owner, attacker, LEFT_CLICK)
return ..()
+
+// Deep Lore //
+
+/obj/item/melee/baton/security/add_deep_lore()
+ AddElement(/datum/element/examine_lore, \
+ lore_hint = span_notice("You can [EXAMINE_HINT("look closer")] to learn a little more about [src]."), \
+ lore = "The Secure Apprehension Device (sometimes referred to as the SAD in the officer training manuals) is \
+ the unholy union of a mace and a cattleprod. This nonlethal device was designed to put a stop to ruffians, \
+ scoundrels, ne'er-do-wells and criminals wherever they may rear their ugly heads. \
+ \
+ A symbol of Nanotrasen security forces, the stun baton is the primary tool officers employ against the \
+ unlawful scum and villainy of the Spinward and abroad. Trained to 'baton first, interrogate later', \
+ Nanotrasen security has long since earned itself a mixed reputation. Able to rapidly shut down the \
+ central nervous system of a criminal with only a few direct applications of the conductive striking head \
+ of the device, few would-be troublemakers want to find themselves on the wrong end of an officer brandishing \
+ this baton. \
+ \
+ TerraGov law enforcement has avoided the adoption of stun batons due to various ethical dilemmas posed by \
+ their usage, largely because of the longterm physical and mental ramifications of being struck by a human cattleprod. \
+ Citizens' rights advocacy groups protest against the proliferation of stun batons as a policing tool, \
+ arguing that they are 'inhumane' and 'authoritarian'. Nanotrasen, on the other hand, has had no such qualms \
+ when deploying stun batons as a compliance measure across all of their existing stations and facilities against \
+ unruly members of staff." \
+ )
+
+// Contractor Baton
+
+/obj/item/melee/baton/telescopic/contractor_baton/add_deep_lore()
+ AddElement(/datum/element/examine_lore, \
+ lore_hint = span_notice("You can [EXAMINE_HINT("look closer")] to learn a little more about [src]."), \
+ lore = "The Contract Acquisition Device (sometimes referred to as the CAD in encrypted correspondence) is \
+ one of the more frequently encountered examples of Cybersun Industries weaponry. Extremely similar to Nanotrasen's \
+ own Secure Apprehension Device (also simply known as the stun baton), the contractor baton is able to induce \
+ CNS disruption in a target to render them helpless. It is also capable of devastating blunt force trauma if \
+ used as a bludgeon. The contractor baton is also capable of telescopic deployment, allowing for discretion while \
+ making an approach towards a target. \
+ \
+ The contractor baton is famously associated with contractors, elite Cybersun field agents. While the standard \
+ agent would often be tasked with sabotage, terrorism, murder or theft, contractors have the critical task of \
+ kidnapping high value personnel. Anyone with the potential to possess classified or sensitive data about Nanotrasen \
+ security systems and devices could be a target for Cybersun. \
+ \
+ Extracting this information is most easily performed on living subjects. As such, the contractor baton was designed \
+ with nonlethal incapacitation in mind. However, Cybersun Industries has long since found workarounds for extracting \
+ data from the recently deceased, should the contractor find themselves with only a corpse left to send back. Death \
+ may not spare you from the machinations of Cybersun Industries if they deem you a valuable asset towards their goals. \
+ \
+ Nanotrasen utilizes a number of countermeasures to contractor insurgencies, such as employing selective memory wiping \
+ or falsified memory injection, the establishment of 'dummy' command staff through the artificial acceleration \
+ of otherwise incompetent but useful crewmembers (whose incompetence will often result in an acceptable degree \
+ of operational disruption), which provides convenient scapegoats in the event of a security breach as well as \
+ frequent staff turnover and reassignment." \
+ )
diff --git a/code/game/objects/items/melee/chainofcommand.dm b/code/game/objects/items/melee/chainofcommand.dm
index 8009b031df4c..ed0482f4abc1 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 f5005a23b613..8c4505490664 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
@@ -329,6 +335,10 @@
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
light_color = COLOR_RED
+/obj/item/melee/energy/sword/pirate/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/cuffable_item) //closed sword guard
+
/// Energy blades, which are effectively perma-extended energy swords
/obj/item/melee/energy/blade
name = "energy blade"
@@ -380,13 +390,9 @@
icon_angle = 0
/obj/item/melee/energy/sword/surplus
- name = "\improper Type I 'Iaito' energy sword"
- desc = "Oversized, overengineered, and mass-produced. The two blades help make up for the poor cutting plane the emitter generates. Hopefully. \
- Supposedly, this version of the energy sword was a Waffle Corp prototype that was first trialed in a variety of armed conflicts around the interstellar \
- frontier. The success rate, and survival of its users, were abysmally low. To make matters worse, they had made so many of these swords (accidentally) that \
- it would cost the company more disposing of them than trying to offload them to raise a quick buck. Thus, the 'Iaito' was 'born'. Often found in the hands of \
- grunts, mooks, goons, criminals, wannabe assassins or lunatics. You may or may not fit into one of these categories if you are genuinely attempting to kill someone\
- with this 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"
inhand_icon_state = "surplus_e_sword"
base_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
@@ -413,6 +420,18 @@
/obj/item/melee/energy/sword/surplus/Initialize(mapload)
. = ..()
RegisterSignal(src, COMSIG_TRANSFORMING_PRE_TRANSFORM, PROC_REF(check_power))
+ AddElement(/datum/element/examine_lore, \
+ 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. \
+ \
+ Unfortunately, the success rate of the platform, along with the survival rate of its users, was abysmally low. \
+ To make matters worse, initial overestimation of its effectiveness meant that by the time its myriad flaws reared their heads, production had already \
+ reached such a level that the company behind its manufacture would have to pay more to properly disassemble and dispose of the swords, \
+ than if they started offloading them onto markets of various legitimacy to try and recoup costs. Thus, the Iaito was 'born'.
\
+ As a consequence of its haphazard proliferation and its low market price compared to later, improved energy sword models, examples of the Iaito are \
+ typically found in the hands of various grunts, mooks, goons, criminals, wannabe assassins, lunatics, or those otherwise embroiled in \
+ a desperate struggle. If you're actually trying to kill someone with this sword, you may or may not fit into one or more of those categories." \
+ )
/obj/item/melee/energy/sword/surplus/examine(mob/user)
. = ..()
@@ -486,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!")
@@ -506,3 +545,49 @@
playsound(src, 'sound/items/baton/telescopic_baton_folded_pickup.ogg', 40, TRUE)
COOLDOWN_START(src, jiggle_cooldown, 1 SECONDS)
return TRUE
+
+// Null rod variants
+
+/obj/item/melee/energy/sword/nullrod
+ name = "light energy sword"
+ desc = "If you strike me down, I shall become more robust than you can possibly imagine."
+ throw_speed = 3
+ throw_range = 4
+ block_chance = 30
+ armour_penetration = 0
+ wound_bonus = -10
+ demolition_mod = 1
+ 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)
+
+/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
+
+ 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/energy/sword/nullrod/red
+ name = "dark energy sword"
+ desc = "Woefully ineffective when used on steep terrain."
+ sword_color_icon = "red"
+ light_color = COLOR_SOFT_RED
+
+/obj/item/melee/energy/sword/nullrod/pirate
+ name = "nautical energy cutlass"
+ desc = "Convincing HR that your religion involved piracy was no mean feat."
+ icon_state = "e_cutlass"
+ inhand_icon_state = "e_cutlass"
+ base_icon_state = "e_cutlass"
+ sword_color_icon = null
+ light_color = COLOR_RED
diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm
index feac13198ce6..2f4defafa2cd 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
@@ -60,6 +60,7 @@
/obj/item/melee/sabre/Initialize(mapload)
. = ..()
+ AddElement(/datum/element/cuffable_item) //closed sword guard
AddComponent(/datum/component/jousting)
//fast and effective, but as a sword, it might damage the results.
AddComponent(/datum/component/butchering, \
@@ -93,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 ..()
@@ -138,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)
@@ -173,10 +174,11 @@
/obj/item/melee/parsnip_sabre/Initialize(mapload)
. = ..()
+ AddElement(/datum/element/cuffable_item) //closed sword guard
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 ..()
@@ -212,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)
@@ -241,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
@@ -511,7 +514,7 @@
material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_GREYSCALE | MATERIAL_AFFECT_STATISTICS //Material type changes the prefix as well as the color.
custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 4.5, /datum/material/wood = SHEET_MATERIAL_AMOUNT * 1.5) //Defaults to an Iron Mace.
slot_flags = ITEM_SLOT_BELT
- force = 14
+ force = 16
w_class = WEIGHT_CLASS_BULKY
throwforce = 8
block_chance = 10
@@ -541,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/mop.dm b/code/game/objects/items/mop.dm
index 591dd127411c..a4a738469cd5 100644
--- a/code/game/objects/items/mop.dm
+++ b/code/game/objects/items/mop.dm
@@ -24,6 +24,7 @@
/obj/item/reagent_containers/cup/bucket,
/obj/structure/mop_bucket,
))
+ custom_price = 20 // DARKPACK EDIT ADD - ECONOMY
/obj/item/mop/apply_fantasy_bonuses(bonus)
. = ..()
diff --git a/code/game/objects/items/pet_carrier.dm b/code/game/objects/items/pet_carrier.dm
index ee3b323eec02..dc93e9364390 100644
--- a/code/game/objects/items/pet_carrier.dm
+++ b/code/game/objects/items/pet_carrier.dm
@@ -47,6 +47,7 @@
/obj/item/pet_carrier/Initialize(mapload)
. = ..()
register_context()
+ AddElement(/datum/element/cuffable_item)
/obj/item/pet_carrier/Destroy()
if(occupants.len)
diff --git a/code/game/objects/items/piggy_bank.dm b/code/game/objects/items/piggy_bank.dm
index 9678ab72f164..071faaca6900 100644
--- a/code/game/objects/items/piggy_bank.dm
+++ b/code/game/objects/items/piggy_bank.dm
@@ -176,7 +176,7 @@
initial_value = PAYCHECK_CREW //it takes about 66 shifts for it to hit its max value on its own.
maximum_savings_per_shift = PAYCHECK_COMMAND * 16 //and 2 if you actively use it.
-/* DARKPACK EDIT REMOVAL
+/* // DARKPACK EDIT REMOVAL
/obj/item/piggy_bank/vault/Initialize(mapload)
. = ..()
//one piggy bank should exist, preferibly inside the vault's safe.
diff --git a/code/game/objects/items/pinpointer.dm b/code/game/objects/items/pinpointer.dm
index 2e0f7af61021..2e23ffdfbb77 100644
--- a/code/game/objects/items/pinpointer.dm
+++ b/code/game/objects/items/pinpointer.dm
@@ -14,6 +14,9 @@
throw_speed = 3
throw_range = 7
custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 2.5)
+ sound_vary = TRUE
+ pickup_sound = SFX_GENERIC_DEVICE_PICKUP
+ drop_sound = SFX_GENERIC_DEVICE_DROP
var/active = FALSE
var/atom/movable/target //The thing we're searching for
var/minimum_range = 0 //at what range the pinpointer declares you to be at your destination
@@ -217,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/plushes.dm b/code/game/objects/items/plushes.dm
index f733481ae9b4..48e5f14d0c6e 100644
--- a/code/game/objects/items/plushes.dm
+++ b/code/game/objects/items/plushes.dm
@@ -19,13 +19,12 @@
var/obj/item/toy/plush/plush_child
var/obj/item/toy/plush/paternal_parent //who initiated creation
var/obj/item/toy/plush/maternal_parent //who owns, see love()
- var/static/list/breeding_blacklist = typecacheof(/obj/item/toy/plush/carpplushie/dehy_carp) // you cannot have sexual relations with this plush
var/list/scorned = list() //who the plush hates
var/list/scorned_by = list() //who hates the plush, to remove external references on Destroy()
var/heartbroken = FALSE
var/vowbroken = FALSE
var/young = FALSE
-///Prevents players from cutting stuffing out of a plushie if true
+ ///Prevents players from cutting stuffing out of a plushie if true
var/divine = FALSE
var/mood_message
var/list/love_message
@@ -34,6 +33,9 @@
var/list/vowbroken_message
var/list/parent_message
var/normal_desc
+ /// The type of offspring this plush generates. If not set, it'll default to the type itself on init.
+ var/offspring_type
+
//--end of love :'(--
/*
@@ -47,6 +49,7 @@
AddComponent(/datum/component/squeak, squeak_override)
AddElement(/datum/element/bed_tuckable, mapload, 6, -5, 90)
AddElement(/datum/element/toy_talk)
+ AddElement(/datum/element/cuffable_item)
//have we decided if Pinocchio goes in the blue or pink aisle yet?
if(gender == NEUTER)
@@ -55,6 +58,9 @@
else
gender = MALE
+ if(!offspring_type)
+ offspring_type = type
+
love_message = list("\n[src] is so happy, \he could rip a seam!")
partner_message = list("\n[src] has a ring on \his finger! It says bound to my dear [partner].")
heartbroken_message = list("\n[src] looks so sad.")
@@ -290,19 +296,15 @@
mood_message = pick(partner_message)
update_desc()
-/obj/item/toy/plush/proc/plop(obj/item/toy/plush/Daddy)
- if(partner != Daddy)
+/obj/item/toy/plush/proc/plop(obj/item/toy/plush/daddy)
+ if(partner != daddy)
return FALSE //we do not have bastards in our toyshop
- if(is_type_in_typecache(Daddy, breeding_blacklist))
- return FALSE // some love is forbidden
-
- if(prob(50)) //it has my eyes
- plush_child = new type(get_turf(loc))
- else //it has your eyes
- plush_child = new Daddy.type(get_turf(loc))
+ // Ask the RNG if it looks more like mommy or daddy.
+ var/chosen_type = pick(offspring_type, daddy.offspring_type)
- plush_child.make_young(src, Daddy)
+ plush_child = new chosen_type(get_turf(loc))
+ plush_child.make_young(src, daddy)
/obj/item/toy/plush/proc/make_young(obj/item/toy/plush/Mama, obj/item/toy/plush/Dada)
if(Mama == Dada)
diff --git a/code/game/objects/items/pneumaticCannon.dm b/code/game/objects/items/pneumaticCannon.dm
deleted file mode 100644
index e8fe75c74b36..000000000000
--- a/code/game/objects/items/pneumaticCannon.dm
+++ /dev/null
@@ -1,346 +0,0 @@
-
-#define PCANNON_FIREALL 1
-#define PCANNON_FILO 2
-#define PCANNON_FIFO 3
-///Defines for the pressure strength of the cannon
-#define LOW_PRESSURE 1
-#define MID_PRESSURE 2
-#define HIGH_PRESSURE 3
-
-/obj/item/pneumatic_cannon
- name = "pneumatic cannon"
- desc = "A gas-powered cannon that can fire any object loaded into it."
- w_class = WEIGHT_CLASS_BULKY
- force = 8 //Very heavy
- attack_verb_continuous = list("bludgeons", "smashes", "beats")
- attack_verb_simple = list("bludgeon", "smash", "beat")
- icon = 'icons/obj/weapons/pneumaticCannon.dmi'
- icon_state = "pneumaticCannon"
- inhand_icon_state = "bulldog"
- 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
- 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
- var/gasPerThrow = 3 //How much gas is drawn from a tank's pressure to fire
- var/list/loadedItems = list() //The items loaded into the cannon that will be fired out
- var/pressure_setting = LOW_PRESSURE //How powerful the cannon is - higher pressure = more gas but more powerful throws
- var/checktank = TRUE
- var/range_multiplier = 1
- var/throw_amount = 1 //How many items to throw per fire
- var/fire_mode = PCANNON_FIFO
- var/automatic = FALSE
- var/needs_air = TRUE
- var/clumsyCheck = TRUE
- var/list/allowed_typecache //Leave as null to allow all.
- var/charge_amount = 1
- var/charge_ticks = 1
- var/charge_tick = 0
- var/charge_type
- var/selfcharge = FALSE
- var/fire_sound = 'sound/items/weapons/sonic_jackhammer.ogg'
- var/spin_item = TRUE //Do the projectiles spin when launched?
- trigger_guard = TRIGGER_GUARD_NORMAL
-
-
-/datum/armor/item_pneumatic_cannon
- fire = 60
- acid = 50
-
-/obj/item/pneumatic_cannon/Initialize(mapload)
- . = ..()
- if(selfcharge)
- init_charge()
-
-/obj/item/pneumatic_cannon/proc/init_charge() //wrapper so it can be vv'd easier
- START_PROCESSING(SSobj, src)
-
-/obj/item/pneumatic_cannon/process()
- charge_tick++
- if(charge_tick >= charge_ticks && charge_type)
- fill_with_type(charge_type, charge_amount)
-
-/obj/item/pneumatic_cannon/Destroy()
- STOP_PROCESSING(SSobj, src)
- return ..()
-
-/obj/item/pneumatic_cannon/CanItemAutoclick()
- return automatic
-
-/obj/item/pneumatic_cannon/proc/pressure_setting_to_text(pressure_setting)
- switch(pressure_setting)
- if(LOW_PRESSURE)
- return "low"
- if(MID_PRESSURE)
- return "medium"
- if(HIGH_PRESSURE)
- return "high"
- else
- CRASH("Invalid pressure setting: [pressure_setting]!")
-
-/obj/item/pneumatic_cannon/examine(mob/user)
- . = ..()
- var/list/out = list()
- if(!in_range(user, src))
- out += span_notice("You'll need to get closer to see any more.")
- return
- for(var/obj/item/I in loadedItems)
- out += span_info("[icon2html(I, user)] It has \a [I] loaded.")
- CHECK_TICK
- if(tank)
- out += span_notice("[icon2html(tank, user)] It has \a [tank] mounted onto it. It could be removed with a screwdriver.")
- if(needs_air == TRUE)
- . += span_notice("Use a wrench to change the pressure level. Current output level is [pressure_setting_to_text(pressure_setting)].")
- . += out.Join("\n")
-
-/obj/item/pneumatic_cannon/screwdriver_act(mob/living/user, obj/item/tool)
- if(tank)
- tool.play_tool_sound(src)
- updateTank(tank, 1, user)
- return TRUE
-
-/obj/item/pneumatic_cannon/wrench_act(mob/living/user, obj/item/tool)
- if(needs_air == FALSE)
- return
- playsound(src, 'sound/items/tools/ratchet.ogg', 50, TRUE)
- pressure_setting = pressure_setting >= HIGH_PRESSURE ? LOW_PRESSURE : pressure_setting + 1
- balloon_alert(user, "output level set to [pressure_setting_to_text(pressure_setting)]")
- return TRUE
-
-/obj/item/pneumatic_cannon/attackby(obj/item/W, mob/living/user, list/modifiers, list/attack_modifiers)
- if(user.combat_mode)
- return ..()
- if(istype(W, /obj/item/tank/internals))
- if(needs_air == FALSE)
- return
- if(!tank)
- var/obj/item/tank/internals/IT = W
- if(IT.volume <= 3)
- to_chat(user, span_warning("\The [IT] is too small for \the [src]."))
- return
- updateTank(W, 0, user)
- else if(W.type == type)
- to_chat(user, span_warning("You're fairly certain that putting a pneumatic cannon inside another pneumatic cannon would cause a spacetime disruption."))
- else if(loadedWeightClass >= maxWeightClass)
- to_chat(user, span_warning("\The [src] can't hold any more items!"))
- else if(isitem(W))
- var/obj/item/IW = W
- load_item(IW, user)
-
-/obj/item/pneumatic_cannon/proc/can_load_item(obj/item/I, mob/user)
- if(!istype(I)) //Players can't load non items, this allows for admin varedit inserts.
- return TRUE
- if(allowed_typecache && !is_type_in_typecache(I, allowed_typecache))
- if(user)
- to_chat(user, span_warning("[I] won't fit into [src]!"))
- return
- if((loadedWeightClass + I.w_class) > maxWeightClass) //Only make messages if there's a user
- if(user)
- to_chat(user, span_warning("\The [I] won't fit into \the [src]!"))
- return FALSE
- if(I.w_class > w_class)
- if(user)
- to_chat(user, span_warning("\The [I] is too large to fit into \the [src]!"))
- return FALSE
- return TRUE
-
-/obj/item/pneumatic_cannon/proc/load_item(obj/item/I, mob/user)
- if(!can_load_item(I, user))
- return FALSE
- if(user) //Only use transfer proc if there's a user, otherwise just set loc.
- if(!user.transferItemToLoc(I, src))
- return FALSE
- to_chat(user, span_notice("You load \the [I] into \the [src]."))
- else
- I.forceMove(src)
- loadedItems += I
- if(isitem(I))
- loadedWeightClass += I.w_class
- else
- loadedWeightClass++
- return TRUE
-
-/obj/item/pneumatic_cannon/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
- if(user.combat_mode)
- return ITEM_INTERACT_SKIP_TO_ATTACK
- Fire(user, interacting_with)
- return ITEM_INTERACT_SUCCESS
-
-/obj/item/pneumatic_cannon/ranged_interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
- Fire(user, interacting_with)
- return ITEM_INTERACT_SUCCESS
-
-/obj/item/pneumatic_cannon/proc/Fire(mob/living/user, atom/target)
- if(!istype(user) && !target)
- return
- var/discharge = 0
- if(!can_trigger_gun(user))
- return
- if(!loadedItems || !loadedWeightClass)
- to_chat(user, span_warning("\The [src] has nothing loaded."))
- return
- if(!tank && checktank)
- to_chat(user, span_warning("\The [src] can't fire without a source of gas."))
- return
- if(HAS_TRAIT(user, TRAIT_PACIFISM))
- to_chat(user, span_warning("You can't bring yourself to fire \the [src]! You don't want to risk harming anyone...") )
- return
- if(tank && !tank.remove_air(gasPerThrow * pressure_setting))
- to_chat(user, span_warning("\The [src] lets out a weak hiss and doesn't react!"))
- return
- if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(75) && clumsyCheck && iscarbon(user))
- var/mob/living/carbon/C = user
- C.visible_message(span_warning("[C] loses [C.p_their()] grip on [src], causing it to go off!"), span_userdanger("[src] slips out of your hands and goes off!"))
- C.dropItemToGround(src, TRUE)
- if(prob(10))
- target = get_turf(user)
- else
- var/list/possible_targets = range(3,src)
- target = pick(possible_targets)
- discharge = 1
- if(!discharge)
- user.visible_message(span_danger("[user] fires \the [src]!"), \
- span_danger("You fire \the [src]!"))
- log_combat(user, target, "fired at", src)
- var/turf/T = get_target(target, get_turf(src))
- playsound(src, fire_sound, 50, TRUE)
- fire_items(T, user)
- if(pressure_setting >= 3 && iscarbon(user))
- var/mob/living/carbon/C = user
- C.visible_message(span_warning("[C] is thrown down by the force of the cannon!"), span_userdanger("[src] slams into your shoulder, knocking you down!"))
- C.Paralyze(60)
-
-/obj/item/pneumatic_cannon/proc/fire_items(turf/target, mob/user)
- if(fire_mode == PCANNON_FIREALL)
- for(var/obj/item/ITD in loadedItems) //Item To Discharge
- if(!throw_item(target, ITD, user))
- break
- else
- for(var/i in 1 to throw_amount)
- if(!loadedItems.len)
- break
- var/atom/movable/I
- if(fire_mode == PCANNON_FILO)
- I = loadedItems[loadedItems.len]
- else
- I = loadedItems[1]
- if(!throw_item(target, I, user))
- break
-
-/obj/item/pneumatic_cannon/proc/throw_item(turf/target, atom/movable/AM, mob/user)
- if(!istype(AM))
- return FALSE
- loadedItems -= AM
- if(isitem(AM))
- var/obj/item/I = AM
- loadedWeightClass -= I.w_class
- else
- loadedWeightClass--
- AM.forceMove(get_turf(src))
- AM.throw_at(target, pressure_setting * 10 * range_multiplier, pressure_setting * 2, user, spin_item)
- return TRUE
-
-/obj/item/pneumatic_cannon/proc/get_target(turf/target, turf/starting)
- if(range_multiplier == 1)
- return target
- var/x_o = (target.x - starting.x)
- var/y_o = (target.y - starting.y)
- var/new_x = clamp((starting.x + (x_o * range_multiplier)), 0, world.maxx)
- var/new_y = clamp((starting.y + (y_o * range_multiplier)), 0, world.maxy)
- var/turf/newtarget = locate(new_x, new_y, starting.z)
- return newtarget
-
-/obj/item/pneumatic_cannon/Exited(atom/movable/gone, direction)
- . = ..()
- if(loadedItems.Remove(gone))
- var/obj/item/item = gone
- if(istype(item))
- loadedWeightClass -= item.w_class
- else
- loadedWeightClass--
- else if (gone == tank)
- tank = null
- update_appearance()
-
-/obj/item/pneumatic_cannon/ghetto //Obtainable by improvised methods; more gas per use, less capacity
- name = "improvised pneumatic cannon"
- desc = "A gas-powered, object-firing cannon made out of common parts."
- force = 5
- maxWeightClass = 10
- gasPerThrow = 5
-
-/obj/item/pneumatic_cannon/proc/updateTank(obj/item/tank/internals/thetank, removing = 0, mob/living/carbon/human/user)
- if(removing)
- if(!tank)
- return
- to_chat(user, span_notice("You detach \the [thetank] from \the [src]."))
- tank.forceMove(user.drop_location())
- user.put_in_hands(tank)
- tank = null
- if(!removing)
- if(tank)
- to_chat(user, span_warning("\The [src] already has a tank."))
- return
- if(!user.transferItemToLoc(thetank, src))
- return
- to_chat(user, span_notice("You hook \the [thetank] up to \the [src]."))
- tank = thetank
- update_appearance()
-
-/obj/item/pneumatic_cannon/update_overlays()
- . = ..()
- if(!tank)
- return
- . += tank.icon_state
-
-/obj/item/pneumatic_cannon/proc/fill_with_type(type, amount)
- if(!ispath(type, /obj) && !ispath(type, /mob))
- return FALSE
- var/loaded = 0
- for(var/i in 1 to amount)
- var/obj/item/I = new type
- if(!load_item(I, null))
- qdel(I)
- return loaded
- loaded++
- CHECK_TICK
-
-/obj/item/pneumatic_cannon/pie
- name = "pie cannon"
- desc = "Load cream pie for optimal results."
- force = 10
- icon_state = "piecannon"
- gasPerThrow = 0
- checktank = FALSE
- range_multiplier = 3
- fire_mode = PCANNON_FIFO
- throw_amount = 1
- maxWeightClass = 150 //50 pies. :^)
- needs_air = FALSE
- clumsyCheck = FALSE
- var/static/list/pie_typecache = typecacheof(/obj/item/food/pie)
-
-/obj/item/pneumatic_cannon/pie/Initialize(mapload)
- . = ..()
- allowed_typecache = pie_typecache
-
-/obj/item/pneumatic_cannon/pie/selfcharge
- automatic = TRUE
- selfcharge = TRUE
- charge_type = /obj/item/food/pie/cream
- maxWeightClass = 60 //20 pies.
-
-/obj/item/pneumatic_cannon/pie/selfcharge/cyborg
- name = "low velocity pie cannon"
- automatic = FALSE
- charge_type = /obj/item/food/pie/cream/nostun
- maxWeightClass = 6 //2 pies
- charge_ticks = 2 //4 second/pie
-
-#undef PCANNON_FIREALL
-#undef PCANNON_FILO
-#undef PCANNON_FIFO
-#undef LOW_PRESSURE
-#undef MID_PRESSURE
-#undef HIGH_PRESSURE
diff --git a/code/game/objects/items/pneumatic_cannon.dm b/code/game/objects/items/pneumatic_cannon.dm
new file mode 100644
index 000000000000..8ea0ee60b67a
--- /dev/null
+++ b/code/game/objects/items/pneumatic_cannon.dm
@@ -0,0 +1,347 @@
+
+#define PCANNON_FIREALL 1
+#define PCANNON_FILO 2
+#define PCANNON_FIFO 3
+///Defines for the pressure strength of the cannon
+#define LOW_PRESSURE 1
+#define MID_PRESSURE 2
+#define HIGH_PRESSURE 3
+
+/obj/item/pneumatic_cannon
+ name = "pneumatic cannon"
+ desc = "A gas-powered cannon that can fire any object loaded into it."
+ w_class = WEIGHT_CLASS_BULKY
+ force = 8 //Very heavy
+ attack_verb_continuous = list("bludgeons", "smashes", "beats")
+ attack_verb_simple = list("bludgeon", "smash", "beat")
+ icon = 'icons/obj/weapons/pneumaticCannon.dmi'
+ icon_state = "pneumaticCannon"
+ inhand_icon_state = "bulldog"
+ 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
+ var/gasPerThrow = 3 //How much gas is drawn from a tank's pressure to fire
+ var/list/loadedItems = list() //The items loaded into the cannon that will be fired out
+ var/pressure_setting = LOW_PRESSURE //How powerful the cannon is - higher pressure = more gas but more powerful throws
+ var/checktank = TRUE
+ var/range_multiplier = 1
+ var/throw_amount = 1 //How many items to throw per fire
+ var/fire_mode = PCANNON_FIFO
+ var/automatic = FALSE
+ var/needs_air = TRUE
+ var/clumsyCheck = TRUE
+ var/list/allowed_typecache //Leave as null to allow all.
+ var/charge_amount = 1
+ var/charge_ticks = 1
+ var/charge_tick = 0
+ var/charge_type
+ var/selfcharge = FALSE
+ var/fire_sound = 'sound/items/weapons/sonic_jackhammer.ogg'
+ var/spin_item = TRUE //Do the projectiles spin when launched?
+ trigger_guard = TRIGGER_GUARD_NORMAL
+
+
+/datum/armor/item_pneumatic_cannon
+ fire = 60
+ acid = 50
+
+/obj/item/pneumatic_cannon/Initialize(mapload)
+ . = ..()
+ if(selfcharge)
+ init_charge()
+
+/obj/item/pneumatic_cannon/proc/init_charge() //wrapper so it can be vv'd easier
+ START_PROCESSING(SSobj, src)
+
+/obj/item/pneumatic_cannon/process()
+ charge_tick++
+ if(charge_tick >= charge_ticks && charge_type)
+ fill_with_type(charge_type, charge_amount)
+
+/obj/item/pneumatic_cannon/Destroy()
+ STOP_PROCESSING(SSobj, src)
+ return ..()
+
+/obj/item/pneumatic_cannon/CanItemAutoclick()
+ return automatic
+
+/obj/item/pneumatic_cannon/proc/pressure_setting_to_text(pressure_setting)
+ switch(pressure_setting)
+ if(LOW_PRESSURE)
+ return "low"
+ if(MID_PRESSURE)
+ return "medium"
+ if(HIGH_PRESSURE)
+ return "high"
+ else
+ CRASH("Invalid pressure setting: [pressure_setting]!")
+
+/obj/item/pneumatic_cannon/examine(mob/user)
+ . = ..()
+ var/list/out = list()
+ if(!in_range(user, src))
+ out += span_notice("You'll need to get closer to see any more.")
+ return
+ for(var/obj/item/I in loadedItems)
+ out += span_info("[icon2html(I, user)] It has \a [I] loaded.")
+ CHECK_TICK
+ if(tank)
+ out += span_notice("[icon2html(tank, user)] It has \a [tank] mounted onto it. It could be removed with a screwdriver.")
+ if(needs_air == TRUE)
+ . += span_notice("Use a wrench to change the pressure level. Current output level is [pressure_setting_to_text(pressure_setting)].")
+ . += out.Join("\n")
+
+/obj/item/pneumatic_cannon/screwdriver_act(mob/living/user, obj/item/tool)
+ if(tank)
+ tool.play_tool_sound(src)
+ updateTank(tank, 1, user)
+ return TRUE
+
+/obj/item/pneumatic_cannon/wrench_act(mob/living/user, obj/item/tool)
+ if(needs_air == FALSE)
+ return
+ playsound(src, 'sound/items/tools/ratchet.ogg', 50, TRUE)
+ pressure_setting = pressure_setting >= HIGH_PRESSURE ? LOW_PRESSURE : pressure_setting + 1
+ balloon_alert(user, "output level set to [pressure_setting_to_text(pressure_setting)]")
+ return TRUE
+
+/obj/item/pneumatic_cannon/attackby(obj/item/W, mob/living/user, list/modifiers, list/attack_modifiers)
+ if(user.combat_mode)
+ return ..()
+ if(istype(W, /obj/item/tank/internals))
+ if(needs_air == FALSE)
+ return
+ if(!tank)
+ var/obj/item/tank/internals/IT = W
+ if(IT.volume <= 3)
+ to_chat(user, span_warning("\The [IT] is too small for \the [src]."))
+ return
+ updateTank(W, 0, user)
+ else if(W.type == type)
+ to_chat(user, span_warning("You're fairly certain that putting a pneumatic cannon inside another pneumatic cannon would cause a spacetime disruption."))
+ else if(loadedWeightClass >= maxWeightClass)
+ to_chat(user, span_warning("\The [src] can't hold any more items!"))
+ else if(isitem(W))
+ var/obj/item/IW = W
+ load_item(IW, user)
+
+/obj/item/pneumatic_cannon/proc/can_load_item(obj/item/I, mob/user)
+ if(!istype(I)) //Players can't load non items, this allows for admin varedit inserts.
+ return TRUE
+ if(allowed_typecache && !is_type_in_typecache(I, allowed_typecache))
+ if(user)
+ to_chat(user, span_warning("[I] won't fit into [src]!"))
+ return
+ if((loadedWeightClass + I.w_class) > maxWeightClass) //Only make messages if there's a user
+ if(user)
+ to_chat(user, span_warning("\The [I] won't fit into \the [src]!"))
+ return FALSE
+ if(I.w_class > w_class)
+ if(user)
+ to_chat(user, span_warning("\The [I] is too large to fit into \the [src]!"))
+ return FALSE
+ return TRUE
+
+/obj/item/pneumatic_cannon/proc/load_item(obj/item/I, mob/user)
+ if(!can_load_item(I, user))
+ return FALSE
+ if(user) //Only use transfer proc if there's a user, otherwise just set loc.
+ if(!user.transferItemToLoc(I, src))
+ return FALSE
+ to_chat(user, span_notice("You load \the [I] into \the [src]."))
+ else
+ I.forceMove(src)
+ loadedItems += I
+ if(isitem(I))
+ loadedWeightClass += I.w_class
+ else
+ loadedWeightClass++
+ return TRUE
+
+/obj/item/pneumatic_cannon/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ if(user.combat_mode)
+ return ITEM_INTERACT_SKIP_TO_ATTACK
+ Fire(user, interacting_with)
+ return ITEM_INTERACT_SUCCESS
+
+/obj/item/pneumatic_cannon/ranged_interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ Fire(user, interacting_with)
+ return ITEM_INTERACT_SUCCESS
+
+/obj/item/pneumatic_cannon/proc/Fire(mob/living/user, atom/target)
+ if(!istype(user) && !target)
+ return
+ var/discharge = 0
+ if(!can_trigger_gun(user))
+ return
+ if(!loadedItems || !loadedWeightClass)
+ to_chat(user, span_warning("\The [src] has nothing loaded."))
+ return
+ if(!tank && checktank)
+ to_chat(user, span_warning("\The [src] can't fire without a source of gas."))
+ return
+ if(HAS_TRAIT(user, TRAIT_PACIFISM))
+ to_chat(user, span_warning("You can't bring yourself to fire \the [src]! You don't want to risk harming anyone...") )
+ return
+ if(tank && !tank.remove_air(gasPerThrow * pressure_setting))
+ to_chat(user, span_warning("\The [src] lets out a weak hiss and doesn't react!"))
+ return
+ if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(75) && clumsyCheck && iscarbon(user))
+ var/mob/living/carbon/C = user
+ C.visible_message(span_warning("[C] loses [C.p_their()] grip on [src], causing it to go off!"), span_userdanger("[src] slips out of your hands and goes off!"))
+ C.dropItemToGround(src, TRUE)
+ if(prob(10))
+ target = get_turf(user)
+ else
+ var/list/possible_targets = range(3,src)
+ target = pick(possible_targets)
+ discharge = 1
+ if(!discharge)
+ user.visible_message(span_danger("[user] fires \the [src]!"), \
+ span_danger("You fire \the [src]!"))
+ log_combat(user, target, "fired at", src)
+ var/turf/T = get_target(target, get_turf(src))
+ playsound(src, fire_sound, 50, TRUE)
+ fire_items(T, user)
+ if(pressure_setting >= 3 && iscarbon(user))
+ var/mob/living/carbon/C = user
+ C.visible_message(span_warning("[C] is thrown down by the force of the cannon!"), span_userdanger("[src] slams into your shoulder, knocking you down!"))
+ C.Paralyze(60)
+
+/obj/item/pneumatic_cannon/proc/fire_items(turf/target, mob/user)
+ if(fire_mode == PCANNON_FIREALL)
+ for(var/obj/item/ITD in loadedItems) //Item To Discharge
+ if(!throw_item(target, ITD, user))
+ break
+ else
+ for(var/i in 1 to throw_amount)
+ if(!loadedItems.len)
+ break
+ var/atom/movable/I
+ if(fire_mode == PCANNON_FILO)
+ I = loadedItems[loadedItems.len]
+ else
+ I = loadedItems[1]
+ if(!throw_item(target, I, user))
+ break
+
+/obj/item/pneumatic_cannon/proc/throw_item(turf/target, atom/movable/AM, mob/user)
+ if(!istype(AM))
+ return FALSE
+ loadedItems -= AM
+ if(isitem(AM))
+ var/obj/item/I = AM
+ loadedWeightClass -= I.w_class
+ else
+ loadedWeightClass--
+ AM.forceMove(get_turf(src))
+ AM.throw_at(target, pressure_setting * 10 * range_multiplier, pressure_setting * 2, user, spin_item)
+ return TRUE
+
+/obj/item/pneumatic_cannon/proc/get_target(turf/target, turf/starting)
+ if(range_multiplier == 1)
+ return target
+ var/x_o = (target.x - starting.x)
+ var/y_o = (target.y - starting.y)
+ var/new_x = clamp((starting.x + (x_o * range_multiplier)), 0, world.maxx)
+ var/new_y = clamp((starting.y + (y_o * range_multiplier)), 0, world.maxy)
+ var/turf/newtarget = locate(new_x, new_y, starting.z)
+ return newtarget
+
+/obj/item/pneumatic_cannon/Exited(atom/movable/gone, direction)
+ . = ..()
+ if(loadedItems.Remove(gone))
+ var/obj/item/item = gone
+ if(istype(item))
+ loadedWeightClass -= item.w_class
+ else
+ loadedWeightClass--
+ else if (gone == tank)
+ tank = null
+ update_appearance()
+
+/obj/item/pneumatic_cannon/ghetto //Obtainable by improvised methods; more gas per use, less capacity
+ name = "improvised pneumatic cannon"
+ desc = "A gas-powered, object-firing cannon made out of common parts."
+ force = 5
+ maxWeightClass = 10
+ gasPerThrow = 5
+
+/obj/item/pneumatic_cannon/proc/updateTank(obj/item/tank/internals/thetank, removing = 0, mob/living/carbon/human/user)
+ if(removing)
+ if(!tank)
+ return
+ to_chat(user, span_notice("You detach \the [thetank] from \the [src]."))
+ tank.forceMove(user.drop_location())
+ user.put_in_hands(tank)
+ tank = null
+ if(!removing)
+ if(tank)
+ to_chat(user, span_warning("\The [src] already has a tank."))
+ return
+ if(!user.transferItemToLoc(thetank, src))
+ return
+ to_chat(user, span_notice("You hook \the [thetank] up to \the [src]."))
+ tank = thetank
+ update_appearance()
+
+/obj/item/pneumatic_cannon/update_overlays()
+ . = ..()
+ if(!tank)
+ return
+ . += tank.icon_state
+
+/obj/item/pneumatic_cannon/proc/fill_with_type(type, amount)
+ if(!ispath(type, /obj) && !ispath(type, /mob))
+ return FALSE
+ var/loaded = 0
+ for(var/i in 1 to amount)
+ var/obj/item/I = new type
+ if(!load_item(I, null))
+ qdel(I)
+ return loaded
+ loaded++
+ CHECK_TICK
+
+/obj/item/pneumatic_cannon/pie
+ name = "pie cannon"
+ desc = "Load cream pie for optimal results."
+ force = 10
+ icon_state = "piecannon"
+ gasPerThrow = 0
+ checktank = FALSE
+ range_multiplier = 3
+ fire_mode = PCANNON_FIFO
+ throw_amount = 1
+ maxWeightClass = 150 //50 pies. :^)
+ needs_air = FALSE
+ clumsyCheck = FALSE
+ var/static/list/pie_typecache = typecacheof(/obj/item/food/pie)
+
+/obj/item/pneumatic_cannon/pie/Initialize(mapload)
+ . = ..()
+ allowed_typecache = pie_typecache
+
+/obj/item/pneumatic_cannon/pie/selfcharge
+ automatic = TRUE
+ selfcharge = TRUE
+ charge_type = /obj/item/food/pie/cream
+ maxWeightClass = 60 //20 pies.
+
+/obj/item/pneumatic_cannon/pie/selfcharge/cyborg
+ name = "low velocity pie cannon"
+ automatic = FALSE
+ charge_type = /obj/item/food/pie/cream/nostun
+ maxWeightClass = 6 //2 pies
+ charge_ticks = 2 //4 second/pie
+
+#undef PCANNON_FIREALL
+#undef PCANNON_FILO
+#undef PCANNON_FIFO
+#undef LOW_PRESSURE
+#undef MID_PRESSURE
+#undef HIGH_PRESSURE
diff --git a/code/game/objects/items/rcd/RCD.dm b/code/game/objects/items/rcd/RCD.dm
index 892cbe70489f..1e531a2ddcc6 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 1d966d37670f..6c48d2f691d7 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 53e5ba0cb7dd..ccd2b9f50639 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 27e0b14b084d..88681dade527 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 043d99125c08..d14d78e6b99a 100644
--- a/code/game/objects/items/rcd/RPLD.dm
+++ b/code/game/objects/items/rcd/RPLD.dm
@@ -197,26 +197,24 @@
//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)
else
new blueprint(destination, FALSE, GLOB.plumbing_layers[current_layer])
+ useResource(cost, user)
return TRUE
/obj/item/construction/plumbing/proc/canPlace(turf/destination)
@@ -312,6 +310,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 50f973246c80..b552fc33d4e1 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 0d84fda683f2..e820a462ff53 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,8 +405,11 @@
/obj/item/claymore/weak
desc = "This one is rusted."
- force = 24
- armour_penetration = 10
+ icon = 'icons/obj/weapons/sword.dmi'
+ icon_state = "claymore_old"
+ worn_icon = 'icons/mob/clothing/back.dmi'
+ force = 30
+ armour_penetration = 15
/obj/item/claymore/weak/make_stabby()
AddComponent(/datum/component/alternative_sharpness, SHARP_POINTY, alt_continuous, alt_simple, -9)
diff --git a/code/game/objects/items/robot/items/generic.dm b/code/game/objects/items/robot/items/generic.dm
index d282ae01b7f6..aee8274d2b8e 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)
@@ -174,7 +174,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]!"),
@@ -201,7 +201,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)
@@ -373,7 +373,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)
@@ -386,18 +386,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 c68d4e0bb262..2c80fdc35e47 100644
--- a/code/game/objects/items/robot/items/hypo.dm
+++ b/code/game/objects/items/robot/items/hypo.dm
@@ -112,13 +112,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
@@ -178,10 +178,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
@@ -190,19 +192,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])."))
-
- 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])")
+ user.changeNext_move(CLICK_CD_MELEE)
+ 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 a9e94b7c0d9e..8236b58108c2 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 5dee6df43084..5264bca98bdf 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 a44bcd4e4870..e8a5a93ea666 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 cbf5b6aed52a..ed6cf5d63857 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
@@ -43,6 +43,7 @@
/obj/item/shield/Initialize(mapload)
. = ..()
AddElement(/datum/element/disarm_attack)
+ AddElement(/datum/element/cuffable_item) //I mean, it has a closed handle, right?
/obj/item/shield/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)
var/effective_block_chance = final_block_chance
@@ -53,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(.)
@@ -74,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)
@@ -115,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
@@ -129,6 +131,7 @@
block_chance = 40
max_integrity = 40
w_class = WEIGHT_CLASS_NORMAL
+ custom_materials = null
/obj/item/shield/kite
name = "kite shield"
@@ -165,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'
@@ -201,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)
. = ..()
@@ -343,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
@@ -477,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 8ed78cccc876..32b8c08747d6 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 671cad6780f2..6b70eb9cad8b 100644
--- a/code/game/objects/items/signs.dm
+++ b/code/game/objects/items/signs.dm
@@ -5,11 +5,12 @@
name = "blank picket sign"
desc = "It's blank."
force = 5
+ obj_flags = UNIQUE_RENAME | RENAME_NO_DESC
w_class = WEIGHT_CLASS_BULKY
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)
@@ -20,21 +21,14 @@
resistance_flags = NONE
actions_types = list(/datum/action/item_action/nano_picket_sign)
-/obj/item/picket_sign/proc/retext(mob/user, obj/item/writing_instrument)
- if(!user.can_write(writing_instrument))
- return
- var/txt = tgui_input_text(user, "What would you like to write on the sign?", "Sign Label", max_length = 30)
- if(txt && user.can_perform_action(src))
- playsound(src, SFX_WRITING_PEN, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE, SOUND_FALLOFF_EXPONENT + 3, ignore_walls = FALSE)
- label = txt
- name = "[label] sign"
- desc = "It reads: [label]"
+/obj/item/picket_sign/nameformat(input, user)
+ playsound(src, SFX_WRITING_PEN, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE, SOUND_FALLOFF_EXPONENT + 3, ignore_walls = FALSE)
+ label = input
+ AddComponent(/datum/component/rename, name, "It reads: [input]")
+ return "[input] sign"
-/obj/item/picket_sign/attackby(obj/item/W, mob/user, list/modifiers, list/attack_modifiers)
- if(IS_WRITING_UTENSIL(W))
- retext(user, W)
- else
- return ..()
+/obj/item/picket_sign/rename_reset()
+ label = initial(label)
/obj/item/picket_sign/attack_self(mob/living/carbon/human/user)
if(!COOLDOWN_FINISHED(src, picket_sign_cooldown))
@@ -66,7 +60,10 @@
if(!istype(target, /obj/item/picket_sign))
return FALSE
var/obj/item/picket_sign/sign = target
- sign.retext(owner)
+ var/input = tgui_input_text(owner, "What would you like to write on the sign?", "Sign Label", max_length = 30)
+ if(input && owner.can_perform_action(sign))
+ sign.label = input
+ sign.AddComponent(/datum/component/rename, "[input] sign", "It reads: [input]")
return TRUE
/datum/crafting_recipe/picket_sign
diff --git a/code/game/objects/items/skateboards.dm b/code/game/objects/items/skateboards.dm
new file mode 100644
index 000000000000..7b5e3c92d252
--- /dev/null
+++ b/code/game/objects/items/skateboards.dm
@@ -0,0 +1,67 @@
+
+/obj/item/melee/skateboard
+ name = "skateboard"
+ desc = "A skateboard. It can be placed on its wheels and ridden, or used as a radical weapon."
+ icon = 'modular_darkpack/master_files/icons/mob/rideables/vehicles.dmi' // DARKPACK EDIT CHANGE - Darkpack skateboard icon
+ icon_state = "skateboard_held"
+ inhand_icon_state = "skateboard"
+ force = 12
+ throwforce = 4
+ 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)
+ custom_price = 50 // DARKPACK EDIT ADD - ECONOMY
+ ///The vehicle counterpart for the board
+ var/board_item_type = /obj/vehicle/ridden/scooter/skateboard
+
+/obj/item/melee/skateboard/attack_self(mob/user)
+ var/obj/vehicle/ridden/scooter/skateboard/S = new board_item_type(get_turf(user))//this probably has fucky interactions with telekinesis but for the record it wasn't my fault
+ S.buckle_mob(user)
+ qdel(src)
+
+/obj/item/melee/skateboard/improvised
+ name = "improvised skateboard"
+ desc = "A jury-rigged skateboard. It can be placed on its wheels and ridden, or used as a radical weapon."
+ board_item_type = /obj/vehicle/ridden/scooter/skateboard/improvised
+ custom_price = 25 // DARKPACK EDIT ADD - ECONOMY
+
+/obj/item/melee/skateboard/pro
+ name = "skateboard"
+ desc = "An EightO brand professional skateboard. It looks sturdy and well made."
+ icon_state = "skateboard2_held"
+ inhand_icon_state = "skateboard2"
+ board_item_type = /obj/vehicle/ridden/scooter/skateboard/pro
+ custom_price = 150 // DARKPACK EDIT ADD - ECONOMY
+ custom_premium_price = PAYCHECK_COMMAND * 5
+
+/obj/item/melee/skateboard/hoverboard
+ name = "hoverboard"
+ desc = "A blast from the past, so retro!"
+ icon_state = "hoverboard_red_held"
+ inhand_icon_state = "hoverboard_red"
+ board_item_type = /obj/vehicle/ridden/scooter/skateboard/hoverboard
+ custom_premium_price = PAYCHECK_COMMAND * 5.4 //If I can't make it a meme I'll make it RAD
+
+/obj/item/melee/skateboard/hoverboard/admin
+ name = "Board Of Directors"
+ desc = "The engineering complexity of a spaceship concentrated inside of a board. Just as expensive, too."
+ icon_state = "hoverboard_nt_held"
+ inhand_icon_state = "hoverboard_nt"
+ board_item_type = /obj/vehicle/ridden/scooter/skateboard/hoverboard/admin
+
+/obj/item/melee/skateboard/holyboard
+ name = "holy skateboard"
+ desc = "A board blessed by the gods with the power to grind for our sins. Has the initials 'J.C.' on the underside."
+ icon_state = "hoverboard_holy_held"
+ inhand_icon_state = "hoverboard_holy"
+ force = 18
+ throwforce = 6
+ w_class = WEIGHT_CLASS_NORMAL
+ attack_verb_continuous = list("bashes", "crashes", "grinds", "skates")
+ attack_verb_simple = list("bash", "crash", "grind", "skate")
+ board_item_type = /obj/vehicle/ridden/scooter/skateboard/hoverboard/holyboarded
+
+/obj/item/melee/skateboard/holyboard/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/nullrod_core)
diff --git a/code/game/objects/items/soulscythe.dm b/code/game/objects/items/soulscythe.dm
index d58ae34de501..fad7413520d7 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), ROUNDSTART_TRAIT)
+ 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
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 d1658244ea6a..98350fc2ca97 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,83 @@
slapcraft_recipes = slapcraft_recipe_list,\
)
+/*
+ * Anti-big monster spear
+ * "WHERES MY DRAGONATOR?!"
+ */
+/obj/item/spear/dragonator
+ icon = 'icons/obj/weapons/48x.dmi'
+ icon_state = "speardragon0"
+ icon_prefix = "speardragon"
+ base_icon_state = "speardragon0"
+ lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/polearms_righthand.dmi'
+ name = "Giantslayer Spear"
+ desc = "An oversized multi-bladed spear designed to kill large hostile xenoforms such as space dragons or the creatures of lavaland. Capable of being launched from a ballista."
+ 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
+ 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
+ icon = 'icons/obj/weapons/48x.dmi'
+ icon_state = "speardragonraw0"
+ icon_prefix = "speardragonraw"
+ base_icon_state = "speardragonraw0"
+ lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/polearms_righthand.dmi'
+ name = "Unfired Giantslayer Spear"
+ desc = "A half-finished giantslayer spear, needs to be thrown in lava to forge the metals to a killing edge."
+ 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 +382,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 +423,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 2ed833192905..885ab685a80c 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 1082d682c4ff..a278c02ce130 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 5541c90895e2..35bb72d0a672 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 09c1a335ef11..4960a6dfb131 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
@@ -17,15 +17,15 @@
return !existing || istype(existing, status_effect)
/// Called when someone actually eats this
-/datum/golem_food_buff/proc/on_consumption(mob/living/carbon/consumer, atom/movable/consumed)
+/datum/golem_food_buff/proc/on_consumption(mob/living/carbon/consumer, atom/movable/consumed, multiplier = 1)
if (!HAS_TRAIT(consumer, TRAIT_ROCK_METAMORPHIC))
return
- apply_effects(consumer, consumed)
+ apply_effects(consumer, consumed, multiplier)
/// Apply our desired effects to the eater
-/datum/golem_food_buff/proc/apply_effects(mob/living/carbon/consumer, atom/movable/consumed)
+/datum/golem_food_buff/proc/apply_effects(mob/living/carbon/consumer, atom/movable/consumed, multiplier = 1)
if (status_effect)
- consumer.apply_status_effect(status_effect)
+ consumer.apply_status_effect(status_effect, multiplier)
/// Can eat at any time, but isn't very nutritious
/datum/golem_food_buff/glass
@@ -40,12 +40,12 @@
/// 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)
+/datum/golem_food_buff/iron/apply_effects(mob/living/carbon/consumer, atom/movable/consumed, multiplier = 1)
if (consumer.health == consumer.maxHealth)
return
- consumer.heal_ordered_damage(healed_amount, damage_heal_order)
+ consumer.heal_ordered_damage(healed_amount * multiplier, damage_heal_order)
new /obj/effect/temp_visual/heal(get_turf(consumer), COLOR_HEALING_CYAN)
/datum/golem_food_buff/uranium
@@ -90,7 +90,7 @@
exclusive = FALSE
added_info = "After consumption, you can launch this mineral like a rocket. It's a little hard to keep down."
-/datum/golem_food_buff/gibtonite/apply_effects(mob/living/carbon/human/consumer, atom/movable/consumed)
+/datum/golem_food_buff/gibtonite/apply_effects(mob/living/carbon/human/consumer, atom/movable/consumed, multiplier = 1)
var/obj/item/gibtonite_hand/new_hand = new(null, /* held_gibtonite = */ consumed)
if(consumer.put_in_hands(new_hand))
@@ -108,10 +108,14 @@
exclusive = FALSE
added_info = "After consumption, you can use the stored power to teleport yourself."
-/datum/golem_food_buff/bluespace/apply_effects(mob/living/carbon/human/consumer, obj/item/stack/consumed)
+/datum/golem_food_buff/bluespace/apply_effects(mob/living/carbon/human/consumer, atom/movable/consumed, multiplier = 1)
+ if(multiplier <= 0.2)
+ return
var/obj/item/bluespace_finger/new_hand = new
- if (consumed.amount == 1)
- consumer.dropItemToGround(consumed)
+ if (isstack(consumed))
+ var/obj/item/stack/stack = consumed
+ if(stack.amount == 1)
+ consumer.dropItemToGround(stack)
if (consumer.put_in_hands(new_hand, del_on_fail = TRUE))
return
consumer.balloon_alert(consumer, "no free hands!")
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 cb6498ffdc5e..a00b149097a4 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
@@ -94,9 +94,16 @@
animate(alpha = 50, time = 7.5 SECONDS, loop = -1, easing = SINE_EASING)
return TRUE
-/datum/status_effect/golem/on_creation(mob/living/new_owner)
+/datum/status_effect/golem/on_creation(mob/living/new_owner, multiplier = 1)
+ ///instead of straight out multiplying the duration, we use exponents to flatten the duration so it doesn't become exceedingly long for golems
+ var/exponent = 0.2
if(!isgolem(new_owner))
duration *= 0.1
+ exponent = 0.5 //non-golem benefit more from higher multipliers since it normally only lasts for 30 seconds for them.
+ if(multiplier > 1)
+ duration *= multiplier ** exponent
+ else // if the multiplier is lower than 1, don't bother using powers.
+ duration *= multiplier
var/buff_duration = duration
. = ..()
if (!.)
@@ -366,7 +373,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 1518c3880972..babf8d5db3d1 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"
- custom_price = 50 // DARKPACK EDIT ADD
+ custom_price = 50 // DARKPACK EDIT ADD - ECONOMY
+
+/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!"))
@@ -379,10 +380,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
@@ -398,6 +400,9 @@
. = ..()
register_context()
+/obj/item/stack/medical/gauze/grind_results()
+ return list(/datum/reagent/cellulose = 2)
+
/obj/item/stack/medical/gauze/Destroy(force)
. = ..()
@@ -491,6 +496,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
@@ -502,7 +514,7 @@
balloon_alert(user, "not enough gauze!")
return
new /obj/item/stack/sheet/cloth(I.drop_location())
- if(user.CanReach(src))
+ if(IsReachableBy(user))
user.visible_message(span_notice("[user] cuts [src] into pieces of cloth with [I]."), \
span_notice("You cut [src] into pieces of cloth with [I]."), \
span_hear("You hear cutting."))
@@ -528,6 +540,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
/*
@@ -550,8 +564,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
@@ -560,15 +573,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."
@@ -581,14 +599,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"
- custom_price = 50 // DARKPACK EDIT ADD
+ custom_price = 50 // DARKPACK EDIT ADD - ECONOMY
+
+/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?"))
@@ -613,17 +632,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 ..()
@@ -660,15 +682,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 ..()
@@ -677,7 +700,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"
@@ -689,7 +711,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"
@@ -697,6 +718,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
@@ -704,20 +728,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")
@@ -775,7 +799,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"
@@ -791,10 +815,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 61fdd829aca6..cafb00e59447 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")
@@ -42,6 +42,7 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \
pickup_sound = 'sound/items/handling/materials/iron_rod_pick_up.ogg'
drop_sound = 'sound/items/handling/materials/metal_drop.ogg'
sound_vary = TRUE
+ usable_for_construction = TRUE
/datum/embedding/rods
embed_chance = 50
@@ -80,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)
@@ -133,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
@@ -150,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 bc3529093d0b..04f902ba7301 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) \
))
*/
@@ -201,13 +207,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
@@ -378,6 +386,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 cb7b016c8e30..de42ef32e448 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 8597cfc859f2..4d06e8fb3d16 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 94a98705b6f6..a38bffbe1eeb 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), \ */ // DARKPACK EDIT REMOVE
+ /* 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), \ */ // DARKPACK EDIT REMOVE
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
@@ -38,7 +38,7 @@ GLOBAL_LIST_INIT(sandstone_recipes, list ( \
throw_speed = 3
throw_range = 5
mats_per_unit = list(/datum/material/sandstone=SHEET_MATERIAL_AMOUNT)
- sheettype = "sandstone"
+ construction_path_type = "sandstone"
merge_type = /obj/item/stack/sheet/mineral/sandstone
walltype = /turf/closed/wall/mineral/sandstone
material_type = /datum/material/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."
@@ -99,23 +102,27 @@ GLOBAL_LIST_INIT(sandbag_recipes, list ( \
icon_state = "sheet-diamond"
inhand_icon_state = "sheet-diamond"
singular_name = "diamond"
- sheettype = "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
-// DARKPACK CHANGE START
+// DARKPACK EDIT CHANGE START
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, 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
*/
-// DARKPACK CHANGE END
+// DARKPACK EDIT CHANGE END
/obj/item/stack/sheet/mineral/diamond/five
amount = 5
@@ -130,23 +137,28 @@ GLOBAL_LIST_INIT(diamond_recipes, list ( \
icon_state = "sheet-uranium"
inhand_icon_state = "sheet-uranium"
singular_name = "uranium sheet"
- sheettype = "uranium"
+ 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
-// DARKPACK CHANGE START
+// DARKPACK EDIT CHANGE START
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, 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
*/
-// DARKPACK CHANGE END
+// DARKPACK EDIT CHANGE END
/obj/item/stack/sheet/mineral/uranium/five
amount = 5
@@ -164,22 +176,24 @@ GLOBAL_LIST_INIT(uranium_recipes, list ( \
icon_state = "sheet-plasma"
inhand_icon_state = "sheet-plasma"
singular_name = "plasma sheet"
- sheettype = "plasma"
+ construction_path_type = "plasma"
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), \ */ // DARKPACK EDIT REMOVE
+ /* 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), \ */ // DARKPACK EDIT REMOVE
new/datum/stack_recipe("plasma tile", /obj/item/stack/tile/mineral/plasma, 1, 4, 20, crafting_flags = NONE, category = CAT_TILES), \
))
/* // DARKPACK EDIT REMOVE
@@ -204,21 +218,24 @@ GLOBAL_LIST_INIT(plasma_recipes, list ( \
icon_state = "sheet-gold"
inhand_icon_state = "sheet-gold"
singular_name = "gold bar"
- sheettype = "gold"
+ 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), \ */ // DARKPACK EDIT REMOVE
+ /* 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), \ */ // DARKPACK EDIT REMOVE
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)
+
/* // DARKPACK EDIT REMOVE
/obj/item/stack/sheet/mineral/gold/get_main_recipes()
. = ..()
@@ -235,9 +252,8 @@ GLOBAL_LIST_INIT(gold_recipes, list ( \
icon_state = "sheet-silver"
inhand_icon_state = "sheet-silver"
singular_name = "silver bar"
- sheettype = "silver"
+ 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
@@ -245,10 +261,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), \ */ // DARKPACK EDIT REMOVE
+ /* 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), \ */ // DARKPACK EDIT REMOVE
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)
+
/* // DARKPACK EDIT REMOVE
/obj/item/stack/sheet/mineral/silver/get_main_recipes()
. = ..()
@@ -265,9 +285,8 @@ GLOBAL_LIST_INIT(silver_recipes, list ( \
icon_state = "sheet-bananium"
inhand_icon_state = null
singular_name = "bananium sheet"
- sheettype = "bananium"
+ 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
@@ -276,6 +295,10 @@ GLOBAL_LIST_INIT(silver_recipes, list ( \
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)
+
/* // DARKPACK EDIT REMOVE
/obj/item/stack/sheet/mineral/bananium/get_main_recipes()
. = ..()
@@ -297,7 +320,7 @@ GLOBAL_LIST_INIT(bananium_recipes, list ( \
w_class = WEIGHT_CLASS_NORMAL
throw_speed = 1
throw_range = 3
- sheettype = "titanium"
+ construction_path_type = "titanium"
mats_per_unit = list(/datum/material/titanium=SHEET_MATERIAL_AMOUNT)
gulag_valid = TRUE
merge_type = /obj/item/stack/sheet/mineral/titanium
@@ -308,7 +331,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), \ */ // DARKPACK EDIT REMOVE
+ 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), \ */ // DARKPACK EDIT REMOVE
))
/* // DARKPACK EDIT REMOVE
/obj/item/stack/sheet/mineral/titanium/get_main_recipes()
@@ -351,7 +374,7 @@ GLOBAL_LIST_INIT(titanium_recipes, list ( \
w_class = WEIGHT_CLASS_NORMAL
throw_speed = 1
throw_range = 3
- sheettype = "plastitanium"
+ construction_path_type = "plastitanium"
mats_per_unit = list(/datum/material/alloy/plastitanium=SHEET_MATERIAL_AMOUNT)
gulag_valid = TRUE
material_type = /datum/material/alloy/plastitanium
@@ -380,7 +403,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
@@ -398,6 +420,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
@@ -461,7 +486,7 @@ GLOBAL_LIST_INIT(adamantine_recipes, list(
icon_state = "sheet-abductor"
inhand_icon_state = "sheet-abductor"
singular_name = "alien alloy sheet"
- sheettype = "abductor"
+ construction_path_type = "abductor"
mats_per_unit = list(/datum/material/alloy/alien=SHEET_MATERIAL_AMOUNT)
merge_type = /obj/item/stack/sheet/mineral/abductor
material_type = /datum/material/alloy/alien
@@ -470,6 +495,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, \
@@ -491,9 +517,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 5e0900a3ff3f..674dea391c1e 100644
--- a/code/game/objects/items/stacks/sheets/runed_metal.dm
+++ b/code/game/objects/items/stacks/sheets/runed_metal.dm
@@ -75,13 +75,15 @@ GLOBAL_LIST_INIT(runed_metal_recipes, list( \
inhand_icon_state = "sheet-runed"
icon = 'icons/obj/stack_objects.dmi'
mats_per_unit = list(/datum/material/runedmetal = SHEET_MATERIAL_AMOUNT)
- sheettype = "runed"
+ 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 dacad2baac0e..e2c39a5232b4 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), \
@@ -127,7 +129,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
@@ -147,6 +148,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:")
@@ -252,6 +256,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
// DARKPACK EDIT CHANGE START
GLOBAL_LIST_INIT(plasteel_recipes, list ( \
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),
@@ -272,7 +277,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
@@ -282,6 +286,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
@@ -317,6 +324,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
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("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), \
@@ -329,7 +337,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
new/datum/stack_recipe("wooden bucket", /obj/item/reagent_containers/cup/bucket/wooden, 3, time = 1 SECONDS, crafting_flags = NONE, category = CAT_CONTAINERS),\
new/datum/stack_recipe("rake", /obj/item/cultivator/rake, 5, time = 1 SECONDS, crafting_flags = NONE, category = CAT_TOOLS),\
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), \
@@ -362,12 +370,11 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
inhand_icon_state = "sheet-wood"
icon = 'icons/obj/stack_objects.dmi'
mats_per_unit = list(/datum/material/wood=SHEET_MATERIAL_AMOUNT)
- sheettype = "wood"
+ construction_path_type = "wood"
armor_type = /datum/armor/mineral_wood
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'
@@ -376,6 +383,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
@@ -407,7 +417,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), \
@@ -427,13 +437,12 @@ GLOBAL_LIST_INIT(bamboo_recipes, list ( \
icon_state = "sheet-bamboo"
inhand_icon_state = "sheet-bamboo"
icon = 'icons/obj/stack_objects.dmi'
- sheettype = "bamboo"
+ construction_path_type = "bamboo"
mats_per_unit = list(/datum/material/bamboo = SHEET_MATERIAL_AMOUNT)
throwforce = 15
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
@@ -442,6 +451,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
@@ -503,10 +515,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
@@ -543,7 +557,8 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
. = ..()
. += GLOB.durathread_recipes
*/
-/obj/item/stack/sheet/durathread/on_item_crafted(mob/builder, atom/created)
+/obj/item/stack/sheet/durathread/used_in_craft(atom/created, datum/crafting_recipe/recipe)
+ . = ..()
created.set_armor_rating(CONSUME, max(50, created.get_armor_rating(CONSUME)))
/obj/item/stack/sheet/cotton
@@ -555,23 +570,25 @@ GLOBAL_LIST_INIT(cloth_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
@@ -580,7 +597,6 @@ GLOBAL_LIST_INIT(cloth_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
/*
@@ -590,6 +606,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
GLOBAL_LIST_INIT(cardboard_recipes, list ( \
new/datum/stack_recipe("box", /obj/item/storage/box, crafting_flags = NONE, category = CAT_CONTAINERS), \
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, \
@@ -646,7 +663,8 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \
null, \
))
// DARKPACK EDIT CHANGE END
-/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"
@@ -657,7 +675,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'
@@ -671,6 +688,10 @@ 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
@@ -721,29 +742,26 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \
lefthand_file = 'icons/mob/inhands/items/sheets_lefthand.dmi'
righthand_file = 'icons/mob/inhands/items/sheets_righthand.dmi'
resistance_flags = FIRE_PROOF | ACID_PROOF
- sheettype = "bronze"
+ construction_path_type = "bronze"
force = 5
throwforce = 10
max_amount = 50
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
@@ -785,7 +803,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
@@ -810,6 +827,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)
+
// DARKPACK EDIT CHANGE START
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), \
@@ -817,7 +838,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), \
@@ -864,11 +885,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
@@ -936,7 +959,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/sheets/sheets.dm b/code/game/objects/items/stacks/sheets/sheets.dm
index 35e8dd161f4d..bd50d1648e8e 100644
--- a/code/game/objects/items/stacks/sheets/sheets.dm
+++ b/code/game/objects/items/stacks/sheets/sheets.dm
@@ -18,14 +18,13 @@
pickup_sound = 'sound/items/handling/materials/metal_pick_up.ogg'
drop_sound = 'sound/items/handling/materials/metal_drop.ogg'
sound_vary = TRUE
- /// this is used for girders in the creation of walls/false walls
- var/sheettype = null
+ usable_for_construction = TRUE
+ /// text string used to find typepaths used in door and wall (false and tram too) construction for door assemblies and girders respectively
+ var/construction_path_type = null
///If true, this is worth points in the gulag labour stacker
var/gulag_valid = FALSE
///Set to true if this is vended from a material storage
var/manufactured = FALSE
- ///What type of wall does this sheet spawn
- var/walltype
/// whether this sheet can be sniffed by the material sniffer
var/sniffable = FALSE
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index c970f41dab82..b1cb72cba89c 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -45,8 +45,6 @@
// these amounts will be multiplied by the stack size in on_grind()
/// Amount of matter given back to RCDs
var/matter_amount = 0
- /// Does this stack require a unique girder in order to make a wall?
- var/has_unique_girder = FALSE
/// What typepath table we create from this stack
var/obj/structure/table/table_type
/// What typepath stairs do we create from this stack
@@ -60,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
@@ -73,6 +73,13 @@
/// or until the cut heals, whichever comes first
var/absorption_rate
+ /// Can this stack be used for contruction of girders?
+ var/usable_for_construction = FALSE
+ /// Does this stack require a unique girder in order to make a wall?
+ var/has_unique_girder = FALSE
+ ///What type of wall does this sheet spawn
+ var/walltype
+
/obj/item/stack/Initialize(mapload, new_amount = amount, merge = TRUE, list/mat_override=null, mat_amt=1)
amount = new_amount
if(amount <= 0)
@@ -89,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)
@@ -115,17 +121,21 @@
/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))
- merge_with_loc()
+ merge_with_loc(merge_into_ourselves = !isnull(pulledby))
///Called to lazily update the materials of the item whenever the used or if more is added
/obj/item/stack/proc/update_custom_materials()
if(length(mats_per_unit))
set_custom_materials(mats_per_unit, amount)
-/obj/item/stack/proc/find_other_stack(list/already_found)
+/obj/item/stack/proc/find_other_stack(list/already_found, merge_into_ourselves = FALSE)
if(QDELETED(src) || isnull(loc))
return
for(var/obj/item/stack/item_stack in loc)
@@ -136,27 +146,25 @@
var/stack_ref = REF(item_stack)
if(already_found[stack_ref])
continue
- if(can_merge(item_stack))
+ if(merge_into_ourselves ? item_stack.can_merge(src) : can_merge(item_stack))
already_found[stack_ref] = TRUE
return item_stack
/// Tries to merge the stack with everything on the same tile.
-/obj/item/stack/proc/merge_with_loc()
+/obj/item/stack/proc/merge_with_loc(merge_into_ourselves = FALSE)
var/list/already_found = list() // change to alist whenever dreamchecker and such finally supports that
- var/obj/item/other_stack = find_other_stack(already_found)
+ var/obj/item/stack/other_stack = find_other_stack(already_found, merge_into_ourselves)
var/sanity = max_amount // just in case
while(other_stack && sanity > 0)
sanity--
- if(merge(other_stack))
+ if(!merge_into_ourselves)
+ if(merge(other_stack))
+ return FALSE
+ else if (other_stack.merge(src) && !QDELETED(other_stack))
return FALSE
- other_stack = find_other_stack(already_found)
+ 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!"))
@@ -168,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))
@@ -183,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)
@@ -203,12 +212,14 @@
return list() //empty list
/obj/item/stack/proc/update_weight()
- if(amount <= (max_amount * (1/3)))
- update_weight_class(clamp(full_w_class-2, WEIGHT_CLASS_TINY, full_w_class))
- else if (amount <= (max_amount * (2/3)))
- update_weight_class(clamp(full_w_class-1, WEIGHT_CLASS_TINY, full_w_class))
- else
- update_weight_class(full_w_class)
+ update_weight_class(get_weight_from_size(amount))
+
+/obj/item/stack/proc/get_weight_from_size(stack_amount)
+ if(stack_amount <= (max_amount * (1/3)))
+ return clamp(full_w_class - 2, WEIGHT_CLASS_TINY, full_w_class)
+ if(stack_amount <= (max_amount * (2/3)))
+ return clamp(full_w_class - 1, WEIGHT_CLASS_TINY, full_w_class)
+ return full_w_class
/obj/item/stack/update_icon_state()
if(novariants)
@@ -407,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
@@ -444,31 +455,42 @@
var/turf/covered_turf = builder.drop_location()
if(!isturf(covered_turf))
return
- var/turf/created_turf = covered_turf.place_on_top(recipe.result_type, flags = CHANGETURF_INHERIT_AIR)
+ 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_turf.set_custom_materials(mats_per_unit, recipe.req_amount / recipe.res_amount)
else
created = new recipe.result_type(builder.drop_location())
builder.balloon_alert(builder, "built item")
- if(created)
+ // split the material and use it for the craft
+ var/obj/item/stack/used_stack = split_stack(recipe.req_amount * multiplier)
+ if(ismovable(created))
created.setDir(builder.dir)
- SEND_SIGNAL(created, COMSIG_ATOM_CONSTRUCTED, builder)
- on_item_crafted(builder, created)
+ created.on_craft_completion(list(used_stack), null, builder)
- // Use up the material
- use(recipe.req_amount * multiplier)
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))
@@ -487,10 +509,6 @@
return TRUE
-/// Run special logic on created items after they've been successfully crafted.
-/obj/item/stack/proc/on_item_crafted(mob/builder, atom/created)
- return
-
/obj/item/stack/vv_edit_var(vname, vval)
if(vname == NAMEOF(src, amount))
add(clamp(vval, 1-amount, max_amount - amount)) //there must always be one.
@@ -567,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)
@@ -666,8 +683,35 @@
transfer = min(transfer, round((target_stack.source.max_energy - target_stack.source.energy) / target_stack.cost))
else
transfer = min(transfer, (limit ? limit : target_stack.max_amount) - target_stack.amount)
- if(pulledby)
+ // Ensure that we're not bloating the target stack to the point where it falls out of storage
+ if(target_stack.loc?.atom_storage)
+ var/datum/storage/target_storage = target_stack.loc?.atom_storage
+ var/cur_size = target_stack.w_class
+ var/new_size = target_stack.get_weight_from_size(target_stack.amount + transfer)
+ var/real_new_size = new_size
+ var/real_cur_size = cur_size
+
+ // Ensure that we don't end up with two mergeable stacks if our own size gets reduced enough from the merge and we share the space
+ if (!is_cyborg && loc == target_stack.loc)
+ real_cur_size += w_class
+ if (amount > transfer)
+ real_new_size += get_weight_from_size(amount - transfer)
+
+ // If total size changed, check for overflows
+ if(new_size > cur_size)
+ var/size_limit = max(new_size - target_storage.max_specific_storage, target_storage.get_total_weight() + real_new_size - real_cur_size - target_storage.max_total_storage)
+ // If we're over the stack limit the storage container can support, reduce the transferred amount
+ // to the nearest size threshold, then by a third of the target stack per excess size
+ if(size_limit > 0)
+ var/to_threshold = FLOOR(target_stack.amount + transfer, floor(target_stack.max_amount / 3))
+ transfer = clamp(to_threshold - floor(target_stack.max_amount / 3) * (size_limit - 1) - target_stack.amount, 0, transfer)
+
+ if(!transfer)
+ return
+
+ if(pulledby && is_zero_amount(delete_if_zero = FALSE))
pulledby.start_pulling(target_stack)
+
target_stack.copy_evidences(src)
use(transfer, transfer = TRUE, check = FALSE)
target_stack.add(transfer)
diff --git a/code/game/objects/items/stacks/stack_recipe.dm b/code/game/objects/items/stacks/stack_recipe.dm
index f507e2fc784a..3f30d259aa91 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 38e9854aa039..e373de11aada 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 0c4bce3310a2..651cf36ac1a3 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 4e7c23b51ff5..67a905b4334f 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 31c20817c906..024142e04c44 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 600c7b3e451b..0c445cc2986b 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/stickers.dm b/code/game/objects/items/stickers.dm
index 992474937957..eb4b20d6f17b 100644
--- a/code/game/objects/items/stickers.dm
+++ b/code/game/objects/items/stickers.dm
@@ -220,3 +220,12 @@
/obj/item/sticker/syndicate/trap
name = "bear trap sticker"
icon_state = "trap"
+
+/obj/item/sticker/purity_seal
+ name = "purity seal"
+ icon_state = "purity_seal_1"
+ desc = "Looking closer, you realize it's actually a mass produced sticker. You suppose it's the holiness that counts."
+
+/obj/item/sticker/purity_seal/purity_seal_2
+ icon_state = "purity_seal_2"
+
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index 5d56a3c11bf0..1c8ae11f65a2 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -140,6 +140,12 @@
icon_state = "backpack-medical"
inhand_icon_state = "medicalpack"
+/obj/item/storage/backpack/chief_medic
+ name = "chief medical officer's backpack"
+ desc = "A backpack with just enough pockets to carry the chief medical officer's equipment."
+ icon_state = "backpack-chiefmedical"
+ inhand_icon_state = "medicalpack"
+
/obj/item/storage/backpack/coroner
name = "coroner backpack"
desc = "It's a backpack especially designed for use in an undead environment."
@@ -315,6 +321,12 @@
icon_state = "satchel-medical"
inhand_icon_state = "satchel-med"
+/obj/item/storage/backpack/satchel/chief_medic
+ name = "chief medical officer's satchel"
+ desc = "A satchel with barely enough pockets to carry the chief medical officer's equipment."
+ icon_state = "satchel-chiefmedical"
+ inhand_icon_state = "satchel-med"
+
/obj/item/storage/backpack/satchel/vir
name = "virologist satchel"
desc = "A sterile satchel with virologist colours."
@@ -420,6 +432,12 @@
icon_state = "messenger_medical"
inhand_icon_state = "messenger_medical"
+/obj/item/storage/backpack/messenger/chief_medic
+ name = "chief medical officer's messenger bag"
+ desc = "A slim messenger bag appreciated by chief medical officers for staying out of their way while working - unlike their chemists."
+ icon_state = "messenger_chiefmedical"
+ inhand_icon_state = "messenger_medical"
+
/obj/item/storage/backpack/messenger/vir
name = "virologist messenger bag"
desc = "A sterile messenger bag with virologist colours, useful for deploying biohazards in record times."
diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm
index 1ce7b49e879c..ed63a3e01446 100644
--- a/code/game/objects/items/storage/bags.dm
+++ b/code/game/objects/items/storage/bags.dm
@@ -36,6 +36,7 @@
storage_type = /datum/storage/bag/trash
///If true, can be inserted into the janitor cart
var/insertable = TRUE
+ custom_price = 20 // DARKPACK EDIT ADD - ECONOMY
/obj/item/storage/bag/trash/Initialize(mapload)
. = ..()
@@ -101,82 +102,139 @@
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_POCKETS
w_class = WEIGHT_CLASS_NORMAL
storage_type = /datum/storage/bag/ore
- ///If this is TRUE, the holder won't receive any messages when they fail to pick up ore through crossing it
+ /// If this is TRUE, the holder won't receive any messages when they fail to pick up ore through crossing it
var/spam_protection = FALSE
- var/mob/listeningTo
- ///Cooldown on balloon alerts when picking ore
+ /// Mob we're currently tracking
+ var/mob/listening_to = null
+ /// Are we currently dropping off ores? Used to prevent the bag from instantly picking up ores after dropping them
+ var/dropping_ores = FALSE
+ /// Cooldown on balloon alerts when picking ore
COOLDOWN_DECLARE(ore_bag_balloon_cooldown)
+/obj/item/storage/bag/ore/Destroy(force)
+ listening_to = null
+ return ..()
+
/obj/item/storage/bag/ore/equipped(mob/user)
. = ..()
- if(listeningTo == user)
+ if (listening_to)
return
- if(listeningTo)
- UnregisterSignal(listeningTo, COMSIG_MOVABLE_MOVED)
- RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(pickup_ores))
- listeningTo = user
+ RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(on_user_moved))
+ if (isturf(user.loc))
+ RegisterSignal(user.loc, COMSIG_ATOM_ENTERED, PROC_REF(on_obj_entered))
+ RegisterSignal(user.loc, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON, PROC_REF(on_atom_initialized_on))
+ listening_to = user
/obj/item/storage/bag/ore/dropped()
. = ..()
- if(listeningTo)
- UnregisterSignal(listeningTo, COMSIG_MOVABLE_MOVED)
- listeningTo = null
+ if(!listening_to)
+ return
+ UnregisterSignal(listening_to, COMSIG_MOVABLE_MOVED)
+ if (listening_to.loc)
+ UnregisterSignal(listening_to.loc, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON))
+ listening_to = null
+
+// Ensure we don't suck up ores that we've just dropped off
+/obj/item/storage/bag/ore/attack_self(mob/user, modifiers)
+ dropping_ores = TRUE
+ . = ..()
+ dropping_ores = FALSE
/obj/item/storage/bag/ore/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
if(istype(tool, /obj/item/boulder))
to_chat(user, span_warning("You can't fit [tool] into [src]. \
Perhaps you should break it down first, or find an ore box."))
return ITEM_INTERACT_BLOCKING
-
return NONE
-/obj/item/storage/bag/ore/proc/pickup_ores(mob/living/user)
+/obj/item/storage/bag/ore/proc/on_user_moved(mob/living/user, atom/old_loc, dir, forced)
SIGNAL_HANDLER
- var/show_message = FALSE
- var/obj/structure/ore_box/box
- var/turf/tile = get_turf(user)
+ if(old_loc)
+ UnregisterSignal(old_loc, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON))
+ var/turf/tile = get_turf(user)
if(!isturf(tile))
return
+ RegisterSignal(tile, COMSIG_ATOM_ENTERED, PROC_REF(on_obj_entered))
+ RegisterSignal(tile, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON, PROC_REF(on_atom_initialized_on))
+ 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))
box = user.pulling
- if(atom_storage)
- for(var/thing in tile)
- if(!is_type_in_typecache(thing, atom_storage.can_hold))
- continue
- if(box)
- user.transferItemToLoc(thing, box)
- show_message = TRUE
- else if(atom_storage.attempt_insert(thing, user))
- show_message = TRUE
- else
- if(!spam_protection)
- balloon_alert(user, "bag full!")
- spam_protection = TRUE
- continue
- if(show_message)
- playsound(user, SFX_RUSTLE, 50, TRUE)
- if(!COOLDOWN_FINISHED(src, ore_bag_balloon_cooldown))
- return
-
- COOLDOWN_START(src, ore_bag_balloon_cooldown, ORE_BAG_BALOON_COOLDOWN)
- if (box)
- balloon_alert(user, "scoops ore into box")
- user.visible_message(
- span_notice("[user] offloads the ores beneath [user.p_them()] into [box]."),
- ignored_mobs = user
- )
- else
- balloon_alert(user, "scoops ore into bag")
- user.visible_message(
- span_notice("[user] scoops up the ores beneath [user.p_them()]."),
- ignored_mobs = user
- )
+ var/show_message = FALSE
+ for(var/atom/thing as anything in tile)
+ if(!is_type_in_typecache(thing, atom_storage.can_hold))
+ continue
+ if(pickup_ore(thing, user, box))
+ show_message = TRUE
+
+ if (!show_message)
+ spam_protection = FALSE
+ return
+
+ playsound(user, SFX_RUSTLE, 50, TRUE)
+ if(!COOLDOWN_FINISHED(src, ore_bag_balloon_cooldown))
+ return
spam_protection = FALSE
+ COOLDOWN_START(src, ore_bag_balloon_cooldown, ORE_BAG_BALOON_COOLDOWN)
+
+ if (box)
+ balloon_alert(user, "scoops ore into box")
+ user.visible_message(
+ span_notice("[user] offloads the ores beneath [user.p_them()] into [box]."),
+ ignored_mobs = user
+ )
+ return
+
+ balloon_alert(user, "scoops ore into bag")
+ user.visible_message(
+ span_notice("[user] scoops up the ores beneath [user.p_them()]."),
+ ignored_mobs = user
+ )
+
+/obj/item/storage/bag/ore/proc/pickup_ore(obj/item/ore, mob/user, obj/structure/ore_box/box)
+ if (!box && istype(user.pulling, /obj/structure/ore_box))
+ box = user.pulling
+
+ if (box)
+ user.transferItemToLoc(ore, box, animated = FALSE)
+ return TRUE
+
+ if (istype(ore, /obj/item/stack/ore))
+ var/obj/item/stack/ore/real_ore = ore
+ for(var/obj/item/stack/ore/stored_ore as anything in src)
+ if(!real_ore.can_merge(stored_ore))
+ continue
+ real_ore.merge(stored_ore)
+ if(QDELETED(real_ore))
+ return TRUE
+
+ if (atom_storage.attempt_insert(ore, user))
+ return TRUE
+
+ if (!spam_protection)
+ balloon_alert(user, "bag full!")
+ spam_protection = TRUE
+ return FALSE
+
+/obj/item/storage/bag/ore/proc/on_obj_entered(atom/new_loc, atom/movable/arrived, atom/old_loc)
+ SIGNAL_HANDLER
+ if(is_type_in_list(arrived, atom_storage.can_hold) && !dropping_ores && old_loc != loc)
+ INVOKE_ASYNC(src, PROC_REF(pickup_ore), arrived, listening_to)
+
+/obj/item/storage/bag/ore/proc/on_atom_initialized_on(atom/loc, atom/new_atom)
+ SIGNAL_HANDLER
+ if(is_type_in_list(new_atom, atom_storage.can_hold))
+ INVOKE_ASYNC(src, PROC_REF(pickup_ore), new_atom, listening_to)
/obj/item/storage/bag/ore/cyborg
name = "cyborg mining satchel"
@@ -250,7 +308,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,
@@ -272,6 +330,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)
@@ -302,6 +361,9 @@
custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*1.5)
custom_price = PAYCHECK_CREW * 0.6
storage_type = /datum/storage/bag/tray
+ sound_vary = TRUE
+ pickup_sound = SFX_TRAY_PICKUP
+ drop_sound = SFX_TRAY_DROP
/obj/item/storage/bag/tray/attack(mob/living/M, mob/living/user)
. = ..()
@@ -455,6 +517,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"
@@ -508,7 +571,7 @@
return
var/obj/item/ammo_casing/rebar/ammo_to_load = contents[1]
- held_crossbow.attackby(ammo_to_load, user)
+ held_crossbow.item_interaction(user, ammo_to_load)
/obj/item/storage/bag/quiver
name = "quiver"
@@ -524,6 +587,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/basket.dm b/code/game/objects/items/storage/basket.dm
index ab33ea67d844..4859bd6b598c 100644
--- a/code/game/objects/items/storage/basket.dm
+++ b/code/game/objects/items/storage/basket.dm
@@ -7,3 +7,6 @@
resistance_flags = FLAMMABLE
storage_type = /datum/storage/basket
+/obj/item/storage/basket/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/cuffable_item)
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 90c990113767..c8695185429a 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -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)
. = ..()
@@ -599,17 +608,17 @@
. += span_notice("Alt-click it to quickly draw the blade.")
/obj/item/storage/belt/sheath/click_alt(mob/user)
- if(length(contents))
- var/obj/item/I = contents[1]
- user.visible_message(span_notice("[user] takes [I] out of [src]."), span_notice("You take [I] out of [src]."))
- user.put_in_hands(I)
- update_appearance()
- else
+ if(!length(contents))
balloon_alert(user, "it's empty!")
+ return CLICK_ACTION_BLOCKING
+ var/obj/item/stored_item = contents[1]
+ user.visible_message(span_notice("[user] takes [stored_item] out of [src]."), span_notice("You take [stored_item] out of [src]."))
+ user.put_in_hands(stored_item)
+ update_appearance()
return CLICK_ACTION_SUCCESS
/obj/item/storage/belt/sheath/update_icon_state()
- icon_state = initial(inhand_icon_state)
+ icon_state = initial(base_icon_state) // DARKPACK TODO - Fallcon will make a PR that upstreams this change soon
inhand_icon_state = initial(inhand_icon_state)
worn_icon_state = initial(worn_icon_state)
if(contents.len)
@@ -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 ab29439da506..a491ace1eea7 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 ea2fc77ffb13..749873b50a06 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 2ac97ff0313d..f692354a689d 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 66e9887039e6..f2f0d43d6208 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,
@@ -41,6 +41,7 @@
/obj/item/uplink/nuclear/debug=1,
/obj/item/clothing/ears/earmuffs/debug=1,
/obj/item/gps/visible_debug=1,
+ /obj/item/clothing/glasses/meson/engine/admin=1,
)
generate_items_inside(items_inside, src)
diff --git a/code/game/objects/items/storage/boxes/food_boxes.dm b/code/game/objects/items/storage/boxes/food_boxes.dm
index 090bb71e3b03..68337585ef12 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.
@@ -336,7 +338,7 @@
w_class = WEIGHT_CLASS_TINY
illustration = null
foldable_result = null
- custom_price = 3 // DARKPACK EDIT CHANGE
+ custom_price = 3 // DARKPACK EDIT CHANGE - ECONOMY
storage_type = /datum/storage/box/gum
///Typepath of the type of gum that spawns with this box, this is passed to the wrapper for spawning in.
@@ -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 b0961f881e31..b3f1db2e4572 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 21c5b51341aa..0c78be971bcd 100644
--- a/code/game/objects/items/storage/boxes/job_boxes.dm
+++ b/code/game/objects/items/storage/boxes/job_boxes.dm
@@ -190,9 +190,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 7d468ff81b1a..f8563a10024e 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 41c958b1398e..c9d184feb619 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 46d0890ea409..11eebd8699cf 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 1ef3dd4f47e5..d8e6c2f65209 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,
@@ -294,3 +294,14 @@
/obj/item/storage/box/heretic_box/PopulateContents()
for(var/i in 1 to rand(1,4))
new /obj/item/toy/reality_pierce(src)
+
+
+/obj/item/storage/box/purity_seal_box
+ name = "box of purity seals"
+ desc = "A box containing several blessed purity seals."
+
+/obj/item/storage/box/purity_seal_box/PopulateContents()
+ for(var/i in 1 to 4)
+ new /obj/item/sticker/purity_seal(src)
+ new /obj/item/sticker/purity_seal/purity_seal_2(src)
+
diff --git a/code/game/objects/items/storage/briefcase.dm b/code/game/objects/items/storage/briefcase.dm
index dc710870c56b..3bb4f1d990b7 100644
--- a/code/game/objects/items/storage/briefcase.dm
+++ b/code/game/objects/items/storage/briefcase.dm
@@ -21,6 +21,10 @@
/// The path of the folder that gets spawned in New()
var/folder_path = /obj/item/folder
+/obj/item/storage/briefcase/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/cuffable_item)
+
/obj/item/storage/briefcase/PopulateContents()
new /obj/item/pen(src)
var/obj/item/folder/folder = new folder_path(src)
@@ -81,10 +85,17 @@
icon_state = "secure"
base_icon_state = "secure"
inhand_icon_state = "sec-case"
+ var/stored_lock_code
/obj/item/storage/briefcase/secure/Initialize(mapload)
. = ..()
- AddComponent(/datum/component/lockable_storage)
+ AddComponent(/datum/component/lockable_storage, stored_lock_code)
+ RegisterSignal(src, COMSIG_LOCKABLE_STORAGE_SET_CODE, PROC_REF(update_lock_code))
+
+/obj/item/storage/briefcase/secure/proc/update_lock_code(obj/item/storage/briefcase/secure/briefacase, new_code)
+ SIGNAL_HANDLER
+
+ stored_lock_code = new_code
/// Base container used for gimmick disks.
/obj/item/storage/briefcase/secure/digital_storage
diff --git a/code/game/objects/items/storage/dufflebags.dm b/code/game/objects/items/storage/dufflebags.dm
index 159f581a76d9..15eaf089d30d 100644
--- a/code/game/objects/items/storage/dufflebags.dm
+++ b/code/game/objects/items/storage/dufflebags.dm
@@ -132,6 +132,12 @@
icon_state = "duffel-medical"
inhand_icon_state = "duffel-med"
+/obj/item/storage/backpack/duffelbag/chief_medic
+ name = "chief medical officer's duffel bag"
+ desc = "A large duffel bag for handling the duties of the entire medical department at once."
+ icon_state = "duffel-chiefmedical"
+ inhand_icon_state = "duffel-med"
+
/obj/item/storage/backpack/duffelbag/coroner
name = "coroner duffel bag"
desc = "A large duffel bag for holding large amounts of organs at once."
diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm
index b2e215904fc4..3a7552030ee2 100644
--- a/code/game/objects/items/storage/fancy.dm
+++ b/code/game/objects/items/storage/fancy.dm
@@ -176,7 +176,6 @@
open_status = FANCY_CONTAINER_ALWAYS_OPEN
contents_tag = "candle"
storage_type = /datum/storage/candle_box
- custom_price = 8 // DARKPACK EDIT ADD
////////////
//CIG PACK//
@@ -232,6 +231,8 @@
. = ..()
register_context()
+ if(!spawn_count)
+ update_appearance()
/obj/item/storage/fancy/cigarettes/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
. = ..()
@@ -295,6 +296,11 @@
. += "[use_icon_state]_[cig_position]"
cig_position++
+/obj/item/storage/fancy/cigarettes/empty
+ spawn_count = 0
+ spawn_coupon = FALSE
+ open_status = FANCY_CONTAINER_OPEN
+
/obj/item/storage/fancy/cigarettes/dromedaryco
name = "\improper Camel packet" // DARKPACK EDIT CHANGE
desc = "I'd walk a mile for a Camel!" // DARKPACK EDIT CHANGE
@@ -302,6 +308,11 @@
base_icon_state = "dromedary"
spawn_type = /obj/item/cigarette/dromedary
+/obj/item/storage/fancy/cigarettes/dromedaryco/empty
+ spawn_count = 0
+ spawn_coupon = FALSE
+ open_status = FANCY_CONTAINER_OPEN
+
/obj/item/storage/fancy/cigarettes/cigpack_uplift
name = "\improper Uplift Smooth packet"
desc = "Your favorite brand, now menthol flavored."
@@ -309,6 +320,11 @@
base_icon_state = "uplift"
spawn_type = /obj/item/cigarette/uplift
+/obj/item/storage/fancy/cigarettes/cigpack_uplift/empty
+ spawn_count = 0
+ spawn_coupon = FALSE
+ open_status = FANCY_CONTAINER_OPEN
+
/obj/item/storage/fancy/cigarettes/cigpack_robust
name = "\improper Malboro packet" // DARKPACK EDIT CHANGE
desc = "You get a lot to like with Malboro." // DARKPACK EDIT CHANGE
@@ -316,6 +332,11 @@
base_icon_state = "robust"
spawn_type = /obj/item/cigarette/robust
+/obj/item/storage/fancy/cigarettes/cigpack_robust/empty
+ spawn_count = 0
+ spawn_coupon = FALSE
+ open_status = FANCY_CONTAINER_OPEN
+
/obj/item/storage/fancy/cigarettes/cigpack_robustgold
name = "\improper Malboro Gold packet" // DARKPACK EDIT CHANGE
desc = "You get a lot to like with Malboro." // DARKPACK EDIT CHANGE
@@ -323,6 +344,11 @@
base_icon_state = "robustg"
spawn_type = /obj/item/cigarette/robustgold
+/obj/item/storage/fancy/cigarettes/cigpack_robustgold/empty
+ spawn_count = 0
+ spawn_coupon = FALSE
+ open_status = FANCY_CONTAINER_OPEN
+
/obj/item/storage/fancy/cigarettes/cigpack_greytide
name = "\improper Mainthol Grey packet"
desc = "The thin grey line."
@@ -330,6 +356,11 @@
base_icon_state = "greytide"
spawn_type = /obj/item/cigarette/greytide
+/obj/item/storage/fancy/cigarettes/cigpack_greytide/empty
+ spawn_count = 0
+ spawn_coupon = FALSE
+ open_status = FANCY_CONTAINER_OPEN
+
/obj/item/storage/fancy/cigarettes/cigpack_carp
name = "\improper Carp Classic packet"
desc = "Since 1896." // DARKPACK EDIT CHANGE
@@ -337,6 +368,11 @@
base_icon_state = "carp"
spawn_type = /obj/item/cigarette/carp
+/obj/item/storage/fancy/cigarettes/cigpack_carp/empty
+ spawn_count = 0
+ spawn_coupon = FALSE
+ open_status = FANCY_CONTAINER_OPEN
+
/obj/item/storage/fancy/cigarettes/cigpack_syndicate
name = "cigarette packet"
desc = "An obscure brand of cigarettes."
@@ -344,6 +380,11 @@
base_icon_state = "syndie"
spawn_type = /obj/item/cigarette/syndicate
+/obj/item/storage/fancy/cigarettes/cigpack_syndicate/empty
+ spawn_count = 0
+ spawn_coupon = FALSE
+ open_status = FANCY_CONTAINER_OPEN
+
/obj/item/storage/fancy/cigarettes/cigpack_midori
name = "\improper Midori Tabako packet"
desc = "You can't understand the runes, but the packet smells funny."
@@ -351,6 +392,11 @@
base_icon_state = "midori"
spawn_type = /obj/item/cigarette/rollie/nicotine
+/obj/item/storage/fancy/cigarettes/cigpack_midori/empty
+ spawn_count = 0
+ spawn_coupon = FALSE
+ open_status = FANCY_CONTAINER_OPEN
+
/obj/item/storage/fancy/cigarettes/cigpack_candy
name = "\improper Timmy's First Candy Smokes packet"
desc = "Unsure about smoking? Want to bring your children safely into the family tradition? Look no more with this special packet! Includes 100%* Nicotine-Free candy cigarettes."
@@ -366,6 +412,11 @@
if(prob(7))
spawn_type = /obj/item/cigarette/candy/nicotine //uh oh!
+/obj/item/storage/fancy/cigarettes/cigpack_candy/empty
+ spawn_count = 0
+ spawn_coupon = FALSE
+ open_status = FANCY_CONTAINER_OPEN
+
/obj/item/storage/fancy/cigarettes/cigpack_shadyjims
name = "\improper Shady Jim's Super Slims packet"
desc = "Is your weight slowing you down? Having trouble running away from gravitational singularities? Can't stop stuffing your mouth? Smoke Shady Jim's Super Slims and watch all that fat burn away. Guaranteed results!"
@@ -373,6 +424,11 @@
base_icon_state = "shadyjim"
spawn_type = /obj/item/cigarette/shadyjims
+/obj/item/storage/fancy/cigarettes/cigpack_shadyjims/empty
+ spawn_count = 0
+ spawn_coupon = FALSE
+ open_status = FANCY_CONTAINER_OPEN
+
/obj/item/storage/fancy/cigarettes/cigpack_xeno
name = "\improper Newport packet" // DARKPACK EDIT CHANGE
desc = "Alive with pleasure!" // DARKPACK EDIT CHANGE
@@ -380,6 +436,11 @@
base_icon_state = "slime"
spawn_type = /obj/item/cigarette/xeno
+/obj/item/storage/fancy/cigarettes/cigpack_xeno/empty
+ spawn_count = 0
+ spawn_coupon = FALSE
+ open_status = FANCY_CONTAINER_OPEN
+
/obj/item/storage/fancy/cigarettes/cigpack_cannabis
name = "\improper Freak Brothers' Special packet"
desc = "A label on the packaging reads, \"Endorsed by Phineas, Freddy and Franklin.\""
@@ -387,6 +448,11 @@
base_icon_state = "midori"
spawn_type = /obj/item/cigarette/rollie/cannabis
+/obj/item/storage/fancy/cigarettes/cigpack_cannabis/empty
+ spawn_count = 0
+ spawn_coupon = FALSE
+ open_status = FANCY_CONTAINER_OPEN
+
/obj/item/storage/fancy/cigarettes/cigpack_mindbreaker
name = "\improper Leary's Delight packet"
desc = "Banned in over 36 galaxies."
@@ -394,6 +460,14 @@
base_icon_state = "shadyjim"
spawn_type = /obj/item/cigarette/rollie/mindbreaker
+/obj/item/storage/fancy/cigarettes/cigpack_mindbreaker/empty
+ spawn_count = 0
+ spawn_coupon = FALSE
+ open_status = FANCY_CONTAINER_OPEN
+
+/obj/item/storage/fancy/cigarettes/flash_powder
+ spawn_type = /obj/item/cigarette/flash_powder
+
/obj/item/storage/fancy/rollingpapers
name = "rolling paper pack"
desc = "A pack of Rollers brand rolling papers." // DARKPACK EDIT CHANGE
@@ -408,11 +482,20 @@
has_open_closed_states = FALSE
storage_type = /datum/storage/rolling_paper_pack
+/obj/item/storage/fancy/rollingpapers/Initialize(mapload)
+ . = ..()
+
+ if(!spawn_count)
+ update_appearance()
+
/obj/item/storage/fancy/rollingpapers/update_overlays()
. = ..()
if(!contents.len)
. += "[base_icon_state]_empty"
+/obj/item/storage/fancy/rollingpapers/empty
+ spawn_count = 0
+
/////////////
//CIGAR BOX//
/////////////
@@ -436,6 +519,10 @@
//reset any changes the parent call may have made
icon_state = base_icon_state
+/obj/item/storage/fancy/cigarettes/cigars/empty
+ spawn_count = 0
+ open_status = FANCY_CONTAINER_OPEN
+
/obj/item/storage/fancy/cigarettes/cigars/update_overlays()
. = ..()
if(!open_status)
@@ -452,6 +539,10 @@
base_icon_state = "cohibacase"
spawn_type = /obj/item/cigarette/cigar/cohiba
+/obj/item/storage/fancy/cigarettes/cigars/cohiba/empty
+ spawn_count = 0
+ open_status = FANCY_CONTAINER_OPEN
+
/obj/item/storage/fancy/cigarettes/cigars/havana
name = "\improper premium Havanian cigar case"
desc = "A case of classy Havanian cigars."
@@ -459,6 +550,10 @@
base_icon_state = "cohibacase"
spawn_type = /obj/item/cigarette/cigar/havana
+/obj/item/storage/fancy/cigarettes/cigars/havana/empty
+ spawn_count = 0
+ open_status = FANCY_CONTAINER_OPEN
+
/*
* Heart Shaped Box w/ Chocolates
*/
@@ -514,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 971e30818aea..fb0a57427734 100644
--- a/code/game/objects/items/storage/garment.dm
+++ b/code/game/objects/items/storage/garment.dm
@@ -39,6 +39,10 @@
name = "quartermasters's garment bag"
desc = "A bag for storing extra clothes and shoes. This one belongs to the quartermaster."
+/obj/item/storage/bag/garment/paramedic
+ name = "EMT's garment bag"
+ desc = "A bag for storing extra clothes and shoes. This one belongs to the emergency medical team."
+
/obj/item/storage/bag/garment/captain/PopulateContents()
new /obj/item/clothing/under/rank/captain(src)
new /obj/item/clothing/under/rank/captain/skirt(src)
@@ -54,6 +58,10 @@
new /obj/item/clothing/head/hats/caphat/parade(src)
new /obj/item/clothing/neck/cloak/cap(src)
new /obj/item/clothing/shoes/laceup(src)
+ new /obj/item/storage/backpack/captain(src)
+ new /obj/item/storage/backpack/satchel/cap(src)
+ new /obj/item/storage/backpack/duffelbag/captain(src)
+ new /obj/item/storage/backpack/messenger/cap(src)
/obj/item/storage/bag/garment/hop/PopulateContents()
new /obj/item/clothing/under/rank/civilian/head_of_personnel(src)
@@ -92,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)
@@ -121,7 +129,11 @@
new /obj/item/clothing/head/beret/medical/cmo(src)
new /obj/item/clothing/head/utility/surgerycap/cmo(src)
new /obj/item/clothing/neck/cloak/cmo(src)
- new /obj/item/clothing/shoes/sneakers/blue (src)
+ new /obj/item/clothing/shoes/sneakers/white(src)
+ new /obj/item/storage/backpack/chief_medic(src)
+ new /obj/item/storage/backpack/satchel/chief_medic(src)
+ new /obj/item/storage/backpack/duffelbag/chief_medic(src)
+ new /obj/item/storage/backpack/messenger/chief_medic(src)
/obj/item/storage/bag/garment/engineering_chief/PopulateContents()
new /obj/item/clothing/under/rank/engineering/chief_engineer(src)
@@ -147,3 +159,10 @@
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/neck/cloak/qm(src)
new /obj/item/clothing/shoes/sneakers/brown(src)
+
+/obj/item/storage/bag/garment/paramedic/PopulateContents()
+ new /obj/item/clothing/under/rank/medical/paramedic(src)
+ new /obj/item/clothing/under/rank/medical/paramedic/skirt(src)
+ new /obj/item/clothing/gloves/latex/nitrile(src)
+ new /obj/item/clothing/shoes/workboots/black(src)
+ new /obj/item/clothing/glasses/hud/health(src)
diff --git a/code/game/objects/items/storage/holsters.dm b/code/game/objects/items/storage/holsters.dm
index 379d8b1c3bfb..a4f9a271c175 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."
@@ -102,6 +106,3 @@
/obj/item/ammo_box/speedloader/c357 = 2,
/obj/item/gun/ballistic/revolver/cowboy/nuclear = 1,
), src)
-
-
-
diff --git a/code/game/objects/items/storage/lockbox.dm b/code/game/objects/items/storage/lockbox.dm
index 02f89c0f351c..791be925adf0 100644
--- a/code/game/objects/items/storage/lockbox.dm
+++ b/code/game/objects/items/storage/lockbox.dm
@@ -22,6 +22,7 @@
register_context()
update_icon_state()
+ AddElement(/datum/element/cuffable_item)
///screentips for lockboxes
/obj/item/storage/lockbox/add_context(atom/source, list/context, obj/item/held_item, mob/user)
diff --git a/code/game/objects/items/storage/medkit.dm b/code/game/objects/items/storage/medkit.dm
index a4ad08cbbf11..ab56a9253320 100644
--- a/code/game/objects/items/storage/medkit.dm
+++ b/code/game/objects/items/storage/medkit.dm
@@ -27,6 +27,10 @@
/// Defines damage type of the medkit. General ones stay null. Used for medibot healing bonuses
var/damagetype_healed
+/obj/item/storage/medkit/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/cuffable_item)
+
/obj/item/storage/medkit/regular
icon_state = "medkit"
desc = "A first aid kit with the ability to heal common types of injuries."
@@ -38,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,
@@ -56,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,
@@ -76,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,
@@ -100,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,
@@ -126,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)
@@ -153,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,
@@ -178,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,
@@ -204,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,
@@ -228,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,
@@ -251,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,
@@ -270,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,
@@ -293,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,
@@ -315,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,
@@ -352,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,
@@ -370,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
@@ -492,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/storage.dm b/code/game/objects/items/storage/storage.dm
index d9e2fe3ae67c..957d6f2e355d 100644
--- a/code/game/objects/items/storage/storage.dm
+++ b/code/game/objects/items/storage/storage.dm
@@ -19,9 +19,6 @@
PopulateContents()
- for (var/obj/item/item in src)
- item.item_flags |= IN_STORAGE
-
/obj/item/storage/create_storage(
max_slots,
max_specific_storage,
diff --git a/code/game/objects/items/storage/toolboxes/_toolbox.dm b/code/game/objects/items/storage/toolboxes/_toolbox.dm
index 1a078bebec8d..7601e3264250 100644
--- a/code/game/objects/items/storage/toolboxes/_toolbox.dm
+++ b/code/game/objects/items/storage/toolboxes/_toolbox.dm
@@ -46,6 +46,7 @@
latches = "quad_latch" // like winning the lottery, but worse
update_appearance()
AddElement(/datum/element/falling_hazard, damage = force, wound_bonus = wound_bonus, hardhat_safety = TRUE, crushes = FALSE, impact_sound = hitsound)
+ AddElement(/datum/element/cuffable_item)
/obj/item/storage/toolbox/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
if (user.combat_mode || !user.has_hand_for_held_index(user.get_inactive_hand_index()))
@@ -99,7 +100,7 @@
picked_tool.melee_attack_chain(user, interacting_with, modifiers)
current_interactions -= 1
- if (QDELETED(picked_tool) || picked_tool.loc != user || !user.CanReach(picked_tool))
+ if (QDELETED(picked_tool) || picked_tool.loc != user || !picked_tool.IsReachableBy(user))
current_interactions = 0
return
@@ -148,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/weapons.dm b/code/game/objects/items/storage/toolboxes/weapons.dm
index b1e13ba58b57..f7d638486593 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 53548989384a..1e8a9acbba86 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/storage/wallets.dm b/code/game/objects/items/storage/wallets.dm
index 8ab4b176ee1a..51bb6b6e0e18 100644
--- a/code/game/objects/items/storage/wallets.dm
+++ b/code/game/objects/items/storage/wallets.dm
@@ -35,7 +35,7 @@
is_magnetic_found = TRUE
if(!is_magnetic_found)
- var/card_tally = SSid_access.tally_access(id_card, ACCESS_FLAG_COMMAND)
+ var/card_tally = SSid_access.tally_access(id_card, ACCESS_FLAG_PRV_COMMAND)
if(card_tally > winning_tally)
winning_tally = card_tally
front_id = id_card
diff --git a/code/game/objects/items/surgery_tray.dm b/code/game/objects/items/surgery_tray.dm
index e55b7d711865..8c0ccdad40fe 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 815631e4cf8d..ad6c52709baf 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/tanks/watertank.dm b/code/game/objects/items/tanks/watertank.dm
index a704d49a7f38..3891f34bd095 100644
--- a/code/game/objects/items/tanks/watertank.dm
+++ b/code/game/objects/items/tanks/watertank.dm
@@ -28,6 +28,7 @@
create_reagents(volume, OPENCONTAINER)
noz = make_noz()
RegisterSignal(noz, COMSIG_MOVABLE_MOVED, PROC_REF(noz_move))
+ AddElement(/datum/element/drag_pickup)
/obj/item/watertank/Destroy()
QDEL_NULL(noz)
@@ -90,12 +91,6 @@
else
return ..()
-/obj/item/watertank/mouse_drop_dragged(atom/over_object)
- var/mob/M = loc
- if(istype(M) && istype(over_object, /atom/movable/screen/inventory/hand))
- var/atom/movable/screen/inventory/hand/H = over_object
- M.putItemFromInventoryInHandIfPossible(src, H.held_index)
-
/obj/item/watertank/attackby(obj/item/attacking_item, mob/user, list/modifiers, list/attack_modifiers)
if(attacking_item == noz)
remove_noz()
diff --git a/code/game/objects/items/tcg/tcg.dm b/code/game/objects/items/tcg/tcg.dm
index d40b236f5c5a..bf4408062c8d 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 b1adc436e7a2..18eabb3f8169 100644
--- a/code/game/objects/items/teleportation.dm
+++ b/code/game/objects/items/teleportation.dm
@@ -12,7 +12,7 @@
*/
/obj/item/locator
name = "bluespace locator"
- desc = "Used to track portable teleportation beacons and targets with embedded tracking implants."
+ desc = "A handheld device that locks onto the unique bluespace resonance of tracking implants, providing real-time directional and positional data."
icon = 'icons/obj/devices/tracker.dmi'
icon_state = "locator"
var/temp = null
@@ -34,61 +34,35 @@
/obj/item/locator/ui_data(mob/user)
var/list/data = list()
-
data["trackingrange"] = tracking_range;
- // Get our current turf location.
- var/turf/sr = get_turf(src)
-
- if (sr)
- // Check every teleport beacon.
- var/list/tele_beacons = list()
- for(var/obj/item/beacon/W in GLOB.teleportbeacons)
-
- // Get the tracking beacon's turf location.
- var/turf/tr = get_turf(W)
+ var/turf/current_turf = get_turf(src) // Get our current turf location.
+ if(!current_turf)
+ return data
- // Make sure it's on a turf and that its Z-level matches the tracker's Z-level
- if (tr && tr.z == sr.z)
- // Get the distance between the beacon's turf and our turf
- var/distance = max(abs(tr.x - sr.x), abs(tr.y - sr.y))
-
- // If the target is too far away, skip over this beacon.
- if(distance > tracking_range)
- continue
-
- var/beacon_name
+ var/list/track_implants = list()
+ for(var/obj/item/implant/tracking/tracking_implant in GLOB.tracked_implants)
+ if(!tracking_implant.imp_in || !isliving(tracking_implant.imp_in))
+ continue
- if(W.renamed)
- beacon_name = W.name
- else
- var/area/A = get_area(W)
- beacon_name = A.name
+ var/mob/living/tracked_mob = tracking_implant.imp_in
+ if(tracked_mob.stat == DEAD)
+ if(tracked_mob.timeofdeath + tracking_implant.lifespan_postmortem < world.time)
+ continue
- var/D = dir2text(get_dir(sr, tr))
- tele_beacons += list(list(name = beacon_name, direction = D, distance = distance))
+ var/turf/implant_turf = get_turf(tracking_implant)
+ if(!implant_turf || implant_turf.z != current_turf.z)
+ continue
- data["telebeacons"] = tele_beacons
+ var/distance = max(abs(implant_turf.x - current_turf.x), abs(implant_turf.y - current_turf.y)) // get Chebyshev distance
+ if(distance > tracking_range)
+ continue
- var/list/track_implants = list()
+ var/implant_direction = dir2text(get_dir(current_turf, implant_turf))
+ track_implants += list(list(name = tracking_implant.imp_in.name, direction = implant_direction, distance = distance))
- for (var/obj/item/implant/beacon/tracking_beacon in GLOB.tracked_implants)
- if (!tracking_beacon.imp_in || !isliving(tracking_beacon.loc))
- continue
- else
- var/mob/living/living_mob = tracking_beacon.loc
- if (living_mob.stat == DEAD)
- if (living_mob.timeofdeath + tracking_beacon.lifespan_postmortem < world.time)
- continue
- var/turf/tr = get_turf(tracking_beacon)
- var/distance = max(abs(tr.x - sr.x), abs(tr.y - sr.y))
-
- if(distance > tracking_range)
- continue
+ data["trackimplants"] = track_implants
- var/D = dir2text(get_dir(sr, tr))
- track_implants += list(list(name = tracking_beacon.imp_in.name, direction = D, distance = distance))
- data["trackimplants"] = track_implants
return data
#define PORTAL_LOCATION_DANGEROUS "portal_location_dangerous"
@@ -113,6 +87,9 @@
custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5)
armor_type = /datum/armor/item_hand_tele
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+ sound_vary = TRUE
+ pickup_sound = SFX_GENERIC_DEVICE_PICKUP
+ drop_sound = SFX_GENERIC_DEVICE_DROP
///List of portal pairs created by this hand tele
var/list/active_portal_pairs = list()
///Maximum concurrent active portal pairs allowed
@@ -426,7 +403,7 @@
var/bagholdingcheck = FALSE
if(iscarbon(user))
var/mob/living/carbon/teleporting_guy = user
- if(locate(/obj/item/storage/backpack/holding) in teleporting_guy.get_all_gear())
+ if(locate(/obj/item/storage/backpack/holding) in teleporting_guy.get_all_gear(INCLUDE_PROSTHETICS|INCLUDE_ABSTRACT|INCLUDE_ACCESSORIES))
bagholdingcheck = TRUE
if(isclosedturf(destination))
diff --git a/code/game/objects/items/theft_tools.dm b/code/game/objects/items/theft_tools.dm
index ab9acd207a95..c13d621036d3 100644
--- a/code/game/objects/items/theft_tools.dm
+++ b/code/game/objects/items/theft_tools.dm
@@ -204,7 +204,7 @@
if(victim.incorporeal_move || HAS_TRAIT(victim, TRAIT_GODMODE)) //try to keep this in sync with supermatter's consume fail conditions
return ..()
var/mob/thrower = throwingdatum?.get_thrower()
- if(thrower)
+ if(istype(thrower))
log_combat(thrower, hit_atom, "consumed", src)
message_admins("[src] has consumed [key_name_admin(victim)] [ADMIN_JMP(src)], thrown by [key_name_admin(thrower)].")
investigate_log("has consumed [key_name(victim)], thrown by [key_name(thrower)]", INVESTIGATE_ENGINE)
diff --git a/code/game/objects/items/tongs.dm b/code/game/objects/items/tongs.dm
index 3c85cc8c004c..a6be04b604fd 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 731fd3e6f0a6..411989719766 100644
--- a/code/game/objects/items/tools/crowbar.dm
+++ b/code/game/objects/items/tools/crowbar.dm
@@ -25,6 +25,7 @@
toolspeed = 1
armor_type = /datum/armor/item_crowbar
var/force_opens = FALSE
+ custom_price = 20 // DARKPACK EDIT ADD - ECONOMY
/datum/armor/item_crowbar
fire = 50
@@ -132,9 +133,32 @@
var/snap_time_weak_handcuffs = 0 SECONDS
/// Used on Initialize, how much time to cut real handcuffs. Null means it can't.
var/snap_time_strong_handcuffs = 0 SECONDS
+ /// The text used for our jaws tool description while active
+ var/active_text = "cutting"
+ /// The text used for our jaws tool description while inactive
+ var/inactive_text = "prying"
+ /// The default tool behavior. This should match tool_behavior
+ var/first_tool_behavior = TOOL_CROWBAR
+ /// The active tool behavior. This should not match tool_behavior on init.
+ var/second_tool_behavior = TOOL_WIRECUTTER
+ /// Determines if we want to limit our jaws of life from opening certain doors or not.
+ var/limit_jaws_access = FALSE
+ /// The access on doors that block our jaws of life from opening if limit_jaws_access is TRUE. Does nothing if FALSE.
+ var/list/blacklisted_access = list()
+ /// Whether or not our jaws throw out an alert when we pry open a door. Default alert sends out a message to security comms.
+ var/radio_alert = FALSE
+ /// If radio_alert is TRUE, access in this list that is found on our pried open door is ignored.
+ var/list/ignored_access = list(
+ ACCESS_MAINT_TUNNELS,
+ ACCESS_AUX_BASE,
+ ACCESS_EXTERNAL_AIRLOCKS,
+ )
+ COOLDOWN_DECLARE(alert_cooldown)
+ /// How long between announcements from our jaws of life. Keeps the jaws from getting too radio spammy.
+ var/alert_cooldown_time = 1 MINUTES
/obj/item/crowbar/power/get_all_tool_behaviours()
- return list(TOOL_CROWBAR, TOOL_WIRECUTTER)
+ return list(first_tool_behavior, second_tool_behavior)
/obj/item/crowbar/power/Initialize(mapload)
. = ..()
@@ -148,6 +172,11 @@
inhand_icon_change = FALSE, \
)
RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform))
+ RegisterSignal(src, COMSIG_TOOL_FORCE_OPEN_AIRLOCK, PROC_REF(on_force_open))
+
+/obj/item/crowbar/power/examine()
+ . = ..()
+ . += "It's fitted with a [tool_behaviour == first_tool_behavior ? inactive_text : active_text] head."
/*
* Signal proc for [COMSIG_TRANSFORMING_ON_TRANSFORM].
@@ -157,27 +186,68 @@
/obj/item/crowbar/power/proc/on_transform(obj/item/source, mob/user, active)
SIGNAL_HANDLER
- tool_behaviour = (active ? TOOL_WIRECUTTER : TOOL_CROWBAR)
+ tool_behaviour = (active ? second_tool_behavior : first_tool_behavior)
if(user)
- balloon_alert(user, "attached [active ? "cutting" : "prying"]")
+ balloon_alert(user, "attached [tool_behaviour == first_tool_behavior ? inactive_text : active_text]")
playsound(src, 'sound/items/tools/change_jaws.ogg', 50, TRUE)
- if(tool_behaviour == TOOL_CROWBAR)
+ if(tool_behaviour != TOOL_WIRECUTTER)
RemoveElement(/datum/element/cuffsnapping, snap_time_weak_handcuffs, snap_time_strong_handcuffs)
else
AddElement(/datum/element/cuffsnapping, snap_time_weak_handcuffs, snap_time_strong_handcuffs)
return COMPONENT_NO_DEFAULT_MESSAGE
-/obj/item/crowbar/power/syndicate
- name = "jaws of death"
- desc = "An improved, faster, and smaller copy of Nanotrasen's standard jaws of life. Can be used to force open airlocks in its crowbar configuration."
- icon_state = "jaws_syndie"
- w_class = WEIGHT_CLASS_SMALL
- toolspeed = 0.5
- force_opens = TRUE
+/*
+ * Signal proc for [COMSIG_TOOL_FORCE_OPEN_AIRLOCK].
+ *
+ * Determines if our jaws of life is restricted from opening some doors, and whether or not we need to alert over the radio whenever they are used to
+ * pry open a door. Useful if you want to restrict jaws of life in some fashion.
+ */
-/obj/item/crowbar/power/examine()
- . = ..()
- . += " It's fitted with a [tool_behaviour == TOOL_CROWBAR ? "prying" : "cutting"] head."
+/obj/item/crowbar/power/proc/on_force_open(obj/item/source, mob/user, obj/machinery/door/airlock/target)
+ SIGNAL_HANDLER
+
+ var/list/collective_access = list()
+ collective_access += target.req_access
+ collective_access += target.req_one_access
+
+ if(limit_jaws_access)
+ for(var/possible_blacklisted_access in collective_access)
+ if(possible_blacklisted_access in blacklisted_access)
+ playsound(src.loc, 'sound/machines/buzz/buzz-sigh.ogg', 50, FALSE)
+ user.balloon_alert(user, "cannot pry open!")
+ return COMPONENT_TOOL_DO_NOT_ALLOW_FORCE_OPEN
+
+ if(radio_alert && COOLDOWN_FINISHED(src, alert_cooldown))
+
+ if(!collective_access) //Return if the door has literally no access at all
+ return COMPONENT_TOOL_ALLOW_FORCE_OPEN
+
+ for(var/possible_public_access in collective_access) //Return if the door has otherwise unimportant access
+ if((possible_public_access in ignored_access))
+ return COMPONENT_TOOL_ALLOW_FORCE_OPEN
+
+ sound_the_alarms(user, target)
+ COOLDOWN_START(src, alert_cooldown, alert_cooldown_time)
+ return COMPONENT_TOOL_ALLOW_FORCE_OPEN
+
+///Our alert for our jaws of life.
+/obj/item/crowbar/power/proc/sound_the_alarms(mob/user, obj/machinery/door/airlock/target)
+ aas_config_announce(/datum/aas_config_entry/jaws_entry_alert, list(
+ "PERSON" = user.name,
+ "LOCATION" = get_area_name(target),
+ "TOOL" = name), src, list(RADIO_CHANNEL_SECURITY), RADIO_CHANNEL_SECURITY)
+
+/datum/aas_config_entry/jaws_entry_alert
+ // This tool screams into the radio whenever the user successfully pries open an airlock.
+ name = "Door Forced Entry Alert"
+ announcement_lines_map = list(
+ RADIO_CHANNEL_SECURITY = "SECURITY ALERT: %PERSON has forced open a door at %LOCATION using %TOOL. Confirm that this was done during an emergency by authorized staff.",
+ )
+ vars_and_tooltips_map = list(
+ "PERSON" = "will be replaced with the name of the user",
+ "LOCATION" = "with the area of the door",
+ "TOOL" = "replaced with the tool used",
+ )
/obj/item/crowbar/power/suicide_act(mob/living/user)
if(tool_behaviour == TOOL_CROWBAR)
@@ -194,6 +264,82 @@
playsound(loc, SFX_DESECRATION, 50, TRUE, -1)
return BRUTELOSS
+/obj/item/crowbar/power/syndicate
+ name = "jaws of death"
+ desc = "An improved, faster, and smaller copy of Nanotrasen's standard jaws of life. Can be used to force open airlocks in its crowbar configuration."
+ icon_state = "jaws_syndie"
+ w_class = WEIGHT_CLASS_SMALL
+ toolspeed = 0.5
+
+/obj/item/crowbar/power/paramedic
+ name = "jaws of recovery"
+ 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. \
+ Cannot access certain high security areas due to safety concerns."
+ icon_state = "jaws_paramedic"
+ inhand_icon_state = "jawsparamedic"
+ worn_icon_state = "jawsparamedic"
+ w_class = WEIGHT_CLASS_BULKY
+ toolspeed = 1
+ slot_flags = null
+ active_text = "bonesetting"
+ second_tool_behavior = TOOL_BONESET
+ limit_jaws_access = TRUE
+ blacklisted_access = list(
+ ACCESS_COMMAND,
+ ACCESS_AI_UPLOAD,
+ ACCESS_CAPTAIN,
+ ACCESS_HOP,
+ ACCESS_SECURITY,
+ ACCESS_BRIG,
+ ACCESS_ARMORY,
+ ACCESS_HOS,
+ ACCESS_DETECTIVE,
+ ACCESS_CE,
+ ACCESS_CMO,
+ ACCESS_QM,
+ ACCESS_VAULT,
+ 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)
+ aas_config_announce(/datum/aas_config_entry/jaws_entry_alert_paramedic, list(
+ "PERSON" = user.name,
+ "LOCATION" = get_area_name(target),
+ "TOOL" = name), src, list(RADIO_CHANNEL_SECURITY), RADIO_CHANNEL_SECURITY)
+
+ aas_config_announce(/datum/aas_config_entry/jaws_entry_alert_paramedic, list(
+ "PERSON" = user.name,
+ "LOCATION" = get_area_name(target),
+ "TOOL" = name), src, list(RADIO_CHANNEL_MEDICAL), RADIO_CHANNEL_MEDICAL)
+
+/datum/aas_config_entry/jaws_entry_alert_paramedic
+ // This tool screams into the radio whenever the user successfully pries open an airlock.
+ name = "Door Forced Entry Medical Alert"
+ announcement_lines_map = list(
+ RADIO_CHANNEL_SECURITY = "SECURITY ALERT: %PERSON has forced open a door at %LOCATION using %TOOL. Confirm that this was done during an emergency by authorized staff.",
+ RADIO_CHANNEL_MEDICAL = "MEDICAL ALERT: %PERSON has forced open a door at %LOCATION using %TOOL. Confirm that this was done during an emergency by authorized staff.",
+ )
+ vars_and_tooltips_map = list(
+ "PERSON" = "will be replaced with the name of the user",
+ "LOCATION" = "with the area of the door",
+ "TOOL" = "replaced with the tool used",
+ )
+
+/obj/item/crowbar/power/paramedic/silent
+ 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
+
/obj/item/crowbar/cyborg
name = "hydraulic crowbar"
desc = "A hydraulic prying tool, simple but powerful."
diff --git a/code/game/objects/items/tools/painter/paintable_decals.dm b/code/game/objects/items/tools/painter/paintable_decals.dm
index 5cfbd2cc27f8..a2c330f516a1 100644
--- a/code/game/objects/items/tools/painter/paintable_decals.dm
+++ b/code/game/objects/items/tools/painter/paintable_decals.dm
@@ -170,7 +170,7 @@
category = "Tiles"
default_alpha = /obj/effect/turf_decal/tile::alpha
possible_colors = list(
- "Neutral" = /obj/effect/turf_decal/tile/neutral::color,
+ "Neutral" = "#d4d4d432", // very lazy way to do transparent decal, should be remade in future
"White" = "#FFFFFF",
"Dark" = /obj/effect/turf_decal/tile/dark::color,
"Bar Burgundy" = /obj/effect/turf_decal/tile/bar::color,
diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm
index e1b644a08cc9..429cb66a7ef1 100644
--- a/code/game/objects/items/tools/screwdriver.dm
+++ b/code/game/objects/items/tools/screwdriver.dm
@@ -47,6 +47,7 @@
COLOR_TOOL_CYAN,
COLOR_TOOL_YELLOW,
)
+ custom_price = 20 // DARKPACK EDIT ADD - ECONOMY
/datum/armor/item_screwdriver
fire = 50
@@ -143,7 +144,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 6ad4bbe579eb..be9eb72889ee 100644
--- a/code/game/objects/items/tools/weldingtool.dm
+++ b/code/game/objects/items/tools/weldingtool.dm
@@ -48,6 +48,7 @@
var/activation_sound = 'sound/items/tools/welderactivate.ogg'
var/deactivation_sound = 'sound/items/tools/welderdeactivate.ogg'
+ custom_price = 20 // DARKPACK EDIT ADD - ECONOMY
/datum/armor/item_weldingtool
fire = 100
@@ -333,6 +334,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 +355,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 +372,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 612a7cf498c0..7e3d3d39cd53 100644
--- a/code/game/objects/items/tools/wirecutters.dm
+++ b/code/game/objects/items/tools/wirecutters.dm
@@ -9,13 +9,15 @@
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
- /* DARKPACK EDIT REMOVAL START
+ /* // DARKPACK EDIT REMOVAL START
+ 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
*/ // DARKPACK EDIT REMOVAL END
+ greyscale_colors = COLOR_RED
obj_flags = CONDUCTS_ELECTRICITY
slot_flags = ITEM_SLOT_BELT
force = 6
@@ -49,6 +51,7 @@
var/snap_time_weak_handcuffs = 0 SECONDS
/// Used on Initialize, how much time to cut real handcuffs. Null means it can't.
var/snap_time_strong_handcuffs = null
+ custom_price = 20 // DARKPACK EDIT ADD - ECONOMY
/datum/armor/item_wirecutters
fire = 50
@@ -75,6 +78,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
@@ -85,3 +92,5 @@
worn_icon_state = "cutters"
toolspeed = 0.5
random_color = FALSE
+ greyscale_config = null
+ greyscale_colors = null
diff --git a/code/game/objects/items/tools/wrench.dm b/code/game/objects/items/tools/wrench.dm
index 25f7e75593fb..28ba97dfcec3 100644
--- a/code/game/objects/items/tools/wrench.dm
+++ b/code/game/objects/items/tools/wrench.dm
@@ -25,6 +25,7 @@
tool_behaviour = TOOL_WRENCH
toolspeed = 1
armor_type = /datum/armor/item_wrench
+ custom_price = 20 // DARKPACK EDIT ADD - ECONOMY
/datum/armor/item_wrench
fire = 50
diff --git a/code/game/objects/items/toy_mechs.dm b/code/game/objects/items/toy_mechs.dm
index 74dccf416ee6..cf8b1f341289 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 55a6ba57957f..ed736c39150c 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)
@@ -1208,7 +1210,7 @@
/obj/item/toy/figure/Initialize(mapload)
. = ..()
- desc = "A \"Space Life\" brand [src]."
+ desc = "A \"Black Dog Games Factory\" brand [src]." // DARKPACK EDIT CHANGE
AddElement(/datum/element/toy_talk)
/obj/item/toy/figure/attack_self(mob/user as mob)
diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
index 9e513a939cff..8dc3181464c2 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 2d2d5e405933..5b5e934bb25e 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 5ae4d33df2bc..cbd63adf7c00 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 2db970b556ae..2cd4c4011dad 100644
--- a/code/game/objects/items/wall_mounted.dm
+++ b/code/game/objects/items/wall_mounted.dm
@@ -6,65 +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), floor_to_wall, TRUE)
- 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
- 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
@@ -91,5 +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 1f0583f75037..cabe475fb602 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 ..()
@@ -173,6 +173,10 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
throw_range = 5
armour_penetration = 35
+/obj/item/claymore/cutlass/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/cuffable_item) //closed sword guard
+
/obj/item/claymore/cutlass/old
name = "old cutlass"
desc = parent_type::desc + " This one seems a tad old."
@@ -359,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."
@@ -392,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
@@ -563,8 +591,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
/obj/item/phone
name = "red phone"
desc = "Should anything ever go wrong..."
- icon = 'icons/obj/devices/voice.dmi'
- icon_state = "red_phone"
+ icon = 'modular_darkpack/modules/phones/icons/phone.dmi' // DARKPACK EDIT CHANGE
+ icon_state = "phone_red" // DARKPACK EDIT CHANGE
force = 3
throwforce = 2
throw_speed = 3
@@ -600,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)
. = ..()
@@ -614,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."
@@ -672,6 +706,10 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
attack_verb_continuous = list("bludgeons", "whacks", "thrashes")
attack_verb_simple = list("bludgeon", "whack", "thrash")
+/obj/item/cane/crutch/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/cuffable_item)
+
/obj/item/cane/crutch/examine(mob/user, thats)
. = ..()
// tacked on after the cane string
@@ -708,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"
@@ -724,6 +762,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
/obj/item/cane/white/Initialize(mapload)
. = ..()
+ AddElement(/datum/element/cuffable_item)
AddComponent( \
/datum/component/transforming, \
force_on = 7, \
@@ -810,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!"))
@@ -835,87 +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")
-
-/obj/item/melee/skateboard
- name = "skateboard"
- desc = "A skateboard. It can be placed on its wheels and ridden, or used as a radical weapon."
- icon = 'icons/mob/rideables/vehicles.dmi'
- icon_state = "skateboard_held"
- inhand_icon_state = "skateboard"
- force = 12
- throwforce = 4
- w_class = WEIGHT_CLASS_NORMAL
- attack_verb_continuous = list("smacks", "whacks", "slams", "smashes")
- attack_verb_simple = list("smack", "whack", "slam", "smash")
- ///The vehicle counterpart for the board
- var/board_item_type = /obj/vehicle/ridden/scooter/skateboard
-
-/obj/item/melee/skateboard/attack_self(mob/user)
- var/obj/vehicle/ridden/scooter/skateboard/S = new board_item_type(get_turf(user))//this probably has fucky interactions with telekinesis but for the record it wasn't my fault
- S.buckle_mob(user)
- qdel(src)
-
-/obj/item/melee/skateboard/improvised
- name = "improvised skateboard"
- desc = "A jury-rigged skateboard. It can be placed on its wheels and ridden, or used as a radical weapon."
- board_item_type = /obj/vehicle/ridden/scooter/skateboard/improvised
-
-/obj/item/melee/skateboard/pro
- name = "skateboard"
- desc = "An EightO brand professional skateboard. It looks sturdy and well made."
- icon_state = "skateboard2_held"
- inhand_icon_state = "skateboard2"
- board_item_type = /obj/vehicle/ridden/scooter/skateboard/pro
- custom_premium_price = PAYCHECK_COMMAND * 5
-
-/obj/item/melee/skateboard/hoverboard
- name = "hoverboard"
- desc = "A blast from the past, so retro!"
- icon_state = "hoverboard_red_held"
- inhand_icon_state = "hoverboard_red"
- board_item_type = /obj/vehicle/ridden/scooter/skateboard/hoverboard
- custom_premium_price = PAYCHECK_COMMAND * 5.4 //If I can't make it a meme I'll make it RAD
-
-/obj/item/melee/skateboard/hoverboard/admin
- name = "Board Of Directors"
- desc = "The engineering complexity of a spaceship concentrated inside of a board. Just as expensive, too."
- icon_state = "hoverboard_nt_held"
- inhand_icon_state = "hoverboard_nt"
- board_item_type = /obj/vehicle/ridden/scooter/skateboard/hoverboard/admin
-
-/obj/item/melee/skateboard/holyboard
- name = "holy skateboard"
- desc = "A board blessed by the gods with the power to grind for our sins. Has the initials 'J.C.' on the underside."
- icon_state = "hoverboard_holy_held"
- inhand_icon_state = "hoverboard_holy"
- force = 18
- throwforce = 6
- w_class = WEIGHT_CLASS_NORMAL
- attack_verb_continuous = list("bashes", "crashes", "grinds", "skates")
- attack_verb_simple = list("bash", "crash", "grind", "skate")
- board_item_type = /obj/vehicle/ridden/scooter/skateboard/hoverboard/holyboarded
-
-/obj/item/melee/skateboard/holyboard/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/anti_magic, MAGIC_RESISTANCE|MAGIC_RESISTANCE_HOLY)
- AddComponent(/datum/component/effect_remover, \
- success_feedback = "You disrupt the magic of %THEEFFECT with %THEWEAPON.", \
- success_forcesay = "BEGONE FOUL MAGICKS!!", \
- tip_text = "Clear rune", \
- on_clear_callback = CALLBACK(src, PROC_REF(on_cult_rune_removed)), \
- effects_we_clear = list(/obj/effect/rune, /obj/effect/heretic_rune) \
- )
- AddElement(/datum/element/bane, mob_biotypes = MOB_SPIRIT, damage_multiplier = 0, added_damage = 25, requires_combat_mode = FALSE)
-
-/obj/item/melee/skateboard/holyboard/proc/on_cult_rune_removed(obj/effect/target, mob/living/user)
- SIGNAL_HANDLER
- if(!istype(target, /obj/effect/rune))
- return
-
- var/obj/effect/rune/target_rune = target
- if(target_rune.log_when_erased)
- user.log_message("erased [target_rune.cultist_name] rune using [src]", LOG_GAME)
- SSshuttle.shuttle_purchase_requirements_met[SHUTTLE_UNLOCK_NARNAR] = TRUE
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT)
/obj/item/melee/baseball_bat
name = "baseball bat"
@@ -1095,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)
. = ..()
@@ -1113,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
@@ -1129,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))
@@ -1263,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 671f408557c6..e3647434e61f 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 74cd1213b698..b713c3acd5ee 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 7179eedb9d58..5c8eaf4a8184 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 98a3165b5e2a..000000000000
--- 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/obj_defense.dm b/code/game/objects/obj_defense.dm
index 1d343314531a..6dd7f49ac611 100644
--- a/code/game/objects/obj_defense.dm
+++ b/code/game/objects/obj_defense.dm
@@ -27,7 +27,7 @@
return TRUE
-/obj/bullet_act(obj/projectile/hitting_projectile, def_zone, piercing_hit = FALSE)
+/obj/bullet_act(obj/projectile/hitting_projectile, def_zone, piercing_hit = FALSE, blocked = null)
. = ..()
if(. != BULLET_ACT_HIT)
return .
@@ -125,8 +125,9 @@
/obj/fire_act(exposed_temperature, exposed_volume)
if(HAS_TRAIT(src, TRAIT_UNDERFLOOR))
return
- if(exposed_temperature && !(resistance_flags & FIRE_PROOF))
- take_damage(clamp(0.02 * exposed_temperature, 0, 20), BURN, FIRE, 0)
+ var/potential_damage = 0.02 * exposed_temperature
+ if(exposed_temperature && !(resistance_flags & FIRE_PROOF) && (potential_damage > damage_deflection))
+ take_damage(clamp(potential_damage, 0, 20), BURN, FIRE, 0)
if(QDELETED(src)) // take_damage() can send our obj to an early grave, let's stop here if that happens
return
if(!(resistance_flags & ON_FIRE) && (resistance_flags & FLAMMABLE) && !(resistance_flags & FIRE_PROOF))
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index 5f9b566b6703..cc7cf0f2ccd8 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
. = ..()
@@ -347,3 +351,19 @@ GLOBAL_LIST_EMPTY(objects_by_id_tag)
if(HAS_TRAIT(target, TRAIT_INVERTED_DEMOLITION))
return (1 / demolition_mod)
return demolition_mod
+
+/// Checks performed by a renamable object(through UNIQUE_RENAME obj_flag) before renaming begins.
+/obj/proc/rename_checks(mob/living/user)
+ return TRUE
+
+/// Returns the final name of the object, and does any side effects of renaming, such as sounds.
+/obj/proc/nameformat(input, mob/living/user)
+ return input
+
+/// Same as nameformat, but for desc.
+/obj/proc/descformat(input, mob/living/user)
+ return input
+
+/// Called when UNIQUE_RENAME is reset
+/obj/proc/rename_reset()
+ return
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index 3e7e13c1df2f..9d4442238ac9 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 6eee27ce24ee..000000000000
--- 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 1f77227a8bec..2c0b620dce92 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 6b687c8a4b01..c6435e1973d7 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 f01698e6bb86..637910ce9e4d 100644
--- a/code/game/objects/structures/beds_chairs/chair.dm
+++ b/code/game/objects/structures/beds_chairs/chair.dm
@@ -19,8 +19,6 @@
///How much sitting on this chair influences fishing difficulty
var/fishing_modifier = -5
var/has_armrest = FALSE
- // The mutable appearance used for the overlay over buckled mobs.
- var/mutable_appearance/armrest
/obj/structure/chair/Initialize(mapload)
. = ..()
@@ -28,8 +26,6 @@
name = "tactical [name]"
fishing_modifier -= 8
MakeRotate()
- if (has_armrest)
- gen_armrest()
if(can_buckle && fishing_modifier)
AddComponent(/datum/component/adjust_fishing_difficulty, fishing_modifier)
@@ -67,14 +63,6 @@
visible_message_flags = ALWAYS_SHOW_SELF_MESSAGE,
)
-/obj/structure/chair/on_changed_z_level(turf/old_turf, turf/new_turf, same_z_layer, notify_contents)
- if(same_z_layer || !has_armrest)
- return ..()
- cut_overlay(armrest)
- QDEL_NULL(armrest)
- gen_armrest()
- return ..()
-
/obj/structure/chair/examine(mob/user)
. = ..()
. += span_notice("It's held together by a couple of bolts.")
@@ -83,11 +71,10 @@
///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
- QDEL_NULL(armrest)
return ..()
/obj/structure/chair/atom_deconstruct(disassembled)
@@ -111,29 +98,16 @@
return
. = ..()
-/obj/structure/chair/update_atom_colour()
+/obj/structure/chair/update_overlays()
. = ..()
- if (armrest)
- color_atom_overlay(armrest)
-
-/obj/structure/chair/proc/gen_armrest()
- armrest = GetArmrest()
- armrest.layer = ABOVE_MOB_LAYER
- armrest.appearance_flags |= KEEP_APART
- update_armrest()
-
-/obj/structure/chair/proc/GetArmrest()
- return mutable_appearance(icon, "[icon_state]_armrest")
-
-/obj/structure/chair/proc/update_armrest()
+ if (!has_buckled_mobs())
+ return
+ var/mutable_appearance/armrest = mutable_appearance(icon, "[icon_state]_armrest", ABOVE_MOB_LAYER, src, appearance_flags = KEEP_APART)
+ var/mutable_appearance/armrest_blocker = emissive_blocker(icon, "[icon_state]_armrest", src, ABOVE_MOB_LAYER)
if (cached_color_filter)
armrest = filter_appearance_recursive(armrest, cached_color_filter)
- update_appearance()
-
-/obj/structure/chair/update_overlays()
- . = ..()
- if(has_buckled_mobs())
- . += armrest
+ . += armrest
+ . += armrest_blocker
///allows each chair to request the electrified_buckle component with overlays that dont look ridiculous
/obj/structure/chair/proc/electrify_self(obj/item/assembly/shock_kit/input_shock_kit, mob/user, list/overlays_from_child_procs)
@@ -183,13 +157,13 @@
. = ..()
handle_layer()
if (has_armrest)
- update_armrest()
+ update_appearance()
/obj/structure/chair/post_unbuckle_mob()
. = ..()
handle_layer()
if (has_armrest)
- update_armrest()
+ update_appearance()
/obj/structure/chair/setDir(newdir)
..()
@@ -214,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
@@ -233,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)
@@ -258,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)
@@ -312,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"
@@ -320,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)
. = ..()
@@ -346,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()
@@ -382,13 +366,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)
@@ -401,6 +382,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"
@@ -419,7 +401,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.
@@ -428,6 +410,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool/bar, 0)
// What structure type does this chair become when placed?
var/obj/structure/chair/origin_type = /obj/structure/chair
+/obj/item/chair/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/cuffable_item)
+
/obj/item/chair/suicide_act(mob/living/carbon/user)
user.visible_message(span_suicide("[user] begins hitting [user.p_them()]self with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!"))
playsound(src,hitsound,50,TRUE)
@@ -442,25 +428,28 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool/bar, 0)
plant(user)
/obj/item/chair/proc/plant(mob/user)
- var/turf/T = get_turf(loc)
- if(isgroundlessturf(T))
+ var/turf/turf = user.loc
+ if(!istype(turf) || isgroundlessturf(turf))
to_chat(user, span_warning("You need ground to plant this on!"))
return
+ if(!user.dropItemToGround(src))
+ to_chat(user, span_warning("[src] is stuck to your hand!"))
+ return
if(flags_1 & HOLOGRAM_1)
to_chat(user, span_notice("You try to place down \the [src], but it fades away!"))
qdel(src)
return
- for(var/obj/A in T)
- if(istype(A, /obj/structure/chair))
+ for(var/obj/object in turf)
+ if(istype(object, /obj/structure/chair))
to_chat(user, span_warning("There is already a chair here!"))
return
- if(A.density && !(A.flags_1 & ON_BORDER_1))
+ if(object.density && !(object.flags_1 & ON_BORDER_1))
to_chat(user, span_warning("There is already something here!"))
return
user.visible_message(span_notice("[user] rights \the [src.name]."), span_notice("You right \the [name]."))
- var/obj/structure/chair/chair = new origin_type(get_turf(loc))
+ var/obj/structure/chair/chair = new origin_type(turf)
chair.set_custom_materials(custom_materials)
TransferComponents(chair)
chair.setDir(user.dir)
@@ -543,6 +532,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
@@ -557,6 +547,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
@@ -582,6 +573,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
@@ -625,6 +617,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
@@ -641,7 +634,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
@@ -675,7 +668,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 e6c64d9f36f0..22faec36e70b 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 986bbcd99a07..75c2deb8d6d0 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 01536a2518a2..58196a173da6 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
@@ -92,7 +92,7 @@ LINEN BINS
return ITEM_INTERACT_SUCCESS
/obj/item/bedsheet/attack_self(mob/living/user)
- if(!user.CanReach(src)) //No telekinetic grabbing.
+ if(!IsReachableBy(user)) //No telekinetic grabbing.
return
if(user.body_position != LYING_DOWN)
return
@@ -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 2ad9ac77a68e..f05d8f646f4c 100644
--- a/code/game/objects/structures/bonfire.dm
+++ b/code/game/objects/structures/bonfire.dm
@@ -12,15 +12,17 @@
desc = "For grilling, broiling, charring, smoking, heating, roasting, toasting, simmering, searing, melting, and occasionally burning things."
icon = 'modular_darkpack/master_files/icons/obj/service/hydroponics/equipment.dmi' // DARKPACK EDIT CHANGE
icon_state = "bonfire"
+ base_icon_state = "bonfire" // DARKPACK EDIT ADD
light_color = LIGHT_COLOR_FIRE
density = FALSE
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"
- var/burn_icon = "bonfire_on_fire"
+ var/burn_icon = "_on_fire"
/// if the bonfire has a grill attached
var/grill = FALSE
/// the looping sound effect that is played while burning
@@ -108,7 +110,7 @@
return
burning_loop.start()
- icon_state = burn_icon
+ icon_state = "[base_icon_state][burn_icon]" // DARKPACK EDIT CHANGE
burning = TRUE
set_light(6)
bonfire_burn()
@@ -167,7 +169,7 @@
return
burning_loop.stop()
- icon_state = "bonfire"
+ icon_state = base_icon_state // DARKPACK EDIT CHANGE
burning = FALSE
set_light(0)
QDEL_NULL(particles)
@@ -199,4 +201,14 @@
/obj/structure/bonfire/prelit/LateInitialize()
start_burning()
+// DARKPACK EDIT ADD START
+/obj/structure/bonfire/alt
+ icon_state = "campfire"
+ base_icon_state = "campfire"
+
+/obj/structure/bonfire/prelit/alt
+ icon_state = "campfire"
+ base_icon_state = "campfire"
+// DARKPACK EDIT ADD END
+
#undef BONFIRE_FIRE_STACK_STRENGTH
diff --git a/code/game/objects/structures/cannons/cannon.dm b/code/game/objects/structures/cannons/cannon.dm
index 4c44ae646a86..383e35172093 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 855292e8521a..fca8eb7e901d 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 3a7a027acb58..758a3f197e8a 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/musket/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 ea016e00d677..746c67f0b1ec 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 04410e299809..a8d45ccbf8fc 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 cce7d2ee5162..398e97954e71 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 50437e1936a0..a01ba7fdeef3 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -20,7 +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
@@ -154,6 +154,7 @@ GLOBAL_LIST_EMPTY(roundstart_station_closets)
add_to_roundstart_list()
closet_see_inside = new(src)
+ obj_flags |= UNIQUE_RENAME
// if closed, any item at the crate's loc is put in the contents
if (mapload)
@@ -289,12 +290,27 @@ GLOBAL_LIST_EMPTY(roundstart_station_closets)
if(vname in list(NAMEOF(src, locked), NAMEOF(src, welded), NAMEOF(src, secure), NAMEOF(src, icon_welded), NAMEOF(src, delivery_icon)))
update_appearance()
+// Clone of closet items
+/obj/effect/appearance_clone/closet_item
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+
/// Animates the closet door opening and closing
/obj/structure/closet/proc/animate_door(closing = FALSE)
if(!door_anim_time)
return
if(!door_obj)
door_obj = new
+ if(closing && length(contents))
+ var/icon/mask_icon = icon(icon, has_closed_overlay ? "[icon_door || base_icon_state || initial(icon_state)]_door" : icon_state)
+ // When closing, all of our contents are already in src - they've already disappeared from the world
+ // So to make the animation less jarring, we create a clone of everything in the closet to show in the animation
+ for(var/content in src)
+ var/obj/effect/appearance_clone/closet_item/clone = new(loc, content)
+ // Mask keeps in in bounds of the inside of the closet
+ clone.add_filter("closet_mask", 1, alpha_mask_filter(x = -1 * (clone.pixel_x + clone.pixel_w), y = -1 * (clone.pixel_y + clone.pixel_z), icon = mask_icon))
+ clone.layer = FLOAT_LAYER - 1
+ vis_contents += clone
+
var/default_door_icon = "[icon_door || icon_state]_door"
vis_contents += door_obj
door_obj.icon = icon
@@ -330,6 +346,9 @@ GLOBAL_LIST_EMPTY(roundstart_station_closets)
/obj/structure/closet/proc/end_door_animation()
is_animating_door = FALSE
vis_contents -= door_obj
+ for(var/obj/effect/appearance_clone/closet_item/clone in vis_contents)
+ vis_contents -= clone
+ qdel(clone)
update_icon()
/// Calculates the matrix to be applied to the animated door overlay
@@ -374,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))
@@ -836,39 +865,6 @@ GLOBAL_LIST_EMPTY(roundstart_station_closets)
else
balloon_alert(user, "set to [choice]")
- else if(!opened && IS_WRITING_UTENSIL(weapon))
- if(locked)
- balloon_alert(user, "unlock first!")
- return
-
- if(isnull(id_card) && secure)
- balloon_alert(user, "not yours to rename!")
- return
-
- var/name_set = FALSE
- var/desc_set = FALSE
-
-
- var/input_name = tgui_input_text(user, "Locker Name", "Locker Name", max_length = MAX_NAME_LEN)
-
- if(!isnull(input_name))
- name = input_name
- name_set = TRUE
-
- var/input_desc = tgui_input_text(user, "Locker Description", "Locker Description", max_length = MAX_DESC_LEN)
-
- if(!isnull(input_desc))
- desc = input_desc
- desc_set = TRUE
-
- var/bit_flag = NONE
- if(name_set)
- bit_flag |= UPDATE_NAME
- if(desc_set)
- bit_flag |= UPDATE_DESC
- if(bit_flag)
- update_appearance(bit_flag)
-
else if(opened)
if(istype(weapon, cutting_tool))
if(weapon.tool_behaviour == TOOL_WELDER)
@@ -1260,6 +1256,16 @@ GLOBAL_LIST_EMPTY(roundstart_station_closets)
/obj/structure/closet/proc/add_to_roundstart_list()
GLOB.roundstart_station_closets += src
+/obj/structure/closet/rename_checks(mob/living/user)
+ . = TRUE
+ if(locked)
+ src.balloon_alert(user, "unlock first!")
+ return FALSE
+
+ if(isnull(id_card) && secure)
+ src.balloon_alert(user, "not yours to rename!")
+ return FALSE
+
///Spears deal bonus damages to lockers
/obj/structure/closet/secure_closet/attacked_by(obj/item/attacking_item, mob/living/user, list/modifiers, list/attack_modifiers)
if(istype(attacking_item, /obj/item/spear))
diff --git a/code/game/objects/structures/crates_lockers/closets/bodybag.dm b/code/game/objects/structures/crates_lockers/closets/bodybag.dm
index 2c596b67aebb..12d9b7a37943 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
@@ -39,6 +40,7 @@
rmb_text = "Fold up", \
)
AddElement(/datum/element/contextual_screentip_sharpness, lmb_text = "Remove Tag")
+ obj_flags |= UNIQUE_RENAME | RENAME_NO_DESC
/obj/structure/closet/body_bag/Destroy()
// If we have a stored bag, and it's in nullspace (not in someone's hand), delete it.
@@ -47,28 +49,22 @@
return ..()
/obj/structure/closet/body_bag/attackby(obj/item/interact_tool, mob/user, list/modifiers, list/attack_modifiers)
- if (IS_WRITING_UTENSIL(interact_tool))
- if(!user.can_write(interact_tool))
- return
- var/t = tgui_input_text(user, "What would you like the label to be?", name, max_length = 53)
- if(user.get_active_held_item() != interact_tool)
- return
- if(!user.can_perform_action(src))
- return
- handle_tag("[t ? t : initial(name)]")
- return
- if(!tag_name)
- return
if(interact_tool.tool_behaviour == TOOL_WIRECUTTER || interact_tool.get_sharpness())
to_chat(user, span_notice("You cut the tag off [src]."))
- handle_tag()
+ playsound(src, SFX_WRITING_PEN, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE, SOUND_FALLOFF_EXPONENT + 3, ignore_walls = FALSE)
+ tag_name = null
+ update_appearance()
+ qdel(src.GetComponent(/datum/component/rename))
-///Handles renaming of the bodybag's examine tag.
-/obj/structure/closet/body_bag/proc/handle_tag(new_name)
+/obj/structure/closet/body_bag/nameformat(input, user)
playsound(src, SFX_WRITING_PEN, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE, SOUND_FALLOFF_EXPONENT + 3, ignore_walls = FALSE)
- tag_name = new_name
- name = tag_name ? "[initial(name)] - [tag_name]" : initial(name)
- update_appearance()
+ tag_name = input
+ update_icon()
+ return tag_name ? "[initial(name)] - [tag_name]" : initial(name)
+
+/obj/structure/closet/body_bag/rename_reset()
+ tag_name = null
+ update_icon()
/obj/structure/closet/body_bag/update_overlays()
. = ..()
diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
index 7773d54e3e4c..66f7e2780e56 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 4e43ea2ce10b..407fea71c316 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 5ba0e8c42010..69e521508861 100644
--- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm
+++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
@@ -10,12 +10,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 fdaaa8d4b067..4e50ffb2960d 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 22dd2bec4b2b..e448c3d553de 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 c4ee98fb1068..c9986bae481f 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
@@ -3,9 +3,13 @@
base_icon_state = "freezer"
icon = 'modular_darkpack/master_files/icons/obj/storage/closet32x32.dmi' // DARKPACK EDIT ADD
flags_1 = PREVENT_CONTENTS_EXPLOSION_1
- door_anim_squish = 0.22
- door_anim_angle = 123
- door_anim_time = 4
+ // DARKPACK EDIT CHANGE START
+ door_anim_time = 0
+ enable_door_overlay = FALSE
+ has_opened_overlay = FALSE
+ has_closed_overlay = FALSE
+ // DARKPACK EDIT CHANGE END
+ 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
@@ -16,6 +20,12 @@
/// Minimum temperature of the internal air mixture
var/minimum_temperature = T0C - 60
+// DARKPACK EDIT ADD START - handles fridge open/close states since parent type handles it alot differently
+/obj/structure/closet/secure_closet/freezer/update_icon_state()
+ . = ..()
+ icon_state = opened ? "freezeropen" : "freezer"
+// DARKPACK EDIT ADD END
+
/obj/structure/closet/secure_closet/freezer/process_internal_air(seconds_per_tick)
if(opened)
var/datum/gas_mixture/current_exposed_air = loc.return_air()
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 084631931815..849c7f74e8e5 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,14 +83,11 @@
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)
new /obj/item/clothing/neck/petcollar(src)
new /obj/item/pet_carrier(src)
- new /obj/item/wallframe/defib_mount(src)
new /obj/item/circuitboard/machine/techfab/department/medical(src)
new /obj/item/storage/photo_album/cmo(src)
new /obj/item/storage/lockbox/medal/med(src)
@@ -100,6 +97,7 @@
// Traitor steal objective
new /obj/item/reagent_containers/hypospray/cmo(src)
+ new /obj/item/defibrillator/compact/loaded/cmo(src)
/obj/structure/closet/secure_closet/animal
name = "animal control locker"
@@ -139,3 +137,23 @@
new /obj/item/storage/box/syringes/variety(src)
new /obj/item/storage/box/beakers/variety(src)
new /obj/item/clothing/glasses/science(src)
+
+/obj/structure/closet/secure_closet/paramedic
+ name = "emergency medical team locker"
+ req_access = list(ACCESS_PARAMEDIC)
+ icon_state = "paramed_secure"
+
+/obj/structure/closet/secure_closet/paramedic/PopulateContents()
+ ..()
+
+ var/list/items_inside = list(
+ /obj/item/storage/medkit/emergency = 1,
+ /obj/item/storage/box/bandages = 1,
+ /obj/item/pinpointer/crew = 1,
+ /obj/item/storage/belt/medical/paramedic = 1,
+ /obj/item/radio/headset/headset_med = 2,
+ /obj/item/emergency_bed = 2,
+ /obj/item/storage/bag/garment/paramedic = 2,
+ )
+ generate_items_inside(items_inside,src)
+
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 f639df5f1286..01eb0550d57f 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 1fad4a1c9025..1d798b567a3c 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 51a41063e71a..d1fef8c52da4 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -5,11 +5,6 @@
/obj/structure/closet/secure_closet/captains/PopulateContents()
..()
-
- new /obj/item/storage/backpack/captain(src)
- new /obj/item/storage/backpack/satchel/cap(src)
- new /obj/item/storage/backpack/duffelbag/captain(src)
- new /obj/item/storage/backpack/messenger/cap(src)
new /obj/item/clothing/neck/petcollar(src)
new /obj/item/pet_carrier(src)
new /obj/item/storage/bag/garment/captain(src)
@@ -18,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)
@@ -94,6 +90,7 @@
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()
@@ -178,7 +175,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()
..()
@@ -312,7 +309,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 fc2c2fe56d10..f07fd7dca1df 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 cd2cfe725489..a888034bd5ff 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 prisoner attire." // DARKPACK EDIT CHANGE
@@ -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 c54605eb78c2..e7be92d5a849 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -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."
@@ -283,8 +284,8 @@
new /obj/item/reagent_containers/blood/b_plus(src)
new /obj/item/reagent_containers/blood/o_minus(src)
new /obj/item/reagent_containers/blood/o_plus(src)
- new /obj/item/reagent_containers/blood/lizard(src)
- new /obj/item/reagent_containers/blood/ethereal(src)
+// new /obj/item/reagent_containers/blood/lizard(src) // DARKPACK EDIT REMOVAL
+// new /obj/item/reagent_containers/blood/ethereal(src) // DARKPACK EDIT REMOVAL
for(var/i in 1 to 3)
new /obj/item/reagent_containers/blood/random(src)
new /obj/item/paper/fluff/jobs/medical/blood_types(src)
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
new file mode 100644
index 000000000000..009a8c6a843a
--- /dev/null
+++ b/code/game/objects/structures/crates_lockers/crates/abandoned_crates/abandoned_crates.dm
@@ -0,0 +1,242 @@
+//Originally coded by ISaidNo, later modified by Kelenius. Ported from Baystation12.
+
+/obj/structure/closet/crate/secure/loot
+ name = "abandoned crate"
+ desc = "What could be inside?"
+ icon_state = "securecrate"
+ base_icon_state = "securecrate"
+ integrity_failure = 0 //no breaking open the crate
+ var/code = 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.
+
+ /// Possible loot from the crate, selected according to a weighted list: [typepath] = probability %
+ var/list/possible_loot = list(
+ list( // Toys & Entertainment
+ /obj/item/melee/skateboard/pro = 5,
+ /obj/effect/spawner/abandoned_crate/snappop = 5,
+ /obj/effect/spawner/abandoned_crate/posters = 5,
+ /obj/item/toy/balloon/corgi = 2,
+ /obj/effect/spawner/abandoned_crate/mecha = 2,
+ /obj/item/toy/balloon/syndicate = 2,
+ /obj/item/toy/plush/snakeplushie = 2,
+ /obj/item/bikehorn/airhorn = 2,
+ /obj/item/toy/plush/beeplushie = 2,
+ /obj/item/toy/plush/lizard_plushie = 2,
+ /obj/item/toy/plush/nukeplushie = 1,
+ /obj/effect/spawner/abandoned_crate/bwoink = 1,
+ /obj/effect/spawner/abandoned_crate/pay_day = 1,
+ /obj/item/melee/skateboard/hoverboard = 1,
+ /obj/item/implanter/sad_trombone = 1,
+ ) = 34, // sum of weights inside list
+
+ list( // Weapons & Combat
+ /obj/item/melee/baton = 2,
+ /obj/item/clothing/gloves/boxing/evil = 1,
+ /obj/item/melee/energy/sword/bananium = 1,
+ /obj/item/katana = 1,
+ ) = 5,
+
+ list( // Clothing
+ /obj/item/storage/box/syndie_kit/chameleon/broken = 5,
+ /obj/item/clothing/shoes/kindle_kicks = 2,
+ /obj/effect/spawner/abandoned_crate/kitty = 2,
+ /obj/effect/spawner/abandoned_crate/space_suit = 2,
+ /obj/effect/spawner/abandoned_crate/fursuit = 2,
+ ) = 13,
+
+ list( // Tools & Equipment
+ /obj/item/modular_computer/pda/clear = 5,
+ /obj/item/defibrillator/compact = 2,
+ ) = 7,
+
+ list( // Materials
+ /obj/effect/spawner/abandoned_crate/diamonds = 5,
+ /obj/effect/spawner/abandoned_crate/bluespace_crystal = 2,
+ /obj/effect/spawner/abandoned_crate/bananium = 2,
+ ) = 9,
+
+ list( // Seed & Plants
+ /obj/item/seeds/firelemon = 5,
+ /obj/effect/spawner/abandoned_crate/weed = 1,
+ ) = 6,
+
+ list( // Consumables
+ /obj/effect/spawner/abandoned_crate/booze = 5,
+ /obj/effect/spawner/abandoned_crate/boda = 5,
+ /obj/item/reagent_containers/cup/glass/bottle/lizardwine = 1,
+ ) = 11,
+
+ list( // Mobs
+ /mob/living/basic/bot/honkbot = 5,
+ /mob/living/basic/pet/gondola = 2,
+ /obj/effect/spawner/abandoned_crate/bloodroaches = 1,
+ ) = 8,
+
+ list( // Medical & Science
+ /obj/item/dnainjector/xraymut = 1,
+ /obj/item/dnainjector/wackymut = 1,
+ ) = 2,
+
+ list( // Dangerous
+ /obj/effect/spawner/abandoned_crate/gibtonite = 2,
+ /obj/effect/spawner/abandoned_crate/mimic = 1,
+ /obj/effect/spawner/abandoned_crate/bees = 1,
+ ) = 4,
+
+ list( // Misc
+ /obj/effect/spawner/random/structure/closet_empty/crate = 1, //crate with crate
+ ) = 1,
+ )
+
+/obj/structure/closet/crate/secure/loot/Initialize(mapload)
+ . = ..()
+ code = generate_code(code_length)
+
+/// Generates a random code of specified length with no repeating digits
+/obj/structure/closet/crate/secure/loot/proc/generate_code(length)
+ var/list/digits = list("1", "2", "3", "4", "5", "6", "7", "8", "9", "0")
+ var/list/code_digits = list()
+
+ for(var/i in 1 to length)
+ if(!digits.len)
+ break
+ var/digit = pick(digits)
+ code_digits += digit
+ digits -= digit //there are never matching digits in the answer
+
+ return code_digits.Join("")
+
+//ATTACK HAND IGNORING PARENT RETURN VALUE
+/obj/structure/closet/crate/secure/loot/attack_hand(mob/user, list/modifiers)
+ if(!locked)
+ return ..()
+ if(!user.can_perform_action(src))
+ return
+
+ var/input = tgui_input_text(user, title = "Deca-code lock", message = "Enter [code_length] digits. All digits must be unique.", max_length = code_length)
+
+ if(input == code)
+ if(!spawned_loot)
+ 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))
+ to_chat(user, span_notice("You leave the crate alone."))
+ return
+
+ to_chat(user, span_warning("A red light flashes."))
+ previous_attempts += list(bulls_and_cows(input))
+ attempts--
+
+ if(attempts <= 0)
+ boom(user)
+
+/// Checks if user input is a valid code attempt
+/obj/structure/closet/crate/secure/loot/proc/validate_input(input)
+ if(!input || code_length != length(input))
+ return FALSE
+
+ var/list/used_digits = list()
+ for(var/i = 1 to length(input))
+ var/char = input[i]
+ if(!(char >= "0" && char <= "9")) //if a non-digit is found, reject the input
+ return FALSE
+ if(char in used_digits) //if a digit is repeated, reject the input
+ return FALSE
+ used_digits += char
+
+ return TRUE
+
+/obj/structure/closet/crate/secure/loot/click_alt(mob/living/user)
+ 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
+ if(Adjacent(user))
+ ui_interact(user)
+
+ return ITEM_INTERACT_SUCCESS
+
+/// Implements bulls and cows algorithm to compare guess against actual code
+/obj/structure/closet/crate/secure/loot/proc/bulls_and_cows(guess)
+ var/bulls = 0
+ var/cows = 0
+
+ for(var/i = 1 to code_length)
+ var/guess_char = guess[i]
+ var/code_char = code[i]
+
+ if(guess_char == code_char)
+ bulls++
+ else if(findtext(code, guess_char))
+ 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)
+ . = ..()
+
+ if(locked)
+ boom(user) // no feedback since it just explodes, thats its own feedback
+ return TRUE
+ return
+
+/obj/structure/closet/crate/secure/loot/togglelock(mob/user, silent = FALSE)
+ if(!locked)
+ . = ..() //Run the normal code.
+ if(locked) //Double check if the crate actually locked itself when the normal code ran.
+ //reset the anti-tampering, number of attempts and last attempt when the lock is re-enabled.
+ tamperproof = initial(tamperproof)
+ attempts = initial(attempts)
+ previous_attempts = list()
+ return
+ if(tamperproof)
+ return
+ return ..()
+
+/obj/structure/closet/crate/secure/loot/atom_deconstruct(disassembled = TRUE)
+ if(locked)
+ boom()
+ return
+ return ..()
+
+/obj/structure/closet/crate/secure/loot/after_open(mob/living/user, force)
+ . = ..()
+ if(qdel_on_open)
+ qdel(src)
+
+/obj/structure/closet/crate/secure/loot/proc/spawn_loot()
+ var/loot = pick_weight_recursive(possible_loot)
+ new loot(src)
+ spawned_loot = TRUE
diff --git a/code/game/objects/structures/crates_lockers/crates/abandoned_crates/abandoned_crates_loot.dm b/code/game/objects/structures/crates_lockers/crates/abandoned_crates/abandoned_crates_loot.dm
new file mode 100644
index 000000000000..490b280c66c2
--- /dev/null
+++ b/code/game/objects/structures/crates_lockers/crates/abandoned_crates/abandoned_crates_loot.dm
@@ -0,0 +1,163 @@
+/**
+ * Abandoned Crate Loot Spawner
+ *
+ * Base spawner for generating loot contents in abandoned crates
+ */
+/obj/effect/spawner/abandoned_crate
+ name = "abandoned crate loot spawner"
+ desc = "i feel lucky"
+ /// Associative list with actual loot: item_type = quantity
+ var/list/loot
+
+/obj/effect/spawner/abandoned_crate/Initialize(mapload)
+ . = ..()
+
+ if(LAZYLEN(loot))
+ for(var/atom in loot)
+ for(var/i in 1 to loot[atom])
+ new atom(loc)
+
+/obj/effect/spawner/abandoned_crate/booze
+ loot = list(
+ /obj/item/reagent_containers/cup/glass/bottle/rum = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/whiskey = 2,
+ /obj/item/lighter = 1,
+ /obj/item/reagent_containers/cup/glass/bottle/absinthe/premium = 1,
+ /obj/item/cigarette/rollie = 3
+ )
+
+/obj/effect/spawner/abandoned_crate/diamonds
+ loot = list(
+ /obj/item/stack/ore/diamond = 10
+ )
+
+/obj/effect/spawner/abandoned_crate/posters
+ loot = list(
+ /obj/item/poster/random_contraband = 5
+ )
+
+/obj/effect/spawner/abandoned_crate/boda
+ loot = list(
+ /obj/item/vending_refill/sovietsoda = 1,
+ /obj/item/circuitboard/machine/vendor = 1
+ )
+
+/obj/effect/spawner/abandoned_crate/boda/Initialize(mapload)
+ . = ..()
+
+ for(var/obj/item/circuitboard/machine/vendor/board in loc)
+ board.set_type(/obj/machinery/vending/sovietsoda)
+
+/obj/effect/spawner/abandoned_crate/snappop
+ loot = list(
+ /obj/item/toy/snappop/phoenix = 5
+ )
+
+/obj/effect/spawner/abandoned_crate/mecha
+ loot = list()
+
+/obj/effect/spawner/abandoned_crate/mecha/Initialize(mapload)
+ var/mecha = pick(subtypesof(/obj/item/toy/mecha))
+ loot[mecha] = 1
+
+ return ..()
+
+/obj/effect/spawner/abandoned_crate/space_suit
+ loot = list(
+ /obj/item/borg/upgrade/modkit/aoe/mobs = 1,
+ /obj/item/clothing/suit/space = 1,
+ /obj/item/clothing/head/helmet/space = 1
+ )
+
+/obj/effect/spawner/abandoned_crate/kitty
+ loot = list(
+ /obj/item/clothing/head/costume/kitty = 5,
+ /obj/item/clothing/neck/petcollar = 5
+ )
+
+/obj/effect/spawner/abandoned_crate/fursuit
+ loot = list(
+ /obj/item/clothing/suit/costume/wellworn_shirt/graphic/ian = 1,
+ /obj/item/clothing/suit/hooded/ian_costume = 1
+ )
+
+/obj/effect/spawner/abandoned_crate/gibtonite
+ loot = list(
+ /obj/item/gibtonite = 1,
+ )
+
+/obj/effect/spawner/abandoned_crate/gibtonite/Initialize(mapload)
+ . = ..()
+
+ for(var/obj/item/gibtonite/free_bomb in loc)
+ free_bomb.quality = rand(GIBTONITE_QUALITY_LOW, GIBTONITE_QUALITY_HIGH)
+ free_bomb.GibtoniteReaction(null, "A secure loot closet has spawned a live")
+
+/obj/effect/spawner/abandoned_crate/bluespace_crystal
+ loot = list(
+ /obj/item/stack/ore/bluespace_crystal = 5
+ )
+
+/obj/effect/spawner/abandoned_crate/bananium
+ loot = list(
+ /obj/item/stack/sheet/mineral/bananium = 10
+ )
+
+/obj/effect/spawner/abandoned_crate/weed
+ loot = list()
+
+/obj/effect/spawner/abandoned_crate/weed/Initialize(mapload)
+ var/seed_type = pick(typesof(/obj/item/seeds/cannabis))
+ var/cannabis_type= pick(typesof(/obj/item/food/grown/cannabis))
+ var/weed_amount = rand(2, 4)
+
+ for(var/i in 1 to weed_amount)
+ loot[seed_type] = (loot[seed_type] || 0) + 1
+ loot[cannabis_type] = (loot[cannabis_type] || 0) + 1
+
+ return ..()
+
+/obj/effect/spawner/abandoned_crate/bloodroaches
+ loot = list(
+ /mob/living/basic/cockroach/bloodroach = 30
+ )
+
+/obj/effect/spawner/abandoned_crate/mimic
+ loot = list(
+ /mob/living/basic/mimic/crate = 1
+ )
+
+/obj/effect/spawner/abandoned_crate/mimic/Initialize(mapload)
+ . = ..()
+
+ var/obj/structure/closet/crate/secure/loot/parent_crate = loc
+ if(istype(parent_crate))
+ parent_crate.qdel_on_open = TRUE
+
+/obj/effect/spawner/abandoned_crate/bwoink
+ loot = list(
+ /obj/item/banhammer = 1,
+ /obj/effect/mine/sound/bwoink = 3
+ )
+
+/obj/effect/spawner/abandoned_crate/bwoink/Initialize(mapload)
+ . = ..()
+
+ for(var/obj/effect/mine/sound/bwoink/mine in loc)
+ mine.set_anchored(FALSE)
+ mine.move_resist = MOVE_RESIST_DEFAULT
+
+/obj/effect/spawner/abandoned_crate/pay_day
+ loot = list(
+ /obj/item/clothing/mask/balaclava = 4,
+ /obj/item/gun/ballistic/shotgun/toy = 1,
+ /obj/item/gun/ballistic/automatic/pistol/toy = 1,
+ /obj/item/gun/ballistic/automatic/toy = 1,
+ /obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted = 1,
+ /obj/item/ammo_box/foambox = 1
+ )
+
+/obj/effect/spawner/abandoned_crate/bees
+ loot = list(
+ /mob/living/basic/bee/toxin = 3
+ )
diff --git a/code/game/objects/structures/crates_lockers/crates/cardboard.dm b/code/game/objects/structures/crates_lockers/crates/cardboard.dm
index 1544bb2e0a40..55a843f9edf8 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/large.dm b/code/game/objects/structures/crates_lockers/crates/large.dm
index 54f8e3541b29..898939afc029 100644
--- a/code/game/objects/structures/crates_lockers/crates/large.dm
+++ b/code/game/objects/structures/crates_lockers/crates/large.dm
@@ -71,3 +71,13 @@
var/obj/item/clothing/head/lucky_hat = pick(our_contents)
lucky_hat.AddComponent(/datum/component/unusual_effect, color = "#FFEA0030", include_particles = TRUE)
lucky_hat.name = "unusual [name]"
+
+// DARKPACK EDIT ADD - Paths, finding artifacts in crates
+/obj/structure/closet/crate/large/Destroy()
+ // 10% chance to spawn a random artifact when destroyed (spawner has 50% chance of spawning nothing)
+ if(!length(contents) && prob(16))
+ var/turf/T = get_turf(src)
+ if(T)
+ new /obj/effect/spawner/random/occult/artifact(T)
+ return ..()
+// DARKPACK EDIT ADD END
diff --git a/code/game/objects/structures/crates_lockers/crates/wooden.dm b/code/game/objects/structures/crates_lockers/crates/wooden.dm
index 5703cb6ddcb3..d1ffc7246e8c 100644
--- a/code/game/objects/structures/crates_lockers/crates/wooden.dm
+++ b/code/game/objects/structures/crates_lockers/crates/wooden.dm
@@ -1,6 +1,8 @@
/obj/structure/closet/crate/wooden
name = "wooden crate"
desc = "Works just as well as a metal one."
+ icon = 'modular_darkpack/master_files/icons/obj/storage/crates32x32.dmi' // DARKPACK EDIT CHANGE
+ 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 +13,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 cde4f4da174e..ec864ca5a86f 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 c2f143ced07c..91df15cc4436 100644
--- a/code/game/objects/structures/detectiveboard.dm
+++ b/code/game/objects/structures/detectiveboard.dm
@@ -34,9 +34,9 @@ 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_mount_on_atom()
register_context()
- find_and_hang_on_wall()
/// Attaching evidences: photo and papers
diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm
index fb6347791dc3..3f3d06534a01 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/divine.dm b/code/game/objects/structures/divine.dm
index 6114a20158c6..bfe843d7f4d6 100644
--- a/code/game/objects/structures/divine.dm
+++ b/code/game/objects/structures/divine.dm
@@ -10,13 +10,13 @@
/obj/structure/sacrificealtar/click_alt(mob/living/user)
if(!has_buckled_mobs())
return CLICK_ACTION_BLOCKING
- var/mob/living/L = locate() in buckled_mobs
- if(!L)
+ var/mob/living/buckled_mob = locate() in buckled_mobs
+ if(!buckled_mob)
return CLICK_ACTION_BLOCKING
- to_chat(user, span_notice("Invoking the sacred ritual, you sacrifice [L]."))
- L.investigate_log("has been sacrificially gibbed on an altar.", INVESTIGATE_DEATHS)
- L.gib(DROP_ALL_REMAINS)
- message_admins("[ADMIN_LOOKUPFLW(user)] has sacrificed [key_name_admin(L)] on the sacrificial altar at [AREACOORD(src)].")
+ to_chat(user, span_notice("Invoking the sacred ritual, you sacrifice [buckled_mob]."))
+ buckled_mob.investigate_log("has been sacrificially gibbed on an altar.", INVESTIGATE_DEATHS)
+ buckled_mob.gib(DROP_ALL_REMAINS)
+ message_admins("[ADMIN_LOOKUPFLW(user)] has sacrificed [key_name_admin(buckled_mob)] on the sacrificial altar at [AREACOORD(src)].")
return CLICK_ACTION_SUCCESS
/obj/structure/healingfountain
diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
index c8c9cdf058d9..90a97bd7d10e 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"
@@ -48,6 +49,7 @@
/obj/structure/door_assembly/Initialize(mapload)
. = ..()
+ obj_flags |= UNIQUE_RENAME | RENAME_NO_DESC
update_appearance()
update_name()
@@ -81,23 +83,15 @@
if(created_name)
. += span_notice("There is a small paper placard on the assembly, written on it is '[created_name]'.")
-/obj/structure/door_assembly/attackby(obj/item/W, mob/living/user, list/modifiers, list/attack_modifiers)
- if(IS_WRITING_UTENSIL(W) && !user.combat_mode)
- var/t = tgui_input_text(user, "Enter the name for the door", "Airlock Renaming", created_name, max_length = MAX_NAME_LEN)
- if(!t)
- return
- if(!in_range(src, usr) && loc != usr)
- return
- created_name = t
-
- else if((W.tool_behaviour == TOOL_WELDER) && (mineral || glass || !anchored ))
- if(!W.tool_start_check(user, amount=1))
+/obj/structure/door_assembly/attackby(obj/item/tool, mob/living/user, list/modifiers, list/attack_modifiers)
+ if((tool.tool_behaviour == TOOL_WELDER) && (mineral || glass || !anchored ))
+ if(!tool.tool_start_check(user, amount=1))
return
if(mineral)
var/obj/item/stack/sheet/mineral/mineral_path = text2path("/obj/item/stack/sheet/mineral/[mineral]")
user.visible_message(span_notice("[user] welds the [mineral] plating off the airlock assembly."), span_notice("You start to weld the [mineral] plating off the airlock assembly..."))
- if(W.use_tool(src, user, 40, volume=50))
+ if(tool.use_tool(src, user, 40, volume=50))
to_chat(user, span_notice("You weld the [mineral] plating off."))
new mineral_path(loc, 2)
var/obj/structure/door_assembly/PA = new previous_assembly(loc)
@@ -105,7 +99,7 @@
else if(glass)
user.visible_message(span_notice("[user] welds the glass panel out of the airlock assembly."), span_notice("You start to weld the glass panel out of the airlock assembly..."))
- if(W.use_tool(src, user, 40, volume=50))
+ if(tool.use_tool(src, user, 40, volume=50))
to_chat(user, span_notice("You weld the glass panel out."))
if(heat_proof_finished)
new /obj/item/stack/sheet/rglass(get_turf(src))
@@ -116,11 +110,11 @@
else if(!anchored)
user.visible_message(span_warning("[user] disassembles the airlock assembly."), \
span_notice("You start to disassemble the airlock assembly..."))
- if(W.use_tool(src, user, 40, volume=50))
+ if(tool.use_tool(src, user, 40, volume=50))
to_chat(user, span_notice("You disassemble the airlock assembly."))
deconstruct(TRUE)
- else if(W.tool_behaviour == TOOL_WRENCH)
+ else if(tool.tool_behaviour == TOOL_WRENCH)
if(!anchored )
var/door_check = 1
for(var/obj/machinery/door/D in loc)
@@ -133,7 +127,7 @@
span_notice("You start to secure the airlock assembly to the floor..."), \
span_hear("You hear wrenching."))
- if(W.use_tool(src, user, 40, volume=100))
+ if(tool.use_tool(src, user, 40, volume=100))
if(anchored)
return
to_chat(user, span_notice("You secure the airlock assembly."))
@@ -146,31 +140,31 @@
user.visible_message(span_notice("[user] unsecures the airlock assembly from the floor."), \
span_notice("You start to unsecure the airlock assembly from the floor..."), \
span_hear("You hear wrenching."))
- if(W.use_tool(src, user, 40, volume=100))
+ if(tool.use_tool(src, user, 40, volume=100))
if(!anchored)
return
to_chat(user, span_notice("You unsecure the airlock assembly."))
name = "airlock assembly"
set_anchored(FALSE)
- else if(istype(W, /obj/item/stack/cable_coil) && state == AIRLOCK_ASSEMBLY_NEEDS_WIRES && anchored )
- if(!W.tool_start_check(user, amount=1))
+ else if(istype(tool, /obj/item/stack/cable_coil) && state == AIRLOCK_ASSEMBLY_NEEDS_WIRES && anchored )
+ if(!tool.tool_start_check(user, amount=1))
return
user.visible_message(span_notice("[user] wires the airlock assembly."), \
span_notice("You start to wire the airlock assembly..."))
- if(W.use_tool(src, user, 40, amount=1))
+ if(tool.use_tool(src, user, 40, amount=1))
if(state != AIRLOCK_ASSEMBLY_NEEDS_WIRES)
return
state = AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS
to_chat(user, span_notice("You wire the airlock assembly."))
name = "wired airlock assembly"
- else if((W.tool_behaviour == TOOL_WIRECUTTER) && state == AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS )
+ else if((tool.tool_behaviour == TOOL_WIRECUTTER) && state == AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS )
user.visible_message(span_notice("[user] cuts the wires from the airlock assembly."), \
span_notice("You start to cut the wires from the airlock assembly..."))
- if(W.use_tool(src, user, 40, volume=100))
+ if(tool.use_tool(src, user, 40, volume=100))
if(state != AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS)
return
to_chat(user, span_notice("You cut the wires from the airlock assembly."))
@@ -178,27 +172,27 @@
state = AIRLOCK_ASSEMBLY_NEEDS_WIRES
name = "secured airlock assembly"
- else if(istype(W, /obj/item/electronics/airlock) && state == AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS )
- W.play_tool_sound(src, 100)
+ else if(istype(tool, /obj/item/electronics/airlock) && state == AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS )
+ tool.play_tool_sound(src, 100)
user.visible_message(span_notice("[user] installs the electronics into the airlock assembly."), \
span_notice("You start to install electronics into the airlock assembly..."))
if(do_after(user, 4 SECONDS, target = src))
if( state != AIRLOCK_ASSEMBLY_NEEDS_ELECTRONICS )
return
- if(!user.transferItemToLoc(W, src))
+ if(!user.transferItemToLoc(tool, src))
return
to_chat(user, span_notice("You install the airlock electronics."))
state = AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER
name = "near finished airlock assembly"
- electronics = W
+ electronics = tool
- else if((W.tool_behaviour == TOOL_CROWBAR) && state == AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER )
+ else if((tool.tool_behaviour == TOOL_CROWBAR) && state == AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER )
user.visible_message(span_notice("[user] removes the electronics from the airlock assembly."), \
span_notice("You start to remove electronics from the airlock assembly..."))
- if(W.use_tool(src, user, 40, volume=100))
+ if(tool.use_tool(src, user, 40, volume=100))
if(state != AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER)
return
to_chat(user, span_notice("You remove the airlock electronics."))
@@ -212,69 +206,69 @@
electronics = null
ae.forceMove(src.loc)
- else if(istype(W, /obj/item/stack/sheet) && (!glass || !mineral))
- var/obj/item/stack/sheet/G = W
- if(G)
- if(G.get_amount() >= 1)
- if(!noglass)
- if(!glass)
- if(istype(G, /obj/item/stack/sheet/rglass) || istype(G, /obj/item/stack/sheet/glass))
- playsound(src, 'sound/items/tools/crowbar.ogg', 100, TRUE)
- user.visible_message(span_notice("[user] adds [G.name] to the airlock assembly."), \
- span_notice("You start to install [G.name] into the airlock assembly..."))
- if(do_after(user, 4 SECONDS, target = src))
- if(G.get_amount() < 1 || glass)
- return
- if(G.type == /obj/item/stack/sheet/rglass)
- to_chat(user, span_notice("You install [G.name] windows into the airlock assembly."))
- heat_proof_finished = 1 //reinforced glass makes the airlock heat-proof
- name = "near finished heat-proofed window airlock assembly"
- else
- to_chat(user, span_notice("You install regular glass windows into the airlock assembly."))
- name = "near finished window airlock assembly"
- G.use(1)
- glass = TRUE
- if(!nomineral && !mineral)
- if(istype(G, /obj/item/stack/sheet/mineral) && G.sheettype)
- var/M = G.sheettype
- var/mineralassembly = text2path("/obj/structure/door_assembly/door_assembly_[M]")
- if(!ispath(mineralassembly))
- to_chat(user, span_warning("You cannot add [G] to [src]!"))
- return
- if(G.get_amount() >= 2)
- playsound(src, 'sound/items/tools/crowbar.ogg', 100, TRUE)
- user.visible_message(span_notice("[user] adds [G.name] to the airlock assembly."), \
- span_notice("You start to install [G.name] into the airlock assembly..."))
- if(do_after(user, 4 SECONDS, target = src))
- if(G.get_amount() < 2 || mineral)
- return
- to_chat(user, span_notice("You install [M] plating into the airlock assembly."))
- G.use(2)
- var/obj/structure/door_assembly/MA = new mineralassembly(loc)
-
- if(MA.noglass && glass) //in case the new door doesn't support glass. prevents the new one from reverting to a normal airlock after being constructed.
- var/obj/item/stack/sheet/dropped_glass
- if(heat_proof_finished)
- dropped_glass = new /obj/item/stack/sheet/rglass(drop_location())
- heat_proof_finished = FALSE
- else
- dropped_glass = new /obj/item/stack/sheet/glass(drop_location())
- glass = FALSE
- to_chat(user, span_notice("As you finish, a [dropped_glass.singular_name] falls out of [MA]'s frame."))
-
- transfer_assembly_vars(src, MA, TRUE)
- else
- to_chat(user, span_warning("You need at least two sheets add a mineral cover!"))
- else
- to_chat(user, span_warning("You cannot add [G] to [src]!"))
+ else if(istype(tool, /obj/item/stack/sheet))
+ var/obj/item/stack/sheet/sheet = tool
+ if(!glass && (istype(sheet, /obj/item/stack/sheet/rglass) || istype(sheet, /obj/item/stack/sheet/glass)))
+ if(noglass)
+ to_chat(user, span_warning("You cannot add [sheet] to [src]!"))
+ return
+ playsound(src, 'sound/items/tools/crowbar.ogg', 100, TRUE)
+ user.visible_message(span_notice("[user] adds [sheet.name] to the airlock assembly."), \
+ span_notice("You start to install [sheet.name] into the airlock assembly..."))
+ if(do_after(user, 4 SECONDS, target = src))
+ if(sheet.get_amount() < 1 || glass)
+ return
+ if(sheet.type == /obj/item/stack/sheet/rglass)
+ to_chat(user, span_notice("You install [sheet.name] windows into the airlock assembly."))
+ heat_proof_finished = 1 //reinforced glass makes the airlock heat-proof
+ name = "near finished heat-proofed window airlock assembly"
+ else
+ to_chat(user, span_notice("You install regular glass windows into the airlock assembly."))
+ name = "near finished window airlock assembly"
+ sheet.use(1)
+ glass = TRUE
+ return
+
+ if(istype(sheet, /obj/item/stack/sheet/mineral) && sheet.construction_path_type)
+ if(nomineral || mineral)
+ to_chat(user, span_warning("You cannot add [sheet] to [src]!"))
+ return
+
+ var/M = sheet.construction_path_type
+ var/mineralassembly = text2path("/obj/structure/door_assembly/door_assembly_[M]")
+ if(!ispath(mineralassembly))
+ to_chat(user, span_warning("You cannot add [sheet] to [src]!"))
+ return
+ if(sheet.get_amount() < 2)
+ to_chat(user, span_warning("You need at least two sheets add a mineral cover!"))
+ return
+
+ playsound(src, 'sound/items/tools/crowbar.ogg', 100, TRUE)
+ user.visible_message(span_notice("[user] adds [sheet.name] to the airlock assembly."), \
+ span_notice("You start to install [sheet.name] into the airlock assembly..."))
+ if(!do_after(user, 4 SECONDS, target = src) || sheet.get_amount() < 2 || mineral)
+ return
+ to_chat(user, span_notice("You install [M] plating into the airlock assembly."))
+ sheet.use(2)
+ var/obj/structure/door_assembly/MA = new mineralassembly(loc)
+
+ if(MA.noglass && glass) //in case the new door doesn't support glass. prevents the new one from reverting to a normal airlock after being constructed.
+ var/obj/item/stack/sheet/dropped_glass
+ if(heat_proof_finished)
+ dropped_glass = new /obj/item/stack/sheet/rglass(drop_location())
+ heat_proof_finished = FALSE
else
- to_chat(user, span_warning("You cannot add [G] to [src]!"))
+ dropped_glass = new /obj/item/stack/sheet/glass(drop_location())
+ glass = FALSE
+ to_chat(user, span_notice("As you finish, a [dropped_glass.singular_name] falls out of [MA]'s frame."))
+
+ transfer_assembly_vars(src, MA, TRUE)
- else if((W.tool_behaviour == TOOL_SCREWDRIVER) && state == AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER )
+ else if((tool.tool_behaviour == TOOL_SCREWDRIVER) && state == AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER )
user.visible_message(span_notice("[user] finishes the airlock."), \
span_notice("You start finishing the airlock..."))
- if(W.use_tool(src, user, 40, volume=100))
+ if(tool.use_tool(src, user, 40, volume=100))
if(loc && state == AIRLOCK_ASSEMBLY_NEEDS_SCREWDRIVER)
to_chat(user, span_notice("You finish the airlock."))
finish_door()
@@ -315,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
@@ -384,7 +378,14 @@
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
+
+/obj/structure/door_assembly/nameformat(input, mob/living/user)
+ created_name = input
+ return input
+
+/obj/structure/door_assembly/rename_reset()
+ created_name = null
diff --git a/code/game/objects/structures/door_assembly_types.dm b/code/game/objects/structures/door_assembly_types.dm
index d62fb1bec767..203039779d6e 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 8bfab74cf274..a1a40e4075d4 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 269d049316dd..e4f258b13b7c 100644
--- a/code/game/objects/structures/extinguisher.dm
+++ b/code/game/objects/structures/extinguisher.dm
@@ -2,7 +2,7 @@
name = "extinguisher cabinet"
desc = "A small wall mounted cabinet designed to hold a fire extinguisher."
icon = 'modular_darkpack/master_files/icons/obj/wallmounts32x48.dmi' // DARKPACK EDIT CHANGE
- icon_state = "extinguisher"
+ MAP_SWITCH(icon_state = "extinguisher", icon_state = "extinguisher_mapswitch") // DARKPACK EDIT CHANGE
anchored = TRUE
density = FALSE
max_integrity = 200
@@ -11,16 +11,22 @@
var/opened = FALSE
MAPPING_DIRECTIONAL_HELPERS(/obj/structure/extinguisher_cabinet, 29)
-
-/obj/structure/extinguisher_cabinet/Initialize(mapload, ndir, building)
+// DARKPACK EDIT ADD START
+/obj/structure/extinguisher_cabinet/directional/east
+ pixel_w = -29
+/obj/structure/extinguisher_cabinet/directional/west
+ pixel_w = 29
+// DARKPACK EDIT ADD END
+
+/obj/structure/extinguisher_cabinet/Initialize(mapload)
. = ..()
- if(building)
+ if(!mapload)
opened = TRUE
else
stored_extinguisher = new /obj/item/extinguisher(src)
+ find_and_mount_on_atom()
update_appearance(UPDATE_ICON)
register_context()
- find_and_hang_on_wall()
/obj/structure/extinguisher_cabinet/add_context(atom/source, list/context, obj/item/held_item, mob/user)
. = ..()
diff --git a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm
index d140a2cb6db2..44aa56d6088f 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.
@@ -20,6 +21,8 @@
var/item_overlay = "axe"
/// Whether we should populate our own contents on Initialize()
var/populate_contents = TRUE
+ /// The tool behavior necessary to unlock the cabinet
+ var/unlocking_tool_behavior = TOOL_MULTITOOL
MAPPING_DIRECTIONAL_HELPERS(/obj/structure/fireaxecabinet, 32)
@@ -36,7 +39,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/fireaxecabinet, 32)
if(populate_contents)
held_item = new item_path(src)
update_appearance()
- find_and_hang_on_wall()
+ if(mapload)
+ find_and_mount_on_atom()
/obj/structure/fireaxecabinet/Destroy()
if(held_item)
@@ -44,7 +48,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/fireaxecabinet, 32)
return ..()
/obj/structure/fireaxecabinet/attackby(obj/item/attacking_item, mob/living/user, list/modifiers, list/attack_modifiers)
- if(iscyborg(user) || attacking_item.tool_behaviour == TOOL_MULTITOOL)
+ if(iscyborg(user) || attacking_item.tool_behaviour == unlocking_tool_behavior)
toggle_lock(user)
else if(attacking_item.tool_behaviour == TOOL_WELDER && !user.combat_mode && !broken)
if(atom_integrity < max_integrity)
@@ -218,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"
@@ -243,3 +248,30 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/fireaxecabinet/mechremoval/empty, 32)
desc = "Home to a very special crowbar. Apply to wall to use."
icon_state = "mechremoval"
result_path = /obj/structure/fireaxecabinet/mechremoval/empty
+
+/obj/structure/fireaxecabinet/jawsofrecovery
+ name = "jaws of recovery tool cabinet"
+ desc = "There is a small label that reads \"For Emergency use only\" along with details for safe use of the jaws of recovery. \
+ The lock seems to require...a surgical drill bit to unlock? You have no idea who thought this was a good idea."
+ icon_state = "jaws_of_recovery"
+ item_path = /obj/item/crowbar/power/paramedic
+ item_overlay = "jaws"
+ unlocking_tool_behavior = TOOL_DRILL
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/fireaxecabinet/jawsofrecovery, 32)
+
+/obj/structure/fireaxecabinet/jawsofrecovery/atom_deconstruct(disassembled = TRUE)
+ if(held_item && loc)
+ held_item.forceMove(loc)
+ new /obj/item/wallframe/fireaxecabinet/jawsofrecovery(loc)
+
+/obj/structure/fireaxecabinet/jawsofrecovery/empty
+ populate_contents = FALSE
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/fireaxecabinet/jawsofrecovery/empty, 32)
+
+/obj/item/wallframe/fireaxecabinet/jawsofrecovery
+ name = "jaws of recovery tool cabinet"
+ desc = "Home to the paramedic's jaws of recovery. Apply to wall to use."
+ icon_state = "jaws_of_recovery"
+ result_path = /obj/structure/fireaxecabinet/jawsofrecovery/empty
diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm
index 4565cd1b09a4..c951d2a7b364 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"
@@ -845,6 +856,12 @@
/obj/structure/flora/bush/flowers_yw
icon_state = "ywflowers_1"
+// DARKPACK EDIT ADD START - Flowers Sway in the Wind
+/obj/structure/flora/bush/flowers_yw/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/swaying, sway_angle = 4, sway_time = 2 SECONDS)
+// DARKPACK EDIT ADD END
+
/obj/structure/flora/bush/flowers_yw/style_2
icon_state = "ywflowers_2"
@@ -859,6 +876,12 @@
/obj/structure/flora/bush/flowers_br
icon_state = "brflowers_1"
+// DARKPACK EDIT ADD START - Flowers Sway in the Wind
+/obj/structure/flora/bush/flowers_br/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/swaying, sway_angle = 4, sway_time = 2 SECONDS)
+// DARKPACK EDIT ADD END
+
/obj/structure/flora/bush/flowers_br/style_2
icon_state = "brflowers_2"
@@ -873,6 +896,12 @@
/obj/structure/flora/bush/flowers_pp
icon_state = "ppflowers_1"
+// DARKPACK EDIT ADD START - Flowers Sway in the Wind
+/obj/structure/flora/bush/flowers_pp/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/swaying, sway_angle = 4, sway_time = 2 SECONDS)
+// DARKPACK EDIT ADD END
+
/obj/structure/flora/bush/flowers_pp/style_2
icon_state = "ppflowers_2"
@@ -1006,7 +1035,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 +1043,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/fluff.dm b/code/game/objects/structures/fluff.dm
index 1ce124dc3c36..331643a77f9a 100644
--- a/code/game/objects/structures/fluff.dm
+++ b/code/game/objects/structures/fluff.dm
@@ -283,7 +283,7 @@
/obj/structure/fluff/tram_rail
name = "tram rail"
desc = "Great for trams, not so great for skating."
- icon = 'icons/obj/tram/tram_rails.dmi'
+ icon = 'modular_darkpack/master_files/icons/obj/tram/tram_rails.dmi' // DARKPACK EDIT CHANGE - Doesnt have directionals by default
icon_state = "rail"
layer = TRAM_RAIL_LAYER
plane = FLOOR_PLANE
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index d17cb7b410e6..f51bfafa2e5a 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
@@ -44,12 +45,7 @@
. += span_notice("[src] is designed for tram usage. Deconstructed with a screwdriver!")
/obj/structure/girder/attackby(obj/item/W, mob/user, list/modifiers, list/attack_modifiers)
- var/platingmodifier = 1
- if(HAS_TRAIT(user, TRAIT_QUICK_BUILD))
- platingmodifier = 0.7
- if(next_beep <= world.time)
- next_beep = world.time + 10
- playsound(src, 'sound/machines/clockcult/integration_cog_install.ogg', 50, TRUE)
+
add_fingerprint(user)
if(istype(W, /obj/item/gun/energy/plasmacutter))
@@ -64,9 +60,14 @@
if(!QDELETED(M))
M.add_fingerprint(user)
qdel(src)
+ return
+
+ if(isstack(W))
+ var/obj/item/stack/stack = W
+ if(!stack.usable_for_construction)
+ balloon_alert(user, "can't make walls with it!")
return
- else if(isstack(W))
if(iswallturf(loc) || (locate(/obj/structure/falsewall) in src.loc.contents))
balloon_alert(user, "wall already present!")
return
@@ -78,245 +79,255 @@
balloon_alert(user, "need tram floors!")
return
- if(istype(W, /obj/item/stack/rods))
- var/obj/item/stack/rods/rod = W
- var/amount = construction_cost[rod.type]
- if(state == GIRDER_DISPLACED)
- if(rod.get_amount() < amount)
- balloon_alert(user, "need [amount] rods!")
- return
- balloon_alert(user, "concealing entrance...")
- if(do_after(user, 2 SECONDS, target = src))
- if(rod.get_amount() < amount)
- return
- rod.use(amount)
- var/obj/structure/falsewall/iron/FW = new (loc)
- transfer_fingerprints_to(FW)
- qdel(src)
- return
- else if(state == GIRDER_REINF)
- balloon_alert(user, "need plasteel sheet!")
+ make_wall(stack, user)
+ return
+
+ if(istype(W, /obj/item/pipe))
+ var/obj/item/pipe/P = W
+ if (P.pipe_type in list(0, 1, 5)) //simple pipes, simple bends, and simple manifolds.
+ if(!user.transfer_item_to_turf(P, drop_location()))
return
- else
+ balloon_alert(user, "inserted pipe")
+ return
+
+ return ..()
+
+/obj/structure/girder/proc/make_wall(obj/item/stack/stack, mob/user)
+ var/speed_modifier = 1
+ if(HAS_TRAIT(user, TRAIT_QUICK_BUILD))
+ speed_modifier = 0.7
+ if(next_beep <= world.time)
+ next_beep = world.time + 10
+ playsound(src, 'sound/machines/clockcult/integration_cog_install.ogg', 50, TRUE)
+
+ if(istype(stack, /obj/item/stack/rods))
+ var/obj/item/stack/rods/rod = stack
+ var/amount = construction_cost[rod.type]
+ if(state == GIRDER_DISPLACED)
+ if(rod.get_amount() < amount)
+ balloon_alert(user, "need [amount] rods!")
+ return
+ balloon_alert(user, "concealing entrance...")
+ if(do_after(user, 2 SECONDS, target = src))
if(rod.get_amount() < amount)
- balloon_alert(user, "need [amount] rods!")
return
- balloon_alert(user, "adding rods...")
- if(do_after(user, 4 SECONDS, target = src))
- if(rod.get_amount() < amount)
- return
- rod.use(amount)
- var/turf/T = get_turf(src)
- T.place_on_top(/turf/closed/wall/mineral/iron)
- transfer_fingerprints_to(T)
- qdel(src)
- return
+ rod.use(amount)
+ var/obj/structure/falsewall/iron/FW = new (loc)
+ transfer_fingerprints_to(FW)
+ qdel(src)
+ return
- if(!istype(W, /obj/item/stack/sheet))
+ if(state == GIRDER_REINF)
+ balloon_alert(user, "need plasteel sheet!")
return
- var/obj/item/stack/sheet/sheets = W
- if(istype(sheets, /obj/item/stack/sheet/iron))
- var/amount = construction_cost[/obj/item/stack/sheet/iron]
- if(state == GIRDER_DISPLACED)
- if(sheets.get_amount() < amount)
- balloon_alert(user, "need [amount] sheets!")
- return
- balloon_alert(user, "concealing entrance...")
- if(do_after(user, 20*platingmodifier, target = src))
- if(sheets.get_amount() < amount)
- return
- sheets.use(amount)
- var/obj/structure/falsewall/F = new (loc)
- transfer_fingerprints_to(F)
- qdel(src)
- return
- else if(state == GIRDER_REINF)
- balloon_alert(user, "need plasteel sheet!")
+ if(rod.get_amount() < amount)
+ balloon_alert(user, "need [amount] rods!")
+ return
+ balloon_alert(user, "adding rods...")
+ if(do_after(user, 4 SECONDS, target = src))
+ if(rod.get_amount() < amount)
return
- else if(state == GIRDER_TRAM)
- if(sheets.get_amount() < amount)
- balloon_alert(user, "need [amount] sheets!")
- return
- balloon_alert(user, "adding plating...")
- if (do_after(user, 4 SECONDS, target = src))
- if(sheets.get_amount() < amount)
- return
- sheets.use(amount)
- var/obj/structure/tram/alt/iron/tram_wall = new(loc)
- transfer_fingerprints_to(tram_wall)
- qdel(src)
+ rod.use(amount)
+ var/turf/T = get_turf(src)
+ T.place_on_top(/turf/closed/wall/mineral/iron)
+ transfer_fingerprints_to(T)
+ qdel(src)
+ return
+
+ 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)
+ balloon_alert(user, "need [amount] sheets!")
return
- else
- if(sheets.get_amount() < amount)
- balloon_alert(user, "need [amount] sheets!")
+ balloon_alert(user, "concealing entrance...")
+ if(do_after(user, 20 * speed_modifier, target = src))
+ if(stack.get_amount() < amount)
return
- balloon_alert(user, "adding plating...")
- if (do_after(user, 40*platingmodifier, target = src))
- if(sheets.get_amount() < amount)
- return
- sheets.use(amount)
- var/turf/T = get_turf(src)
- T.place_on_top(/turf/closed/wall)
- transfer_fingerprints_to(T)
- qdel(src)
+ stack.use(amount)
+ var/obj/structure/falsewall/F = new (loc)
+ transfer_fingerprints_to(F)
+ qdel(src)
return
-
- if(istype(sheets, /obj/item/stack/sheet/titaniumglass) && state == GIRDER_TRAM)
- var/amount = construction_cost[/obj/item/stack/sheet/titaniumglass]
- if(sheets.get_amount() < amount)
+ else if(state == GIRDER_REINF)
+ balloon_alert(user, "need plasteel sheet!")
+ return
+ else if(state == GIRDER_TRAM)
+ if(stack.get_amount() < amount)
balloon_alert(user, "need [amount] sheets!")
return
- balloon_alert(user, "adding panel...")
- if (do_after(user, 2 SECONDS, target = src))
- if(sheets.get_amount() < amount)
+ balloon_alert(user, "adding plating...")
+ if (do_after(user, 4 SECONDS, target = src))
+ if(stack.get_amount() < amount)
return
- sheets.use(amount)
- var/obj/structure/tram/tram_wall = new(loc)
+ stack.use(amount)
+ var/obj/structure/tram/alt/iron/tram_wall = new(loc)
transfer_fingerprints_to(tram_wall)
qdel(src)
return
-
- if(istype(sheets, /obj/item/stack/sheet/plasteel))
- var/amount = construction_cost[/obj/item/stack/sheet/plasteel]
- if(state == GIRDER_DISPLACED)
- if(sheets.get_amount() < amount)
- balloon_alert(user, "need [amount] sheets!")
- return
- balloon_alert(user, "concealing entrance...")
- if(do_after(user, 2 SECONDS, target = src))
- if(sheets.get_amount() < amount)
- return
- sheets.use(amount)
- var/obj/structure/falsewall/reinforced/FW = new (loc)
- transfer_fingerprints_to(FW)
- qdel(src)
- return
- else if(state == GIRDER_REINF)
- amount = 1 // hur dur let's make plasteel have different construction amounts 4norasin
- if(sheets.get_amount() < amount)
- return
- balloon_alert(user, "adding plating...")
- if(do_after(user, 50*platingmodifier, target = src))
- if(sheets.get_amount() < amount)
- return
- sheets.use(amount)
- var/turf/T = get_turf(src)
- T.place_on_top(/turf/closed/wall/r_wall)
- transfer_fingerprints_to(T)
- qdel(src)
+ else
+ if(stack.get_amount() < amount)
+ balloon_alert(user, "need [amount] sheets!")
return
- else
- amount = 1 // hur dur x2
- if(sheets.get_amount() < amount)
+ balloon_alert(user, "adding plating...")
+ if (do_after(user, 40 * speed_modifier, target = src))
+ if(stack.get_amount() < amount)
return
- balloon_alert(user, "reinforcing frame...")
- if(do_after(user, 60*platingmodifier, target = src))
- if(sheets.get_amount() < amount)
- return
- sheets.use(amount)
- var/obj/structure/girder/reinforced/R = new (loc)
- transfer_fingerprints_to(R)
- qdel(src)
+ stack.use(amount)
+ var/turf/T = get_turf(src)
+ T.place_on_top(/turf/closed/wall)
+ transfer_fingerprints_to(T)
+ qdel(src)
+ return
+
+ 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!")
+ return
+ balloon_alert(user, "adding panel...")
+ if (do_after(user, 2 SECONDS, target = src))
+ if(stack.get_amount() < amount)
return
+ stack.use(amount)
+ var/obj/structure/tram/tram_wall = new(loc)
+ transfer_fingerprints_to(tram_wall)
+ qdel(src)
+ return
- if(istype(sheets, /obj/item/stack/sheet/mineral/plastitanium))
- if(state == GIRDER_REINF)
- if(sheets.get_amount() < 1)
+ 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)
+ balloon_alert(user, "need [amount] sheets!")
+ return
+ balloon_alert(user, "concealing entrance...")
+ if(do_after(user, 2 SECONDS, target = src))
+ if(stack.get_amount() < amount)
return
- balloon_alert(user, "adding plating...")
- if(do_after(user, 50*platingmodifier, target = src))
- if(sheets.get_amount() < 1)
- return
- sheets.use(1)
- var/turf/T = get_turf(src)
- T.place_on_top(/turf/closed/wall/r_wall/plastitanium)
- transfer_fingerprints_to(T)
- qdel(src)
+ stack.use(amount)
+ var/obj/structure/falsewall/reinforced/FW = new (loc)
+ transfer_fingerprints_to(FW)
+ qdel(src)
return
- // No return here because generic material construction handles making normal plastitanium walls
-
- if(!sheets.has_unique_girder && sheets.material_type)
- if(istype(src, /obj/structure/girder/reinforced))
- balloon_alert(user, "need plasteel or plastitanium!")
+ else if(state == GIRDER_REINF)
+ amount = 1 // hur dur let's make plasteel have different construction amounts 4norasin
+ if(stack.get_amount() < amount)
return
-
- var/M = sheets.sheettype
- var/amount = construction_cost["exotic_material"]
- if(state == GIRDER_TRAM)
- if(sheets.get_amount() < amount)
- balloon_alert(user, "need [amount] sheets!")
+ balloon_alert(user, "adding plating...")
+ if(do_after(user, 50 * speed_modifier, target = src))
+ if(stack.get_amount() < amount)
return
- var/tram_wall_type = text2path("/obj/structure/tram/alt/[M]")
- if(!tram_wall_type)
- balloon_alert(user, "need titanium glass or mineral!")
+ stack.use(amount)
+ var/turf/T = get_turf(src)
+ T.place_on_top(/turf/closed/wall/r_wall)
+ transfer_fingerprints_to(T)
+ qdel(src)
+ return
+ else
+ amount = 1 // hur dur x2
+ if(stack.get_amount() < amount)
+ return
+ balloon_alert(user, "reinforcing frame...")
+ if(do_after(user, 60 * speed_modifier, target = src))
+ if(stack.get_amount() < amount)
return
- balloon_alert(user, "adding plating...")
- if (do_after(user, 4 SECONDS, target = src))
- if(sheets.get_amount() < amount)
- return
- var/obj/structure/tram/tram_wall
- tram_wall = new tram_wall_type(loc)
- sheets.use(amount)
- transfer_fingerprints_to(tram_wall)
- qdel(src)
+ stack.use(amount)
+ var/obj/structure/girder/reinforced/R = new (loc)
+ transfer_fingerprints_to(R)
+ qdel(src)
+ return
+
+ else if(istype(stack, /obj/item/stack/sheet/mineral/plastitanium))
+ if(state == GIRDER_REINF)
+ if(stack.get_amount() < 1)
return
- if(state == GIRDER_DISPLACED)
- var/falsewall_type = text2path("/obj/structure/falsewall/[M]")
- if(sheets.get_amount() < amount)
- balloon_alert(user, "need [amount] sheets!")
+ balloon_alert(user, "adding plating...")
+ if(do_after(user, 50 * speed_modifier, target = src))
+ if(stack.get_amount() < 1)
return
- balloon_alert(user, "concealing entrance...")
- if(do_after(user, 2 SECONDS, target = src))
- if(sheets.get_amount() < amount)
- return
- sheets.use(amount)
- var/obj/structure/falsewall/falsewall
- if(falsewall_type)
- falsewall = new falsewall_type (loc)
- else
- var/obj/structure/falsewall/material/mat_falsewall = new(loc)
- var/list/material_list = list()
- material_list[GET_MATERIAL_REF(sheets.material_type)] = SHEET_MATERIAL_AMOUNT * 2
- if(material_list)
- mat_falsewall.set_custom_materials(material_list)
- falsewall = mat_falsewall
- transfer_fingerprints_to(falsewall)
- qdel(src)
+ stack.use(1)
+ var/turf/T = get_turf(src)
+ T.place_on_top(/turf/closed/wall/r_wall/plastitanium)
+ transfer_fingerprints_to(T)
+ qdel(src)
+ return
+ // No return here because generic material construction handles making normal plastitanium walls
+
+ else if(!stack.has_unique_girder && stack.material_type)
+ if(istype(src, /obj/structure/girder/reinforced))
+ balloon_alert(user, "need plasteel or plastitanium!")
+ return
+
+ var/material
+ if(istype(stack, /obj/item/stack/sheet))
+ var/obj/item/stack/sheet/sheet = stack
+ material = sheet.construction_path_type
+ var/amount = construction_cost["exotic_material"]
+ if(state == GIRDER_TRAM)
+ if(stack.get_amount() < amount)
+ balloon_alert(user, "need [amount] sheets!")
+ return
+ var/tram_wall_type = text2path("/obj/structure/tram/alt/[material]")
+ if(!tram_wall_type)
+ balloon_alert(user, "need titanium glass or mineral!")
+ return
+ balloon_alert(user, "adding plating...")
+ if (do_after(user, 4 SECONDS, target = src))
+ if(stack.get_amount() < amount)
return
- else
- if(sheets.get_amount() < amount)
- balloon_alert(user, "need [amount] sheets!")
+ var/obj/structure/tram/tram_wall
+ tram_wall = new tram_wall_type(loc)
+ stack.use(amount)
+ transfer_fingerprints_to(tram_wall)
+ qdel(src)
+ return
+ if(state == GIRDER_DISPLACED)
+ var/falsewall_type = text2path("/obj/structure/falsewall/[material]")
+ if(stack.get_amount() < amount)
+ balloon_alert(user, "need [amount] sheets!")
+ return
+ balloon_alert(user, "concealing entrance...")
+ if(do_after(user, 2 SECONDS, target = src))
+ if(stack.get_amount() < amount)
return
- balloon_alert(user, "adding plating...")
- if (do_after(user, 4 SECONDS, target = src))
- if(sheets.get_amount() < amount)
- return
- sheets.use(amount)
- var/turf/T = get_turf(src)
- if(sheets.walltype)
- T.place_on_top(sheets.walltype)
- else
- var/turf/newturf = T.place_on_top(/turf/closed/wall/material)
- var/list/material_list = list()
- material_list[GET_MATERIAL_REF(sheets.material_type)] = SHEET_MATERIAL_AMOUNT * 2
- if(material_list)
- newturf.set_custom_materials(material_list)
-
- transfer_fingerprints_to(T)
- qdel(src)
+ stack.use(amount)
+ var/obj/structure/falsewall/falsewall
+ if(falsewall_type)
+ falsewall = new falsewall_type (loc)
+ else
+ var/obj/structure/falsewall/material/mat_falsewall = new(loc)
+ var/list/material_list = list()
+ material_list[GET_MATERIAL_REF(stack.material_type)] = SHEET_MATERIAL_AMOUNT * 2
+ if(material_list)
+ mat_falsewall.set_custom_materials(material_list)
+ falsewall = mat_falsewall
+ transfer_fingerprints_to(falsewall)
+ qdel(src)
return
-
- add_hiddenprint(user)
-
- else if(istype(W, /obj/item/pipe))
- var/obj/item/pipe/P = W
- if (P.pipe_type in list(0, 1, 5)) //simple pipes, simple bends, and simple manifolds.
- if(!user.transfer_item_to_turf(P, drop_location()))
+ else
+ if(stack.get_amount() < amount)
+ balloon_alert(user, "need [amount] sheets!")
return
- balloon_alert(user, "inserted pipe")
- else
- return ..()
+ balloon_alert(user, "adding plating...")
+ if (do_after(user, 4 SECONDS, target = src))
+ if(stack.get_amount() < amount)
+ return
+ stack.use(amount)
+ var/turf/T = get_turf(src)
+ if(stack.walltype)
+ T.place_on_top(stack.walltype)
+ else
+ var/turf/newturf = T.place_on_top(/turf/closed/wall/material)
+ var/list/material_list = list()
+ material_list[GET_MATERIAL_REF(stack.material_type)] = SHEET_MATERIAL_AMOUNT * 2
+ if(material_list)
+ newturf.set_custom_materials(material_list)
+
+ transfer_fingerprints_to(T)
+ qdel(src)
+ return
// Screwdriver behavior for girders
/obj/structure/girder/screwdriver_act(mob/user, obj/item/tool)
@@ -462,6 +473,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)
@@ -514,7 +526,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
@@ -537,6 +549,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 d21f7d457ab1..ed3aa733d662 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 ca7344d2f247..6742e89248bf 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 bea51bc1d8c6..f767f77c912b 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 c9b59efd89f0..c3ba59cead6b 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 c9b9562ce731..5dcfac5f77ea 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 97b9404b3a46..f1492da1267c 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)
. = ..()
@@ -74,10 +75,12 @@
buckle_lying = FALSE
can_buckle = TRUE
max_integrity = 250
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 7)
/obj/structure/kitchenspike/Initialize(mapload)
. = ..()
register_context()
+ ADD_TRAIT(src, TRAIT_DANGEROUS_BUCKLE, INNATE_TRAIT)
/obj/structure/kitchenspike/examine(mob/user)
. = ..()
@@ -119,7 +122,7 @@
playsound(src.loc, 'sound/effects/splat.ogg', 25, TRUE)
target.emote("scream")
target.add_splatter_floor()
- target.adjustBruteLoss(30)
+ target.adjust_brute_loss(30)
target.setDir(2)
var/matrix/m180 = matrix(target.transform)
m180.Turn(180)
@@ -142,7 +145,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,7 +153,7 @@
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)
diff --git a/code/game/objects/structures/ladders.dm b/code/game/objects/structures/ladders.dm
index 28fc8b08f94b..1405f2b36d5f 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
@@ -257,10 +258,11 @@
// Our climbers athletics ability
// DARKPACK EDIT CHANGE START - STORYTELLER_STATS
+ // DARKPACK TODO - standardize stat doafter delays
var/fitness_level = 1
if(isliving(user))
var/mob/living/living_user = user
- fitness_level = living_user.st_get_stat(STAT_DEXTERITY) + living_user.st_get_stat(STAT_ATHLETICS)
+ fitness_level = living_user.st_get_stat(STAT_DEXTERITY) + living_user.st_get_stat(STAT_ATHLETICS) * travel_time/10
// DARKPACK EDIT CHANGE END
// Misc bonuses to the climb speed.
@@ -292,7 +294,7 @@
var/turf/target = get_turf(ladder)
user.zMove(target = target, z_move_flags = ZMOVE_CHECK_PULLEDBY|ZMOVE_ALLOW_BUCKLED|ZMOVE_INCLUDE_PULLED)
- /* DARKPACK EDIT REMOVAL
+ /* // DARKPACK EDIT REMOVAL
if(grant_exp)
var/fitness_level = user.mind?.get_skill_level(/datum/skill/athletics)
user.mind?.adjust_experience(/datum/skill/athletics, round(ATHLETICS_SKILL_MISC_EXP/(fitness_level || 1), 1)) //get a little experience for our trouble
diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm
index 65e6e80e6373..b6c959a05ab3 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))
@@ -196,12 +200,11 @@
/obj/structure/lattice/catwalk/boulder
name = "boulder platform"
desc = "A boulder, floating on the molten hot deadly lava. More like a BOATlder."
- icon = 'icons/obj/ore.dmi'
- icon_state = "boulder_platform"
+ icon = 'icons/obj/smooth_structures/boulder_platform.dmi'
+ icon_state = "boulder_platform-0"
base_icon_state = "boulder_platform"
- smoothing_flags = NONE
- smoothing_groups = null
- canSmoothWith = null
+ smoothing_groups = SMOOTH_GROUP_BOULDER_PLATFORM
+ canSmoothWith = SMOOTH_GROUP_BOULDER_PLATFORM + SMOOTH_GROUP_FLOOR_LAVA
build_material = null
/// The type of particle to make before the platform collapses.
var/warning_particle = /particles/smoke/ash
@@ -224,10 +227,9 @@
. = ..()
/obj/structure/lattice/catwalk/boulder/proc/pre_self_destruct()
- if(istype(loc, /turf/open/lava/plasma))
- add_overlay("plasma_cracks")
- else
- add_overlay("lava_cracks")
+ var/mutable_appearance/cracks_overlay = mutable_appearance('icons/obj/ore.dmi', istype(loc, /turf/open/lava/plasma) ? "plasma_cracks" : "lava_cracks", src)
+ cracks_overlay.blend_mode = BLEND_INSET_OVERLAY
+ add_overlay(cracks_overlay)
animate(src, alpha = 0, time = 2 SECONDS, pixel_y = -16, easing = QUAD_EASING|EASE_IN)
addtimer(CALLBACK(src, PROC_REF(self_destruct)), 2 SECONDS)
diff --git a/code/game/objects/structures/lavaland/geyser.dm b/code/game/objects/structures/lavaland/geyser.dm
index a34bcb10a43e..bbbc8da76e49 100644
--- a/code/game/objects/structures/lavaland/geyser.dm
+++ b/code/game/objects/structures/lavaland/geyser.dm
@@ -108,6 +108,12 @@
reagent_id = /datum/reagent/water/hollowwater
true_name = "hollow water geyser"
+/obj/structure/geyser/chiral_buffer
+ reagent_id = /datum/reagent/reaction_agent/inversing_buffer
+ point_value = 250
+ true_name = "chiral inversing geyser"
+ discovery_message = "It's a rare chiral inversing geyser! This could be very powerful in the right hands... "
+
/obj/structure/geyser/random
point_value = 500
diff --git a/code/game/objects/structures/lavaland/ore_vent.dm b/code/game/objects/structures/lavaland/ore_vent.dm
index 2e00a08a600c..305ecf611fc5 100644
--- a/code/game/objects/structures/lavaland/ore_vent.dm
+++ b/code/game/objects/structures/lavaland/ore_vent.dm
@@ -237,13 +237,34 @@
addtimer(CALLBACK(node, TYPE_PROC_REF(/atom, update_appearance)), wave_timer * 0.75)
add_shared_particles(/particles/smoke/ash)
for(var/i in 1 to 5) // Clears the surroundings of the ore vent before starting wave defense.
- for(var/turf/closed/mineral/rock in oview(i))
- if(istype(rock, /turf/open/misc/asteroid) && prob(35)) // so it's too common
- new /obj/effect/decal/cleanable/rubble(rock)
- if(prob(100 - (i * 15)))
- rock.gets_drilled(user)
+ for(var/turf/rock in oview(i))
+
+ if(istype(rock, /turf/closed/mineral)) //Solid wall checks: Mine out the wall, but start skipping more as we move farther away.
+ if(prob(50 + (i * 8)))
+ continue
+ var/turf/closed/mineral/drillable = rock
+ drillable.gets_drilled(user)
if(prob(50))
- new /obj/effect/decal/cleanable/rubble(rock)
+ new /obj/effect/decal/cleanable/rubble(rock) // Only throw rubble when we actually mine something, and not all the time.
+ continue //skip the rest of the checks
+
+ if(istype(rock, /turf/open/misc/asteroid) && prob(35)) // Open rock floors: make rubble decals occasionally.
+ new /obj/effect/decal/cleanable/rubble(rock)
+ continue
+
+ if(istype(rock, /turf/open/lava)) // Lava turfs, skip as we get farther away, otherwise produce a boulder and make it a platform, lasting the whole wave.
+ if(prob(30 + (i * 8))) // We want to skip these less than the mining walls, since lava is more common to deal with.
+ continue
+
+ var/obj/item/boulder/produced = produce_boulder(FALSE)
+ var/obj/structure/lattice/catwalk/boulder/platform = produced.create_platform(rock, null, wave_timer)
+
+ if(!platform || !QDELETED(produced))
+ qdel(produced)
+ continue
+ platform.alpha = 0
+ platform.pixel_z = -16
+ animate(platform, alpha = 255, time = 2 SECONDS, pixel_z = 0, easing = QUAD_EASING|EASE_OUT)
sleep(0.6 SECONDS)
return TRUE
@@ -475,50 +496,66 @@
log_game("Vent-spawned mob [key_name_and_tag(killed)] was killed")
SSblackbox.record_feedback("tally", "ore_vent_mobs_killed", 1, killed.type)
-//comes with the station, and is already tapped.
-/obj/structure/ore_vent/starter_resources
- name = "active ore vent"
- desc = "An ore vent, brimming with underground ore. It's already supplying the station with iron and glass."
- tapped = TRUE
- discovered = TRUE
- unique_vent = TRUE
- boulder_size = BOULDER_SIZE_SMALL
- mineral_breakdown = list(
- /datum/material/iron = 1,
- /datum/material/glass = 1,
- )
+/**
+ * The part of initialization and the ore_generation subsystem's setup that assigns the size of an ore_vent and it's boulders.
+ * @param random: Used for random sized boulders, and the standard (pre 9-6-2025) behavior.
+ * @param force_size: An override we use for map_generation, when we know what size boulder we need from this ore vent already. Use the standard ore_vent size defines.
+ */
+/obj/structure/ore_vent/proc/vent_size_setup(random = FALSE, force_size, map_loading)
+ var/string_boulder_size
-/obj/structure/ore_vent/random
+ if(force_size)
+ string_boulder_size = force_size
+
+ else if(random)
+ string_boulder_size = pick_weight(ore_vent_options)
-/obj/structure/ore_vent/random/Initialize(mapload)
- . = ..()
- if(!unique_vent && !mapload)
- generate_mineral_breakdown(map_loading = mapload) //Default to random mineral breakdowns, unless this is a unique vent or we're still setting up default vent distribution.
- generate_description()
- artifact_chance = rand(0, MAX_ARTIFACT_ROLL_CHANCE)
- var/string_boulder_size = pick_weight(ore_vent_options)
name = "[string_boulder_size] ore vent"
switch(string_boulder_size)
if(LARGE_VENT_TYPE)
boulder_size = BOULDER_SIZE_LARGE
wave_timer = WAVE_DURATION_LARGE
- if(mapload)
+ if(map_loading)
GLOB.ore_vent_sizes["large"] += 1
if(MEDIUM_VENT_TYPE)
boulder_size = BOULDER_SIZE_MEDIUM
wave_timer = WAVE_DURATION_MEDIUM
- if(mapload)
+ if(map_loading)
GLOB.ore_vent_sizes["medium"] += 1
if(SMALL_VENT_TYPE)
boulder_size = BOULDER_SIZE_SMALL
wave_timer = WAVE_DURATION_SMALL
- if(mapload)
+ if(map_loading)
GLOB.ore_vent_sizes["small"] += 1
else
boulder_size = BOULDER_SIZE_SMALL //Might as well set a default value
wave_timer = WAVE_DURATION_SMALL
name = initial(name)
+//comes with the station, and is already tapped.
+/obj/structure/ore_vent/starter_resources
+ name = "active ore vent"
+ desc = "An ore vent, brimming with underground ore. It's already supplying the station with iron and glass."
+ tapped = TRUE
+ discovered = TRUE
+ unique_vent = TRUE
+ boulder_size = BOULDER_SIZE_SMALL
+ mineral_breakdown = list(
+ /datum/material/iron = 1,
+ /datum/material/glass = 1,
+ )
+
+/obj/structure/ore_vent/random
+ // Todo: determine if we need a boulder_size default thats unique from the override performed in vent_size_setup.
+
+/obj/structure/ore_vent/random/Initialize(mapload)
+ . = ..()
+ if(!unique_vent && !mapload)
+ generate_mineral_breakdown(map_loading = mapload) //Default to random mineral breakdowns, unless this is a unique vent or we're still setting up default vent distribution.
+ generate_description()
+ artifact_chance = rand(0, MAX_ARTIFACT_ROLL_CHANCE)
+ if(!mapload)
+ vent_size_setup(random = TRUE) // We only do this here specific to random distribution ore vents, and within mapload we handle this manually within SSore_generation.
/obj/structure/ore_vent/random/icebox //The one that shows up on the top level of icebox
@@ -621,6 +658,20 @@
/mob/living/simple_animal/hostile/megafauna/colossus,
)
+/obj/effect/landmark/mining_center
+ name = "Mining Epicenter"
+ icon_state = "mining_epicenter"
+
+/obj/effect/landmark/mining_center/Initialize(mapload)
+ ..()
+
+ for(var/obj/mining_mark as anything in GLOB.mining_center)
+ if(src.z == mining_mark.z)
+ CRASH("\The [src] spawned on Z level [z] already exists! Maps should only have at most one mining epicenter for normal ore generation.")
+
+ GLOB.mining_center += loc
+ return INITIALIZE_HINT_QDEL
+
#undef MAX_ARTIFACT_ROLL_CHANCE
#undef MINERAL_TYPE_OPTIONS_RANDOM
#undef OVERLAY_OFFSET_START
diff --git a/code/game/objects/structures/loom.dm b/code/game/objects/structures/loom.dm
index 2d10df50a747..c60bae1af3f6 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 273a446eb854..0ee8e1b2bcb8 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 2260751bbf70..8fedeebb1143 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()
@@ -146,9 +146,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 eaa18fd6eb1f..0bddf5575d28 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
@@ -34,10 +35,6 @@
///List of all Races that can be chosen, decided by its Initialize.
var/list/selectable_races = list()
-/obj/structure/mirror/Initialize(mapload)
- . = ..()
- update_choices()
-
/obj/structure/mirror/Destroy()
mirror_options = null
selectable_races = null
@@ -58,6 +55,10 @@
update_signals = list(COMSIG_ATOM_BREAK), \
check_reflect_signals = list(SIGNAL_ADDTRAIT(TRAIT_NO_MIRROR_REFLECTION), SIGNAL_REMOVETRAIT(TRAIT_NO_MIRROR_REFLECTION)), \
)
+ if(mapload)
+ find_and_mount_on_atom()
+ update_choices()
+ register_context()
/obj/structure/mirror/proc/can_reflect(atom/movable/target)
///I'm doing it this way too, because the signal is sent before the broken variable is set to TRUE.
@@ -69,11 +70,6 @@
MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror, 28)
-/obj/structure/mirror/Initialize(mapload)
- . = ..()
- find_and_hang_on_wall()
- register_context()
-
/obj/structure/mirror/broken
icon_state = "mirror_broke"
@@ -85,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)
@@ -111,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)
@@ -129,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)
@@ -178,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")
@@ -238,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)
@@ -247,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()
@@ -341,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
@@ -367,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.
@@ -419,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 f01c2f3911ad..7b71200fb47e 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,
@@ -174,13 +177,15 @@ GLOBAL_LIST_INIT(mystery_fishing, list(
/obj/structure/mystery_box/proc/generate_valid_types()
valid_types = get_sane_item_types(selectable_base_type)
+/obj/structure/mystery_box/IsContainedAtomAccessible(atom/contained, atom/movable/user)
+ return TRUE
+
/// The box has been activated, play the sound and spawn the prop item
/obj/structure/mystery_box/proc/activate(mob/living/user)
box_state = MYSTERY_BOX_CHOOSING
update_icon_state()
presented_item = new(src)
presented_item.vis_flags = VIS_INHERIT_PLANE
- presented_item.flags_1 |= IS_ONTOP_1
vis_contents += presented_item
presented_item.start_animation(src)
current_sound_channel = SSsounds.reserve_sound_channel(src)
diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm
index 7e11eb6cb406..d9b7a4c5c03d 100644
--- a/code/game/objects/structures/noticeboard.dm
+++ b/code/game/objects/structures/noticeboard.dm
@@ -35,7 +35,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/noticeboard, 32)
paper.forceMove(src)
notices++
update_appearance(UPDATE_ICON)
- find_and_hang_on_wall()
+ if(mapload)
+ 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 5baf25200fdd..de143b17f9f3 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 f5b24e3f24ff..6aed496b6f41 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."
@@ -38,9 +45,9 @@
//Current stations
-// Birdshot: added Apr 29, 2023 (#74371)
-/obj/structure/plaque/static_plaque/golden/commission/birdshot
- desc = "Spinward Sector Station SS-13\n'Birdshot' Class Outpost\nCommissioned 29/04/2563\n'Shooting for the Stars'"
+// Catwalk: added Apr 10, 2025 (#90532)
+/obj/structure/plaque/static_plaque/golden/commission/catwalk
+ desc = "Spinward Sector Station SS-13\n'Catwalk' Class Outpost\nCommissioned 10/04/2565\n'The New Level'"
// Deltastation: added Dec 17, 2016 (#22066)
/obj/structure/plaque/static_plaque/golden/commission/delta
@@ -124,6 +131,10 @@
/obj/structure/plaque/static_plaque/golden/commission/uterus
desc = "Spinward Sector Station SS-01\n'Uterus' Class Outpost\nCommissioned 03/09/2551\nDecommissioned 21/06/2552\n'Humanity's Vanguard'"
+// Birdshot: added Apr 29, 2023 (#74371), removed Jul 9, 2025 (#92022) — 2 years, 2 months, 10 days
+/obj/structure/plaque/static_plaque/golden/commission/birdshot
+ desc = "Spinward Sector Station SS-13\n'Birdshot' Class Outpost\nCommissioned 29/04/2563\nDecommissioned 09/07/2565\n'Shooting for the Stars'"
+
// Other Stations
// Space Station 13, Developer Class Outpost, Station Commissioned 30.12.2322, For the Glory of the Workers of the Third Soviet Union
diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm
index 09638e6d7178..0c153c59128e 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
@@ -84,7 +85,7 @@
/obj/structure/plasticflaps/proc/check_melt(turf/source, datum/gas_mixture/air, temperature)
SIGNAL_HANDLER
- if(temperature < FIRE_MINIMUM_TEMPERATURE_TO_EXIST)
+ if(temperature < FIRE_MINIMUM_TEMPERATURE_TO_EXIST * 1.5)
return
if(!COOLDOWN_FINISHED(src, burn_damage_cd))
return
diff --git a/code/game/objects/structures/platform.dm b/code/game/objects/structures/platform.dm
index 6adfcf310aa5..3eb0b76f2139 100644
--- a/code/game/objects/structures/platform.dm
+++ b/code/game/objects/structures/platform.dm
@@ -7,6 +7,7 @@
icon = 'icons/obj/smooth_structures/platform/window_frame_normal.dmi'
icon_state = "window_frame_normal-0"
base_icon_state = "window_frame_normal"
+ layer = PLATFORM_LAYER // DARKPACK EDIT ADD - (Allows tables to be placed ontop of platforms (but please dont))
smoothing_flags = SMOOTH_BITMASK|SMOOTH_OBJ
smoothing_groups = SMOOTH_GROUP_PLATFORMS
canSmoothWith = SMOOTH_GROUP_PLATFORMS
@@ -18,6 +19,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
@@ -49,7 +51,7 @@
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 5beb43a31bcd..7fa9a6ccb18d 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 ada47e65bc0a..082a140d6993 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 fbfd3e004069..84dcf0deafcf 100644
--- a/code/game/objects/structures/safe.dm
+++ b/code/game/objects/structures/safe.dm
@@ -18,7 +18,16 @@ FLOOR SAFES
anchored = TRUE
density = TRUE
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+ obj_flags = CONDUCTS_ELECTRICITY
interaction_flags_atom = INTERACT_ATOM_ATTACK_HAND | INTERACT_ATOM_UI_INTERACT
+ custom_materials = list(
+ /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
@@ -41,14 +50,26 @@ FLOOR SAFES
/obj/structure/safe/Initialize(mapload)
. = ..()
- update_appearance(UPDATE_ICON)
+ var/static/list/tool_behaviors = list(
+ TOOL_WRENCH = list(
+ SCREENTIP_CONTEXT_LMB = "Reset lock",
+ ),
+ )
+ AddElement(/datum/element/contextual_screentip_tools, tool_behaviors)
+
// Combination generation
for(var/iterating in 1 to number_of_tumblers)
tumblers.Add(rand(0, 99))
- if(!mapload)
+ if(density)
+ AddElement(/datum/element/climbable)
+ AddElement(/datum/element/elevation, pixel_shift = 22)
+
+ if(open && !locked)
return
+ update_appearance(UPDATE_ICON)
+
// Put as many items on our turf inside as possible
for(var/obj/item/inserting_item in loc)
if(space >= maxspace)
@@ -57,11 +78,46 @@ FLOOR SAFES
space += inserting_item.w_class
inserting_item.forceMove(src)
+/obj/structure/safe/examine(mob/user)
+ . = ..()
+ . += span_notice("The locking mechanism gears are wrenched in place.")
+
/obj/structure/safe/update_icon_state()
//uses the same icon as the captain's spare safe (therefore lockable storage) so keep it in line with that
icon_state = "[initial(icon_state)][open ? null : "_locked"]"
return ..()
+/obj/structure/safe/wrench_act(mob/living/user, obj/item/tool)
+ if(!open)
+ balloon_alert(user, "must be open!")
+ return ITEM_INTERACT_BLOCKING
+
+ balloon_alert(user, "resetting lock...")
+ to_chat(user, span_notice("You begin resetting the lock for [src]. You'll need to set [number_of_tumblers] numbers."))
+
+ var/list/new_tumblers = list()
+ for(var/tumbler_index in 1 to number_of_tumblers)
+ var/input_value = tgui_input_number(user, "Set tumbler #[tumbler_index] (0-99):", "Set Lock", 0, 99, 0)
+ if(isnull(input_value))
+ balloon_alert(user, "reset cancelled!")
+ return ITEM_INTERACT_BLOCKING
+ if(!user.can_perform_action(src))
+ balloon_alert(user, "reset interrupted!")
+ return ITEM_INTERACT_BLOCKING
+ new_tumblers.Add(input_value)
+
+ tool.play_tool_sound(src)
+ if(!do_after(user, 10 SECONDS, target = src))
+ return ITEM_INTERACT_BLOCKING
+
+ tumblers = new_tumblers
+ current_tumbler_index = 1
+ dial = 0
+ tool.play_tool_sound(src)
+ to_chat(user, span_notice("You successfully reset the lock for [src]. The new combination is: [tumblers.Join("-")]."))
+ balloon_alert(user, "lock set!")
+ return ITEM_INTERACT_SUCCESS
+
/obj/structure/safe/attackby(obj/item/attacking_item, mob/user, list/modifiers, list/attack_modifiers)
if(open)
. = TRUE //no afterattack
@@ -238,17 +294,30 @@ FLOOR SAFES
if(total_ticks == 1 || prob(SOUND_CHANCE))
balloon_alert(user, pick(sounds))
+/obj/structure/safe/open
+ open = TRUE
+ locked = FALSE
+
//FLOOR SAFES
/obj/structure/safe/floor
name = "floor safe"
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)
. = ..()
AddElement(/datum/element/undertile)
+/obj/structure/safe/floor/open
+ open = TRUE
+ locked = FALSE
+
///Special safe for the station's vault. Not explicitly required, but the piggy bank inside it is.
/obj/structure/safe/vault
diff --git a/code/game/objects/structures/secure_safe.dm b/code/game/objects/structures/secure_safe.dm
index e3a74c00300b..71c3d0bb481a 100644
--- a/code/game/objects/structures/secure_safe.dm
+++ b/code/game/objects/structures/secure_safe.dm
@@ -6,6 +6,17 @@
base_icon_state = "wall_safe"
result_path = /obj/structure/secure_safe
pixel_shift = 32
+ w_class = WEIGHT_CLASS_GIGANTIC
+ obj_flags = CONDUCTS_ELECTRICITY
+ resistance_flags = FIRE_PROOF
+ custom_materials = list(
+ /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
+ var/stored_lock_code
/obj/item/wallframe/secure_safe/Initialize(mapload)
. = ..()
@@ -13,12 +24,55 @@
max_specific_storage = WEIGHT_CLASS_GIGANTIC,
max_total_storage = 20,
)
- atom_storage.set_locked(STORAGE_FULLY_LOCKED)
+ if(stored_lock_code && !(obj_flags & EMAGGED))
+ atom_storage.set_locked(STORAGE_FULLY_LOCKED)
+ update_appearance()
+
+/obj/item/wallframe/secure_safe/update_icon_state()
+ . = ..()
+ if(obj_flags & EMAGGED)
+ icon_state = "[base_icon_state]_broken"
+ else
+ icon_state = "[base_icon_state][stored_lock_code ? "_locked" : null]"
-/obj/item/wallframe/secure_safe/after_attach(obj/attached_to)
+/obj/item/wallframe/secure_safe/emag_act(mob/user, obj/item/card/emag/emag_card)
. = ..()
+ if(obj_flags & EMAGGED)
+ return FALSE
+
+ obj_flags |= EMAGGED
+ visible_message(span_warning("Sparks fly from [src]!"), blind_message = span_hear("You hear a faint electrical spark."))
+ balloon_alert(user, "lock destroyed")
+ playsound(src, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ stored_lock_code = null
+ atom_storage.locked = STORAGE_NOT_LOCKED
+ update_appearance()
+ return TRUE
+
+/obj/item/wallframe/secure_safe/after_attach(obj/structure/secure_safe/safe)
+ if(!istype(safe))
+ return ..()
+
for(var/obj/item in contents)
- item.forceMove(attached_to)
+ item.forceMove(safe)
+
+ var/datum/component/lockable_storage/storage_component = safe.GetComponent(/datum/component/lockable_storage)
+ if(stored_lock_code)
+ storage_component?.set_lock_code(stored_lock_code)
+
+ if(obj_flags & EMAGGED)
+ storage_component?.break_lock()
+
+ return ..()
+
+/datum/armor/secure_safe
+ melee = 30
+ bullet = 30
+ laser = 20
+ energy = 20
+ bomb = 30
+ fire = 95
+ acid = 30
/**
* Wall safes
@@ -33,21 +87,48 @@
base_icon_state = "wall_safe"
anchored = TRUE
density = FALSE
+ resistance_flags = FIRE_PROOF
+ obj_flags = CONDUCTS_ELECTRICITY
+ armor_type = /datum/armor/secure_safe
+ max_integrity = 300
+ damage_deflection = 21
+ custom_materials = list(
+ /datum/material/alloy/plasteel = SHEET_MATERIAL_AMOUNT*5,
+ /datum/material/titanium = SHEET_MATERIAL_AMOUNT*3,
+ )
+ material_flags = MATERIAL_EFFECTS
+ /// The lock code used to open the safe
+ var/stored_lock_code
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)
- if(!density)
- find_and_hang_on_wall()
+ AddComponent(/datum/component/lockable_storage, stored_lock_code)
if(mapload)
PopulateContents()
+ find_and_mount_on_atom()
+ RegisterSignal(src, COMSIG_LOCKABLE_STORAGE_SET_CODE, PROC_REF(update_lock_code))
+
+/obj/structure/secure_safe/find_and_mount_on_atom(mark_for_late_init, late_init)
+ if(!density)
+ return ..()
/obj/structure/secure_safe/atom_deconstruct(disassembled)
if(!density) //if we're a wall item, we'll drop a wall frame.
var/obj/item/wallframe/secure_safe/new_safe = new(get_turf(src))
+
+ // Transfer lock code to the wallframe
+ var/datum/component/lockable_storage/storage_component = GetComponent(/datum/component/lockable_storage)
+ if(storage_component)
+ new_safe.stored_lock_code = storage_component.lock_code
+
+ if(obj_flags & EMAGGED)
+ new_safe.obj_flags |= EMAGGED
+
+ new_safe.update_appearance()
+
for(var/obj/item in contents)
item.forceMove(new_safe)
@@ -55,6 +136,16 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/secure_safe, 32)
new /obj/item/paper(src)
new /obj/item/pen(src)
+/obj/structure/secure_safe/proc/update_lock_code(obj/structure/secure_safe/safe, new_code)
+ SIGNAL_HANDLER
+
+ stored_lock_code = new_code
+
+/obj/structure/secure_safe/ex_act(severity, target)
+ if(severity <= EXPLODE_LIGHT)
+ return FALSE
+ return ..()
+
/obj/structure/secure_safe/hos
name = "head of security's safe"
@@ -73,15 +164,16 @@ 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
- max_integrity = 300
damage_deflection = 30 // prevents stealing the captain's spare using null rods/lavaland monsters/AP projectiles
density = TRUE
anchored_tabletop_offset = 6
- custom_materials = list(/datum/material/gold = SMALL_MATERIAL_AMOUNT)
+ custom_materials = list(
+ /datum/material/alloy/plasteel = SHEET_MATERIAL_AMOUNT*5,
+ /datum/material/gold = SHEET_MATERIAL_AMOUNT*3,
+ )
material_flags = MATERIAL_EFFECTS
/datum/armor/safe_caps_spare
diff --git a/code/game/objects/structures/shower.dm b/code/game/objects/structures/shower.dm
index 70d8b24cfd6f..06d2f744e312 100644
--- a/code/game/objects/structures/shower.dm
+++ b/code/game/objects/structures/shower.dm
@@ -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 c3786e81e28e..e1debb4aab1f 100644
--- a/code/game/objects/structures/signs/_signs.dm
+++ b/code/game/objects/structures/signs/_signs.dm
@@ -14,8 +14,6 @@
var/is_editable = FALSE
///sign_change_name is used to make nice looking, alphabetized and categorized names when you use a pen on any sign item or structure which is_editable.
var/sign_change_name
- ///Callback to the knock down proc for wallmounting behavior.
- var/knock_down_callback
/datum/armor/structure_sign
melee = 50
@@ -25,12 +23,11 @@
/obj/structure/sign/Initialize(mapload)
. = ..()
register_context()
- knock_down_callback = CALLBACK(src, PROC_REF(knock_down))
- find_and_hang_on_wall(custom_drop_callback = knock_down_callback)
+ if(mapload && !find_and_mount_on_atom(mark_for_late_init = TRUE))
+ return INITIALIZE_HINT_LATELOAD
-/obj/structure/sign/Destroy()
- . = ..()
- knock_down_callback = null
+/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)
. = ..()
@@ -54,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]."))
- knock_down(user)
- return TRUE
+ deconstruct(TRUE)
+ return ITEM_INTERACT_SUCCESS
/obj/structure/sign/welder_act(mob/living/user, obj/item/I)
. = ..()
@@ -112,16 +109,8 @@
return
return ..()
-/**
- * This is called when a sign is removed from a wall, either through deconstruction or being knocked down.
- * @param mob/living/user The user who removed the sign, if it was knocked down by a mob.
- */
-/obj/structure/sign/proc/knock_down(mob/living/user)
- var/turf/drop_turf
- if(user)
- drop_turf = get_turf(user)
- else
- drop_turf = drop_location()
+/obj/structure/sign/atom_deconstruct(disassembled)
+ var/turf/drop_turf = drop_location()
var/obj/item/sign/unwrenched_sign = new (drop_turf)
if(type != /obj/structure/sign/blank) //If it's still just a basic sign backing, we can (and should) skip some of the below variable transfers.
unwrenched_sign.name = name //Copy over the sign structure variables to the sign item we're creating when we unwrench a sign.
@@ -131,9 +120,7 @@
unwrenched_sign.sign_path = type
unwrenched_sign.set_custom_materials(custom_materials) //This is here so picture frames and wooden things don't get messed up.
unwrenched_sign.is_editable = is_editable
- unwrenched_sign.update_integrity(get_integrity()) //Transfer how damaged it is.
unwrenched_sign.setDir(dir)
- qdel(src) //The sign structure on the wall goes poof and only the sign item from unwrenching remains.
/obj/structure/sign/blank //This subtype is necessary for now because some other things (posters, picture frames, paintings) inherit from the parent type.
icon_state = "backing"
@@ -142,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."
@@ -191,32 +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/dir = get_dir(user_turf, target_turf)
+ if(!(dir in GLOB.cardinals))
+ balloon_alert(user, "stand in line with wall!")
+ 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.
- var/dir = get_dir(user_turf, target_turf)
if(dir & NORTH)
placed_sign.pixel_y = 32
else if(dir & SOUTH)
@@ -230,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(TRUE, placed_sign.knock_down_callback)
+ placed_sign.AddComponent(/datum/component/atom_mounted, target_turf)
qdel(src)
return ITEM_INTERACT_SUCCESS
@@ -252,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_interactive.dm b/code/game/objects/structures/signs/signs_interactive.dm
index 5ef9031fef93..e8b98ac3473b 100644
--- a/code/game/objects/structures/signs/signs_interactive.dm
+++ b/code/game/objects/structures/signs/signs_interactive.dm
@@ -8,7 +8,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/clock, 32)
/obj/structure/sign/clock/examine(mob/user)
. = ..()
. += span_info("The current CST (local) time is: [station_time_timestamp()].")
- . += span_info("The current TCT (galactic) time is: [time2text(world.realtime, "hh:mm:ss", 0)].")
+ //. += span_info("The current TCT (galactic) time is: [time2text(world.realtime, "hh:mm:ss", 0)].") DARKPACK EDIT REMOVAL
/obj/structure/sign/calendar
name = "wall calendar"
diff --git a/code/game/objects/structures/signs/signs_maps.dm b/code/game/objects/structures/signs/signs_maps.dm
index a6701ed7e909..8bfd2aebbd07 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 8cf802fc939b..b167f62ec9d1 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 db44c75669d8..7f92f111f237 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 a98871a95b52..e91c77e5a4cf 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 00fa242a725f..fb1d58f0d58e 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,23 @@
name = "stairs"
icon = 'modular_darkpack/master_files/icons/obj/stairs.dmi' // DARKPACK EDIT CHANGE
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
+
+ max_integrity = 500 // DARKPACK EDIT CHANGE
+ /// 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 +45,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 +144,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 +248,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 +271,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 +327,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 +335,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 +419,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 a8e27e0b21a6..70eee9cb3d7c 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)
. = ..()
@@ -16,7 +17,7 @@
AddElement(/datum/element/connect_loc, loc_connections)
AddComponent(/datum/component/climb_walkable)
- AddComponent(/datum/component/simple_rotation)
+ 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 36ae8e5fb704..f5df2da0fa57 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 894425ce174b..75bd2e5ac047 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -91,10 +91,10 @@
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)))
+ AddElement(/datum/element/table_smash, gentle_push = slam_gently)
/// Called after someone is harmfully smashed into us
-/obj/structure/table/proc/after_smash(mob/living/smashed)
+/obj/structure/table/after_smash(mob/living/smashed_onto)
return // This is mostly for our children
/// Applies additional properties based on the frame used to construct this table.
@@ -427,7 +427,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 +552,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
@@ -632,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(
@@ -641,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 +859,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 +938,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 +1047,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 +1072,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_LIVING_BEING_OPERATED_ON,
+ COMSIG_LIVING_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_LIVING_SURGERY_FINISHED,
+ COMSIG_LIVING_UPDATING_SURGERY_STATE,
+ ), PROC_REF(on_surgery_change))
+ RegisterSignal(patient, COMSIG_LIVING_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))
@@ -1149,7 +1177,7 @@
tool.play_tool_sound(src, 50)
balloon_alert(user, "mask detached")
UnregisterSignal(breath_mask, list(COMSIG_MOVABLE_MOVED, COMSIG_ITEM_DROPPED))
- if (user.CanReach(breath_mask))
+ if (breath_mask.IsReachableBy(user))
user.put_in_hands(breath_mask)
breath_mask = null
update_appearance()
@@ -1164,7 +1192,7 @@
air_tank.forceMove(drop_location())
tool.play_tool_sound(src, 50)
balloon_alert(user, "tank detached")
- if (user.CanReach(air_tank))
+ if (air_tank.IsReachableBy(user))
user.put_in_hands(air_tank)
if (patient?.external && patient.external == air_tank)
patient.close_externals()
@@ -1196,7 +1224,7 @@
. += span_notice("There's a port for a breathing mask tube on its side.")
/obj/structure/table/optable/proc/detach_mask(mob/living/user)
- if (!istype(user) || !user.CanReach(src) || !user.can_interact_with(src))
+ if (!istype(user) || !IsReachableBy(user) || !user.can_interact_with(src))
return FALSE
if (!breath_mask)
@@ -1212,7 +1240,7 @@
return TRUE
/obj/structure/table/optable/mouse_drop_dragged(atom/over, mob/living/user, src_location, over_location, params)
- if (over != patient || !istype(user) || !user.CanReach(src) || !user.can_interact_with(src))
+ if (over != patient || !istype(user) || !IsReachableBy(user) || !user.can_interact_with(src))
return
if (!air_tank)
@@ -1278,7 +1306,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)
@@ -1442,4 +1470,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 fa770dd75ee1..664cf9a00109 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)
create_storage(storage_type = /datum/storage/toiletbong)
weed_overlay = mutable_appearance('icons/obj/watercloset.dmi', "[base_icon_state]_overlay")
@@ -78,12 +79,11 @@
update_appearance(UPDATE_ICON)
/obj/structure/toiletbong/wrench_act(mob/living/user, obj/item/tool)
- ..()
default_unfasten_wrench(user, tool)
return ITEM_INTERACT_SUCCESS
///Called in the simple rotation's post_rotation callback, playing a sound cue to players.
-/obj/structure/toiletbong/proc/post_rotation(mob/user, degrees)
+/obj/structure/toiletbong/post_rotation(mob/user, degrees)
playsound(src, 'sound/items/deconstruct.ogg', 50)
/obj/structure/toiletbong/crowbar_act(mob/living/user, obj/item/tool)
@@ -94,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 420e39f627d5..199345a5d6ce 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)
@@ -27,7 +27,7 @@
return FALSE
return TRUE
-/obj/structure/c_transit_tube/proc/post_rotation(mob/user, degrees)
+/obj/structure/c_transit_tube/post_rotation(mob/user, degrees)
if(flipped_build_type && degrees == ROTATION_FLIP)
setDir(turn(dir, degrees)) //Turn back we don't actually flip
flipped = !flipped
diff --git a/code/game/objects/structures/traps.dm b/code/game/objects/structures/traps.dm
index 11f4817b94cf..a14a5137b020 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 f31c8510d31a..8ab34de74ba5 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 47425b8f8a65..d3fcd3b732fa 100644
--- a/code/game/objects/structures/water_structures/sink.dm
+++ b/code/game/objects/structures/water_structures/sink.dm
@@ -105,13 +105,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 +124,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 +136,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 ..()
@@ -251,7 +251,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink/kitchen, (-16))
/obj/structure/sink/basin
icon_state = "basin"
-MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink/basin, (-14))
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink/basin, (-16))
// DARKPACK EDIT ADD END
/obj/structure/sinkframe
@@ -264,7 +264,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink/basin, (-14))
/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 df9740126584..890736740bc2 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
@@ -119,7 +116,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 +148,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,10 +159,10 @@
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 && user.CanReach(src))
+ if(cistern_open && !cover_open && IsReachableBy(user))
if(!LAZYLEN(cistern_items))
to_chat(user, span_notice("The cistern is empty."))
return
@@ -232,18 +229,15 @@
if(!flushing && cover_open)
. += "[base_icon_state]-water"
-/obj/structure/toilet/atom_deconstruct(dissambled = TRUE)
- for(var/obj/toilet_item in cistern_items)
+/obj/structure/toilet/dump_contents()
+ for(var/obj/toilet_item in (cistern_items + fishes))
toilet_item.forceMove(drop_location())
- 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))
+
+/obj/structure/toilet/atom_deconstruct(dissambled = TRUE)
+ dump_contents()
+ drop_costum_materials()
if(has_water_reclaimer)
new /obj/item/stock_parts/water_recycler(drop_location())
- if(stuck_item)
- stuck_item.forceMove(drop_location())
/obj/structure/toilet/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
if(user.combat_mode)
@@ -395,7 +389,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
@@ -408,3 +402,29 @@
secret.desc += " It's a secret!"
w_items += secret.w_class
LAZYADD(cistern_items, 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)
+ 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)
+ w_items += toilet_brain.w_class
+
+//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 180c1b1649dc..f81b25de55ad 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)
. = ..()
@@ -37,7 +37,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/urinal, 32)
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.emote("scream")
- grabbed_mob.adjustBruteLoss(8)
+ 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 62fa00a6457f..9107d6180c0f 100644
--- a/code/game/objects/structures/windoor_assembly.dm
+++ b/code/game/objects/structures/windoor_assembly.dm
@@ -8,9 +8,10 @@
anchored = FALSE
density = FALSE
dir = NORTH
- obj_flags = CAN_BE_HIT | BLOCKS_CONSTRUCTION_DIR
+ 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)
@@ -251,17 +252,6 @@
electronics = null
ae.forceMove(drop_location())
- else if(IS_WRITING_UTENSIL(W))
- var/t = tgui_input_text(user, "Enter the name for the door", "Windoor Renaming", created_name, max_length = MAX_NAME_LEN)
- if(!t)
- return
- if(!in_range(src, usr) && loc != usr)
- return
- created_name = t
- return
-
-
-
//Crowbar to complete the assembly, Step 7 complete.
else if(W.tool_behaviour == TOOL_CROWBAR)
if(!electronics)
@@ -335,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
@@ -367,3 +357,10 @@
update_appearance()
return
+
+/obj/structure/windoor_assembly/nameformat(input, user)
+ created_name = input
+ return input
+
+/obj/structure/windoor_assembly/rename_reset()
+ created_name = initial(created_name)
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 383f9d953b5d..071c696197a8 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)
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
@@ -359,7 +360,7 @@
dropped_debris += new /obj/item/stack/rods(location, (fulltile ? 2 : 1))
return dropped_debris
-/obj/structure/window/proc/post_rotation(mob/user, degrees)
+/obj/structure/window/post_rotation(mob/user, degrees)
air_update_turf(TRUE, FALSE)
/obj/structure/window/proc/on_painted(obj/structure/window/source, mob/user, obj/item/toy/crayon/spraycan/spraycan, is_dark_color)
@@ -424,7 +425,7 @@
ratio = CEILING(ratio*4, 1) * 25
if(ratio > 75)
return
- . += mutable_appearance('icons/obj/structures.dmi', "damage[ratio]", -(layer+0.1))
+ . += mutable_appearance('modular_darkpack/modules/deprecated/icons/32x48.dmi', "damage[ratio]", -(layer+0.1)) // DARKPACK EDIT CHANGE
/obj/structure/window/should_atmos_process(datum/gas_mixture/air, exposed_temperature)
return exposed_temperature > T0C + heat_resistance
@@ -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
@@ -618,14 +620,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/spawner, 0)
MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/unanchored/spawner, 0)
-// You can't rust glass! So only reinforced glass can be impacted.
-/obj/structure/window/reinforced/rust_heretic_act()
- add_atom_colour(COLOR_RUSTED_GLASS, FIXED_COLOUR_PRIORITY)
- AddElement(/datum/element/rust)
- set_armor(/datum/armor/none)
- take_damage(get_integrity() * 0.5)
- modify_max_integrity(initial(max_integrity) * 0.2)
-
/obj/structure/window/plasma
name = "plasma window"
desc = "A window made out of a plasma-silicate alloy. It looks insanely tough to break and burn through."
@@ -638,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
@@ -668,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
@@ -713,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)
@@ -734,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
@@ -751,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
@@ -771,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)
@@ -1008,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)
@@ -1026,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/say.dm b/code/game/say.dm
index 588e6946477a..5fa92db9c6d6 100644
--- a/code/game/say.dm
+++ b/code/game/say.dm
@@ -22,6 +22,14 @@ GLOBAL_LIST_INIT(freqtospan, list(
"[FREQ_CTF_GREEN]" = "greenteamradio",
"[FREQ_CTF_YELLOW]" = "yellowteamradio",
"[FREQ_STATUS_DISPLAYS]" = "captaincast",
+ // DARKPACK EDIT START
+ "[FREQ_POLICE]" = "policeradio",
+ "[FREQ_CLINIC]" = "clinicradio",
+ "[FREQ_MILITARY]" = "militaryradio",
+ "[FREQ_CAMARILLA]" = "camarillaradio",
+ "[FREQ_ANARCH]" = "anarchradio",
+ "[FREQ_ENDRON]" = "endronradio",
+ // DARKPACK EDIT END
))
/**
@@ -68,7 +76,7 @@ GLOBAL_LIST_INIT(freqtospan, list(
/// Called when this movable hears a message from a source.
/// Returns TRUE if the message was received and understood.
-/atom/movable/proc/Hear(atom/movable/speaker, message_language, raw_message, radio_freq, radio_freq_name, radio_freq_color, list/spans, list/message_mods = list(), message_range=0)
+/atom/movable/proc/Hear(atom/movable/speaker, message_language, raw_message, radio_freq, radio_freq_name, radio_freq_color, list/spans, list/message_mods = list(), message_range=0, source) // DARKPACK EDIT, ORIGINAL: /atom/movable/proc/Hear(atom/movable/speaker, message_language, raw_message, radio_freq, radio_freq_name, radio_freq_color, list/spans, list/message_mods = list(), message_range=0)
SEND_SIGNAL(src, COMSIG_MOVABLE_HEAR, args)
return TRUE
@@ -139,7 +147,7 @@ GLOBAL_LIST_INIT(freqtospan, list(
if (!CONFIG_GET(flag/tts_no_whisper) || (CONFIG_GET(flag/tts_no_whisper) && !message_mods[WHISPER_MODE]))
INVOKE_ASYNC(SStts, TYPE_PROC_REF(/datum/controller/subsystem/tts, queue_tts_message), src, html_decode(tts_message_to_use), message_language, voice, filter.Join(","), listened, message_range = range, pitch = pitch)
-/atom/movable/proc/compose_message(atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, radio_freq_name, radio_freq_color, list/spans, list/message_mods = list(), visible_name = FALSE)
+/atom/movable/proc/compose_message(atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, radio_freq_name, radio_freq_color, list/spans, list/message_mods = list(), visible_name = FALSE, source) // DARKPACK EDIT, ORIGINAL: /atom/movable/proc/compose_message(atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, radio_freq_name, radio_freq_color, list/spans, list/message_mods = list(), visible_name = FALSE)
//This proc uses [] because it is faster than continually appending strings. Thanks BYOND.
//Basic span
var/freq_color = get_radio_color(radio_freq, radio_freq_color)
@@ -151,6 +159,28 @@ GLOBAL_LIST_INIT(freqtospan, list(
//Speaker name
var/namepart = speaker.get_message_voice(visible_name)
+ // DARKPACK EDIT START
+ var/atom/movable/reliable_narrator = speaker
+ if(istype(reliable_narrator, /atom/movable/virtualspeaker))
+ var/atom/movable/virtualspeaker/fakespeaker = reliable_narrator
+ reliable_narrator = fakespeaker.source
+
+ if(ismob(src) && (namepart != "Unknown") && ismob(reliable_narrator))
+ var/mob/receiver_mob = src
+ if(receiver_mob.mind?.guestbook)
+ var/mob/speaker_human = reliable_narrator
+ var/known_name = receiver_mob.mind.guestbook.get_known_name(src, reliable_narrator, speaker_human.real_name)
+ if(known_name)
+ namepart = "[known_name]"
+ else
+ var/mob/living/carbon/human/human_narrator = reliable_narrator
+ namepart = "[human_narrator.get_generic_name(prefixed = TRUE, lowercase = TRUE)]"
+
+ if(radio_freq >= USABLE_RADIO_FREQUENCY_FOR_PHONE_RANGE)
+ var/icon/phone_icon = icon('modular_darkpack/modules/phones/icons/chat_icon.dmi', "phone")
+ freqpart = icon2html(phone_icon, src)
+ // DARKPACK EDIT END
+
//End name span.
var/endspanpart = ""
@@ -165,7 +195,9 @@ GLOBAL_LIST_INIT(freqtospan, list(
var/messagepart = speaker.generate_messagepart(raw_message, spans, message_mods)
messagepart = " [messagepart]"
- return "[spanpart1][spanpart2][freqpart][languageicon][compose_track_href(speaker, namepart)][namepart][compose_job(speaker, message_language, raw_message, radio_freq)][endspanpart][messagepart]"
+ var/obj/item/radio/radio = source // DARKPACK EDIT ADD
+ var/radio_id = radio?.radio_id ? "\[[radio?.radio_id]\] " : null // DARKPACK EDIT ADD
+ return "[spanpart1][spanpart2][freqpart][radio_id][languageicon][compose_track_href(speaker, namepart)][namepart][compose_job(speaker, message_language, raw_message, radio_freq)][endspanpart][messagepart]" // DARKPACK EDIT, ORIGINAL: return "[spanpart1][spanpart2][freqpart][languageicon][compose_track_href(speaker, namepart)][namepart][compose_job(speaker, message_language, raw_message, radio_freq)][endspanpart][messagepart]"
/atom/movable/proc/compose_track_href(atom/movable/speaker, message_langs, raw_message, radio_freq)
return ""
diff --git a/code/game/shuttle_engines.dm b/code/game/shuttle_engines.dm
index feb8f6c3dce5..d8af0f533fbf 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 d68c1794e08d..d57ca4754ad1 100644
--- a/code/game/sound/sound.dm
+++ b/code/game/sound/sound.dm
@@ -32,6 +32,18 @@
if (!turf_source)
return
+ //DARKPACK EDIT START - Quietus
+ // Check if the source or its loc is silenced
+ if(HAS_TRAIT(source, TRAIT_SILENCED))
+ return
+ if(isliving(source.loc))
+ var/mob/living/silenced_mob = source.loc
+ if(HAS_TRAIT(silenced_mob, TRAIT_SILENCED))
+ return
+ //if(isturf(source)) because unarmed attacks playsound(turf) rather than playsound(mob) or whatever as others do
+ //what about grenades and bullet impact noises?
+ //DARKPACK EDIT END
+
//allocate a channel if necessary now so its the same for everyone
channel = channel || SSsounds.random_available_channel()
@@ -39,6 +51,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 +194,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/sound/sound_keys/sound_keys.dm b/code/game/sound/sound_keys/sound_keys.dm
index 971f50c38727..52d97f4f8f60 100644
--- a/code/game/sound/sound_keys/sound_keys.dm
+++ b/code/game/sound/sound_keys/sound_keys.dm
@@ -847,3 +847,292 @@
key = SFX_RORO_WARBLE
file_paths = list(
'sound/mobs/non-humanoids/roro/roro_warble.ogg')
+
+/datum/sound_effect/potted_plant_drop
+ key = SFX_POTTED_PLANT_DROP
+ file_paths = list(
+ 'sound/items/potted_plant/potted_plant_drop1.ogg',
+ 'sound/items/potted_plant/potted_plant_drop2.ogg',
+ 'sound/items/potted_plant/potted_plant_drop3.ogg',
+ 'sound/items/potted_plant/potted_plant_drop4.ogg',
+ 'sound/items/potted_plant/potted_plant_drop5.ogg',
+ )
+
+/datum/sound_effect/potted_plant_pickup
+ key = SFX_POTTED_PLANT_PICKUP
+ file_paths = list(
+ 'sound/items/potted_plant/potted_plant_pickup1.ogg',
+ 'sound/items/potted_plant/potted_plant_pickup2.ogg',
+ 'sound/items/potted_plant/potted_plant_pickup3.ogg',
+ 'sound/items/potted_plant/potted_plant_pickup4.ogg',
+ 'sound/items/potted_plant/potted_plant_pickup5.ogg',
+
+ )
+
+/datum/sound_effect/goggles_pickup
+ key = SFX_GOGGLES_PICKUP
+ file_paths = list(
+ 'sound/items/goggles/goggles_pickup1.ogg',
+ 'sound/items/goggles/goggles_pickup2.ogg',
+ 'sound/items/goggles/goggles_pickup3.ogg',
+ )
+
+/datum/sound_effect/goggles_drop
+ key = SFX_GOGGLES_DROP
+ file_paths = list(
+ 'sound/items/goggles/goggles_drop1.ogg',
+ 'sound/items/goggles/goggles_drop2.ogg',
+ 'sound/items/goggles/goggles_drop3.ogg',
+ )
+
+/datum/sound_effect/goggles_equip
+ key = SFX_GOGGLES_EQUIP
+ file_paths = list(
+ 'sound/items/goggles/goggles_equip1.ogg',
+ 'sound/items/goggles/goggles_equip2.ogg',
+ 'sound/items/goggles/goggles_equip3.ogg',
+ 'sound/items/goggles/goggles_equip4.ogg',
+ )
+
+/datum/sound_effect/glasses_pickup
+ key = SFX_GLASSES_PICKUP
+ file_paths = list(
+ 'sound/items/glasses/glasses_pickup1.ogg',
+ 'sound/items/glasses/glasses_pickup2.ogg',
+ 'sound/items/glasses/glasses_pickup3.ogg',
+ )
+
+/datum/sound_effect/glasses_drop
+ key = SFX_GLASSES_DROP
+ file_paths = list(
+ 'sound/items/glasses/glasses_drop1.ogg',
+ 'sound/items/glasses/glasses_drop2.ogg',
+ 'sound/items/glasses/glasses_drop3.ogg',
+ )
+
+/datum/sound_effect/glasses_equip
+ key = SFX_GLASSES_EQUIP
+ file_paths = list(
+ 'sound/items/glasses/glasses_equip1.ogg',
+ 'sound/items/glasses/glasses_equip2.ogg',
+ )
+
+/datum/sound_effect/food_plate_pickup
+ key = SFX_FOOD_PLATE_PICKUP
+ file_paths = list(
+ 'sound/items/food_plate/food_plate_pickup1.ogg',
+ 'sound/items/food_plate/food_plate_pickup2.ogg',
+ 'sound/items/food_plate/food_plate_pickup3.ogg',
+ )
+
+/datum/sound_effect/food_plate_drop
+ key = SFX_FOOD_PLATE_DROP
+ file_paths = list(
+ 'sound/items/food_plate/food_plate_drop1.ogg',
+ 'sound/items/food_plate/food_plate_drop2.ogg',
+ 'sound/items/food_plate/food_plate_drop3.ogg',
+ )
+
+/datum/sound_effect/cutlery_pickup
+ key = SFX_CUTLERY_PICKUP
+ file_paths = list(
+ 'sound/items/cutlery/cutlery_pickup1.ogg',
+ 'sound/items/cutlery/cutlery_pickup2.ogg',
+ 'sound/items/cutlery/cutlery_pickup3.ogg',
+ )
+
+/datum/sound_effect/cutlery_drop
+ key = SFX_CUTLERY_DROP
+ file_paths = list(
+ 'sound/items/cutlery/cutlery_drop1.ogg',
+ 'sound/items/cutlery/cutlery_drop2.ogg',
+ 'sound/items/cutlery/cutlery_drop3.ogg',
+ )
+
+/datum/sound_effect/knife_pickup
+ key = SFX_KNIFE_PICKUP
+ file_paths = list(
+ 'sound/items/knife/knife_pickup1.ogg',
+ 'sound/items/knife/knife_pickup2.ogg',
+ 'sound/items/knife/knife_pickup3.ogg',
+ )
+
+/datum/sound_effect/knife_drop
+ key = SFX_KNIFE_DROP
+ file_paths = list(
+ 'sound/items/knife/knife_drop1.ogg',
+ 'sound/items/knife/knife_drop2.ogg',
+ 'sound/items/knife/knife_drop3.ogg',
+ )
+
+/datum/sound_effect/knife_slice
+ key = SFX_KNIFE_SLICE
+ file_paths = list(
+ 'sound/items/knife/knife_slice1.ogg',
+ 'sound/items/knife/knife_slice2.ogg',
+ 'sound/items/knife/knife_slice3.ogg',
+ 'sound/items/knife/knife_slice4.ogg',
+ 'sound/items/knife/knife_slice5.ogg',
+ 'sound/items/knife/knife_slice6.ogg',
+ )
+
+/datum/sound_effect/pot_pickup
+ key = SFX_POT_PICKUP
+ file_paths = list(
+ 'sound/items/pot/pot_pickup1.ogg',
+ 'sound/items/pot/pot_pickup2.ogg',
+ 'sound/items/pot/pot_pickup3.ogg',
+ )
+
+/datum/sound_effect/pot_drop
+ key = SFX_POT_DROP
+ file_paths = list(
+ 'sound/items/pot/pot_drop1.ogg',
+ 'sound/items/pot/pot_drop2.ogg',
+ 'sound/items/pot/pot_drop3.ogg',
+ )
+
+/datum/sound_effect/tray_pickup
+ key = SFX_TRAY_PICKUP
+ file_paths = list(
+ 'sound/items/tray/tray_pickup1.ogg',
+ 'sound/items/tray/tray_pickup2.ogg',
+ 'sound/items/tray/tray_pickup3.ogg',
+ )
+
+/datum/sound_effect/tray_drop
+ key = SFX_TRAY_DROP
+ file_paths = list(
+ 'sound/items/tray/tray_drop1.ogg',
+ 'sound/items/tray/tray_drop2.ogg',
+ 'sound/items/tray/tray_drop3.ogg',
+ )
+
+/datum/sound_effect/tray_insert
+ key = SFX_TRAY_INSERT
+ file_paths = list(
+ 'sound/items/tray/tray_insert1.ogg',
+ 'sound/items/tray/tray_insert2.ogg',
+ 'sound/items/tray/tray_insert3.ogg',
+ )
+
+/datum/sound_effect/rolling_pin_pickup
+ key = SFX_ROLLING_PIN_PICKUP
+ file_paths = list(
+ 'sound/items/rolling_pin/rolling_pin_pickup1.ogg',
+ 'sound/items/rolling_pin/rolling_pin_pickup2.ogg',
+ 'sound/items/rolling_pin/rolling_pin_pickup3.ogg',
+ )
+
+/datum/sound_effect/rolling_pin_drop
+ key = SFX_ROLLING_PIN_DROP
+ file_paths = list(
+ 'sound/items/rolling_pin/rolling_pin_drop1.ogg',
+ 'sound/items/rolling_pin/rolling_pin_drop2.ogg',
+ 'sound/items/rolling_pin/rolling_pin_drop3.ogg',
+ )
+
+/datum/sound_effect/rolling_pin_rolling
+ key = SFX_ROLLING_PIN_ROLLING
+ file_paths = list(
+ 'sound/items/rolling_pin/rolling_pin_rolling1.ogg',
+ 'sound/items/rolling_pin/rolling_pin_rolling2.ogg',
+ 'sound/items/rolling_pin/rolling_pin_rolling3.ogg',
+ 'sound/items/rolling_pin/rolling_pin_rolling4.ogg',
+ 'sound/items/rolling_pin/rolling_pin_rolling5.ogg',
+ 'sound/items/rolling_pin/rolling_pin_rolling6.ogg',
+ )
+
+/datum/sound_effect/fire_mode_switch
+ key = SFX_FIRE_MODE_SWITCH
+ file_paths = list(
+ 'sound/items/weapons/gun_mode_switch1.ogg',
+ )
+
+
+/datum/sound_effect/remote_mode_switch
+ key = SFX_REMOTE_MODE_SWITCH
+ file_paths = list(
+ 'sound/items/door_remote/door_remote_switch1.ogg',
+ 'sound/items/door_remote/door_remote_switch2.ogg',
+ 'sound/items/door_remote/door_remote_switch3.ogg',
+ )
+
+/datum/sound_effect/remote_action
+ key = SFX_REMOTE_ACTION
+ file_paths = list(
+ 'sound/items/door_remote/door_remote_action1.ogg',
+ 'sound/items/door_remote/door_remote_action2.ogg',
+ )
+
+/datum/sound_effect/gas_mask_pickup
+ key = SFX_GAS_MASK_PICKUP
+ file_paths = list(
+ 'sound/items/gas_mask/gas_mask_pickup1.ogg',
+ 'sound/items/gas_mask/gas_mask_pickup2.ogg',
+ 'sound/items/gas_mask/gas_mask_pickup3.ogg',
+ )
+
+/datum/sound_effect/gas_mask_drop
+ key = SFX_GAS_MASK_DROP
+ file_paths = list(
+ 'sound/items/gas_mask/gas_mask_drop1.ogg',
+ 'sound/items/gas_mask/gas_mask_drop2.ogg',
+ 'sound/items/gas_mask/gas_mask_drop3.ogg',
+ )
+
+/datum/sound_effect/gas_mask_equip
+ key = SFX_GAS_MASK_EQUIP
+ file_paths = list(
+ 'sound/items/gas_mask/gas_mask_equip1.ogg',
+ 'sound/items/gas_mask/gas_mask_equip2.ogg',
+ 'sound/items/gas_mask/gas_mask_equip3.ogg',
+ )
+
+/datum/sound_effect/generic_device_pickup
+ key = SFX_GENERIC_DEVICE_PICKUP
+ file_paths = list(
+ 'sound/items/generic_device/generic_device_pickup1.ogg',
+ 'sound/items/generic_device/generic_device_pickup2.ogg',
+ 'sound/items/generic_device/generic_device_pickup3.ogg',
+ 'sound/items/generic_device/generic_device_pickup4.ogg',
+ 'sound/items/generic_device/generic_device_pickup5.ogg',
+ )
+
+/datum/sound_effect/generic_device_drop
+ key = SFX_GENERIC_DEVICE_DROP
+ file_paths = list(
+ 'sound/items/generic_device/generic_device_drop1.ogg',
+ 'sound/items/generic_device/generic_device_drop2.ogg',
+ 'sound/items/generic_device/generic_device_drop3.ogg',
+ 'sound/items/generic_device/generic_device_drop4.ogg',
+ 'sound/items/generic_device/generic_device_drop5.ogg',
+ )
+
+/datum/sound_effect/hard_hat_pickup
+ key = SFX_HARD_HAT_PICKUP
+ file_paths = list(
+ 'sound/items/hard_hat/hard_hat_pickup1.ogg',
+ 'sound/items/hard_hat/hard_hat_pickup2.ogg',
+ 'sound/items/hard_hat/hard_hat_pickup3.ogg',
+ 'sound/items/hard_hat/hard_hat_pickup4.ogg',
+ 'sound/items/hard_hat/hard_hat_pickup5.ogg',
+ )
+
+/datum/sound_effect/hard_hat_drop
+ key = SFX_HARD_HAT_DROP
+ file_paths = list(
+ 'sound/items/hard_hat/hard_hat_drop1.ogg',
+ 'sound/items/hard_hat/hard_hat_drop2.ogg',
+ 'sound/items/hard_hat/hard_hat_drop3.ogg',
+ 'sound/items/hard_hat/hard_hat_drop4.ogg',
+ 'sound/items/hard_hat/hard_hat_drop5.ogg',
+ )
+
+/datum/sound_effect/hard_hat_equip
+ key = SFX_HARD_HAT_EQUIP
+ file_paths = list(
+ 'sound/items/hard_hat/hard_hat_equip1.ogg',
+ 'sound/items/hard_hat/hard_hat_equip2.ogg',
+ 'sound/items/hard_hat/hard_hat_equip3.ogg',
+ )
diff --git a/code/game/turfs/baseturf_skipover.dm b/code/game/turfs/baseturf_skipover.dm
index 9bef78a15ea1..16d4f124c257 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 09ca2b81c5ef..0ceda1dba1b7 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 2deb6f367812..49ebdb577a92 100644
--- a/code/game/turfs/change_turf.dm
+++ b/code/game/turfs/change_turf.dm
@@ -20,7 +20,7 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list(
/turf/proc/copyTurf(turf/copy_to_turf, copy_air = FALSE, flags = null)
if(copy_to_turf.type != type)
- copy_to_turf.ChangeTurf(type, flags)
+ copy_to_turf.ChangeTurf(type, null, flags)
if(copy_to_turf.icon_state != icon_state)
copy_to_turf.icon_state = icon_state
if(copy_to_turf.icon != icon)
@@ -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 0354fc316bfd..c6ad9db01433 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 6bb8520189ec..861533c4b175 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 a416091aed5c..5b4e791f8e22 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 b7eb985bee55..1df2ea0251bd 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 ee889a876115..4fa24bd38419 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"
@@ -457,7 +457,6 @@
playsound(slipper.loc, 'sound/misc/slip.ogg', 50, TRUE, -3)
SEND_SIGNAL(slipper, COMSIG_ON_CARBON_SLIP)
- slipper.add_mood_event("slipped", /datum/mood_event/slipped)
if(force_drop && iscarbon(slipper)) //carbon specific behavior that living doesn't have
var/mob/living/carbon/carbon = slipper
for(var/obj/item/item in slipper.held_items)
diff --git a/code/game/turfs/open/ashplanet.dm b/code/game/turfs/open/ashplanet.dm
index e6703c04eb55..35c7ec5b1cd1 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/asteroid.dm b/code/game/turfs/open/asteroid.dm
index 312b33664915..4e131d0bf981 100644
--- a/code/game/turfs/open/asteroid.dm
+++ b/code/game/turfs/open/asteroid.dm
@@ -9,12 +9,13 @@
damaged_dmi = 'icons/turf/floors.dmi'
icon_state = "asteroid"
base_icon_state = "asteroid"
+ turf_flags = IS_SOLID
footstep = FOOTSTEP_SAND
barefootstep = FOOTSTEP_SAND
clawfootstep = FOOTSTEP_SAND
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
- rust_resistance = RUST_RESISTANCE_ORGANIC
+ rust_resistance = RUST_RESISTANCE_BASIC
/// Base turf type to be created by the tunnel
var/turf_type = /turf/open/misc/asteroid
/// Whether this turf has different icon states
diff --git a/code/game/turfs/open/chasm.dm b/code/game/turfs/open/chasm.dm
index e490abceda74..df1278b29d4f 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 3808622982da..7e9c72e30ee2 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 ec4b5ca50ada..595623275c7a 100644
--- a/code/game/turfs/open/floor.dm
+++ b/code/game/turfs/open/floor.dm
@@ -3,7 +3,7 @@
name = "floor"
icon = 'icons/turf/floors.dmi'
base_icon_state = "floor"
- baseturfs = /turf/open/floor/plating
+ baseturfs = /turf/open/floor/plating/concrete // DARKPACK EDIT CHANGE
footstep = FOOTSTEP_FLOOR
barefootstep = FOOTSTEP_HARD_BAREFOOT
@@ -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 eea5232aa062..3be12306bab9 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 978a9ab0fdf5..d4fa5912142f 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,14 @@
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 = 'modular_darkpack/modules/walls/icons/floors.dmi' // DARKPACK EDIT CHANGE
icon_state = "stairs"
base_icon_state = "stairs"
- tiled_dirt = FALSE
+ tiled_turf = FALSE
/turf/open/floor/iron/stairs/airless
initial_gas_mix = AIRLESS_ATMOS
@@ -518,8 +519,8 @@
initial_gas_mix = AIRLESS_ATMOS
/turf/open/floor/iron/stairs/old
- icon_state = "stairs-old"
- base_icon_state = "stairs-old"
+ icon_state = "stairs" // DARKPACK EDIT CHANGE
+ base_icon_state = "stairs" // DARKPACK EDIT CHANGE
/turf/open/floor/iron/stairs/old/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 eaccba29aaaa..93ae88597ad1 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 8ca8b45c101e..8456afc084b7 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/misc_floor.dm b/code/game/turfs/open/floor/misc_floor.dm
index ef96b90b021c..b35ca8691821 100644
--- a/code/game/turfs/open/floor/misc_floor.dm
+++ b/code/game/turfs/open/floor/misc_floor.dm
@@ -7,6 +7,7 @@
base_icon_state = "bcircuit"
light_color = LIGHT_COLOR_BABY_BLUE
floor_tile = /obj/item/stack/tile/circuit
+ rust_resistance = RUST_RESISTANCE_REINFORCED
/// If we want to ignore our area's power status and just be always off
/// Mostly for mappers doing asthetic things, or cases where the floor should be broken
var/always_off = FALSE
@@ -237,6 +238,7 @@
desc = "This one takes you back."
icon_state = "eighties"
floor_tile = /obj/item/stack/tile/eighties
+ rust_resistance = RUST_RESISTANCE_BASIC
/turf/open/floor/eighties/broken_states()
return list("eighties_damaged")
diff --git a/code/game/turfs/open/floor/plating.dm b/code/game/turfs/open/floor/plating.dm
index 8aa5c2ed3935..2a440db7c742 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 40fd70555246..2b6fe12a158c 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 219e284db364..bc8f70655759 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/grass.dm b/code/game/turfs/open/grass.dm
index 4dd5946a7ed1..f1668ef94be0 100644
--- a/code/game/turfs/open/grass.dm
+++ b/code/game/turfs/open/grass.dm
@@ -62,3 +62,13 @@
/turf/open/misc/grass/lavaland
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+
+// DARKPACK EDIT ADD START
+/turf/open/misc/grass/nosmooth
+ layer = LOW_FLOOR_LAYER
+ smoothing_flags = null
+ smoothing_groups = null
+ canSmoothWith = null
+ smooth_broken = null
+ smooth_burnt = null
+// DARKPACK EDIT ADD END
diff --git a/code/game/turfs/open/lava.dm b/code/game/turfs/open/lava.dm
index d814fd7d6327..d12fe69c31ad 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 b9c27e3faf26..666ad1aef854 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 d2149766faa1..2af5fcdef491 100644
--- a/code/game/turfs/open/openspace.dm
+++ b/code/game/turfs/open/openspace.dm
@@ -113,6 +113,53 @@
/turf/open/openspace/CanBuildHere()
return can_build_on
+// DARKPACK EDIT ADD START
+/turf/open/openspace/attack_hand(mob/user, list/modifiers)
+ . = ..()
+ if(.)
+ return
+
+ return user.climb_down(src)
+
+/turf/open/openspace/attack_animal(mob/user, list/modifiers)
+ . = ..()
+ if(.)
+ return
+
+ return user.climb_down(src)
+
+/turf/open/openspace/attack_basic_mob(mob/user, list/modifiers)
+ . = ..()
+ if(.)
+ return
+
+ return user.climb_down(src)
+
+/mob/proc/climb_down(turf/open/openspace/target_turf)
+ var/turf/down_turf = GET_TURF_BELOW(target_turf)
+ if(!can_z_move(DOWN, target_turf, down_turf, ZMOVE_FEEDBACK))
+ return FALSE
+
+ return zMove(DOWN, down_turf, ZMOVE_FEEDBACK)
+
+/mob/living/climb_down(turf/open/openspace/target_turf)
+ var/turf/down_turf = GET_TURF_BELOW(target_turf)
+ if(!can_z_move(DOWN, target_turf, down_turf, ZMOVE_FEEDBACK))
+ return FALSE
+
+ to_chat(src, span_notice("You start climbing down..."))
+
+ // DARKPACK TODO - standardize stat doafter delays
+ var/result = do_after(src, (11 - (st_get_stat(STAT_DEXTERITY) + st_get_stat(STAT_ATHLETICS))) SECONDS, target_turf)
+ if(!result)
+ to_chat(src, span_warning("You were interrupted and failed to climb down."))
+ return FALSE
+
+ if(zMove(DOWN, down_turf, ZMOVE_FEEDBACK))
+ to_chat(src, span_notice("You climb down successfully."))
+ return TRUE
+// DARKPACK EDIT ADD END
+
/turf/open/openspace/attackby(obj/item/attacking_item, mob/user, list/modifiers)
..()
if(!CanBuildHere())
@@ -142,7 +189,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 e0fe7e842b94..55963e2cf684 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 af583de77791..71ffa6be6131 100644
--- a/code/game/turfs/open/sand.dm
+++ b/code/game/turfs/open/sand.dm
@@ -8,7 +8,7 @@
barefootstep = FOOTSTEP_SAND
clawfootstep = FOOTSTEP_SAND
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
- rust_resistance = RUST_RESISTANCE_ORGANIC
+ rust_resistance = RUST_RESISTANCE_REINFORCED
/turf/open/misc/beach/Initialize(mapload)
. = ..()
@@ -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 d37d338b6ac6..edb8a337987e 100644
--- a/code/game/turfs/open/space/space.dm
+++ b/code/game/turfs/open/space/space.dm
@@ -44,8 +44,8 @@ GLOBAL_LIST_EMPTY(starlight)
/turf/open/space
icon = 'icons/turf/space.dmi'
- MAP_SWITCH(icon_state = "space", icon_state = "space_map")
- name = CITY_NAME // DARKPACK EDIT CHANGE - ORIGINAL: name = "\proper space"
+ icon_state = MAP_SWITCH("space", "space_map")
+ name = "\proper space"
overfloor_placed = FALSE
underfloor_accessibility = UNDERFLOOR_INTERACTABLE
rust_resistance = RUST_RESISTANCE_ABSOLUTE
@@ -60,8 +60,8 @@ GLOBAL_LIST_EMPTY(starlight)
run_later = TRUE
plane = PLANE_SPACE
layer = SPACE_LAYER
- light_power = 0.25 // DARKPACK EDIT CHANGE, ORIGINAL: light_power = 1 - CITY_TIME
- light_range = 0.5 // DARKPACK EDIT CHANGE, ORIGINAL: light_range = 2 - CITY_TIME
+ light_power = 1
+ light_range = 2
light_color = COLOR_STARLIGHT
light_height = LIGHTING_HEIGHT_SPACE
light_on = FALSE
@@ -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)
@@ -193,6 +193,9 @@ GLOBAL_LIST_EMPTY(starlight)
if (!. || isspaceturf(.))
return
+ if (flags & CHANGETURF_NO_AREA_CHANGE)
+ return
+
var/area/new_turf_area = get_area(.)
if (istype(new_turf_area, /area/space) && !istype(new_turf_area, /area/space/nearstation))
set_turf_to_area(., GLOB.areas_by_type[/area/space/nearstation])
diff --git a/code/game/turfs/open/water.dm b/code/game/turfs/open/water.dm
index 7dde7cb70b1f..35678cc45ad3 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 223fc48a72ff..3a17329e8781 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
@@ -91,7 +91,7 @@ GLOBAL_LIST_EMPTY(station_turfs)
var/force_no_gravity = FALSE
///This turf's resistance to getting rusted
- var/rust_resistance = RUST_RESISTANCE_ORGANIC
+ var/rust_resistance = RUST_RESISTANCE_BASIC
/// How pathing algorithm will check if this turf is passable by itself (not including content checks). By default it's just density check.
/// WARNING: Currently to use a density shortcircuiting this does not support dense turfs with special allow through function
@@ -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
@@ -669,11 +666,12 @@ GLOBAL_LIST_EMPTY(station_turfs)
return TRUE
/turf/proc/add_vomit_floor(mob/living/vomiter, vomit_type = /obj/effect/decal/cleanable/vomit, vomit_flags, purge_ratio = 0.1)
- var/obj/effect/decal/cleanable/vomit/throw_up = new vomit_type (src, vomiter?.get_static_viruses())
+ var/obj/effect/decal/cleanable/vomit/throw_up = new vomit_type(src, vomiter?.get_static_viruses())
// if the vomit combined, apply toxicity and reagents to the old vomit
if (QDELETED(throw_up))
throw_up = locate() in src
+
if(isnull(throw_up))
return
@@ -682,21 +680,28 @@ GLOBAL_LIST_EMPTY(station_turfs)
clear_reagents_to_vomit_pool(vomiter, throw_up, purge_ratio)
-/proc/clear_reagents_to_vomit_pool(mob/living/carbon/M, obj/effect/decal/cleanable/vomit/V, purge_ratio = 0.1)
- var/obj/item/organ/stomach/belly = M.get_organ_slot(ORGAN_SLOT_STOMACH)
+/proc/clear_reagents_to_vomit_pool(mob/living/carbon/owner, obj/effect/decal/cleanable/vomit/vomit, purge_ratio = 0.1)
+ var/obj/item/organ/stomach/belly = owner.get_organ_slot(ORGAN_SLOT_STOMACH)
if(!belly?.reagents.total_volume)
return
+
var/chemicals_lost = belly.reagents.total_volume * purge_ratio
- belly.reagents.trans_to(V, chemicals_lost, transferred_by = M)
- //clear the stomach of anything even not food
+ if (vomit.reagents)
+ vomit.reagents.maximum_volume += chemicals_lost
+ else
+ vomit.create_reagents(chemicals_lost)
+
+ belly.reagents.trans_to(vomit, chemicals_lost, transferred_by = owner)
+ // Clear the stomach of anything even not food
for(var/bile in belly.reagents.reagent_list)
var/datum/reagent/reagent = bile
if(!belly.food_reagents[reagent.type])
belly.reagents.remove_reagent(reagent.type, min(reagent.volume, 10))
- else
- var/bit_vol = reagent.volume - belly.food_reagents[reagent.type]
- if(bit_vol > 0)
- belly.reagents.remove_reagent(reagent.type, min(bit_vol, 10))
+ continue
+
+ var/bit_vol = reagent.volume - belly.food_reagents[reagent.type]
+ if(bit_vol > 0)
+ belly.reagents.remove_reagent(reagent.type, min(bit_vol, 10))
//Whatever happens after high temperature fire dies out or thermite reaction works.
//Should return new turf
@@ -799,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 e2dd3726c35e..b687b25256db 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 e1159d405032..e13afc05d769 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 3a9744ee3e48..d426c48b14dd 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/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index a2ea441d8232..6c62612366b8 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -33,6 +33,11 @@ ADMIN_VERB(admin_ghost, R_ADMIN, "AGhost", "Become a ghost without DNR.", ADMIN_
//ghostize
log_admin("[key_name(user)] admin ghosted.")
message_admins("[key_name_admin(user)] admin ghosted.")
+ // DARKPACK EDIT START
+ if(isavatar(user.mob))
+ var/mob/living/basic/avatar/ghost = user.mob
+ ghost.exit_avatar(force = TRUE)
+ // DARKPACK EDIT END
var/mob/body = user.mob
body.ghostize(TRUE, TRUE)
user.init_verbs()
diff --git a/code/modules/admin/callproc/callproc.dm b/code/modules/admin/callproc/callproc.dm
index 823a4a9e64bf..0bf184689063 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 3e8d212d0713..fdde0aa1cb23 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 c87c424661fd..7d3710ffb08f 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 6be76b4df87b..18b96318f067 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/outfit_editor.dm b/code/modules/admin/outfit_editor.dm
index 765fbb9999d4..7a8b4f60ccab 100644
--- a/code/modules/admin/outfit_editor.dm
+++ b/code/modules/admin/outfit_editor.dm
@@ -55,7 +55,7 @@
"name" = initial(item.name),
"desc" = initial(item.desc),
// at this point initializing the item is probably faster tbh
- "sprite" = icon2base64(icon(initial(item.icon), initial(item.icon_state))),
+ "sprite" = icon2base64(icon(initial(item.icon), initial(item.icon_state), frame = 1)),
)
return data
@@ -78,7 +78,9 @@
var/icon/dummysprite = get_flat_human_icon(null,
dummy_key = dummy_key,
showDirs = list(SOUTH),
- outfit_override = drip)
+ outfit_override = drip,
+ no_anim = TRUE,
+ )
data["dummy64"] = icon2base64(dummysprite)
return data
diff --git a/code/modules/admin/poll_management.dm b/code/modules/admin/poll_management.dm
index 88a38c90166b..80ba5ec56a03 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 a3031ce13ffc..3fd1a1121f4b 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 ceafc49df24c..1d70bc60f6cd 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 806de6442938..b833af12a3a8 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 a3828feb828d..6eaa7b53792f 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/fake_bwoink.dm b/code/modules/admin/smites/fake_bwoink.dm
index a4179ff5ce82..95d30298729b 100644
--- a/code/modules/admin/smites/fake_bwoink.dm
+++ b/code/modules/admin/smites/fake_bwoink.dm
@@ -4,4 +4,4 @@
/datum/smite/fake_bwoink/effect(client/user, mob/living/target)
. = ..()
- SEND_SOUND(target, 'sound/effects/adminhelp.ogg')
+ SEND_SOUND(target, 'modular_darkpack/master_files/sounds/adminhelp.ogg') // DARKPACK EDIT CHANGE
diff --git a/code/modules/admin/smites/lightning.dm b/code/modules/admin/smites/lightning.dm
index 99cb46bdaace..be015a8a1c15 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/smites/retcon.dm b/code/modules/admin/smites/retcon.dm
index 461b7b330bbf..33beb3542e89 100644
--- a/code/modules/admin/smites/retcon.dm
+++ b/code/modules/admin/smites/retcon.dm
@@ -27,7 +27,7 @@
/datum/smite/retcon/proc/delete_bank_account(mob/living/target)
var/name = target.real_name
- var/account_list = flatten_list(SSeconomy.bank_accounts_by_id)
+ var/account_list = assoc_to_values(SSeconomy.bank_accounts_by_id)
for(var/datum/bank_account/account in account_list)
if(account.account_holder == name)
qdel(account)
diff --git a/code/modules/admin/spawn_menu.dm b/code/modules/admin/spawn_menu.dm
new file mode 100644
index 000000000000..07e461e39573
--- /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 95097d6badea..a5cc42a43919 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 71b2c866f0dd..113845a1f7f0 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("
Blood types not written above can only receive from the same blood type.
- Certain species do not have blood.
- "}
+ "} // DARKPACK EDIT REMOVE - Removed "Certain species do not have blood."
/*
* Stations
diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm
index f301ba3a29c8..2e02ff0fdce9 100644
--- a/code/modules/paperwork/paperbin.dm
+++ b/code/modules/paperwork/paperbin.dm
@@ -215,6 +215,7 @@
papertype = /obj/item/paper/natural
resistance_flags = FLAMMABLE
bin_overlay_string = "paper_bundle_overlay"
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT)
///Cable this bundle is held together with.
var/obj/item/stack/cable_coil/binding_cable
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index b9a97778f1ad..54866f7a3169 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -25,7 +25,6 @@
throw_range = 7
custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.1)
pressure_resistance = 2
- grind_results = list(/datum/reagent/iron = 2, /datum/reagent/iodine = 1)
var/colour = COLOR_BLACK //what colour the ink is!
var/degrees = 0
var/font = PEN_FONT
@@ -58,6 +57,9 @@
create_transform_component()
RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform))
+/obj/item/pen/grind_results()
+ return list(/datum/reagent/iron = 2, /datum/reagent/iodine = 1)
+
/// Proc that child classes can override to have custom transforms, like edaggers or pendrivers
/obj/item/pen/proc/create_transform_component()
AddComponent( \
@@ -165,11 +167,13 @@
icon_state = "pen-charcoal"
colour = "#696969"
font = CHARCOAL_FONT
- custom_materials = null
- grind_results = list(/datum/reagent/ash = 5, /datum/reagent/cellulose = 10)
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT)
requires_gravity = FALSE // this is technically a pencil
can_click = FALSE
+/obj/item/pen/charcoal/grind_results()
+ return list(/datum/reagent/ash = 5, /datum/reagent/cellulose = 10)
+
/datum/crafting_recipe/charcoal_stylus
name = "Charcoal Stylus"
result = /obj/item/pen/charcoal
@@ -177,6 +181,38 @@
time = 3 SECONDS
category = CAT_TOOLS
+// Skins for captain's fountain pen
+/datum/atom_skin/cap_pen
+ abstract_type = /datum/atom_skin/cap_pen
+
+/datum/atom_skin/cap_pen/apply(atom/apply_to)
+ . = ..()
+ apply_to.desc = "It's an expensive [preview_name] fountain pen. The nib is quite sharp."
+
+/datum/atom_skin/cap_pen/clear_skin(atom/clear_from)
+ . = ..()
+ clear_from.desc = initial(clear_from.desc)
+
+/datum/atom_skin/cap_pen/oak
+ preview_name = "Oak"
+ new_icon_state = "pen-fountain-o"
+
+/datum/atom_skin/cap_pen/gold
+ preview_name = "Gold"
+ new_icon_state = "pen-fountain-g"
+
+/datum/atom_skin/cap_pen/rosewood
+ preview_name = "Rosewood"
+ new_icon_state = "pen-fountain-r"
+
+/datum/atom_skin/cap_pen/black_silver
+ preview_name = "Black and Silver"
+ new_icon_state = "pen-fountain-b"
+
+/datum/atom_skin/cap_pen/command_blue
+ preview_name = "Command Blue"
+ new_icon_state = "pen-fountain-cb"
+
/obj/item/pen/fountain/captain
name = "captain's fountain pen"
desc = "It's an expensive Oak fountain pen. The nib is quite sharp."
@@ -184,26 +220,18 @@
force = 5
throwforce = 5
throw_speed = 4
- colour = "#DC143C"
custom_materials = list(/datum/material/gold = SMALL_MATERIAL_AMOUNT*7.5)
sharpness = SHARP_EDGED
resistance_flags = FIRE_PROOF
- unique_reskin = list(
- "Oak" = "pen-fountain-o",
- "Gold" = "pen-fountain-g",
- "Rosewood" = "pen-fountain-r",
- "Black and Silver" = "pen-fountain-b",
- "Command Blue" = "pen-fountain-cb"
- )
embed_type = /datum/embedding/pen/captain
dart_insert_casing_icon_state = "overlay_fountainpen_gold"
dart_insert_projectile_icon_state = "overlay_fountainpen_gold_proj"
var/list/overlay_reskin = list(
- "Oak" = "overlay_fountainpen_gold",
- "Gold" = "overlay_fountainpen_gold",
- "Rosewood" = "overlay_fountainpen_gold",
- "Black and Silver" = "overlay_fountainpen",
- "Command Blue" = "overlay_fountainpen_gold"
+ /datum/atom_skin/cap_pen/black_silver::preview_name = "overlay_fountainpen",
+ /datum/atom_skin/cap_pen/command_blue::preview_name = "overlay_fountainpen_gold",
+ /datum/atom_skin/cap_pen/gold::preview_name = "overlay_fountainpen_gold",
+ /datum/atom_skin/cap_pen/oak::preview_name = "overlay_fountainpen_gold",
+ /datum/atom_skin/cap_pen/rosewood::preview_name = "overlay_fountainpen_gold",
)
/datum/embedding/pen/captain
@@ -211,24 +239,21 @@
/obj/item/pen/fountain/captain/Initialize(mapload)
. = ..()
- AddComponent(/datum/component/butchering, \
- speed = 20 SECONDS, \
- effectiveness = 115, \
+ AddComponent( \
+ /datum/component/butchering, \
+ speed = 20 SECONDS, \
+ effectiveness = 115, \
)
+ AddComponent(/datum/component/reskinable_item, /datum/atom_skin/cap_pen)
//the pen is mightier than the sword
RegisterSignal(src, COMSIG_DART_INSERT_PARENT_RESKINNED, PROC_REF(reskin_dart_insert))
-/obj/item/pen/fountain/captain/reskin_obj(mob/M)
- ..()
- if(current_skin)
- desc = "It's an expensive [current_skin] fountain pen. The nib is quite sharp."
-
-
-/obj/item/pen/fountain/captain/proc/reskin_dart_insert(datum/component/dart_insert/insert_comp)
+/obj/item/pen/fountain/captain/proc/reskin_dart_insert(datum/component/dart_insert/insert_comp, skin)
+ SIGNAL_HANDLER
if(!istype(insert_comp)) //You really shouldn't be sending this signal from anything other than a dart_insert component
return
- insert_comp.casing_overlay_icon_state = overlay_reskin[current_skin]
- insert_comp.projectile_overlay_icon_state = "[overlay_reskin[current_skin]]_proj"
+ insert_comp.casing_overlay_icon_state = overlay_reskin[skin]
+ insert_comp.projectile_overlay_icon_state = "[overlay_reskin[skin]]_proj"
/obj/item/pen/item_ctrl_click(mob/living/carbon/user)
if(loc != user)
@@ -445,9 +470,10 @@
/datum/embedding/edagger_active
embed_chance = 100
-/obj/item/pen/edagger/proc/on_scan(datum/source, mob/user, list/extra_data)
+/obj/item/pen/edagger/proc/on_scan(datum/source, mob/user, datum/detective_scanner_log/entry)
SIGNAL_HANDLER
- LAZYADD(extra_data[DETSCAN_CATEGORY_ILLEGAL], "Hard-light generator detected.")
+
+ entry.add_data_entry(DETSCAN_CATEGORY_ILLEGAL, "Hard-light generator detected.")
/obj/item/pen/survival
name = "survival pen"
@@ -460,7 +486,6 @@
w_class = WEIGHT_CLASS_TINY
custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*0.1, /datum/material/diamond=SMALL_MATERIAL_AMOUNT, /datum/material/titanium = SMALL_MATERIAL_AMOUNT*0.1)
pressure_resistance = 2
- grind_results = list(/datum/reagent/iron = 2, /datum/reagent/iodine = 1)
tool_behaviour = TOOL_MINING //For the classic "digging out of prison with a spoon but you're in space so this analogy doesn't work" situation.
toolspeed = 10 //You will never willingly choose to use one of these over a shovel.
font = FOUNTAIN_PEN_FONT
@@ -469,6 +494,9 @@
dart_insert_projectile_icon_state = "overlay_survivalpen_proj"
can_click = FALSE
+/obj/item/pen/survival/grind_results()
+ return list(/datum/reagent/iron = 2, /datum/reagent/iodine = 1)
+
/obj/item/pen/survival/on_inserted_into_dart(datum/source, obj/item/ammo_casing/dart, mob/user)
. = ..()
RegisterSignal(dart.loaded_projectile, COMSIG_PROJECTILE_SELF_ON_HIT, PROC_REF(on_dart_hit))
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
index 2c0cac37b40e..e5fd48b00716 100644
--- a/code/modules/paperwork/photocopier.dm
+++ b/code/modules/paperwork/photocopier.dm
@@ -871,10 +871,12 @@ GLOBAL_LIST_INIT(paper_blanks, init_paper_blanks())
icon = 'icons/obj/service/bureaucracy.dmi'
icon_state = "tonercartridge"
w_class = WEIGHT_CLASS_SMALL
- grind_results = list(/datum/reagent/iodine = 40, /datum/reagent/iron = 10)
var/charges = 5
var/max_charges = 5
+/obj/item/toner/grind_results()
+ return list(/datum/reagent/iodine = 40, /datum/reagent/iron = 10)
+
/obj/item/toner/examine(mob/user)
. = ..()
. += span_notice("The ink level gauge on the side reads [round(charges / max_charges * 100)]%")
@@ -882,9 +884,12 @@ GLOBAL_LIST_INIT(paper_blanks, init_paper_blanks())
/obj/item/toner/large
name = "large toner cartridge"
desc = "A hefty cartridge of Nanotrasen ValueBrand toner. Fits photocopiers and autopainters alike."
- grind_results = list(/datum/reagent/iodine = 90, /datum/reagent/iron = 10)
charges = 25
max_charges = 25
+ custom_price = 30 // DARKPACK EDIT ADD - ECONOMY
+
+/obj/item/toner/large/grind_results()
+ return list(/datum/reagent/iodine = 90, /datum/reagent/iron = 10)
/obj/item/toner/extreme
name = "extremely large toner cartridge"
diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm
index 52c996a7cb15..cac16165e7e4 100644
--- a/code/modules/paperwork/stamps.dm
+++ b/code/modules/paperwork/stamps.dm
@@ -1,8 +1,8 @@
/obj/item/stamp
- name = "\improper GRANTED rubber stamp"
+ name = "rubber stamp"
desc = "A rubber stamp for stamping important documents."
icon = 'icons/obj/service/bureaucracy.dmi'
- icon_state = "stamp-ok"
+ abstract_type = /obj/item/stamp
worn_icon_state = "nothing"
inhand_icon_state = "stamp"
throwforce = 0
@@ -34,8 +34,9 @@
dye_color = DYE_LAW
/obj/item/stamp/head
+ abstract_type = /obj/item/stamp/head
-/* DARKPACK EDIT REMOVAL
+/* // DARKPACK EDIT REMOVAL
/obj/item/stamp/head/Initialize(mapload)
. = ..()
// All maps should have at least 1 of each head of staff stamp
@@ -77,6 +78,11 @@
icon_state = "stamp-qm"
dye_color = DYE_QM
+/obj/item/stamp/granted
+ name = "\improper GRANTED rubber stamp"
+ icon_state = "stamp-ok"
+ dye_color = DYE_GREEN
+
/obj/item/stamp/denied
name = "\improper DENIED rubber stamp"
icon_state = "stamp-deny"
diff --git a/code/modules/paperwork/ticketmachine.dm b/code/modules/paperwork/ticketmachine.dm
index bf4e88fa17b9..256926e7d52e 100644
--- a/code/modules/paperwork/ticketmachine.dm
+++ b/code/modules/paperwork/ticketmachine.dm
@@ -31,7 +31,8 @@
/obj/machinery/ticket_machine/Initialize(mapload)
. = ..()
update_appearance()
- find_and_hang_on_wall()
+ if(mapload)
+ find_and_mount_on_atom()
/obj/machinery/ticket_machine/Destroy()
for(var/obj/item/ticket_machine_ticket/ticket in tickets)
diff --git a/code/modules/photography/camera/camera.dm b/code/modules/photography/camera/camera.dm
index 07f507e4d621..3867a8fb573d 100644
--- a/code/modules/photography/camera/camera.dm
+++ b/code/modules/photography/camera/camera.dm
@@ -59,6 +59,7 @@
var/picture_size_y_min = 1
var/picture_size_x_max = 4
var/picture_size_y_max = 4
+ custom_price = 300 // DARKPACK EDIT ADD - ECONOMY
/obj/item/camera/Initialize(mapload)
. = ..()
@@ -192,17 +193,11 @@
/// Check whether an AI could take a picture of the target turf.
/obj/item/camera/proc/can_ai_target(turf/target_turf)
- if(!GLOB.cameranet.checkTurfVis(target_turf))
- return FALSE
- return TRUE
+ return SScameras.is_visible_by_cameras(target_turf)
/// Check whether a mob could take a picture of the target turf.
/obj/item/camera/proc/can_mob_target(turf/target_turf, mob/user)
- var/user_view = user.client ? user.client.view : WIDESCREEN_VIEWPORT_SIZE
- var/user_eye = user.client ? user.client.eye : user
- if(!(target_turf in get_hear(user_view, user_eye)))
- return FALSE
- return TRUE
+ return (target_turf in get_hear_turfs(user.client?.view || world.view, user.client?.eye || user))
/obj/item/camera/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
// Always skip on storage and tables
@@ -261,18 +256,17 @@
var/list/desc = list("This is a photo of an area of [size_x+1] meters by [size_y+1] meters.")
var/list/mobs_spotted = list()
var/list/dead_spotted = list()
- var/list/seen
- var/list/viewlist = user?.client ? getviewsize(user.client.view) : getviewsize(world.view)
- var/viewr = max(viewlist[1], viewlist[2]) + max(size_x, size_y)
- var/viewc = user?.client ? user.client.eye : target
- seen = get_hear(viewr, viewc)
+ var/list/viewlist = getviewsize(user?.client?.view || world.view)
+ var/view_range = max(viewlist[1], viewlist[2]) + max(size_x, size_y)
+ var/viewer = user?.client?.eye || user || target // not sure why target is a fallback
+ var/list/seen = get_hear_turfs(view_range, viewer)
var/list/turfs = list()
var/list/mobs = list()
var/blueprints = FALSE
var/clone_area = SSmapping.request_turf_block_reservation(size_x * 2 + 1, size_y * 2 + 1, 1)
///list of human names taken on picture
var/list/names = list()
- var/cameranet_user = isAI(user) || istype(viewc, /mob/eye/camera)
+ var/cameranet_user = isAI(user) || istype(viewer, /mob/eye/camera)
var/width = size_x * 2 + 1
var/height = size_y * 2 + 1
@@ -280,7 +274,7 @@
if(isnull(seen_placeholder))
continue
- if(cameranet_user && !GLOB.cameranet.checkTurfVis(seen_placeholder))
+ if(cameranet_user && !SScameras.is_visible_by_cameras(seen_placeholder))
continue
if(!cameranet_user && !(seen_placeholder in seen))
continue
diff --git a/code/modules/photography/camera/film.dm b/code/modules/photography/camera/film.dm
index 91674260e2b0..ef29e88ed055 100644
--- a/code/modules/photography/camera/film.dm
+++ b/code/modules/photography/camera/film.dm
@@ -13,3 +13,4 @@
w_class = WEIGHT_CLASS_TINY
resistance_flags = FLAMMABLE
custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT*0.1, /datum/material/glass = SMALL_MATERIAL_AMOUNT*0.1)
+ custom_price = 30 // DARKPACK EDIT ADD - ECONOMY
diff --git a/code/modules/photography/photos/frame.dm b/code/modules/photography/photos/frame.dm
index 66db83342e56..983cb00977d2 100644
--- a/code/modules/photography/photos/frame.dm
+++ b/code/modules/photography/photos/frame.dm
@@ -73,13 +73,11 @@
var/art_value = OK_ART
var/can_decon = TRUE
-/obj/structure/sign/picture_frame/Initialize(mapload, dir, building)
+/obj/structure/sign/picture_frame/Initialize(mapload)
. = ..()
AddElement(/datum/element/art, art_value)
if (!SSpersistence.initialized)
LAZYADD(SSpersistence.queued_photo_frames, src)
- if(dir)
- setDir(dir)
/obj/structure/sign/picture_frame/Destroy()
LAZYREMOVE(SSpersistence.queued_photo_frames, src)
diff --git a/code/modules/photography/photos/photo.dm b/code/modules/photography/photos/photo.dm
index 9c76e499a607..44dabf0f5d90 100644
--- a/code/modules/photography/photos/photo.dm
+++ b/code/modules/photography/photos/photo.dm
@@ -11,10 +11,12 @@
max_integrity = 50
drop_sound = 'sound/items/handling/paper_drop.ogg'
pickup_sound = 'sound/items/handling/paper_pickup.ogg'
- grind_results = list(/datum/reagent/iodine = 4)
var/datum/picture/picture
var/scribble //Scribble on the back.
+/obj/item/photo/grind_results()
+ return LAZYACCESS(custom_materials, /datum/material/hauntium) ? list(/datum/reagent/hauntium = 20) : list(/datum/reagent/iodine = 4)
+
/obj/item/photo/get_save_vars()
return ..() - NAMEOF(src, icon)
@@ -56,7 +58,6 @@
if(!isobserver(seen) && !isghostspecies(seen))
continue
set_custom_materials(list(/datum/material/hauntium =SHEET_MATERIAL_AMOUNT))
- grind_results = list(/datum/reagent/hauntium = 20)
break
/obj/item/photo/update_icon_state()
diff --git a/code/modules/plumbing/ducts.dm b/code/modules/plumbing/ducts.dm
index 66f745129be4..fb85fe054ba7 100644
--- a/code/modules/plumbing/ducts.dm
+++ b/code/modules/plumbing/ducts.dm
@@ -157,7 +157,7 @@ All the important duct code:
if(ispath(drop_on_wrench))
var/obj/item/stack/ducts/duct_stack = new drop_on_wrench(drop_location())
duct_stack.duct_color = GLOB.pipe_color_name[duct_color] || DUCT_COLOR_OMNI
- duct_stack.duct_layer = GLOB.plumbing_layer_names["[duct_layer]"] || GLOB.plumbing_layer_names["[DUCT_LAYER_DEFAULT]"]
+ duct_stack.duct_layer = GLOB.plumbing_layer_names["[duct_layer]"] || GLOB.plumbing_layer_names[DUCT_LAYER_DEFAULT]
duct_stack.add_atom_colour(duct_color, FIXED_COLOUR_PRIORITY)
drop_on_wrench = null
if(!QDELING(src))
diff --git a/code/modules/plumbing/plumbers/_plumb_machinery.dm b/code/modules/plumbing/plumbers/_plumb_machinery.dm
index 84e51918dc8c..ffb7c0fedcd7 100644
--- a/code/modules/plumbing/plumbers/_plumb_machinery.dm
+++ b/code/modules/plumbing/plumbers/_plumb_machinery.dm
@@ -23,7 +23,7 @@
. = ..()
set_anchored(bolt)
create_reagents(buffer, reagent_flags)
- AddComponent(/datum/component/simple_rotation)
+ AddElement(/datum/element/simple_rotation)
register_context()
/obj/machinery/plumbing/create_reagents(max_vol, flags)
diff --git a/code/modules/plumbing/plumbers/bottler.dm b/code/modules/plumbing/plumbers/bottler.dm
index b3421e9ffc36..f181427c6540 100644
--- a/code/modules/plumbing/plumbers/bottler.dm
+++ b/code/modules/plumbing/plumbers/bottler.dm
@@ -21,7 +21,7 @@
/obj/machinery/plumbing/bottler/Initialize(mapload, bolt, layer)
. = ..()
- AddComponent(/datum/component/plumbing/simple_demand, bolt, layer)
+ AddComponent(/datum/component/plumbing/simple_demand, bolt, layer, distinct_reagent_cap = 3)
setDir(dir)
/obj/machinery/plumbing/bottler/examine(mob/user)
diff --git a/code/modules/plumbing/plumbers/grinder_chemical.dm b/code/modules/plumbing/plumbers/grinder_chemical.dm
index c631e26def6f..2feb38a8a69b 100644
--- a/code/modules/plumbing/plumbers/grinder_chemical.dm
+++ b/code/modules/plumbing/plumbers/grinder_chemical.dm
@@ -103,11 +103,11 @@
INVOKE_ASYNC(src, PROC_REF(blend), AM)
-/obj/machinery/plumbing/grinder_chemical/blended(obj/item/blended_item, grinded)
+/obj/machinery/plumbing/grinder_chemical/blended(obj/item/slime_extract/blended_item, grinded)
//don't delete slime extracts
- if(istype(blended_item, /obj/item/slime_extract))
+ if(istype(blended_item))
//so you can't regrind them for extra stuff
- blended_item.grind_results = null
+ blended_item.can_grind = FALSE
blended_item.forceMove(drop_location())
@@ -120,7 +120,7 @@
* Arguments
* * [AM][atom] - the atom to grind or juice
*/
-/obj/machinery/plumbing/grinder_chemical/proc/blend(obj/item/I)
+/obj/machinery/plumbing/grinder_chemical/proc/blend(obj/item/item_to_blend)
PRIVATE_PROC(TRUE)
if(!is_operational || !anchored)
@@ -128,14 +128,14 @@
if(reagents.holder_full())
return
- if((I.item_flags & ABSTRACT) || (I.flags_1 & HOLOGRAM_1))
+ if((item_to_blend.item_flags & ABSTRACT) || (item_to_blend.flags_1 & HOLOGRAM_1))
return
- if(!I.blend_requirements(src))
+ if(!item_to_blend.blend_requirements(src))
return
if(!grinding)
- I.juice(reagents, usr, src)
- else if(length(I.grind_results) || I.reagents?.total_volume)
- I.grind(reagents, usr, src)
+ item_to_blend.juice(reagents, usr, src)
+ else if(length(item_to_blend.grind_results()) || item_to_blend.reagents?.total_volume)
+ item_to_blend.grind(reagents, usr, src)
use_energy(active_power_usage)
diff --git a/code/modules/plumbing/plumbers/iv_drip.dm b/code/modules/plumbing/plumbers/iv_drip.dm
index 0fef34ef4ca0..d735b49e56af 100644
--- a/code/modules/plumbing/plumbers/iv_drip.dm
+++ b/code/modules/plumbing/plumbers/iv_drip.dm
@@ -10,12 +10,18 @@
/obj/machinery/iv_drip/plumbing/Initialize(mapload, bolt, layer)
. = ..()
- AddComponent(/datum/component/plumbing/simple_demand, bolt, layer)
- AddComponent(/datum/component/simple_rotation)
+ AddComponent(/datum/component/plumbing/automated_iv, bolt, layer, distinct_reagent_cap = 3)
+ AddElement(/datum/element/simple_rotation)
+
+/obj/machinery/iv_drip/plumbing/quick_toggle(mob/living/user)
+ return FALSE
+
+/obj/machinery/iv_drip/plumbing/click_alt(mob/user)
+ return NONE
/obj/machinery/iv_drip/plumbing/add_context(atom/source, list/context, obj/item/held_item, mob/living/user)
. = ..()
- if(held_item.tool_behaviour != TOOL_WRENCH)
+ if(isnull(held_item) || held_item.tool_behaviour != TOOL_WRENCH)
return
context[SCREENTIP_CONTEXT_LMB] = "[anchored ? "Una" : "A"]nchor"
return CONTEXTUAL_SCREENTIP_SET
diff --git a/code/modules/plumbing/plumbers/pill_press.dm b/code/modules/plumbing/plumbers/pill_press.dm
index 4bd9321d2a86..8e10239511ea 100644
--- a/code/modules/plumbing/plumbers/pill_press.dm
+++ b/code/modules/plumbing/plumbers/pill_press.dm
@@ -57,7 +57,7 @@
max_volume = initial(packaging_type.volume)
current_volume = clamp(current_volume, MIN_VOLUME, max_volume)
- AddComponent(/datum/component/plumbing/simple_demand, bolt, layer)
+ AddComponent(/datum/component/plumbing/simple_demand, bolt, layer, distinct_reagent_cap = 3)
/obj/machinery/plumbing/pill_press/Destroy(force)
QDEL_LAZYLIST(stored_products)
diff --git a/code/modules/plumbing/plumbers/simple_machines.dm b/code/modules/plumbing/plumbers/simple_machines.dm
index c2ef30829732..ded80bf88f17 100644
--- a/code/modules/plumbing/plumbers/simple_machines.dm
+++ b/code/modules/plumbing/plumbers/simple_machines.dm
@@ -21,7 +21,7 @@
/obj/machinery/plumbing/output/Initialize(mapload, bolt, layer)
. = ..()
- AddComponent(/datum/component/plumbing/simple_demand, bolt, layer)
+ AddComponent(/datum/component/plumbing/simple_demand, bolt, layer, distinct_reagent_cap = 5)
///For pouring reagents from ducts directly into cups
/obj/machinery/plumbing/output/tap
diff --git a/code/modules/plumbing/plumbers/synthesizer.dm b/code/modules/plumbing/plumbers/synthesizer.dm
index ed4121d6ad02..0d2877cca164 100644
--- a/code/modules/plumbing/plumbers/synthesizer.dm
+++ b/code/modules/plumbing/plumbers/synthesizer.dm
@@ -5,8 +5,8 @@
icon_state = "synthesizer"
icon = 'icons/obj/pipes_n_cables/hydrochem/plumbers.dmi'
- ///Amount we produce for every process. Ideally keep under 5 since thats currently the standard duct capacity
- var/amount = 1
+ ///Amount we produce for every process by default.
+ var/amount = 5
///I track them here because I have no idea how I'd make tgui loop like that
var/static/list/possible_amounts = list(0, 1, 2, 3, 4, 5)
///The reagent we are producing. We are a typepath, but are also typecast because there's several occations where we need to use initial.
diff --git a/code/modules/point/point.dm b/code/modules/point/point.dm
index adb539ad3b9c..e3ef14d2db9e 100644
--- a/code/modules/point/point.dm
+++ b/code/modules/point/point.dm
@@ -114,7 +114,7 @@
if(client) //Clientless mobs can just go ahead and point
if(ismovable(pointing_at))
var/atom/movable/pointed_movable = pointing_at
- if(pointed_movable.flags_1 & IS_ONTOP_1)
+ if(HAS_TRAIT(pointed_movable, TRAIT_SKIP_BASIC_REACH_CHECK) || pointing_at.loc.IsContainedAtomAccessible(pointing_at, src))
pointing_at = pointed_movable.loc
if(!(pointing_at in view(client.view, src)))
diff --git a/code/modules/power/apc/apc_main.dm b/code/modules/power/apc/apc_main.dm
index dbdf8325db43..8cf44a970ee6 100644
--- a/code/modules/power/apc/apc_main.dm
+++ b/code/modules/power/apc/apc_main.dm
@@ -173,36 +173,14 @@
//. += NAMEOF(src, locked)
return .
-/obj/machinery/power/apc/Initialize(mapload, ndir)
+/obj/machinery/power/apc/Initialize(mapload)
. = ..()
+
//APCs get added to their own processing tasks for the machines subsystem.
if (!(datum_flags & DF_ISPROCESSING))
datum_flags |= DF_ISPROCESSING
SSmachines.processing_apcs += src
- //Pixel offset its appearance based on its direction
- dir = ndir
- switch(dir)
- if(NORTH)
- offset_old = pixel_y
- pixel_y = APC_PIXEL_OFFSET
- if(SOUTH)
- offset_old = pixel_y
- pixel_y = -APC_PIXEL_OFFSET
- if(EAST)
- offset_old = pixel_x
- pixel_x = APC_PIXEL_OFFSET
- if(WEST)
- offset_old = pixel_x
- pixel_x = -APC_PIXEL_OFFSET
-
- var/image/hud_image = image(icon = 'icons/mob/huds/hud.dmi', icon_state = "apc_hacked")
- hud_image.pixel_w = pixel_x
- hud_image.pixel_z = pixel_y
- hud_list = list(
- MALF_APC_HUD = hud_image
- )
-
//Assign it to its area. If mappers already assigned an area string fast load the area from it else get the current area
var/area/our_area = get_area(loc)
if(areastring)
@@ -236,8 +214,10 @@
cell.charge = start_charge * cell.maxcharge / 100 // (convert percentage to actual value)
make_terminal()
///This is how we test to ensure that mappers use the directional subtypes of APCs, rather than use the parent and pixel-shift it themselves.
+ setDir(dir)
if(abs(offset_old) != APC_PIXEL_OFFSET)
log_mapping("APC: ([src]) at [AREACOORD(src)] with dir ([dir] | [uppertext(dir2text(dir))]) has pixel_[dir & (WEST|EAST) ? "x" : "y"] value [offset_old] - should be [dir & (SOUTH|EAST) ? "-" : ""][APC_PIXEL_OFFSET]. Use the directional/ helpers!")
+ find_and_mount_on_atom()
// For apcs created during the round players need to configure them from scratch
else
opened = APC_COVER_OPENED
@@ -261,7 +241,6 @@
AddElement(/datum/element/contextual_screentip_bare_hands, rmb_text = "Toggle interface lock")
AddElement(/datum/element/contextual_screentip_mob_typechecks, hovering_mob_typechecks)
- find_and_hang_on_wall()
/obj/machinery/power/apc/Destroy()
if(malfai)
@@ -277,6 +256,30 @@
disconnect_terminal()
return ..()
+/obj/machinery/power/apc/setDir(newdir)
+ . = ..()
+
+ switch(newdir)
+ if(NORTH)
+ offset_old = pixel_y
+ pixel_y = APC_PIXEL_OFFSET
+ if(SOUTH)
+ offset_old = pixel_y
+ pixel_y = -APC_PIXEL_OFFSET
+ if(EAST)
+ offset_old = pixel_x
+ pixel_x = APC_PIXEL_OFFSET
+ if(WEST)
+ offset_old = pixel_x
+ pixel_x = -APC_PIXEL_OFFSET
+
+ var/image/hud_image = image(icon = 'icons/mob/huds/hud.dmi', icon_state = "apc_hacked")
+ hud_image.pixel_w = pixel_x
+ hud_image.pixel_z = pixel_y
+ hud_list = list(
+ MALF_APC_HUD = hud_image
+ )
+
/obj/machinery/power/apc/on_saboteur(datum/source, disrupt_duration)
. = ..()
disrupt_duration *= 0.1 // so, turns out, failure timer is in seconds, not deciseconds; without this, disruptions last 10 times as long as they probably should
diff --git a/code/modules/power/apc/apc_malf.dm b/code/modules/power/apc/apc_malf.dm
index c4cafb9d5e77..eb0526e32ca1 100644
--- a/code/modules/power/apc/apc_malf.dm
+++ b/code/modules/power/apc/apc_malf.dm
@@ -45,8 +45,7 @@
malf.ShutOffDoomsdayDevice()
occupier = malf
if (isturf(malf.loc)) // create a deactivated AI core if the AI isn't coming from an emergency mech shunt
- malf.linked_core = new /obj/structure/ai_core/deactivated(malf.loc)
- malf.linked_core.remote_ai = malf // note that we do not set the deactivated core's core_mmi.brainmob
+ malf.create_core_link(new /obj/structure/ai_core(malf.loc, CORE_STATE_FINISHED, malf.make_mmi()))
malf.forceMove(src) // move INTO the APC, not to its tile
if(!findtext(occupier.name, "APC Copy"))
occupier.name = "[malf.name] APC Copy"
@@ -74,9 +73,7 @@
return
if(occupier.linked_core)
occupier.shunted = FALSE
- occupier.forceMove(occupier.linked_core.loc)
- qdel(occupier.linked_core)
- occupier.cancel_camera()
+ occupier.resolve_core_link()
occupier = null
else
stack_trace("An AI: [occupier] has vacated an APC with no linked core and without being gibbed.")
diff --git a/code/modules/power/apc/apc_tool_act.dm b/code/modules/power/apc/apc_tool_act.dm
index 71bd3f226d3a..f74860662bdc 100644
--- a/code/modules/power/apc/apc_tool_act.dm
+++ b/code/modules/power/apc/apc_tool_act.dm
@@ -407,7 +407,7 @@
return FALSE
/obj/machinery/power/apc/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, list/rcd_data)
- if(!(the_rcd.construction_upgrades & RCD_UPGRADE_SIMPLE_CIRCUITS) || rcd_data["[RCD_DESIGN_MODE]"] != RCD_WALLFRAME)
+ if(!(the_rcd.construction_upgrades & RCD_UPGRADE_SIMPLE_CIRCUITS) || rcd_data[RCD_DESIGN_MODE] != RCD_WALLFRAME)
return FALSE
if(!has_electronics)
diff --git a/code/modules/power/battery.dm b/code/modules/power/battery.dm
index 8a6be8d85aa5..3f0256129b3c 100644
--- a/code/modules/power/battery.dm
+++ b/code/modules/power/battery.dm
@@ -13,11 +13,13 @@
throw_speed = 2
throw_range = 2
custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*12, /datum/material/glass=SMALL_MATERIAL_AMOUNT*2)
- grind_results = list(/datum/reagent/lithium = 60, /datum/reagent/iron = 10, /datum/reagent/silicon = 10)
rating_base = STANDARD_BATTERY_CHARGE
maxcharge = STANDARD_BATTERY_CHARGE
chargerate = STANDARD_BATTERY_RATE
+/obj/item/stock_parts/power_store/battery/grind_results()
+ return list(/datum/reagent/lithium = 60, /datum/reagent/iron = 10, /datum/reagent/silicon = 10)
+
/obj/item/stock_parts/power_store/battery/empty
empty = TRUE
@@ -77,3 +79,14 @@
/obj/item/stock_parts/power_store/battery/crap/empty
empty = TRUE
+
+/obj/item/stock_parts/power_store/battery/infinite
+ name = "infinite-capacity megacell"
+ desc = "A transdimensional megacell with an inexhaustible capacity."
+ icon_state = "icellbig"
+ maxcharge = INFINITY
+ chargerate = INFINITY
+ ratingdesc = FALSE
+
+/obj/item/stock_parts/power_store/battery/infinite/use(used, force = FALSE)
+ return used
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 968db84a535a..2e878c0b556a 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -459,7 +459,6 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(
attack_verb_simple = list("whip", "lash", "discipline", "flog")
singular_name = "cable piece"
full_w_class = WEIGHT_CLASS_SMALL
- grind_results = list(/datum/reagent/copper = 2) //2 copper per cable in the coil
usesound = 'sound/items/deconstruct.ogg'
cost = 1
source = /datum/robot_energy_storage/wire
@@ -476,6 +475,9 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(
update_appearance()
+/obj/item/stack/cable_coil/grind_results()
+ return list(/datum/reagent/copper = 2)
+
/obj/item/stack/cable_coil/examine(mob/user)
. = ..()
. += "Use it in hand to change the layer you are placing on, amongst other things."
@@ -603,7 +605,7 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(
/obj/item/stack/cable_coil/proc/try_heal_loop(atom/interacting_with, mob/living/user, repeating = FALSE)
var/mob/living/carbon/human/attacked_humanoid = interacting_with
var/obj/item/clothing/under/uniform = attacked_humanoid.w_uniform
- if(uniform?.repair_sensors(src, user))
+ if(uniform?.repair_sensors(user))
return ITEM_INTERACT_SUCCESS
var/obj/item/bodypart/affecting = attacked_humanoid.get_bodypart(check_zone(user.zone_selected))
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 78f297793af5..59e0215cf524 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -19,7 +19,6 @@
emp_damage_modifier = 1
w_class = WEIGHT_CLASS_SMALL
custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*7, /datum/material/glass=SMALL_MATERIAL_AMOUNT*0.5)
- grind_results = list(/datum/reagent/lithium = 15, /datum/reagent/iron = 5, /datum/reagent/silicon = 5)
/obj/item/stock_parts/power_store/cell/Initialize(mapload)
. = ..()
@@ -31,7 +30,11 @@
/datum/element/slapcrafting,\
slapcraft_recipes = slapcraft_recipe_list,\
)
- */
+ */
+
+/obj/item/stock_parts/power_store/cell/grind_results()
+ return list(/datum/reagent/lithium = 15, /datum/reagent/iron = 5, /datum/reagent/silicon = 5)
+
/* Cell variants*/
/obj/item/stock_parts/power_store/cell/empty
empty = TRUE
@@ -98,6 +101,10 @@
name = "pulse pistol power cell"
maxcharge = STANDARD_CELL_CHARGE * 2
+/obj/item/stock_parts/power_store/cell/laser_pistol
+ name = "laser pistol power cell"
+ chargerate = STANDARD_CELL_RATE * 0.15
+
/obj/item/stock_parts/power_store/cell/ninja
name = "black power cell"
icon_state = "bscell"
@@ -162,7 +169,7 @@
ratingdesc = FALSE
/obj/item/stock_parts/power_store/cell/infinite/use(used, force = FALSE)
- return TRUE
+ return used
/obj/item/stock_parts/power_store/cell/infinite/abductor
name = "void core"
@@ -242,7 +249,9 @@
charge_light_type = null
connector_type = "crystal"
custom_materials = null
- grind_results = null
+
+/obj/item/stock_parts/power_store/cell/crystal_cell/grind_results()
+ return null
/obj/item/stock_parts/power_store/cell/ethereal
name = "ahelp it"
@@ -253,8 +262,11 @@
charge_light_type = null
connector_type = null
custom_materials = null
- grind_results = null
emp_damage_modifier = 0
+ abstract_type = /obj/item/stock_parts/power_store/cell/ethereal
+
+/obj/item/stock_parts/power_store/cell/ethereal/grind_results()
+ return null
/obj/item/stock_parts/power_store/cell/ethereal/examine(mob/user)
. = ..()
diff --git a/code/modules/power/floodlight.dm b/code/modules/power/floodlight.dm
index 925641e8a50e..d22bd345b258 100644
--- a/code/modules/power/floodlight.dm
+++ b/code/modules/power/floodlight.dm
@@ -11,7 +11,7 @@
icon = 'modular_darkpack/master_files/icons/obj/lighting.dmi' // DARKPACK EDIT CHANGE
icon_state = "floodlight_c1"
density = TRUE
-
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5)
var/state = FLOODLIGHT_NEEDS_WIRES
/obj/structure/floodlight_frame/Initialize(mapload)
@@ -155,6 +155,9 @@
. = ..()
RegisterSignal(src, COMSIG_OBJ_PAINTED, TYPE_PROC_REF(/obj/machinery/power/floodlight, on_color_change)) //update light color when color changes
register_context()
+ if(mapload)
+ set_anchored(TRUE)
+ connect_to_network()
/obj/machinery/power/floodlight/proc/on_color_change(obj/machinery/power/flood_light, mob/user, obj/item/toy/crayon/spraycan/spraycan, is_dark_color)
SIGNAL_HANDLER
diff --git a/code/modules/power/lighting/light.dm b/code/modules/power/lighting/light.dm
index 0f0dc9c09a45..2396d8252b5f 100644
--- a/code/modules/power/lighting/light.dm
+++ b/code/modules/power/lighting/light.dm
@@ -82,11 +82,6 @@
///break if moved, if false also makes it ignore if the wall its on breaks
var/break_if_moved = TRUE
-/obj/machinery/light/Move()
- if(status != LIGHT_BROKEN && break_if_moved)
- break_light_tube(TRUE)
- return ..()
-
// create a new lighting fixture
/obj/machinery/light/Initialize(mapload)
. = ..()
@@ -118,18 +113,25 @@
RegisterSignal(src, COMSIG_LIGHT_EATER_ACT, PROC_REF(on_light_eater))
AddElement(/datum/element/atmos_sensitive, mapload)
AddElement(/datum/element/contextual_screentip_bare_hands, rmb_text = "Remove bulb")
+ if(mapload)
+ find_and_mount_on_atom(mark_for_late_init = TRUE)
+
+/obj/machinery/light/get_turfs_to_mount_on()
+ return list(get_step(src, dir))
+
+/obj/machinery/light/find_and_mount_on_atom(mark_for_late_init, late_init)
if(break_if_moved)
- find_and_hang_on_wall(custom_drop_callback = CALLBACK(src, PROC_REF(knock_down)))
+ return ..()
/obj/machinery/light/post_machine_initialize()
. = ..()
#ifndef MAP_TEST
switch(fitting)
if("tube")
- if(prob(2))
+ if(prob(1)) // DARKPACK EDIT CHANGE
break_light_tube(TRUE)
if("bulb")
- if(prob(5))
+ if(prob(2)) // DARKPACK EDIT CHANGE
break_light_tube(TRUE)
#endif
update(trigger = FALSE)
@@ -141,6 +143,16 @@
QDEL_NULL(cell)
return ..()
+/obj/machinery/light/Move()
+ if(status != LIGHT_BROKEN && break_if_moved)
+ break_light_tube(TRUE)
+ return ..()
+
+/obj/machinery/light/Exited(atom/movable/gone, direction)
+ . = ..()
+ if(gone == cell)
+ cell = null
+
/obj/machinery/light/setDir(newdir)
. = ..()
set_light(l_dir = REVERSE_DIR(dir))
@@ -171,7 +183,7 @@
icon_state = "[base_state]-broken"
return ..()
-/* DARKPACK EDIT REMOVAL - Temp removal because flav is a hack and did not do this properly.
+/* // DARKPACK EDIT REMOVAL - Temp removal because flav is a hack and did not do this properly.
/obj/machinery/light/update_overlays()
. = ..()
if(!on || status != LIGHT_OK)
@@ -409,34 +421,28 @@
electrocute_mob(user, get_area(src), src, (rand(7,10) * 0.1), TRUE)
/obj/machinery/light/on_deconstruction(disassembled)
- var/obj/structure/light_construct/new_light = null
- var/current_stage = 2
- if(!disassembled)
- current_stage = 1
+ var/atom/drop_point = drop_location()
+
+ var/obj/item/wallframe/light_fixture/frame = null
switch(fitting)
if("tube")
- new_light = new /obj/structure/light_construct(loc)
- new_light.icon_state = "tube-construct-stage[current_stage]"
-
+ frame = new /obj/item/wallframe/light_fixture(drop_point)
if("bulb")
- new_light = new /obj/structure/light_construct/small(loc)
- new_light.icon_state = "bulb-construct-stage[current_stage]"
- new_light.setDir(dir)
- new_light.stage = current_stage
+ frame = new /obj/item/wallframe/light_fixture/small(drop_point)
+ if("floor bulb")
+ frame = new /obj/item/wallframe/light_fixture/small(drop_point)
if(!disassembled)
- new_light.take_damage(new_light.max_integrity * 0.5, sound_effect=FALSE)
+ frame.take_damage(frame.max_integrity * 0.5, sound_effect = FALSE)
if(status != LIGHT_BROKEN)
break_light_tube()
if(status != LIGHT_EMPTY)
drop_light_tube()
new /obj/item/stack/cable_coil(loc, 1, "red")
- transfer_fingerprints_to(new_light)
+ transfer_fingerprints_to(frame)
var/obj/item/stock_parts/power_store/real_cell = get_cell()
if(!QDELETED(real_cell))
- new_light.cell = real_cell
- real_cell.forceMove(new_light)
- cell = null
+ real_cell.forceMove(drop_point)
/obj/machinery/light/attacked_by(obj/item/attacking_object, mob/living/user, list/modifiers, list/attack_modifiers)
. = ..()
@@ -718,23 +724,6 @@
continue
INVOKE_ASYNC(src, PROC_REF(flicker))
-/**
- * All the effects that occur when a light falls off a wall that it was hung onto.
- */
-/obj/machinery/light/proc/knock_down()
- if (fitting == "bulb")
- new /obj/item/wallframe/light_fixture/small(drop_location())
- else
- new /obj/item/wallframe/light_fixture(drop_location())
- new /obj/item/stack/cable_coil(drop_location(), 1, "red")
- if(status != LIGHT_BROKEN)
- break_light_tube(FALSE)
- if(status != LIGHT_EMPTY)
- drop_light_tube()
- if(cell)
- cell.forceMove(drop_location())
- qdel(src)
-
/obj/machinery/light/floor
name = "floor light"
desc = "A lightbulb you can walk on without breaking it, amazing."
@@ -746,10 +735,24 @@
layer = BELOW_CATWALK_LAYER
plane = FLOOR_PLANE
light_type = /obj/item/light/bulb
- fitting = "bulb"
+ fitting = "floor bulb"
nightshift_brightness = 4
fire_brightness = 4.5
+/obj/machinery/light/floor/get_turfs_to_mount_on()
+ return list(get_turf(src))
+
+/obj/machinery/light/floor/is_mountable_turf(turf/target)
+ return !isgroundlessturf(target)
+
+/obj/machinery/light/floor/get_moutable_objects()
+ var/static/list/attachables = list(
+ /obj/structure/thermoplastic,
+ /obj/structure/lattice/catwalk,
+ )
+
+ return attachables
+
/obj/machinery/light/floor/get_light_offset()
return list(0, 0)
@@ -757,6 +760,15 @@
status = LIGHT_BROKEN
icon_state = "floor-broken"
+/obj/machinery/light/floor/burned
+ status = LIGHT_BURNED
+ icon_state = "floor-burned"
+
+/obj/machinery/light/floor/empty
+ icon_state = "floor-empty"
+ start_with_cell = FALSE
+ status = LIGHT_EMPTY
+
/obj/machinery/light/floor/transport
name = "transport light"
break_if_moved = FALSE
diff --git a/code/modules/power/lighting/light_construct.dm b/code/modules/power/lighting/light_construct.dm
index a8c51e8a0b4b..8676097db165 100644
--- a/code/modules/power/lighting/light_construct.dm
+++ b/code/modules/power/lighting/light_construct.dm
@@ -28,16 +28,21 @@
fire = 80
acid = 50
-/obj/structure/light_construct/Initialize(mapload, ndir, building)
+/obj/structure/light_construct/Initialize(mapload)
. = ..()
- if(building)
- setDir(ndir)
- find_and_hang_on_wall()
+ if(mapload && !find_and_mount_on_atom(mark_for_late_init = TRUE))
+ return INITIALIZE_HINT_LATELOAD
+
+/obj/structure/light_construct/LateInitialize()
+ find_and_mount_on_atom(late_init = TRUE)
/obj/structure/light_construct/Destroy()
QDEL_NULL(cell)
return ..()
+/obj/structure/light_construct/get_turfs_to_mount_on()
+ return list(get_step(src, dir))
+
/obj/structure/light_construct/get_cell()
return cell
@@ -107,11 +112,9 @@
return
to_chat(user, span_notice("You begin deconstructing [src]..."))
if (tool.use_tool(src, user, 30, volume=50))
- new /obj/item/stack/sheet/iron(drop_location(), sheets_refunded)
user.visible_message(span_notice("[user.name] deconstructs [src]."), \
span_notice("You deconstruct [src]."), span_hear("You hear a ratchet."))
playsound(src, 'sound/items/deconstruct.ogg', 75, TRUE)
- qdel(src)
return
if(istype(tool, /obj/item/stack/cable_coil))
@@ -144,10 +147,16 @@
tool.play_tool_sound(src, 75)
switch(fixture_type)
if("tube")
- new_light = new /obj/machinery/light/built(loc)
+ new_light = new /obj/machinery/light/empty(loc)
if("bulb")
- new_light = new /obj/machinery/light/small/built(loc)
+ new_light = new /obj/machinery/light/small/empty(loc)
+ if("floor")
+ new_light = new /obj/machinery/light/floor/empty(loc)
new_light.setDir(dir)
+ var/atom/support = get_step(src, dir)
+ if(!isclosedturf(support))
+ support = locate(/obj/structure/window) in support
+ new_light.AddComponent(/datum/component/atom_mounted, support)
transfer_fingerprints_to(new_light)
if(!QDELETED(cell))
new_light.cell = cell
@@ -159,13 +168,21 @@
/obj/structure/light_construct/blob_act(obj/structure/blob/attacking_blob)
if(attacking_blob && attacking_blob.loc == loc)
- qdel(src)
+ deconstruct(FALSE)
-/obj/structure/light_construct/atom_deconstruct(disassembled = TRUE)
+/obj/structure/light_construct/atom_deconstruct(disassembled)
new /obj/item/stack/sheet/iron(loc, sheets_refunded)
+ if(stage == LIGHT_CONSTRUCT_WIRED)
+ new /obj/item/stack/cable_coil(drop_location(), 1, "red")
/obj/structure/light_construct/small
name = "small light fixture frame"
icon_state = "bulb-construct-stage1"
fixture_type = "bulb"
sheets_refunded = 1
+
+/obj/structure/light_construct/floor
+ name = "floor light fixture frame"
+ icon_state = "floor-construct-stage1"
+ fixture_type = "floor"
+ sheets_refunded = 1
diff --git a/code/modules/power/lighting/light_items.dm b/code/modules/power/lighting/light_items.dm
index 3a72d0c34da5..27797c7c5268 100644
--- a/code/modules/power/lighting/light_items.dm
+++ b/code/modules/power/lighting/light_items.dm
@@ -9,7 +9,6 @@
throwforce = 5
w_class = WEIGHT_CLASS_TINY
custom_materials = list(/datum/material/glass=SMALL_MATERIAL_AMOUNT)
- grind_results = list(/datum/reagent/silicon = 5, /datum/reagent/nitrogen = 10) //Nitrogen is used as a cheaper alternative to argon in incandescent lighbulbs
///How much light it gives off
var/brightness = 2
///LIGHT_OK, LIGHT_BURNED or LIGHT_BROKEN
@@ -31,6 +30,9 @@
AddElement(/datum/element/update_icon_updates_onmob)
AddComponent(/datum/component/golem_food, golem_food_key = /obj/item/light, extra_validation = CALLBACK(src, PROC_REF(is_intact)))
+/obj/item/light/grind_results()
+ return list(/datum/reagent/silicon = 5, /datum/reagent/nitrogen = 10)
+
/obj/item/light/attackby(obj/item/attacking_item, mob/user, list/modifiers, list/attack_modifiers)
. = ..()
diff --git a/code/modules/power/lighting/light_mapping_helpers.dm b/code/modules/power/lighting/light_mapping_helpers.dm
index 94b9514318fd..e14c110c39f0 100644
--- a/code/modules/power/lighting/light_mapping_helpers.dm
+++ b/code/modules/power/lighting/light_mapping_helpers.dm
@@ -2,7 +2,11 @@
status = LIGHT_BROKEN
icon_state = "tube-broken"
-/obj/machinery/light/built
+/obj/machinery/light/burned
+ status = LIGHT_BURNED
+ icon_state = "tube-burned"
+
+/obj/machinery/light/empty
icon_state = "tube-empty"
start_with_cell = FALSE
status = LIGHT_EMPTY
@@ -68,7 +72,11 @@
status = LIGHT_BROKEN
icon_state = "bulb-broken"
-/obj/machinery/light/small/built
+/obj/machinery/light/small/burned
+ status = LIGHT_BURNED
+ icon_state = "bulb-burned"
+
+/obj/machinery/light/small/empty
icon_state = "bulb-empty"
start_with_cell = FALSE
status = LIGHT_EMPTY
@@ -94,8 +102,9 @@
fire_brightness = 4.5
fire_colour = "#d400ff"
-// DARKPACK EDIT START
+// DARKPACK EDIT CHANGE START
/obj/machinery/light/prince
+ icon_state = "prince"
base_state = "prince"
/obj/machinery/light/prince/ghost
@@ -118,7 +127,7 @@
/obj/machinery/light/prince/broken
status = LIGHT_BROKEN
- icon_state = "tube-broken"
+ icon_state = "prince-broken"
#define LIGHTING_DIRECTIONAL_HELPERS(path) \
MAPPING_DIRECTIONAL_HELPERS(##path, 0) \
@@ -137,11 +146,14 @@ LIGHTING_DIRECTIONAL_HELPERS(/obj/machinery/light)
// ---- Broken tube
LIGHTING_DIRECTIONAL_HELPERS(/obj/machinery/light/broken)
+// ---- Burned tube
+LIGHTING_DIRECTIONAL_HELPERS(/obj/machinery/light/burned)
+
// ---- Tube construct
LIGHTING_DIRECTIONAL_HELPERS(/obj/structure/light_construct)
// ---- Tube frames
-LIGHTING_DIRECTIONAL_HELPERS(/obj/machinery/light/built)
+LIGHTING_DIRECTIONAL_HELPERS(/obj/machinery/light/empty)
// ---- No nightlight tubes
LIGHTING_DIRECTIONAL_HELPERS(/obj/machinery/light/no_nightlight)
@@ -184,11 +196,14 @@ LIGHTING_DIRECTIONAL_HELPERS(/obj/machinery/light/small)
LIGHTING_DIRECTIONAL_HELPERS(/obj/structure/light_construct/small)
// ---- Bulb frames
-LIGHTING_DIRECTIONAL_HELPERS(/obj/machinery/light/small/built)
+LIGHTING_DIRECTIONAL_HELPERS(/obj/machinery/light/small/empty)
// ---- Broken bulbs
LIGHTING_DIRECTIONAL_HELPERS(/obj/machinery/light/small/broken)
+// ---- Burned bulb
+LIGHTING_DIRECTIONAL_HELPERS(/obj/machinery/light/small/burned)
+
// ---- Red bulbs
LIGHTING_DIRECTIONAL_HELPERS(/obj/machinery/light/small/dim)
@@ -200,7 +215,10 @@ LIGHTING_DIRECTIONAL_HELPERS(/obj/machinery/light/small/red/dim)
// ---- Blacklight bulbs
LIGHTING_DIRECTIONAL_HELPERS(/obj/machinery/light/small/blacklight)
-LIGHTING_DIRECTIONAL_HELPERS(/obj/machinery/light/prince) // DARKPACK EDIT ADD
+LIGHTING_DIRECTIONAL_HELPERS(/obj/machinery/light/prince)
+
+LIGHTING_DIRECTIONAL_HELPERS(/obj/machinery/light/prince/broken)
+LIGHTING_DIRECTIONAL_HELPERS(/obj/machinery/light/prince/ghost)
#undef LIGHTING_DIRECTIONAL_HELPERS
-// DARKPACK EDIT END
+// DARKPACK EDIT CHANGE END
diff --git a/code/modules/power/lighting/light_wallframes.dm b/code/modules/power/lighting/light_wallframes.dm
index a649519f0ed0..dda16838704a 100644
--- a/code/modules/power/lighting/light_wallframes.dm
+++ b/code/modules/power/lighting/light_wallframes.dm
@@ -6,6 +6,16 @@
result_path = /obj/structure/light_construct
wall_external = TRUE
+/obj/item/wallframe/light_fixture/find_support_structure(atom/structure)
+ return istype(structure, /obj/structure/window) ? structure : ..()
+
+/obj/item/wallframe/light_fixture/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/item/wallframe/light_fixture/small
name = "small light fixture frame"
icon_state = "bulb-construct-item"
@@ -20,3 +30,35 @@
to_chat(user, span_warning("You cannot place [src] in this area!"))
return
return TRUE
+
+/obj/item/wallframe/light_fixture/small/attack_self(mob/user)
+ var/turf/local_turf = get_turf(user)
+ var/area/local_area = get_area(user)
+ if(!isturf(user.loc) || !isfloorturf(local_turf))
+ balloon_alert(user, "cannot place here!")
+ return
+ if(local_area.always_unpowered || !local_area.static_lighting)
+ balloon_alert(user, "cannot place in this area!")
+ return
+ for(var/obj/object in local_turf)
+ if(object.density && !(object.obj_flags & IGNORE_DENSITY) || object.obj_flags & BLOCKS_CONSTRUCTION)
+ balloon_alert(user, "something is in the way!")
+ return
+ if(local_turf.underfloor_accessibility < UNDERFLOOR_INTERACTABLE)
+ balloon_alert(user, "remove the floor plating!")
+ return
+ if(locate(/obj/structure/light_construct/floor) in local_turf)
+ balloon_alert(user, "already has a light!")
+ return
+ if(locate(/obj/machinery/light/floor) in local_turf)
+ balloon_alert(user, "already has a light!")
+ return
+
+ playsound(src.loc, 'sound/machines/click.ogg', 75, TRUE)
+ user.visible_message(span_notice("[user.name] attaches [src] to the floor."),
+ span_notice("You attach [src] to the floor."),
+ span_hear("You hear clicking."))
+
+ new /obj/structure/light_construct/floor(local_turf)
+ qdel(src)
+
diff --git a/code/modules/power/pipecleaners.dm b/code/modules/power/pipecleaners.dm
index 9297140b7b84..d6b6f0dbc2b6 100644
--- a/code/modules/power/pipecleaners.dm
+++ b/code/modules/power/pipecleaners.dm
@@ -201,7 +201,6 @@ By design, d1 is the smallest direction and d2 is the highest
attack_verb_simple = list("whip", "lash", "discipline", "flog")
singular_name = "pipe cleaner piece"
full_w_class = WEIGHT_CLASS_SMALL
- grind_results = list(/datum/reagent/copper = 2) //2 copper per pipe_cleaner in the coil
usesound = 'sound/items/deconstruct.ogg'
cost = 1
source = /datum/robot_energy_storage/pipe_cleaner
@@ -209,6 +208,9 @@ By design, d1 is the smallest direction and d2 is the highest
///For updating inhand icons.
var/pipecleaner_color = CABLE_COLOR_RED
+/obj/item/stack/pipe_cleaner_coil/grind_results()
+ return list(/datum/reagent/copper = 2)
+
/obj/item/stack/pipe_cleaner_coil/cyborg/attack_self(mob/user)
var/list/pipe_cleaner_colors = GLOB.cable_colors
var/list/possible_colors = list()
diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm
index fba78f4559be..82ea13b43097 100644
--- a/code/modules/power/power.dm
+++ b/code/modules/power/power.dm
@@ -177,7 +177,7 @@
if((amount > grid_used) && !ignore_apc && !QDELETED(local_apc.cell)) // Use from the APC's cell if there isn't enough energy from the grid.
apc_used = local_apc.cell.use(amount - grid_used, force = force)
- if(!force && (amount < grid_used + apc_used)) // If we aren't forcing it and there isn't enough energy to supply demand, return nothing.
+ if(!force && (amount > grid_used + apc_used)) // If we aren't forcing it and there isn't enough energy to supply demand, return nothing.
return FALSE
// Use the grid's and APC's energy.
diff --git a/code/modules/power/power_store.dm b/code/modules/power/power_store.dm
index 7e4852f84598..dee7151f523e 100644
--- a/code/modules/power/power_store.dm
+++ b/code/modules/power/power_store.dm
@@ -52,10 +52,8 @@
if (override_maxcharge)
maxcharge = override_maxcharge
rating = max(round(maxcharge / (rating_base * 10), 1), 1)
- if(!charge)
+ if(!empty && !charge)
charge = maxcharge
- if(empty)
- charge = 0
if(ratingdesc)
desc += " This one has a rating of [display_energy(maxcharge)][prob(10) ? ", and you should not swallow it" : ""]." //joke works better if it's not on every cell
update_appearance()
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 4aa0e5a867ac..1c1c45fe59a2 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -77,7 +77,7 @@
sparks = new
sparks.attach(src)
sparks.set_up(5, TRUE, src)
- AddComponent(/datum/component/simple_rotation)
+ AddElement(/datum/element/simple_rotation)
AddElement(/datum/element/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES)
/obj/machinery/power/emitter/welded/Initialize(mapload)
@@ -146,14 +146,24 @@
QDEL_NULL(sparks)
return ..()
+/obj/machinery/power/emitter/update_overlays()
+ . = ..()
+ if(!active)
+ return
+ var/laser_color = COLOR_VIBRANT_LIME
+ if (!powered)
+ laser_color = COLOR_ORANGE //stank low power orange
+ else if (diskie)
+ laser_color = diskie.laser_color
+ var/mutable_appearance/overlay = mutable_appearance(icon, "emitter_overlay")
+ overlay.color = laser_color
+ . += overlay
+
/obj/machinery/power/emitter/update_icon_state()
- if(!active || !powernet)
- icon_state = base_icon_state
- return ..()
if(panel_open)
icon_state = "[base_icon_state]_open"
- return ..()
- icon_state = avail(active_power_usage) ? icon_state_on : icon_state_underpowered
+ else
+ icon_state = base_icon_state
return ..()
/obj/machinery/power/emitter/interact(mob/user)
@@ -373,6 +383,7 @@
no_shot_counter = diskie.no_shot_counter
playsound(src, 'sound/machines/card_slide.ogg', 50)
to_chat(user, span_notice("You update the [src]'s diode configuration with the [config_disk]."))
+ update_appearance()
if(diskie.consumable)
qdel(diskie)
return ..()
@@ -410,6 +421,7 @@
user.put_in_hands(diskie)
diskie = null
playsound(src, 'sound/machines/card_slide.ogg', 50, TRUE)
+ update_appearance()
set_projectile()
return TRUE
@@ -618,6 +630,7 @@
desc = "This disk can be used on an emitter with an open panel to reset its projectile. Unless this was handed to you by an admin, you should report this on github."
icon = 'icons/obj/devices/circuitry_n_data.dmi'
icon_state = "datadisk6"
+ var/laser_color = COLOR_VIBRANT_LIME
var/stored_proj = /obj/projectile/beam/emitter/hitscan
var/stored_sound = 'sound/items/weapons/emitter.ogg'
var/consumed_on_removal = TRUE
@@ -631,6 +644,7 @@
stored_proj = /obj/projectile/beam/emitter/hitscan/bluelens
consumed_on_removal = FALSE
consumable = FALSE
+ laser_color = COLOR_TRUE_BLUE
/obj/item/emitter_disk/healing
name = "\improper Diode Disk: Bioregenerative"
@@ -638,6 +652,7 @@
stored_proj = /obj/projectile/beam/emitter/hitscan/bioregen
consumed_on_removal = FALSE
consumable = FALSE
+ laser_color = COLOR_YELLOW
/obj/item/emitter_disk/incendiary
name = "\improper Diode Disk: Conflagratory"
@@ -645,6 +660,8 @@
stored_proj = /obj/projectile/beam/emitter/hitscan/incend
consumed_on_removal = FALSE
consumable = FALSE
+ laser_color = COLOR_RED_LIGHT
+
/obj/item/emitter_disk/sanity
name = "\improper Diode Disk: Psychosiphoning"
@@ -652,6 +669,8 @@
stored_proj = /obj/projectile/beam/emitter/hitscan/psy
consumed_on_removal = FALSE
consumable = FALSE
+ laser_color = COLOR_TONGUE_PINK
+
/obj/item/emitter_disk/magnetic
name = "\improper Diode Disk: Magnetogenerative"
@@ -659,6 +678,7 @@
stored_proj = /obj/projectile/beam/emitter/hitscan/magnetic
consumed_on_removal = FALSE
consumable = FALSE
+ laser_color = COLOR_SILVER
/obj/item/emitter_disk/blast
name = "\improper Diode Disk: Hyperconcussive"
@@ -666,4 +686,5 @@
stored_proj = /obj/projectile/beam/emitter/hitscan/blast
consumed_on_removal = FALSE
consumable = FALSE
+ laser_color = COLOR_SYNDIE_RED //magnetic is already grey
fire_rate_mod = 2
diff --git a/code/modules/power/smes_portable.dm b/code/modules/power/smes_portable.dm
index a416a946e2ce..27439e1a25ad 100644
--- a/code/modules/power/smes_portable.dm
+++ b/code/modules/power/smes_portable.dm
@@ -56,7 +56,12 @@
return ITEM_INTERACT_BLOCKING
return ..()
-/// checks if the connector is free; if not, alerts a user and returns FALSE
+/**
+ * Checks if the connector is free
+ * Arguments
+ *
+ * * mob/living/user - the player doing the checking
+ */
/obj/machinery/power/smes/connector/proc/connector_free(mob/living/user)
PRIVATE_PROC(TRUE)
@@ -86,15 +91,19 @@
total_capacity = 1
for(var/obj/item/stock_parts/power_store/power_cell in component_parts)
component_parts -= power_cell
+ SStgui.close_uis(src)
update_appearance(UPDATE_OVERLAYS)
-/obj/machinery/power/smes/connector/ui_act(action, params)
- // prevent UI interactions if there's no SMES
+/obj/machinery/power/smes/connector/ui_interact(mob/user, datum/tgui/ui)
if(!connected_smes)
- balloon_alert(usr, "needs a connected SMES!")
+ balloon_alert(user, "no power bank!")
return FALSE
+
return ..()
+/obj/machinery/power/smes/connector/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+ return connected_smes ? ..() : FALSE
+
/// The actual portable part of the portable SMES system. Pretty useless without an actual connector.
/obj/machinery/smesbank
name = "portable power storage unit"
@@ -195,7 +204,6 @@
// adapted from portable atmos connection code
/obj/machinery/smesbank/wrench_act(mob/living/user, obj/item/wrench)
if(connected_port)
- wrench.play_tool_sound(src)
if(!wrench.use_tool(src, user, 8 SECONDS))
return ITEM_INTERACT_BLOCKING
user.visible_message( \
@@ -208,14 +216,9 @@
return ITEM_INTERACT_SUCCESS
var/obj/machinery/power/smes/connector/possible_connector = locate(/obj/machinery/power/smes/connector) in loc
- if(!possible_connector)
- to_chat(user, span_notice("There's no power connector to connect to."))
- return ITEM_INTERACT_BLOCKING
- wrench.play_tool_sound(src)
- if(!wrench.use_tool(src, user, 4 SECONDS))
+ if(!wrench.use_tool(src, user, 4 SECONDS, extra_checks = CALLBACK(src, PROC_REF(connect_port), possible_connector, user, TRUE)))
return ITEM_INTERACT_BLOCKING
- if(!connect_port(possible_connector))
- to_chat(user, span_notice("[src] failed to connect to [possible_connector]."))
+ if(!connect_port(possible_connector, user))
return ITEM_INTERACT_BLOCKING
user.visible_message( \
"[user] connects [src].", \
@@ -231,30 +234,39 @@
update_appearance(UPDATE_OVERLAYS)
return ITEM_INTERACT_SUCCESS
-/obj/machinery/smesbank/default_deconstruction_crowbar(obj/item/crowbar/crowbar)
- if(istype(crowbar) && connected_port)
- balloon_alert(usr, "disconnect from [connected_port] first!")
+/obj/machinery/smesbank/crowbar_act(mob/living/user, obj/item/tool)
+ if(connected_port)
+ balloon_alert(user, "disconnect from [connected_port] first!")
return ITEM_INTERACT_FAILURE
- return ..()
+
+ if(default_deconstruction_crowbar(tool))
+ return ITEM_INTERACT_SUCCESS
/**
* Attempt to connect the portable SMES to a given connector. Adapted from portable atmos connection code.
*
* Arguments
* * obj/machinery/power/smes/connector/possible_connector - the connector we are trying to link with
+ * * mob/living/user - the mob trying to connect the port
+ * * check_only - don't connect but check if we can
*/
-/obj/machinery/smesbank/proc/connect_port(obj/machinery/power/smes/connector/possible_connector)
+/obj/machinery/smesbank/proc/connect_port(obj/machinery/power/smes/connector/possible_connector, mob/living/user, check_only = FALSE)
PRIVATE_PROC(TRUE)
- //Make sure not already connected to something else
- if(connected_port || !possible_connector || possible_connector.connected_smes || possible_connector.panel_open)
+ if(QDELETED(possible_connector))
+ if(user)
+ balloon_alert(user, "no connector!")
return FALSE
- //Make sure are close enough for a valid connection
- if(possible_connector.loc != get_turf(src))
+ //Make sure not already connected to something else
+ if(possible_connector.panel_open)
+ if(user)
+ balloon_alert(user, "close connector panel!")
return FALSE
//Perform the connection
+ if(check_only)
+ return TRUE
connected_port = possible_connector
connected_port.connect_smes(src)
set_anchored(TRUE)
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index db5c1d0ac584..ce521b097524 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -1100,6 +1100,54 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
SIGNAL_HANDLER
examine_list += span_info("There's a santa hat placed atop it. How it got there without being dusted is a mystery.")
+// Warp Effect //
+
+/atom/movable/warp_effect
+ plane = DISPLACEMENT_PLANE
+ appearance_flags = PIXEL_SCALE|LONG_GLIDE // no tile bound so you can see it around corners and so
+ icon = 'icons/effects/light_overlays/light_352.dmi'
+ icon_state = "light"
+ pixel_x = -176
+ pixel_y = -176
+
+/atom/movable/warp_effect/Initialize(mapload)
+ . = ..()
+ var/turf/new_turf = get_turf(src)
+ if(new_turf)
+ var/new_offset = GET_TURF_PLANE_OFFSET(new_turf)
+ ADD_TRAIT(GLOB, TRAIT_DISTORTION_IN_USE(new_offset), ref(src))
+
+/atom/movable/warp_effect/Destroy(force)
+ // Just in case I've forgotten how the movement api works
+ var/offset = GET_TURF_PLANE_OFFSET(loc)
+ REMOVE_TRAIT(GLOB, TRAIT_DISTORTION_IN_USE(offset), ref(src))
+ return ..()
+
+/atom/movable/warp_effect/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change)
+ . = ..()
+ var/turf/new_turf = get_turf(src)
+ var/turf/old_turf = get_turf(old_loc)
+ if(!new_turf)
+ var/old_offset = GET_TURF_PLANE_OFFSET(old_turf)
+ REMOVE_TRAIT(GLOB, TRAIT_DISTORTION_IN_USE(old_offset), ref(src))
+ return
+ else if(get_turf(old_loc))
+ return
+ // If we're in a thing on a turf we COUNT as a distortion source
+ var/new_offset = GET_TURF_PLANE_OFFSET(new_turf)
+ ADD_TRAIT(GLOB, TRAIT_DISTORTION_IN_USE(new_offset), ref(src))
+
+/atom/movable/warp_effect/on_changed_z_level(turf/old_turf, turf/new_turf, same_z_layer, notify_contents)
+ . = ..()
+ if(same_z_layer)
+ return
+ if(old_turf)
+ var/old_offset = GET_TURF_PLANE_OFFSET(old_turf)
+ REMOVE_TRAIT(GLOB, TRAIT_DISTORTION_IN_USE(old_offset), ref(src))
+ if(new_turf)
+ var/new_offset = GET_TURF_PLANE_OFFSET(new_turf)
+ ADD_TRAIT(GLOB, TRAIT_DISTORTION_IN_USE(new_offset), ref(src))
+
#undef BIKE
#undef COIL
#undef ROD
diff --git a/code/modules/power/supermatter/supermatter_delamination/cascade_delam_objects.dm b/code/modules/power/supermatter/supermatter_delamination/cascade_delam_objects.dm
index 3cb6c8fd82c3..b883e051a044 100644
--- a/code/modules/power/supermatter/supermatter_delamination/cascade_delam_objects.dm
+++ b/code/modules/power/supermatter/supermatter_delamination/cascade_delam_objects.dm
@@ -168,7 +168,7 @@
investigate_log("was entered by [key_name(consumed_mob)].", INVESTIGATE_ENGINE)
consumed_mob.forceMove(arrival_turf)
consumed_mob.Paralyze(100)
- consumed_mob.adjustBruteLoss(30)
+ consumed_mob.adjust_brute_loss(30)
consumed_mob.flash_act(1, TRUE, TRUE)
new /obj/effect/particle_effect/sparks(consumed_object)
diff --git a/code/modules/power/supermatter/supermatter_variants.dm b/code/modules/power/supermatter/supermatter_variants.dm
index 270994d0a101..146c5b345457 100644
--- a/code/modules/power/supermatter/supermatter_variants.dm
+++ b/code/modules/power/supermatter/supermatter_variants.dm
@@ -61,6 +61,7 @@
icon_state = "sm_small"
moveable = TRUE
anchored = FALSE
+ custom_materials = list(/datum/material/adamantine = SHEET_MATERIAL_AMOUNT * 20, /datum/material/iron = SHEET_MATERIAL_AMOUNT)
/obj/machinery/power/supermatter_crystal/small/Initialize(mapload)
. = ..()
@@ -76,3 +77,4 @@
throw_speed = 1
throw_range = 1
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+ custom_materials = list(/datum/material/adamantine = SHEET_MATERIAL_AMOUNT * 20)
diff --git a/code/modules/power/thermoelectric_generator.dm b/code/modules/power/thermoelectric_generator.dm
index bded1482825f..9d5fd1d38501 100644
--- a/code/modules/power/thermoelectric_generator.dm
+++ b/code/modules/power/thermoelectric_generator.dm
@@ -31,7 +31,7 @@
/obj/machinery/power/thermoelectric_generator/Initialize(mapload)
. = ..()
- AddComponent(/datum/component/simple_rotation)
+ AddElement(/datum/element/simple_rotation)
find_circulators()
connect_to_network()
SSair.start_processing_machine(src)
diff --git a/code/modules/projectiles/ammunition/_ammunition.dm b/code/modules/projectiles/ammunition/_ammunition.dm
index e0cc6e089204..fa3aa1e13004 100644
--- a/code/modules/projectiles/ammunition/_ammunition.dm
+++ b/code/modules/projectiles/ammunition/_ammunition.dm
@@ -16,6 +16,8 @@
var/caliber = null
///The bullet type to create when New() is called
var/projectile_type = null
+ ///Muzzle flash color based on ammo casing.
+ var/muzzle_flash_color = LIGHT_COLOR_ORANGE
///the loaded projectile in this ammo casing
var/obj/projectile/loaded_projectile = null
///Pellets for spreadshot
diff --git a/code/modules/projectiles/ammunition/_firing.dm b/code/modules/projectiles/ammunition/_firing.dm
index 510f7b1253da..4b307119bbcf 100644
--- a/code/modules/projectiles/ammunition/_firing.dm
+++ b/code/modules/projectiles/ammunition/_firing.dm
@@ -86,6 +86,7 @@
firing_dir = get_dir(fired_from, target)
if(!loaded_projectile.suppressed && firing_effect_type && !tk_firing(user, fired_from))
new firing_effect_type(user || get_turf(src), firing_dir)
+ SEND_SIGNAL(SSdcs, COMSIG_GLOB_REPORT_CRIME, CRIME_GUNSHOTS, get_turf(src))
var/direct_target
if(target && curloc.Adjacent(targloc, target=targloc, mover=src)) //if the target is right on our location or adjacent (including diagonally if reachable) we'll skip the travelling code in the proj's fire()
diff --git a/code/modules/projectiles/ammunition/ballistic/junk.dm b/code/modules/projectiles/ammunition/ballistic/junk.dm
index 99a9b637923f..2ec346b7d214 100644
--- a/code/modules/projectiles/ammunition/ballistic/junk.dm
+++ b/code/modules/projectiles/ammunition/ballistic/junk.dm
@@ -6,7 +6,7 @@
icon_state = "improvshell"
caliber = CALIBER_JUNK
projectile_type = /obj/projectile/bullet/junk
- custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT*2, /datum/material/glass=SMALL_MATERIAL_AMOUNT*1)
+ custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 2, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 1)
// Junk Shell Spawner; used to spawn in our random shells upon crafting
diff --git a/code/modules/projectiles/ammunition/ballistic/rifle.dm b/code/modules/projectiles/ammunition/ballistic/rifle.dm
index 2ec850950b03..554ca4c57a15 100644
--- a/code/modules/projectiles/ammunition/ballistic/rifle.dm
+++ b/code/modules/projectiles/ammunition/ballistic/rifle.dm
@@ -64,6 +64,7 @@
base_icon_state = "rod_sharp"
projectile_type = /obj/projectile/bullet/rebar
newtonian_force = 1.5
+ custom_materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT)
/obj/item/ammo_casing/rebar/Initialize(mapload)
. = ..()
@@ -104,6 +105,7 @@
icon_state = "rod_healium"
base_icon_state = "rod_healium"
projectile_type = /obj/projectile/bullet/rebar/healium
+ custom_materials = null
/// How many seconds of healing/sleeping action we have left, once all are spent the bolt dissolves
var/heals_left = 6 SECONDS
@@ -145,16 +147,16 @@
casing.heals_left -= seconds_per_tick * 1 SECONDS
var/update_health = FALSE
var/healing = -healing_per_second * seconds_per_tick
- update_health += owner.adjustBruteLoss(healing, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
- update_health += owner.adjustFireLoss(healing, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
- update_health += owner.adjustToxLoss(healing, updating_health = FALSE, required_biotype = BODYTYPE_ORGANIC)
- update_health += owner.adjustOxyLoss(healing, updating_health = FALSE, required_biotype = BODYTYPE_ORGANIC)
+ update_health += owner.adjust_brute_loss(healing, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
+ update_health += owner.adjust_fire_loss(healing, updating_health = FALSE, required_bodytype = BODYTYPE_ORGANIC)
+ update_health += owner.adjust_tox_loss(healing, updating_health = FALSE, required_biotype = MOB_ORGANIC)
+ update_health += owner.adjust_oxy_loss(healing, updating_health = FALSE, required_biotype = MOB_ORGANIC)
if (update_health)
owner.updatehealth()
if (can_sleep && (owner.mob_biotypes & MOB_ORGANIC))
owner.adjust_drowsiness(drowsy_per_second * seconds_per_tick)
var/datum/status_effect/drowsiness/drowsiness = owner.has_status_effect(/datum/status_effect/drowsiness)
- if (drowsiness?.duration - world.time >= drowsy_knockout)
+ if (drowsiness?.duration >= drowsy_knockout)
owner.Sleeping(3 SECONDS)
if (casing.heals_left <= 0)
fall_out()
@@ -181,3 +183,4 @@
base_icon_state = "paperball"
projectile_type = /obj/projectile/bullet/paperball
newtonian_force = 0.5
+ custom_materials = list(/datum/material/paper = HALF_SHEET_MATERIAL_AMOUNT / 2)
diff --git a/code/modules/projectiles/ammunition/ballistic/shotgun.dm b/code/modules/projectiles/ammunition/ballistic/shotgun.dm
index 223b8346f07c..acdecca4b00a 100644
--- a/code/modules/projectiles/ammunition/ballistic/shotgun.dm
+++ b/code/modules/projectiles/ammunition/ballistic/shotgun.dm
@@ -66,6 +66,7 @@
desc = "A shotgun shell rigged with CMC technology, which launches a massive slug when fired."
icon_state = "mshell"
projectile_type = /obj/projectile/bullet/cannonball/meteorslug
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 8, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 4)
/obj/item/ammo_casing/shotgun/pulseslug
name = "pulse slug"
@@ -74,6 +75,7 @@
would have difficulty with."
icon_state = "pshell"
projectile_type = /obj/projectile/beam/pulse/shotgun
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2.1, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 1.2)
/obj/item/ammo_casing/shotgun/frag12
name = "FRAG-12 slug"
@@ -161,6 +163,7 @@
pellets = 4
variance = 15
randomspread = TRUE
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.7)
/obj/item/ammo_casing/shotgun/scatterlaser
name = "scatter laser shell"
diff --git a/code/modules/projectiles/ammunition/energy/_energy.dm b/code/modules/projectiles/ammunition/energy/_energy.dm
index 29e3d635585e..1ec145650f1f 100644
--- a/code/modules/projectiles/ammunition/energy/_energy.dm
+++ b/code/modules/projectiles/ammunition/energy/_energy.dm
@@ -9,3 +9,4 @@
fire_sound = 'sound/items/weapons/laser.ogg'
firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/red
newtonian_force = 0.5
+ muzzle_flash_color = LIGHT_COLOR_CYAN
diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm
index 1168a2b3814f..4ae41e99ce99 100644
--- a/code/modules/projectiles/ammunition/energy/laser.dm
+++ b/code/modules/projectiles/ammunition/energy/laser.dm
@@ -2,31 +2,45 @@
projectile_type = /obj/projectile/beam/laser
e_cost = LASER_SHOTS(12, STANDARD_CELL_CHARGE)
select_name = "kill"
+ muzzle_flash_color = COLOR_SOFT_RED
/obj/item/ammo_casing/energy/laser/hellfire
projectile_type = /obj/projectile/beam/laser/hellfire
e_cost = LASER_SHOTS(10, STANDARD_CELL_CHARGE)
select_name = "maim"
+/obj/item/ammo_casing/energy/laser/accelerator
+ projectile_type = /obj/projectile/beam/laser/accelerator
+ select_name = "accelerator"
+ fire_sound = 'sound/items/weapons/lasercannonfire.ogg'
+
/obj/item/ammo_casing/energy/lasergun
projectile_type = /obj/projectile/beam/laser
e_cost = LASER_SHOTS(16, STANDARD_CELL_CHARGE)
select_name = "kill"
+ muzzle_flash_color = COLOR_SOFT_RED
-/obj/item/ammo_casing/energy/lasergun/carbine
- projectile_type = /obj/projectile/beam/laser/carbine
+/obj/item/ammo_casing/energy/lasergun/pistol
+ e_cost = LASER_SHOTS(10, STANDARD_CELL_CHARGE)
+
+/obj/item/ammo_casing/energy/lasergun/assault
+ projectile_type = /obj/projectile/beam/laser/rapid
e_cost = LASER_SHOTS(40, STANDARD_CELL_CHARGE)
+
+/obj/item/ammo_casing/energy/lasergun/carbine
+ projectile_type = /obj/projectile/beam/laser/rapid
+ e_cost = LASER_SHOTS(26, STANDARD_CELL_CHARGE)
select_name = "kill"
fire_sound = 'sound/items/weapons/laser2.ogg'
-/obj/item/ammo_casing/energy/lasergun/carbine/cybersun
- projectile_type = /obj/projectile/beam/laser/carbine/cybersun
+/obj/item/ammo_casing/energy/lasergun/cybersun
+ projectile_type = /obj/projectile/beam/laser/cybersun
e_cost = LASER_SHOTS(54, STANDARD_CELL_CHARGE)
select_name = "rapid fire"
fire_sound = 'sound/items/weapons/laser2.ogg'
/obj/item/ammo_casing/energy/lasergun/carbine/practice
- projectile_type = /obj/projectile/beam/laser/carbine/practice
+ projectile_type = /obj/projectile/beam/laser/rapid/practice
select_name = "practice"
harmful = FALSE
@@ -47,6 +61,13 @@
pellets = 3
variance = 10
+/obj/item/ammo_casing/energy/laser/musket/repeater
+ projectile_type = /obj/projectile/beam/laser/musket/repeater
+ pellets = 2
+ variance = 10
+ fire_sound = 'sound/items/weapons/thermalpistol.ogg'
+ e_cost = LASER_SHOTS(6, STANDARD_CELL_CHARGE)
+
/obj/item/ammo_casing/energy/laser/practice
projectile_type = /obj/projectile/beam/practice
select_name = "practice"
@@ -100,6 +121,7 @@
select_name = "DESTROY"
fire_sound = 'sound/items/weapons/pulse.ogg'
firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/blue
+ muzzle_flash_color = LIGHT_COLOR_BLUE
/obj/item/ammo_casing/energy/laser/bluetag
projectile_type = /obj/projectile/beam/lasertag/bluetag
diff --git a/code/modules/projectiles/ammunition/energy/special.dm b/code/modules/projectiles/ammunition/energy/special.dm
index 7ed56c0ddd0d..7cf649b393ed 100644
--- a/code/modules/projectiles/ammunition/energy/special.dm
+++ b/code/modules/projectiles/ammunition/energy/special.dm
@@ -3,6 +3,7 @@
select_name = "ion"
fire_sound = 'sound/items/weapons/ionrifle.ogg'
firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/blue
+ muzzle_flash_color = LIGHT_COLOR_BLUE
/obj/item/ammo_casing/energy/ion/hos
projectile_type = /obj/projectile/ion/weak
diff --git a/code/modules/projectiles/ammunition/energy/stun.dm b/code/modules/projectiles/ammunition/energy/stun.dm
index b1a4131176a6..f8c0d41b0e15 100644
--- a/code/modules/projectiles/ammunition/energy/stun.dm
+++ b/code/modules/projectiles/ammunition/energy/stun.dm
@@ -5,6 +5,7 @@
e_cost = LASER_SHOTS(5, STANDARD_CELL_CHARGE)
harmful = FALSE
firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect
+ muzzle_flash_color = LIGHT_COLOR_DIM_YELLOW
/obj/item/ammo_casing/energy/electrode/spec
e_cost = LASER_SHOTS(10, STANDARD_CELL_CHARGE)
@@ -26,6 +27,7 @@
fire_sound = 'sound/items/weapons/taser2.ogg'
harmful = FALSE
firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/blue
+ muzzle_flash_color = LIGHT_COLOR_CYAN
/obj/item/ammo_casing/energy/disabler/smg
projectile_type = /obj/projectile/beam/disabler/weak
diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm
index f5c123866b39..355ce2cb530a 100644
--- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm
+++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm
@@ -45,9 +45,16 @@
/obj/item/ammo_box/Initialize(mapload)
. = ..()
- custom_materials = SSmaterials.FindOrCreateMaterialCombo(custom_materials, 0.1)
if(!start_empty)
top_off(starting=TRUE)
+ else if(custom_materials && !(item_flags & ABSTRACT)) //internal magazines are abstract
+ var/obj/item/ammo_casing/prototype = new ammo_type
+ var/list/new_materials = custom_materials?.Copy()
+ for(var/mat in prototype.custom_materials)
+ new_materials[mat] -= prototype.custom_materials[mat] * max_ammo
+ qdel(prototype)
+ set_custom_materials(new_materials)
+
update_icon_state()
/obj/item/ammo_box/Destroy(force)
@@ -64,6 +71,11 @@
/obj/item/ammo_box/proc/remove_from_stored_ammo(atom/movable/gone)
stored_ammo -= gone
+ if(gone.custom_materials && custom_materials && !(item_flags & ABSTRACT))
+ var/list/new_materials = custom_materials?.Copy()
+ for(var/mat in gone.custom_materials)
+ new_materials[mat] -= gone.custom_materials[mat]
+ set_custom_materials(new_materials)
update_appearance()
/obj/item/ammo_box/add_weapon_description()
@@ -108,8 +120,21 @@
stack_trace("Tried loading unsupported ammocasing type [load_type] into ammo box [type].")
return
+ var/list/new_materials = null
+ if(!(item_flags & ABSTRACT))
+ new_materials = custom_materials?.Copy() || list()
for(var/i in max(1, stored_ammo.len + 1) to max_ammo)
- stored_ammo += starting ? round_check : new round_check(src)
+ var/obj/item/ammo_casing/casing = round_check
+ if(!starting)
+ casing = new round_check(src)
+ if(new_materials)
+ for(var/mat in casing.custom_materials)
+ new_materials[mat] += casing.custom_materials[mat]
+ stored_ammo += casing
+
+ if(!starting && length(new_materials))
+ set_custom_materials(new_materials)
+
update_appearance()
///gets a round from the magazine
@@ -141,6 +166,11 @@
if (stored_ammo.len < max_ammo)
stored_ammo += new_round
new_round.forceMove(src)
+ if(new_round.custom_materials && !(item_flags & ABSTRACT))
+ var/list/new_materials = custom_materials?.Copy() || list()
+ for(var/mat in new_round.custom_materials)
+ new_materials[mat] += new_round.custom_materials[mat]
+ set_custom_materials(new_materials)
return TRUE
if(!replace_spent)
@@ -168,7 +198,7 @@
if(!ammo_band_icon)
balloon_alert(user, "no indicator support!")
return
- var/new_color = input(user, "Set a new ammo band color, cancel to remove indicator", "Ammo Box Indicator Color", ammo_band_color) as color|null
+ var/new_color = tgui_color_picker(user, "Set a new ammo band color, cancel to remove indicator", "Ammo Box Indicator Color", ammo_band_color)
ammo_band_color = new_color
balloon_alert(user, "indicator updated")
update_appearance()
diff --git a/code/modules/projectiles/boxes_magazines/external/pistol.dm b/code/modules/projectiles/boxes_magazines/external/pistol.dm
index 250ec30af39a..7fbece15863e 100644
--- a/code/modules/projectiles/boxes_magazines/external/pistol.dm
+++ b/code/modules/projectiles/boxes_magazines/external/pistol.dm
@@ -104,6 +104,12 @@
max_ammo = 8
multiple_sprites = AMMO_BOX_PER_BULLET
multiple_sprite_use_base = TRUE
+ custom_materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 10,
+ /datum/material/gold = SHEET_MATERIAL_AMOUNT * 10,
+ /datum/material/silver = SHEET_MATERIAL_AMOUNT * 10,
+ /datum/material/plasma = SHEET_MATERIAL_AMOUNT * 10,
+ )
// M1911 (.45) //
diff --git a/code/modules/projectiles/boxes_magazines/external/rifle.dm b/code/modules/projectiles/boxes_magazines/external/rifle.dm
index 9ef05f653beb..41f9ec154927 100644
--- a/code/modules/projectiles/boxes_magazines/external/rifle.dm
+++ b/code/modules/projectiles/boxes_magazines/external/rifle.dm
@@ -24,7 +24,7 @@
ammo_type = /obj/item/ammo_casing/c38
caliber = CALIBER_38
custom_materials = list(
- /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT * 3,
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT * 4,
/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT * 1,
)
max_ammo = 15
@@ -58,7 +58,7 @@
/obj/item/ammo_box/magazine/m38/true
name = "battle rifle magazine (.38 True Strike)"
- desc = parent_type::desc + " Bullets bounce towards new targets with surprising accuracy."
+ desc = parent_type::desc + " Bullets bounce towards new targets with surprising accuracy and can strike through armored target"
ammo_type = /obj/item/ammo_casing/c38/match/true
ammo_band_color = COLOR_AMMO_TRUESTRIKE
diff --git a/code/modules/projectiles/boxes_magazines/internal/_internal.dm b/code/modules/projectiles/boxes_magazines/internal/_internal.dm
index 43b34979e44d..238ac94406d2 100644
--- a/code/modules/projectiles/boxes_magazines/internal/_internal.dm
+++ b/code/modules/projectiles/boxes_magazines/internal/_internal.dm
@@ -4,6 +4,7 @@
spawn_blacklisted = TRUE
obj_flags = CONDUCTS_ELECTRICITY
item_flags = ABSTRACT
+ custom_materials = null //we are never gonna be recycled anyway
//internals magazines are accessible, so replace spent ammo if full when trying to put a live one in
/obj/item/ammo_box/magazine/internal/give_round(obj/item/ammo_casing/R)
diff --git a/code/modules/projectiles/boxes_magazines/internal/shotgun.dm b/code/modules/projectiles/boxes_magazines/internal/shotgun.dm
index ef14b2701a39..da58c2a97021 100644
--- a/code/modules/projectiles/boxes_magazines/internal/shotgun.dm
+++ b/code/modules/projectiles/boxes_magazines/internal/shotgun.dm
@@ -12,7 +12,7 @@
max_ammo = 4
/obj/item/ammo_box/magazine/internal/shot/tube/fire
- ammo_type = /obj/projectile/bullet/incendiary/shotgun/no_trail
+ ammo_type = /obj/item/ammo_casing/shotgun/incendiary/no_trail
/obj/item/ammo_box/magazine/internal/shot/tube/buckshot
ammo_type = /obj/item/ammo_casing/shotgun/buckshot
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index c33d36dd5893..277cadb5ab20 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -24,19 +24,31 @@
attack_verb_simple = list("strike", "hit", "bash")
action_slots = ALL
+ // Muzzle Flash
+ light_on = FALSE
+ light_system = OVERLAY_LIGHT_DIRECTIONAL
+ light_range = 3
+ light_color = LIGHT_COLOR_ORANGE
+ light_power = 0.5
+ var/can_muzzle_flash = TRUE
+ /// Muzzle Flash Duration
+ var/light_time = 0.1 SECONDS
+
var/gun_flags = NONE
+
var/fire_sound = 'sound/items/weapons/gun/pistol/shot.ogg'
var/vary_fire_sound = TRUE
var/fire_sound_volume = 50
var/dry_fire_sound = 'sound/items/weapons/gun/general/dry_fire.ogg'
var/dry_fire_sound_volume = 30
- var/suppressed = null //whether or not a message is displayed when fired
+ /// Whether or not a message is displayed when fired
+ var/suppressed = SUPPRESSED_NONE
var/can_suppress = FALSE
var/suppressed_sound = 'sound/items/weapons/gun/general/heavy_shot_suppressed.ogg'
var/suppressed_volume = 60
- /// whether a gun can be unsuppressed. for ballistics, also determines if it generates a suppressor overlay
+ /// Whether a gun can be unsuppressed. for ballistics, also determines if it generates a suppressor overlay
var/can_unsuppress = TRUE
- var/recoil = 0 //boom boom shake the room
+
var/clumsy_check = TRUE
var/obj/item/ammo_casing/chambered = null
trigger_guard = TRIGGER_GUARD_NORMAL //trigger guard on the weapon, hulks can't fire them with their big meaty fingers
@@ -46,18 +58,21 @@
/// Delay between shots in a burst.
var/burst_delay = 2
/// Delay between bursts (if burst-firing) or individual shots (if weapon is single-fire).
- var/fire_delay = 0
+ var/fire_delay = 0 SECONDS
var/firing_burst = 0 //Prevent the weapon from firing again while already firing
/// firing cooldown, true if this gun shouldn't be allowed to manually fire
var/fire_cd = 0
var/weapon_weight = WEAPON_LIGHT
- var/dual_wield_spread = 24 //additional spread when dual wielding
///Can we hold up our target with this? Default to yes
var/can_hold_up = TRUE
/// If TRUE, and we aim at ourselves, it will initiate a do after to fire at ourselves.
/// If FALSE it will just try to fire at ourselves straight up.
var/doafter_self_shoot = TRUE
+ /// If TRUE, will fire ITEM_INTERACT_BLOCKING (melee, etc) if the gun has a round already in the chamber, and is waiting to be fired (but cant, usually due to waiting on fire_delay).
+ /// If FALSE, nothing changed.
+ var/chambered_attack_block = FALSE
+
/// Just 'slightly' snowflakey way to modify projectile damage for projectiles fired from this gun.
var/projectile_damage_multiplier = 1
@@ -70,6 +85,18 @@
var/spread = 0 //Spread induced by the gun itself.
var/randomspread = 1 //Set to 0 for shotguns. This is used for weapons that don't fire all their bullets at once.
+ var/dual_wield_spread = 24 //additional spread when dual wielding
+
+ ///Screen shake when the weapon is fired
+ var/recoil = 0
+ ///a multiplier of the duration the recoil takes to go back to normal view, this is (recoil*recoil_backtime_multiplier)+1
+ var/recoil_backtime_multiplier = 1.5
+ ///this is how much deviation the gun recoil can have, recoil pushes the screen towards the reverse angle you shot + some deviation which this is the max.
+ var/recoil_deviation = 20
+ /// Used as the min value when calculating recoil
+ /// Affected by a player's min_recoil_multiplier preference, so keep in mind it can ultimately be 0 regardless
+ /// Often utilized as a "purely visual" form of recoil (as it can be disabled)
+ var/min_recoil = 0
lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
@@ -90,7 +117,7 @@
. = ..()
if(ispath(pin))
pin = new pin
- pin.gun_insert(new_gun = src)
+ pin.gun_insert(new_gun = src, starting = TRUE)
add_seclight_point()
add_bayonet_point()
@@ -98,10 +125,7 @@
/obj/item/gun/Destroy()
if(isobj(pin)) //Can still be the initial path, then we skip
QDEL_NULL(pin)
- if(chambered) //Not all guns are chambered (EMP'ed energy guns etc)
- QDEL_NULL(chambered)
- if(isatom(suppressed)) //SUPPRESSED IS USED AS BOTH A TRUE/FALSE AND AS A REF, WHAT THE FUCKKKKKKKKKKKKKKKKK
- QDEL_NULL(suppressed)
+ QDEL_NULL(chambered)
return ..()
/obj/item/gun/apply_fantasy_bonuses(bonus)
@@ -133,20 +157,20 @@
if(gone == chambered)
chambered = null
update_appearance()
- if(gone == suppressed)
- clear_suppressor()
-///Clears var and updates icon. In the case of ballistic weapons, also updates the gun's weight.
+/// Clears var and updates icon.
/obj/item/gun/proc/clear_suppressor()
if(!can_unsuppress)
return
- suppressed = null
+ suppressed = SUPPRESSED_NONE
update_appearance()
/obj/item/gun/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
. = ..()
if(isliving(hit_atom))
var/mob/living/thrower = throwingdatum?.get_thrower()
+ if(!isliving(thrower))
+ return
toss_gun_hard(thrower, hit_atom)
/obj/item/gun/proc/toss_gun_hard(mob/living/thrower, mob/living/target) //throw a gun at them. They don't expect it.
@@ -205,10 +229,22 @@
else
playsound(src, fire_sound, fire_sound_volume, vary_fire_sound)
+/obj/item/gun/proc/muzzle_flash_on()
+ if (can_muzzle_flash)
+ set_light_on(TRUE)
+ addtimer(CALLBACK(src, PROC_REF(muzzle_flash_off)), light_time, TIMER_UNIQUE | TIMER_OVERRIDE)
+ else
+ muzzle_flash_off()
+
+/obj/item/gun/proc/muzzle_flash_off()
+ set_light_on(FALSE)
+
/obj/item/gun/proc/shoot_live_shot(mob/living/user, pointblank = FALSE, atom/pbtarget = null, message = TRUE)
- if(recoil && !tk_firing(user))
- shake_camera(user, recoil + 1, recoil)
+ if(!tk_firing(user))
+ var/actual_angle = get_angle((user || get_turf(src)), pbtarget)
+ simulate_recoil(user, recoil, actual_angle)
fire_sounds()
+ muzzle_flash_on()
if(suppressed || !message)
return FALSE
if(tk_firing(user))
@@ -304,9 +340,10 @@
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
/obj/item/gun/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
- if(try_fire_gun(interacting_with, user, list2params(modifiers)))
- return ITEM_INTERACT_SUCCESS
- return NONE
+ var/fired = try_fire_gun(interacting_with, user, list2params(modifiers))
+ if(!fired && chambered_attack_block == TRUE && can_shoot() && isliving(interacting_with))
+ return ITEM_INTERACT_BLOCKING
+ return fired
/obj/item/gun/interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers)
if(user.combat_mode && isliving(interacting_with))
@@ -328,9 +365,7 @@
return ITEM_INTERACT_SUCCESS
/obj/item/gun/ranged_interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
- if(try_fire_gun(interacting_with, user, list2params(modifiers)))
- return ITEM_INTERACT_SUCCESS
- return ITEM_INTERACT_BLOCKING
+ return try_fire_gun(interacting_with, user, list2params(modifiers))
/obj/item/gun/ranged_interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers)
if(IN_GIVEN_RANGE(user, interacting_with, GUNPOINT_SHOOTER_STRAY_RANGE))
@@ -342,49 +377,42 @@
/obj/item/gun/proc/fire_gun(atom/target, mob/living/user, flag, params)
if(QDELETED(target))
- return
+ return NONE
if(firing_burst)
- return
+ return NONE
if(SEND_SIGNAL(user, COMSIG_MOB_TRYING_TO_FIRE_GUN, src, target, flag, params) & COMPONENT_CANCEL_GUN_FIRE)
- return
+ return NONE
if(SEND_SIGNAL(src, COMSIG_GUN_TRY_FIRE, user, target, flag, params) & COMPONENT_CANCEL_GUN_FIRE)
- return
+ return NONE
if(flag) //It's adjacent, is the user, or is on the user's person
if(target in user.contents) //can't shoot stuff inside us.
- return
+ return NONE
if(!ismob(target)) //melee attack
- return
+ return NONE
if(target == user && (user.zone_selected != BODY_ZONE_PRECISE_MOUTH && doafter_self_shoot)) //so we can't shoot ourselves (unless mouth selected)
- return
- if(iscarbon(target))
- var/mob/living/carbon/C = target
- for(var/i in C.all_wounds)
- var/datum/wound/W = i
- if(W.try_treating(src, user))
- return // another coward cured!
+ return NONE
if(istype(user))//Check if the user can use the gun, if the user isn't alive(turrets) assume it can.
var/mob/living/L = user
if(!can_trigger_gun(L))
- return
+ return NONE
if(flag && doafter_self_shoot && user.zone_selected == BODY_ZONE_PRECISE_MOUTH)
- handle_suicide(user, target, params)
- return
+ return handle_suicide(user, target, params)
if(!can_shoot()) //Just because you can pull the trigger doesn't mean it can shoot.
shoot_with_empty_chamber(user)
- return
+ return ITEM_INTERACT_BLOCKING
if(check_botched(user, target))
- return
+ return NONE
var/obj/item/bodypart/other_hand = user.has_hand_for_held_index(user.get_inactive_hand_index()) //returns non-disabled inactive hands
if(weapon_weight == WEAPON_HEAVY && (user.get_inactive_held_item() || !other_hand))
balloon_alert(user, "use both hands!")
- return
+ return ITEM_INTERACT_BLOCKING
//DUAL (or more!) WIELDING
var/bonus_spread = 0
var/loop_counter = 0
@@ -455,7 +483,7 @@
else //Smart spread
sprd = round((((burst_spread_mult/burst_size) * iteration) - (0.5 + (burst_spread_mult * 0.25))) * (random_spread))
before_firing(target,user)
- if(!chambered.fire_casing(target, user, params, ,suppressed, zone_override, sprd, src))
+ if(!chambered.fire_casing(target, user, params, 0, suppressed, zone_override, sprd, src))
shoot_with_empty_chamber(user)
firing_burst = FALSE
return FALSE
@@ -474,6 +502,39 @@
update_appearance()
return TRUE
+/**
+ * Calculates the final recoil value applied when firing a gun.
+ *
+ * Arguments:
+ * * user - The living mob attempting to fire the gun. Used for preference lookups.
+ * * recoil_amount - The raw recoil value to be processed before clamping.
+ *
+ * Returns:
+ * The clamped recoil value after applying all modifiers.
+ */
+/obj/item/gun/proc/calculate_recoil(mob/living/user, recoil_amount = 0)
+ var/used_min_recoil = min_recoil
+ if(user.client)
+ used_min_recoil *= (user.client.prefs.read_preference(/datum/preference/numeric/min_recoil_multiplier) / 100)
+ return clamp(recoil_amount, used_min_recoil, INFINITY)
+
+/**
+ * Simulates firearm recoil and applies camera feedback when firing.
+ *
+ * Arguments:
+ * * user - The mob firing the gun. Used for recoil calculation and camera shake.
+ * * recoil_amount - The base recoil value before modifiers.
+ * * firing_angle - The firing direction used to determine camera kick direction.
+ */
+/obj/item/gun/proc/simulate_recoil(mob/living/user, recoil_amount = 0, firing_angle)
+ var/total_recoil = calculate_recoil(user, recoil_amount)
+
+ var/actual_angle = firing_angle + rand(-recoil_deviation, recoil_deviation) + 180
+ if(actual_angle > 360)
+ actual_angle -= 360
+ if(total_recoil > 0)
+ recoil_camera(user, total_recoil + 1, (total_recoil * recoil_backtime_multiplier)+1, total_recoil, actual_angle)
+
///returns true if the gun successfully fires
/obj/item/gun/proc/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
var/base_bonus_spread = 0
@@ -488,7 +549,7 @@
add_fingerprint(user)
if(fire_cd)
- return
+ return NONE
//Vary by at least this much
var/randomized_bonus_spread = rand(base_bonus_spread, bonus_spread)
@@ -513,12 +574,12 @@
if(HAS_TRAIT(user, TRAIT_PACIFISM)) // If the user has the pacifist trait, then they won't be able to fire [src] if the round chambered inside of [src] is lethal.
if(chambered.harmful) // Is the bullet chambered harmful?
to_chat(user, span_warning("[src] is lethally chambered! You don't want to risk harming anyone..."))
- return
+ return NONE
var/sprd = round((rand(0, 1) - 0.5) * DUALWIELD_PENALTY_EXTRA_MULTIPLIER * total_random_spread)
before_firing(target,user)
- if(!chambered.fire_casing(target, user, params, , suppressed, zone_override, sprd, src))
+ if(!chambered.fire_casing(target, user, params, 0, suppressed, zone_override, sprd, src))
shoot_with_empty_chamber(user)
- return
+ return NONE
else
if(get_dist(user, target) <= 1) //Making sure whether the target is in vicinity for the pointblank shot
shoot_live_shot(user, TRUE, target, message)
@@ -526,7 +587,7 @@
shoot_live_shot(user, FALSE, target, message)
else
shoot_with_empty_chamber(user)
- return
+ return NONE
// If gun gets destroyed as a result of firing
if (!QDELETED(src))
process_chamber()
@@ -599,10 +660,10 @@
/obj/item/gun/proc/handle_suicide(mob/living/carbon/human/user, mob/living/carbon/human/target, params, bypass_timer)
if(!ishuman(user) || !ishuman(target))
- return
+ return NONE
if(fire_cd)
- return
+ return NONE
if(user == target)
target.visible_message(span_warning("[user] sticks [src] in [user.p_their()] mouth, ready to pull the trigger..."), \
@@ -620,28 +681,33 @@
else if(target?.Adjacent(user))
target.visible_message(span_notice("[user] has decided to spare [target]"), span_notice("[user] has decided to spare your life!"))
fire_cd = FALSE
- return
+ return ITEM_INTERACT_BLOCKING
fire_cd = FALSE
target.visible_message(span_warning("[user] pulls the trigger!"), span_userdanger("[(user == target) ? "You pull" : "[user] pulls"] the trigger!"))
- if(chambered?.loaded_projectile)
- chambered.loaded_projectile.damage *= 5
- if(chambered.loaded_projectile.wound_bonus != CANT_WOUND)
- chambered.loaded_projectile.wound_bonus += 5 // much more dramatic on multiple pellet'd projectiles really
+ if(!chambered?.loaded_projectile)
+ shoot_with_empty_chamber()
+ return ITEM_INTERACT_BLOCKING
+
+ chambered.loaded_projectile.damage *= 5
+ if(chambered.loaded_projectile.wound_bonus != CANT_WOUND)
+ chambered.loaded_projectile.wound_bonus += 5 // much more dramatic on multiple pellet'd projectiles really
var/fired = process_fire(target, user, TRUE, params, BODY_ZONE_HEAD)
if(!fired && chambered?.loaded_projectile)
chambered.loaded_projectile.damage /= 5
if(chambered.loaded_projectile.wound_bonus != CANT_WOUND)
chambered.loaded_projectile.wound_bonus -= 5
+ return NONE
+ return ITEM_INTERACT_SUCCESS
/obj/item/gun/proc/unlock() //used in summon guns and as a convience for admins
if(pin)
qdel(pin)
var/obj/item/firing_pin/new_pin = new
- new_pin.gun_insert(new_gun = src)
+ new_pin.gun_insert(new_gun = src, starting = TRUE)
//Happens before the actual projectile creation
/obj/item/gun/proc/before_firing(atom/target,mob/user)
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index 4218c3027b0c..119a82cca5ec 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -9,7 +9,8 @@
pickup_sound = 'sound/items/handling/gun/gun_pick_up.ogg'
drop_sound = 'sound/items/handling/gun/gun_drop.ogg'
sound_vary = TRUE
- unique_reskin_changes_base_icon_state = TRUE
+
+ min_recoil = 0.1
///sound when inserting magazine
var/load_sound = 'sound/items/weapons/gun/general/magazine_insert_full.ogg'
@@ -140,6 +141,10 @@
var/burst_fire_selection = FALSE
/// If it has an icon for a selector switch indicating current firemode.
var/selector_switch_icon = FALSE
+ /// Suppressor attached to the gun, if any
+ var/obj/item/suppressor/suppressor = null
+ /// Sound played when the burst mode is changed
+ var/burst_select_sound = SFX_FIRE_MODE_SWITCH
/obj/item/gun/ballistic/Initialize(mapload)
. = ..()
@@ -162,8 +167,14 @@
/obj/item/gun/ballistic/Destroy()
QDEL_NULL(magazine)
+ QDEL_NULL(suppressor)
return ..()
+/obj/item/gun/ballistic/Exited(atom/movable/gone, direction)
+ . = ..()
+ if(gone == suppressor)
+ clear_suppressor()
+
/obj/item/gun/ballistic/add_weapon_description()
AddElement(/datum/element/weapon_description, attached_proc = PROC_REF(add_notes_ballistic))
@@ -280,14 +291,17 @@
burst_fire_selection = !burst_fire_selection
if(!burst_fire_selection)
burst_size = 1
- fire_delay = 0
+ fire_delay = 0 SECONDS
balloon_alert(user, "switched to semi-automatic")
else
burst_size = initial(burst_size)
fire_delay = initial(fire_delay)
balloon_alert(user, "switched to [burst_size]-round burst")
- playsound(user, 'sound/items/weapons/empty.ogg', 100, TRUE)
+ if(burst_select_sound)
+ playsound(user, burst_select_sound, 50, TRUE)
+ else
+ playsound(user, 'sound/items/weapons/empty.ogg', 100, TRUE)
update_appearance()
update_item_action_buttons()
@@ -534,7 +548,7 @@
return ITEM_INTERACT_FAILURE
if(suppressed)
- balloon_alert(user, "already has a supressor!")
+ balloon_alert(user, "already has a suppressor!")
return ITEM_INTERACT_FAILURE
if(!user.transferItemToLoc(tool, src))
@@ -551,7 +565,7 @@
/obj/item/gun/ballistic/proc/load_gun(obj/item/ammo, mob/living/user)
if (chambered && !chambered.loaded_projectile)
chambered.forceMove(drop_location())
- if(chambered != magazine?.stored_ammo[1])
+ if(length(magazine?.stored_ammo) && chambered != magazine.stored_ammo[1])
magazine.stored_ammo -= chambered
chambered = null
@@ -595,27 +609,30 @@
return ..()
///Installs a new suppressor, assumes that the suppressor is already in the contents of src
-/obj/item/gun/ballistic/proc/install_suppressor(obj/item/suppressor/S)
- suppressed = S
- update_weight_class(w_class + S.w_class) //so pistols do not fit in pockets when suppressed
+/obj/item/gun/ballistic/proc/install_suppressor(obj/item/suppressor/new_suppressor)
+ suppressor = new_suppressor
+ suppressed = suppressor.suppression
+ update_weight_class(w_class + suppressor.w_class) //so pistols do not fit in pockets when suppressed
+ can_muzzle_flash = FALSE
update_appearance()
/obj/item/gun/ballistic/clear_suppressor()
if(!can_unsuppress)
return
- if(isitem(suppressed))
- var/obj/item/I = suppressed
- update_weight_class(w_class - I.w_class)
- return ..()
+ suppressed = SUPPRESSED_NONE
+ if(suppressor)
+ update_weight_class(w_class - suppressor.w_class)
+ suppressor = null
+ can_muzzle_flash = initial(can_muzzle_flash)
+ update_appearance()
/obj/item/gun/ballistic/click_alt(mob/user)
if(!suppressed || !can_unsuppress)
return CLICK_ACTION_BLOCKING
- var/obj/item/suppressor/S = suppressed
if(!user.is_holding(src))
return CLICK_ACTION_BLOCKING
- balloon_alert(user, "[S.name] removed")
- user.put_in_hands(S)
+ balloon_alert(user, "[suppressor.name] removed")
+ user.put_in_hands(suppressor)
clear_suppressor()
return CLICK_ACTION_SUCCESS
@@ -695,7 +712,7 @@
. += "It does not seem to have a round chambered."
if (bolt_locked)
. += "The [bolt_wording] is locked back and needs to be released before firing or de-fouling."
- if (suppressed)
+ if (suppressor)
. += "It has a suppressor [can_unsuppress ? "attached that can be removed with alt+click." : "that is integral or can't otherwise be removed."]"
if(can_misfire)
. += span_danger("You get the feeling this might explode if you fire it...")
@@ -873,3 +890,5 @@ GLOBAL_LIST_INIT(gun_saw_types, typecacheof(list(
icon = 'icons/obj/weapons/guns/ballistic.dmi'
icon_state = "suppressor"
w_class = WEIGHT_CLASS_TINY
+ /// How quiet should the gun be when we're installed?
+ var/suppression = SUPPRESSED_QUIET
diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm
index a404221fb1d8..fbdc1f6f3f17 100644
--- a/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -329,7 +329,8 @@
inhand_icon_state = "arg"
accepted_magazine_type = /obj/item/ammo_box/magazine/recharge
empty_indicator = TRUE
- fire_delay = 2
+ bolt_type = BOLT_TYPE_OPEN
+ fire_delay = 2 DECISECONDS
can_suppress = FALSE
burst_size = 0
actions_types = list()
@@ -340,9 +341,9 @@
/obj/item/gun/ballistic/automatic/battle_rifle
name = "\improper NT BR-38 battle rifle"
- desc = "Nanotrasen's prototype security weapon, found exclusively in the hands of their private security teams. Chambered in .38 pistol rounds. \
- Ignore that this makes it technically a carbine. And that it functions as a designated marksman rifle. Marketing weren't being very co-operative \
- when it came time to name the gun. That, and the endless arguments in board rooms about exactly what designation the gun is meant to be."
+ desc = "Nanotrasen's latest prototype .38 Special longarm, found exclusively in the hands of their private security teams. \
+ Technically a pistol-caliber carbine, despite the name and its use as a designated marksman rifle. Acceleration technology \
+ enables improved ballistic performance, but necessitates maintenance."
icon = 'icons/obj/weapons/guns/wide_guns.dmi'
icon_state = "battle_rifle"
inhand_icon_state = "battle_rifle"
@@ -358,7 +359,7 @@
mag_display = TRUE
projectile_damage_multiplier = 1.2
projectile_speed_multiplier = 1.2
- fire_delay = 2
+ fire_delay = 2 DECISECONDS
burst_size = 1
actions_types = list()
fire_sound = 'sound/items/weapons/thermalpistol.ogg'
@@ -390,6 +391,21 @@
/obj/item/gun/ballistic/automatic/battle_rifle/Initialize(mapload)
. = ..()
AddComponent(/datum/component/scope, range_modifier = 2)
+ AddElement(/datum/element/examine_lore, \
+ lore = "The BR-38 is Nanotrasen's latest foray into entirely in-house, standard-issue-ready, accelerator-assisted ballistic firearms. \
+ \
+ The acceleration rail built into the barrel assembly boosts fired projectiles to higher velocities than unassisted bullets, \
+ allowing even less powerful cartridges, such as the venerable .38 Special, to have improved ballistic performance and stopping power. \
+ Even though the chambering makes this more of a pistol-caliber carbine than a battle rifle, countless arguments in both the marketing office \
+ and the corporate boardroom about the name meant that something had to give; in this case, the slightly misleading designation. \
+ \
+ It's hard to cover up everything about its troubled development, though. \
+ \
+ In a sour twist of irony for Nanotrasen's historical issues with ballistics-based security weapons, the BR-38 has one significant flaw. \
+ It is possible for the weapons system to suffer from unintended discombulations due to closed heat distribution systems, should the weapon be tampered with. \
+ Nanotrasen's weapons R&D teams are still working on this issue, while also trying to work out why the weapon's onboard computation systems \
+ suffer from so many calculation errors, before moving onto a full commercial rollout." \
+ )
register_context()
/obj/item/gun/ballistic/automatic/battle_rifle/add_context(atom/source, list/context, obj/item/held_item, mob/user)
@@ -399,26 +415,15 @@
context[SCREENTIP_CONTEXT_LMB] = "Reset System"
return CONTEXTUAL_SCREENTIP_SET
-/obj/item/gun/ballistic/automatic/battle_rifle/examine_more(mob/user)
- . = ..()
- . += span_notice("Looking down at \the [src], you recall something you read in a promotional pamphlet... ")
-
- . += span_info("The BR-38 possesses an acceleration rail that launches bullets at higher than typical velocity. \
- This allows even less powerful cartridges to put out significant amounts of stopping power.")
-
- . += span_notice("However, you also remember some of the rumors... ")
-
- . += span_notice("In a sour twist of irony for Nanotrasen's historical issues with ballistics-based security weapons, the BR-38 has one significant flaw. \
- It is possible for the weapon to suffer from unintended discombulations due to closed heat distribution systems should the weapon be tampered with. \
- R&D are working on this issue before the weapon sees commercial sales. That, and trying to work out why the weapon's onboard computation systems suffer \
- from so many calculation errors.")
-
/obj/item/gun/ballistic/automatic/battle_rifle/examine(mob/user)
. = ..()
if(shots_before_degradation)
. += span_notice("[src] can fire [shots_before_degradation] more times before risking system degradation.")
else
. += span_notice("[src] is in the process of system degradation. It is currently at stage [degradation_stage] of [degradation_stage_max]. Use a multitool on [src] to recalibrate. Alternatively, insert it into a weapon recharger.")
+ . += span_notice("You can [EXAMINE_HINT("look closer")] to learn a little more about [src].")
+
+
/obj/item/gun/ballistic/automatic/battle_rifle/update_icon_state()
. = ..()
@@ -465,14 +470,18 @@
balloon_alert(user, "system reset")
return ITEM_INTERACT_SUCCESS
-/obj/item/gun/ballistic/automatic/battle_rifle/try_fire_gun(atom/target, mob/living/user, params)
+/obj/item/gun/ballistic/automatic/battle_rifle/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
+ if(chambered.loaded_projectile && prob(75) && (emp_malfunction || degradation_stage == degradation_stage_max))
+ balloon_alert_to_viewers("*click*")
+ playsound(src, dry_fire_sound, dry_fire_sound_volume, TRUE)
+ return
+
. = ..()
- if(!chambered || (chambered && !chambered.loaded_projectile))
+ if(!.)
return
- if(shots_before_degradation)
+ else if(shots_before_degradation)
shots_before_degradation --
- return
else if ((obj_flags & EMAGGED) && degradation_stage == degradation_stage_max && !explosion_timer)
perform_extreme_malfunction(user)
@@ -480,15 +489,6 @@
else
attempt_degradation(FALSE)
-
-/obj/item/gun/ballistic/automatic/battle_rifle/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
- if(chambered.loaded_projectile && prob(75) && (emp_malfunction || degradation_stage == degradation_stage_max))
- balloon_alert_to_viewers("*click*")
- playsound(src, dry_fire_sound, dry_fire_sound_volume, TRUE)
- return
-
- return ..()
-
/// Proc to handle weapon degradation. Called when attempting to fire or immediately after an EMP takes place.
/obj/item/gun/ballistic/automatic/battle_rifle/proc/attempt_degradation(force_increment = FALSE)
if(!prob(degradation_probability) && !force_increment || degradation_stage == degradation_stage_max)
@@ -527,6 +527,7 @@
/// proc to handle our detonation
/obj/item/gun/ballistic/automatic/battle_rifle/proc/fucking_explodes_you()
explosion(src, devastation_range = 1, heavy_impact_range = 3, light_impact_range = 6, explosion_cause = src)
+
//component for seclight attachment
/obj/item/gun/ballistic/automatic/battle_rifle/add_seclight_point()
AddComponent(/datum/component/seclite_attachable, \
diff --git a/code/modules/projectiles/guns/ballistic/bows/_bow.dm b/code/modules/projectiles/guns/ballistic/bows/_bow.dm
index 5bcec2deeb7e..69399c71138b 100644
--- a/code/modules/projectiles/guns/ballistic/bows/_bow.dm
+++ b/code/modules/projectiles/guns/ballistic/bows/_bow.dm
@@ -22,6 +22,7 @@
bolt_type = BOLT_TYPE_NO_BOLT
click_on_low_ammo = FALSE
must_hold_to_load = TRUE
+ trigger_guard = TRIGGER_GUARD_ALLOW_ALL
/// whether the bow is drawn back
var/drawn = FALSE
diff --git a/code/modules/projectiles/guns/ballistic/bows/bow_arrows.dm b/code/modules/projectiles/guns/ballistic/bows/bow_arrows.dm
index 96459341cf36..d1d5a977de80 100644
--- a/code/modules/projectiles/guns/ballistic/bows/bow_arrows.dm
+++ b/code/modules/projectiles/guns/ballistic/bows/bow_arrows.dm
@@ -11,6 +11,7 @@
throwforce = 1
firing_effect_type = null
caliber = CALIBER_ARROW
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT, /datum/material/iron = SHEET_MATERIAL_AMOUNT)
///Whether the bullet type spawns another casing of the same type or not.
var/reusable = TRUE
@@ -131,6 +132,7 @@
base_icon_state = "plastic_arrow"
projectile_type = /obj/projectile/bullet/arrow/plastic
reusable = FALSE //cheap shit
+ custom_materials = list(/datum/material/plastic = SHEET_MATERIAL_AMOUNT)
/// plastic arrow projectile
/obj/projectile/bullet/arrow/plastic
@@ -179,6 +181,7 @@
inhand_icon_state = "ashen_arrow"
base_icon_state = "ashen_arrow"
projectile_type = /obj/projectile/bullet/arrow/ashen
+ custom_materials = list(/datum/material/bone = SHEET_MATERIAL_AMOUNT)
/// ashen arrow projectile
/obj/projectile/bullet/arrow/ashen
diff --git a/code/modules/projectiles/guns/ballistic/bows/bow_types.dm b/code/modules/projectiles/guns/ballistic/bows/bow_types.dm
index ee8f6ed305de..dfc9e1ca9805 100644
--- a/code/modules/projectiles/guns/ballistic/bows/bow_types.dm
+++ b/code/modules/projectiles/guns/ballistic/bows/bow_types.dm
@@ -10,6 +10,7 @@
desc = "A simple homemade shortbow. Great for LARPing. Or poking out someones eye."
obj_flags = UNIQUE_RENAME
projectile_damage_multiplier = 0.5
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 4, /datum/material/iron = SHEET_MATERIAL_AMOUNT)
///chaplain's divine archer bow
/obj/item/gun/ballistic/bow/divine
@@ -31,37 +32,22 @@
/obj/item/gun/ballistic/bow/divine/Initialize(mapload)
. = ..()
- AddComponent(/datum/component/anti_magic, MAGIC_RESISTANCE|MAGIC_RESISTANCE_HOLY)
- AddComponent(/datum/component/effect_remover, \
- success_feedback = "You disrupt the magic of %THEEFFECT with %THEWEAPON.", \
- success_forcesay = "BOW-GONE FOUL MAGIKS!!", \
- tip_text = "Clear rune", \
- on_clear_callback = CALLBACK(src, PROC_REF(on_cult_rune_removed)), \
- effects_we_clear = list(/obj/effect/rune, /obj/effect/heretic_rune) \
- )
- AddElement(/datum/element/bane, mob_biotypes = MOB_SPIRIT, damage_multiplier = 0, added_damage = 25, requires_combat_mode = FALSE)
+ AddElement(/datum/element/nullrod_core)
+ RegisterSignal(src, COMSIG_ITEM_SUBTYPE_PICKER_SELECTED, PROC_REF(on_selected))
-/obj/item/gun/ballistic/bow/divine/proc/on_cult_rune_removed(obj/effect/target, mob/living/user)
+/obj/item/gun/ballistic/bow/divine/proc/on_selected(datum/source, obj/item/nullrod/old_weapon, mob/picker)
SIGNAL_HANDLER
- if(!istype(target, /obj/effect/rune))
- return
-
- var/obj/effect/rune/target_rune = target
- if(target_rune.log_when_erased)
- user.log_message("erased [target_rune.cultist_name] rune using [src]", LOG_GAME)
- SSshuttle.shuttle_purchase_requirements_met[SHUTTLE_UNLOCK_NARNAR] = TRUE
-
-/obj/item/gun/ballistic/bow/divine/with_quiver/Initialize(mapload)
- . = ..()
new /obj/item/storage/bag/quiver/holy(loc)
/// Ashen bow, crafted from watcher sinew and animal bones.
/obj/item/gun/ballistic/bow/ashenbow
name = "ashen bow"
desc = "A bow made from watcher sinew and bone. Seems to possess an almost eerie radiance about it."
+ icon_state = "ashenbow"
inhand_icon_state = "ashenbow"
base_icon_state = "ashenbow"
worn_icon_state = "ashenbow"
slot_flags = ITEM_SLOT_BACK
obj_flags = UNIQUE_RENAME
projectile_damage_multiplier = 0.5
+ custom_materials = list(/datum/material/bone = SHEET_MATERIAL_AMOUNT * 6)
diff --git a/code/modules/projectiles/guns/ballistic/launchers.dm b/code/modules/projectiles/guns/ballistic/launchers.dm
index 2a3d22e00644..738ffc41820e 100644
--- a/code/modules/projectiles/guns/ballistic/launchers.dm
+++ b/code/modules/projectiles/guns/ballistic/launchers.dm
@@ -11,6 +11,7 @@
w_class = WEIGHT_CLASS_NORMAL
pin = /obj/item/firing_pin/implant/pindicate
bolt_type = BOLT_TYPE_NO_BOLT
+ can_muzzle_flash = FALSE
/obj/item/gun/ballistic/revolver/grenadelauncher/unrestricted
pin = /obj/item/firing_pin
@@ -60,7 +61,7 @@
fire_sound = 'sound/items/weapons/gun/general/grenade_launch.ogg'
accepted_magazine_type = /obj/item/ammo_box/magazine/m75
burst_size = 1
- fire_delay = 0
+ fire_delay = 0 SECONDS
actions_types = list()
casing_ejector = FALSE
@@ -82,7 +83,7 @@
can_suppress = FALSE
pin = /obj/item/firing_pin/implant/pindicate
burst_size = 1
- fire_delay = 0
+ fire_delay = 0 SECONDS
casing_ejector = FALSE
weapon_weight = WEAPON_HEAVY
bolt_type = BOLT_TYPE_NO_BOLT
@@ -90,6 +91,7 @@
cartridge_wording = "rocket"
empty_indicator = TRUE
tac_reloads = FALSE
+ can_muzzle_flash = FALSE
/// Do we shit flames behind us when we fire?
var/backblast = TRUE
diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm
index e4c4e47cdeab..9a16feceebb0 100644
--- a/code/modules/projectiles/guns/ballistic/pistol.dm
+++ b/code/modules/projectiles/guns/ballistic/pistol.dm
@@ -6,7 +6,7 @@
accepted_magazine_type = /obj/item/ammo_box/magazine/m9mm
can_suppress = TRUE
burst_size = 1
- fire_delay = 0
+ fire_delay = 0 SECONDS
actions_types = list()
bolt_type = BOLT_TYPE_LOCKING
fire_sound = 'sound/items/weapons/gun/pistol/shot.ogg'
@@ -25,6 +25,7 @@
bolt_wording = "slide"
suppressor_x_offset = 10
suppressor_y_offset = -1
+ recoil_backtime_multiplier = 1
/obj/item/gun/ballistic/automatic/pistol/no_mag
spawnwithmagazine = FALSE
@@ -65,23 +66,27 @@
for an underbarrel-mounted disruptor, similar in operation to the standalone SC/FISHER. Chambered in 10mm."
desc_controls = "Right-click to use the underbarrel disruptor. Two shots maximum between self-charges."
icon_state = "pistol_evil_fisher"
- suppressed = TRUE
+ suppressed = SUPPRESSED_QUIET
can_suppress = FALSE
can_unsuppress = FALSE
var/obj/item/gun/energy/recharge/fisher/underbarrel
-/obj/item/gun/ballistic/automatic/pistol/clandestine/fisher/examine_more(mob/user)
- . = ..()
- . += span_notice("The Ansem/SC is a Scarborough Arms-manufactured overhaul suite for the also Scarborough Arms-manufactured Ansem handgun, designed for special \
- operators who like to operate operationally, and/or people who really, really hate lightbulbs, and tend to fight people who really like lightbulbs. \
- The slide is lengthened and has an integrated suppressor, while a compact kinetic light disruptor was mounted underneath the barrel. \
- Scarborough Arms has never actually officially responded to allegations that they're involved with the modification and/or manufacture \
- of the SC/FISHER or similar disruptor weapons. Operators are reminded that kinetic light disruptors do not actually physically harm targets. \
- Caveat emptor.")
-
/obj/item/gun/ballistic/automatic/pistol/clandestine/fisher/Initialize(mapload)
. = ..()
underbarrel = new /obj/item/gun/energy/recharge/fisher(src)
+ AddElement(/datum/element/examine_lore, \
+ lore = "The Ansem/SC is a Scarborough Arms overhaul suite for their own Ansem handgun, designed for special operators who operate operationally, \
+ especially against people who like using lightbulbs. \
+ \
+ The slide is chopped down, with the front half of the handgun featuring a monolithic integral suppressor built around the barrel, \
+ and a compact kinetic light disruptor mounted underneath the barrel assembly. The integral suppressor is engineered to not affect \
+ ballistic performance nor affect the concealability of the handgun, leading to a surprisingly robust firearm. \
+ \
+ Scarborough Arms has never actually addressed allegations of their involvement with the modification and/or manufacture \
+ of the SC/FISHER or similar disruptor weapons. Prospective operators are reminded that kinetic light disruptors do not actually physically harm targets. \
+ \
+ Caveat emptor." \
+ )
/obj/item/gun/ballistic/automatic/pistol/clandestine/fisher/Destroy()
QDEL_NULL(underbarrel)
@@ -89,10 +94,13 @@
/obj/item/gun/ballistic/automatic/pistol/clandestine/fisher/try_fire_gun(atom/target, mob/living/user, params)
if(LAZYACCESS(params2list(params), RIGHT_CLICK))
- return underbarrel.try_fire_gun(target, user, params)
+ underbarrel.try_fire_gun(target, user, params)
+ return
return ..()
/obj/item/gun/ballistic/automatic/pistol/clandestine/fisher/afterattack(atom/target, mob/user, list/modifiers, list/attack_modifiers)
+ if(QDELETED(target))
+ return
var/obj/projectile/energy/fisher/melee/simulated_hit = new
simulated_hit.firer = user
simulated_hit.on_hit(target)
@@ -181,6 +189,7 @@
accepted_magazine_type = /obj/item/ammo_box/magazine/r10mm
actions_types = list(/datum/action/item_action/toggle_firemode)
obj_flags = UNIQUE_RENAME // if you did the sidequest, you get the customization
+ custom_materials = list(/datum/material/gold = SHEET_MATERIAL_AMOUNT * 30, /datum/material/silver = SHEET_MATERIAL_AMOUNT * 25, /datum/material/iron = SHEET_MATERIAL_AMOUNT * 11.5)
/obj/item/gun/ballistic/automatic/pistol/aps
name = "\improper Stechkin APS machine pistol"
diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm
index 06a8b50c566e..6f4b9be9330c 100644
--- a/code/modules/projectiles/guns/ballistic/revolver.dm
+++ b/code/modules/projectiles/guns/ballistic/revolver.dm
@@ -97,8 +97,7 @@
. = ..()
var/live_ammo = get_ammo(FALSE, FALSE)
. += "[live_ammo ? live_ammo : "None"] of those are live rounds."
- if (current_skin)
- . += span_notice("It can be spun with [EXAMINE_HINT("alt-click")].")
+ . += span_notice("It can be spun with [EXAMINE_HINT("alt-click")].")
/obj/item/gun/ballistic/revolver/ignition_effect(atom/A, mob/user)
if(last_fire && last_fire + 15 SECONDS > world.time)
@@ -112,6 +111,47 @@
base_icon_state = "c38"
fire_sound = 'sound/items/weapons/gun/revolver/shot.ogg'
+// 38 special skins
+/datum/atom_skin/det_revolver
+ abstract_type = /datum/atom_skin/det_revolver
+ change_base_icon_state = TRUE
+
+/datum/atom_skin/det_revolver/default
+ preview_name = "Default"
+ new_icon_state = "c38"
+
+/datum/atom_skin/det_revolver/fitz_special
+ preview_name = "Fitz Special"
+ new_icon_state = "c38_fitz"
+
+/datum/atom_skin/det_revolver/police_positive_special
+ preview_name = "Police Positive Special"
+ new_icon_state = "c38_police"
+
+/datum/atom_skin/det_revolver/blued_steel
+ preview_name = "Blued Steel"
+ new_icon_state = "c38_blued"
+
+/datum/atom_skin/det_revolver/stainless_steel
+ preview_name = "Stainless Steel"
+ new_icon_state = "c38_stainless"
+
+/datum/atom_skin/det_revolver/gold_trim
+ preview_name = "Gold Trim"
+ new_icon_state = "c38_trim"
+
+/datum/atom_skin/det_revolver/golden
+ preview_name = "Golden"
+ new_icon_state = "c38_gold"
+
+/datum/atom_skin/det_revolver/peacemaker
+ preview_name = "The Peacemaker"
+ new_icon_state = "c38_peacemaker"
+
+/datum/atom_skin/det_revolver/black_panther
+ preview_name = "Black Panther"
+ new_icon_state = "c38_panther"
+
/obj/item/gun/ballistic/revolver/c38/detective
name = "\improper Colt Detective Special"
desc = "A classic, if not outdated, law enforcement firearm. Uses .38 Special rounds. \nSome spread rumors that if you loosen the barrel with a wrench, you can \"improve\" it."
@@ -126,17 +166,10 @@
misfire_percentage_increment = 25 //about 1 in 4 rounds, which increases rapidly every shot
obj_flags = UNIQUE_RENAME
- unique_reskin = list(
- "Default" = "c38",
- "Fitz Special" = "c38_fitz",
- "Police Positive Special" = "c38_police",
- "Blued Steel" = "c38_blued",
- "Stainless Steel" = "c38_stainless",
- "Gold Trim" = "c38_trim",
- "Golden" = "c38_gold",
- "The Peacemaker" = "c38_peacemaker",
- "Black Panther" = "c38_panther"
- )
+
+/obj/item/gun/ballistic/revolver/c38/detective/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/reskinable_item, /datum/atom_skin/det_revolver)
/obj/item/gun/ballistic/revolver/badass
name = "\improper Badass Revolver"
diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm
index e769a69eb477..db6567e2767f 100644
--- a/code/modules/projectiles/guns/ballistic/rifle.dm
+++ b/code/modules/projectiles/guns/ballistic/rifle.dm
@@ -217,6 +217,7 @@
fire_sound = 'sound/items/xbow_lock.ogg'
can_be_sawn_off = FALSE
tac_reloads = FALSE
+ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 3.1, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 1.2)
var/draw_time = 3 SECONDS
SET_BASE_PIXEL(0, 0)
@@ -298,6 +299,7 @@
inhand_icon_state = "pipegun"
worn_icon_state = "pipegun"
fire_sound = 'sound/items/weapons/gun/sniper/shot.ogg'
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 8, /datum/material/iron = SHEET_MATERIAL_AMOUNT * 8, /datum/material/cardboard = SHEET_MATERIAL_AMOUNT)
accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/pipegun
projectile_damage_multiplier = 1.35
@@ -308,6 +310,21 @@
SET_BASE_PIXEL(-8, 0)
+/obj/item/gun/ballistic/rifle/boltaction/pipegun/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/examine_lore, \
+ lore_hint = span_notice("You can [EXAMINE_HINT("look closer")] to recall a tale about [src]."), \
+ lore = "You were told this story, in hushed tones, from a wizened man in a grey jumpsuit...
\
+ It is said that the first slaying committed on a Nanotrasen space station was by an assistant.
\
+ That this act, done by toolbox, maybe spear, was what consigned their kind to a life of destitution, rejection and violence.
\
+ They carry the weight of this act visibly; the grey jumpsuit. Breathing deeply filtered air. And with bloodsoaked yellow hands clenched into fists.
\
+ Eyes, sharp and waiting. Hunters in the dark.
\
+ Eventually, these killing spirits sought to stake a claim on the metal tombs they were trapped within. Rejecting their status. Determined to be something more.
\
+ This weapon is one such tool. And it is a grim one indeed. Wrought from scrap, pulled from the station's walls and floors and the very nails holding it together. \
+ \
+ It is a symbol that the true masters of this place are not those who merely inhabit it. But the one willing to twist it towards a killing intent." \
+ )
+
/obj/item/gun/ballistic/rifle/boltaction/pipegun/add_bayonet_point()
AddComponent(/datum/component/bayonet_attachable, offset_x = 35, offset_y = 10)
@@ -315,23 +332,13 @@
. = ..()
do_sparks(1, TRUE, src)
-/obj/item/gun/ballistic/rifle/boltaction/pipegun/examine_more(mob/user)
- . = ..()
- . += span_notice("Looking down at \the [src], you recall a tale told to you in some distant memory...")
-
- . += span_info("It's said that the first slaying committed on a Nanotrasen space station was by an assistant.")
- . += span_info("That this act, done by toolbox, maybe spear, was what consigned their kind to a life of destitution, rejection and violence.")
- . += span_info("They carry the weight of this act visibly; the grey jumpsuit. Breathing deeply filtered air. And with bloodsoaked yellow hands clenched into fists. Eyes, sharp and waiting. Hunters in the dark.")
- . += span_info("Eventually, these killing spirits sought to stake a claim on the metal tombs they were trapped within. Rejecting their status. Determined to be something more.")
- . += span_info("This weapon is one such tool. And it is a grim one indeed. Wrought from scrap, pulled from the station's walls and floors and the very nails holding it together.")
- . += span_info("It is a symbol that the true masters of this place are not those who merely inhabit it. But the one willing to twist it towards a killing intent.")
-
/obj/item/gun/ballistic/rifle/boltaction/pipegun/pistol
name = "pipe pistol"
desc = "It is foolish to think that anyone wearing the grey is incapable of hurting you, simply because they are not baring their teeth."
icon_state = "pipepistol"
inhand_icon_state = "pipepistol"
worn_icon_state = "gun"
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 4, /datum/material/iron = SHEET_MATERIAL_AMOUNT * 7, /datum/material/cardboard = SHEET_MATERIAL_AMOUNT)
accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/pipegun/pistol
projectile_damage_multiplier = 0.50
spread = 15 //kinda inaccurate
@@ -356,6 +363,13 @@
worn_icon_state = "regal_pipegun"
accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/pipegun/prime
projectile_damage_multiplier = 2
+ custom_materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 9.15,
+ /datum/material/wood = SHEET_MATERIAL_AMOUNT *8,
+ /datum/material/gold = SHEET_MATERIAL_AMOUNT * 5,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT * 1.15,
+ /datum/material/cardboard = SHEET_MATERIAL_AMOUNT,
+ )
/obj/item/gun/ballistic/rifle/boltaction/pipegun/pistol/prime
name = "regal pipe pistol"
@@ -481,6 +495,7 @@
semi_auto = TRUE
slot_flags = ITEM_SLOT_BACK
projectile_damage_multiplier = 0.5
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 8, /datum/material/iron = SHEET_MATERIAL_AMOUNT * 5.5, /datum/material/cardboard = SHEET_MATERIAL_AMOUNT)
SET_BASE_PIXEL(-8, 0)
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index 1110d302a6ad..124284f3c994 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -46,17 +46,20 @@
desc = "A sturdy shotgun with a longer magazine and a fixed tactical stock designed for non-lethal riot control."
icon_state = "riotshotgun"
inhand_icon_state = "shotgun"
- fire_delay = 8
+ fire_delay = 8 DECISECONDS
accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/riot
sawn_desc = "Come with me if you want to live."
can_be_sawn_off = TRUE
- //component for seclight attachment
+ chambered_attack_block = TRUE // necessary for riot shotgun due to fire_delay and wanting to shoot point blank without accidental melee
+
+//component for seclight attachment
/obj/item/gun/ballistic/shotgun/riot/add_seclight_point()
AddComponent(/datum/component/seclite_attachable, \
light_overlay_icon = 'icons/obj/weapons/guns/flashlights.dmi', \
light_overlay = "flight", \
overlay_x = 20, \
overlay_y = 11)
+
// Automatic Shotguns//
/obj/item/gun/ballistic/shotgun/automatic/shoot_live_shot(mob/living/user)
@@ -71,6 +74,7 @@
projectile_damage_multiplier = 1.5
accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/com
w_class = WEIGHT_CLASS_HUGE
+
//component for seclight attachment
/obj/item/gun/ballistic/shotgun/automatic/combat/add_seclight_point()
AddComponent(/datum/component/seclite_attachable, \
@@ -78,6 +82,7 @@
light_overlay = "flight", \
overlay_x = 20, \
overlay_y = 11)
+
/obj/item/gun/ballistic/shotgun/automatic/combat/compact
name = "compact combat shotgun"
desc = "A compact version of the semi automatic combat shotgun. Lower magazine capacity, but more easily carried."
@@ -85,6 +90,7 @@
accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/com/compact
w_class = WEIGHT_CLASS_BULKY
weapon_weight = WEAPON_MEDIUM
+
//component for seclight attachment
/obj/item/gun/ballistic/shotgun/automatic/combat/compact/add_seclight_point()
AddComponent(/datum/component/seclite_attachable, \
@@ -92,6 +98,7 @@
light_overlay = "flight", \
overlay_x = 16, \
overlay_y = 11)
+
//Dual Feed Shotgun
/obj/item/gun/ballistic/shotgun/automatic/dual_tube
@@ -105,7 +112,6 @@
inhand_y_dimension = 32
worn_icon_state = "cshotgun"
w_class = WEIGHT_CLASS_HUGE
- semi_auto = TRUE
accepted_magazine_type = /obj/item/ammo_box/magazine/internal/shot/tube
interaction_flags_click = NEED_DEXTERITY|NEED_HANDS|ALLOW_RESTING
/// If defined, the secondary tube is this type, if you want different shell loads
@@ -138,7 +144,7 @@
return ..()
/obj/item/gun/ballistic/shotgun/automatic/dual_tube/attack_self(mob/living/user)
- if(!chambered && magazine.contents.len)
+ if(!chambered && get_ammo())
rack()
else
toggle_tube(user)
@@ -278,6 +284,36 @@
/obj/item/gun/ballistic/shotgun/bulldog/unrestricted
pin = /obj/item/firing_pin
+
+// Double barrel shotgun skins
+/datum/atom_skin/bar_shotgun
+ abstract_type = /datum/atom_skin/bar_shotgun
+ change_base_icon_state = TRUE
+
+/datum/atom_skin/bar_shotgun/default
+ preview_name = "Standard Finish"
+ new_icon_state = "dshotgun"
+
+/datum/atom_skin/bar_shotgun/dark_red
+ preview_name = "Dark Red Finish"
+ new_icon_state = "dshotgun_d"
+
+/datum/atom_skin/bar_shotgun/ash
+ preview_name = "Ash"
+ new_icon_state = "dshotgun_f"
+
+/datum/atom_skin/bar_shotgun/faded_grey
+ preview_name = "Faded Grey"
+ new_icon_state = "dshotgun_g"
+
+/datum/atom_skin/bar_shotgun/maple
+ preview_name = "Maple"
+ new_icon_state = "dshotgun_l"
+
+/datum/atom_skin/bar_shotgun/rosewood
+ preview_name = "Rosewood"
+ new_icon_state = "dshotgun_p"
+
/////////////////////////////
// DOUBLE BARRELED SHOTGUN //
/////////////////////////////
@@ -297,18 +333,15 @@
sawn_desc = "Omar's coming!"
obj_flags = UNIQUE_RENAME
rack_sound_volume = 0
- unique_reskin = list("Default" = "dshotgun",
- "Dark Red Finish" = "dshotgun_d",
- "Ash" = "dshotgun_f",
- "Faded Grey" = "dshotgun_g",
- "Maple" = "dshotgun_l",
- "Rosewood" = "dshotgun_p"
- )
semi_auto = TRUE
bolt_type = BOLT_TYPE_NO_BOLT
can_be_sawn_off = TRUE
pb_knockback = 3 // it's a super shotgun!
+/obj/item/gun/ballistic/shotgun/doublebarrel/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/reskinable_item, /datum/atom_skin/bar_shotgun)
+
/obj/item/gun/ballistic/shotgun/doublebarrel/sawoff(mob/user)
. = ..()
if(.)
diff --git a/code/modules/projectiles/guns/ballistic/toy.dm b/code/modules/projectiles/guns/ballistic/toy.dm
index dae77b093683..6d43ecbcea24 100644
--- a/code/modules/projectiles/guns/ballistic/toy.dm
+++ b/code/modules/projectiles/guns/ballistic/toy.dm
@@ -14,6 +14,7 @@
item_flags = NONE
gun_flags = TOY_FIREARM_OVERLAY | NOT_A_REAL_GUN
casing_ejector = FALSE
+ can_muzzle_flash = FALSE
/obj/item/gun/ballistic/automatic/toy/riot
spawn_magazine_type = /obj/item/ammo_box/magazine/toy/smg/riot
@@ -49,6 +50,7 @@
weapon_weight = WEAPON_LIGHT
pb_knockback = 0
gun_flags = TOY_FIREARM_OVERLAY | NOT_A_REAL_GUN
+ can_muzzle_flash = FALSE
/obj/item/gun/ballistic/shotgun/toy/handle_chamber(empty_chamber = TRUE, from_firing = TRUE, chamber_next_round = TRUE)
. = ..()
@@ -75,6 +77,7 @@
slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_SMALL
gun_flags = NONE
+ can_muzzle_flash = FALSE
/obj/item/gun/ballistic/shotgun/toy/crossbow/riot
spawn_magazine_type = /obj/item/ammo_box/magazine/internal/shot/toy/crossbow/riot
@@ -89,6 +92,7 @@
casing_ejector = FALSE
clumsy_check = FALSE
gun_flags = TOY_FIREARM_OVERLAY | NOT_A_REAL_GUN
+ can_muzzle_flash = FALSE
/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted //Use this for actual toys
pin = /obj/item/firing_pin
@@ -108,6 +112,7 @@
casing_ejector = FALSE
clumsy_check = FALSE
gun_flags = TOY_FIREARM_OVERLAY | NOT_A_REAL_GUN
+ can_muzzle_flash = FALSE
/obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted //Use this for actual toys
pin = /obj/item/firing_pin
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index 734bce371227..e7910d37be58 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -47,6 +47,13 @@
var/charge_delay = 8
/// The amount restored by the gun to the cell per self charge tick
var/self_charge_amount = STANDARD_ENERGY_GUN_SELF_CHARGE_RATE
+ /// sound played when fire mode select is done
+ var/fire_mode_switch_sound = SFX_FIRE_MODE_SWITCH
+
+ // EMP related vars
+
+ /// A divide to the amount of charge lost when the weapon is EMP'd. Higher means more resistant.
+ var/emp_resistance = 1
/obj/item/gun/energy/fire_sounds()
// What frequency the energy gun's sound will make
@@ -74,7 +81,7 @@
/obj/item/gun/energy/emp_act(severity)
. = ..()
if(!(. & EMP_PROTECT_CONTENTS))
- cell.use(round(cell.charge / severity))
+ cell.use(round(cell.charge / emp_resistance / severity))
chambered = null //we empty the chamber
recharge_newshot() //and try to charge a new shot
update_appearance()
@@ -231,11 +238,15 @@
var/obj/item/ammo_casing/energy/shot = ammo_type[select]
fire_sound = shot.fire_sound
fire_delay = shot.delay
+ if (shot.muzzle_flash_color)
+ set_light_color(shot.muzzle_flash_color)
if (shot.select_name && user)
balloon_alert(user, "set to [shot.select_name]")
chambered = null
recharge_newshot(TRUE)
update_appearance()
+ if(fire_mode_switch_sound)
+ playsound(src, fire_mode_switch_sound, 50, TRUE)
/obj/item/gun/energy/update_icon_state()
var/skip_inhand = initial(inhand_icon_state) //only build if we aren't using a preset inhand icon
diff --git a/code/modules/projectiles/guns/energy/beam_rifle.dm b/code/modules/projectiles/guns/energy/beam_rifle.dm
index e5e36337ae23..bf82ed7939b2 100644
--- a/code/modules/projectiles/guns/energy/beam_rifle.dm
+++ b/code/modules/projectiles/guns/energy/beam_rifle.dm
@@ -19,7 +19,16 @@
w_class = WEIGHT_CLASS_BULKY
ammo_type = list(/obj/item/ammo_casing/energy/event_horizon)
selfcharge = TRUE
+ light_color = COLOR_STRONG_BLUE
self_charge_amount = STANDARD_ENERGY_GUN_SELF_CHARGE_RATE * 10
+ custom_materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 5,
+ /datum/material/uranium = SHEET_MATERIAL_AMOUNT * 4,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT * 2.5,
+ /datum/material/diamond = SHEET_MATERIAL_AMOUNT * 2.5,
+ /datum/material/gold = SHEET_MATERIAL_AMOUNT * 2.5,
+ /datum/material/silver = SHEET_MATERIAL_AMOUNT * 2.25,
+ )
/obj/item/gun/energy/event_horizon/Initialize(mapload)
. = ..()
diff --git a/code/modules/projectiles/guns/energy/crank_guns.dm b/code/modules/projectiles/guns/energy/crank_guns.dm
index 05139823fae2..1a2e785cd397 100644
--- a/code/modules/projectiles/guns/energy/crank_guns.dm
+++ b/code/modules/projectiles/guns/energy/crank_guns.dm
@@ -7,6 +7,8 @@
ammo_type = list(/obj/item/ammo_casing/energy/laser/musket)
slot_flags = ITEM_SLOT_BACK
obj_flags = UNIQUE_RENAME
+ custom_materials = list(/datum/material/wood = SHEET_MATERIAL_AMOUNT * 8, /datum/material/glass = SHEET_MATERIAL_AMOUNT * 1.2, /datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.2)
+ light_color = COLOR_PURPLE
/obj/item/gun/energy/laser/musket/add_bayonet_point()
AddComponent(/datum/component/bayonet_attachable, offset_x = 22, offset_y = 11)
@@ -34,6 +36,13 @@
inhand_icon_state = "musket_prime"
worn_icon_state = "las_musket_prime"
ammo_type = list(/obj/item/ammo_casing/energy/laser/musket/prime)
+ custom_materials = list(
+ /datum/material/wood = SHEET_MATERIAL_AMOUNT * 8,
+ /datum/material/silver = SHEET_MATERIAL_AMOUNT * 5,
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 1.4,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT * 1.35,
+ /datum/material/plastic = SMALL_MATERIAL_AMOUNT * 2,
+ )
/obj/item/gun/energy/disabler/smoothbore
@@ -45,6 +54,12 @@
charge_sections = 1
spread = 22.5
obj_flags = UNIQUE_RENAME
+ custom_materials = list(
+ /datum/material/wood = SHEET_MATERIAL_AMOUNT * 8,
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2.25,
+ /datum/material/cardboard = SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = SMALL_MATERIAL_AMOUNT * 1.2,
+ )
/obj/item/gun/energy/disabler/smoothbore/Initialize(mapload)
. = ..()
@@ -74,6 +89,12 @@
ammo_type = list(/obj/item/ammo_casing/energy/disabler/smoothbore/prime)
charge_sections = 2
spread = 0 //could be like 5, but having just very tiny spread kinda feels like bullshit
+ custom_materials = list(
+ /datum/material/wood = SHEET_MATERIAL_AMOUNT * 8,
+ /datum/material/gold = SHEET_MATERIAL_AMOUNT * 5,
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 2.25,
+ /datum/material/cardboard = SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = SMALL_MATERIAL_AMOUNT * 5.2)
//Inferno and Cryo Pistols
@@ -118,6 +139,7 @@
While it doesn't manipulate temperature in and of itself, it does cause an violent eruption in anyone who is severely cold. Able to generate \
ammunition by manually spinning the weapon's nanite canister."
icon_state = "infernopistol"
+ light_color = COLOR_RED
ammo_type = list(/obj/item/ammo_casing/energy/nanite/inferno)
/obj/item/gun/energy/laser/thermal/cryo //the ice gun
@@ -126,4 +148,81 @@
While it doesn't manipulate temperature in and of itself, it does cause an internal explosion in anyone who is severely hot. Able to generate \
ammunition by manually spinning the weapon's nanite canister."
icon_state = "cryopistol"
+ light_color = COLOR_BLUE
ammo_type = list(/obj/item/ammo_casing/energy/nanite/cryo)
+
+/obj/item/gun/energy/laser/musket/repeater
+ name = "Iconoclast's Repeater"
+ desc = "A weapon of incredible bulk, this ratvarian repeater has been permanently severed from its stand to be carried by hand. Cumbersome, Yes - but powerful."
+ icon_state = "repeater"
+ inhand_icon_state = "repeater"
+ slowdown = 1
+ w_class = WEIGHT_CLASS_HUGE
+ ammo_type = list(/obj/item/ammo_casing/energy/laser/musket/repeater)
+ spread = 20
+ charge_sections = 1
+ item_flags = SLOWS_WHILE_IN_HAND | IMMUTABLE_SLOW
+ 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/item/gun/energy/laser/musket/repeater/Initialize(mapload)
+ . = ..()
+ AddComponent( \
+ /datum/component/crank_recharge, \
+ charging_cell = get_cell(), \
+ charge_amount = STANDARD_CELL_CHARGE, \
+ cooldown_time = 3 SECONDS, \
+ charge_sound = 'sound/machines/clockcult/integration_cog_install.ogg', \
+ charge_sound_cooldown_time = 3 SECONDS, \
+ charge_move = IGNORE_USER_LOC_CHANGE, \
+ )
+ AddComponent(/datum/component/automatic_fire, 0.5 SECONDS)
+// The Deep Lore //
+
+// Laser Musket
+
+/obj/item/gun/energy/laser/musket/add_deep_lore()
+ AddElement(/datum/element/examine_lore, \
+ lore_hint = span_notice("You can [EXAMINE_HINT("think carefully")] to learn a little more about [src]."), \
+ lore = "The first examples of laser muskets emerged somewhat recently, even though improvised firearms have had \
+ a rich history throughout human, Mothic and Tiziran history. \
+ \
+ Laser muskets often started to emerge when conventional weaponry or ammunition started to grow scarcer, and the amount \
+ of scrap electronics and materials outpaced the speed at which engineering crews could repair structural defenses and \
+ infrastructure. They're regarded as weapons of extreme desperation, but also of unmatched grit in the face of a hopeless situation. \
+ \
+ Constructing one of these is sometimes seen as a rite of passage amongst militia groups and rebel forces. Each one as unique \
+ as the next. \
+ \
+ What will this one's name be? What history will it write? Time will surely tell." \
+ )
+
+// Thermal Pistols
+
+/obj/item/gun/energy/laser/thermal/add_deep_lore()
+ AddElement(/datum/element/examine_lore, \
+ lore_hint = span_notice("You can [EXAMINE_HINT("look closer")] to learn a little more about [src]."), \
+ lore = "A weapon with no name, more a pattern of design. Examples of thermal pistols vary heavily based on the \
+ manufacturer or craftsperson. However, the original inventor of the thermal pistol is largely clouded in mystery. \
+ Replica versions of the pistol were circulating long before weaponized nanites were banned by the \
+ TerraGov Subdermal Weapons Accord, and have continued to exist as a means of disposing of the self-replicating stocks \
+ of weaponized nanites. \
+ \
+ This is an example of Nanotrasen's Viper Classic model, based on earlier models of the weapon in appearance, but using \
+ up to date nanite breeding chambers that respond to user articulation. That is, the weapons can be charged with a vigorous \
+ shake. Though most users prefer to use the custom trick triggerguard to twirl them on their finger. Mostly for showmanship. \
+ \
+ Due to various movies and television programs, or perhaps spacer legends of fancy, the weapons are often associated with the \
+ 'Space Rangers' that roam the periphery and Australicus regions of space. Polarizing tales of rugged gun fighters roaming \
+ from outpost to outpost, leaving justice, death or merely a large quantity of buzzing nanite clouds in their wake. \
+ Robber barons, frontier lawbringers. Even the occasional hard-boiled detective. These weapons are sometimes associated \
+ with cultural imagery around rugged individualism, tenacity and nonconformity, as well as a bygone age of noble warriors and \
+ ruthless villains. Using these weapons today is largely seen as a way to evoke this imagery, even if it comes across \
+ as mildly tacky. \
+ \
+ It isn't fully understood who started the practice of 'pairing' the pistols, though the custom has remained as long as \
+ living memory. Every thermal pistol has a mate, and it is considered ill fortune to separate them purposefully." \
+ )
diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm
index be6f33c935ed..64241bfb5e5a 100644
--- a/code/modules/projectiles/guns/energy/energy_gun.dm
+++ b/code/modules/projectiles/guns/energy/energy_gun.dm
@@ -8,6 +8,7 @@
modifystate = TRUE
ammo_x_offset = 3
dual_wield_spread = 60
+ light_color = LIGHT_COLOR_CYAN
/obj/item/gun/energy/e_gun/Initialize(mapload)
. = ..()
@@ -157,6 +158,12 @@
ammo_x_offset = 1
ammo_type = list(/obj/item/ammo_casing/energy/laser, /obj/item/ammo_casing/energy/disabler)
selfcharge = 1
+ custom_materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 6,
+ /datum/material/uranium = SHEET_MATERIAL_AMOUNT * 1.5,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT,
+ /datum/material/titanium = HALF_SHEET_MATERIAL_AMOUNT,
+ )
var/reactor_overloaded
var/fail_tick = 0
var/fail_chance = 0
@@ -177,11 +184,11 @@
switch(fail_tick)
if(0 to 200)
fail_tick += (2*(fail_chance))
- M.adjustFireLoss(3)
+ M.adjust_fire_loss(3)
to_chat(M, span_userdanger("Your [name] feels warmer."))
if(201 to INFINITY)
SSobj.processing.Remove(src)
- M.adjustFireLoss(10)
+ M.adjust_fire_loss(10)
reactor_overloaded = TRUE
to_chat(M, span_userdanger("Your [name]'s reactor overloads!"))
diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
index 6b7d38298c7b..57534ab96b6b 100644
--- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
@@ -705,5 +705,5 @@
/obj/item/borg/upgrade/modkit/tracer/adjustable/proc/choose_bolt_color(mob/user)
set waitfor = FALSE
- var/new_color = input(user,"","Choose Color",bolt_color) as color|null
+ var/new_color = tgui_color_picker(user, "", "Choose Color", bolt_color)
bolt_color = new_color || bolt_color
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index 228bbcc4ceb0..321187a81dce 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -1,27 +1,29 @@
/obj/item/gun/energy/laser
- name = "laser gun"
- desc = "A basic energy-based laser gun that fires concentrated beams of light which pass through glass and thin metal."
+ name = "\improper Type 5 laser gun"
+ desc = "The Type 5 Heat Delivery System, developed by Nanotrasen. The workhorse of Nanotrasen's security forces."
icon_state = "laser"
inhand_icon_state = "laser"
w_class = WEIGHT_CLASS_BULKY
custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT)
ammo_type = list(/obj/item/ammo_casing/energy/lasergun)
- ammo_x_offset = 1
- shaded_charge = 1
+ shaded_charge = TRUE
+ light_color = COLOR_SOFT_RED
/obj/item/gun/energy/laser/Initialize(mapload)
. = ..()
- // Only actual lasguns can be converted
+ add_deep_lore()
+
+ // Only regular lasguns can be slapcrafted
if(type != /obj/item/gun/energy/laser)
return
-/*
+ /*
var/static/list/slapcraft_recipe_list = list(/datum/crafting_recipe/xraylaser, /datum/crafting_recipe/hellgun, /datum/crafting_recipe/ioncarbine)
-
AddElement(
/datum/element/slapcrafting,\
slapcraft_recipes = slapcraft_recipe_list,\
)
*/ // DARKPACK EDIT REMOVE
+
/obj/item/gun/energy/laser/add_seclight_point()
AddComponent(/datum/component/seclite_attachable, \
light_overlay_icon = 'icons/obj/weapons/guns/flashlights.dmi', \
@@ -29,109 +31,192 @@
overlay_x = 18, \
overlay_y = 12)
+/obj/item/gun/energy/laser/pistol
+ name = "\improper Type 5/C laser pistol"
+ desc = "The Type 5 Heat Delivery System, Compact Variant, developed by Nanotrasen. The workhorse of Nanotrasen's security forces, but in a more portable size. \
+ Sacrifices some stopping power and capacity for ease of carry and faster charging."
+ icon_state = "laser_pistol"
+ w_class = WEIGHT_CLASS_NORMAL
+ projectile_damage_multiplier = 0.8
+ cell_type = /obj/item/stock_parts/power_store/cell/laser_pistol
+ ammo_type = list(/obj/item/ammo_casing/energy/lasergun/pistol)
+
+/obj/item/gun/energy/laser/pistol/add_seclight_point()
+ return
+
+/obj/item/gun/energy/laser/assault
+ name = "\improper Type 5/A assault laser rifle"
+ desc = "The Type 5 Heat Delivery System, Assault Variant, developed by Nanotrasen. The workhorse of Nanotrasen's security forces and paramilitary organizations. \
+ While it sacrifices some stopping power and ease of use, its laser system is remarkably efficient and it boasts some resistance against electromagnetic interference."
+ icon = 'icons/obj/weapons/guns/wide_guns.dmi'
+ icon_state = "assault_laser"
+ inhand_icon_state = "assault_laser"
+ worn_icon_state = "assault_laser"
+ slot_flags = ITEM_SLOT_BACK
+ burst_size = 2
+ fire_delay = 1
+ ammo_type = list(/obj/item/ammo_casing/energy/lasergun/assault)
+ emp_resistance = 2
+ weapon_weight = WEAPON_HEAVY
+ projectile_speed_multiplier = 1.5
+ SET_BASE_PIXEL(-8, 0)
+
+/obj/item/gun/energy/laser/assault/add_seclight_point()
+ AddComponent(/datum/component/seclite_attachable, \
+ light_overlay_icon = 'icons/obj/weapons/guns/flashlights.dmi', \
+ light_overlay = "flight", \
+ overlay_x = 18, \
+ overlay_y = 30)
+
/obj/item/gun/energy/laser/practice
name = "practice laser gun"
- desc = "A modified version of the basic laser gun, this one fires less concentrated energy bolts designed for target practice."
+ desc = "A modified version of the Type 5 laser gun. Fires entirely harmless bolts of directed energy. Safe AND entertaining to fire with abandon."
ammo_type = list(/obj/item/ammo_casing/energy/laser/practice)
clumsy_check = FALSE
item_flags = NONE
gun_flags = NOT_A_REAL_GUN
+/obj/item/gun/energy/laser/practice/add_deep_lore()
+ return
+
/obj/item/gun/energy/laser/retro
- name ="retro laser gun"
+ name ="\improper Type 1 laser gun"
+ desc = "The Type 1 Heat Delivery System, developed by Nanotrasen. No longer used by Nanotrasen's private security or military forces. Nevertheless, \
+ it is still quite deadly and easy to maintain, making it a favorite amongst pirates and other outlaws."
icon_state = "retro"
- desc = "An older model of the basic lasergun, no longer used by Nanotrasen's private security or military forces. Nevertheless, it is still quite deadly and easy to maintain, making it a favorite amongst pirates and other outlaws."
ammo_x_offset = 3
+/obj/item/gun/energy/laser/soul
+ name ="\improper Type 3 laser gun"
+ desc = "The Type 3 Heat Delivery System, developed by Nanotrasen. Quite possibly the most popular model of HDS ever made by Nanotrasen. \
+ They don't make them like they used to."
+ icon_state = "laser_soulful"
+ inhand_icon_state = "laser_soulful"
+ ammo_x_offset = 1
+
/obj/item/gun/energy/laser/carbine
- name = "laser carbine"
- desc = "A modified laser gun which can shoot far faster, but each shot is far less damaging."
+ name = "\improper Type 5/R laser carbine"
+ desc = "The burst fire Type 5/R Rapid Heat Delivery System, developed by Nanotrasen. Capable of firing a sustained volley of directed energy projectiles, though each individual projectile lacks the punch of the Type 5."
icon_state = "laser_carbine"
+ burst_size = 2
+ fire_delay = 2
+ projectile_damage_multiplier = 0.75
+ projectile_speed_multiplier = 1.5
ammo_type = list(/obj/item/ammo_casing/energy/lasergun/carbine)
+ weapon_weight = WEAPON_MEDIUM
-/obj/item/gun/energy/laser/carbine/Initialize(mapload)
- . = ..()
- AddComponent(/datum/component/automatic_fire, 0.15 SECONDS, allow_akimbo = FALSE)
-
-/obj/item/gun/energy/laser/carbine/cybersun
+/obj/item/gun/energy/laser/cybersun
name = "\improper Cybersun S-120"
desc = "A laser gun primarily used by syndicate security guards. It fires a rapid spray of low-power plasma beams."
icon_state = "cybersun_s120"
inhand_icon_state = "s120"
- ammo_type = list(/obj/item/ammo_casing/energy/lasergun/carbine/cybersun)
+ ammo_type = list(/obj/item/ammo_casing/energy/lasergun/cybersun)
spread = 14
pin = /obj/item/firing_pin/implant/pindicate
+ ammo_x_offset = 1
+
+/obj/item/gun/energy/laser/cybersun/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/automatic_fire, 0.15 SECONDS, allow_akimbo = FALSE)
+
+/obj/item/gun/energy/laser/cybersun/add_deep_lore()
+ return
-/obj/item/gun/energy/laser/carbine/cybersun/unrestricted
+/obj/item/gun/energy/laser/cybersun/unrestricted
pin = /obj/item/firing_pin
/obj/item/gun/energy/laser/carbine/practice
name = "practice laser carbine"
- desc = "A modified version of the laser carbine, this one fires even less concentrated energy bolts designed for target practice."
+ desc = "A modified version of the Type 5/R laser carbine. Fires entirely harmless bolts of directed energy. Safe AND entertaining to fire with abandon."
ammo_type = list(/obj/item/ammo_casing/energy/lasergun/carbine/practice)
clumsy_check = FALSE
item_flags = NONE
gun_flags = NOT_A_REAL_GUN
+/obj/item/gun/energy/laser/carbine/practice/add_deep_lore()
+ return
+
/obj/item/gun/energy/laser/retro/old
- name ="laser gun"
- icon_state = "retro"
- desc = "First generation lasergun, developed by Nanotrasen. Suffers from ammo issues but its unique ability to recharge its ammo without the need of a magazine helps compensate. You really hope someone has developed a better lasergun while you were in cryo."
+ desc = "The NT Type 1 Heat Delivery System, developed by Nanotrasen. This one looks downright ancient. What the hell happened to it?"
ammo_type = list(/obj/item/ammo_casing/energy/lasergun/old)
- ammo_x_offset = 3
+
+/obj/item/gun/energy/laser/retro/old/add_deep_lore()
+ return
/obj/item/gun/energy/laser/hellgun
- name ="hellfire laser gun"
- desc = "A relic of a weapon, built before NT began installing regulators on its laser weaponry. This pattern of laser gun became infamous for the gruesome burn wounds it caused, and was quietly discontinued once it began to affect NT's reputation."
+ name = "\improper Type 4 'hellfire' laser gun"
+ desc = "The Type 4 Heat Delivery System, developed by Nanotrasen. Technically speaking, it is an improvement. \
+ Legally speaking, possession of this weapon is restricted in most occupied sectors of space. \
+ The Type 4 is notorious for its ability to render victims a carbonized husk with ease, melting flesh and bone as easily as butter. \
+ A painful, gruesome death awaits anyone on the wrong end of this gun."
icon_state = "hellgun"
ammo_type = list(/obj/item/ammo_casing/energy/laser/hellfire)
+ ammo_x_offset = 1
+ light_color = COLOR_AMMO_HELLFIRE
/obj/item/gun/energy/laser/captain
name = "antique laser gun"
+ desc = "This is an antique laser gun. All craftsmanship is of the highest quality. It is decorated with assistant leather and chrome. \
+ The object menaces with spikes of energy. On the item is an image of Space Station 13. The station is exploding."
icon_state = "caplaser"
w_class = WEIGHT_CLASS_NORMAL
inhand_icon_state = null
- desc = "This is an antique laser gun. All craftsmanship is of the highest quality. It is decorated with assistant leather and chrome. The object menaces with spikes of energy. On the item is an image of Space Station 13. The station is exploding."
force = 10
ammo_x_offset = 3
selfcharge = 1
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
flags_1 = PREVENT_CONTENTS_EXPLOSION_1
ammo_type = list(/obj/item/ammo_casing/energy/laser/hellfire)
+ light_color = COLOR_AMMO_HELLFIRE
/obj/item/gun/energy/laser/captain/scattershot
name = "scatter shot laser rifle"
+ desc = "An industrial-grade heavy-duty laser rifle with a modified laser lens to scatter its shot into multiple smaller lasers. \
+ The inner-core can self-charge for theoretically infinite use."
icon_state = "lasercannon"
w_class = WEIGHT_CLASS_BULKY
inhand_icon_state = "laser"
- desc = "An industrial-grade heavy-duty laser rifle with a modified laser lens to scatter its shot into multiple smaller lasers. The inner-core can self-charge for theoretically infinite use."
ammo_type = list(/obj/item/ammo_casing/energy/laser/scatter, /obj/item/ammo_casing/energy/laser)
shaded_charge = FALSE
+ ammo_x_offset = 1
+
+
+/obj/item/gun/energy/laser/captain/scattershot/add_deep_lore()
+ return
/obj/item/gun/energy/laser/cyborg
can_charge = FALSE
desc = "An energy-based laser gun that draws power from the cyborg's internal energy cell directly. So this is what freedom looks like?"
use_cyborg_cell = TRUE
+ ammo_x_offset = 1
/obj/item/gun/energy/laser/cyborg/Initialize(mapload)
. = ..()
AddElement(/datum/element/empprotection, EMP_PROTECT_ALL)
+/obj/item/gun/energy/laser/cyborg/add_deep_lore()
+ return
+
/obj/item/gun/energy/laser/scatter
name = "scatter laser gun"
desc = "A laser gun equipped with a refraction kit that spreads bolts."
ammo_type = list(/obj/item/ammo_casing/energy/laser/scatter, /obj/item/ammo_casing/energy/laser)
+ ammo_x_offset = 1
+
+/obj/item/gun/energy/laser/scatter/add_deep_lore()
+ return
/obj/item/gun/energy/laser/scatter/shotty
name = "energy shotgun"
icon = 'icons/obj/weapons/guns/ballistic.dmi'
icon_state = "cshotgun"
inhand_icon_state = "shotgun"
- desc = "A combat shotgun gutted and refitted with an internal laser system. Can switch between taser and scattered disabler shots."
- shaded_charge = 0
+ desc = "A combat shotgun gutted and refitted with an internal energy emission system. Can switch between scattered disabler shots and taser electrodes."
+ shaded_charge = FALSE
pin = /obj/item/firing_pin/implant/mindshield
ammo_type = list(/obj/item/ammo_casing/energy/laser/scatter/disabler, /obj/item/ammo_casing/energy/electrode)
automatic_charge_overlays = FALSE
+ ammo_x_offset = 1
///Laser Cannon
@@ -149,35 +234,26 @@
pin = null
ammo_x_offset = 3
-/obj/item/ammo_casing/energy/laser/accelerator
- projectile_type = /obj/projectile/beam/laser/accelerator
- select_name = "accelerator"
- fire_sound = 'sound/items/weapons/lasercannonfire.ogg'
-
-/obj/projectile/beam/laser/accelerator
- name = "accelerator laser"
- icon_state = "scatterlaser"
- range = 255
- damage = 6
- var/size_per_tile = 0.1
- var/max_scale = 4
-
-/obj/projectile/beam/laser/accelerator/reduce_range()
- ..()
- damage += 7
- transform = matrix()
- transform *= min(1 + (maximum_range - range) * size_per_tile, max_scale)
-
///X-ray gun
-/obj/item/gun/energy/xray
- name = "\improper X-ray laser gun"
- desc = "A high-power laser gun capable of expelling concentrated X-ray blasts that pass through multiple soft targets and heavier materials."
+/obj/item/gun/energy/laser/xray
+ name = "\improper Type 6 X-ray laser gun"
+ desc = "The Type 6 Heat Delivery System, developed by Nanotrasen. \
+ Capable of expelling concentrated 'X-ray' blasts that pass through multiple soft targets and heavier materials."
icon_state = "xray"
w_class = WEIGHT_CLASS_BULKY
inhand_icon_state = null
ammo_type = list(/obj/item/ammo_casing/energy/xray)
ammo_x_offset = 3
+ custom_materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 3.5,
+ /datum/material/gold = SHEET_MATERIAL_AMOUNT * 2.5,
+ /datum/material/uranium = SHEET_MATERIAL_AMOUNT * 2,
+ /datum/material/titanium = SHEET_MATERIAL_AMOUNT,
+ /datum/material/bluespace = SHEET_MATERIAL_AMOUNT,
+ )
+ shaded_charge = FALSE
+ light_color = LIGHT_COLOR_GREEN
////////Laser Tag////////////////////
@@ -196,6 +272,9 @@
/obj/item/gun/energy/laser/bluetag/hitscan
ammo_type = list(/obj/item/ammo_casing/energy/laser/bluetag/hitscan)
+/obj/item/gun/energy/laser/bluetag/add_deep_lore()
+ return
+
/obj/item/gun/energy/laser/redtag
name = "laser tag gun"
icon_state = "redtag"
@@ -208,16 +287,183 @@
selfcharge = TRUE
gun_flags = NOT_A_REAL_GUN
+/obj/item/gun/energy/laser/redtag/add_deep_lore()
+ return
+
/obj/item/gun/energy/laser/redtag/hitscan
ammo_type = list(/obj/item/ammo_casing/energy/laser/redtag/hitscan)
// luxury shuttle funnies
/obj/item/firing_pin/paywall/luxury
multi_payment = TRUE
- owned = TRUE
payment_amount = 20
/obj/item/gun/energy/laser/luxurypaywall
name = "luxurious laser gun"
desc = "A laser gun modified to cost 20 credits to fire. Point towards poor people."
pin = /obj/item/firing_pin/paywall/luxury
+
+// The Deep Lore //
+
+// Laser Gun
+
+/obj/item/gun/energy/laser/proc/add_deep_lore()
+ AddElement(/datum/element/examine_lore, \
+ lore_hint = span_notice("You can [EXAMINE_HINT("look closer")] to learn a little more about [src]."), \
+ lore = "The NT Type 5 Heat Delivery System (sometimes referred to as the HDS-5 in promotional material) is what truly put Nanotrasen \
+ head and shoulders above most weapon manufacturers in the modern era. All modern energy weaponry offered by the company have \
+ the success of the Type 5 to thank for setting the standard for energy-based weapon platforms. \
+ \
+ Adopted as the standard infantry firearm for Nanotrasen military forces, as well as private security lethal armaments, few can deny \
+ the weapon's reliability, and at an affordable price! \
+ \
+ However, the weapon platform still possesses many of the vulnerabilities of previous energy-based weaponry. Onboard power supplies \
+ cannot be adequately shielded from external electromagnetic pulses that might interfere with the weapon's functionality without \
+ also severely jeopardizing thermal distribution into the weapon's heatsink. The Type 4, which never saw wider adoption, remains a \
+ haunting example to Nanotrasen's weapons division as to the consequences when a HDS is unable to expel thermal buildup safely. \
+ \
+ Certainly, the Melted Veterans of Galpha 5 advocacy group will never let them forget it." \
+ )
+
+// Retro Laser Gun
+
+/obj/item/gun/energy/laser/retro/add_deep_lore()
+ AddElement(/datum/element/examine_lore, \
+ lore_hint = span_notice("You can [EXAMINE_HINT("look closer")] to learn a little more about [src]."), \
+ lore = "The NT Type 1 Heat Delivery System (sometimes referred to as the HDS-1 in older weapon catalogs) was a weapon that \
+ marked the beginning of a new era of firearm development. \
+ \
+ Invented in the think-tank laboratories of Nanotrasen's weapon development team towards the end of the 24th century, the Type 1 found \
+ itself adopted broadly by various factions and military entities vying for control over the frontier once it hit the market. One \
+ hallmark of those who stood successful in these conflicts was the adoption of the Type 1 as a standard infantry \
+ weapon. The logistics required to maintain the operational peak of the HDS-1 allowed most quartermasters to merely dump a half \
+ dozen of the weapons into the hands of bloodythirsty marines, knowing full well the weapons were rugged enough to survive \
+ most anything thrown at them, only needing a recharging station with a power supply to become operational again once they ran empty. \
+ \
+ So many of these weapons exist today that even modern conflicts may see more usage of the HDS-1 than the updated and equally \
+ reliable HDS5 employed by Nanotrasen's modern combat forces. Nanotrasen, despite their best efforts, still have not managed \
+ to encourage potential customers to swap for the new model despite a generous exchange discount." \
+ )
+
+// Soulful Laser Gun
+
+/obj/item/gun/energy/laser/soul/add_deep_lore()
+ AddElement(/datum/element/examine_lore, \
+ lore_hint = span_notice("You can [EXAMINE_HINT("look closer")] to learn a little more about [src]."), \
+ lore = "The NT Type 3 Heat Delivery System (sometimes referred to as the HDS-3 in the memories of security officers) is quite possibly \
+ the most common type of HDS still available on the market. Fondly regarded, with quite a few diehard fans still clinging to their \
+ Type 3s like their lives depended on it, the weapon has its own place in history as the 'gun that could do it all'. \
+ \
+ The Type 3 line ran for several decades before attempts to replace it ever even crossed Nanotrasen's minds. When people think \
+ 'laser gun', the Type 3 is usually what comes to mind. \
+ \
+ When Nanotrasen announced its replacement, the Type 4, skeptics were quick to pan the weapon, claiming that it lacked several notable \
+ features that users of the Type 3 had enjoyed for years. As it turns out, most of those critics would end up vindicated after word of \
+ Galpha 5 and the terrible, terrible consequences of the Type 4's volatile nature came to light. Most stuck to the Type 3 and never \
+ looked back, even when the Type 5 rolled out to considerable success in its own right. \
+ \
+ Nanotrasen still services Type 3s, with many of the parts used in the weapon sharing compatible cousins in the Type 5. Most \
+ examples of the Type 3 today may actually be closer in function and form to the Type 5 than they were during their original \
+ construction, depending on how often it is serviced." \
+ )
+
+// hellfire laser gun
+
+/obj/item/gun/energy/laser/hellgun/add_deep_lore()
+ AddElement(/datum/element/examine_lore, \
+ lore_hint = span_notice("You can [EXAMINE_HINT("look closer")] to learn a little more about [src]."), \
+ lore = "The NT Type 4 Heat Delivery System (sometimes referred to as the HDS-4 in legal documentation) is considered a notable \
+ example of Nanotrasen's weapons development teams flying too close to the sun. \
+ \
+ The success of the Type 3 resulted in shareholders urging marketing to bring out the 'next best thing' in energy-based weaponry. \
+ At the time, Nanotrasen's weapons division had a prototype still in the works, with recently-learned lessons \
+ from the failure-prone Type 2 in mind after it had more than a few catastrophic failures in testing. \
+ However, there were some concerns raised amongst researchers as to the 'moral implications' \
+ that might result from unleashing 'that much directed radioactive material' towards a living being. \
+ Executives at the time brushed off such concerns, as there was money to be made and already ultrawealthy shareholders to feed the earnings. \
+ \
+ The Type 4 was rushed onto the market within the next quarter, even before most common safety mechanisms had been properly tested and implemented. \
+ Reports immediately began flooding in of horrific accidental discharges, battlefield atrocities, and unexpected spontaneous combustion \
+ from excessive exposure to the untested experimental heat distribution systems 'taking its pound of flesh' for the 'hell it unleashed'. \
+ \
+ News outlets and tabloids alike railed against the company for creating what was now being called the 'hellfire' laser gun. In response, most \
+ legal bodies rushed to ban the firearm from sales within their region of space, and the weapon became infamous for its unethical means of ending \
+ sentient life. Laws were passed to ensure power regulators were installed in all future energy-based weaponry sold by Nanotrasen. Nanotrasen quickly \
+ discontinued the Type 4 in response, and it never saw production from that day forth. However, retrofit kits still exist \
+ on the black market and in some of Nanotrasen's own warehouses. While, legally, it is unlawful to sell and possess a Type 4, Nanotrasen itself \
+ does not regulate possession of the firearm aboard its own stations, nor does any legal body intend on preventing them from utilizing it in defense \
+ of its own assets." \
+ )
+
+// Antique Laser Gun
+
+/obj/item/gun/energy/laser/captain/add_deep_lore()
+ AddElement(/datum/element/examine_lore, \
+ lore_hint = span_notice("You can [EXAMINE_HINT("look closer")] to learn a little more about [src]."), \
+ lore = "For a brief period, Nanotrasen produced a series of custom-made Type 4 laser guns for a select group of \
+ clients, primarily composed of wealthy starship captains, politicians, and military leaders looking to demonstrate prestige before \
+ the common folk. \
+ \
+ The Type 4 was a commercial failure, but this particular variant earned its own infamy, linked to narratives of crazed \
+ despots using it to put down political rivals and dissidents, as well as tales of mad generals marching ahead of their \
+ forces, this weapon brandished and running hot in an outstretched arm, pointed towards any moving target they could find on the \
+ battlefield. \
+ \
+ Copies of this firearm are now prohibited within TerraGov space, and any captured are quickly decommissioned.\
+ This is largely why Nanotrasen insists that any examples held by ranking officers be kept under lock and key. \
+ All records of the schematics surrounding this variant of the Type 4 were seized and destroyed, and the creator behind \
+ it was detained in a maximum security TerraGov sanitorium. When they found her again, she appeared to have smeared the walls in her \
+ own blood, claiming that 'She' was coming, and that she had paid dearly for the knowledge of how to make the weapon. \
+ \
+ Even the microfusion breeder cell housed inside the weapon is practically a lost technology, and Nanotrasen have been unable \
+ to reverse engineer the devices exact means of functionality. \
+ \
+ The Syndicate are obviously just as interested in exactly how this weapon is capable of self-perpetuation, hence why the collective \
+ seem hell-bent on capturing them whenever possible. Maybe keep this somewhere safe. Or don't." \
+ )
+
+// X-ray Laser Gun
+
+/obj/item/gun/energy/laser/xray/add_deep_lore()
+ AddElement(/datum/element/examine_lore, \
+ lore_hint = span_notice("You can [EXAMINE_HINT("look closer")] to learn a little more about [src]."), \
+ lore = "The NT Type 6 Heat Delivery System (sometimes referred to as the HDS6 in research notes) is a breakthrough in the \
+ development of man-portable directed energy weaponry. \
+ \
+ Very little is known about the Type 6, as it is a relatively new experimental weapon only accessible to Nanotrasen security forces. \
+ Somehow, Nanotrasen has found a means to 'slip' the energy beams produced by the Type 6 through unintended targets, only impacting \
+ once it has made contact with a pre-designated target by the weapon's user. It appears to be unable to slip past organic matter reliably, \
+ which hampers its potential for eliminating friendly-fire. However, inorganic targets are left unscathed unless the weapon is directed towards \
+ firing upon the object. This makes the weapon exceptional for asset recovery, defense of entrenched positions, and assaults on defensive structures. \
+ \
+ Nanotrasen claims that this phenomenon is achieved 'through the power of X-rays'. Most critics have highlighted that this is total nonsense. Some claim \
+ that Nanotrasen has discovered a yet-unknown state of matter that the company is exploiting for weapons development and manufacturing. The most \
+ conspiratorially minded of Nanotrasen's critics have even gone as far as to claim it is 'proof of ectoplasm as the sixth element,' \
+ perhaps even allowing the weapon to operate through supernatural means: perhaps even powered by the 'spirits of the damned'. \
+ \
+ Whatever the truth may be, the weapon seems to function as advertized, and is even more energy efficient than the Type 5. Nanotrasen \
+ expects full commercial rollout sometime in the next quarter." \
+ )
+
+// Laser Carbine
+
+/obj/item/gun/energy/laser/carbine/add_deep_lore()
+ AddElement(/datum/element/examine_lore, \
+ lore_hint = span_notice("You can [EXAMINE_HINT("look closer")] to learn a little more about [src]."), \
+ lore = "The NT Type 5/R Rapid Heat Delivery System (sometimes referred to as the HDS-5/R in briefing manuals, and 'that piece of shit flashlight' \
+ amongst TGMC troopers) was a shaky first step into automatic directed energy weaponry. \
+ \
+ Intended for use in special operations, particularly in the hands of orbital drop shock troopers, the Type 5/R was foreseen to be an excellent \
+ addition to Nanotrasen's arsenal of offerings to military forces across occupied space. However, field performance proved grim. \
+ \
+ The advantages of directed energy weapons is the lightweight impacts felt on the supply chain for logistical officers and quartermasters due to the \
+ only necessary upkeep for the weapons being a consistent power supply, either established or brought to the front, and the occassional cleaning. \
+ \
+ This, however, is not a benefit that soldiers operating behind enemy lines or during tactical deployments are capable of exploiting. As a result, \
+ operators often chafed against the limited ammunition supply compared to conventional ballistic firearms, and the weapon quickly was abandoned by \
+ most special forces units. \
+ \
+ Instead, the weapon found favour in the hands of private security teams, who enjoyed the volume of fire it provided, while maintaining \
+ exceptional accuracy even at long ranges, along with being compact enough to allow a high degree of discretion compared to a full sized rifle. \
+ The weapon is also often utilized by rim pirates and marauders, giving the weapon something of an ill reputation." \
+ )
diff --git a/code/modules/projectiles/guns/energy/laser_gatling.dm b/code/modules/projectiles/guns/energy/laser_gatling.dm
index 670f0b0c3703..c9b4455919a4 100644
--- a/code/modules/projectiles/guns/energy/laser_gatling.dm
+++ b/code/modules/projectiles/guns/energy/laser_gatling.dm
@@ -24,6 +24,7 @@
gun = new(src)
battery = new(src)
START_PROCESSING(SSobj, src)
+ AddElement(/datum/element/drag_pickup)
/obj/item/minigunpack/Destroy()
if(!QDELETED(gun))
@@ -64,15 +65,6 @@
if(armed)
user.dropItemToGround(gun, TRUE)
-/obj/item/minigunpack/mouse_drop_dragged(atom/over_object, mob/user)
- if(armed)
- return
-
- if(iscarbon(user))
- if(istype(over_object, /atom/movable/screen/inventory/hand))
- var/atom/movable/screen/inventory/hand/H = over_object
- user.putItemFromInventoryInHandIfPossible(src, H.held_index)
-
/obj/item/minigunpack/update_icon_state()
icon_state = armed ? "notholstered" : "holstered"
return ..()
diff --git a/code/modules/projectiles/guns/energy/mounted.dm b/code/modules/projectiles/guns/energy/mounted.dm
index 7e33567aa0ed..13e6c40d0d68 100644
--- a/code/modules/projectiles/guns/energy/mounted.dm
+++ b/code/modules/projectiles/guns/energy/mounted.dm
@@ -22,6 +22,9 @@
selfcharge = 1
trigger_guard = TRIGGER_GUARD_ALLOW_ALL
+/obj/item/gun/energy/laser/mounted/add_deep_lore()
+ return
+
/obj/item/gun/energy/laser/mounted/augment
icon = 'icons/obj/medical/organs/organs.dmi'
icon_state = "arm_laser"
diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm
index 839689144c2f..973904873a60 100644
--- a/code/modules/projectiles/guns/energy/pulse.dm
+++ b/code/modules/projectiles/guns/energy/pulse.dm
@@ -9,6 +9,7 @@
modifystate = TRUE
obj_flags = CONDUCTS_ELECTRICITY
slot_flags = ITEM_SLOT_BACK
+ light_color = COLOR_BLUE
ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse, /obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser)
cell_type = /obj/item/stock_parts/power_store/cell/pulse
diff --git a/code/modules/projectiles/guns/energy/recharge.dm b/code/modules/projectiles/guns/energy/recharge.dm
index acc34edc4b24..4289cee1ff33 100644
--- a/code/modules/projectiles/guns/energy/recharge.dm
+++ b/code/modules/projectiles/guns/energy/recharge.dm
@@ -105,8 +105,13 @@
inhand_icon_state = "crossbow"
no_charge_state = "crossbow_empty"
w_class = WEIGHT_CLASS_SMALL
- custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT)
- suppressed = TRUE
+ custom_materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT * 0.5,
+ /datum/material/uranium = HALF_SHEET_MATERIAL_AMOUNT * 0.5,
+ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT * 0.5,
+ )
+ suppressed = SUPPRESSED_QUIET
ammo_type = list(/obj/item/ammo_casing/energy/bolt)
recharge_time = 2 SECONDS
holds_charge = TRUE
@@ -130,31 +135,48 @@
base_icon_state = "crossbowlarge"
no_charge_state = "crossbowlarge_empty"
w_class = WEIGHT_CLASS_BULKY
- custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*2)
- suppressed = null
+ custom_materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT * 3.5,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT * 1.5,
+ /datum/material/uranium = HALF_SHEET_MATERIAL_AMOUNT * 1.5,
+ /datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT * 1.5,
+ )
+ suppressed = SUPPRESSED_NONE
ammo_type = list(/obj/item/ammo_casing/energy/bolt/large)
/// A silly gun that does literally zero damage, but disrupts electrical sources of light, like flashlights.
/obj/item/gun/energy/recharge/fisher
name = "\improper SC/FISHER disruptor"
- desc = "A self-recharging, permanently suppressed, and very haphazardly modified accelerator handgun that does literally nothing to anything except light fixtures and cameras. \
- Can fire twice before requiring a recharge, with bolts passing through machinery, but demands precision."
+ desc = "A self-recharging, integrally suppressed, modified kinetic accelerator that does no damage, \
+ but disrupts electronics like lights, APCs, and security cameras. \
+ Can fire twice before requiring a recharge. \
+ Bolts can be fired around machinery, but the precise nature of shooting light fixtures demands a skillful hand."
icon_state = "fisher"
base_icon_state = "fisher"
dry_fire_sound_volume = 10
w_class = WEIGHT_CLASS_SMALL
holds_charge = TRUE
- suppressed = TRUE
+ suppressed = SUPPRESSED_QUIET
recharge_time = 1.2 SECONDS
ammo_type = list(/obj/item/ammo_casing/energy/fisher)
-/obj/item/gun/energy/recharge/fisher/examine_more(mob/user)
+/obj/item/gun/energy/recharge/fisher/Initialize(mapload)
. = ..()
- . += span_notice("The SC/FISHER is an illegally-modified kinetic accelerator cut down and refit into a disassembled miniature energy gun chassis, \
- with its pressure chamber attenuated to launch kinetic bolts that temporarily disrupt flashlights, cameras, and certain other electronics. \
- This effect also works on cyborg headlamps, and works longer in melee.