Make two 3x3 grids right next to eachother using anything you can find to mark the ground. I like using the bartenders hologram projector.
\
+
Make two 3x3 grids right next to each other using anything you can find to mark the ground. I like using the bartenders hologram projector.
\
Take turns rolling the dice and moving the dice into one of the three rows on your 3x3 grid.
\
Your goal is to get the most points by putting die of the same number in the same row.
\
If you have two of the same die in the same row, you will add them together and then times the sum by two. Then add that to the rest of the die.
\
@@ -360,10 +360,8 @@
if(4)
//Destroy Equipment
selected_turf.visible_message(span_userdanger("Everything [user] is holding and wearing disappears!"))
- for(var/obj/item/non_implant in user)
- if(istype(non_implant, /obj/item/implant))
- continue
- qdel(non_implant)
+ var/list/belongings = user.get_all_gear()
+ QDEL_LIST(belongings)
if(5)
//Monkeying
selected_turf.visible_message(span_userdanger("[user] transforms into a monkey!"))
@@ -395,9 +393,9 @@
if(11)
//Cookie
selected_turf.visible_message(span_userdanger("A cookie appears out of thin air!"))
- var/obj/item/food/cookie/C = new(drop_location())
+ var/obj/item/food/cookie/ooh_a_cookie = new(drop_location())
do_smoke(0, holder = src, location = drop_location())
- C.name = "Cookie of Fate"
+ ooh_a_cookie.name = "Cookie of Fate"
if(12)
//Healing
selected_turf.visible_message(span_userdanger("[user] looks very healthy!"))
diff --git a/code/game/objects/items/dna_probe.dm b/code/game/objects/items/dna_probe.dm
index ee6a32766522f..57718ca217e0b 100644
--- a/code/game/objects/items/dna_probe.dm
+++ b/code/game/objects/items/dna_probe.dm
@@ -17,8 +17,6 @@
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
icon_state = "sampler"
item_flags = NOBLUDGEON
- ///Whether we have Carp DNA
- var/carp_dna_loaded = FALSE
///What sources of DNA this sampler can extract from.
var/allowed_scans = DNA_PROBE_SCAN_PLANTS | DNA_PROBE_SCAN_ANIMALS | DNA_PROBE_SCAN_HUMANS
///List of all Animal DNA scanned with this sampler.
@@ -35,10 +33,14 @@
if(dna_vault_ref?.resolve())
// Weirdly we can upload to any existing DNA vault so long as we're linked to any other existing DNA vault.
return try_upload_dna(interacting_with, user) ? ITEM_INTERACT_SUCCESS : ITEM_INTERACT_BLOCKING
- else
- return try_linking_vault(interacting_with, user) ? ITEM_INTERACT_SUCCESS : ITEM_INTERACT_BLOCKING
+ return try_linking_vault(interacting_with, user) ? ITEM_INTERACT_SUCCESS : ITEM_INTERACT_BLOCKING
+
+ if (!valid_scan_target(interacting_with))
+ return NONE
+
+ if (scan_dna(interacting_with, user))
+ return ITEM_INTERACT_SUCCESS
- scan_dna(interacting_with, user)
return ITEM_INTERACT_BLOCKING
/obj/item/dna_probe/proc/try_linking_vault(obj/machinery/dna_vault/target, mob/user)
@@ -78,7 +80,7 @@
playsound(user, 'sound/machines/buzz-sigh.ogg', 50)
balloon_alert(user, "need database!")
return
- if((allowed_scans & DNA_PROBE_SCAN_PLANTS) && istype(target, /obj/machinery/hydroponics))
+ if(istype(target, /obj/machinery/hydroponics))
var/obj/machinery/hydroponics/hydro_tray = target
if(!hydro_tray.myseed)
return
@@ -90,11 +92,12 @@
return
if(hydro_tray.plant_status != HYDROTRAY_PLANT_HARVESTABLE) // So it's bit harder.
to_chat(user, span_alert("Plant needs to be ready to harvest to perform full data scan.")) //Because space dna is actually magic
- return .
+ return
stored_dna_plants[hydro_tray.myseed.type] = TRUE
playsound(src, 'sound/misc/compiler-stage2.ogg', 50)
balloon_alert(user, "data added")
- else if((allowed_scans & DNA_PROBE_SCAN_HUMANS) && ishuman(target))
+ return TRUE
+ else if(ishuman(target))
var/mob/living/carbon/human/human_target = target
if(our_vault.human_dna[human_target.dna.unique_identity])
to_chat(user, span_notice("Humanoid data already present in vault storage."))
@@ -108,23 +111,40 @@
stored_dna_human[human_target.dna.unique_identity] = TRUE
playsound(src, 'sound/misc/compiler-stage2.ogg', 50)
balloon_alert(user, "data added")
+ return TRUE
+
+ if(!isliving(target))
+ return
+
+ var/static/list/non_simple_animals = typecacheof(list(/mob/living/carbon/alien))
+ if(!isanimal_or_basicmob(target) && !is_type_in_typecache(target, non_simple_animals) && !ismonkey(target))
+ return
+
+ var/mob/living/living_target = target
+ if(our_vault.animal_dna[living_target.type])
+ to_chat(user, span_notice("Animal data already present in vault storage."))
+ return
+ if(stored_dna_animal[living_target.type])
+ to_chat(user, span_notice("Animal data already present in local storage."))
+ return
+ if(!(living_target.mob_biotypes & MOB_ORGANIC))
+ to_chat(user, span_alert("No compatible DNA detected."))
+ return .
+ stored_dna_animal[living_target.type] = TRUE
+ playsound(src, 'sound/misc/compiler-stage2.ogg', 50)
+ balloon_alert(user, "data added")
+ return TRUE
- else if((allowed_scans & DNA_PROBE_SCAN_ANIMALS) && isliving(target))
+/obj/item/dna_probe/proc/valid_scan_target(atom/target)
+ if((allowed_scans & DNA_PROBE_SCAN_PLANTS) && istype(target, /obj/machinery/hydroponics))
+ return TRUE
+ if((allowed_scans & DNA_PROBE_SCAN_HUMANS) && ishuman(target))
+ return TRUE
+ if((allowed_scans & DNA_PROBE_SCAN_ANIMALS) && isliving(target))
var/static/list/non_simple_animals = typecacheof(list(/mob/living/carbon/alien))
if(isanimal_or_basicmob(target) || is_type_in_typecache(target, non_simple_animals) || ismonkey(target))
- var/mob/living/living_target = target
- if(our_vault.animal_dna[living_target.type])
- to_chat(user, span_notice("Animal data already present in vault storage."))
- return
- if(stored_dna_animal[living_target.type])
- to_chat(user, span_notice("Animal data already present in local storage."))
- return
- if(!(living_target.mob_biotypes & MOB_ORGANIC))
- to_chat(user, span_alert("No compatible DNA detected."))
- return .
- stored_dna_animal[living_target.type] = TRUE
- playsound(src, 'sound/misc/compiler-stage2.ogg', 50)
- balloon_alert(user, "data added")
+ return TRUE
+ return FALSE
#define CARP_MIX_DNA_TIMER (15 SECONDS)
@@ -132,6 +152,8 @@
/obj/item/dna_probe/carp_scanner
name = "Carp DNA Sampler"
desc = "Can be used to take chemical and genetic samples of animals."
+ ///Whether we have Carp DNA
+ var/carp_dna_loaded = FALSE
/obj/item/dna_probe/carp_scanner/examine_more(mob/user)
. = ..()
@@ -145,6 +167,11 @@
else
return ..()
+/obj/item/dna_probe/carp_scanner/valid_scan_target(atom/target)
+ if (istype(target, /mob/living/basic/carp))
+ return TRUE
+ return ..()
+
/obj/item/dna_probe/carp_scanner/attack_self(mob/user, modifiers)
. = ..()
if(!carp_dna_loaded)
diff --git a/code/game/objects/items/eightball.dm b/code/game/objects/items/eightball.dm
index 719789b2a936c..4445cdd1b7277 100644
--- a/code/game/objects/items/eightball.dm
+++ b/code/game/objects/items/eightball.dm
@@ -63,7 +63,9 @@
shaking = TRUE
- start_shaking(user)
+ if (!start_shaking(user))
+ return
+
if(do_after(user, shake_time))
say(get_answer())
@@ -73,7 +75,7 @@
shaking = FALSE
/obj/item/toy/eightball/proc/start_shaking(mob/user)
- return
+ return TRUE
/obj/item/toy/eightball/proc/get_answer()
return pick(possible_answers)
@@ -98,8 +100,7 @@
/obj/item/toy/eightball/haunted
shake_time = 30 SECONDS
cooldown_time = 3 MINUTES
- var/last_message = "Nothing!"
- var/selected_message
+ var/selected_message = "Nothing!"
//these kind of store the same thing but one is easier to work with.
var/list/votes = list()
var/list/voted = list()
@@ -137,7 +138,6 @@
for (var/answer in haunted_answers)
votes[answer] = 0
SSpoints_of_interest.make_point_of_interest(src)
- become_hearing_sensitive()
/obj/item/toy/eightball/haunted/MakeHaunted()
return FALSE
@@ -150,20 +150,19 @@
interact(user)
return ..()
-/obj/item/toy/eightball/haunted/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, spans, list/message_mods = list(), message_range)
- . = ..()
- last_message = raw_message
-
/obj/item/toy/eightball/haunted/start_shaking(mob/user)
// notify ghosts that someone's shaking a haunted eightball
// and inform them of the message, (hopefully a yes/no question)
- selected_message = last_message
+ selected_message = tgui_input_text(user, "What is your question?", "Eightball") || initial(selected_message)
+ if (!(src in user.held_items))
+ return FALSE
notify_ghosts(
"[user] is shaking [src], hoping to get an answer to \"[selected_message]\"",
source = src,
header = "Magic eightball",
click_interact = TRUE,
)
+ return TRUE
/obj/item/toy/eightball/haunted/get_answer()
var/top_amount = 0
@@ -211,16 +210,16 @@
data["question"] = selected_message
data["answers"] = list()
- for(var/pa in haunted_answers)
- var/list/L = list()
- L["answer"] = pa
- L["amount"] = votes[pa]
- L["selected"] = voted[user.ckey]
+ for(var/vote in haunted_answers)
+ var/list/answer_data = list()
+ answer_data["answer"] = vote
+ answer_data["amount"] = votes[vote]
+ answer_data["selected"] = voted[user.ckey]
- data["answers"] += list(L)
+ data["answers"] += list(answer_data)
return data
-/obj/item/toy/eightball/haunted/ui_act(action, params)
+/obj/item/toy/eightball/haunted/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/game/objects/items/food/bait.dm b/code/game/objects/items/food/bait.dm
index 41b50c181f287..f31eb44f308eb 100644
--- a/code/game/objects/items/food/bait.dm
+++ b/code/game/objects/items/food/bait.dm
@@ -60,15 +60,23 @@
*/
/obj/item/food/bait/doughball/synthetic
name = "synthetic doughball"
- icon_state = "doughball"
+ icon_state = "doughball_blue"
preserved_food = TRUE
/obj/item/food/bait/doughball/synthetic/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_OMNI_BAIT, INNATE_TRAIT)
+///Found in the can of omni-baits, only available from the super fishing toolbox, from the fishing mystery box.
+/obj/item/food/bait/doughball/synthetic/super
+ name = "super-doughball"
+ desc = "No fish will be able to resist this."
+ bait_quality = TRAIT_GREAT_QUALITY_BAIT
+
+///Used by the advanced fishing rod
/obj/item/food/bait/doughball/syntethic/unconsumable
/obj/item/food/bait/doughball/synthetic/unconsumable/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_BAIT_UNCONSUMABLE, INNATE_TRAIT)
+
diff --git a/code/game/objects/items/food/burgers.dm b/code/game/objects/items/food/burgers.dm
index b2d779ca3a54c..eb73f4736b1c3 100644
--- a/code/game/objects/items/food/burgers.dm
+++ b/code/game/objects/items/food/burgers.dm
@@ -580,7 +580,7 @@
/obj/item/food/burger/rib
name = "mcrib"
- desc = "An elusive rib shaped burger with limited availablity across the galaxy. Not as good as you remember it."
+ desc = "An elusive rib shaped burger with limited availability across the galaxy. Not as good as you remember it."
icon_state = "mcrib"
food_reagents = list(
/datum/reagent/consumable/nutriment = 2,
diff --git a/code/game/objects/items/food/cake.dm b/code/game/objects/items/food/cake.dm
index 0b443554bb3b6..ec3e0a0390caa 100644
--- a/code/game/objects/items/food/cake.dm
+++ b/code/game/objects/items/food/cake.dm
@@ -45,6 +45,10 @@
foodtypes = GRAIN | DAIRY | SUGAR
slice_type = /obj/item/food/cakeslice/plain
+/obj/item/food/cake/plain/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/customizable_reagent_holder, /obj/item/food/cake/empty, CUSTOM_INGREDIENT_ICON_FILL, max_ingredients = 16)
+
/obj/item/food/cakeslice/plain
name = "plain cake slice"
desc = "Just a slice of cake, it is enough for everyone."
@@ -52,6 +56,23 @@
tastes = list("sweetness" = 2, "cake" = 5)
foodtypes = GRAIN | DAIRY | SUGAR
+/obj/item/food/cake/empty
+ name = "cake"
+ desc = "A custom cake made by an insane chef."
+ icon_state = "cake_custom"
+ foodtypes = GRAIN | DAIRY | SUGAR
+ slice_type = /obj/item/food/cakeslice/empty
+
+/obj/item/food/cakeslice/empty
+ name = "cake slice"
+ desc = "A slice of custom cake, made by an insane chef."
+ icon_state = "cake_custom_slice"
+ foodtypes = GRAIN | DAIRY | SUGAR
+
+/obj/item/food/cakeslice/empty/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/customizable_reagent_holder, null, CUSTOM_INGREDIENT_ICON_FILL, max_ingredients = 16)
+
/obj/item/food/cake/carrot
name = "carrot cake"
desc = "A favorite desert of a certain wascally wabbit. Not a lie."
@@ -521,6 +542,7 @@
foodtypes = GRAIN | SUGAR | DAIRY
slice_type = /obj/item/food/cakeslice/clown_slice
crafting_complexity = FOOD_COMPLEXITY_5
+ crafted_food_buff = /datum/status_effect/food/trait/waddle
/obj/item/food/cakeslice/clown_slice
name = "clown cake slice"
@@ -534,6 +556,7 @@
tastes = list("cake" = 1, "sugar" = 1, "joy" = 10)
foodtypes = GRAIN | SUGAR | DAIRY
crafting_complexity = FOOD_COMPLEXITY_5
+ crafted_food_buff = /datum/status_effect/food/trait/waddle
/obj/item/food/cake/trumpet
name = "spaceman's cake"
diff --git a/code/game/objects/items/food/egg.dm b/code/game/objects/items/food/egg.dm
index b669e16b103cd..bcc61e721e211 100644
--- a/code/game/objects/items/food/egg.dm
+++ b/code/game/objects/items/food/egg.dm
@@ -277,6 +277,7 @@ GLOBAL_VAR_INIT(chicks_from_eggs, 0)
foodtypes = MEAT | BREAKFAST | DAIRY
venue_value = FOOD_PRICE_CHEAP
crafting_complexity = FOOD_COMPLEXITY_2
+ crafted_food_buff = /datum/status_effect/food/speech/french
/obj/item/food/omelette/attackby(obj/item/item, mob/user, params)
if(istype(item, /obj/item/kitchen/fork))
diff --git a/code/game/objects/items/food/lizard.dm b/code/game/objects/items/food/lizard.dm
index 47b5ff7510916..2048c997ef9ad 100644
--- a/code/game/objects/items/food/lizard.dm
+++ b/code/game/objects/items/food/lizard.dm
@@ -156,6 +156,7 @@
desc = "Another example of cultural crossover between lizards and humans, desert snail escargot is closer to the Roman dish cocleas than the contemporary French escargot. It's a common street food in the desert cities."
icon = 'icons/obj/food/lizard.dmi'
icon_state = "lizard_escargot"
+ trash_type = /obj/item/reagent_containers/cup/bowl
food_reagents = list(
/datum/reagent/consumable/nutriment/protein = 6,
/datum/reagent/consumable/nutriment/vitamin = 4,
@@ -188,6 +189,7 @@
desc = "One of the many human foods to make its way to the lizards was french fries, which are called poms-franzisks in Draconic. When topped with barbecued meat and sauce, they make a hearty meal."
icon = 'icons/obj/food/lizard.dmi'
icon_state = "lizard_fries"
+ trash_type = /obj/item/plate
food_reagents = list(
/datum/reagent/consumable/nutriment = 4,
/datum/reagent/consumable/nutriment/protein = 6,
@@ -887,7 +889,7 @@
/obj/item/food/burger/rootrib
name = "rootrib"
- desc = "An elusive rib shaped burger with limited availablity across the galaxy. Now meeting subhuman requirements."
+ desc = "An elusive rib shaped burger with limited availability across the galaxy. Now meeting subhuman requirements."
icon_state = "rootrib"
icon = 'icons/obj/food/lizard.dmi'
food_reagents = list(
diff --git a/code/game/objects/items/food/martian.dm b/code/game/objects/items/food/martian.dm
index 7ceaf1878176c..748610457ec41 100644
--- a/code/game/objects/items/food/martian.dm
+++ b/code/game/objects/items/food/martian.dm
@@ -102,6 +102,7 @@
desc = "A spice paste from Indonesia, used widely in cooking throughout South East Asia."
icon = 'icons/obj/food/martian.dmi'
icon_state = "sambal"
+ trash_type = /obj/item/reagent_containers/cup/bowl
food_reagents = list(
/datum/reagent/consumable/nutriment/vitamin = 5,
/datum/reagent/consumable/capsaicin = 2
@@ -519,7 +520,7 @@
crafting_complexity = FOOD_COMPLEXITY_3
/obj/item/food/takoyaki/russian
- name = "russian takoyaki"
+ name = "Russian takoyaki"
desc = "A dangerous twist on a classic dish, that makes for the perfect cover for evading the police."
icon = 'icons/obj/food/martian.dmi'
icon_state = "russian_takoyaki"
@@ -535,7 +536,7 @@
/obj/item/food/takoyaki/taco
name = "tacoyaki"
- desc = "Straight outta Mars' most innovative street food stands, it's tacoyaki- trading octopus for taco meat and corn, and worcestershire sauce for queso. ¡Tan sabroso!"
+ desc = "Straight outta Mars' most innovative street food stands, it's tacoyaki- trading octopus for taco meat and corn, and Worcestershire sauce for queso. ¡Tan sabroso!"
icon = 'icons/obj/food/martian.dmi'
icon_state = "tacoyaki"
food_reagents = list(
diff --git a/code/game/objects/items/food/meatdish.dm b/code/game/objects/items/food/meatdish.dm
index c03470ff416b3..5ad5cea20fae8 100644
--- a/code/game/objects/items/food/meatdish.dm
+++ b/code/game/objects/items/food/meatdish.dm
@@ -36,6 +36,36 @@
w_class = WEIGHT_CLASS_SMALL
starting_reagent_purity = 1.0
+/obj/item/food/fishmeat/quality
+ name = "quality fish fillet"
+ desc = "A fillet of some precious fish meat."
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 4,
+ /datum/reagent/consumable/nutriment/vitamin = 3,
+ )
+ bite_consumption = 7
+ crafting_complexity = FOOD_COMPLEXITY_1
+
+/obj/item/food/fishmeat/quality/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/quality_food_ingredient, FOOD_COMPLEXITY_1)
+
+/obj/item/food/fishmeat/salmon
+ name = "salmon fillet"
+ desc = "a chunky, fatty fillet of salmon meat."
+ icon_state = "salmon"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment/protein = 4,
+ /datum/reagent/consumable/nutriment/vitamin = 3,
+ /datum/reagent/consumable/nutriment/fat/oil = 2,
+ )
+ bite_consumption = 4.5
+ crafting_complexity = FOOD_COMPLEXITY_1
+
+/obj/item/food/fishmeat/salmon/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/quality_food_ingredient, FOOD_COMPLEXITY_1)
+
/obj/item/food/fishmeat/carp
name = "carp fillet"
desc = "A fillet of spess carp meat."
@@ -491,7 +521,7 @@
/obj/item/food/patty
name = "patty"
- desc = "The nanotrasen patty is the patty for you and me!"
+ desc = "The Nanotrasen patty is the patty for you and me!"
icon = 'icons/obj/food/meat.dmi'
icon_state = "patty"
food_reagents = list(/datum/reagent/consumable/nutriment/protein = 2)
@@ -500,7 +530,7 @@
w_class = WEIGHT_CLASS_SMALL
crafting_complexity = FOOD_COMPLEXITY_1
-///Exists purely for the crafting recipe (because itll take subtypes)
+///Exists purely for the crafting recipe (because it'll take subtypes)
/obj/item/food/patty/plain
/obj/item/food/patty/human
@@ -895,9 +925,10 @@
/obj/item/food/beef_stroganoff
name = "beef stroganoff"
- desc = "A russian dish that consists of beef and sauce. Really popular in japan, or at least that's what my animes would allude to."
+ desc = "A Russian dish that consists of beef and sauce. Really popular in Japan, or at least that's what my animes would allude to."
icon = 'icons/obj/food/meat.dmi'
icon_state = "beefstroganoff"
+ trash_type = /obj/item/reagent_containers/cup/bowl
food_reagents = list(
/datum/reagent/consumable/nutriment/protein = 16,
/datum/reagent/consumable/nutriment/vitamin = 4,
@@ -1076,7 +1107,7 @@
crafting_complexity = FOOD_COMPLEXITY_5
/obj/item/food/full_english
- name = "full english breakfast"
+ name = "full English breakfast"
desc = "A hearty plate with all the trimmings, representing the pinnacle of the breakfast art."
icon = 'icons/obj/food/meat.dmi'
icon_state = "full_english"
diff --git a/code/game/objects/items/food/meatslab.dm b/code/game/objects/items/food/meatslab.dm
index a5fe073e56f3f..ed391a57bd255 100644
--- a/code/game/objects/items/food/meatslab.dm
+++ b/code/game/objects/items/food/meatslab.dm
@@ -150,7 +150,7 @@
blood_decal_type = null
/obj/item/food/meat/slab/human/mutant/skeleton/make_processable()
- return //skeletons dont have cutlets
+ return //skeletons don't have cutlets
/obj/item/food/meat/slab/human/mutant/zombie
name = "meat (rotten)"
@@ -353,7 +353,7 @@
/obj/item/food/meat/rawbacon
name = "raw piece of bacon"
desc = "A raw piece of bacon."
- icon_state = "baconb"
+ icon_state = "bacon"
bite_consumption = 2
food_reagents = list(
/datum/reagent/consumable/nutriment/protein = 2,
@@ -369,7 +369,7 @@
/obj/item/food/meat/bacon
name = "piece of bacon"
desc = "A delicious piece of bacon."
- icon_state = "baconcookedb"
+ icon_state = "baconcooked"
food_reagents = list(
/datum/reagent/consumable/nutriment/protein = 2,
/datum/reagent/consumable/nutriment/vitamin = 1,
diff --git a/code/game/objects/items/food/mexican.dm b/code/game/objects/items/food/mexican.dm
index 396e351ff4bde..fa66db1450c8f 100644
--- a/code/game/objects/items/food/mexican.dm
+++ b/code/game/objects/items/food/mexican.dm
@@ -196,12 +196,14 @@
w_class = WEIGHT_CLASS_SMALL
venue_value = FOOD_PRICE_LEGENDARY
crafting_complexity = FOOD_COMPLEXITY_5
+ crafted_food_buff = /datum/status_effect/food/trait/ashstorm_immune
/obj/item/food/chipsandsalsa
name = "chips and salsa"
desc = "Some tortilla chips with a cup of zesty salsa. Highly addictive!"
icon = 'icons/obj/food/mexican.dmi'
icon_state = "chipsandsalsa"
+ trash_type = /obj/item/reagent_containers/cup/bowl
food_reagents = list(
/datum/reagent/consumable/nutriment = 4,
/datum/reagent/consumable/capsaicin = 2,
@@ -331,6 +333,7 @@
desc = "A not-so liquid salsa made of pineapples, tomatoes, onions, and chilis. Makes for delightfully contrasting flavors."
icon = 'icons/obj/food/mexican.dmi'
icon_state = "pineapple_salsa"
+ trash_type = /obj/item/reagent_containers/cup/bowl
food_reagents = list(
/datum/reagent/consumable/nutriment = 6,
/datum/reagent/consumable/nutriment/vitamin = 6,
diff --git a/code/game/objects/items/food/misc.dm b/code/game/objects/items/food/misc.dm
index 26852066bae28..b2cf4d132c5fb 100644
--- a/code/game/objects/items/food/misc.dm
+++ b/code/game/objects/items/food/misc.dm
@@ -292,6 +292,14 @@
foodtypes = FRUIT | ALCOHOL
crafting_complexity = FOOD_COMPLEXITY_2
+/obj/item/food/melonkeg/CheckParts(list/parts_list)
+ . = ..()
+ var/obj/item/reagent_containers/cup/glass/bottle/bottle = locate() in contents
+ if(!bottle)
+ return
+ if(bottle.message_in_a_bottle)
+ bottle.message_in_a_bottle.forceMove(drop_location())
+
/obj/item/food/honeybar
name = "honey nut bar"
desc = "Oats and nuts compressed together into a bar, held together with a honey glaze."
@@ -797,3 +805,30 @@
foodtypes = VEGETABLES | GRAIN
w_class = WEIGHT_CLASS_TINY
crafting_complexity = FOOD_COMPLEXITY_4
+
+///Extracted from squids, or any fish with the ink fish trait.
+/obj/item/food/ink_sac
+ name = "ink sac"
+ desc = "the ink sac from some sort of fish or mollusk. It could be canned with a processor."
+ icon_state = "ink_sac"
+ food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/salt = 5)
+ tastes = list("seafood" = 3)
+ foodtypes = SEAFOOD|RAW
+
+/obj/item/food/ink_sac/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/splat, \
+ memory_type = /datum/memory/witnessed_inking, \
+ smudge_type = /obj/effect/decal/cleanable/food/squid_ink, \
+ moodlet_type = /datum/mood_event/inked, \
+ splat_color = COLOR_NEARLY_ALL_BLACK, \
+ hit_callback = CALLBACK(src, PROC_REF(blind_em)), \
+ )
+
+/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.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/moth.dm b/code/game/objects/items/food/moth.dm
index b2d9dfdb8fe37..367a3f29b5cc4 100644
--- a/code/game/objects/items/food/moth.dm
+++ b/code/game/objects/items/food/moth.dm
@@ -9,6 +9,7 @@
Herbs are one such addition, and are particularly beloved."
icon = 'icons/obj/food/moth.dmi'
icon_state = "herby_cheese"
+ trash_type = /obj/item/reagent_containers/cup/bowl
food_reagents = list(/datum/reagent/consumable/nutriment/protein = 6)
tastes = list("cheese" = 1, "herbs" = 1)
foodtypes = DAIRY | VEGETABLES
@@ -461,6 +462,7 @@
it's just sorta what it's always been called."
icon = 'icons/obj/food/moth.dmi'
icon_state = "hua_mulan_congee"
+ trash_type = /obj/item/reagent_containers/cup/bowl
food_reagents = list(
/datum/reagent/consumable/nutriment = 6,
/datum/reagent/consumable/nutriment/vitamin = 10,
@@ -476,6 +478,7 @@
desc = "Polenta loaded with cheese, served with a few discs of fried eggplant and some tomato sauce. Lække!"
icon = 'icons/obj/food/moth.dmi'
icon_state = "fried_eggplant_polenta"
+ trash_type = /obj/item/reagent_containers/cup/bowl
food_reagents = list(
/datum/reagent/consumable/nutriment/protein = 12,
/datum/reagent/consumable/nutriment/vitamin = 6,
diff --git a/code/game/objects/items/food/packaged.dm b/code/game/objects/items/food/packaged.dm
index 0f08fd8f57dd9..b3578204a2daa 100644
--- a/code/game/objects/items/food/packaged.dm
+++ b/code/game/objects/items/food/packaged.dm
@@ -156,6 +156,25 @@
tastes = list("seafood" = 7, "tin" = 1)
foodtypes = SEAFOOD
+/obj/item/food/canned/squid_ink/open_can(mob/user)
+ . = ..()
+ AddComponent(/datum/component/splat, \
+ memory_type = /datum/memory/witnessed_inking, \
+ smudge_type = /obj/effect/decal/cleanable/food/squid_ink, \
+ moodlet_type = /datum/mood_event/inked, \
+ 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.visible_message(span_warning("[victim] is inked by [src]!"), span_userdanger("You've been inked by [src]!"))
+ playsound(victim, SFX_DESECRATION, 50, TRUE)
+
/obj/item/food/canned/chap
name = "can of CHAP"
desc = "CHAP: Chopped Ham And Pork. The classic American canned meat product that won a world war, then sent millions of servicemen home with heart congestion."
diff --git a/code/game/objects/items/food/pastries.dm b/code/game/objects/items/food/pastries.dm
index 1024e44c625f3..0b96101a99d51 100644
--- a/code/game/objects/items/food/pastries.dm
+++ b/code/game/objects/items/food/pastries.dm
@@ -67,7 +67,6 @@
name = "waffles"
desc = "Mmm, waffles."
icon_state = "waffles"
- trash_type = /obj/item/trash/waffles
food_reagents = list(
/datum/reagent/consumable/nutriment = 8,
/datum/reagent/consumable/nutriment/vitamin = 2,
@@ -85,7 +84,6 @@
name = "\improper Soylent Green"
desc = "Not made of people. Honest." //Totally people.
icon_state = "soylent_green"
- trash_type = /obj/item/trash/waffles
food_reagents = list(
/datum/reagent/consumable/nutriment = 10,
/datum/reagent/consumable/nutriment/vitamin = 2,
@@ -100,7 +98,6 @@
name = "\improper Soylent Virdians"
desc = "Not made of people. Honest." //Actually honest for once.
icon_state = "soylent_yellow"
- trash_type = /obj/item/trash/waffles
food_reagents = list(
/datum/reagent/consumable/nutriment = 10,
/datum/reagent/consumable/nutriment/vitamin = 2,
@@ -115,7 +112,6 @@
name = "roffle waffles"
desc = "Waffles from Roffle. Co."
icon_state = "rofflewaffles"
- trash_type = /obj/item/trash/waffles
bite_consumption = 4
food_reagents = list(
/datum/reagent/consumable/nutriment = 8,
@@ -327,6 +323,20 @@
tastes = list("cake" = 3, "blue cherry" = 1)
crafting_complexity = FOOD_COMPLEXITY_3
+/obj/item/food/jupitercupcake
+ name = "jupiter-cup-cake"
+ desc = "A static dessert."
+ icon_state = "jupitercupcake"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 6,
+ /datum/reagent/consumable/nutriment/vitamin = 2,
+ /datum/reagent/consumable/caramel = 3,
+ /datum/reagent/consumable/liquidelectricity/enriched = 3,
+ )
+ tastes = list("cake" = 3, "caramel" = 2, "zap" = 1)
+ crafting_complexity = FOOD_COMPLEXITY_3
+ crafted_food_buff = /datum/status_effect/food/trait/shockimmune
+
/obj/item/food/honeybun
name = "honey bun"
desc = "A sticky pastry bun glazed with honey."
diff --git a/code/game/objects/items/food/pie.dm b/code/game/objects/items/food/pie.dm
index e57759915208d..6d73bc2f5df21 100644
--- a/code/game/objects/items/food/pie.dm
+++ b/code/game/objects/items/food/pie.dm
@@ -11,7 +11,7 @@
crafting_complexity = FOOD_COMPLEXITY_2
/// type is spawned 5 at a time and replaces this pie when processed by cutting tool
var/obj/item/food/pieslice/slice_type
- /// so that the yield can change if it isnt 5
+ /// so that the yield can change if it isn't 5
var/yield = 5
/obj/item/food/pie/make_processable()
@@ -39,6 +39,27 @@
foodtypes = GRAIN
crafting_complexity = FOOD_COMPLEXITY_2
+/obj/item/food/pie/plain/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/customizable_reagent_holder, /obj/item/food/pie/empty, CUSTOM_INGREDIENT_ICON_FILL, max_ingredients = 8)
+
+/obj/item/food/pie/empty
+ name = "pie"
+ desc = "A custom pie made by a crazed chef."
+ icon_state = "pie_custom"
+ foodtypes = GRAIN
+ slice_type = /obj/item/food/pieslice/empty
+
+/obj/item/food/pieslice/empty
+ name = "pie slice"
+ desc = "A custom pie slice made by a crazed chef."
+ icon_state = "pie_custom_slice"
+ foodtypes = GRAIN
+
+/obj/item/food/pieslice/empty/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/customizable_reagent_holder, null, CUSTOM_INGREDIENT_ICON_FILL, max_ingredients = 8)
+
/obj/item/food/pie/cream
name = "banana cream pie"
desc = "Just like back home, on clown planet! HONK!"
@@ -53,32 +74,17 @@
var/stunning = TRUE
crafting_complexity = FOOD_COMPLEXITY_3
-/obj/item/food/pie/cream/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
+/obj/item/food/pie/cream/Initialize(mapload)
. = ..()
- if(!.) //if we're not being caught
- splat(hit_atom)
-
-/obj/item/food/pie/cream/proc/splat(atom/movable/hit_atom)
- if(isliving(loc)) //someone caught us!
- return
- var/turf/hit_turf = get_turf(hit_atom)
- new/obj/effect/decal/cleanable/food/pie_smudge(hit_turf)
- if(reagents?.total_volume)
- reagents.expose(hit_atom, TOUCH)
- var/is_creamable = TRUE
- if(isliving(hit_atom))
- var/mob/living/living_target_getting_hit = hit_atom
- if(stunning)
- living_target_getting_hit.Paralyze(2 SECONDS) //splat!
- if(iscarbon(living_target_getting_hit))
- is_creamable = !!(living_target_getting_hit.get_bodypart(BODY_ZONE_HEAD))
- if(is_creamable)
- living_target_getting_hit.adjust_eye_blur(2 SECONDS)
- living_target_getting_hit.visible_message(span_warning("[living_target_getting_hit] is creamed by [src]!"), span_userdanger("You've been creamed by [src]!"))
- playsound(living_target_getting_hit, SFX_DESECRATION, 50, TRUE)
- if(is_creamable && is_type_in_typecache(hit_atom, GLOB.creamable))
- hit_atom.AddComponent(/datum/component/creamed, src)
- qdel(src)
+ AddComponent(/datum/component/splat, hit_callback = CALLBACK(src, PROC_REF(stun_and_blur)))
+
+/obj/item/food/pie/cream/proc/stun_and_blur(mob/living/victim, can_splat_on)
+ if(stunning)
+ victim.Paralyze(2 SECONDS) //splat!
+ if(can_splat_on)
+ victim.adjust_eye_blur(2 SECONDS)
+ victim.visible_message(span_warning("[victim] is creamed by [src]!"), span_userdanger("You've been creamed by [src]!"))
+ playsound(victim, SFX_DESECRATION, 50, TRUE)
/obj/item/food/pie/cream/nostun
stunning = FALSE
@@ -316,6 +322,7 @@
)
tastes = list("nothing" = 3)
foodtypes = GRAIN
+ crafted_food_buff = /datum/status_effect/food/trait/mute
/obj/item/food/pie/berrytart
name = "berry tart"
diff --git a/code/game/objects/items/food/pizza.dm b/code/game/objects/items/food/pizza.dm
index 71dd87af8e183..bdaab0a72851f 100644
--- a/code/game/objects/items/food/pizza.dm
+++ b/code/game/objects/items/food/pizza.dm
@@ -169,7 +169,7 @@
/obj/item/food/pizza/vegetable
name = "vegetable pizza"
- desc = "No one of Tomatos Sapiens were harmed during making this pizza."
+ desc = "No one of Tomatoes Sapiens were harmed during making this pizza."
icon_state = "vegetablepizza"
food_reagents = list(
/datum/reagent/consumable/nutriment = 25,
diff --git a/code/game/objects/items/food/snacks.dm b/code/game/objects/items/food/snacks.dm
index cb64c6df52204..722663cf265e0 100644
--- a/code/game/objects/items/food/snacks.dm
+++ b/code/game/objects/items/food/snacks.dm
@@ -400,7 +400,7 @@ GLOBAL_LIST_INIT(safe_peanut_types, populate_safe_peanut_types())
/obj/item/food/semki
name = "\improper Semki Sunflower Seeds"
- desc = "A pack of roasted sunflower seeds. Beloved by space russians and babushka alike."
+ desc = "A pack of roasted sunflower seeds. Beloved by space Russians and babushka alike."
icon_state = "semki"
trash_type = /obj/item/trash/semki
food_reagents = list(
diff --git a/code/game/objects/items/food/spaghetti.dm b/code/game/objects/items/food/spaghetti.dm
index cab4a62a29f3b..bf1fca9332a08 100644
--- a/code/game/objects/items/food/spaghetti.dm
+++ b/code/game/objects/items/food/spaghetti.dm
@@ -249,3 +249,17 @@
tastes = list("noodles" = 5, "fried tofu" = 4, "lime" = 2, "peanut" = 3, "onion" = 2)
foodtypes = GRAIN | VEGETABLES | NUTS | FRUIT
crafting_complexity = FOOD_COMPLEXITY_4
+
+/obj/item/food/spaghetti/carbonara
+ name = "spaghetti carbonara"
+ desc = "Silky eggs, crispy pork, cheesy bliss. Mamma mia!"
+ icon_state = "carbonara"
+ food_reagents = list(
+ /datum/reagent/consumable/nutriment = 10,
+ /datum/reagent/consumable/nutriment/protein = 6,
+ /datum/reagent/consumable/nutriment/vitamin = 4,
+ )
+ tastes = list("spaghetti" = 1, "parmigiano reggiano" = 1, "guanciale" = 1)
+ foodtypes = GRAIN | MEAT | DAIRY
+ crafting_complexity = FOOD_COMPLEXITY_4
+ crafted_food_buff = /datum/status_effect/food/speech/italian
diff --git a/code/game/objects/items/frog_statue.dm b/code/game/objects/items/frog_statue.dm
index 34c491d9dd72b..e2477d2179aca 100644
--- a/code/game/objects/items/frog_statue.dm
+++ b/code/game/objects/items/frog_statue.dm
@@ -41,7 +41,7 @@
if(isnull(contained_frog))
. += span_notice("There are currently no frogs linked to this statue!")
else
- . += span_notice("Using it will [contained_frog in src ? "release" : "recall"] the beast!")
+ . += span_notice("Using it will [(contained_frog in src) ? "release" : "recall"] the beast!")
///resummon the frog into its home
/obj/item/frog_statue/proc/recall_frog(mob/user)
diff --git a/code/game/objects/items/granters/magic/lightning_bolt.dm b/code/game/objects/items/granters/magic/lightning_bolt.dm
index 3e3cbade46fa6..9fb6494bcc38c 100644
--- a/code/game/objects/items/granters/magic/lightning_bolt.dm
+++ b/code/game/objects/items/granters/magic/lightning_bolt.dm
@@ -13,4 +13,3 @@
"UNLIMITED power? Well... maybe if I practice...",
"Wait until they're grouped up...",
)
-
diff --git a/code/game/objects/items/grenades/_grenade.dm b/code/game/objects/items/grenades/_grenade.dm
index bb9d275fb00b8..ca7da893bb4b4 100644
--- a/code/game/objects/items/grenades/_grenade.dm
+++ b/code/game/objects/items/grenades/_grenade.dm
@@ -19,11 +19,12 @@
max_integrity = 40
pickup_sound = 'sound/items/grenade_pick_up.ogg'
drop_sound = 'sound/items/grenade_drop.ogg'
+ sound_vary = TRUE
/// Bitfields which prevent the grenade from detonating if set. Includes ([GRENADE_DUD]|[GRENADE_USED])
var/dud_flags = NONE
///Is this grenade currently armed?
var/active = FALSE
- ///Is it a cluster grenade? We dont wanna spam admin logs with these.
+ ///Is it a cluster grenade? We don't wanna spam admin logs with these.
var/type_cluster = FALSE
///How long it takes for a grenade to explode after being armed
var/det_time = 5 SECONDS
@@ -48,7 +49,7 @@
var/shrapnel_type
/// the higher this number, the more projectiles are created as shrapnel
var/shrapnel_radius
- ///Did we add the component responsible for spawning sharpnel to this?
+ ///Did we add the component responsible for spawning shrapnel to this?
var/shrapnel_initialized
/obj/item/grenade/Initialize(mapload)
@@ -61,7 +62,7 @@
playsound(src, 'sound/items/eatfood.ogg', 50, TRUE)
arm_grenade(user, det_time)
user.transferItemToLoc(src, user, TRUE)//>eat a grenade set to 5 seconds >rush captain
- sleep(det_time)//so you dont die instantly
+ sleep(det_time)//so you don't die instantly
return dud_flags ? SHAME : BRUTELOSS
/obj/item/grenade/atom_deconstruct(disassembled = TRUE)
diff --git a/code/game/objects/items/hand_items.dm b/code/game/objects/items/hand_items.dm
index 8030eed9883a9..cf752bf82accb 100644
--- a/code/game/objects/items/hand_items.dm
+++ b/code/game/objects/items/hand_items.dm
@@ -532,6 +532,12 @@
color = COLOR_BLACK
kiss_type = /obj/projectile/kiss/death
+/obj/item/hand_item/kisser/syndie
+ name = "syndie kiss"
+ desc = "oooooo you like syndicate ur a syndiekisser"
+ color = COLOR_SYNDIE_RED
+ kiss_type = /obj/projectile/kiss/syndie
+
/obj/projectile/kiss
name = "kiss"
icon = 'icons/mob/simple/animal.dmi'
@@ -543,17 +549,21 @@
damage_type = BRUTE
damage = 0 // love can't actually hurt you
armour_penetration = 100 // but if it could, it would cut through even the thickest plate
+ var/silent_blown = FALSE
/obj/projectile/kiss/Initialize(mapload)
. = ..()
AddComponent(/datum/component/parriable_projectile)
/obj/projectile/kiss/fire(angle, atom/direct_target)
- if(firer)
+ if(firer && !silent_blown)
name = "[name] blown by [firer]"
+
return ..()
/obj/projectile/kiss/Impact(atom/A)
+ def_zone = BODY_ZONE_HEAD // let's keep it PG, people
+
if(damage > 0 || !isliving(A)) // if we do damage or we hit a nonliving thing, we don't have to worry about a harmless hit because we can't wrongly do damage anyway
return ..()
@@ -607,7 +617,6 @@
living_target.visible_message("[living_target] [other_msg]", span_userdanger("Whoa! [self_msg]"))
/obj/projectile/kiss/on_hit(atom/target, blocked, pierce_hit)
- def_zone = BODY_ZONE_HEAD // let's keep it PG, people
. = ..()
if(isliving(target))
var/mob/living/living_target = target
@@ -629,6 +638,18 @@
var/obj/item/organ/internal/heart/dont_go_breakin_my_heart = heartbreakee.get_organ_slot(ORGAN_SLOT_HEART)
dont_go_breakin_my_heart.apply_organ_damage(999)
+// Based on energy gun characteristics
+/obj/projectile/kiss/syndie
+ name = "syndie kiss"
+ color = COLOR_SYNDIE_RED
+ impact_effect_type = /obj/effect/temp_visual/impact_effect/red_laser
+ damage_type = BURN
+ armor_flag = LASER
+ armour_penetration = 0
+ damage = 25
+ wound_bonus = -20
+ bare_wound_bonus = 40
+ silent_blown = TRUE
/obj/projectile/kiss/french
name = "french kiss (is that a hint of garlic?)"
diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm
index 7edc000920454..9e8f1d7308860 100644
--- a/code/game/objects/items/handcuffs.dm
+++ b/code/game/objects/items/handcuffs.dm
@@ -50,6 +50,7 @@
custom_price = PAYCHECK_COMMAND * 0.35
pickup_sound = 'sound/items/handcuffs_pick_up.ogg'
drop_sound = 'sound/items/handcuffs_drop.ogg'
+ sound_vary = TRUE
///How long it takes to handcuff someone
var/handcuff_time = 4 SECONDS
diff --git a/code/game/objects/items/implants/implant_mindshield.dm b/code/game/objects/items/implants/implant_mindshield.dm
index 67b1f4c6d92ff..9f7e507f1c343 100644
--- a/code/game/objects/items/implants/implant_mindshield.dm
+++ b/code/game/objects/items/implants/implant_mindshield.dm
@@ -20,7 +20,7 @@
if(!.)
return FALSE
if(target.mind)
- if((SEND_SIGNAL(target.mind, COMSIG_PRE_MINDSHIELD_IMPLANT, user) & COMPONENT_MINDSHIELD_RESISTED) || target.mind.unconvertable)
+ if((SEND_SIGNAL(target.mind, COMSIG_PRE_MINDSHIELD_IMPLANT, user) & COMPONENT_MINDSHIELD_RESISTED))
if(!silent)
target.visible_message(span_warning("[target] seems to resist the implant!"), span_warning("You feel something interfering with your mental conditioning, but you resist it!"))
removed(target, TRUE)
@@ -30,7 +30,7 @@
if(prob(1) || check_holidays(APRIL_FOOLS))
target.say("I'm out! I quit! Whose kidneys are these?", forced = "They're out! They quit! Whose kidneys do they have?")
- ADD_TRAIT(target, TRAIT_MINDSHIELD, IMPLANT_TRAIT)
+ target.add_traits(list(TRAIT_MINDSHIELD, TRAIT_UNCONVERTABLE), IMPLANT_TRAIT)
target.sec_hud_set_implants()
if(!silent)
to_chat(target, span_notice("You feel a sense of peace and security. You are now protected from brainwashing."))
@@ -42,7 +42,7 @@
return FALSE
if(isliving(target))
var/mob/living/L = target
- REMOVE_TRAIT(L, TRAIT_MINDSHIELD, IMPLANT_TRAIT)
+ target.remove_traits(list(TRAIT_MINDSHIELD, TRAIT_UNCONVERTABLE), IMPLANT_TRAIT)
L.sec_hud_set_implants()
if(target.stat != DEAD && !silent)
to_chat(target, span_boldnotice("Your mind suddenly feels terribly vulnerable. You are no longer safe from brainwashing."))
diff --git a/code/game/objects/items/implants/implantchair.dm b/code/game/objects/items/implants/implantchair.dm
index 5f833e3264875..50302173a796f 100644
--- a/code/game/objects/items/implants/implantchair.dm
+++ b/code/game/objects/items/implants/implantchair.dm
@@ -55,7 +55,7 @@
return data
-/obj/machinery/implantchair/ui_act(action, params)
+/obj/machinery/implantchair/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
@@ -191,7 +191,7 @@
objective = tgui_input_text(user, "What order do you want to imprint on [C]?", "Brainwashing", max_length = 120)
message_admins("[ADMIN_LOOKUPFLW(user)] set brainwash machine objective to '[objective]'.")
user.log_message("set brainwash machine objective to '[objective]'.", LOG_GAME)
- if(HAS_TRAIT(C, TRAIT_MINDSHIELD))
+ if(HAS_MIND_TRAIT(C, TRAIT_UNCONVERTABLE))
return FALSE
brainwash(C, objective)
message_admins("[ADMIN_LOOKUPFLW(user)] brainwashed [key_name_admin(C)] with objective '[objective]'.")
diff --git a/code/game/objects/items/inducer.dm b/code/game/objects/items/inducer.dm
index d74bb7aa8d10e..2404974d69970 100644
--- a/code/game/objects/items/inducer.dm
+++ b/code/game/objects/items/inducer.dm
@@ -81,9 +81,9 @@
return
/obj/item/inducer/attackby(obj/item/used_item, mob/user)
+ var/obj/item/stock_parts/power_store/our_cell = get_cell()
if(istype(used_item, /obj/item/stock_parts/power_store))
if(opened)
- var/obj/item/stock_parts/power_store/our_cell = get_cell()
if(isnull(our_cell))
if(!user.transferItemToLoc(used_item, src))
return
@@ -95,6 +95,15 @@
to_chat(user, span_warning("[src] already has \a [our_cell] installed!"))
return
+ if (istype(used_item, /obj/item/stack/sheet/mineral/plasma) && !isnull(our_cell))
+ if(our_cell.charge == our_cell.maxcharge)
+ balloon_alert(user, "already fully charged!")
+ return
+ used_item.use(1)
+ our_cell.give(1.5 * STANDARD_CELL_CHARGE)
+ balloon_alert(user, "cell recharged")
+ return
+
if(cantbeused(user))
return
@@ -187,7 +196,7 @@
opened = TRUE
/obj/item/inducer/orderable
- cell_type = /obj/item/stock_parts/power_store/cell/inducer_supply
+ cell_type = /obj/item/stock_parts/power_store/battery/upgraded
opened = FALSE
/obj/item/inducer/sci
diff --git a/code/game/objects/items/kirby_plants/kirbyplants.dm b/code/game/objects/items/kirby_plants/kirbyplants.dm
index 26199bcd42c9c..0c5b255db38b6 100644
--- a/code/game/objects/items/kirby_plants/kirbyplants.dm
+++ b/code/game/objects/items/kirby_plants/kirbyplants.dm
@@ -1,4 +1,3 @@
-
/obj/item/kirbyplants
name = "potted plant"
icon = 'icons/obj/fluff/flora/plants.dmi'
diff --git a/code/game/objects/items/machine_wand.dm b/code/game/objects/items/machine_wand.dm
index fd0c730fff811..75c765730f78b 100644
--- a/code/game/objects/items/machine_wand.dm
+++ b/code/game/objects/items/machine_wand.dm
@@ -24,6 +24,18 @@
bug_appearance = mutable_appearance('icons/effects/effects.dmi', "fly-surrounding", ABOVE_WINDOW_LAYER)
register_context()
+/obj/item/machine_remote/equipped(mob/user, slot, initial)
+ . = ..()
+ if(user.get_active_held_item() == src)
+ ADD_TRAIT(user, TRAIT_AI_ACCESS, HELD_ITEM_TRAIT)
+ ADD_TRAIT(user, TRAIT_SILICON_ACCESS, HELD_ITEM_TRAIT)
+
+/obj/item/machine_remote/dropped(mob/user, silent)
+ . = ..()
+ if(user.get_active_held_item() != src)
+ REMOVE_TRAIT(user, TRAIT_AI_ACCESS, HELD_ITEM_TRAIT)
+ REMOVE_TRAIT(user, TRAIT_SILICON_ACCESS, HELD_ITEM_TRAIT)
+
/obj/item/machine_remote/Destroy(force)
. = ..()
if(controlling_machine_or_bot)
diff --git a/code/game/objects/items/maintenance_loot.dm b/code/game/objects/items/maintenance_loot.dm
index 51a272509969c..74d908732a562 100644
--- a/code/game/objects/items/maintenance_loot.dm
+++ b/code/game/objects/items/maintenance_loot.dm
@@ -20,6 +20,9 @@
wound_bonus = 20
demolition_mod = 1.25
grind_results = list(/datum/reagent/lead = 20)
+ pickup_sound = 'sound/items/lead_pipe_pickup.ogg'
+ drop_sound = 'sound/items/lead_pipe_drop.ogg'
+ hitsound = 'sound/items/lead_pipe_hit.ogg'
//A good battery early in the shift. Source of lead & sulfuric acid reagents.
//Add lead material to this once implemented.
diff --git a/code/game/objects/items/melee/baton.dm b/code/game/objects/items/melee/baton.dm
index 4af5c4c923e75..8c1ae33c4c70e 100644
--- a/code/game/objects/items/melee/baton.dm
+++ b/code/game/objects/items/melee/baton.dm
@@ -12,6 +12,7 @@
force = 12 //9 hit crit
w_class = WEIGHT_CLASS_NORMAL
wound_bonus = 15
+ sound_vary = TRUE
/// Whether this baton is active or not
var/active = TRUE
@@ -318,9 +319,13 @@
bare_wound_bonus = 5
clumsy_knockdown_time = 15 SECONDS
active = FALSE
- pickup_sound = 'sound/items/stun_baton_pick_up.ogg'
- drop_sound = 'sound/items/stun_baton_drop.ogg'
-
+ var/folded_drop_sound = 'sound/items/baton/telescopic_baton_folded_drop.ogg'
+ var/folded_pickup_sound = 'sound/items/baton/telescopic_baton_folded_pickup.ogg'
+ var/unfolded_drop_sound = 'sound/items/baton/telescopic_baton_unfolded_drop.ogg'
+ var/unfolded_pickup_sound = 'sound/items/baton/telescopic_baton_unfolded_pickup.ogg'
+ pickup_sound = 'sound/items/baton/telescopic_baton_folded_pickup.ogg'
+ drop_sound = 'sound/items/baton/telescopic_baton_folded_drop.ogg'
+ sound_vary = TRUE
/// The sound effecte played when our baton is extended.
var/on_sound = 'sound/weapons/batonextend.ogg'
/// The inhand iconstate used when our baton is extended.
@@ -376,6 +381,12 @@
inhand_icon_state = active ? on_inhand_icon_state : null // When inactive, there is no inhand icon_state.
if(user)
balloon_alert(user, active ? "extended" : "collapsed")
+ if(!active)
+ drop_sound = folded_drop_sound
+ pickup_sound = folded_pickup_sound
+ else
+ drop_sound = unfolded_drop_sound
+ pickup_sound = unfolded_pickup_sound
playsound(src, on_sound, 50, TRUE)
return COMPONENT_NO_DEFAULT_MESSAGE
@@ -397,6 +408,8 @@
clumsy_knockdown_time = 24 SECONDS
affect_cyborg = TRUE
on_stun_sound = 'sound/effects/contractorbatonhit.ogg'
+ unfolded_drop_sound = 'sound/items/baton/contractor_baton_unfolded_pickup.ogg'
+ unfolded_pickup_sound = 'sound/items/baton/contractor_baton_unfolded_pickup.ogg'
on_inhand_icon_state = "contractor_baton_on"
on_sound = 'sound/weapons/contractorbatonextend.ogg'
@@ -438,9 +451,13 @@
light_on = FALSE
light_color = LIGHT_COLOR_ORANGE
light_power = 0.5
- pickup_sound = 'sound/items/stun_baton_pick_up.ogg'
- drop_sound = 'sound/items/stun_baton_drop.ogg'
-
+ var/inactive_drop_sound = 'sound/items/baton/stun_baton_inactive_drop.ogg'
+ var/inactive_pickup_sound = 'sound/items/baton/stun_baton_inactive_pickup.ogg'
+ var/active_drop_sound = 'sound/items/baton/stun_baton_active_drop.ogg'
+ var/active_pickup_sound = 'sound/items/baton/stun_baton_active_pickup.ogg'
+ drop_sound = 'sound/items/baton/stun_baton_inactive_drop.ogg'
+ pickup_sound = 'sound/items/baton/stun_baton_inactive_pickup.ogg'
+ sound_vary = TRUE
var/throw_stun_chance = 35
var/obj/item/stock_parts/power_store/cell
@@ -501,15 +518,14 @@
SIGNAL_HANDLER
if(!active)
return
- toggle_light()
- active = FALSE
+ turn_off()
update_appearance()
return COMSIG_SABOTEUR_SUCCESS
/obj/item/melee/baton/security/Exited(atom/movable/mov_content)
. = ..()
if(mov_content == cell)
cell = null
- active = FALSE
+ turn_off()
update_appearance()
/obj/item/melee/baton/security/update_icon_state()
@@ -559,26 +575,41 @@
return FALSE
/obj/item/melee/baton/security/attack_self(mob/user)
- if(cell?.charge >= cell_hit_cost)
- active = !active
- balloon_alert(user, "turned [active ? "on" : "off"]")
- playsound(src, SFX_SPARKS, 75, TRUE, -1)
- toggle_light(user)
- do_sparks(1, TRUE, src)
+ if(cell?.charge >= cell_hit_cost && !active)
+ turn_on(user)
+ balloon_alert(user, "turned on")
else
- active = FALSE
+ turn_off()
if(!cell)
balloon_alert(user, "no power source!")
- else
+ else if(cell?.charge < cell_hit_cost)
balloon_alert(user, "out of charge!")
- update_appearance()
+ else
+ balloon_alert(user, "turned off")
add_fingerprint(user)
/// Toggles the stun baton's light
-/obj/item/melee/baton/security/proc/toggle_light(mob/user)
+/obj/item/melee/baton/security/proc/toggle_light()
set_light_on(!light_on)
return
+/obj/item/melee/baton/security/proc/turn_on(mob/user)
+ active = TRUE
+ playsound(src, SFX_SPARKS, 75, TRUE, -1)
+ update_appearance()
+ toggle_light()
+ do_sparks(1, TRUE, src)
+ drop_sound = active_drop_sound
+ pickup_sound = active_pickup_sound
+
+/obj/item/melee/baton/security/proc/turn_off()
+ active = FALSE
+ set_light_on(FALSE)
+ update_appearance()
+ playsound(src, SFX_SPARKS, 75, TRUE, -1)
+ drop_sound = inactive_drop_sound
+ pickup_sound = inactive_pickup_sound
+
/obj/item/melee/baton/security/proc/deductcharge(deducted_charge)
if(!cell)
return
@@ -587,10 +618,7 @@
. = cell.use(deducted_charge)
if(active && cell.charge < cell_hit_cost)
//we're below minimum, turn off
- active = FALSE
- set_light_on(FALSE)
- update_appearance()
- playsound(src, SFX_SPARKS, 75, TRUE, -1)
+ turn_off()
/obj/item/melee/baton/security/clumsy_check(mob/living/carbon/human/user)
. = ..()
diff --git a/code/game/objects/items/paint.dm b/code/game/objects/items/paint.dm
index 41c1809b5589e..66e0b15e99fd7 100644
--- a/code/game/objects/items/paint.dm
+++ b/code/game/objects/items/paint.dm
@@ -108,7 +108,7 @@
return FALSE
if(!user.is_holding(src))
return FALSE
- if(user.incapacitated())
+ if(user.incapacitated)
return FALSE
return TRUE
diff --git a/code/game/objects/items/pet_carrier.dm b/code/game/objects/items/pet_carrier.dm
index 2e2e622ff6c1b..7b9aa7ceefe08 100644
--- a/code/game/objects/items/pet_carrier.dm
+++ b/code/game/objects/items/pet_carrier.dm
@@ -182,7 +182,7 @@
add_occupant(target)
/obj/item/pet_carrier/proc/add_occupant(mob/living/occupant)
- if(occupant in occupants || !istype(occupant))
+ if((occupant in occupants) || !istype(occupant))
return
occupant.forceMove(src)
occupants += occupant
diff --git a/code/game/objects/items/pinpointer.dm b/code/game/objects/items/pinpointer.dm
index 5d7fc1957f4f4..526b5ca2e985e 100644
--- a/code/game/objects/items/pinpointer.dm
+++ b/code/game/objects/items/pinpointer.dm
@@ -152,7 +152,7 @@
return
if(isnull(names[pinpoint_target]))
return
- if(QDELETED(src) || !user || !user.is_holding(src) || user.incapacitated())
+ if(QDELETED(src) || !user || !user.is_holding(src) || user.incapacitated)
return
target = names[pinpoint_target]
toggle_on()
diff --git a/code/game/objects/items/rcd/RCD.dm b/code/game/objects/items/rcd/RCD.dm
index cf254e447818d..5bd0b4c9d39b8 100644
--- a/code/game/objects/items/rcd/RCD.dm
+++ b/code/game/objects/items/rcd/RCD.dm
@@ -16,6 +16,9 @@
item_flags = NO_MAT_REDEMPTION | NOBLUDGEON
has_ammobar = TRUE
actions_types = list(/datum/action/item_action/rcd_scan)
+ drop_sound = 'sound/items/handling/rcd_drop.ogg'
+ pickup_sound = 'sound/items/handling/rcd_pickup.ogg'
+ sound_vary = TRUE
/// main category of currently selected design[Structures, Airlocks, Airlock Access]
var/root_category
@@ -103,7 +106,7 @@
T.rcd_act(user, src, list("[RCD_DESIGN_MODE]" = RCD_TURF, "[RCD_DESIGN_PATH]" = /turf/open/floor/plating/rcd))
useResource(16, user)
activate()
- playsound(loc, 'sound/machines/click.ogg', 50, 1)
+ playsound(get_turf(user), SFX_TOOL_SWITCH, 20, TRUE)
user.gib(DROP_ALL_REMAINS)
return MANUAL_SUICIDE
@@ -144,7 +147,7 @@
//check if we can build our window on the grill
if(target_turf.is_blocked_turf(exclude_mobs = !is_full_tile, source_atom = null, ignore_atoms = structures_to_ignore, type_list = TRUE))
- playsound(loc, 'sound/machines/click.ogg', 50, TRUE)
+ playsound(get_turf(user), SFX_TOOL_SWITCH, 20, TRUE)
balloon_alert(user, "something is blocking the turf")
return FALSE
@@ -155,7 +158,7 @@
else if(rcd_mode == RCD_TURF && rcd_structure == /turf/open/floor/plating/rcd && (!istype(target_turf, /turf/open/floor) || istype(target, /obj/structure/girder)))
//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)))
- playsound(loc, 'sound/machines/click.ogg', 50, TRUE)
+ playsound(get_turf(user), SFX_TOOL_SWITCH, 20, TRUE)
balloon_alert(user, "something is on the girder!")
return FALSE
@@ -190,7 +193,7 @@
//check if the structure can fit on this turf
if(target_turf.is_blocked_turf(exclude_mobs = ignore_mobs, source_atom = null, ignore_atoms = ignored_types, type_list = TRUE))
- playsound(loc, 'sound/machines/click.ogg', 50, TRUE)
+ playsound(get_turf(user), SFX_TOOL_SWITCH, 20, TRUE)
balloon_alert(user, "something is on the tile!")
return FALSE
@@ -341,6 +344,7 @@
return data
/obj/item/construction/rcd/handle_ui_act(action, params, datum/tgui/ui, datum/ui_state/state)
+ playsound(src, SFX_TOOL_SWITCH, 20, TRUE)
switch(action)
if("root_category")
diff --git a/code/game/objects/items/rcd/RHD.dm b/code/game/objects/items/rcd/RHD.dm
index 64179a81b5fb4..a212274ce46be 100644
--- a/code/game/objects/items/rcd/RHD.dm
+++ b/code/game/objects/items/rcd/RHD.dm
@@ -292,7 +292,7 @@
/obj/item/construction/proc/check_menu(mob/living/user, remote_anchor)
if(!istype(user))
return FALSE
- if(user.incapacitated())
+ if(user.incapacitated)
return FALSE
if(remote_anchor && user.remote_control != remote_anchor)
return FALSE
diff --git a/code/game/objects/items/rcd/RPD.dm b/code/game/objects/items/rcd/RPD.dm
index 41a962ed7e7de..9c3aa6cffc284 100644
--- a/code/game/objects/items/rcd/RPD.dm
+++ b/code/game/objects/items/rcd/RPD.dm
@@ -59,6 +59,8 @@ GLOBAL_LIST_INIT(disposal_pipe_recipes, list(
new /datum/pipe_info/disposal("Sort Junction", /obj/structure/disposalpipe/sorting/mail, PIPE_TRIN_M),
new /datum/pipe_info/disposal("Rotator", /obj/structure/disposalpipe/rotator, PIPE_ONEDIR_FLIPPABLE),
new /datum/pipe_info/disposal("Trunk", /obj/structure/disposalpipe/trunk),
+ new /datum/pipe_info/disposal("Down Turn", /obj/structure/disposalpipe/trunk/multiz/down),
+ new /datum/pipe_info/disposal("Up Turn", /obj/structure/disposalpipe/trunk/multiz),
new /datum/pipe_info/disposal("Bin", /obj/machinery/disposal/bin, PIPE_ONEDIR),
new /datum/pipe_info/disposal("Outlet", /obj/structure/disposaloutlet),
new /datum/pipe_info/disposal("Chute", /obj/machinery/disposal/delivery_chute),
@@ -142,6 +144,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
/datum/pipe_info/meter
icon_state = "meter"
dirtype = PIPE_ONEDIR
+ all_layers = TRUE
/datum/pipe_info/meter/New(label)
name = label
@@ -182,6 +185,9 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
custom_materials = list(/datum/material/iron=SHEET_MATERIAL_AMOUNT*37.5, /datum/material/glass=SHEET_MATERIAL_AMOUNT*18.75)
armor_type = /datum/armor/item_pipe_dispenser
resistance_flags = FIRE_PROOF
+ drop_sound = 'sound/items/handling/rpd_drop.ogg'
+ pickup_sound = 'sound/items/handling/rpd_pickup.ogg'
+ sound_vary = TRUE
///Sparks system used when changing device in the UI
var/datum/effect_system/spark_spread/spark_system
///Direction of the device we are going to spawn, set up in the UI
@@ -293,7 +299,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
/obj/item/pipe_dispenser/suicide_act(mob/living/user)
user.visible_message(span_suicide("[user] points the end of the RPD down [user.p_their()] throat and presses a button! It looks like [user.p_theyre()] trying to commit suicide..."))
- playsound(get_turf(user), 'sound/machines/click.ogg', 50, TRUE)
+ playsound(get_turf(user), SFX_TOOL_SWITCH, 20, TRUE)
playsound(get_turf(user), RPD_USE_SOUND, 50, TRUE)
return BRUTELOSS
@@ -357,11 +363,13 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
data["init_directions"] = init_directions
return data
-/obj/item/pipe_dispenser/ui_act(action, params)
+/obj/item/pipe_dispenser/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
+ playsound(src, SFX_TOOL_SWITCH, 20, TRUE)
+
var/playeffect = TRUE
switch(action)
if("color")
@@ -456,7 +464,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
. = TRUE
if((mode & DESTROY_MODE) && istype(attack_target, /obj/item/pipe) || istype(attack_target, /obj/structure/disposalconstruct) || istype(attack_target, /obj/structure/c_transit_tube) || istype(attack_target, /obj/structure/c_transit_tube_pod) || istype(attack_target, /obj/item/pipe_meter) || istype(attack_target, /obj/structure/disposalpipe/broken))
- playsound(get_turf(src), 'sound/machines/click.ogg', 50, TRUE)
+ playsound(get_turf(src), SFX_TOOL_SWITCH, 20, TRUE)
playsound(get_turf(src), RPD_USE_SOUND, 50, TRUE)
qdel(attack_target)
return
@@ -478,7 +486,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
balloon_alert(user, "already configured for its directions!")
return
- playsound(get_turf(src), 'sound/machines/click.ogg', 50, TRUE)
+ playsound(get_turf(src), SFX_TOOL_SWITCH, 20, TRUE)
// Something else could have changed the target's state while we were waiting in do_after
// Most of the edge cases don't matter, but atmos components being able to have live connections not described by initializable directions sounds like a headache at best and an exploit at worst
@@ -542,7 +550,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
if(isclosedturf(attack_target))
balloon_alert(user, "target is blocked!")
return
- playsound(get_turf(src), 'sound/machines/click.ogg', 50, TRUE)
+ playsound(get_turf(src), SFX_TOOL_SWITCH, 20, TRUE)
if(do_after(user, disposal_build_speed, target = attack_target))
var/obj/structure/disposalconstruct/new_disposals_segment = new (attack_target, queued_pipe_type, queued_pipe_dir, queued_pipe_flipped)
@@ -572,7 +580,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
balloon_alert(user, "something in the way!")
return
- playsound(get_turf(src), 'sound/machines/click.ogg', 50, TRUE)
+ playsound(get_turf(src), SFX_TOOL_SWITCH, 20, TRUE)
if(do_after(user, transit_build_speed, target = attack_target))
playsound(get_turf(src), RPD_USE_SOUND, 50, TRUE)
if(queued_pipe_type == /obj/structure/c_transit_tube_pod)
@@ -619,7 +627,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
return FALSE
if(!can_make_pipe)
return FALSE
- playsound(get_turf(src), 'sound/machines/click.ogg', 50, vary = TRUE)
+ playsound(get_turf(src), SFX_TOOL_SWITCH, 20, vary = TRUE)
if(!continued_build && !do_after(user, atmos_build_speed, target = atom_to_target))
return FALSE
if(!recipe.all_layers && (layer_to_build == 1 || layer_to_build == 5))
@@ -681,7 +689,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
if(multi_layer)
balloon_alert(source_mob, "turn off multi layer!")
return
- if(source_mob.incapacitated(IGNORE_RESTRAINTS|IGNORE_STASIS))
+ if(INCAPACITATED_IGNORING(source_mob, INCAPABLE_RESTRAINTS|INCAPABLE_STASIS))
return
if(source_mob.get_active_held_item() != src)
return
diff --git a/code/game/objects/items/rcd/RPLD.dm b/code/game/objects/items/rcd/RPLD.dm
index 56452e2e452b1..4872dffde362e 100644
--- a/code/game/objects/items/rcd/RPLD.dm
+++ b/code/game/objects/items/rcd/RPLD.dm
@@ -12,6 +12,9 @@
banned_upgrades = RCD_ALL_UPGRADES & ~RCD_UPGRADE_SILO_LINK
matter = 200
max_matter = 200
+ drop_sound = 'sound/items/handling/rcd_drop.ogg'
+ pickup_sound = 'sound/items/handling/rcd_pickup.ogg'
+ sound_vary = TRUE
///category of design selected
var/selected_category
@@ -153,6 +156,8 @@
return data
/obj/item/construction/plumbing/handle_ui_act(action, params, datum/tgui/ui, datum/ui_state/state)
+ playsound(src, SFX_TOOL_SWITCH, 20, TRUE)
+
switch(action)
if("color")
var/color = params["paint_color"]
@@ -178,8 +183,6 @@
blueprint = design
blueprint_changed = TRUE
- playsound(src, 'sound/effects/pop.ogg', 50, vary = FALSE)
-
return TRUE
@@ -285,7 +288,7 @@
/obj/item/construction/plumbing/proc/mouse_wheeled(mob/source, atom/A, delta_x, delta_y, params)
SIGNAL_HANDLER
- if(source.incapacitated(IGNORE_RESTRAINTS|IGNORE_STASIS))
+ if(INCAPACITATED_IGNORING(source, INCAPABLE_RESTRAINTS|INCAPABLE_STASIS))
return
if(delta_y == 0)
return
diff --git a/code/game/objects/items/rcd/RSF.dm b/code/game/objects/items/rcd/RSF.dm
index ee85994143a00..e3d27620ce9ff 100644
--- a/code/game/objects/items/rcd/RSF.dm
+++ b/code/game/objects/items/rcd/RSF.dm
@@ -121,7 +121,7 @@ RSF
return radial_list
/obj/item/rsf/proc/check_menu(mob/user)
- if(user.incapacitated() || !user.Adjacent(src))
+ if(user.incapacitated || !user.Adjacent(src))
return FALSE
return TRUE
diff --git a/code/game/objects/items/rcd/RTD.dm b/code/game/objects/items/rcd/RTD.dm
index 45b9c9e3687dd..93e5147175e4e 100644
--- a/code/game/objects/items/rcd/RTD.dm
+++ b/code/game/objects/items/rcd/RTD.dm
@@ -24,6 +24,9 @@
item_flags = NO_MAT_REDEMPTION | NOBLUDGEON
has_ammobar = TRUE
banned_upgrades = RCD_ALL_UPGRADES & ~RCD_UPGRADE_SILO_LINK
+ drop_sound = 'sound/items/handling/rcd_drop.ogg'
+ pickup_sound = 'sound/items/handling/rcd_pickup.ogg'
+ sound_vary = TRUE
/// main category for tile design
var/root_category = "Conventional"
@@ -195,6 +198,7 @@
return data
/obj/item/construction/rtd/handle_ui_act(action, params, datum/tgui/ui, datum/ui_state/state)
+ playsound(src, SFX_TOOL_SWITCH, 20, TRUE)
var/floor_designs = GLOB.floor_designs
switch(action)
diff --git a/code/game/objects/items/rcd/RWD.dm b/code/game/objects/items/rcd/RWD.dm
index 0ee29e87a352f..bafbfdc5d8dd9 100644
--- a/code/game/objects/items/rcd/RWD.dm
+++ b/code/game/objects/items/rcd/RWD.dm
@@ -152,7 +152,7 @@
if(!ISADVANCEDTOOLUSER(user))
to_chat(user, span_warning("You don't have the dexterity to do this!"))
return FALSE
- if(user.incapacitated() || !user.Adjacent(src))
+ if(user.incapacitated || !user.Adjacent(src))
return FALSE
return TRUE
diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm
index f25c022b5808a..232de4c461930 100644
--- a/code/game/objects/items/religion.dm
+++ b/code/game/objects/items/religion.dm
@@ -386,6 +386,7 @@
icon_state = "crusader"
w_class = WEIGHT_CLASS_NORMAL
armor_type = /datum/armor/shoes_plate
+ body_parts_covered = FEET|LEGS
clothing_traits = list(TRAIT_NO_SLIP_WATER)
cold_protection = FEET
min_cold_protection_temperature = SHOES_MIN_TEMP_PROTECT
diff --git a/code/game/objects/items/robot/items/hypo.dm b/code/game/objects/items/robot/items/hypo.dm
index 9a29ccbd9ef97..96a0c0d36b220 100644
--- a/code/game/objects/items/robot/items/hypo.dm
+++ b/code/game/objects/items/robot/items/hypo.dm
@@ -90,6 +90,9 @@
/datum/reagent/consumable/ethanol/fernet,\
)
+#define REAGENT_CONTAINER_INTERNAL "internal_beaker"
+#define REAGENT_CONTAINER_BEVAPPARATUS "beverage_apparatus"
+
///Borg Hypospray
/obj/item/reagent_containers/borghypo
name = "cyborg hypospray"
@@ -222,7 +225,7 @@
/obj/item/reagent_containers/borghypo/attack_self(mob/user)
ui_interact(user)
-/obj/item/reagent_containers/borghypo/ui_act(action, params)
+/obj/item/reagent_containers/borghypo/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
@@ -325,6 +328,7 @@
dispensed_temperature = WATER_MATTERSTATE_CHANGE_TEMP //Water stays wet, ice stays ice
default_reagent_types = BASE_SERVICE_REAGENTS
expanded_reagent_types = EXPANDED_SERVICE_REAGENTS
+ var/reagent_search_container = REAGENT_CONTAINER_BEVAPPARATUS
/obj/item/reagent_containers/borghypo/borgshaker/ui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
@@ -332,6 +336,27 @@
ui = new(user, src, "BorgShaker", name)
ui.open()
+/obj/item/reagent_containers/borghypo/borgshaker/ui_act(action, params)
+ . = ..()
+ if(.)
+ return
+ var/mob/living/silicon/robot/user = usr
+ switch(action)
+ if("reaction_lookup")
+ if(!iscyborg(usr))
+ return
+ if (reagent_search_container == REAGENT_CONTAINER_BEVAPPARATUS)
+ var/obj/item/borg/apparatus/beaker/service/beverage_apparatus = (locate() in user.model.modules) || (locate() in user.held_items)
+ if (!isnull(beverage_apparatus) && !isnull(beverage_apparatus.stored))
+ beverage_apparatus.stored.reagents.ui_interact(user)
+ else if (reagent_search_container == REAGENT_CONTAINER_INTERNAL)
+ var/obj/item/reagent_containers/cup/beaker/large/internal_beaker = (locate() in user.model.modules) || (locate() in user.held_items)
+ if (!isnull(internal_beaker))
+ internal_beaker.reagents.ui_interact(user)
+ if ("set_preferred_container")
+ reagent_search_container = params["value"]
+ return TRUE
+
/obj/item/reagent_containers/borghypo/borgshaker/ui_data(mob/user)
var/list/drink_reagents = list()
var/list/alcohol_reagents = list()
@@ -354,6 +379,17 @@
data["sodas"] = drink_reagents
data["alcohols"] = alcohol_reagents
data["selectedReagent"] = selected_reagent?.name
+ data["reagentSearchContainer"] = reagent_search_container
+
+ if(iscyborg(user))
+ var/mob/living/silicon/robot/cyborg = user
+ var/obj/item/borg/apparatus/beaker/service/beverage_apparatus = (locate() in cyborg.model.modules) || (locate() in cyborg.held_items)
+
+ if (isnull(beverage_apparatus))
+ to_chat(user, span_warning("This unit has no beverage apparatus. This shouldn't be possible. Delete yourself, NOW!"))
+ data["apparatusHasItem"] = FALSE
+ else
+ data["apparatusHasItem"] = !isnull(beverage_apparatus.stored)
return data
/obj/item/reagent_containers/borghypo/borgshaker/attack(mob/M, mob/user)
@@ -452,6 +488,8 @@
dispensed_temperature = WATER_MATTERSTATE_CHANGE_TEMP
default_reagent_types = HACKED_SERVICE_REAGENTS
+#undef REAGENT_CONTAINER_INTERNAL
+#undef REAGENT_CONTAINER_BEVAPPARATUS
#undef BASE_MEDICAL_REAGENTS
#undef EXPANDED_MEDICAL_REAGENTS
#undef HACKED_MEDICAL_REAGENTS
diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm
index 7e954fbcec5cd..14a7c8a1d63a5 100644
--- a/code/game/objects/items/robot/robot_parts.dm
+++ b/code/game/objects/items/robot/robot_parts.dm
@@ -121,14 +121,11 @@
if(chest)
chest.forceMove(drop_to)
- new /obj/item/stack/cable_coil(drop_to, 1)
- chest.wired = FALSE
- chest.cell?.forceMove(drop_to)
+ chest.drop_organs()
if(head)
- head.flash1?.forceMove(drop_to)
- head.flash2?.forceMove(drop_to)
head.forceMove(drop_to)
+ head.drop_organs()
/obj/item/robot_suit/proc/put_in_hand_or_drop(mob/living/user, obj/item/I) //normal put_in_hands() drops the item ontop of the player, this drops it at the suit's loc
if(!user.put_in_hands(I))
@@ -409,7 +406,7 @@
data["lawsync"] = lawsync
return data
-/obj/item/robot_suit/ui_act(action, list/params)
+/obj/item/robot_suit/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm
index 815bdeb2b60e6..4727f16ee1dd2 100644
--- a/code/game/objects/items/robot/robot_upgrades.dm
+++ b/code/game/objects/items/robot/robot_upgrades.dm
@@ -208,6 +208,27 @@
items_to_add = list(/obj/item/cautery/prt)
+/obj/item/borg/upgrade/plunger
+ name = "janitor cyborg plunging tool"
+ desc = "An integrated cyborg retractable plunger. It's meant for plunging things, duh."
+ icon_state = "module_janitor"
+ require_model = TRUE
+ model_type = list(/obj/item/robot_model/janitor)
+ model_flags = BORG_MODEL_JANITOR
+
+ items_to_add = list(/obj/item/plunger/cyborg)
+
+/obj/item/borg/upgrade/high_capacity_light_replacer
+ name = "janitor cyborg high capacity replacer"
+ desc = "Increases the amount of lights that can be stored in the replacer."
+ icon_state = "module_janitor"
+ require_model = TRUE
+ model_type = list(/obj/item/robot_model/janitor)
+ model_flags = BORG_MODEL_JANITOR
+
+ items_to_add = list (/obj/item/lightreplacer/cyborg/advanced)
+ items_to_remove = list(/obj/item/lightreplacer/cyborg)
+
/obj/item/borg/upgrade/syndicate
name = "illegal equipment module"
desc = "Unlocks the hidden, deadlier functions of a cyborg."
@@ -420,7 +441,8 @@
/obj/item/borg/upgrade/surgery_omnitool
name = "cyborg surgical omni-tool upgrade"
desc = "An upgrade to the Medical model, upgrading the built-in \
- surgical omnitool, to be on par with advanced surgical tools"
+ surgical omnitool, to be on par with advanced surgical tools, allowing for faster surgery. \
+ It also upgrades their scanner."
icon_state = "module_medical"
require_model = TRUE
model_type = list(/obj/item/robot_model/medical, /obj/item/robot_model/syndicate_medical)
diff --git a/code/game/objects/items/scrolls.dm b/code/game/objects/items/scrolls.dm
index 65d9000728d53..3fea8376eb3d2 100644
--- a/code/game/objects/items/scrolls.dm
+++ b/code/game/objects/items/scrolls.dm
@@ -55,7 +55,7 @@
if(!ishuman(user))
return
var/mob/living/carbon/human/human_user = user
- if(human_user.incapacitated() || !human_user.is_holding(src))
+ if(human_user.incapacitated || !human_user.is_holding(src))
return
var/datum/action/cooldown/spell/teleport/area_teleport/wizard/scroll/teleport = locate() in actions
if(!teleport)
diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm
index c980fe0dbb359..73aaa7e75a1cb 100644
--- a/code/game/objects/items/shields.dm
+++ b/code/game/objects/items/shields.dm
@@ -26,6 +26,10 @@
var/shield_break_sound = 'sound/effects/bang.ogg'
/// baton bash cooldown
COOLDOWN_DECLARE(baton_bash)
+ /// is shield bashable?
+ var/is_bashable = TRUE
+ /// sound when a shield is bashed
+ var/shield_bash_sound = 'sound/effects/shieldbash.ogg'
/datum/armor/item_shield
melee = 50
@@ -61,6 +65,19 @@
if(0 to 25)
. += span_warning("It's falling apart!")
+/obj/item/shield/item_interaction(mob/living/user, obj/item/tool, list/modifiers, is_right_clicking)
+ . = ..()
+ if(. & ITEM_INTERACT_ANY_BLOCKER)
+ return .
+ if(!istype(tool, /obj/item/melee/baton) || !is_bashable)
+ return .
+ if(!COOLDOWN_FINISHED(src, baton_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)
+ 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)
if(!breakable_by_damage || (damage_type != BRUTE && damage_type != BURN))
return TRUE
@@ -162,13 +179,6 @@
)
/obj/item/shield/riot/attackby(obj/item/attackby_item, mob/user, params)
- if(istype(attackby_item, /obj/item/melee/baton))
- if(!COOLDOWN_FINISHED(src, baton_bash))
- return
- user.visible_message(span_warning("[user] bashes [src] with [attackby_item]!"))
- playsound(user.loc, 'sound/effects/shieldbash.ogg', 50, TRUE)
- COOLDOWN_START(src, baton_bash, BATON_BASH_COOLDOWN)
- return
if(istype(attackby_item, /obj/item/stack/sheet/mineral/titanium))
if (atom_integrity >= max_integrity)
to_chat(user, span_warning("[src] is already in perfect condition."))
@@ -284,7 +294,7 @@
/obj/item/shield/energy
name = "combat energy shield"
- desc = "A hardlight shield capable of reflecting blocked energy projectiles, as well las providing well-rounded defense from most all other attacks."
+ desc = "A hardlight shield capable of reflecting blocked energy projectiles, as well as providing well-rounded defense from most all other attacks."
icon_state = "eshield"
inhand_icon_state = "eshield"
w_class = WEIGHT_CLASS_TINY
@@ -296,6 +306,8 @@
throw_speed = 3
breakable_by_damage = FALSE
block_sound = 'sound/weapons/block_blade.ogg'
+ is_bashable = FALSE // Gotta wait till it activates y'know
+ shield_bash_sound = 'sound/effects/energyshieldbash.ogg'
/// Force of the shield when active.
var/active_force = 10
/// Throwforce of the shield when active.
@@ -344,6 +356,7 @@
if(user)
balloon_alert(user, active ? "activated" : "deactivated")
playsound(src, active ? 'sound/weapons/saberon.ogg' : 'sound/weapons/saberoff.ogg', 35, TRUE)
+ is_bashable = !is_bashable
return COMPONENT_NO_DEFAULT_MESSAGE
/obj/item/shield/energy/proc/can_disarm_attack(datum/source, mob/living/victim, mob/living/user, send_message = TRUE)
@@ -355,7 +368,7 @@
/obj/item/shield/energy/advanced
name = "advanced combat energy shield"
- desc = "A hardlight shield capable of reflecting all energy projectiles, as well las providing well-rounded defense from most all other attacks. \
+ desc = "A hardlight shield capable of reflecting all energy projectiles, as well as providing well-rounded defense from most all other attacks. \
Often employed by Nanotrasen deathsquads."
icon_state = "advanced_eshield"
inhand_icon_state = "advanced_eshield"
diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm
index 1f13ec34a764c..9dff36dca2dde 100644
--- a/code/game/objects/items/stacks/sheets/leather.dm
+++ b/code/game/objects/items/stacks/sheets/leather.dm
@@ -245,6 +245,8 @@ GLOBAL_LIST_INIT(leather_recipes, list ( \
icon_state = "sinew"
novariants = TRUE
merge_type = /obj/item/stack/sheet/sinew
+ drop_sound = 'sound/effects/meatslap.ogg'
+ pickup_sound = 'sound/effects/meatslap.ogg'
/obj/item/stack/sheet/sinew/Initialize(mapload, new_amount, merge, list/mat_override, mat_amt)
. = ..()
@@ -346,6 +348,8 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
icon_state = "sheet-hairlesshide"
inhand_icon_state = null
merge_type = /obj/item/stack/sheet/hairlesshide
+ pickup_sound = 'sound/items/skin_pick_up.ogg'
+ drop_sound = 'sound/items/skin_drop.ogg'
/obj/item/stack/sheet/hairlesshide/examine(mob/user)
. = ..()
@@ -359,6 +363,8 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
icon_state = "sheet-wetleather"
inhand_icon_state = null
merge_type = /obj/item/stack/sheet/wethide
+ pickup_sound = 'sound/items/skin_pick_up.ogg'
+ drop_sound = 'sound/items/skin_drop.ogg'
/// Reduced when exposed to high temperatures
var/wetness = 30
/// Kelvin to start drying
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 7443085aa4d5f..877460edfaf7a 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -450,6 +450,8 @@ GLOBAL_LIST_INIT(bamboo_recipes, list ( \
grind_results = list(/datum/reagent/cellulose = 10)
material_type = /datum/material/bamboo
walltype = /turf/closed/wall/mineral/bamboo
+ drop_sound = null
+ pickup_sound = null
/datum/armor/mineral_bamboo
fire = 50
@@ -575,6 +577,8 @@ GLOBAL_LIST_INIT(durathread_recipes, list ( \
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_drop.ogg'
+ pickup_sound = 'sound/items/handling/cloth_pickup.ogg'
/obj/item/stack/sheet/cotton/Initialize(mapload)
. = ..()
@@ -813,6 +817,8 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \
grind_results = list(/datum/reagent/carbon = 10)
merge_type = /obj/item/stack/sheet/bone
material_type = /datum/material/bone
+ drop_sound = null
+ pickup_sound = null
/obj/item/stack/sheet/bone/Initialize(mapload, new_amount, merge, list/mat_override, mat_amt)
. = ..()
@@ -885,6 +891,8 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra
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/get_main_recipes()
. = ..()
@@ -906,6 +914,8 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra
merge_type = /obj/item/stack/sheet/meat
material_type = /datum/material/meat
material_modifier = 1 //None of that wussy stuff
+ drop_sound = null
+ pickup_sound = null
/obj/item/stack/sheet/meat/fifty
amount = 50
@@ -923,6 +933,8 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra
merge_type = /obj/item/stack/sheet/pizza
material_type = /datum/material/pizza
material_modifier = 1
+ drop_sound = null
+ pickup_sound = null
/obj/item/stack/sheet/pizza/fifty
amount = 50
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index a6571eeb1e9b3..5eb651b2905d4 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -302,7 +302,7 @@
data["recipes"] = recursively_build_recipes(recipes)
return data
-/obj/item/stack/ui_act(action, params)
+/obj/item/stack/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
@@ -369,7 +369,7 @@
/obj/item/stack/proc/radial_check(mob/builder)
if(QDELETED(builder) || QDELETED(src))
return FALSE
- if(builder.incapacitated())
+ if(builder.incapacitated)
return FALSE
if(!builder.is_holding(src))
return FALSE
diff --git a/code/game/objects/items/stickers.dm b/code/game/objects/items/stickers.dm
index 19ac58f6f4072..447e202247367 100644
--- a/code/game/objects/items/stickers.dm
+++ b/code/game/objects/items/stickers.dm
@@ -30,8 +30,10 @@
/// `list` or `null`, contains possible alternate `icon_states`.
var/list/icon_states
- /// Whether sticker is legal and allowed to generate inside non-syndicate boxes.
- var/contraband = FALSE
+ /// This sticker won't be generated inside random sticker packs.
+ var/exclude_from_random = FALSE
+ /// Text added to the atom's examine when stickered.
+ var/examine_text
/obj/item/sticker/Initialize(mapload)
. = ..()
@@ -85,7 +87,7 @@
user.log_message("stuck [src] to [key_name(victim)]", LOG_ATTACK)
victim.log_message("had [src] stuck to them by [key_name(user)]", LOG_ATTACK)
- target.AddComponent(/datum/component/sticker, src, get_dir(target, src), px, py)
+ target.AddComponent(/datum/component/sticker, src, get_dir(target, src), px, py, null, null, examine_text)
return TRUE
#undef MAX_STICKER_COUNT
@@ -123,6 +125,7 @@
name = "blue R sticker"
desc = "A sticker of FUCK THE SYSTEM, the galaxy's premiere hardcore punk band."
icon_state = "revhead"
+ examine_text = "There is a sticker displaying FUCK THE SYSTEM, the galaxy's premiere hardcore punk band."
/obj/item/sticker/pslime
name = "slime plushie sticker"
@@ -149,6 +152,12 @@
name = "toolbox sticker"
icon_state = "soul"
+/obj/item/sticker/chief_engineer
+ name = "CE approved sticker"
+ icon_state = "ce_approved"
+ exclude_from_random = TRUE
+ examine_text = "There is a sticker displaying the Chief Engineer's SEAL OF APPROVAL."
+
/obj/item/sticker/clown
name = "clown sticker"
icon_state = "honkman"
@@ -164,15 +173,17 @@
/obj/item/sticker/skub
name = "skub sticker"
icon_state = "skub"
+ examine_text = "There is a sticker displaying Skubtide, Stationwide!"
/obj/item/sticker/anti_skub
name = "anti-skub sticker"
icon_state = "anti_skub"
+ examine_text = "There is an anti-skub sticker."
/obj/item/sticker/syndicate
name = "syndicate sticker"
icon_state = "synd"
- contraband = TRUE
+ exclude_from_random = TRUE
/obj/item/sticker/syndicate/Initialize(mapload)
. = ..()
diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm
index 996cd933647a1..269a6699d3e1c 100644
--- a/code/game/objects/items/storage/bags.dm
+++ b/code/game/objects/items/storage/bags.dm
@@ -274,6 +274,8 @@
. += span_notice("Ctrl-click to activate seed extraction.")
/obj/item/storage/bag/plants/portaseeder/item_ctrl_click(mob/user)
+ if(user.incapacitated)
+ return
for(var/obj/item/plant in contents)
seedify(plant, 1)
return CLICK_ACTION_SUCCESS
@@ -581,7 +583,7 @@
worn_icon_state = "rebar_quiver"
inhand_icon_state = "rebar_quiver"
desc = "A oxygen tank cut in half, used for holding sharpened rods for the rebar crossbow."
- slot_flags = ITEM_SLOT_BACK|ITEM_SLOT_SUITSTORE
+ slot_flags = ITEM_SLOT_BACK|ITEM_SLOT_SUITSTORE|ITEM_SLOT_NECK
resistance_flags = FLAMMABLE
/obj/item/storage/bag/rebar_quiver/Initialize(mapload)
@@ -598,4 +600,59 @@
/obj/item/ammo_casing/rebar/paperball,
))
+/obj/item/storage/bag/rebar_quiver/syndicate
+ icon_state = "syndie_quiver_0"
+ worn_icon_state = "syndie_quiver_0"
+ inhand_icon_state = "holyquiver"
+ desc = "A specialized quiver meant to hold any kind of bolts intended for use with the rebar crossbow. \
+ Clearly a better design than a cut up oxygen tank..."
+ slot_flags = ITEM_SLOT_NECK
+ w_class = WEIGHT_CLASS_SMALL
+ resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+ actions_types = list(/datum/action/item_action/reload_rebar)
+
+/obj/item/storage/bag/rebar_quiver/syndicate/Initialize(mapload)
+ . = ..()
+ atom_storage.max_slots = 20
+ atom_storage.max_total_storage = 20
+ update_appearance(UPDATE_OVERLAYS)
+
+/obj/item/storage/bag/rebar_quiver/syndicate/PopulateContents()
+ for(var/to_fill in 1 to 20)
+ new /obj/item/ammo_casing/rebar/syndie(src)
+
+/obj/item/storage/bag/rebar_quiver/syndicate/update_icon_state()
+ . = ..()
+ switch(contents.len)
+ if(0)
+ icon_state = "syndie_quiver_0"
+ if(1 to 7)
+ icon_state = "syndie_quiver_1"
+ if(8 to 13)
+ icon_state = "syndie_quiver_2"
+ if(14 to 20)
+ icon_state = "syndie_quiver_3"
+
+/obj/item/storage/bag/rebar_quiver/syndicate/ui_action_click(mob/user, actiontype)
+ if(istype(actiontype, /datum/action/item_action/reload_rebar))
+ reload_held_rebar(user)
+
+/obj/item/storage/bag/rebar_quiver/syndicate/proc/reload_held_rebar(mob/user)
+ if(!contents.len)
+ user.balloon_alert(user, "no bolts left!")
+ return
+ var/obj/held_item = user.get_active_held_item()
+ if(!held_item || !istype(held_item, /obj/item/gun/ballistic/rifle/rebarxbow))
+ user.balloon_alert(user, "no held crossbow!")
+ return
+ var/obj/item/gun/ballistic/rifle/rebarxbow/held_crossbow = held_item
+ if(held_crossbow.magazine.contents.len >= held_crossbow.magazine.max_ammo)
+ user.balloon_alert(user, "no more room!")
+ return
+ if(!do_after(user, 0.8 SECONDS, user, IGNORE_USER_LOC_CHANGE))
+ return
+
+ var/obj/item/ammo_casing/rebar/ammo_to_load = contents[1]
+ held_crossbow.attackby(ammo_to_load, user)
+
#undef ORE_BAG_BALOON_COOLDOWN
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 32b825f803f61..5386718d94718 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -76,10 +76,11 @@
/obj/item/wrench,
/obj/item/spess_knife,
/obj/item/melee/sickly_blade/lock,
+ /obj/item/reagent_containers/cup/soda_cans,
))
/obj/item/storage/belt/utility/chief
- name = "\improper Chief Engineer's toolbelt" //"the Chief Engineer's toolbelt", because "Chief Engineer's toolbelt" is not a proper noun
+ name = "chief engineer's toolbelt"
desc = "Holds tools, looks snazzy."
icon_state = "utility_ce"
inhand_icon_state = "utility_ce"
@@ -824,7 +825,7 @@
AddElement(/datum/element/update_icon_updates_onmob)
atom_storage.max_slots = 1
- atom_storage.rustle_sound = FALSE
+ atom_storage.do_rustle = FALSE
atom_storage.max_specific_storage = WEIGHT_CLASS_BULKY
atom_storage.set_holdable(/obj/item/melee/sabre)
atom_storage.click_alt_open = FALSE
@@ -872,7 +873,7 @@
AddElement(/datum/element/update_icon_updates_onmob)
atom_storage.max_slots = 1
- atom_storage.rustle_sound = FALSE
+ atom_storage.do_rustle = FALSE
atom_storage.max_specific_storage = WEIGHT_CLASS_BULKY
atom_storage.set_holdable(/obj/item/melee/parsnip_sabre)
atom_storage.click_alt_open = FALSE
diff --git a/code/game/objects/items/storage/boxes/_boxes.dm b/code/game/objects/items/storage/boxes/_boxes.dm
index 56915d8a5fced..9401527299689 100644
--- a/code/game/objects/items/storage/boxes/_boxes.dm
+++ b/code/game/objects/items/storage/boxes/_boxes.dm
@@ -19,6 +19,8 @@
. = ..()
atom_storage.max_specific_storage = WEIGHT_CLASS_SMALL
update_appearance()
+ atom_storage.open_sound = 'sound/items/cardboard_box_open.ogg'
+ atom_storage.rustle_sound = 'sound/items/cardboard_box_rustle.ogg'
/obj/item/storage/box/suicide_act(mob/living/carbon/user)
var/obj/item/bodypart/head/myhead = user.get_bodypart(BODY_ZONE_HEAD)
diff --git a/code/game/objects/items/storage/boxes/clothes_boxes.dm b/code/game/objects/items/storage/boxes/clothes_boxes.dm
index 6b4e995a2762e..582b611186c56 100644
--- a/code/game/objects/items/storage/boxes/clothes_boxes.dm
+++ b/code/game/objects/items/storage/boxes/clothes_boxes.dm
@@ -130,6 +130,24 @@
new /obj/item/clothing/under/ethereal_tunic/trailwarden(src)
new /obj/item/storage/backpack/saddlepack(src)
+/obj/item/storage/box/hero/journalist
+ name = "Assassinated by CIA - 1984." // Literally
+ desc = "Many courageous individuals risked their lives to report on events the government sought to keep hidden from the public, ensuring that the truth remained buried and unheard. These garments are replicas of the clothing worn by one such 'journalist,' a silent sentinel in the fight for truth."
+
+/obj/item/storage/box/hero/journalist/PopulateContents()
+ new /obj/item/clothing/under/costume/buttondown/slacks(src)
+ new /obj/item/clothing/suit/toggle/suspenders(src)
+ new /obj/item/clothing/neck/tie/red(src)
+ new /obj/item/clothing/head/fedora/beige/press(src)
+ new /obj/item/clothing/accessory/press_badge(src)
+ new /obj/item/clothing/suit/hazardvest/press(src)
+ new /obj/item/radio/entertainment/microphone/physical(src)
+ new /obj/item/radio/entertainment/speakers/physical(src)
+ new /obj/item/clipboard(src)
+ new /obj/item/taperecorder(src)
+ new /obj/item/camera(src)
+ new /obj/item/wallframe/telescreen/entertainment(src)
+
/obj/item/storage/box/holy
name = "Templar Kit"
/// This item is used to generate a preview image for this set.
diff --git a/code/game/objects/items/storage/boxes/engineering_boxes.dm b/code/game/objects/items/storage/boxes/engineering_boxes.dm
index a46703ec8bf9d..09f641ec31520 100644
--- a/code/game/objects/items/storage/boxes/engineering_boxes.dm
+++ b/code/game/objects/items/storage/boxes/engineering_boxes.dm
@@ -112,3 +112,12 @@
..()
for(var/i in 1 to 7)
new /obj/item/tank/internals/emergency_oxygen/engi(src) //in case anyone ever wants to do anything with spawning them, apart from crafting the box
+
+/obj/item/storage/box/stickers/chief_engineer
+ name = "CE approved sticker pack"
+ desc = "With one of these stickers, inform the crew that the contraption in the corridor is COMPLETELY SAFE!"
+ illustration = "label_ce"
+
+/obj/item/storage/box/stickers/chief_engineer/PopulateContents()
+ for(var/i in 1 to 3)
+ new /obj/item/sticker/chief_engineer(src)
diff --git a/code/game/objects/items/storage/boxes/food_boxes.dm b/code/game/objects/items/storage/boxes/food_boxes.dm
index bccb04f14d006..86d59123c72aa 100644
--- a/code/game/objects/items/storage/boxes/food_boxes.dm
+++ b/code/game/objects/items/storage/boxes/food_boxes.dm
@@ -126,7 +126,7 @@
/obj/item/storage/box/papersack/proc/check_menu(mob/user, obj/item/pen/P)
if(!istype(user))
return FALSE
- if(user.incapacitated())
+ if(user.incapacitated)
return FALSE
if(contents.len)
balloon_alert(user, "items inside!")
diff --git a/code/game/objects/items/storage/boxes/science_boxes.dm b/code/game/objects/items/storage/boxes/science_boxes.dm
index 48ab6cd5b7243..63e1c1ee3762d 100644
--- a/code/game/objects/items/storage/boxes/science_boxes.dm
+++ b/code/game/objects/items/storage/boxes/science_boxes.dm
@@ -39,6 +39,7 @@
illustration = null
/// Which type of cube are we spawning in this box?
var/cube_type = /obj/item/food/monkeycube
+ custom_price = PAYCHECK_CREW * 2
/obj/item/storage/box/monkeycubes/Initialize(mapload)
. = ..()
diff --git a/code/game/objects/items/storage/boxes/security_boxes.dm b/code/game/objects/items/storage/boxes/security_boxes.dm
index 935ead8f93e95..de18eb76258fe 100644
--- a/code/game/objects/items/storage/boxes/security_boxes.dm
+++ b/code/game/objects/items/storage/boxes/security_boxes.dm
@@ -174,6 +174,12 @@
for(var/i in 1 to 7)
new /obj/item/ammo_casing/shotgun/buckshot(src)
+/obj/item/storage/box/lethalshot/old
+
+/obj/item/storage/box/lethalshot/old/PopulateContents()
+ for(var/i in 1 to 7)
+ new /obj/item/ammo_casing/shotgun/buckshot/old(src)
+
/obj/item/storage/box/slugs
name = "box of shotgun shells (Lethal - Slugs)"
desc = "A box full of lethal shotgun slugs, designed for shotguns."
diff --git a/code/game/objects/items/storage/boxes/service_boxes.dm b/code/game/objects/items/storage/boxes/service_boxes.dm
index ee558d863daf4..767f351635d3a 100644
--- a/code/game/objects/items/storage/boxes/service_boxes.dm
+++ b/code/game/objects/items/storage/boxes/service_boxes.dm
@@ -224,14 +224,35 @@
new /obj/item/toy/balloon/long(src)
/obj/item/storage/box/stickers
- name = "box of stickers"
- desc = "A box full of random stickers. Do give to the clown."
+ name = "sticker pack"
+ desc = "A pack of removable stickers. Removable? What a rip off! On the back, DO NOT GIVE TO THE CLOWN! is printed in large lettering."
+ icon = 'icons/obj/toys/stickers.dmi'
+ icon_state = "stickerpack"
+ illustration = null
+ w_class = WEIGHT_CLASS_TINY
+ var/static/list/pack_labels = list(
+ "smile",
+ "frown",
+ "heart",
+ "silentman",
+ "tider",
+ "star",
+ )
+
+/obj/item/storage/box/stickers/Initialize(mapload)
+ . = ..()
+ atom_storage.max_slots = 8
+ atom_storage.set_holdable(list(/obj/item/sticker))
+ atom_storage.max_specific_storage = WEIGHT_CLASS_TINY
+ if(isnull(illustration))
+ illustration = pick(pack_labels)
+ update_appearance()
/obj/item/storage/box/stickers/proc/generate_non_contraband_stickers_list()
var/list/allowed_stickers = list()
for(var/obj/item/sticker/sticker_type as anything in subtypesof(/obj/item/sticker))
- if(!sticker_type::contraband)
+ if(!sticker_type::exclude_from_random)
allowed_stickers += sticker_type
return allowed_stickers
@@ -247,8 +268,9 @@
new type(src)
/obj/item/storage/box/stickers/googly
- name = "box of googly eye stickers"
+ name = "googly eye sticker pack"
desc = "Turn anything and everything into something vaguely alive!"
+ illustration = "googly-alt"
/obj/item/storage/box/stickers/googly/PopulateContents()
for(var/i in 1 to 6)
diff --git a/code/game/objects/items/storage/holsters.dm b/code/game/objects/items/storage/holsters.dm
index f8dee3afdc7f4..cc8a790c8ef34 100644
--- a/code/game/objects/items/storage/holsters.dm
+++ b/code/game/objects/items/storage/holsters.dm
@@ -113,8 +113,8 @@
/obj/item/storage/belt/holster/detective/full/PopulateContents()
generate_items_inside(list(
- /obj/item/gun/ballistic/revolver/c38/detective = 1,
/obj/item/ammo_box/c38 = 2,
+ /obj/item/gun/ballistic/revolver/c38/detective = 1,
), src)
/obj/item/storage/belt/holster/detective/full/ert
@@ -126,8 +126,8 @@
/obj/item/storage/belt/holster/detective/full/ert/PopulateContents()
generate_items_inside(list(
- /obj/item/gun/ballistic/automatic/pistol/m1911 = 1,
/obj/item/ammo_box/magazine/m45 = 2,
+ /obj/item/gun/ballistic/automatic/pistol/m1911 = 1,
),src)
/obj/item/storage/belt/holster/chameleon
@@ -197,8 +197,8 @@
/obj/item/storage/belt/holster/nukie/cowboy/full/PopulateContents()
generate_items_inside(list(
- /obj/item/gun/ballistic/revolver/syndicate/cowboy/nuclear = 1,
/obj/item/ammo_box/a357 = 2,
+ /obj/item/gun/ballistic/revolver/syndicate/cowboy/nuclear = 1,
), src)
diff --git a/code/game/objects/items/storage/medkit.dm b/code/game/objects/items/storage/medkit.dm
index bee7fdd524f3d..368ef9c0b406a 100644
--- a/code/game/objects/items/storage/medkit.dm
+++ b/code/game/objects/items/storage/medkit.dm
@@ -84,6 +84,7 @@
atom_storage.max_specific_storage = WEIGHT_CLASS_SMALL
atom_storage.open_sound = 'sound/items/medkit_open.ogg'
atom_storage.open_sound_vary = TRUE
+ atom_storage.rustle_sound = 'sound/items/medkit_rustle.ogg'
/obj/item/storage/medkit/regular
icon_state = "medkit"
diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm
index 905f2e40f47a7..d2bb90e69e445 100644
--- a/code/game/objects/items/storage/toolbox.dm
+++ b/code/game/objects/items/storage/toolbox.dm
@@ -33,7 +33,8 @@
if(prob(1))
latches = "triple_latch"
update_appearance()
-
+ atom_storage.open_sound = 'sound/items/toolbox_open.ogg'
+ atom_storage.rustle_sound = 'sound/items/toolbox_rustle.ogg'
AddElement(/datum/element/falling_hazard, damage = force, wound_bonus = wound_bonus, hardhat_safety = TRUE, crushes = FALSE, impact_sound = hitsound)
/obj/item/storage/toolbox/update_overlays()
diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm
index eacd0b4b630d0..05b8a5a0e8ab0 100644
--- a/code/game/objects/items/storage/uplink_kits.dm
+++ b/code/game/objects/items/storage/uplink_kits.dm
@@ -346,6 +346,7 @@
/obj/item/storage/box/syndie_kit/rebarxbowsyndie/PopulateContents()
new /obj/item/book/granter/crafting_recipe/dusting/rebarxbowsyndie_ammo(src)
new /obj/item/gun/ballistic/rifle/rebarxbow/syndie(src)
+ new /obj/item/storage/bag/rebar_quiver/syndicate(src)
/obj/item/storage/box/syndie_kit/origami_bundle
name = "origami kit"
@@ -683,14 +684,7 @@
group.register(i)
desc += " The implants are registered to the \"[group.name]\" group."
-/obj/item/storage/box/syndie_kit/stickers
- name = "sticker kit"
-
-/obj/item/storage/box/syndie_kit/stickers/Initialize(mapload)
- . = ..()
- atom_storage.max_slots = 8
-
-/obj/item/storage/box/syndie_kit/stickers/PopulateContents()
+/obj/item/storage/box/stickers/syndie_kit/PopulateContents()
var/list/types = subtypesof(/obj/item/sticker/syndicate)
for(var/i in 1 to atom_storage.max_slots)
diff --git a/code/game/objects/items/syndie_spraycan.dm b/code/game/objects/items/syndie_spraycan.dm
index 1b7e0d9c4024a..fb6192c6e3990 100644
--- a/code/game/objects/items/syndie_spraycan.dm
+++ b/code/game/objects/items/syndie_spraycan.dm
@@ -143,7 +143,7 @@
user.visible_message(span_suicide("[user] shakes up [src] with a rattle and lifts it to [user.p_their()] mouth, spraying paint across [user.p_their()] teeth!"))
user.say("WITNESS ME!!", forced="spraycan suicide")
playsound(src, 'sound/effects/spray.ogg', 5, TRUE, 5)
- suicider.update_lips("spray_face", paint_color)
+ suicider.AddComponent(/datum/component/face_decal, "spray", EXTERNAL_ADJACENT, paint_color)
return OXYLOSS
/obj/effect/decal/cleanable/traitor_rune
diff --git a/code/game/objects/items/tanks/jetpack.dm b/code/game/objects/items/tanks/jetpack.dm
index cd5a9a1841ead..a7a577c77cf16 100644
--- a/code/game/objects/items/tanks/jetpack.dm
+++ b/code/game/objects/items/tanks/jetpack.dm
@@ -79,7 +79,7 @@
toggle_internals(user)
/obj/item/tank/jetpack/proc/cycle(mob/user)
- if(user.incapacitated())
+ if(user.incapacitated)
return
if(!on)
diff --git a/code/game/objects/items/tanks/tanks.dm b/code/game/objects/items/tanks/tanks.dm
index d89794f420917..9c7138e00dee0 100644
--- a/code/game/objects/items/tanks/tanks.dm
+++ b/code/game/objects/items/tanks/tanks.dm
@@ -256,7 +256,7 @@
if(istype(carbon_user) && (carbon_user.external == src || carbon_user.internal == src))
.["connected"] = TRUE
-/obj/item/tank/ui_act(action, params)
+/obj/item/tank/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/game/objects/items/tanks/watertank.dm b/code/game/objects/items/tanks/watertank.dm
index 8094a9a21c863..15db2a5d3edf2 100644
--- a/code/game/objects/items/tanks/watertank.dm
+++ b/code/game/objects/items/tanks/watertank.dm
@@ -47,7 +47,7 @@
if(user.get_item_by_slot(user.getBackSlot()) != src)
to_chat(user, span_warning("The watertank must be worn properly to use!"))
return
- if(user.incapacitated())
+ if(user.incapacitated)
return
if(QDELETED(noz))
diff --git a/code/game/objects/items/tcg/tcg.dm b/code/game/objects/items/tcg/tcg.dm
index fc2eeba82ff72..23204b4809ff8 100644
--- a/code/game/objects/items/tcg/tcg.dm
+++ b/code/game/objects/items/tcg/tcg.dm
@@ -151,7 +151,7 @@ GLOBAL_LIST_EMPTY(tcgcard_radial_choices)
/obj/item/tcgcard/proc/check_menu(mob/living/user)
if(!istype(user))
return FALSE
- if(user.incapacitated() || !user.Adjacent(src))
+ if(user.incapacitated || !user.Adjacent(src))
return FALSE
return TRUE
@@ -249,7 +249,7 @@ GLOBAL_LIST_EMPTY(tcgcard_radial_choices)
/obj/item/tcgcard_deck/proc/check_menu(mob/living/user)
if(!istype(user))
return FALSE
- if(user.incapacitated() || !user.Adjacent(src))
+ if(user.incapacitated || !user.Adjacent(src))
return FALSE
return TRUE
diff --git a/code/game/objects/items/tcg/tcg_machines.dm b/code/game/objects/items/tcg/tcg_machines.dm
index 78854afdd5b39..77b6891e4c17a 100644
--- a/code/game/objects/items/tcg/tcg_machines.dm
+++ b/code/game/objects/items/tcg/tcg_machines.dm
@@ -105,7 +105,7 @@ GLOBAL_LIST_EMPTY(tcgcard_machine_radial_choices)
/obj/machinery/trading_card_holder/proc/check_menu(mob/living/user)
if(!istype(user))
return FALSE
- if(user.incapacitated() || !user.Adjacent(src))
+ if(user.incapacitated || !user.Adjacent(src))
return FALSE
return TRUE
@@ -356,7 +356,7 @@ GLOBAL_LIST_EMPTY(tcgcard_mana_bar_radial_choices)
/obj/machinery/trading_card_button/proc/check_menu(mob/living/user)
if(!istype(user))
return FALSE
- if(user.incapacitated() || !user.Adjacent(src))
+ if(user.incapacitated || !user.Adjacent(src))
return FALSE
return TRUE
diff --git a/code/game/objects/items/teleportation.dm b/code/game/objects/items/teleportation.dm
index 04f5a0688db82..6fa7e8d23b340 100644
--- a/code/game/objects/items/teleportation.dm
+++ b/code/game/objects/items/teleportation.dm
@@ -190,7 +190,7 @@
var/teleport_location_key = tgui_input_list(user, "Teleporter to lock on", "Hand Teleporter", sort_list(locations))
if (isnull(teleport_location_key))
return
- if(user.get_active_held_item() != src || user.incapacitated())
+ if(user.get_active_held_item() != src || user.incapacitated)
return
// Not always a datum, but needed for IS_WEAKREF_OF to cast properly.
diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm
index fb40a70cbeea0..143b8eab174e6 100644
--- a/code/game/objects/items/tools/weldingtool.dm
+++ b/code/game/objects/items/tools/weldingtool.dm
@@ -153,8 +153,9 @@
if(isnull(affecting) || !IS_ROBOTIC_LIMB(affecting))
return NONE
- if (!affecting.get_damage())
- return
+ if (!affecting.brute_dam)
+ balloon_alert(user, "limb not damaged")
+ return ITEM_INTERACT_BLOCKING
user.visible_message(span_notice("[user] starts to fix some of the dents on [attacked_humanoid == user ? user.p_their() : "[attacked_humanoid]'s"] [affecting.name]."),
span_notice("You start fixing some of the dents on [attacked_humanoid == user ? "your" : "[attacked_humanoid]'s"] [affecting.name]."))
diff --git a/code/game/objects/items/toy_mechs.dm b/code/game/objects/items/toy_mechs.dm
index 1b3367032c190..d08deec62e316 100644
--- a/code/game/objects/items/toy_mechs.dm
+++ b/code/game/objects/items/toy_mechs.dm
@@ -96,7 +96,7 @@
return FALSE
//dead men tell no tales, incapacitated men fight no fights
- if(attacker_controller.incapacitated())
+ if(attacker_controller.incapacitated)
return FALSE
//if the attacker_controller isn't next to the attacking toy (and doesn't have telekinesis), the battle ends
if(!in_range(attacker, attacker_controller) && !(attacker_controller.dna.check_mutation(/datum/mutation/human/telekinesis)))
@@ -106,7 +106,7 @@
//if it's PVP and the opponent is not next to the defending(src) toy (and doesn't have telekinesis), the battle ends
if(opponent)
- if(opponent.incapacitated())
+ if(opponent.incapacitated)
return FALSE
if(!in_range(src, opponent) && !(opponent.dna.check_mutation(/datum/mutation/human/telekinesis)))
opponent.visible_message(span_notice("[opponent.name] separates from [src], ending the battle."), \
diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
index ff540932f31b7..82636c0ee8514 100644
--- a/code/game/objects/items/trash.dm
+++ b/code/game/objects/items/trash.dm
@@ -85,10 +85,6 @@
desc = "In the Mothic Fleet every individual wrapper is carefully recycled and repurposed into fresh material. Over here they are more commonly dropped directly onto the floor."
icon_state = "moth_ration"
-/obj/item/trash/waffles
- name = "waffles tray"
- icon_state = "waffles"
-
/obj/item/trash/pistachios
name = "pistachios pack"
icon_state = "pistachios_pack"
diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index 0d3e3f60d4abf..821f994a1ed6f 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -160,6 +160,14 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
throw_range = 5
armour_penetration = 35
+/obj/item/claymore/cutlass/old
+ name = "old cutlass"
+ desc = parent_type::desc + " This one seems a tad old."
+ force = 24
+ throwforce = 17
+ armour_penetration = 20
+ block_chance = 30
+
/obj/item/claymore/carrot
name = "carrot sword"
desc = "A full-sized carrot sword. Definitely not good for the eyes, not anymore."
@@ -529,11 +537,10 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
AddComponent(/datum/component/two_handed, \
force_unwielded = 10, \
force_wielded = 14, \
- icon_wielded = "[base_icon_state]1", \
)
/obj/item/bambostaff/update_icon_state()
- icon_state = "[base_icon_state]0"
+ icon_state = inhand_icon_state = "[base_icon_state][HAS_TRAIT(src, TRAIT_WIELDED)]"
return ..()
/obj/item/cane
diff --git a/code/game/objects/items_reskin.dm b/code/game/objects/items_reskin.dm
index 9fa3b91d0e198..f8bffa7bf5f63 100644
--- a/code/game/objects/items_reskin.dm
+++ b/code/game/objects/items_reskin.dm
@@ -81,6 +81,6 @@
return FALSE
if(!istype(user))
return FALSE
- if(user.incapacitated())
+ if(user.incapacitated)
return FALSE
return TRUE
diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm
index d07f7ad21c5f5..ceaa0e0beb734 100644
--- a/code/game/objects/obj_defense.dm
+++ b/code/game/objects/obj_defense.dm
@@ -96,7 +96,7 @@
/obj/proc/collision_damage(atom/movable/pusher, force = MOVE_FORCE_DEFAULT, direction)
var/amt = max(0, ((force - (move_resist * MOVE_FORCE_CRUSH_RATIO)) / (move_resist * MOVE_FORCE_CRUSH_RATIO)) * 10)
- take_damage(amt, BRUTE)
+ take_damage(amt, BRUTE, attack_dir = REVERSE_DIR(direction))
/obj/singularity_act()
SSexplosions.high_mov_atom += src
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index f12479c66a444..ef436e24e8c1a 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -7,7 +7,7 @@
/// Extra examine line to describe controls, such as right-clicking, left-clicking, etc.
var/desc_controls
- /// The context returned when an attack against this object doesnt deal any traditional damage to the object.
+ /// The context returned when an attack against this object doesn't deal any traditional damage to the object.
var/no_damage_feedback = "without leaving a mark"
/// Icon to use as a 32x32 preview in crafting menus and such
var/icon_preview
@@ -24,7 +24,7 @@
/// If this attacks a human with no wound armor on the affected body part, add this to the wound mod. Some attacks may be significantly worse at wounding if there's even a slight layer of armor to absorb some of it vs bare flesh
var/bare_wound_bonus = 0
- /// A multiplier to an objecet's force when used against a stucture, vechicle, machine, or robot.
+ /// A multiplier to an object's force when used against a structure, vehicle, machine, or robot.
var/demolition_mod = 1
/// Custom fire overlay icon, will just use the default overlay if this is null
@@ -32,7 +32,7 @@
/// Particles this obj uses when burning, if any
var/burning_particles
- var/drag_slowdown // Amont of multiplicative slowdown applied if pulled. >1 makes you slower, <1 makes you faster.
+ var/drag_slowdown // Amount of multiplicative slowdown applied if pulled. >1 makes you slower, <1 makes you faster.
/// Map tag for something. Tired of it being used on snowflake items. Moved here for some semblance of a standard.
/// Next pr after the network fix will have me refactor door interactions, so help me god.
@@ -70,7 +70,7 @@ GLOBAL_LIST_EMPTY(objects_by_id_tag)
var/total_force = (attacking_item.force * attacking_item.demolition_mod)
- var/damage = take_damage(total_force, attacking_item.damtype, MELEE, 1)
+ var/damage = take_damage(total_force, attacking_item.damtype, MELEE, 1, get_dir(src, user))
var/damage_verb = "hit"
@@ -190,7 +190,6 @@ GLOBAL_LIST_EMPTY(objects_by_id_tag)
if(obj_flags & UNIQUE_RENAME)
. += span_notice("Use a pen on it to rename it or change its description.")
-
/obj/analyzer_act(mob/living/user, obj/item/analyzer/tool)
if(atmos_scan(user=user, target=src, silent=FALSE))
return TRUE
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index ff6e6e171bb06..701c13bfcf755 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -32,7 +32,7 @@
QUEUE_SMOOTH_NEIGHBORS(src)
return ..()
-/obj/structure/ui_act(action, params)
+/obj/structure/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
add_fingerprint(usr)
return ..()
diff --git a/code/game/objects/structures/ai_core.dm b/code/game/objects/structures/ai_core.dm
index 5c219aaa4a946..4a5ee234c7742 100644
--- a/code/game/objects/structures/ai_core.dm
+++ b/code/game/objects/structures/ai_core.dm
@@ -61,7 +61,6 @@
/obj/structure/ai_core/Destroy()
if(istype(remote_ai))
- remote_ai.break_core_link()
remote_ai = null
QDEL_NULL(circuit)
QDEL_NULL(core_mmi)
@@ -72,7 +71,7 @@
. = ..()
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"
diff --git a/code/game/objects/structures/beds_chairs/alien_nest.dm b/code/game/objects/structures/beds_chairs/alien_nest.dm
index 77759c9e309b0..365e790ca48f5 100644
--- a/code/game/objects/structures/beds_chairs/alien_nest.dm
+++ b/code/game/objects/structures/beds_chairs/alien_nest.dm
@@ -13,6 +13,7 @@
canSmoothWith = SMOOTH_GROUP_ALIEN_NEST
build_stack_type = null
elevation = 0
+ 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/add_context(atom/source, list/context, obj/item/held_item, mob/living/user)
@@ -21,10 +22,6 @@
return ..()
-/obj/structure/bed/nest/wrench_act_secondary(mob/living/user, obj/item/weapon)
- return ITEM_INTERACT_BLOCKING
-
-
/obj/structure/bed/nest/user_unbuckle_mob(mob/living/captive, mob/living/hero)
if(!length(buckled_mobs))
return
@@ -59,7 +56,7 @@
add_fingerprint(hero)
/obj/structure/bed/nest/user_buckle_mob(mob/living/M, mob/user, check_loc = TRUE)
- if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.incapacitated() || M.buckled )
+ if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.incapacitated || M.buckled )
return
if(M.get_organ_by_type(/obj/item/organ/internal/alien/plasmavessel))
diff --git a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm
index 4cfd6355eb0b2..4ade32bdd0e0a 100644
--- a/code/game/objects/structures/beds_chairs/bed.dm
+++ b/code/game/objects/structures/beds_chairs/bed.dm
@@ -15,6 +15,7 @@
anchored = TRUE
can_buckle = TRUE
buckle_lying = 90
+ buckle_dir = SOUTH
resistance_flags = FLAMMABLE
max_integrity = 100
integrity_failure = 0.35
@@ -24,17 +25,21 @@
var/build_stack_amount = 2
/// Mobs standing on it are nudged up by this amount. Also used to align the person back when buckled to it after init.
var/elevation = 8
+ /// If this bed can be deconstructed using a wrench
+ var/can_deconstruct = TRUE
/obj/structure/bed/Initialize(mapload)
. = ..()
AddElement(/datum/element/soft_landing)
if(elevation)
AddElement(/datum/element/elevation, pixel_shift = elevation)
+ update_buckle_vars(dir)
register_context()
/obj/structure/bed/examine(mob/user)
. = ..()
- . += span_notice("It's held together by a couple of bolts.")
+ if (can_deconstruct)
+ . += span_notice("It's held together by a couple of bolts.")
/obj/structure/bed/add_context(atom/source, list/context, obj/item/held_item, mob/living/user)
if(held_item)
@@ -48,6 +53,13 @@
context[SCREENTIP_CONTEXT_LMB] = "Unbuckle"
return CONTEXTUAL_SCREENTIP_SET
+/obj/structure/bed/setDir(newdir)
+ . = ..()
+ update_buckle_vars(newdir)
+
+/obj/structure/bed/proc/update_buckle_vars(newdir)
+ buckle_lying = newdir & NORTHEAST ? 270 : 90
+
/obj/structure/bed/atom_deconstruct(disassembled = TRUE)
if(build_stack_type)
new build_stack_type(loc, build_stack_amount)
@@ -56,6 +68,8 @@
return attack_hand(user, modifiers)
/obj/structure/bed/wrench_act_secondary(mob/living/user, obj/item/weapon)
+ if (!can_deconstruct)
+ return NONE
..()
weapon.play_tool_sound(src)
deconstruct(disassembled = TRUE)
diff --git a/code/game/objects/structures/cannons/cannon.dm b/code/game/objects/structures/cannons/cannon.dm
index 3408ade8283d0..3a10cc17189f8 100644
--- a/code/game/objects/structures/cannons/cannon.dm
+++ b/code/game/objects/structures/cannons/cannon.dm
@@ -140,5 +140,17 @@
new /obj/item/stack/rods(src.loc)
. = ..()
+///A cannon found from the fishing mystery box.
+/obj/structure/cannon/mystery_box
+ icon_state = "mystery_box_cannon" //east facing sprite for the presented item, it'll be changed back to normal on init
+ dir = EAST
+ anchored = FALSE
+
+/obj/structure/cannon/mystery_box/Initialize(mapload)
+ . = ..()
+ icon_state = "falconet_patina"
+ reagents.add_reagent(/datum/reagent/gunpowder, charge_size)
+ loaded_cannonball = new(src)
+
#undef BAD_FUEL_DAMAGE_TAX
#undef BAD_FUEL_EXPLODE_PROBABILTY
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 4484e3c512ef3..f407dcd82c04f 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -915,6 +915,8 @@ GLOBAL_LIST_EMPTY(roundstart_station_closets)
/obj/structure/closet/mouse_drop_receive(atom/movable/O, mob/living/user, params)
if(!istype(O) || O.anchored || istype(O, /atom/movable/screen))
return
+ if(!istype(user) || user.incapacitated || user.body_position == LYING_DOWN)
+ return
if(user == O) //try to climb onto it
return ..()
if(!opened)
@@ -1193,6 +1195,8 @@ GLOBAL_LIST_EMPTY(roundstart_station_closets)
if(!toggle())
return
if(was_opened)
+ if (!target.Move(get_turf(src), get_dir(target, src)))
+ return
target.forceMove(src)
else
target.Knockdown(SHOVE_KNOCKDOWN_SOLID)
diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
index f0d1eaa0cc819..2f555ed84dea5 100644
--- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
+++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
@@ -32,7 +32,7 @@
var/move_delay = FALSE
/obj/structure/closet/cardboard/relaymove(mob/living/user, direction)
- if(opened || move_delay || user.incapacitated() || !isturf(loc) || !has_gravity(loc))
+ if(opened || move_delay || user.incapacitated || !isturf(loc) || !has_gravity(loc))
return
move_delay = TRUE
var/oldloc = loc
@@ -72,7 +72,7 @@
for(var/mob/living/alerted_mob as anything in alerted)
if(alerted_mob.stat != CONSCIOUS || alerted_mob.is_blind())
continue
- if(!alerted_mob.incapacitated(IGNORE_RESTRAINTS))
+ if(!INCAPACITATED_IGNORING(alerted_mob, INCAPABLE_RESTRAINTS))
alerted_mob.face_atom(src)
alerted_mob.do_alert_animation()
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 3dc59fb9ce21a..22dd2bec4b2bb 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
@@ -18,6 +18,7 @@
new /obj/item/extinguisher/advanced(src)
new /obj/item/storage/photo_album/ce(src)
new /obj/item/storage/box/skillchips/engineering(src)
+ new /obj/item/storage/box/stickers/chief_engineer(src)
/obj/structure/closet/secure_closet/engineering_chief/populate_contents_immediate()
. = ..()
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index 7b64b6569d6cc..cac9fbaf890bb 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -222,6 +222,12 @@
icon_state = "medicalcrate"
base_icon_state = "medicalcrate"
+/obj/structure/closet/crate/deforest
+ name = "deforest medical crate"
+ desc = "A DeFortest brand crate of medical supplies."
+ icon_state = "deforest"
+ base_icon_state = "deforest"
+
/obj/structure/closet/crate/medical/department
icon_state = "medical"
base_icon_state = "medical"
@@ -290,6 +296,24 @@
icon_state = "food"
base_icon_state = "food"
+/obj/structure/closet/crate/freezer/donk
+ name = "donk co. fridge"
+ desc = "A Donk Co. brand fridge, keeps your donkpcokets and foam ammunition fresh!"
+ icon_state = "donkcocrate"
+ base_icon_state = "donkcocrate"
+
+/obj/structure/closet/crate/freezer/interdyne
+ name = "interdyne freezer"
+ desc = "Interdyne Pharmauceutics branded freezer. Might or might not contain cold steel, or fresh organs."
+ icon_state = "interdynefreezer"
+ base_icon_state = "interdynefreezer"
+
+/obj/structure/closet/crate/freezer/blood/interdyne
+ name = "interdyne blood freezer"
+ desc = "Interdyne Pharmauceutics branded freezer. Only freshly harvested- I mean, freshly kept blood inside!"
+ icon_state = "interdynefreezer"
+ base_icon_state = "interdynefreezer"
+
/obj/structure/closet/crate/radiation
desc = "A crate with a radiation sign on it."
name = "radiation crate"
@@ -312,6 +336,12 @@
icon_state = "cargo"
base_icon_state = "cargo"
+/obj/structure/closet/crate/robust
+ name = "robust industries crate"
+ desc = "Robust Inustries LLC. crate. Feels oddly nostalgic."
+ icon_state = "robust"
+ base_icon_state = "robust"
+
/obj/structure/closet/crate/cargo/mining
name = "mining crate"
icon_state = "mining"
@@ -322,6 +352,12 @@
icon_state = "engi_crate"
base_icon_state = "engi_crate"
+/obj/structure/closet/crate/nakamura
+ name = "nakamura engineering crate"
+ desc = "Crate from Nakamura Engineering, most likely containing engineering supplies or MODcores."
+ icon_state = "nakamura"
+ base_icon_state = "nakamura"
+
/obj/structure/closet/crate/engineering/electrical
icon_state = "engi_e_crate"
base_icon_state = "engi_e_crate"
diff --git a/code/game/objects/structures/crates_lockers/crates/secure.dm b/code/game/objects/structures/crates_lockers/crates/secure.dm
index 1a102fdb512fd..e93591f1d596c 100644
--- a/code/game/objects/structures/crates_lockers/crates/secure.dm
+++ b/code/game/objects/structures/crates_lockers/crates/secure.dm
@@ -44,6 +44,17 @@
icon_state = "weaponcrate"
base_icon_state = "weaponcrate"
+/obj/structure/closet/crate/secure/gorlex_weapons
+ desc = "A secure weapons crate of Gorlex Marauders."
+ name = "weapons crate"
+ icon_state = "gorlex_weaponcrate"
+ base_icon_state = "gorlex_weaponcrate"
+
+/obj/structure/closet/crate/secure/gorlex_weapons/jammed
+ desc = "A beaten up, jammed open weapon crate of Gorlex Marauders."
+ name = "jammed weapons crate"
+ locked = FALSE
+
/obj/structure/closet/crate/secure/plasma
desc = "A secure plasma crate."
name = "plasma crate"
@@ -192,3 +203,65 @@
else if(!silent)
to_chat(user, span_warning("[src] is broken!"))
else ..()
+
+/obj/structure/closet/crate/secure/interdyne
+ name = "interdyne crate"
+ desc = "Crate belonging to Interdyne Pharmaceutics. Hopefully doesn't have bioweapons inside..."
+ icon_state = "interdynecrate"
+ base_icon_state = "interdynecrate"
+
+/obj/structure/closet/crate/secure/tiger
+ name = "tiger co-op crate"
+ icon_state = "tigercrate"
+ base_icon_state = "tigercrate"
+
+/obj/structure/closet/crate/secure/self
+ name = "s.e.l.f. crate"
+ desc = "A secure crate locked from the inside with a scanning panel above it and holographic display of lock's status. Sentient Engine Liberation Front engineers are quite the show-offs."
+ icon_state = "selfcrate"
+ base_icon_state = "selfcrate"
+
+/obj/structure/closet/crate/secure/m13
+ name = "mysterious secure crate"
+ desc = "A secure crate. Lacks any obvious logos or even codes for where it arrived from, but looks like taken straight from a spy movie."
+ icon_state = "mithirteencrate"
+ base_icon_state = "mithirteencrate"
+
+/obj/structure/closet/crate/secure/arc
+ name = "animal rights consortium crate"
+ icon_state = "arccrate"
+ base_icon_state = "arccrate"
+
+/obj/structure/closet/crate/secure/cybersun
+ name = "cybersun crate"
+
+/obj/structure/closet/crate/secure/cybersun/dawn
+ desc = "A secure crate from Cybersun Industries. It has distinct orange-green colouring, probably of some departament or division, but you cannot tell what is it."
+ icon_state = "cyber_dawncrate"
+ base_icon_state = "cyber_dawncrate"
+
+/obj/structure/closet/crate/secure/cybersun/noon
+ desc = "A secure crate from Cybersun Industries. It has distinct yellow-orange colouring, probably of some departament or division, but you cannot tell what is it."
+ icon_state = "cyber_nooncrate"
+ base_icon_state = "cyber_nooncrate"
+
+/obj/structure/closet/crate/secure/cybersun/dusk
+ desc = "A secure crate from Cybersun Industries. It has distinct purple-green colouring, probably of some departament or division, but you cannot tell what is it."
+ icon_state = "cyber_duskcrate"
+ base_icon_state = "cyber_duskcrate"
+
+/obj/structure/closet/crate/secure/cybersun/night
+ desc = "A secure crate from Cybersun Industries. This one blatantly adorns syndicate colours. You can only guess it contains equipement for syndicate operatives."
+ icon_state = "cyber_nightcrate"
+ base_icon_state = "cyber_nightcrate"
+
+/obj/structure/closet/crate/secure/wafflecorp
+ name = "wafflecorp crate"
+ desc = "A very outdated model and design of shipment crate with a modern lock strapped on it, how befitting of its brand owner, Waffle Corporation. Golden lettering written in cursive by the logo reads 'bringing you consecutively top five world-wide rated* breakfast since 2055. A much smaller fineprint, also in cursive, clarifies: '*in years 2099-2126'... It's year 2563 now, however."
+ icon_state = "wafflecrate"
+ base_icon_state = "wafflecrate"
+
+/obj/structure/closet/crate/secure/gorlex
+ name = "gorlex marauders crate"
+ icon_state = "gorlexcrate"
+ base_icon_state = "gorlexcrate"
diff --git a/code/game/objects/structures/deployable_turret.dm b/code/game/objects/structures/deployable_turret.dm
index 2b1a90500ccf8..908d2348db4b3 100644
--- a/code/game/objects/structures/deployable_turret.dm
+++ b/code/game/objects/structures/deployable_turret.dm
@@ -85,7 +85,7 @@
STOP_PROCESSING(SSfastprocess, src)
/obj/machinery/deployable_turret/user_buckle_mob(mob/living/M, mob/user, check_loc = TRUE)
- if(user.incapacitated() || !istype(user))
+ if(user.incapacitated || !istype(user))
return
M.forceMove(get_turf(src))
. = ..()
@@ -129,7 +129,7 @@
calculated_projectile_vars = calculate_projectile_angle_and_pixel_offsets(controller, target_turf, modifiers)
/obj/machinery/deployable_turret/proc/direction_track(mob/user, atom/targeted)
- if(user.incapacitated())
+ if(user.incapacitated)
return
setDir(get_dir(src,targeted))
user.setDir(dir)
@@ -169,7 +169,7 @@
/obj/machinery/deployable_turret/proc/checkfire(atom/targeted_atom, mob/user)
target = targeted_atom
- if(target == user || user.incapacitated() || target == get_turf(src))
+ if(target == user || user.incapacitated || target == get_turf(src))
return
if(world.time < cooldown)
if(!warned && world.time > (cooldown - cooldown_duration + rate_of_fire*number_of_shots)) // To capture the window where one is done firing
@@ -187,7 +187,7 @@
addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/machinery/deployable_turret/, fire_helper), user), i*rate_of_fire)
/obj/machinery/deployable_turret/proc/fire_helper(mob/user)
- if(user.incapacitated() || !(user in buckled_mobs))
+ if(user.incapacitated || !(user in buckled_mobs))
return
update_positioning() //REFRESH MOUSE TRACKING!!
var/turf/targets_from = get_turf(src)
diff --git a/code/game/objects/structures/detectiveboard.dm b/code/game/objects/structures/detectiveboard.dm
new file mode 100644
index 0000000000000..f9d0560dfdee4
--- /dev/null
+++ b/code/game/objects/structures/detectiveboard.dm
@@ -0,0 +1,308 @@
+#define MAX_ICON_NOTICES 8
+#define MAX_CASES 8
+#define MAX_EVIDENCE_Y 3500
+#define MAX_EVIDENCE_X 1180
+
+#define EVIDENCE_TYPE_PHOTO "photo"
+#define EVIDENCE_TYPE_PAPER "paper"
+
+/obj/structure/detectiveboard
+ name = "detective notice board"
+ desc = "A board for linking evidence to crimes."
+ icon = 'icons/obj/wallmounts.dmi'
+ icon_state = "noticeboard"
+ density = FALSE
+ anchored = TRUE
+ max_integrity = 150
+
+ /// When player attaching evidence to board this will become TRUE
+ var/attaching_evidence = FALSE
+ /// Colors for case color
+ var/list/case_colors = list("red", "orange", "yellow", "green", "blue", "violet")
+ /// List of board cases
+ var/list/datum/case/cases = list()
+ /// Index of viewing case in cases array
+ var/current_case = 1
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/structure/detectiveboard, 32)
+
+/obj/structure/detectiveboard/Initialize(mapload)
+ . = ..()
+
+ if(mapload)
+ for(var/obj/item/item in loc)
+ if(istype(item, /obj/item/paper) || istype(item, /obj/item/photo))
+ item.forceMove(src)
+ cases[current_case].notices++
+
+ register_context()
+ find_and_hang_on_wall()
+
+/// Attaching evidences: photo and papers
+
+/obj/structure/detectiveboard/attackby(obj/item/item, mob/user, params)
+ if(istype(item, /obj/item/paper) || istype(item, /obj/item/photo))
+ if(!cases.len)
+ to_chat(user, "There are no cases!")
+ return
+
+ if(attaching_evidence)
+ to_chat(user, "You already attaching evidence!")
+ return
+ attaching_evidence = TRUE
+ var/name = tgui_input_text(user, "Please enter the evidence name", "Detective's Board")
+ if(!name)
+ attaching_evidence = FALSE
+ return
+ var/desc = tgui_input_text(user, "Please enter the evidence description", "Detective's Board")
+ if(!desc)
+ attaching_evidence = FALSE
+ return
+
+ if(!user.transferItemToLoc(item, src))
+ attaching_evidence = FALSE
+ return
+ cases[current_case].notices++
+ var/datum/evidence/evidence = new (name, desc, item)
+ cases[current_case].evidences += evidence
+ to_chat(user, span_notice("You pin the [item] to the detective board."))
+ attaching_evidence = FALSE
+ update_appearance(UPDATE_ICON)
+ return
+ return ..()
+
+/obj/structure/detectiveboard/wrench_act_secondary(mob/living/user, obj/item/tool)
+ . = ..()
+ balloon_alert(user, "[anchored ? "un" : ""]securing...")
+ tool.play_tool_sound(src)
+ if(tool.use_tool(src, user, 6 SECONDS))
+ playsound(loc, 'sound/items/deconstruct.ogg', 50, TRUE)
+ balloon_alert(user, "[anchored ? "un" : ""]secured")
+ deconstruct()
+ return TRUE
+
+/obj/structure/detectiveboard/ui_state(mob/user)
+ return GLOB.physical_state
+
+/obj/structure/detectiveboard/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "DetectiveBoard", name, 1200, 800)
+ ui.open()
+
+/obj/structure/detectiveboard/ui_data(mob/user)
+ var/list/data = list()
+ var/list/data_cases = list()
+ for(var/datum/case/case in cases)
+ var/list/data_case = list("ref"=REF(case),"name" = case.name, "color" = case.color)
+ var/list/data_evidences = list()
+ for(var/datum/evidence/evidence in case.evidences)
+ var/list/data_evidence = list("ref" = REF(evidence), "name" = evidence.name, "type" = evidence.evidence_type, "description" = evidence.description, "x"=evidence.x, "y"=evidence.y)
+ var/list/data_connections = list()
+ for(var/datum/evidence/connection in evidence.connections)
+ data_connections += REF(connection) // TODO: create array of strings
+ data_evidence["connections"] = data_connections
+ switch(evidence.evidence_type)
+ if(EVIDENCE_TYPE_PHOTO)
+ var/obj/item/photo/photo = evidence.item
+ var/tmp_picture_name = "evidence_photo[REF(photo)].png"
+ user << browse_rsc(photo.picture.picture_image, tmp_picture_name)
+ data_evidence["photo_url"] = tmp_picture_name
+ if(EVIDENCE_TYPE_PAPER)
+ var/obj/item/paper/paper = evidence.item
+ data_evidence["text"] = ""
+ if(paper.raw_text_inputs && paper.raw_text_inputs.len)
+ data_evidence["text"] = paper.raw_text_inputs[1].raw_text
+ data_evidences += list(data_evidence)
+ data_case["evidences"] = data_evidences
+ var/list/connections = list()
+ for(var/datum/evidence/evidence in case.evidences)
+ for(var/datum/evidence/connection in evidence.connections)
+ var/list/from_pos = get_pin_position(evidence)
+ var/list/to_pos = get_pin_position(connection)
+ var/found_in_connections = FALSE
+ for(var/list/con in connections)
+ if(con["from"]["x"] == to_pos["x"] && con["from"]["y"] == to_pos["y"] && con["to"]["x"] == from_pos["x"] && con["to"]["y"] == from_pos["y"] )
+ found_in_connections = TRUE
+ if(!found_in_connections)
+ var/list/data_connection = list("color" = "red", "from" = from_pos, "to" = to_pos)
+ connections += list(data_connection)
+ data_case["connections"] = connections
+ data_cases += list(data_case)
+
+ data["cases"] = data_cases
+ data["current_case"] = current_case
+ return data
+
+/obj/structure/detectiveboard/proc/get_pin_position(datum/evidence/evidence)
+ return list("x" = evidence.x + 15, "y" = evidence.y + 15)
+
+/obj/structure/detectiveboard/ui_act(action, params, datum/tgui/ui, datum/ui_state/state)
+ . = ..()
+ if(.)
+ return
+ var/mob/user = ui.user
+ switch(action)
+ if("add_case")
+ if(cases.len == MAX_CASES)
+ return FALSE
+ var/new_case = tgui_input_text(user, "Please enter the case name", "Detective's Board")
+ if(!new_case)
+ return FALSE
+ var/case_color = tgui_input_list(user, "Please choose case color", "Detective's Board", case_colors)
+ if(!case_color)
+ return FALSE
+
+ var/datum/case/case = new (new_case, case_color)
+ cases += case
+ current_case = clamp(cases.len, 1, MAX_CASES)
+ update_appearance(UPDATE_ICON)
+ return TRUE
+ if("set_case")
+ if(cases && params["case"] && params["case"] <= cases.len)
+ current_case = clamp(params["case"], 1, MAX_CASES)
+ update_appearance(UPDATE_ICON)
+ return TRUE
+ if("remove_case")
+ var/datum/case/case = locate(params["case_ref"]) in cases
+ if(case)
+ for(var/datum/evidence/evidence in case.evidences)
+ remove_item(evidence.item, user)
+ cases -= case
+ current_case = clamp(cases.len, 1, MAX_CASES)
+ update_appearance(UPDATE_ICON)
+ return TRUE
+ if("rename_case")
+ var/new_name = tgui_input_text(user, "Please ender the case new name", "Detective's Board")
+ if(new_name)
+ var/datum/case/case = locate(params["case_ref"]) in cases
+ case.name = new_name
+ return TRUE
+ if("look_evidence")
+ var/datum/case/case = locate(params["case_ref"]) in cases
+ var/datum/evidence/evidence = locate(params["evidence_ref"]) in case.evidences
+ if(evidence.evidence_type == EVIDENCE_TYPE_PHOTO)
+ var/obj/item/photo/item = evidence.item
+ item.show(user)
+ return TRUE
+
+ var/obj/item/paper/paper = evidence.item
+ var/paper_text = ""
+ for(var/datum/paper_input/text_input as anything in paper.raw_text_inputs)
+ paper_text += text_input.raw_text
+ user << browse("[paper.name]" \
+ + "" \
+ + "[paper_text]" \
+ + "", "window=photo_showing;size=480x608")
+ onclose(user, "[name]")
+ if("remove_evidence")
+ var/datum/case/case = cases[current_case]
+ var/datum/evidence/evidence = locate(params["evidence_ref"]) in case.evidences
+ if(evidence)
+ var/obj/item/item = evidence.item
+ if(!istype(item) || item.loc != src)
+ return
+ remove_item(item, user)
+ for(var/datum/evidence/connection in evidence.connections)
+ connection.connections.Remove(evidence)
+ case.evidences -= evidence
+ update_appearance(UPDATE_ICON)
+ return TRUE
+ if("set_evidence_cords")
+ var/datum/case/case = locate(params["case_ref"]) in cases
+ if(case)
+ var/datum/evidence/evidence = locate(params["evidence_ref"]) in case.evidences
+ if(evidence)
+ evidence.x = clamp(params["rel_x"], 0, MAX_EVIDENCE_X)
+ evidence.y = clamp(params["rel_y"], 0, MAX_EVIDENCE_Y)
+ return TRUE
+ if("add_connection")
+ var/datum/evidence/from_evidence = locate(params["from_ref"]) in cases[current_case].evidences
+ var/datum/evidence/to_evidence = locate(params["to_ref"]) in cases[current_case].evidences
+ if(from_evidence && to_evidence)
+ from_evidence.connections += to_evidence
+ to_evidence.connections += from_evidence
+ return TRUE
+
+
+ return FALSE
+
+/obj/structure/detectiveboard/update_overlays()
+ . = ..()
+ if(!cases.len)
+ return
+ if(cases[current_case].notices < MAX_ICON_NOTICES)
+ . += "notices_[cases[current_case].notices]"
+ else
+ . += "notices_[MAX_ICON_NOTICES]"
+/**
+ * Removes an item from the notice board
+ *
+ * Arguments:
+ * * item - The item that is to be removed
+ * * user - The mob that is trying to get the item removed, if there is one
+ */
+/obj/structure/detectiveboard/proc/remove_item(obj/item/item, mob/user)
+ item.forceMove(drop_location())
+ if(user)
+ user.put_in_hands(item)
+ balloon_alert(user, "removed from board")
+ cases[current_case].notices--
+ update_appearance(UPDATE_ICON)
+
+/obj/structure/detectiveboard/atom_deconstruct(disassembled = TRUE)
+ if(!disassembled)
+ new /obj/item/stack/sheet/mineral/wood(loc)
+ else
+ new /obj/item/wallframe/detectiveboard(loc)
+ for(var/obj/item/content in contents)
+ remove_item(content)
+
+/obj/item/wallframe/detectiveboard
+ name = "detective notice board"
+ desc = "A board for linking evidence to crimes."
+ icon = 'icons/obj/wallmounts.dmi'
+ icon_state = "noticeboard"
+ custom_materials = list(
+ /datum/material/wood = SHEET_MATERIAL_AMOUNT,
+ )
+ resistance_flags = FLAMMABLE
+ result_path = /obj/structure/detectiveboard
+ pixel_shift = 32
+
+/datum/evidence
+ var/name = "None"
+ var/description = "No description"
+ var/evidence_type = "none"
+ var/x = 0
+ var/y = 0
+ var/list/datum/evidence/connections = list()
+ var/obj/item/item = null
+
+/datum/evidence/New(param_name, param_desc, obj/item/param_item)
+ name = param_name
+ description = param_desc
+ item = param_item
+ if(istype(param_item, /obj/item/photo))
+ evidence_type = EVIDENCE_TYPE_PHOTO
+ else
+ evidence_type = EVIDENCE_TYPE_PAPER
+
+/datum/case
+ var/notices = 0
+ var/name = ""
+ var/color = 0
+ var/list/datum/evidence/evidences = list()
+
+/datum/case/New(param_name, param_color)
+ name = param_name
+ color = param_color
+
+
+#undef EVIDENCE_TYPE_PHOTO
+#undef EVIDENCE_TYPE_PAPER
+
+#undef MAX_EVIDENCE_Y
+#undef MAX_EVIDENCE_X
+#undef MAX_ICON_NOTICES
+#undef MAX_CASES
diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm
index 012e8e8a544e9..b582d86efde0e 100644
--- a/code/game/objects/structures/displaycase.dm
+++ b/code/game/objects/structures/displaycase.dm
@@ -411,7 +411,7 @@
data["showpiece_icon"] = icon2base64(getFlatIcon(showpiece, no_anim=TRUE))
return data
-/obj/structure/displaycase/trophy/ui_act(action, params)
+/obj/structure/displaycase/trophy/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
@@ -526,7 +526,7 @@
data["product_icon"] = showpiece ? icon2base64(getFlatIcon(showpiece, no_anim=TRUE)) : null
return data
-/obj/structure/displaycase/forsale/ui_act(action, params)
+/obj/structure/displaycase/forsale/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm
index 49a230d6bdc48..a464f41827678 100644
--- a/code/game/objects/structures/flora.dm
+++ b/code/game/objects/structures/flora.dm
@@ -2,7 +2,7 @@
name = "flora"
desc = "Some sort of plant."
resistance_flags = FLAMMABLE
- max_integrity = 150
+ max_integrity = 100
anchored = TRUE
drag_slowdown = 1.3
@@ -113,6 +113,12 @@
if(harvest(user))
after_harvest(user)
+/obj/structure/flora/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir)
+ if(damage_flag == MELEE)
+ if(damage_type == BURN)
+ damage_amount *= 4
+ return ..()
+
/obj/structure/flora/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
var/use_default_sound = TRUE //Because I don't wanna do unnecessary bitflag checks in a single if statement, while also allowing for multiple sounds to be played
if(flora_flags & FLORA_HERBAL)
@@ -278,6 +284,7 @@
name = "tree"
desc = "A large tree."
density = TRUE
+ max_integrity = 150
pixel_x = -16
layer = FLY_LAYER
plane = ABOVE_GAME_PLANE
diff --git a/code/game/objects/structures/guncase.dm b/code/game/objects/structures/guncase.dm
index 4f4972d486415..b297b670b0ebe 100644
--- a/code/game/objects/structures/guncase.dm
+++ b/code/game/objects/structures/guncase.dm
@@ -104,7 +104,7 @@
return FALSE
if(!istype(user))
return FALSE
- if(user.incapacitated())
+ if(user.incapacitated)
return FALSE
return TRUE
diff --git a/code/game/objects/structures/icemoon/cave_entrance.dm b/code/game/objects/structures/icemoon/cave_entrance.dm
index 4401b87d23eca..6efa671875915 100644
--- a/code/game/objects/structures/icemoon/cave_entrance.dm
+++ b/code/game/objects/structures/icemoon/cave_entrance.dm
@@ -178,7 +178,8 @@ GLOBAL_LIST_INIT(ore_probability, list(
if(16)
new /mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/doom(loc)
if(17)
- new /obj/item/reagent_containers/cup/glass/drinkingglass/filled/nuka_cola(loc)
+ new /obj/item/clothing/gloves/fingerless/punch_mitts(loc)
+ new /obj/item/clothing/head/cowboy(loc)
if(18)
new /obj/item/soulstone/anybody(loc)
if(19)
diff --git a/code/game/objects/structures/janitor.dm b/code/game/objects/structures/janitor.dm
index 0413bcac53986..a8df82e02b2fa 100644
--- a/code/game/objects/structures/janitor.dm
+++ b/code/game/objects/structures/janitor.dm
@@ -337,7 +337,7 @@
* * user The mob interacting with a menu
*/
/obj/structure/mop_bucket/janitorialcart/proc/check_menu(mob/living/user)
- return istype(user) && !user.incapacitated()
+ return istype(user) && !user.incapacitated
/obj/structure/mop_bucket/janitorialcart/update_overlays()
. = ..()
diff --git a/code/game/objects/structures/ladders.dm b/code/game/objects/structures/ladders.dm
index 314539aa2b412..ffe4ea44a00cb 100644
--- a/code/game/objects/structures/ladders.dm
+++ b/code/game/objects/structures/ladders.dm
@@ -182,7 +182,7 @@
INVOKE_ASYNC(src, PROC_REF(start_travelling), user, going_up)
/obj/structure/ladder/proc/check_menu(mob/user, is_ghost)
- if(user.incapacitated() || (!user.Adjacent(src)))
+ if(user.incapacitated || (!user.Adjacent(src)))
return FALSE
return TRUE
diff --git a/code/game/objects/structures/lavaland/geyser.dm b/code/game/objects/structures/lavaland/geyser.dm
index 045a703250b0a..4168a100751f1 100644
--- a/code/game/objects/structures/lavaland/geyser.dm
+++ b/code/game/objects/structures/lavaland/geyser.dm
@@ -185,3 +185,7 @@
layer_mode_sprite = "reinforced_plunger_layer"
custom_premium_price = PAYCHECK_CREW * 8
+
+/obj/item/plunger/cyborg/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, CYBORG_ITEM_TRAIT)
diff --git a/code/game/objects/structures/maintenance.dm b/code/game/objects/structures/maintenance.dm
index 768bd22d2abe2..9f88246966f94 100644
--- a/code/game/objects/structures/maintenance.dm
+++ b/code/game/objects/structures/maintenance.dm
@@ -31,7 +31,7 @@ at the cost of risking a vicious bite.**/
/obj/structure/moisture_trap/Initialize(mapload)
. = ..()
- ADD_TRAIT(src, TRAIT_FISH_SAFE_STORAGE, TRAIT_GENERIC)
+ AddElement(/datum/element/fish_safe_storage)
AddElement(/datum/element/swabable, CELL_LINE_TABLE_MOIST, CELL_VIRUS_TABLE_GENERIC, rand(2,4), 20)
if(prob(40))
critter_infested = FALSE
@@ -226,7 +226,7 @@ at the cost of risking a vicious bite.**/
/obj/structure/destructible/cult/pants_altar/proc/check_menu(mob/user)
if(!istype(user))
return FALSE
- if(user.incapacitated() || !user.Adjacent(src))
+ if(user.incapacitated || !user.Adjacent(src))
return FALSE
return TRUE
diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm
index 7ea2330281413..a0ed1013f549b 100644
--- a/code/game/objects/structures/mirror.dm
+++ b/code/game/objects/structures/mirror.dm
@@ -88,7 +88,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror/broken, 28)
return display_radial_menu(user)
/obj/structure/mirror/proc/display_radial_menu(mob/living/carbon/human/user)
- var/pick = show_radial_menu(user, src, mirror_options, user, radius = 36, require_near = TRUE)
+ var/pick = show_radial_menu(user, src, mirror_options, user, radius = 36, require_near = TRUE, tooltips = TRUE)
if(!pick)
return TRUE //get out
@@ -382,12 +382,36 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror/broken, 28)
desc = "Pride cometh before the..."
race_flags = MIRROR_PRIDE
mirror_options = PRIDE_MIRROR_OPTIONS
+ /// 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
+
+ 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(.)
- return TRUE
-
+ if (!changed)
+ return
user.visible_message(
span_bolddanger("The ground splits beneath [user] as [user.p_their()] hand leaves the mirror!"),
span_notice("Perfect. Much better! Now nobody will be able to resist yo-"),
diff --git a/code/game/objects/structures/mystery_box.dm b/code/game/objects/structures/mystery_box.dm
index e165c2e295c93..9bb51ba09cbef 100644
--- a/code/game/objects/structures/mystery_box.dm
+++ b/code/game/objects/structures/mystery_box.dm
@@ -19,7 +19,6 @@
#define MBOX_DURATION_STANDBY (2.7 SECONDS)
GLOBAL_LIST_INIT(mystery_box_guns, list(
- /obj/item/gun/energy/lasercannon,
/obj/item/gun/energy/recharge/ebow/large,
/obj/item/gun/energy/e_gun,
/obj/item/gun/energy/e_gun/nuclear,
@@ -45,6 +44,7 @@ GLOBAL_LIST_INIT(mystery_box_guns, list(
/obj/item/gun/ballistic/automatic/m90/unrestricted,
/obj/item/gun/ballistic/automatic/tommygun,
/obj/item/gun/ballistic/automatic/wt550,
+ /obj/item/gun/ballistic/automatic/smartgun,
/obj/item/gun/ballistic/rifle/sniper_rifle,
/obj/item/gun/ballistic/rifle/boltaction,
))
@@ -85,6 +85,30 @@ GLOBAL_LIST_INIT(mystery_magic, list(
/obj/item/runic_vendor_scepter,
))
+GLOBAL_LIST_INIT(mystery_fishing, list(
+ /obj/item/storage/toolbox/fishing/master,
+ /obj/item/storage/box/fish_revival_kit,
+ /obj/item/circuitboard/machine/fishing_portal_generator/emagged,
+ /obj/item/fishing_rod/telescopic/master,
+ /obj/item/bait_can/super_baits,
+ /obj/item/storage/fish_case/tiziran,
+ /obj/item/storage/fish_case/syndicate,
+ /obj/item/claymore/cutlass/old,
+ /obj/item/gun/energy/laser/retro/old,
+ /obj/item/gun/energy/laser/musket,
+ /obj/item/gun/energy/disabler/smoothbore,
+ /obj/item/gun/ballistic/rifle/boltaction/surplus,
+ /obj/item/food/rationpack,
+ /obj/item/food/canned/squid_ink,
+ /obj/item/reagent_containers/cup/glass/bottle/rum/aged,
+ /obj/item/storage/bag/money/dutchmen,
+ /obj/item/language_manual/piratespeak,
+ /obj/item/clothing/head/costume/pirate/armored,
+ /obj/item/clothing/suit/costume/pirate/armored,
+ /obj/structure/cannon/mystery_box,
+ /obj/item/stack/cannonball/trashball/four,
+ /obj/item/stack/cannonball/four,
+))
/obj/structure/mystery_box
name = "mystery box"
@@ -117,6 +141,10 @@ GLOBAL_LIST_INIT(mystery_magic, list(
var/grant_extra_mag = TRUE
/// Stores the current sound channel we're using so we can cut off our own sounds as needed. Randomized after each roll
var/current_sound_channel
+ /// How many time can it still be used?
+ var/uses_left
+ /// A list of weakrefs to mind datums of people that opened it and how many times.
+ var/list/datum/weakref/minds_that_opened_us
/obj/structure/mystery_box/Initialize(mapload)
. = ..()
@@ -126,6 +154,7 @@ GLOBAL_LIST_INIT(mystery_magic, list(
QDEL_NULL(presented_item)
if(current_sound_channel)
SSsounds.free_sound_channel(current_sound_channel)
+ minds_that_opened_us = null
return ..()
/obj/structure/mystery_box/attack_hand(mob/living/user, list/modifiers)
@@ -163,6 +192,11 @@ GLOBAL_LIST_INIT(mystery_magic, list(
current_sound_channel = SSsounds.reserve_sound_channel(src)
playsound(src, open_sound, 70, FALSE, channel = current_sound_channel, falloff_exponent = 10)
playsound(src, crate_open_sound, 80)
+ if(user.mind)
+ LAZYINITLIST(minds_that_opened_us)
+ var/datum/weakref/ref = WEAKREF(user.mind)
+ minds_that_opened_us[ref] += 1
+ uses_left--
/// The box has finished choosing, mark it as available for grabbing
/obj/structure/mystery_box/proc/present_weapon()
@@ -186,6 +220,9 @@ GLOBAL_LIST_INIT(mystery_magic, list(
box_close_timer = null
box_expire_timer = null
addtimer(CALLBACK(src, PROC_REF(ready_again)), MBOX_DURATION_STANDBY)
+ if(uses_left <= 0)
+ visible_message("[src] breaks down.")
+ deconstruct(disassembled = FALSE)
/// The cooldown between activations has finished, shake to show that
/obj/structure/mystery_box/proc/ready_again()
@@ -196,22 +233,26 @@ GLOBAL_LIST_INIT(mystery_magic, list(
/// Someone attacked the box with an empty hand, spawn the shown prize and give it to them, then close the box
/obj/structure/mystery_box/proc/grant_weapon(mob/living/user)
- var/obj/item/instantiated_weapon = new presented_item.selected_path(src)
- user.put_in_hands(instantiated_weapon)
-
- if(isgun(instantiated_weapon)) // handle pins + possibly extra ammo
- var/obj/item/gun/instantiated_gun = instantiated_weapon
- instantiated_gun.unlock()
- if(grant_extra_mag && istype(instantiated_gun, /obj/item/gun/ballistic))
- var/obj/item/gun/ballistic/instantiated_ballistic = instantiated_gun
- if(!instantiated_ballistic.internal_magazine)
- var/obj/item/ammo_box/magazine/extra_mag = new instantiated_ballistic.spawn_magazine_type(loc)
- user.put_in_hands(extra_mag)
-
+ var/atom/movable/instantiated_weapon = new presented_item.selected_path(loc)
user.visible_message(span_notice("[user] takes [presented_item] from [src]."), span_notice("You take [presented_item] from [src]."), vision_distance = COMBAT_MESSAGE_RANGE)
playsound(src, grant_sound, 70, FALSE, channel = current_sound_channel, falloff_exponent = 10)
close_box()
+ if(!isitem(instantiated_weapon))
+ return
+ user.put_in_hands(instantiated_weapon)
+
+ if(!isgun(instantiated_weapon))
+ return
+ // handle pins + possibly extra ammo
+ var/obj/item/gun/instantiated_gun = instantiated_weapon
+ instantiated_gun.unlock()
+ if(!grant_extra_mag || !istype(instantiated_gun, /obj/item/gun/ballistic))
+ return
+ var/obj/item/gun/ballistic/instantiated_ballistic = instantiated_gun
+ if(!instantiated_ballistic.internal_magazine)
+ var/obj/item/ammo_box/magazine/extra_mag = new instantiated_ballistic.spawn_magazine_type(loc)
+ user.put_in_hands(extra_mag)
/obj/structure/mystery_box/guns
desc = "A wooden crate that seems equally magical and mysterious, capable of granting the user all kinds of different pieces of gear. This one seems focused on firearms."
@@ -231,6 +272,28 @@ GLOBAL_LIST_INIT(mystery_magic, list(
/obj/structure/mystery_box/wands/generate_valid_types()
valid_types = GLOB.mystery_magic
+///One of a kind, rarely found by fishing in the ocean.
+/obj/structure/mystery_box/fishing
+ name = "treasure chest"
+ desc = "A pirate-y chest that seems equally magial and mysterious, capable of granting the user different pieces of gear."
+ icon_state = "treasure"
+ uses_left = 18
+ max_integrity = 100
+ damage_deflection = 30
+ grant_extra_mag = FALSE
+
+/obj/structure/mystery_box/handle_deconstruct(disassembled)
+ new /obj/item/stack/sheet/mineral/wood(drop_location(), 2)
+ return ..()
+
+/obj/structure/mystery_box/fishing/generate_valid_types()
+ valid_types = GLOB.mystery_fishing
+
+/obj/structure/mystery_box/fishing/activate(mob/living/user)
+ if(user.mind && minds_that_opened_us?[WEAKREF(user.mind)] >= 3)
+ to_chat(user, span_warning("[src] refuses to open to you anymore. Perhaps you should present it to someone else..."))
+ return
+ return ..()
/// This represents the item that comes out of the box and is constantly changing before the box finishes deciding. Can probably be just an /atom or /movable.
/obj/mystery_box_item
@@ -290,14 +353,14 @@ GLOBAL_LIST_INIT(mystery_magic, list(
/// animate() isn't up to the task for queueing up icon changes, so this is the proc we call with timers to update our icon
/obj/mystery_box_item/proc/update_random_icon(new_item_type)
- var/obj/item/new_item = new_item_type
- icon = initial(new_item.icon)
- icon_state = initial(new_item.icon_state)
+ var/atom/movable/new_item = new_item_type
+ icon = new_item::icon
+ icon_state = new_item::icon_state
/obj/mystery_box_item/proc/present_item()
- var/obj/item/selected_item = selected_path
+ var/atom/movable/selected_item = selected_path
add_filter("ready_outline", 2, list("type" = "outline", "color" = COLOR_VIVID_YELLOW, "size" = 0.2))
- name = initial(selected_item.name)
+ name = selected_item::name
parent_box.present_weapon()
claimable = TRUE
diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm
index 841da89972599..8bae150e3ba37 100644
--- a/code/game/objects/structures/noticeboard.dm
+++ b/code/game/objects/structures/noticeboard.dm
@@ -66,7 +66,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/noticeboard, 32)
data["items"] += list(content_data)
return data
-/obj/structure/noticeboard/ui_act(action, params)
+/obj/structure/noticeboard/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/game/objects/structures/railings.dm b/code/game/objects/structures/railings.dm
index c3d9b115f01de..06a099ad4f906 100644
--- a/code/game/objects/structures/railings.dm
+++ b/code/game/objects/structures/railings.dm
@@ -25,17 +25,29 @@
energy = 100
bomb = 10
+/obj/structure/railing/unbreakable
+ resistance_flags = INDESTRUCTIBLE
+
/obj/structure/railing/corner //aesthetic corner sharp edges hurt oof ouch
icon_state = "railing_corner"
density = FALSE
climbable = FALSE
+/obj/structure/railing/corner/unbreakable
+ resistance_flags = INDESTRUCTIBLE
+
/obj/structure/railing/corner/end //end of a segment of railing without making a loop
icon_state = "railing_end"
+/obj/structure/railing/corner/end/unbreakable
+ resistance_flags = INDESTRUCTIBLE
+
/obj/structure/railing/corner/end/flip //same as above but flipped around
icon_state = "railing_end_flip"
+/obj/structure/railing/corner/end/flip/unbreakable
+ resistance_flags = INDESTRUCTIBLE
+
/obj/structure/railing/Initialize(mapload)
. = ..()
if(climbable)
@@ -155,6 +167,7 @@
icon_state = "wooden_railing"
item_deconstruct = /obj/item/stack/sheet/mineral/wood
layer = ABOVE_MOB_LAYER
+ plane = GAME_PLANE
/obj/structure/railing/wooden_fence/Initialize(mapload)
. = ..()
@@ -167,7 +180,6 @@
/obj/structure/railing/wooden_fence/proc/adjust_dir_layer(direction)
layer = (direction & NORTH) ? MOB_LAYER : initial(layer)
- plane = (direction & NORTH) ? GAME_PLANE : initial(plane)
/obj/structure/railing/corner/end/wooden_fence
diff --git a/code/game/objects/structures/reflector.dm b/code/game/objects/structures/reflector.dm
index e27f5fcf42b40..5cd3f58df0530 100644
--- a/code/game/objects/structures/reflector.dm
+++ b/code/game/objects/structures/reflector.dm
@@ -311,7 +311,7 @@
return data
-/obj/structure/reflector/ui_act(action, params)
+/obj/structure/reflector/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm
index bcc9d1386955b..14e3b53680d15 100644
--- a/code/game/objects/structures/safe.dm
+++ b/code/game/objects/structures/safe.dm
@@ -129,7 +129,7 @@ FLOOR SAFES
return data
-/obj/structure/safe/ui_act(action, params)
+/obj/structure/safe/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/game/objects/structures/toiletbong.dm b/code/game/objects/structures/toiletbong.dm
index 0ea21e9ff8480..254f151c017df 100644
--- a/code/game/objects/structures/toiletbong.dm
+++ b/code/game/objects/structures/toiletbong.dm
@@ -15,7 +15,7 @@
AddComponent(/datum/component/simple_rotation, post_rotation = CALLBACK(src, PROC_REF(post_rotation)))
create_storage(max_total_storage = 100, max_slots = 12, canhold = /obj/item/food)
atom_storage.attack_hand_interact = FALSE
- atom_storage.rustle_sound = FALSE
+ atom_storage.do_rustle = FALSE
atom_storage.animated = FALSE
weed_overlay = mutable_appearance('icons/obj/watercloset.dmi', "[base_icon_state]_overlay")
diff --git a/code/game/objects/structures/training_machine.dm b/code/game/objects/structures/training_machine.dm
index bed4c4805cca6..c1963ea38a3ef 100644
--- a/code/game/objects/structures/training_machine.dm
+++ b/code/game/objects/structures/training_machine.dm
@@ -79,7 +79,7 @@
*
* Will not respond if moving and emagged, so once you set it to go it can't be stopped!
*/
-/obj/structure/training_machine/ui_act(action, params)
+/obj/structure/training_machine/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm
index f88aadc04631f..6522a2125fea3 100644
--- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm
+++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm
@@ -69,7 +69,7 @@
deconstruct(FALSE)
/obj/structure/transit_tube_pod/container_resist_act(mob/living/user)
- if(!user.incapacitated())
+ if(!user.incapacitated)
empty_pod()
return
if(!moving)
diff --git a/code/game/objects/structures/water_structures/toilet.dm b/code/game/objects/structures/water_structures/toilet.dm
index 7a64404a238a9..7237cd03c5045 100644
--- a/code/game/objects/structures/water_structures/toilet.dm
+++ b/code/game/objects/structures/water_structures/toilet.dm
@@ -36,6 +36,7 @@
update_appearance(UPDATE_ICON)
if(mapload && SSmapping.level_trait(z, ZTRAIT_STATION))
AddElement(/datum/element/lazy_fishing_spot, /datum/fish_source/toilet)
+ AddElement(/datum/element/fish_safe_storage)
register_context()
/obj/structure/toilet/add_context(atom/source, list/context, obj/item/held_item, mob/user)
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index b2b3ee50df64c..f2a90d98dc52d 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -450,6 +450,7 @@
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/movable, forceMove), loc), time_to_go + time_to_return) //we back boys
addtimer(VARSET_CALLBACK(src, dramatically_disappearing, FALSE), time_to_go + time_to_return) //also set the var back
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), time_to_go + time_to_return)
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), get_turf(src), 'sound/effects/glass_reverse.ogg', 70, TRUE), time_to_go + time_to_return)
var/obj/structure/grille/grill = take_grill ? (locate(/obj/structure/grille) in loc) : null
if(grill)
diff --git a/code/game/say.dm b/code/game/say.dm
index 42aea57cf6110..d8cb91c4ea429 100644
--- a/code/game/say.dm
+++ b/code/game/say.dm
@@ -12,6 +12,7 @@ GLOBAL_LIST_INIT(freqtospan, list(
"[FREQ_SECURITY]" = "secradio",
"[FREQ_COMMAND]" = "comradio",
"[FREQ_AI_PRIVATE]" = "aiprivradio",
+ "[FREQ_ENTERTAINMENT]" = "enteradio",
"[FREQ_SYNDICATE]" = "syndradio",
"[FREQ_UPLINK]" = "syndradio", // this probably shouldnt appear ingame
"[FREQ_CENTCOM]" = "centcomradio",
diff --git a/code/game/sound.dm b/code/game/sound.dm
index 17e5f6e3e3209..0b1984188dbec 100644
--- a/code/game/sound.dm
+++ b/code/game/sound.dm
@@ -473,6 +473,18 @@
'sound/creatures/monkey/monkey_screech_6.ogg',
'sound/creatures/monkey/monkey_screech_7.ogg',
)
+ if(SFX_TOOL_SWITCH)
+ soundin = 'sound/items/handling/tool_switch.ogg'
+ if(SFX_KEYBOARD_CLICKS)
+ soundin = pick(
+ 'sound/machines/computer/keyboard_clicks_1.ogg',
+ 'sound/machines/computer/keyboard_clicks_2.ogg',
+ 'sound/machines/computer/keyboard_clicks_3.ogg',
+ 'sound/machines/computer/keyboard_clicks_4.ogg',
+ 'sound/machines/computer/keyboard_clicks_5.ogg',
+ 'sound/machines/computer/keyboard_clicks_6.ogg',
+ 'sound/machines/computer/keyboard_clicks_7.ogg',
+ )
if(SFX_STONE_DROP)
soundin = pick(
'sound/items/stones/stone_drop1.ogg',
@@ -484,4 +496,25 @@
'sound/items/stones/stone_pick_up1.ogg',
'sound/items/stones/stone_pick_up2.ogg',
)
+ if(SFX_MUFFLED_SPEECH)
+ soundin = pick(
+ 'sound/effects/muffspeech/muffspeech1.ogg',
+ 'sound/effects/muffspeech/muffspeech2.ogg',
+ 'sound/effects/muffspeech/muffspeech3.ogg',
+ 'sound/effects/muffspeech/muffspeech4.ogg',
+ 'sound/effects/muffspeech/muffspeech5.ogg',
+ 'sound/effects/muffspeech/muffspeech6.ogg',
+ 'sound/effects/muffspeech/muffspeech7.ogg',
+ 'sound/effects/muffspeech/muffspeech8.ogg',
+ 'sound/effects/muffspeech/muffspeech9.ogg',
+ )
+ if(SFX_DEFAULT_FISH_SLAP)
+ soundin = 'sound/creatures/fish/fish_slap1.ogg'
+ if(SFX_ALT_FISH_SLAP)
+ soundin = 'sound/creatures/fish/fish_slap2.ogg'
+ if(SFX_FISH_PICKUP)
+ soundin = pick(
+ 'sound/creatures/fish/fish_pickup1.ogg',
+ 'sound/creatures/fish/fish_pickup2.ogg',
+ )
return soundin
diff --git a/code/game/turfs/closed/indestructible.dm b/code/game/turfs/closed/indestructible.dm
index b22da7880d73e..9e2a1ea10666e 100644
--- a/code/game/turfs/closed/indestructible.dm
+++ b/code/game/turfs/closed/indestructible.dm
@@ -63,6 +63,7 @@
/turf/closed/indestructible/splashscreen
name = "Space Station 13"
desc = null
+ baseturfs = /turf/cordon
icon = 'icons/blanks/blank_title.png'
icon_state = ""
pixel_x = -64
@@ -99,11 +100,6 @@ INITIALIZE_IMMEDIATE(/turf/closed/indestructible/splashscreen)
desc = pick(strings(SPLASH_FILE, "splashes"))
return ..()
-/turf/closed/indestructible/start_area
- name = null
- desc = null
- mouse_opacity = MOUSE_OPACITY_TRANSPARENT
-
/turf/closed/indestructible/reinforced
name = "reinforced wall"
desc = "A huge chunk of reinforced metal used to separate rooms. Effectively impervious to conventional methods of destruction."
diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm
index f6e6627eff5f8..3a6546f6eaa85 100644
--- a/code/game/turfs/closed/minerals.dm
+++ b/code/game/turfs/closed/minerals.dm
@@ -778,7 +778,10 @@
/turf/closed/mineral/gibtonite/attackby(obj/item/attacking_item, mob/living/user, params)
var/previous_stage = stage
- if(istype(attacking_item, /obj/item/mining_scanner) || istype(attacking_item, /obj/item/t_scanner/adv_mining_scanner) && stage == GIBTONITE_ACTIVE)
+ if(istype(attacking_item, /obj/item/goliath_infuser_hammer) && stage == GIBTONITE_ACTIVE)
+ user.visible_message(span_notice("[user] digs [attacking_item] to [src]..."), span_notice("Your tendril hammer instictively digs and wraps around [src] to stop it..."))
+ defuse(user)
+ else if(istype(attacking_item, /obj/item/mining_scanner) || istype(attacking_item, /obj/item/t_scanner/adv_mining_scanner) && stage == GIBTONITE_ACTIVE)
user.visible_message(span_notice("[user] holds [attacking_item] to [src]..."), span_notice("You use [attacking_item] to locate where to cut off the chain reaction and attempt to stop it..."))
defuse(user)
..()
diff --git a/code/game/turfs/closed/wall/misc_walls.dm b/code/game/turfs/closed/wall/misc_walls.dm
index be4b6ca7ad295..b09a0355b9f58 100644
--- a/code/game/turfs/closed/wall/misc_walls.dm
+++ b/code/game/turfs/closed/wall/misc_walls.dm
@@ -51,6 +51,13 @@
. = ..()
AddElement(/datum/element/rust)
+/turf/closed/wall/heretic_rust
+ color = MAP_SWITCH(null, COLOR_GREEN_GRAY)
+
+/turf/closed/wall/heretic_rust/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/rust/heretic)
+
/turf/closed/wall/r_wall/rust
//SDMM supports colors, this is simply for easier mapping
//and should be removed on initialize
@@ -61,6 +68,13 @@
. = ..()
AddElement(/datum/element/rust)
+/turf/closed/wall/r_wall/heretic_rust
+ color = MAP_SWITCH(null, COLOR_GREEN_GRAY)
+
+/turf/closed/wall/r_wall/heretic_rust/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/rust/heretic)
+
/turf/closed/wall/mineral/bronze
name = "clockwork wall"
desc = "A huge chunk of bronze, decorated like gears and cogs."
diff --git a/code/game/turfs/closed/walls.dm b/code/game/turfs/closed/walls.dm
index ed31138bb19f8..a78579d713e9a 100644
--- a/code/game/turfs/closed/walls.dm
+++ b/code/game/turfs/closed/walls.dm
@@ -40,7 +40,7 @@
if(!iscarbon(dropping) && !iscyborg(dropping))
return
var/mob/living/leaner = dropping
- if(leaner.incapacitated(IGNORE_RESTRAINTS) || leaner.stat != CONSCIOUS || HAS_TRAIT(leaner, TRAIT_NO_TRANSFORM))
+ if(INCAPACITATED_IGNORING(leaner, INCAPABLE_RESTRAINTS) || leaner.stat != CONSCIOUS || HAS_TRAIT(leaner, TRAIT_NO_TRANSFORM))
return
if(!leaner.density || leaner.pulledby || leaner.buckled || !(leaner.mobility_flags & MOBILITY_STAND))
return
diff --git a/code/game/turfs/open/_open.dm b/code/game/turfs/open/_open.dm
index 147e123c8af28..f9b374c88cb88 100644
--- a/code/game/turfs/open/_open.dm
+++ b/code/game/turfs/open/_open.dm
@@ -415,10 +415,10 @@
/turf/open/get_dumping_location()
return src
-/turf/open/proc/ClearWet()//Nuclear option of immediately removing slipperyness from the tile instead of the natural drying over time
+/turf/open/proc/ClearWet()//Nuclear option of immediately removing slipperiness from the tile instead of the natural drying over time
qdel(GetComponent(/datum/component/wet_floor))
-/// Builds with rods. This doesn't exist to be overriden, just to remove duplicate logic for turfs that want
+/// Builds with rods. This doesn't exist to be overridden, just to remove duplicate logic for turfs that want
/// To support floor tile creation
/// I'd make it a component, but one of these things is space. So no.
/turf/open/proc/build_with_rods(obj/item/stack/rods/used_rods, mob/user)
diff --git a/code/game/turfs/open/floor/light_floor.dm b/code/game/turfs/open/floor/light_floor.dm
index dd30a86d8de45..793e4ce8e55e4 100644
--- a/code/game/turfs/open/floor/light_floor.dm
+++ b/code/game/turfs/open/floor/light_floor.dm
@@ -184,7 +184,7 @@
/turf/open/floor/light/proc/check_menu(mob/living/user, obj/item/multitool)
if(!istype(user))
return FALSE
- if(user.incapacitated())
+ if(user.incapacitated)
return FALSE
if(!multitool || !user.is_holding(multitool))
return FALSE
diff --git a/code/game/turfs/open/floor/mineral_floor.dm b/code/game/turfs/open/floor/mineral_floor.dm
index e8be1331378ab..a8cf2a6f37d07 100644
--- a/code/game/turfs/open/floor/mineral_floor.dm
+++ b/code/game/turfs/open/floor/mineral_floor.dm
@@ -97,6 +97,10 @@
/turf/open/floor/mineral/titanium/blue/airless
initial_gas_mix = AIRLESS_ATMOS
+/turf/open/floor/mineral/titanium/blue/lavaland_atmos
+ initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+ planetary_atmos = TRUE
+
/turf/open/floor/mineral/titanium/white
icon_state = "titanium_white"
floor_tile = /obj/item/stack/tile/mineral/titanium/white
diff --git a/code/game/turfs/open/floor/misc_floor.dm b/code/game/turfs/open/floor/misc_floor.dm
index a3915e14cabb8..8f8d5fbf1b08e 100644
--- a/code/game/turfs/open/floor/misc_floor.dm
+++ b/code/game/turfs/open/floor/misc_floor.dm
@@ -258,6 +258,14 @@
AddElement(/datum/element/rust)
color = null
+/turf/open/floor/plating/heretic_rust
+ color = COLOR_GREEN_GRAY
+
+/turf/open/floor/plating/heretic_rust/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/rust/heretic)
+ color = null
+
/turf/open/floor/plating/plasma
initial_gas_mix = ATMOS_TANK_PLASMA
diff --git a/code/game/turfs/open/ice.dm b/code/game/turfs/open/ice.dm
index 481dcb6b84732..dbfff2efc8f91 100644
--- a/code/game/turfs/open/ice.dm
+++ b/code/game/turfs/open/ice.dm
@@ -15,10 +15,21 @@
clawfootstep = FOOTSTEP_HARD_CLAW
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
rust_resistance = RUST_RESISTANCE_ORGANIC
+ var/can_make_hole = TRUE
+ var/static/list/tool_screentips = list(
+ TOOL_SHOVEL = list(
+ SCREENTIP_CONTEXT_LMB = "Dig fishing hole",
+ ),
+ TOOL_MINING = list(
+ SCREENTIP_CONTEXT_LMB = "Dig fishing hole",
+ ),
+ )
/turf/open/misc/ice/Initialize(mapload)
. = ..()
MakeSlippery(TURF_WET_PERMAFROST, INFINITY, 0, INFINITY, TRUE, FALSE)
+ if(can_make_hole)
+ AddElement(/datum/element/contextual_screentip_tools, tool_screentips)
/turf/open/misc/ice/break_tile()
return
@@ -26,6 +37,28 @@
/turf/open/misc/ice/burn_tile()
return
+/turf/open/misc/ice/examine(mob/user)
+ . = ..()
+ if(can_make_hole)
+ . += span_info("You could use a [EXAMINE_HINT("shovel")] or a [EXAMINE_HINT("pick")] to dig a fishing hole here.")
+
+/turf/open/misc/ice/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+ if(!can_make_hole)
+ return NONE
+ if(tool.tool_behaviour != TOOL_SHOVEL && tool.tool_behaviour != TOOL_MINING)
+ return NONE
+ balloon_alert(user, "digging...")
+ playsound(src, 'sound/effects/shovel_dig.ogg', 50, TRUE)
+ if(!do_after(user, 5 SECONDS, src))
+ return NONE
+ balloon_alert(user, "dug hole")
+ AddComponent(/datum/component/fishing_spot, GLOB.preset_fish_sources[/datum/fish_source/ice_fishing])
+ add_overlay(mutable_appearance('icons/turf/overlays.dmi', "ice_hole"))
+ can_make_hole = FALSE
+ RemoveElement(/datum/element/contextual_screentip_tools, tool_screentips)
+ flags_1 &= ~HAS_CONTEXTUAL_SCREENTIPS_1
+ return ITEM_INTERACT_SUCCESS
+
/turf/open/misc/ice/smooth
icon_state = "ice_turf-255"
base_icon_state = "ice_turf"
@@ -40,11 +73,13 @@
/turf/open/misc/ice/icemoon/no_planet_atmos
planetary_atmos = FALSE
+ can_make_hole = FALSE
/turf/open/misc/ice/temperate
baseturfs = /turf/open/misc/ice/temperate
desc = "Somehow, it is not melting under these conditions. Must be some very thick ice. Just as slippery too."
initial_gas_mix = COLD_ATMOS //it works with /turf/open/misc/asteroid/snow/temperatre
+ can_make_hole = FALSE
//For when you want real, genuine ice in your kitchen's cold room.
/turf/open/misc/ice/coldroom
diff --git a/code/game/turfs/open/misc.dm b/code/game/turfs/open/misc.dm
index 02de7489786f9..5c5987f656e23 100644
--- a/code/game/turfs/open/misc.dm
+++ b/code/game/turfs/open/misc.dm
@@ -3,7 +3,7 @@
/// Please do not bloat this. Love you <3
/turf/open/misc
name = "coder/mapper fucked up"
- desc = "report on github please"
+ desc = "report on GitHub please"
flags_1 = NO_SCREENTIPS_1 | CAN_BE_DIRTY_1
turf_flags = IS_SOLID | NO_RUST
diff --git a/code/game/turfs/open/sand.dm b/code/game/turfs/open/sand.dm
index c863e28231d35..254c595fcbdd6 100644
--- a/code/game/turfs/open/sand.dm
+++ b/code/game/turfs/open/sand.dm
@@ -10,6 +10,10 @@
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
rust_resistance = RUST_RESISTANCE_ORGANIC
+/turf/open/misc/beach/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/lazy_fishing_spot, /datum/fish_source/sand)
+
/turf/open/misc/beach/ex_act(severity, target)
return FALSE
@@ -37,6 +41,10 @@
clawfootstep = FOOTSTEP_WATER
heavyfootstep = FOOTSTEP_WATER
+/turf/open/misc/beach/coast/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_MESSAGE_IN_A_BOTTLE_LOCATION, INNATE_TRAIT)
+
/turf/open/misc/beach/coast/break_tile()
. = ..()
icon_state = "beach"
diff --git a/code/game/turfs/open/water.dm b/code/game/turfs/open/water.dm
index 5dcfa85961d20..de895754d03ae 100644
--- a/code/game/turfs/open/water.dm
+++ b/code/game/turfs/open/water.dm
@@ -21,7 +21,7 @@
var/immerse_overlay_color = "#5AAA88"
/// Fishing element for this specific water tile
- var/datum/fish_source/fishing_datum = /datum/fish_source/portal
+ var/datum/fish_source/fishing_datum = /datum/fish_source/river
/turf/open/water/Initialize(mapload)
. = ..()
@@ -42,3 +42,11 @@
baseturfs = /turf/open/water/beach
immerse_overlay_color = "#7799AA"
fishing_datum = /datum/fish_source/ocean/beach
+
+/turf/open/water/beach/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_MESSAGE_IN_A_BOTTLE_LOCATION, INNATE_TRAIT)
+
+/turf/open/water/lavaland_atmos
+ initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+ planetary_atmos = TRUE
diff --git a/code/game/world.dm b/code/game/world.dm
index b7de61e8c93e5..765aa7c18ef5d 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -1,11 +1,13 @@
#define RESTART_COUNTER_PATH "data/round_counter.txt"
-
+/// Load byond-tracy. If USE_BYOND_TRACY is defined, then this is ignored and byond-tracy is always loaded.
+#define USE_TRACY_PARAMETER "tracy"
/// Force the log directory to be something specific in the data/logs folder
#define OVERRIDE_LOG_DIRECTORY_PARAMETER "log-directory"
/// Prevent the master controller from starting automatically
#define NO_INIT_PARAMETER "no-init"
GLOBAL_VAR(restart_counter)
+GLOBAL_VAR(tracy_log)
/**
* WORLD INITIALIZATION
@@ -67,10 +69,12 @@ GLOBAL_VAR(restart_counter)
#ifdef USE_BYOND_TRACY
#warn USE_BYOND_TRACY is enabled
if(!tracy_initialized)
- init_byond_tracy()
+#else
+ if(!tracy_initialized && (USE_TRACY_PARAMETER in params))
+#endif
+ GLOB.tracy_log = init_byond_tracy()
Genesis(tracy_initialized = TRUE)
return
-#endif
Profile(PROFILE_RESTART)
Profile(PROFILE_RESTART, type = "sendmaps")
@@ -217,6 +221,9 @@ GLOBAL_VAR(restart_counter)
logger.init_logging()
+ if(GLOB.tracy_log)
+ rustg_file_write("[GLOB.tracy_log]", "[GLOB.log_directory]/tracy.loc")
+
var/latest_changelog = file("[global.config.directory]/../html/changelogs/archive/" + time2text(world.timeofday, "YYYY-MM") + ".yml")
GLOB.changelog_hash = fexists(latest_changelog) ? md5(latest_changelog) : 0 //for telling if the changelog has changed recently
@@ -409,7 +416,7 @@ GLOBAL_VAR(restart_counter)
hub_password = "SORRYNOPASSWORD"
/**
- * Handles incresing the world's maxx var and intializing the new turfs and assigning them to the global area.
+ * Handles increasing the world's maxx var and initializing the new turfs and assigning them to the global area.
* If map_load_z_cutoff is passed in, it will only load turfs up to that z level, inclusive.
* This is because maploading will handle the turfs it loads itself.
*/
@@ -436,7 +443,7 @@ GLOBAL_VAR(restart_counter)
maxy = new_maxy
if(!map_load_z_cutoff)
return
- var/area/global_area = GLOB.areas_by_type[world.area] // We're guarenteed to be touching the global area, so we'll just do this
+ var/area/global_area = GLOB.areas_by_type[world.area] // We're guaranteed to be touching the global area, so we'll just do this
LISTASSERTLEN(global_area.turfs_by_zlevel, map_load_z_cutoff, list())
for (var/zlevel in 1 to map_load_z_cutoff)
var/list/to_add = block(
@@ -485,7 +492,9 @@ GLOBAL_VAR(restart_counter)
CRASH("Unsupported platform: [system_type]")
var/init_result = call_ext(library, "init")("block")
- if (init_result != "0")
+ if(length(init_result) != 0 && init_result[1] == ".") // if first character is ., then it returned the output filename
+ return init_result
+ else if(init_result != "0")
CRASH("Error initializing byond-tracy: [init_result]")
/world/proc/init_debugger()
@@ -500,4 +509,5 @@ GLOBAL_VAR(restart_counter)
#undef NO_INIT_PARAMETER
#undef OVERRIDE_LOG_DIRECTORY_PARAMETER
+#undef USE_TRACY_PARAMETER
#undef RESTART_COUNTER_PATH
diff --git a/code/modules/NTNet/relays.dm b/code/modules/NTNet/relays.dm
index a2db78a175b4d..f36a89e72e1ff 100644
--- a/code/modules/NTNet/relays.dm
+++ b/code/modules/NTNet/relays.dm
@@ -113,7 +113,7 @@
data["dos_crashed"] = dos_failure
return data
-/obj/machinery/ntnet_relay/ui_act(action, params)
+/obj/machinery/ntnet_relay/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/actionspeed/_actionspeed_modifier.dm b/code/modules/actionspeed/_actionspeed_modifier.dm
index 36b9b9c860dec..59dec9f87cac4 100644
--- a/code/modules/actionspeed/_actionspeed_modifier.dm
+++ b/code/modules/actionspeed/_actionspeed_modifier.dm
@@ -156,7 +156,7 @@ GLOBAL_LIST_EMPTY(actionspeed_modification_cache)
var/amt = M.multiplicative_slowdown
if(conflict)
// Conflicting modifiers prioritize the larger slowdown or the larger speedup
- // We purposefuly don't handle mixing speedups and slowdowns on the same id
+ // We purposefully don't handle mixing speedups and slowdowns on the same id
if(abs(conflict_tracker[conflict]) < abs(amt))
conflict_tracker[conflict] = amt
else
diff --git a/code/modules/admin/admin_fax_panel.dm b/code/modules/admin/admin_fax_panel.dm
index 8874b6f38eb5a..cc88f1949f2e1 100644
--- a/code/modules/admin/admin_fax_panel.dm
+++ b/code/modules/admin/admin_fax_panel.dm
@@ -20,6 +20,8 @@ ADMIN_VERB(fax_panel, R_ADMIN, "Fax Panel", "View and respond to faxes sent to C
/datum/fax_panel_interface/New()
//Get all faxes, and save them to our list.
for(var/obj/machinery/fax/fax as anything in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/fax))
+ if(istype(fax, /obj/machinery/fax/admin))
+ continue
available_faxes += WEAKREF(fax)
//Get all stamps
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 0f7d7a3f39b30..68096367ef80b 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -484,12 +484,14 @@ ADMIN_VERB(populate_world, R_DEBUG, "Populate World", "Populate the world with t
testing("Spawned test mob at [get_area_name(tile, TRUE)] ([tile.x],[tile.y],[tile.z])")
ADMIN_VERB(toggle_ai_interact, R_ADMIN, "Toggle Admin AI Interact", "Allows you to interact with most machines as an AI would as a ghost.", ADMIN_CATEGORY_GAME)
- user.AI_Interact = !user.AI_Interact
- if(user.mob && isAdminGhostAI(user.mob))
- user.mob.has_unlimited_silicon_privilege = user.AI_Interact
+ var/doesnt_have_silicon_access = !HAS_TRAIT_FROM(user, TRAIT_AI_ACCESS, ADMIN_TRAIT)
+ if(doesnt_have_silicon_access)
+ ADD_TRAIT(user, TRAIT_AI_ACCESS, ADMIN_TRAIT)
+ else
+ REMOVE_TRAIT(user, TRAIT_AI_ACCESS, ADMIN_TRAIT)
- log_admin("[key_name(user)] has [user.AI_Interact ? "activated" : "deactivated"] Admin AI Interact")
- message_admins("[key_name_admin(user)] has [user.AI_Interact ? "activated" : "deactivated"] their AI interaction")
+ log_admin("[key_name(user)] has [doesnt_have_silicon_access ? "activated" : "deactivated"] Admin AI Interact")
+ message_admins("[key_name_admin(user)] has [doesnt_have_silicon_access ? "activated" : "deactivated"] their AI interaction")
ADMIN_VERB(debug_statpanel, R_DEBUG, "Debug Stat Panel", "Toggles local debug of the stat panel", ADMIN_CATEGORY_DEBUG)
user.stat_panel.send_message("create_debug")
diff --git a/code/modules/admin/antag_panel.dm b/code/modules/admin/antag_panel.dm
index 877bebffe9509..ca7b45649d159 100644
--- a/code/modules/admin/antag_panel.dm
+++ b/code/modules/admin/antag_panel.dm
@@ -80,6 +80,8 @@ GLOBAL_VAR(antag_prototypes)
result += "No body!"
if(current && HAS_TRAIT(current, TRAIT_MINDSHIELD))
result += "Mindshielded"
+ if(current && HAS_MIND_TRAIT(current, TRAIT_UNCONVERTABLE))
+ result += "Unconvertable"
//Move these to mob
if(iscyborg(current))
var/mob/living/silicon/robot/robot = current
diff --git a/code/modules/admin/fun_balloon.dm b/code/modules/admin/fun_balloon.dm
index 7a56d63da2309..f619bd8aaba87 100644
--- a/code/modules/admin/fun_balloon.dm
+++ b/code/modules/admin/fun_balloon.dm
@@ -64,7 +64,7 @@
return UI_INTERACTIVE
return ..()
-/obj/effect/fun_balloon/sentience/ui_act(action, list/params)
+/obj/effect/fun_balloon/sentience/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/admin/greyscale_modify_menu.dm b/code/modules/admin/greyscale_modify_menu.dm
index f96ecb7c590b6..0bc1ec01f5d4f 100644
--- a/code/modules/admin/greyscale_modify_menu.dm
+++ b/code/modules/admin/greyscale_modify_menu.dm
@@ -120,7 +120,7 @@
data["sprites"] = sprite_data
return data
-/datum/greyscale_modify_menu/ui_act(action, params)
+/datum/greyscale_modify_menu/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/admin/permissionedit.dm b/code/modules/admin/permissionedit.dm
index e508a10473927..296b6fd2dd86f 100644
--- a/code/modules/admin/permissionedit.dm
+++ b/code/modules/admin/permissionedit.dm
@@ -222,7 +222,7 @@ ADMIN_VERB(edit_admin_permissions, R_PERMISSIONS, "Permissions Panel", "Edit adm
. = ckey(admin_key)
if(!.)
return FALSE
- if(!admin_ckey && (. in GLOB.admin_datums+GLOB.deadmins))
+ if(!admin_ckey && (. in (GLOB.admin_datums+GLOB.deadmins)))
to_chat(usr, span_danger("[admin_key] is already an admin."), confidential = TRUE)
return FALSE
if(use_db)
diff --git a/code/modules/admin/skill_panel.dm b/code/modules/admin/skill_panel.dm
index ec80768276dce..b1ba4d10910a0 100644
--- a/code/modules/admin/skill_panel.dm
+++ b/code/modules/admin/skill_panel.dm
@@ -35,7 +35,7 @@
var/exp_percent = exp / SKILL_EXP_LIST[SKILL_LEVEL_LEGENDARY]
.["skills"] += list(list("playername" = targetmind.current, "path" = type, "name" = S.name, "desc" = S.desc, "lvlnum" = lvl_num, "lvl" = lvl_name, "exp" = exp, "exp_prog" = xp_req_to_level - xp_prog_to_level, "exp_req" = xp_req_to_level, "exp_percent" = exp_percent, "max_exp" = SKILL_EXP_LIST[length(SKILL_EXP_LIST)]))
-/datum/skill_panel/ui_act(action, params)
+/datum/skill_panel/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index ebdc843052161..6a2666eef9bed 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1727,11 +1727,12 @@
if(!check_rights(R_ADMIN))
return
- for(var/obj/machinery/fax/FAX as anything in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/fax))
- if(!is_centcom_level(FAX.z))
+ for(var/obj/machinery/fax/admin/FAX as anything in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/fax/admin))
+ if(FAX.fax_id != href_list["destination"])
continue
+ FAX.receive(locate(href_list["print_fax"]), href_list["sender_name"])
+
- FAX.receive(locate(href_list["print_fax"]), href_list["fax_name"])
else if(href_list["play_internet"])
if(!check_rights(R_SOUND))
return
diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm
index 36db4fa8bc4b0..4ee2b79f04459 100644
--- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm
+++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm
@@ -64,7 +64,7 @@
"SELECT /mob/living IN (@[/area/service/bar MAP contents])[1]"
What if some dumbass admin spawned a bajillion spiders and you need to kill them all?
- Oh yeah you'd rather not delete all the spiders in maintenace. Only that one room the spiders were
+ Oh yeah you'd rather not delete all the spiders in maintenance. Only that one room the spiders were
spawned in.
"DELETE /mob/living/carbon/superior_animal/giant_spider WHERE loc.loc == marked"
@@ -109,7 +109,7 @@
By the way, queries are slow and take a while. Be patient.
They don't hang the entire server though.
- With great power comes great responsability.
+ With great power comes great responsibility.
Here's a slightly more formal quick reference.
diff --git a/code/modules/admin/verbs/admin_newscaster.dm b/code/modules/admin/verbs/admin_newscaster.dm
index 0439cfa8811ac..4cb7b5c3344e2 100644
--- a/code/modules/admin/verbs/admin_newscaster.dm
+++ b/code/modules/admin/verbs/admin_newscaster.dm
@@ -134,7 +134,7 @@ ADMIN_VERB(access_news_network, R_ADMIN, "Access Newscaster Network", "Allows yo
data["wanted"] = wanted_info
return data
-/datum/newspanel/ui_act(action, params)
+/datum/newspanel/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/admin/verbs/adminevents.dm b/code/modules/admin/verbs/adminevents.dm
index 4bf32dedb41c1..214cf653d4e1f 100644
--- a/code/modules/admin/verbs/adminevents.dm
+++ b/code/modules/admin/verbs/adminevents.dm
@@ -218,9 +218,15 @@ ADMIN_VERB(hostile_environment, R_ADMIN, "Hostile Environment", "Disable the shu
SSshuttle.hostile_environments.Cut()
SSshuttle.checkHostileEnvironment()
-ADMIN_VERB(toggle_nuke, R_DEBUG|R_ADMIN, "Toggle Nuke", "Arm or disarm a nuke.", ADMIN_CATEGORY_EVENTS, obj/machinery/nuclearbomb/nuke in world)
+ADMIN_VERB(toggle_nuke, R_DEBUG|R_ADMIN, "Toggle Nuke", "Arm or disarm a nuke.", ADMIN_CATEGORY_EVENTS)
+ var/list/nukes = list()
+ for (var/obj/machinery/nuclearbomb/bomb in world)
+ nukes += bomb
+ var/obj/machinery/nuclearbomb/nuke = tgui_input_list(user, "", "Toggle Nuke", nukes)
+ if (isnull(nuke))
+ return
if(!nuke.timing)
- var/newtime = input(user, "Set activation timer.", "Activate Nuke", "[nuke.timer_set]") as num|null
+ var/newtime = tgui_input_number(user, "Set activation timer.", "Activate Nuke", nuke.timer_set)
if(!newtime)
return
nuke.timer_set = newtime
diff --git a/code/modules/admin/verbs/adminfun.dm b/code/modules/admin/verbs/adminfun.dm
index 8bc7a611b35d4..c7acd1cba4624 100644
--- a/code/modules/admin/verbs/adminfun.dm
+++ b/code/modules/admin/verbs/adminfun.dm
@@ -154,7 +154,7 @@ ADMIN_VERB(polymorph_all, R_ADMIN, "Polymorph All", "Applies the effects of the
message_admins("Mass polymorph started by [who_did_it] is complete.")
ADMIN_VERB_AND_CONTEXT_MENU(admin_smite, R_ADMIN|R_FUN, "Smite", "Smite a player with divine power.", ADMIN_CATEGORY_FUN, mob/living/target in world)
- var/punishment = input(user, "Choose a punishment", "DIVINE SMITING") as null|anything in GLOB.smites
+ var/punishment = tgui_input_list(user, "Choose a punishment", "DIVINE SMITING", GLOB.smites)
if(QDELETED(target) || !punishment)
return
diff --git a/code/modules/admin/verbs/borgpanel.dm b/code/modules/admin/verbs/borgpanel.dm
index ffeb1cce2731c..97f690f2a5aad 100644
--- a/code/modules/admin/verbs/borgpanel.dm
+++ b/code/modules/admin/verbs/borgpanel.dm
@@ -64,7 +64,7 @@ ADMIN_VERB(borg_panel, R_ADMIN, "Show Borg Panel", ADMIN_VERB_NO_DESCRIPTION, AD
.["ais"] += list(list("name" = ai.name, "ref" = REF(ai), "connected" = (borg.connected_ai == ai)))
-/datum/borgpanel/ui_act(action, params)
+/datum/borgpanel/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
@@ -153,15 +153,15 @@ ADMIN_VERB(borg_panel, R_ADMIN, "Show Borg Panel", ADMIN_VERB_NO_DESCRIPTION, AD
if (!borg.radio.keyslot) // There's no encryption key. This shouldn't happen but we can cope
borg.radio.channels -= channel
if (channel == RADIO_CHANNEL_SYNDICATE)
- borg.radio.syndie = FALSE
+ borg.radio.special_channels &= ~RADIO_SPECIAL_SYNDIE
else if (channel == "CentCom")
- borg.radio.independent = FALSE
+ borg.radio.special_channels &= ~RADIO_SPECIAL_CENTCOM
else
borg.radio.keyslot.channels -= channel
if (channel == RADIO_CHANNEL_SYNDICATE)
- borg.radio.keyslot.syndie = FALSE
+ borg.radio.keyslot.special_channels &= ~RADIO_SPECIAL_SYNDIE
else if (channel == "CentCom")
- borg.radio.keyslot.independent = FALSE
+ borg.radio.keyslot.special_channels &= ~RADIO_SPECIAL_CENTCOM
message_admins("[key_name_admin(user)] removed the [channel] radio channel from [ADMIN_LOOKUPFLW(borg)].")
log_silicon("[key_name(user)] removed the [channel] radio channel from [key_name(borg)].")
else // We're adding a channel
@@ -169,9 +169,9 @@ ADMIN_VERB(borg_panel, R_ADMIN, "Show Borg Panel", ADMIN_VERB_NO_DESCRIPTION, AD
borg.radio.keyslot = new()
borg.radio.keyslot.channels[channel] = 1
if (channel == RADIO_CHANNEL_SYNDICATE)
- borg.radio.keyslot.syndie = TRUE
+ borg.radio.keyslot.special_channels |= RADIO_SPECIAL_SYNDIE
else if (channel == "CentCom")
- borg.radio.keyslot.independent = TRUE
+ borg.radio.keyslot.special_channels |= RADIO_SPECIAL_CENTCOM
message_admins("[key_name_admin(user)] added the [channel] radio channel to [ADMIN_LOOKUPFLW(borg)].")
log_silicon("[key_name(user)] added the [channel] radio channel to [key_name(borg)].")
borg.radio.recalculateChannels()
diff --git a/code/modules/admin/verbs/ert.dm b/code/modules/admin/verbs/ert.dm
index 2d1ba075a4795..441a5d0dd56fe 100644
--- a/code/modules/admin/verbs/ert.dm
+++ b/code/modules/admin/verbs/ert.dm
@@ -90,6 +90,7 @@
"random_names" = list("desc" = "Randomize names", "type" = "boolean", "value" = "[(ertemplate.random_names ? "Yes" : "No")]"),
"spawn_admin" = list("desc" = "Spawn yourself as briefing officer", "type" = "boolean", "value" = "[(ertemplate.spawn_admin ? "Yes" : "No")]"),
"use_custom_shuttle" = list("desc" = "Use the ERT's custom shuttle (if it has one)", "type" = "boolean", "value" = "[(ertemplate.use_custom_shuttle ? "Yes" : "No")]"),
+ "mob_type" = list("desc" = "Base Species", "callback" = CALLBACK(src, PROC_REF(makeERTTemplateModified)), "type" = "datum", "path" = "/mob/living/carbon/human", "subtypesonly" = TRUE, "value" = ertemplate.mob_type),
)
)
@@ -117,6 +118,7 @@
ertemplate.random_names = prefs["random_names"]["value"] == "Yes"
ertemplate.spawn_admin = prefs["spawn_admin"]["value"] == "Yes"
ertemplate.use_custom_shuttle = prefs["use_custom_shuttle"]["value"] == "Yes"
+ ertemplate.mob_type = prefs["mob_type"]["value"]
var/list/spawnpoints = GLOB.emergencyresponseteamspawn
var/index = 0
@@ -222,11 +224,15 @@
continue
//Spawn the body
- var/mob/living/carbon/human/ert_operative = new ertemplate.mobtype(spawnloc)
- chosen_candidate.client.prefs.safe_transfer_prefs_to(ert_operative, is_antag = TRUE)
+ var/mob/living/carbon/human/ert_operative
+ if(ertemplate.mob_type)
+ ert_operative = new ertemplate.mob_type(spawnloc)
+ else
+ ert_operative = new /mob/living/carbon/human(spawnloc)
+ chosen_candidate.client.prefs.safe_transfer_prefs_to(ert_operative, is_antag = TRUE)
ert_operative.key = chosen_candidate.key
- if(ertemplate.enforce_human || !(ert_operative.dna.species.changesource_flags & ERT_SPAWN)) // Don't want any exploding plasmemes
+ if(ertemplate.enforce_human || !(ert_operative.dna.species.changesource_flags & ERT_SPAWN))
ert_operative.set_species(/datum/species/human)
//Give antag datum
diff --git a/code/modules/admin/verbs/ghost_pool_protection.dm b/code/modules/admin/verbs/ghost_pool_protection.dm
index 439f4a37b897d..ed31d124a7de0 100644
--- a/code/modules/admin/verbs/ghost_pool_protection.dm
+++ b/code/modules/admin/verbs/ghost_pool_protection.dm
@@ -50,7 +50,7 @@ ADMIN_VERB(ghost_pool_protection, R_ADMIN, "Ghost Pool Protection", "Choose whic
data["minigames"] = (new_role_flags & GHOSTROLE_MINIGAME)
return data
-/datum/ghost_pool_menu/ui_act(action, params)
+/datum/ghost_pool_menu/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/admin/verbs/lua/lua_editor.dm b/code/modules/admin/verbs/lua/lua_editor.dm
index a28ae8b40f19b..93e8e50c1a6a4 100644
--- a/code/modules/admin/verbs/lua/lua_editor.dm
+++ b/code/modules/admin/verbs/lua/lua_editor.dm
@@ -129,14 +129,15 @@
last_error = result["message"]
message_admins("[key_name(usr)] executed [length(code)] bytes of lua code. [ADMIN_LUAVIEW_CHUNK(current_state, index_with_result)]")
-/datum/lua_editor/ui_act(action, list/params)
+/datum/lua_editor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
- if(!check_rights_for(usr.client, R_DEBUG))
+ var/mob/user = ui.user
+ if(!check_rights_for(user.client, R_DEBUG))
return
if(action == "runCodeFile")
- params["code"] = file2text(input(usr, "Input File") as null|file)
+ params["code"] = file2text(input(user, "Input File") as null|file)
if(isnull(params["code"]))
return
action = "runCode"
@@ -165,7 +166,7 @@
run_code(params["code"])
return TRUE
if("runFile")
- var/code_file = input(usr, "Select a script to run.", "Lua") as file|null
+ var/code_file = input(user, "Select a script to run.", "Lua") as file|null
if(!code_file)
return TRUE
var/code = file2text(code_file)
@@ -193,9 +194,9 @@
var/list/path = params["path"]
var/list/target_list = traverse_list(path, arguments)
if(target_list != arguments)
- usr?.client?.mod_list_add(target_list, null, "a lua editor", "arguments")
+ user?.client?.mod_list_add(target_list, null, "a lua editor", "arguments")
else
- var/list/vv_val = usr?.client?.vv_get_value(restricted_classes = list(VV_RESTORE_DEFAULT))
+ var/list/vv_val = user?.client?.vv_get_value(restricted_classes = list(VV_RESTORE_DEFAULT))
var/class = vv_val["class"]
if(!class)
return
@@ -214,7 +215,7 @@
var/list/variant_pair = current_variants[index]
var/key_variant = variant_pair["key"]
if(key_variant == "function" || key_variant == "thread" || key_variant == "userdata" || key_variant == "error_as_value")
- to_chat(usr, span_warning("invalid table key \[[key]] for function call (expected text, num, path, list, or ref, got [key_variant])"))
+ to_chat(user, span_warning("invalid table key \[[key]] for function call (expected text, num, path, list, or ref, got [key_variant])"))
return
function += key
if(islist(value))
@@ -222,7 +223,7 @@
current_variants = variant_pair["value"]
else
if(variant_pair["value"] != "function")
- to_chat(usr, span_warning("invalid value \[[value]] for function call (expected list or function)"))
+ to_chat(user, span_warning("invalid value \[[value]] for function call (expected list or function)"))
return
var/result = current_state.call_function(arglist(list(function) + arguments))
current_state.log_result(result)
@@ -247,14 +248,14 @@
if(isweakref(thing_to_debug))
var/datum/weakref/ref = thing_to_debug
thing_to_debug = ref.resolve()
- INVOKE_ASYNC(usr.client, TYPE_PROC_REF(/client, debug_variables), thing_to_debug)
+ INVOKE_ASYNC(user.client, TYPE_PROC_REF(/client, debug_variables), thing_to_debug)
return FALSE
if("vvGlobal")
var/thing_to_debug = traverse_list(params["indices"], current_state.globals["values"])
if(isweakref(thing_to_debug))
var/datum/weakref/ref = thing_to_debug
thing_to_debug = ref.resolve()
- INVOKE_ASYNC(usr.client, TYPE_PROC_REF(/client, debug_variables), thing_to_debug)
+ INVOKE_ASYNC(user.client, TYPE_PROC_REF(/client, debug_variables), thing_to_debug)
return FALSE
if("clearArgs")
arguments.Cut()
diff --git a/code/modules/admin/verbs/lua/lua_state.dm b/code/modules/admin/verbs/lua/lua_state.dm
index 577b0e365c2d8..30bc21c83b2be 100644
--- a/code/modules/admin/verbs/lua/lua_state.dm
+++ b/code/modules/admin/verbs/lua/lua_state.dm
@@ -41,7 +41,10 @@ GLOBAL_PROTECT(lua_state_stack)
return
display_name = _name
internal_id = DREAMLUAU_NEW_STATE()
- if(!isnum(internal_id))
+ if(isnull(internal_id))
+ stack_trace("dreamluau is not loaded")
+ qdel(src)
+ else if(!isnum(internal_id))
stack_trace(internal_id)
qdel(src)
diff --git a/code/modules/admin/verbs/machine_upgrade.dm b/code/modules/admin/verbs/machine_upgrade.dm
index 258de6bcf4dfd..7495b383d0e00 100644
--- a/code/modules/admin/verbs/machine_upgrade.dm
+++ b/code/modules/admin/verbs/machine_upgrade.dm
@@ -1,5 +1,5 @@
-ADMIN_VERB(machine_upgrade, R_DEBUG, "Tweak Component Ratings", ADMIN_VERB_NO_DESCRIPTION, ADMIN_CATEGORY_HIDDEN, obj/machinery/machine in world)
- var/new_rating = input(user, "Enter new rating:","Num") as num|null
+ADMIN_VERB_AND_CONTEXT_MENU(machine_upgrade, R_DEBUG, "Tweak Component Ratings", ADMIN_VERB_NO_DESCRIPTION, ADMIN_CATEGORY_HIDDEN, obj/machinery/machine in world)
+ var/new_rating = tgui_input_number(user, "", "Enter new rating:")
if(new_rating && machine.component_parts)
for(var/obj/item/stock_parts/P in machine.component_parts)
P.rating = new_rating
diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm
index 3717affc51c34..8504cd5262cab 100644
--- a/code/modules/admin/verbs/mapping.dm
+++ b/code/modules/admin/verbs/mapping.dm
@@ -337,7 +337,7 @@ ADMIN_VERB(check_for_obstructed_atmospherics, R_DEBUG, "Check For Obstructed Atm
var/list/results = list()
- results += "
Anything that is considered to aesthetically obstruct an atmospherics machine (vent, scrubber, port) is listed below. Please re-arrange to accomodate for this.
"
+ results += "
Anything that is considered to aesthetically obstruct an atmospherics machine (vent, scrubber, port) is listed below. Please re-arrange to accommodate for this.
"
// Ignore out stuff we see in normal and standard mapping that we don't care about (false alarms). Typically stuff that goes directionally off turfs or other undertile objects that we don't want to care about.
var/list/ignore_list = list(
diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm
index c4e4257e84fc7..b70465666f3d0 100644
--- a/code/modules/admin/verbs/playsound.dm
+++ b/code/modules/admin/verbs/playsound.dm
@@ -54,13 +54,13 @@ ADMIN_VERB(play_direct_mob_sound, R_SOUND, "Play Direct Mob Sound", "Play a soun
SEND_SOUND(target, sound)
BLACKBOX_LOG_ADMIN_VERB("Play Direct Mob Sound")
-///Takes an input from either proc/play_web_sound or the request manager and runs it through youtube-dl and prompts the user before playing it to the server.
+///Takes an input from either proc/play_web_sound or the request manager and runs it through yt-dlp and prompts the user before playing it to the server.
/proc/web_sound(mob/user, input, credit)
if(!check_rights(R_SOUND))
return
var/ytdl = CONFIG_GET(string/invoke_youtubedl)
if(!ytdl)
- to_chat(user, span_boldwarning("Youtube-dl was not configured, action unavailable"), confidential = TRUE) //Check config.txt for the INVOKE_YOUTUBEDL value
+ to_chat(user, span_boldwarning("yt-dlp was not configured, action unavailable"), confidential = TRUE) //Check config.txt for the INVOKE_YOUTUBEDL value
return
var/web_sound_url = ""
var/stop_web_sounds = FALSE
@@ -73,14 +73,14 @@ ADMIN_VERB(play_direct_mob_sound, R_SOUND, "Play Direct Mob Sound", "Play a soun
var/stdout = output[SHELLEO_STDOUT]
var/stderr = output[SHELLEO_STDERR]
if(errorlevel)
- to_chat(user, span_boldwarning("Youtube-dl URL retrieval FAILED:"), confidential = TRUE)
+ to_chat(user, span_boldwarning("yt-dlp URL retrieval FAILED:"), confidential = TRUE)
to_chat(user, span_warning("[stderr]"), confidential = TRUE)
return
var/list/data
try
data = json_decode(stdout)
catch(var/exception/e)
- to_chat(user, span_boldwarning("Youtube-dl JSON parsing FAILED:"), confidential = TRUE)
+ to_chat(user, span_boldwarning("yt-dlp JSON parsing FAILED:"), confidential = TRUE)
to_chat(user, span_warning("[e]: [stdout]"), confidential = TRUE)
return
if (data["url"])
diff --git a/code/modules/admin/verbs/secrets.dm b/code/modules/admin/verbs/secrets.dm
index d6f4c124d36c7..bcb89379ef40a 100644
--- a/code/modules/admin/verbs/secrets.dm
+++ b/code/modules/admin/verbs/secrets.dm
@@ -41,7 +41,7 @@ ADMIN_VERB(secrets, R_NONE, "Secrets", "Abuse harder than you ever have before w
#define THUNDERDOME_TEMPLATE_FILE "admin_thunderdome.dmm"
#define HIGHLANDER_DELAY_TEXT "40 seconds (crush the hope of a normal shift)"
-/datum/secrets_menu/ui_act(action, params)
+/datum/secrets_menu/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/admin/view_variables/debug_variable_appearance.dm b/code/modules/admin/view_variables/debug_variable_appearance.dm
index 9e92eba4605c3..6d87f6cc85d86 100644
--- a/code/modules/admin/view_variables/debug_variable_appearance.dm
+++ b/code/modules/admin/view_variables/debug_variable_appearance.dm
@@ -63,20 +63,6 @@ GLOBAL_DATUM_INIT(pluto, /atom/movable, new /atom/movable(null))
return FALSE
if(var_name == NAMEOF(src, realized_underlays))
return FALSE
- // Filtering out the stuff I know we don't care about
- if(var_name == NAMEOF(src, x))
- return FALSE
- if(var_name == NAMEOF(src, y))
- return FALSE
- if(var_name == NAMEOF(src, z))
- return FALSE
- // Could make an argument for these but I think they will just confuse people, so yeeet
-#ifndef SPACEMAN_DMM // Spaceman doesn't believe in contents on appearances, sorry lads
- if(var_name == NAMEOF(src, contents))
- return FALSE
-#endif
- if(var_name == NAMEOF(src, loc))
- return FALSE
if(var_name == NAMEOF(src, vis_contents))
return FALSE
return ..()
diff --git a/code/modules/admin/view_variables/debug_variables.dm b/code/modules/admin/view_variables/debug_variables.dm
index d9a1b90b0af29..835da1a0b39cb 100644
--- a/code/modules/admin/view_variables/debug_variables.dm
+++ b/code/modules/admin/view_variables/debug_variables.dm
@@ -29,7 +29,7 @@
return "[.][item]"
-// This is split into a seperate proc mostly to make errors that happen not break things too much
+// This is split into a separate proc mostly to make errors that happen not break things too much
/proc/_debug_variable_value(name, value, level, datum/owner, sanitize, display_flags)
if(isappearance(value))
value = get_vv_appearance(value)
@@ -64,11 +64,11 @@
var/datum/datum_value = value
return datum_value.debug_variable_value(name, level, owner, sanitize, display_flags)
- if(islist(value) || (name in GLOB.vv_special_lists)) // Some special lists arent detectable as a list through istype
+ if(islist(value) || (name in GLOB.vv_special_lists)) // Some special lists aren't detectable as a list through istype
var/list/list_value = value
var/list/items = list()
- // This is becuse some lists either dont count as lists or a locate on their ref will return null
+ // This is because some lists either don't count as lists or a locate on their ref will return null
var/link_vars = "Vars=[REF(value)]"
if(name in GLOB.vv_special_lists)
link_vars = "Vars=[REF(owner)];special_varname=[name]"
diff --git a/code/modules/admin/view_variables/filterrific.dm b/code/modules/admin/view_variables/filterrific.dm
index 0bd9f51c114f9..a997d52047743 100644
--- a/code/modules/admin/view_variables/filterrific.dm
+++ b/code/modules/admin/view_variables/filterrific.dm
@@ -24,7 +24,7 @@
data["target_filter_data"] = target.filter_data
return data
-/datum/filter_editor/ui_act(action, list/params)
+/datum/filter_editor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/admin/view_variables/nobody_wants_to_learn_matrix_math.dm b/code/modules/admin/view_variables/nobody_wants_to_learn_matrix_math.dm
index fa5fde1f20e18..8eb2f1c72f0fb 100644
--- a/code/modules/admin/view_variables/nobody_wants_to_learn_matrix_math.dm
+++ b/code/modules/admin/view_variables/nobody_wants_to_learn_matrix_math.dm
@@ -42,7 +42,7 @@
data["pixelated"] = target.appearance_flags & PIXEL_SCALE
return data
-/datum/nobody_wants_to_learn_matrix_math/ui_act(action, list/params)
+/datum/nobody_wants_to_learn_matrix_math/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
@@ -52,7 +52,7 @@
var/matrix_var_name = params["var_name"]
var/matrix_var_value = params["var_value"]
if(testing_matrix.vv_edit_var(matrix_var_name, matrix_var_value) == FALSE)
- to_chat(src, "Your edit was rejected by the object. This is a bug with the matrix tester, not your fault, so report it on github.", confidential = TRUE)
+ to_chat(src, "Your edit was rejected by the object. This is a bug with the matrix tester, not your fault, so report it on GitHub.", confidential = TRUE)
return
set_transform()
if("scale")
diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm
index d51885d51431f..fc8bfa0de8486 100644
--- a/code/modules/antagonists/_common/antag_datum.dm
+++ b/code/modules/antagonists/_common/antag_datum.dm
@@ -128,7 +128,7 @@ GLOBAL_LIST_EMPTY(antagonists)
ui = new(user, src, ui_name, name)
ui.open()
-/datum/antagonist/ui_act(action, params)
+/datum/antagonist/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
@@ -271,6 +271,9 @@ GLOBAL_LIST_EMPTY(antagonists)
if(count_against_dynamic_roll_chance && owner.current.stat != DEAD && owner.current.client)
owner.current.add_to_current_living_antags()
+ for (var/datum/atom_hud/alternate_appearance/basic/antag_hud as anything in GLOB.active_alternate_appearances)
+ antag_hud.apply_to_new_mob(owner.current)
+
SEND_SIGNAL(owner, COMSIG_ANTAGONIST_GAINED, src)
/**
@@ -328,13 +331,8 @@ GLOBAL_LIST_EMPTY(antagonists)
if(team)
team.remove_member(owner)
SEND_SIGNAL(owner, COMSIG_ANTAGONIST_REMOVED, src)
-
- // Remove HUDs that they should no longer see
- var/mob/living/current = owner.current
- for (var/datum/atom_hud/alternate_appearance/basic/has_antagonist/antag_hud as anything in GLOB.has_antagonist_huds)
- if (!antag_hud.mobShouldSee(current))
- antag_hud.hide_from(current)
-
+ if(owner.current)
+ SEND_SIGNAL(owner.current, COMSIG_MOB_ANTAGONIST_REMOVED, src)
qdel(src)
/**
@@ -530,8 +528,7 @@ GLOBAL_LIST_EMPTY(antagonists)
// Add HUDs that they couldn't see before
for (var/datum/atom_hud/alternate_appearance/basic/has_antagonist/antag_hud as anything in GLOB.has_antagonist_huds)
- if (antag_hud.mobShouldSee(owner.current))
- antag_hud.show_to(owner.current)
+ antag_hud.apply_to_new_mob(owner.current)
/// Takes a location, returns an image drawing "on" it that matches this antag datum's hud icon
/datum/antagonist/proc/hud_image_on(mob/hud_loc)
diff --git a/code/modules/antagonists/_common/antag_hud.dm b/code/modules/antagonists/_common/antag_hud.dm
index 863d52ef5ffe4..9933569f9a988 100644
--- a/code/modules/antagonists/_common/antag_hud.dm
+++ b/code/modules/antagonists/_common/antag_hud.dm
@@ -8,8 +8,9 @@ GLOBAL_LIST_EMPTY_TYPED(has_antagonist_huds, /datum/atom_hud/alternate_appearanc
var/datum/weakref/team_ref
/datum/atom_hud/alternate_appearance/basic/has_antagonist/New(key, image/I, antag_datum_type, datum/weakref/team)
- src.antag_datum_type = antag_datum_type
- team_ref = team
+ if(antag_datum_type)
+ src.antag_datum_type = antag_datum_type
+ src.team_ref = team
GLOB.has_antagonist_huds += src
return ..(key, I, NONE)
@@ -18,6 +19,8 @@ GLOBAL_LIST_EMPTY_TYPED(has_antagonist_huds, /datum/atom_hud/alternate_appearanc
return ..()
/datum/atom_hud/alternate_appearance/basic/has_antagonist/mobShouldSee(mob/M)
+ if(add_ghost_version && isobserver(M))
+ return FALSE // use the ghost version instead
var/datum/team/antag_team = team_ref?.resolve()
if(!isnull(antag_team))
return !!(M.mind in antag_team.members)
diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm
index bbc5c7a7b03ab..5f7a7e579d3ee 100644
--- a/code/modules/antagonists/_common/antag_spawner.dm
+++ b/code/modules/antagonists/_common/antag_spawner.dm
@@ -45,7 +45,7 @@
get_asset_datum(/datum/asset/simple/contracts),
)
-/obj/item/antag_spawner/contract/ui_act(action, list/params)
+/obj/item/antag_spawner/contract/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(used || polling || !ishuman(usr))
return
diff --git a/code/modules/antagonists/abductor/abductor.dm b/code/modules/antagonists/abductor/abductor.dm
index 68cf781db9b05..7fc0c565ab1df 100644
--- a/code/modules/antagonists/abductor/abductor.dm
+++ b/code/modules/antagonists/abductor/abductor.dm
@@ -74,12 +74,13 @@
owner.special_role = ROLE_ABDUCTOR
objectives += team.objectives
finalize_abductor()
- ADD_TRAIT(owner, TRAIT_ABDUCTOR_TRAINING, ABDUCTOR_ANTAGONIST)
+ // We don't want abductors to be converted by other antagonists
+ owner.add_traits(list(TRAIT_ABDUCTOR_TRAINING, TRAIT_UNCONVERTABLE), ABDUCTOR_ANTAGONIST)
return ..()
/datum/antagonist/abductor/on_removal()
owner.special_role = null
- REMOVE_TRAIT(owner, TRAIT_ABDUCTOR_TRAINING, ABDUCTOR_ANTAGONIST)
+ owner.remove_traits(list(TRAIT_ABDUCTOR_TRAINING, TRAIT_UNCONVERTABLE), ABDUCTOR_ANTAGONIST)
return ..()
/datum/antagonist/abductor/greet()
@@ -90,20 +91,20 @@
/datum/antagonist/abductor/proc/finalize_abductor()
//Equip
- var/mob/living/carbon/human/H = owner.current
- H.set_species(/datum/species/abductor)
- var/obj/item/organ/internal/tongue/abductor/T = H.get_organ_slot(ORGAN_SLOT_TONGUE)
- T.mothership = "[team.name]"
+ var/mob/living/carbon/human/new_abductor = owner.current
+ new_abductor.set_species(/datum/species/abductor)
+ var/obj/item/organ/internal/tongue/abductor/abductor_tongue = new_abductor.get_organ_slot(ORGAN_SLOT_TONGUE)
+ abductor_tongue.mothership = "[team.name]"
- H.real_name = "[team.name] [sub_role]"
- H.equipOutfit(outfit)
+ new_abductor.real_name = "[team.name] [sub_role]"
+ new_abductor.equipOutfit(outfit)
// We require that the template be loaded here, so call it in a blocking manner, if its already done loading, this won't block
SSmapping.lazy_load_template(LAZY_TEMPLATE_KEY_ABDUCTOR_SHIPS)
//Teleport to ship
for(var/obj/effect/landmark/abductor/LM in GLOB.landmarks_list)
if(istype(LM, landmark_type) && LM.team_number == team.team_number)
- H.forceMove(LM.loc)
+ new_abductor.forceMove(LM.loc)
break
/datum/antagonist/abductor/scientist/on_gain()
@@ -137,13 +138,13 @@
if(!ishuman(owner.current))
to_chat(admin, span_warning("This only works on humans!"))
return
- var/mob/living/carbon/human/H = owner.current
+ var/mob/living/carbon/human/new_abductor = owner.current
var/gear = tgui_alert(admin,"Agent or Scientist Gear", "Gear", list("Agent", "Scientist"))
if(gear)
if(gear == "Agent")
- H.equipOutfit(/datum/outfit/abductor/agent)
+ new_abductor.equipOutfit(/datum/outfit/abductor/agent)
else
- H.equipOutfit(/datum/outfit/abductor/scientist)
+ new_abductor.equipOutfit(/datum/outfit/abductor/scientist)
/datum/team/abductor_team
member_name = "\improper Abductor"
diff --git a/code/modules/antagonists/abductor/equipment/gear/abductor_clothing.dm b/code/modules/antagonists/abductor/equipment/gear/abductor_clothing.dm
index c54ce6937d86f..e5951473df087 100644
--- a/code/modules/antagonists/abductor/equipment/gear/abductor_clothing.dm
+++ b/code/modules/antagonists/abductor/equipment/gear/abductor_clothing.dm
@@ -103,6 +103,8 @@
/obj/item/clothing/suit/armor/abductor/vest/proc/return_disguise_name(mob/living/carbon/human/source, list/identity)
SIGNAL_HANDLER
+ if(identity[VISIBLE_NAME_FORCED]) // name-forcing overrides disguise
+ return
identity[VISIBLE_NAME_FACE] = disguise.name
identity[VISIBLE_NAME_ID] = ""
diff --git a/code/modules/antagonists/abductor/equipment/gear/abductor_items.dm b/code/modules/antagonists/abductor/equipment/gear/abductor_items.dm
index d3f162f5fb55a..25bbea665777c 100644
--- a/code/modules/antagonists/abductor/equipment/gear/abductor_items.dm
+++ b/code/modules/antagonists/abductor/equipment/gear/abductor_items.dm
@@ -384,7 +384,7 @@ Congratulations! You are now trained for invasive xenobiology research!"}
/obj/item/melee/baton/abductor/proc/SleepAttack(mob/living/target, mob/living/user)
playsound(src, on_stun_sound, 50, TRUE, -1)
- if(target.incapacitated(IGNORE_RESTRAINTS|IGNORE_GRAB))
+ if(INCAPACITATED_IGNORING(target, INCAPABLE_RESTRAINTS|INCAPABLE_GRAB))
if(target.can_block_magic(MAGIC_RESISTANCE_MIND))
to_chat(user, span_warning("The specimen has some kind of mental protection that is interfering with the sleep inducement! It seems you've been foiled."))
target.visible_message(span_danger("[user] tried to induced sleep in [target] with [src], but is unsuccessful!"), \
@@ -689,7 +689,7 @@ Congratulations! You are now trained for invasive xenobiology research!"}
/obj/item/abductor/alien_omnitool/proc/check_menu(mob/user)
if(!istype(user))
return FALSE
- if(user.incapacitated() || !user.Adjacent(src))
+ if(user.incapacitated || !user.Adjacent(src))
return FALSE
return TRUE
diff --git a/code/modules/antagonists/abductor/equipment/glands/mindshock.dm b/code/modules/antagonists/abductor/equipment/glands/mindshock.dm
index 87870947f17d6..1a3f140c3415d 100644
--- a/code/modules/antagonists/abductor/equipment/glands/mindshock.dm
+++ b/code/modules/antagonists/abductor/equipment/glands/mindshock.dm
@@ -15,7 +15,7 @@
for(var/mob/living/carbon/target in orange(4,owner_turf))
if(target == owner)
continue
- if(HAS_TRAIT(target, TRAIT_MINDSHIELD))
+ if(HAS_MIND_TRAIT(target, TRAIT_MINDSHIELD))
to_chat(target, span_notice("You hear a faint hum fill your ears, which quickly dies down."))
continue
@@ -41,7 +41,7 @@
if(target_human.stat)
continue
- if(HAS_TRAIT(target_human, TRAIT_MINDSHIELD))
+ if(HAS_MIND_TRAIT(target_human, TRAIT_UNCONVERTABLE))
to_chat(target_human, span_notice("You hear a low drone as something foreign attempts to enter your mind, but the noise fades after a few moments."))
continue
diff --git a/code/modules/antagonists/abductor/machinery/console.dm b/code/modules/antagonists/abductor/machinery/console.dm
index ee729de7068b8..3dcdaf5a5b07e 100644
--- a/code/modules/antagonists/abductor/machinery/console.dm
+++ b/code/modules/antagonists/abductor/machinery/console.dm
@@ -118,7 +118,7 @@
data["vest_lock"] = HAS_TRAIT_FROM(vest, TRAIT_NODROP, ABDUCTOR_VEST_TRAIT)
return data
-/obj/machinery/abductor/console/ui_act(action, list/params)
+/obj/machinery/abductor/console/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/antagonists/abductor/machinery/dispenser.dm b/code/modules/antagonists/abductor/machinery/dispenser.dm
index 8d8f9e14b8954..416153c50e58f 100644
--- a/code/modules/antagonists/abductor/machinery/dispenser.dm
+++ b/code/modules/antagonists/abductor/machinery/dispenser.dm
@@ -48,7 +48,7 @@
data["glands"] += list(gland_information)
return data
-/obj/machinery/abductor/gland_dispenser/ui_act(action, list/params)
+/obj/machinery/abductor/gland_dispenser/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/antagonists/abductor/machinery/experiment.dm b/code/modules/antagonists/abductor/machinery/experiment.dm
index a549171b66150..09790f4ba897e 100644
--- a/code/modules/antagonists/abductor/machinery/experiment.dm
+++ b/code/modules/antagonists/abductor/machinery/experiment.dm
@@ -86,7 +86,7 @@
data["occupant_status"] = mob_occupant.stat
return data
-/obj/machinery/abductor/experiment/ui_act(action, list/params)
+/obj/machinery/abductor/experiment/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/antagonists/blob/overmind.dm b/code/modules/antagonists/blob/overmind.dm
index 217a215e8753c..65d2acb8bb905 100644
--- a/code/modules/antagonists/blob/overmind.dm
+++ b/code/modules/antagonists/blob/overmind.dm
@@ -194,7 +194,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
if(isnull(guy_turf) || !is_station_level(guy_turf.z))
continue
- if(live_guy in GLOB.overminds || (live_guy.pass_flags & PASSBLOB))
+ if((live_guy in GLOB.overminds) || (live_guy.pass_flags & PASSBLOB))
continue
var/area/blob_area = get_area(guy_turf)
diff --git a/code/modules/antagonists/brother/brother.dm b/code/modules/antagonists/brother/brother.dm
index 5f4622bd910a4..4f535ece8cef0 100644
--- a/code/modules/antagonists/brother/brother.dm
+++ b/code/modules/antagonists/brother/brother.dm
@@ -94,7 +94,7 @@
flashed.balloon_alert(source, "[flashed.p_theyre()] loyal to someone else!")
return
- if (HAS_TRAIT(flashed, TRAIT_MINDSHIELD))
+ if (HAS_TRAIT(flashed, TRAIT_UNCONVERTABLE))
flashed.balloon_alert(source, "[flashed.p_they()] resist!")
return
@@ -221,6 +221,9 @@
return
. = ..()
member.remove_antag_datum(/datum/antagonist/brother)
+ if (!length(members))
+ qdel(src)
+ return
if (isnull(member.current))
return
for (var/datum/mind/brother_mind as anything in members)
diff --git a/code/modules/antagonists/changeling/cellular_emporium.dm b/code/modules/antagonists/changeling/cellular_emporium.dm
index 68e83ea25e668..754d2343d5cd5 100644
--- a/code/modules/antagonists/changeling/cellular_emporium.dm
+++ b/code/modules/antagonists/changeling/cellular_emporium.dm
@@ -69,7 +69,7 @@
return data
-/datum/cellular_emporium/ui_act(action, params)
+/datum/cellular_emporium/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/antagonists/changeling/powers/fakedeath.dm b/code/modules/antagonists/changeling/powers/fakedeath.dm
index 1dff58377fd4a..6f2781b20336c 100644
--- a/code/modules/antagonists/changeling/powers/fakedeath.dm
+++ b/code/modules/antagonists/changeling/powers/fakedeath.dm
@@ -123,7 +123,7 @@
return
var/datum/antagonist/changeling/ling = IS_CHANGELING(user)
- if(QDELETED(ling) || !(src in ling.innate_powers + ling.purchased_powers)) // checking both innate and purchased for full coverage
+ if(QDELETED(ling) || !(src in (ling.innate_powers + ling.purchased_powers))) // checking both innate and purchased for full coverage
return
if(!HAS_TRAIT_FROM(user, TRAIT_DEATHCOMA, CHANGELING_TRAIT))
return
diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm
index db261c29b5433..01d97f448cd60 100644
--- a/code/modules/antagonists/changeling/powers/mutations.dm
+++ b/code/modules/antagonists/changeling/powers/mutations.dm
@@ -498,6 +498,7 @@
lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi'
righthand_file = 'icons/mob/inhands/antag/changeling_righthand.dmi'
block_chance = 50
+ is_bashable = FALSE
var/remaining_uses //Set by the changeling ability.
diff --git a/code/modules/antagonists/changeling/powers/spiders.dm b/code/modules/antagonists/changeling/powers/spiders.dm
index ce23fc0eb1b57..e184815945b40 100644
--- a/code/modules/antagonists/changeling/powers/spiders.dm
+++ b/code/modules/antagonists/changeling/powers/spiders.dm
@@ -7,6 +7,14 @@
dna_cost = 1
req_absorbs = 3
+// Ensures that you cannot horrifically cheese the game by spawning spiders while in the vents
+/datum/action/changeling/spiders/can_be_used_by(mob/living/user)
+ if (!isopenturf(user.loc))
+ var/turf/user_turf = get_turf(user)
+ user_turf.balloon_alert(user, "not enough space!")
+ return FALSE
+ return ..()
+
//Makes a spider egg cluster. Allows you enable further general havok by introducing spiders to the station.
/datum/action/changeling/spiders/sting_action(mob/user)
..()
diff --git a/code/modules/antagonists/clown_ops/clown_weapons.dm b/code/modules/antagonists/clown_ops/clown_weapons.dm
index 1e566b7d1975e..bd2dfd4b0da01 100644
--- a/code/modules/antagonists/clown_ops/clown_weapons.dm
+++ b/code/modules/antagonists/clown_ops/clown_weapons.dm
@@ -17,6 +17,7 @@
desc = "advanced clown shoes that protect the wearer and render them nearly immune to slipping on their own peels. They also squeak at 100% capacity."
clothing_traits = list(TRAIT_NO_SLIP_WATER)
slowdown = SHOES_SLOWDOWN
+ body_parts_covered = FEET|LEGS
armor_type = /datum/armor/clown_shoes_combat
strip_delay = 70
resistance_flags = NONE
@@ -49,6 +50,7 @@
strip_delay = 70
resistance_flags = NONE
always_noslip = TRUE
+ body_parts_covered = FEET|LEGS
/datum/armor/banana_shoes_combat
melee = 25
diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm
index 39cd9b550ae45..4cfa39f3fa654 100644
--- a/code/modules/antagonists/cult/blood_magic.dm
+++ b/code/modules/antagonists/cult/blood_magic.dm
@@ -79,7 +79,7 @@
return
qdel(nullify_spell)
BS = possible_spells[entered_spell_name]
- if(QDELETED(src) || owner.incapacitated() || !BS || (rune && !(locate(/obj/effect/rune/empower) in range(1, owner))) || (length(spells) >= limit))
+ if(QDELETED(src) || owner.incapacitated || !BS || (rune && !(locate(/obj/effect/rune/empower) in range(1, owner))) || (length(spells) >= limit))
return
to_chat(owner,span_warning("You begin to carve unnatural symbols into your flesh!"))
SEND_SOUND(owner, sound('sound/weapons/slice.ogg',0,1,10))
@@ -137,7 +137,7 @@
..()
/datum/action/innate/cult/blood_spell/IsAvailable(feedback = FALSE)
- if(!IS_CULTIST(owner) || owner.incapacitated() || (!charges && deletes_on_empty))
+ if(!IS_CULTIST(owner) || owner.incapacitated || (!charges && deletes_on_empty))
return FALSE
return ..()
@@ -162,14 +162,14 @@
name = "Stun"
desc = "Empowers your hand to stun and mute a victim on contact. Gets weaker depending on how many have joined the Cult."
button_icon_state = "hand"
- magic_path = "/obj/item/melee/blood_magic/stun"
+ magic_path = /obj/item/melee/blood_magic/stun
health_cost = 10
/datum/action/innate/cult/blood_spell/teleport
name = "Teleport"
desc = "Empowers your hand to teleport yourself or another cultist to a teleport rune on contact."
button_icon_state = "tele"
- magic_path = "/obj/item/melee/blood_magic/teleport"
+ magic_path = /obj/item/melee/blood_magic/teleport
health_cost = 7
/datum/action/innate/cult/blood_spell/emp
@@ -194,20 +194,20 @@
desc = "Empowers your hand to start handcuffing victim on contact, and mute them if successful."
button_icon_state = "cuff"
charges = 4
- magic_path = "/obj/item/melee/blood_magic/shackles"
+ magic_path = /obj/item/melee/blood_magic/shackles
/datum/action/innate/cult/blood_spell/construction
name = "Twisted Construction"
desc = "Empowers your hand to corrupt certain metalic objects. Converts: Plasteel into runed metal 50 metal into a construct shell Living cyborgs into constructs after a delay Cyborg shells into construct shells Purified soulstones (and any shades inside) into cultist soulstones Airlocks into brittle runed airlocks after a delay (harm intent)"
button_icon_state = "transmute"
- magic_path = "/obj/item/melee/blood_magic/construction"
+ magic_path = /obj/item/melee/blood_magic/construction
health_cost = 12
/datum/action/innate/cult/blood_spell/equipment
name = "Summon Combat Equipment"
desc = "Empowers your hand to summon combat gear onto a cultist you touch, including cult armor, a cult bola, and a cult sword. Not recommended for use before the blood cult's presence has been revealed."
button_icon_state = "equip"
- magic_path = "/obj/item/melee/blood_magic/armor"
+ magic_path = /obj/item/melee/blood_magic/armor
/datum/action/innate/cult/blood_spell/dagger
name = "Summon Ritual Dagger"
@@ -263,7 +263,7 @@
SEND_SOUND(caller, sound('sound/effects/ghost.ogg', FALSE, TRUE, 50))
var/image/sparkle_image = image('icons/effects/cult.dmi', clicked_on, "bloodsparkles", ABOVE_MOB_LAYER)
- clicked_on.add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/cult, "cult_apoc", sparkle_image, NONE)
+ clicked_on.add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/has_antagonist/cult, "cult_apoc", sparkle_image, NONE)
addtimer(CALLBACK(clicked_on, TYPE_PROC_REF(/atom/, remove_alt_appearance), "cult_apoc", TRUE), 4 MINUTES, TIMER_OVERRIDE|TIMER_UNIQUE)
to_chat(caller, span_cult_bold("[clicked_on] has been cursed with living nightmares!"))
@@ -339,7 +339,7 @@
invocation = "Fel'th Dol Ab'orod!"
button_icon_state = "manip"
charges = 5
- magic_path = "/obj/item/melee/blood_magic/manipulator"
+ magic_path = /obj/item/melee/blood_magic/manipulator
deletes_on_empty = FALSE
// The "magic hand" items
@@ -433,13 +433,15 @@
/obj/item/melee/blood_magic/stun/cast_spell(mob/living/target, mob/living/carbon/user)
if(!istype(target) || IS_CULTIST(target))
return
- var/datum/antagonist/cult/cultist = IS_CULTIST(user)
- var/datum/team/cult/cult_team = cultist.get_team()
+ var/datum/antagonist/cult/cultist = GET_CULTIST(user)
+ var/datum/team/cult/cult_team = cultist?.get_team()
var/effect_coef = 1
- if(cult_team.cult_ascendent)
+ if(cult_team?.cult_ascendent)
effect_coef = 0.1
- else if(cult_team.cult_risen)
+ else if(cult_team?.cult_risen)
effect_coef = 0.4
+ if(IS_CULTIST(user) && isnull(GET_CULTIST(user)))
+ effect_coef = 0.2
user.visible_message(
span_warning("[user] holds up [user.p_their()] hand, which explodes in a flash of red light!"),
span_cult_italic("You attempt to stun [target] with the spell!"),
@@ -513,7 +515,7 @@
to_chat(user, span_warning("You must pick a valid rune!"))
return
var/obj/effect/rune/teleport/actual_selected_rune = potential_runes[input_rune_key] //what rune does that key correspond to?
- if(QDELETED(src) || !user || !user.is_holding(src) || user.incapacitated() || !actual_selected_rune)
+ if(QDELETED(src) || !user || !user.is_holding(src) || user.incapacitated || !actual_selected_rune)
return
var/turf/dest = get_turf(actual_selected_rune)
if(dest.is_blocked_turf(TRUE))
@@ -699,7 +701,7 @@
/obj/item/melee/blood_magic/construction/proc/check_menu(mob/user)
if(!istype(user))
CRASH("The cult construct selection radial menu was accessed by something other than a valid user.")
- if(user.incapacitated() || !user.Adjacent(src))
+ if(user.incapacitated || !user.Adjacent(src))
return FALSE
return TRUE
@@ -965,7 +967,7 @@
/obj/item/melee/blood_magic/manipulator/proc/check_menu(mob/living/user)
if(!istype(user))
CRASH("The Blood Rites manipulator radial menu was accessed by something other than a valid user.")
- if(user.incapacitated() || !user.Adjacent(src))
+ if(user.incapacitated || !user.Adjacent(src))
return FALSE
return TRUE
diff --git a/code/modules/antagonists/cult/cult_comms.dm b/code/modules/antagonists/cult/cult_comms.dm
index a4f3b291f74da..3d5677996502a 100644
--- a/code/modules/antagonists/cult/cult_comms.dm
+++ b/code/modules/antagonists/cult/cult_comms.dm
@@ -120,7 +120,7 @@
if(!team_member.current)
continue
team_member.current.update_mob_action_buttons()
- if(team_member.current.incapacitated())
+ if(team_member.current.incapacitated)
continue
SEND_SOUND(team_member.current, 'sound/hallucinations/im_here1.ogg')
to_chat(team_member.current, span_cult_large("Acolyte [nominee] has asserted that [nominee.p_theyre()] worthy of leading the cult. A vote will be called shortly."))
@@ -129,19 +129,19 @@
///Polls all Cultists on whether the person putting themselves forward should be made the Cult Leader, if they can actually be such.
/proc/poll_cultists_for_leader(mob/living/nominee, datum/team/cult/team)
- if(QDELETED(nominee) || nominee.incapacitated())
+ if(QDELETED(nominee) || nominee.incapacitated)
team.cult_vote_called = FALSE
for(var/datum/mind/team_member as anything in team.members)
if(!team_member.current)
continue
team_member.current.update_mob_action_buttons()
- if(team_member.current.incapacitated())
+ if(team_member.current.incapacitated)
continue
to_chat(team_member.current,span_cult_large("[nominee] has died in the process of attempting to start a vote!"))
return FALSE
var/list/mob/living/asked_cultists = list()
for(var/datum/mind/team_member as anything in team.members)
- if(!team_member.current || team_member.current == nominee || team_member.current.incapacitated())
+ if(!team_member.current || team_member.current == nominee || team_member.current.incapacitated)
continue
SEND_SOUND(team_member.current, 'sound/magic/exit_blood.ogg')
asked_cultists += team_member.current
@@ -161,13 +161,13 @@
chat_text_border_icon = mutable_appearance('icons/effects/effects.dmi', "cult_master_logo")
)
)
- if(QDELETED(nominee) || nominee.incapacitated())
+ if(QDELETED(nominee) || nominee.incapacitated)
team.cult_vote_called = FALSE
for(var/datum/mind/team_member as anything in team.members)
if(!team_member.current)
continue
team_member.current.update_mob_action_buttons()
- if(team_member.current.incapacitated())
+ if(team_member.current.incapacitated)
continue
to_chat(team_member.current,span_cult_large("[nominee] has died in the process of attempting to win the cult's support!"))
return FALSE
@@ -177,7 +177,7 @@
if(!team_member.current)
continue
team_member.current.update_mob_action_buttons()
- if(team_member.current.incapacitated())
+ if(team_member.current.incapacitated)
continue
to_chat(team_member.current,span_cult_large("[nominee] has gone catatonic in the process of attempting to win the cult's support!"))
return FALSE
@@ -187,7 +187,7 @@
if(!team_member.current)
continue
team_member.current.update_mob_action_buttons()
- if(team_member.current.incapacitated())
+ if(team_member.current.incapacitated)
continue
to_chat(team_member.current, span_cult_large("[nominee] could not win the cult's support and shall continue to serve as an acolyte."))
return FALSE
diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm
index 994f98ed099ea..1c715036d37b5 100644
--- a/code/modules/antagonists/cult/cult_items.dm
+++ b/code/modules/antagonists/cult/cult_items.dm
@@ -19,6 +19,7 @@
inhand_x_dimension = 32
inhand_y_dimension = 32
w_class = WEIGHT_CLASS_SMALL
+ slot_flags = ITEM_SLOT_BELT
force = 15
throwforce = 25
block_chance = 25
@@ -217,7 +218,7 @@ Striking a noncultist, however, will tear their flesh."}
// Get the heretic's new body and antag datum.
trapped_entity = trapped_mind?.current
trapped_entity.key = trapped_mind?.key
- var/datum/antagonist/heretic/heretic_holder = IS_HERETIC(trapped_entity)
+ var/datum/antagonist/heretic/heretic_holder = GET_HERETIC(trapped_entity)
if(!heretic_holder)
stack_trace("[soul_to_bind] in but not a heretic on the heretic soul blade.")
@@ -378,7 +379,7 @@ Striking a noncultist, however, will tear their flesh."}
worn_icon = 'icons/mob/clothing/suits/armor.dmi'
inhand_icon_state = "cultrobes"
body_parts_covered = CHEST|GROIN|LEGS|ARMS
- allowed = list(/obj/item/tome, /obj/item/melee/cultblade)
+ allowed = list(/obj/item/tome, /obj/item/melee/cultblade, /obj/item/melee/sickly_blade/cursed)
armor_type = /datum/armor/hooded_cultrobes
flags_inv = HIDEJUMPSUIT
cold_protection = CHEST|GROIN|LEGS|ARMS
@@ -595,7 +596,6 @@ Striking a noncultist, however, will tear their flesh."}
/obj/item/clothing/suit/hooded/cultrobes/berserker
name = "flagellant's robes"
desc = "Blood-soaked robes infused with dark magic; allows the user to move at inhuman speeds, but at the cost of increased damage. Provides an even greater speed boost if its hood is worn."
- allowed = list(/obj/item/tome, /obj/item/melee/cultblade)
armor_type = /datum/armor/cultrobes_berserker
slowdown = -0.3 //the hood gives an additional -0.3 if you have it flipped up, for a total of -0.6
hoodtype = /obj/item/clothing/head/hooded/cult_hoodie/berserkerhood
@@ -911,7 +911,7 @@ Striking a noncultist, however, will tear their flesh."}
cultists |= cult_mind.current
var/mob/living/cultist_to_receive = tgui_input_list(user, "Who do you wish to call to [src]?", "Followers of the Geometer", (cultists - user))
- if(QDELETED(src) || loc != user || user.incapacitated())
+ if(QDELETED(src) || loc != user || user.incapacitated)
return ITEM_INTERACT_BLOCKING
if(isnull(cultist_to_receive))
to_chat(user, span_cult_italic("You require a destination!"))
@@ -1223,6 +1223,7 @@ Striking a noncultist, however, will tear their flesh."}
attack_verb_simple = list("bump", "prod")
hitsound = 'sound/weapons/smash.ogg'
block_sound = 'sound/weapons/effects/ric5.ogg'
+ shield_bash_sound = 'sound/effects/glassknock.ogg'
var/illusions = 2
/obj/item/shield/mirror/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)
@@ -1278,7 +1279,6 @@ Striking a noncultist, however, will tear their flesh."}
return FALSE
/obj/item/shield/mirror/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
- var/turf/impact_turf = get_turf(hit_atom)
if(isliving(hit_atom))
var/mob/living/target = hit_atom
@@ -1291,14 +1291,9 @@ Striking a noncultist, however, will tear their flesh."}
return
if(!..())
target.Paralyze(30)
- var/mob/thrower = throwingdatum?.get_thrower()
- if(thrower)
- for(var/mob/living/Next in orange(2, impact_turf))
- if(!Next.density || IS_CULTIST(Next))
- continue
- throw_at(Next, 3, 1, thrower)
- return
- throw_at(thrower, 7, 1, null)
+ new /obj/effect/temp_visual/cult/sparks(target)
+ playsound(target, 'sound/effects/glassbr3.ogg', 100)
+ qdel(src)
else
..()
diff --git a/code/modules/antagonists/cult/cult_other.dm b/code/modules/antagonists/cult/cult_other.dm
index 9435baedba11a..f9e1462a30efe 100644
--- a/code/modules/antagonists/cult/cult_other.dm
+++ b/code/modules/antagonists/cult/cult_other.dm
@@ -25,8 +25,6 @@
return FALSE
#endif
- if(target.mind.unconvertable)
- return FALSE
if(ishuman(target) && target.mind.holy_role)
return FALSE
if(specific_cult?.is_sacrifice_target(target.mind))
@@ -36,6 +34,6 @@
return FALSE
if(IS_HERETIC_OR_MONSTER(target))
return FALSE
- if(HAS_TRAIT(target, TRAIT_MINDSHIELD) || issilicon(target) || isbot(target) || isdrone(target))
+ if(HAS_MIND_TRAIT(target, TRAIT_UNCONVERTABLE) || issilicon(target) || isbot(target) || isdrone(target))
return FALSE //can't convert machines, shielded, or braindead
return TRUE
diff --git a/code/modules/antagonists/cult/cult_structures.dm b/code/modules/antagonists/cult/cult_structures.dm
index 2cdb2c2e6f468..773f890d25dbb 100644
--- a/code/modules/antagonists/cult/cult_structures.dm
+++ b/code/modules/antagonists/cult/cult_structures.dm
@@ -201,7 +201,7 @@
* Returns TRUE if the user is a living mob that is a cultist and is not incapacitated.
*/
/obj/structure/destructible/cult/item_dispenser/proc/check_menu(mob/user)
- return isliving(user) && is_cultist_check(user) && !user.incapacitated()
+ return isliving(user) && is_cultist_check(user) && !user.incapacitated
// Spooky looking door used in gateways. Or something.
/obj/effect/gateway
diff --git a/code/modules/antagonists/cult/datums/cult_team.dm b/code/modules/antagonists/cult/datums/cult_team.dm
index 72c7df8bf5d14..4d77f65f588df 100644
--- a/code/modules/antagonists/cult/datums/cult_team.dm
+++ b/code/modules/antagonists/cult/datums/cult_team.dm
@@ -65,7 +65,7 @@
for(var/datum/mind/mind as anything in members)
if(mind.current)
SEND_SOUND(mind.current, 'sound/ambience/antag/bloodcult/bloodcult_halos.ogg')
- to_chat(mind.current, span_cult_large(span_warning("Your cult is ascendent and the red harvest approaches - you cannot hide your true nature for much longer!!")))
+ to_chat(mind.current, span_cult_large(span_warning("Your cult is ascendant and the red harvest approaches - you cannot hide your true nature for much longer!!")))
mind.current.AddElement(/datum/element/cult_halo)
cult_ascendent = TRUE
log_game("The blood cult has ascended with [cultplayers] players.")
@@ -134,6 +134,7 @@
return "
[parts.Join(" ")]
"
/datum/team/cult/proc/is_sacrifice_target(datum/mind/mind)
+
for(var/datum/objective/sacrifice/sac_objective in objectives)
if(mind == sac_objective.target)
return TRUE
diff --git a/code/modules/antagonists/cult/datums/cultist.dm b/code/modules/antagonists/cult/datums/cultist.dm
index f56d79a8f4b18..de415f59c7482 100644
--- a/code/modules/antagonists/cult/datums/cultist.dm
+++ b/code/modules/antagonists/cult/datums/cultist.dm
@@ -281,3 +281,4 @@
///Used to check if the owner is counted as a secondary invoker for runes.
/datum/antagonist/cult/proc/check_invoke_validity()
return TRUE
+
diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm
index d8ce241caf3c8..985f5da950193 100644
--- a/code/modules/antagonists/cult/runes.dm
+++ b/code/modules/antagonists/cult/runes.dm
@@ -200,16 +200,23 @@ structure_check() searches for nearby cultist structures required for the invoca
invocation = "Ra'sha yoka!"
invoke_damage = 30
can_be_scribed = FALSE
+ var/randomized = TRUE
/obj/effect/rune/malformed/Initialize(mapload, set_keyword)
. = ..()
+ if(!randomized)
+ return
icon_state = "[rand(1,7)]"
color = rgb(rand(0,255), rand(0,255), rand(0,255))
+
/obj/effect/rune/malformed/invoke(list/invokers)
..()
qdel(src)
+/obj/effect/rune/malformed/norandom
+ randomized = FALSE
+
//Rite of Offering: Converts or sacrifices a target.
/obj/effect/rune/convert
cultist_name = "Offer"
@@ -505,7 +512,7 @@ structure_check() searches for nearby cultist structures required for the invoca
fail_invoke()
return
var/obj/effect/rune/teleport/actual_selected_rune = potential_runes[input_rune_key] //what rune does that key correspond to?
- if(!Adjacent(user) || QDELETED(src) || user.incapacitated() || !actual_selected_rune)
+ if(!Adjacent(user) || QDELETED(src) || user.incapacitated || !actual_selected_rune)
fail_invoke()
return
@@ -774,7 +781,7 @@ GLOBAL_VAR_INIT(narsie_summon_count, 0)
/obj/effect/rune/raise_dead/proc/validness_checks(mob/living/target_mob, mob/living/user)
if(QDELETED(user))
return FALSE
- if(!Adjacent(user) || user.incapacitated())
+ if(!Adjacent(user) || user.incapacitated)
return FALSE
if(QDELETED(target_mob))
return FALSE
@@ -839,7 +846,7 @@ GLOBAL_VAR_INIT(narsie_summon_count, 0)
return
var/mob/living/cultist_to_summon = tgui_input_list(user, "Who do you wish to call to [src]?", "Followers of the Geometer", cultists)
var/fail_logmsg = "Summon Cultist rune activated by [user] at [COORD(src)] failed - "
- if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated())
+ if(!Adjacent(user) || !src || QDELETED(src) || user.incapacitated)
return
if(isnull(cultist_to_summon))
to_chat(user, "You require a summoning target!")
@@ -1160,8 +1167,8 @@ GLOBAL_VAR_INIT(narsie_summon_count, 0)
images += B
if(!IS_CULTIST(M))
if(M.client)
- var/image/C = image('icons/effects/cult.dmi',M,"bloodsparkles", ABOVE_MOB_LAYER)
- add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/cult, "cult_apoc", C, NONE)
+ var/image/C = image('icons/effects/cult.dmi', M, "bloodsparkles", ABOVE_MOB_LAYER)
+ add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/has_antagonist/cult, "cult_apoc", C, NONE)
addtimer(CALLBACK(M, TYPE_PROC_REF(/atom/, remove_alt_appearance),"cult_apoc",TRUE), duration)
images += C
else
diff --git a/code/modules/antagonists/ert/ert.dm b/code/modules/antagonists/ert/ert.dm
index 5d266227a1053..4b94666abc367 100644
--- a/code/modules/antagonists/ert/ert.dm
+++ b/code/modules/antagonists/ert/ert.dm
@@ -238,6 +238,10 @@
H.open_internals(H.get_item_for_held_index(2))
H.equipOutfit(outfit)
+ if(isplasmaman(H))
+ var/obj/item/mod/control/our_modsuit = locate() in H.get_equipped_items()
+ if(our_modsuit)
+ our_modsuit.install(new /obj/item/mod/module/plasma_stabilizer)
/datum/antagonist/ert/greet()
if(!ert_team)
@@ -285,3 +289,13 @@
name = "Frontier Militia General"
outfit = /datum/outfit/centcom/militia/general
role = "General"
+
+/datum/antagonist/ert/medical_commander
+ role = "Chief EMT"
+ outfit = /datum/outfit/centcom/ert/medical_commander
+ plasmaman_outfit = /datum/outfit/plasmaman/medical_commander
+
+/datum/antagonist/ert/medical_technician
+ role = "Emergency Medical Technician"
+ outfit = /datum/outfit/centcom/ert/medical_technician
+ plasmaman_outfit = /datum/outfit/plasmaman/medical_technician
diff --git a/code/modules/antagonists/heretic/heretic_antag.dm b/code/modules/antagonists/heretic/heretic_antag.dm
index 67a12b3555188..82a0f8ca6228f 100644
--- a/code/modules/antagonists/heretic/heretic_antag.dm
+++ b/code/modules/antagonists/heretic/heretic_antag.dm
@@ -218,7 +218,7 @@
return data
-/datum/antagonist/heretic/ui_act(action, params)
+/datum/antagonist/heretic/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
@@ -313,7 +313,6 @@
RegisterSignal(our_mob, COMSIG_LIVING_CULT_SACRIFICED, PROC_REF(on_cult_sacrificed))
RegisterSignals(our_mob, list(COMSIG_MOB_BEFORE_SPELL_CAST, COMSIG_MOB_SPELL_ACTIVATED), PROC_REF(on_spell_cast))
RegisterSignal(our_mob, COMSIG_USER_ITEM_INTERACTION, PROC_REF(on_item_use))
- RegisterSignal(our_mob, COMSIG_MOB_LOGIN, PROC_REF(fix_influence_network))
RegisterSignal(our_mob, COMSIG_LIVING_POST_FULLY_HEAL, PROC_REF(after_fully_healed))
/datum/antagonist/heretic/remove_innate_effects(mob/living/mob_override)
@@ -329,7 +328,6 @@
COMSIG_MOB_BEFORE_SPELL_CAST,
COMSIG_MOB_SPELL_ACTIVATED,
COMSIG_USER_ITEM_INTERACTION,
- COMSIG_MOB_LOGIN,
COMSIG_LIVING_POST_FULLY_HEAL,
COMSIG_LIVING_CULT_SACRIFICED,
))
@@ -457,18 +455,6 @@
var/obj/item/offhand = user.get_inactive_held_item()
return !QDELETED(offhand) && istype(offhand, /obj/item/melee/touch_attack/mansus_fist)
-/*
- * Signal proc for [COMSIG_MOB_LOGIN].
- *
- * Calls rework_network() on our reality smash tracker
- * whenever a login / client change happens, to ensure
- * influence client visibility is fixed.
- */
-/datum/antagonist/heretic/proc/fix_influence_network(mob/source)
- SIGNAL_HANDLER
-
- GLOB.reality_smash_track.rework_network()
-
/// Signal proc for [COMSIG_LIVING_POST_FULLY_HEAL],
/// Gives the heretic aliving heart on aheal or organ refresh
/datum/antagonist/heretic/proc/after_fully_healed(mob/living/source, heal_flags)
@@ -656,7 +642,7 @@
/datum/antagonist/heretic/proc/passive_influence_gain()
knowledge_points++
if(owner.current.stat <= SOFT_CRIT)
- to_chat(owner.current, "[span_hear("You hear a whisper...")] [span_hypnophrase(pick(strings(HERETIC_INFLUENCE_FILE, "drain_message")))]")
+ to_chat(owner.current, "[span_hear("You hear a whisper...")] [span_hypnophrase(pick_list(HERETIC_INFLUENCE_FILE, "drain_message"))]")
addtimer(CALLBACK(src, PROC_REF(passive_influence_gain)), passive_gain_timer)
/datum/antagonist/heretic/roundend_report()
diff --git a/code/modules/antagonists/heretic/heretic_knowledge.dm b/code/modules/antagonists/heretic/heretic_knowledge.dm
index 6cab092280000..94ecc0f9d77f1 100644
--- a/code/modules/antagonists/heretic/heretic_knowledge.dm
+++ b/code/modules/antagonists/heretic/heretic_knowledge.dm
@@ -540,7 +540,7 @@
var/mob/living/mob_to_summon
/datum/heretic_knowledge/summon/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc)
- summon_ritual_mob(user, loc, mob_to_summon)
+ return summon_ritual_mob(user, loc, mob_to_summon)
/**
* Creates the ritual mob and grabs a ghost for it
@@ -676,13 +676,12 @@
return !was_completed
/datum/heretic_knowledge/knowledge_ritual/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc)
- var/datum/antagonist/heretic/our_heretic = IS_HERETIC(user)
+ var/datum/antagonist/heretic/our_heretic = GET_HERETIC(user)
our_heretic.knowledge_points += KNOWLEDGE_RITUAL_POINTS
was_completed = TRUE
- var/drain_message = pick(strings(HERETIC_INFLUENCE_FILE, "drain_message"))
to_chat(user, span_boldnotice("[name] completed!"))
- to_chat(user, span_hypnophrase(span_big("[drain_message]")))
+ to_chat(user, span_hypnophrase(span_big("[pick_list(HERETIC_INFLUENCE_FILE, "drain_message")]")))
desc += " (Completed!)"
log_heretic_knowledge("[key_name(user)] completed a [name] at [worldtime2text()].")
user.add_mob_memory(/datum/memory/heretic_knowledge_ritual)
@@ -723,7 +722,7 @@
return TRUE
/datum/heretic_knowledge/ultimate/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc)
- var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user)
+ var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user)
if(!can_be_invoked(heretic_datum))
return FALSE
@@ -744,7 +743,7 @@
return (sacrifice.stat == DEAD) && !ismonkey(sacrifice)
/datum/heretic_knowledge/ultimate/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc)
- var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user)
+ var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user)
heretic_datum.ascended = TRUE
// Show the cool red gradiant in our UI
diff --git a/code/modules/antagonists/heretic/heretic_living_heart.dm b/code/modules/antagonists/heretic/heretic_living_heart.dm
index b616d300097e9..3e8f39fef4f94 100644
--- a/code/modules/antagonists/heretic/heretic_living_heart.dm
+++ b/code/modules/antagonists/heretic/heretic_living_heart.dm
@@ -104,7 +104,7 @@
return ..()
/datum/action/cooldown/track_target/Activate(atom/target)
- var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(owner)
+ var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(owner)
var/datum/heretic_knowledge/sac_knowledge = heretic_datum.get_knowledge(/datum/heretic_knowledge/hunt_and_sacrifice)
if(!LAZYLEN(heretic_datum.sac_targets))
owner.balloon_alert(owner, "no targets, visit a rune!")
diff --git a/code/modules/antagonists/heretic/influences.dm b/code/modules/antagonists/heretic/influences.dm
index 631bf04dcefc6..abba2c3f1007e 100644
--- a/code/modules/antagonists/heretic/influences.dm
+++ b/code/modules/antagonists/heretic/influences.dm
@@ -29,36 +29,6 @@
tracked_heretics.Cut()
return ..()
-/**
- * Automatically fixes the target and smash network
- *
- * Fixes any bugs that are caused by late Generate() or exchanging clients
- */
-/datum/reality_smash_tracker/proc/rework_network()
- SIGNAL_HANDLER
-
- for(var/mind in tracked_heretics)
- if(isnull(mind))
- stack_trace("A null somehow landed in the [type] list of minds. How?")
- tracked_heretics -= mind
- continue
-
- add_to_smashes(mind)
-
-/**
- * Allow [to_add] to see all tracked reality smashes.
- */
-/datum/reality_smash_tracker/proc/add_to_smashes(datum/mind/to_add)
- for(var/obj/effect/heretic_influence/reality_smash as anything in smashes)
- reality_smash.add_mind(to_add)
-
-/**
- * Stop [to_remove] from seeing any tracked reality smashes.
- */
-/datum/reality_smash_tracker/proc/remove_from_smashes(datum/mind/to_remove)
- for(var/obj/effect/heretic_influence/reality_smash as anything in smashes)
- reality_smash.remove_mind(to_remove)
-
/**
* Generates a set amount of reality smashes
* based on the number of already existing smashes
@@ -83,8 +53,6 @@
new /obj/effect/heretic_influence(chosen_location)
- rework_network()
-
/**
* Adds a mind to the list of people that can see the reality smashes
*
@@ -97,9 +65,6 @@
if(ishuman(heretic.current) && !is_centcom_level(heretic.current.z))
generate_new_influences()
- add_to_smashes(heretic)
-
-
/**
* Removes a mind from the list of people that can see the reality smashes
*
@@ -108,8 +73,6 @@
/datum/reality_smash_tracker/proc/remove_tracked_mind(datum/mind/heretic)
tracked_heretics -= heretic
- remove_from_smashes(heretic)
-
/obj/effect/visible_heretic_influence
name = "pierced reality"
icon = 'icons/effects/eldritch.dmi'
@@ -201,46 +164,23 @@
var/being_drained = FALSE
/// The icon state applied to the image created for this influence.
var/real_icon_state = "reality_smash"
- /// A list of all minds that can see us.
- var/list/datum/mind/minds = list()
- /// The image shown to heretics
- var/image/heretic_image
- /// We hold the turf we're on so we can remove and add the 'no prints' flag.
- var/turf/on_turf
/obj/effect/heretic_influence/Initialize(mapload)
. = ..()
GLOB.reality_smash_track.smashes += src
- heretic_image = image(icon, src, real_icon_state, OBJ_LAYER)
generate_name()
- on_turf = get_turf(src)
- if(!istype(on_turf))
- return
- on_turf.interaction_flags_atom |= INTERACT_ATOM_NO_FINGERPRINT_ATTACK_HAND
- RegisterSignal(on_turf, COMSIG_TURF_CHANGE, PROC_REF(replace_our_turf))
+ var/image/heretic_image = image(icon, src, real_icon_state, OBJ_LAYER)
+ add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/has_antagonist/heretic, "reality_smash", heretic_image)
+
+ AddElement(/datum/element/block_turf_fingerprints)
AddComponent(/datum/component/redirect_attack_hand_from_turf, interact_check = CALLBACK(src, PROC_REF(verify_user_can_see)))
/obj/effect/heretic_influence/proc/verify_user_can_see(mob/user)
- return (user?.mind in minds)
-
-/obj/effect/heretic_influence/proc/replace_our_turf(datum/source, path, new_baseturfs, flags, post_change_callbacks)
- SIGNAL_HANDLER
- post_change_callbacks += CALLBACK(src, PROC_REF(replace_our_turf_two))
- on_turf = null //hard del ref?
-
-/obj/effect/heretic_influence/proc/replace_our_turf_two(turf/new_turf)
- new_turf.interaction_flags_atom |= INTERACT_ATOM_NO_FINGERPRINT_ATTACK_HAND
- on_turf = new_turf
+ return (user.mind in GLOB.reality_smash_track.tracked_heretics)
/obj/effect/heretic_influence/Destroy()
GLOB.reality_smash_track.smashes -= src
- for(var/datum/mind/heretic in minds)
- remove_mind(heretic)
-
- heretic_image = null
- on_turf?.interaction_flags_atom &= ~INTERACT_ATOM_NO_FINGERPRINT_ATTACK_HAND
- on_turf = null
return ..()
/obj/effect/heretic_influence/attack_hand_secondary(mob/user, list/modifiers)
@@ -290,49 +230,35 @@
// We don't need to set being_drained back since we delete after anyways
loc.balloon_alert(user, "influence drained")
- var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user)
+ var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user)
heretic_datum.knowledge_points += knowledge_to_gain
// Aaand now we delete it
after_drain(user)
-/*
+/**
* Handle the effects of the drain.
*/
/obj/effect/heretic_influence/proc/after_drain(mob/living/user)
if(user)
- to_chat(user, span_hypnophrase(pick(strings(HERETIC_INFLUENCE_FILE, "drain_message"))))
+ to_chat(user, span_hypnophrase(pick_list(HERETIC_INFLUENCE_FILE, "drain_message")))
to_chat(user, span_warning("[src] begins to fade into reality!"))
var/obj/effect/visible_heretic_influence/illusion = new /obj/effect/visible_heretic_influence(drop_location())
- illusion.name = "\improper" + pick(strings(HERETIC_INFLUENCE_FILE, "drained")) + " " + format_text(name)
+ illusion.name = "\improper" + pick_list(HERETIC_INFLUENCE_FILE, "drained") + " " + format_text(name)
GLOB.reality_smash_track.num_drained++
qdel(src)
-/*
- * Add a mind to the list of tracked minds,
- * making another person able to see us.
- */
-/obj/effect/heretic_influence/proc/add_mind(datum/mind/heretic)
- minds |= heretic
- heretic.current?.client?.images |= heretic_image
-
-/*
- * Remove a mind present in our list
- * from being able to see us.
- */
-/obj/effect/heretic_influence/proc/remove_mind(datum/mind/heretic)
- if(!(heretic in minds))
- CRASH("[type] - remove_mind called with a mind not present in the minds list!")
-
- minds -= heretic
- heretic.current?.client?.images -= heretic_image
-
-/*
+/**
* Generates a random name for the influence.
*/
/obj/effect/heretic_influence/proc/generate_name()
- name = "\improper" + pick(strings(HERETIC_INFLUENCE_FILE, "prefix")) + " " + pick(strings(HERETIC_INFLUENCE_FILE, "postfix"))
+ name = "\improper" + pick_list(HERETIC_INFLUENCE_FILE, "prefix") + " " + pick_list(HERETIC_INFLUENCE_FILE, "postfix")
#undef NUM_INFLUENCES_PER_HERETIC
+
+/// Hud used for heretics to see influences
+/datum/atom_hud/alternate_appearance/basic/has_antagonist/heretic
+ antag_datum_type = /datum/antagonist/heretic
+ add_ghost_version = TRUE
diff --git a/code/modules/antagonists/heretic/items/forbidden_book.dm b/code/modules/antagonists/heretic/items/forbidden_book.dm
index 38f42b58c5e82..2591a1fd752a9 100644
--- a/code/modules/antagonists/heretic/items/forbidden_book.dm
+++ b/code/modules/antagonists/heretic/items/forbidden_book.dm
@@ -47,7 +47,7 @@
update_weight_class(WEIGHT_CLASS_NORMAL)
/obj/item/codex_cicatrix/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
- var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user)
+ var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user)
if(!heretic_datum)
return NONE
if(isopenturf(interacting_with))
diff --git a/code/modules/antagonists/heretic/items/heretic_blades.dm b/code/modules/antagonists/heretic/items/heretic_blades.dm
index ddfec8db20cf7..4d2636fa19e8c 100644
--- a/code/modules/antagonists/heretic/items/heretic_blades.dm
+++ b/code/modules/antagonists/heretic/items/heretic_blades.dm
@@ -10,6 +10,7 @@
inhand_x_dimension = 64
inhand_y_dimension = 64
obj_flags = CONDUCTS_ELECTRICITY
+ slot_flags = ITEM_SLOT_BELT
sharpness = SHARP_EDGED
w_class = WEIGHT_CLASS_NORMAL
force = 20
@@ -229,7 +230,7 @@
/obj/item/melee/sickly_blade/cursed/interact_with_atom(atom/target, mob/living/user, list/modifiers)
. = ..()
- var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user)
+ var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user)
if(!heretic_datum)
return NONE
diff --git a/code/modules/antagonists/heretic/knowledge/blade_lore.dm b/code/modules/antagonists/heretic/knowledge/blade_lore.dm
index de79151739f4b..55db187ee73ba 100644
--- a/code/modules/antagonists/heretic/knowledge/blade_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/blade_lore.dm
@@ -147,7 +147,7 @@
if(!riposte_ready)
return
- if(source.incapacitated(IGNORE_GRAB))
+ if(INCAPACITATED_IGNORING(source, INCAPABLE_GRAB))
return
var/mob/living/attacker = hitby.loc
diff --git a/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm b/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm
index a3e7576132036..dfc8aa39bef29 100644
--- a/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/cosmic_lore.dm
@@ -70,7 +70,7 @@
/datum/heretic_knowledge/spell/cosmic_runes
name = "Cosmic Runes"
- desc = "Grants you Cosmic Runes, a spell that creates two runes linked with eachother for easy teleportation. \
+ desc = "Grants you Cosmic Runes, a spell that creates two runes linked with each other for easy teleportation. \
Only the entity activating the rune will get transported, and it can be used by anyone without a star mark. \
However, people with a star mark will get transported along with another person using the rune."
gain_text = "The distant stars crept into my dreams, roaring and screaming without reason. \
diff --git a/code/modules/antagonists/heretic/knowledge/flesh_lore.dm b/code/modules/antagonists/heretic/knowledge/flesh_lore.dm
index a1786189d99c0..6f5b51d4eba4e 100644
--- a/code/modules/antagonists/heretic/knowledge/flesh_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/flesh_lore.dm
@@ -337,7 +337,7 @@
worm_spell.Grant(user)
- var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user)
+ var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user)
var/datum/heretic_knowledge/limited_amount/flesh_grasp/grasp_ghoul = heretic_datum.get_knowledge(/datum/heretic_knowledge/limited_amount/flesh_grasp)
grasp_ghoul.limit *= 3
var/datum/heretic_knowledge/limited_amount/flesh_ghoul/ritual_ghoul = heretic_datum.get_knowledge(/datum/heretic_knowledge/limited_amount/flesh_ghoul)
diff --git a/code/modules/antagonists/heretic/knowledge/general_side.dm b/code/modules/antagonists/heretic/knowledge/general_side.dm
index 27f0e11b4467b..10ff108c5f8fa 100644
--- a/code/modules/antagonists/heretic/knowledge/general_side.dm
+++ b/code/modules/antagonists/heretic/knowledge/general_side.dm
@@ -18,7 +18,7 @@
/datum/heretic_knowledge/reroll_targets/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc)
- var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user)
+ var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user)
// Check first if they have a Living Heart. If it's missing, we should
// throw a fail to show the heretic that there's no point in rerolling
// if you don't have a heart to track the targets in the first place.
@@ -29,7 +29,7 @@
return TRUE
/datum/heretic_knowledge/reroll_targets/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc)
- var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user)
+ var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user)
for(var/mob/living/carbon/human/target as anything in heretic_datum.sac_targets)
heretic_datum.remove_sacrifice_target(target)
diff --git a/code/modules/antagonists/heretic/knowledge/lock_lore.dm b/code/modules/antagonists/heretic/knowledge/lock_lore.dm
index 17e73cb162c17..72eacf607de55 100644
--- a/code/modules/antagonists/heretic/knowledge/lock_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/lock_lore.dm
@@ -136,7 +136,7 @@
/datum/heretic_knowledge/limited_amount/concierge_rite // item that creates 3 max at a time heretic only barriers, probably should limit to 1 only, holy people can also pass
name = "Concierge's Rite"
- desc = "Allows you to transmute a white crayon, a wooden plank, and a multitool to create a Labyrinth Handbook. \
+ desc = "Allows you to transmute a stick of chalk, a wooden plank, and a multitool to create a Labyrinth Handbook. \
It can materialize a barricade at range that only you and people resistant to magic can pass. 3 uses."
gain_text = "The Concierge scribbled my name into the Handbook. \"Welcome to your new home, fellow Steward.\""
required_atoms = list(
@@ -248,7 +248,7 @@
var/datum/action/cooldown/spell/shapeshift/eldritch/ascension/transform_spell = new(user.mind)
transform_spell.Grant(user)
- var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user)
+ var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user)
var/datum/heretic_knowledge/blade_upgrade/flesh/lock/blade_upgrade = heretic_datum.get_knowledge(/datum/heretic_knowledge/blade_upgrade/flesh/lock)
blade_upgrade.chance += 30
new /obj/structure/lock_tear(loc, user.mind)
diff --git a/code/modules/antagonists/heretic/knowledge/moon_lore.dm b/code/modules/antagonists/heretic/knowledge/moon_lore.dm
index 917944d30fe95..3c6b4e2109b69 100644
--- a/code/modules/antagonists/heretic/knowledge/moon_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/moon_lore.dm
@@ -234,7 +234,7 @@
to_chat(crewmate, span_boldwarning("[user]'s rise is influencing those who are weak willed. Their minds shall rend." ))
continue
// Mindshielded and anti-magic folks are immune against this effect because this is a magical mind effect
- if(HAS_TRAIT(crewmate, TRAIT_MINDSHIELD) || crewmate.can_block_magic(MAGIC_RESISTANCE))
+ if(HAS_MIND_TRAIT(crewmate, TRAIT_UNCONVERTABLE) || crewmate.can_block_magic(MAGIC_RESISTANCE))
to_chat(crewmate, span_boldwarning("You feel shielded from something." ))
continue
if(amount_of_lunatics > length(GLOB.human_list) * 0.2)
diff --git a/code/modules/antagonists/heretic/knowledge/rust_lore.dm b/code/modules/antagonists/heretic/knowledge/rust_lore.dm
index 3a081c8d295fb..8c5a4587928dd 100644
--- a/code/modules/antagonists/heretic/knowledge/rust_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/rust_lore.dm
@@ -198,7 +198,7 @@
/datum/heretic_knowledge/spell/entropic_plume/on_gain(mob/user)
. = ..()
- var/datum/antagonist/heretic/our_heretic = IS_HERETIC(user)
+ var/datum/antagonist/heretic/our_heretic = GET_HERETIC(user)
our_heretic.increase_rust_strength(TRUE)
/datum/heretic_knowledge/ultimate/rust_final
diff --git a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm
index 3020c0b2530c0..4b3525c93b044 100644
--- a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm
+++ b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm
@@ -66,7 +66,7 @@
CRASH("Failed to lazy load heretic sacrifice template!")
/datum/heretic_knowledge/hunt_and_sacrifice/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc)
- var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user)
+ var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user)
// First we have to check if the heretic has a Living Heart.
// You may wonder why we don't straight up prevent them from invoking the ritual if they don't have one -
// Hunt and sacrifice should always be invokable for clarity's sake, even if it'll fail immediately.
@@ -75,7 +75,7 @@
return FALSE
// We've got no targets set, let's try to set some.
- // If we recently failed to aquire targets, we will be unable to aquire any.
+ // If we recently failed to acquire targets, we will be unable to acquire any.
if(!LAZYLEN(heretic_datum.sac_targets))
atoms += user
return TRUE
@@ -99,7 +99,7 @@
return FALSE
/datum/heretic_knowledge/hunt_and_sacrifice/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc)
- var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user)
+ var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user)
// Force it to work if the sacrifice is a cultist, even if there's no targets.
var/mob/living/carbon/human/sac = selected_atoms[1]
if(!LAZYLEN(heretic_datum.sac_targets) && !IS_CULTIST(sac))
@@ -189,11 +189,11 @@
* Arguments
* * user - the mob doing the sacrifice (a heretic)
* * selected_atoms - a list of all atoms chosen. Should be (at least) one human.
- * * loc - the turf the sacrifice is occuring on
+ * * loc - the turf the sacrifice is occurring on
*/
/datum/heretic_knowledge/hunt_and_sacrifice/proc/sacrifice_process(mob/living/user, list/selected_atoms, turf/loc)
- var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user)
+ var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user)
var/mob/living/carbon/human/sacrifice = locate() in selected_atoms
if(!sacrifice)
CRASH("[type] sacrifice_process didn't have a human in the atoms list. How'd it make it so far?")
@@ -207,7 +207,7 @@
var/feedback = "Your patrons accept your offer"
var/sac_job_flag = sacrifice.mind?.assigned_role?.job_flags | sacrifice.last_mind?.assigned_role?.job_flags
- var/datum/antagonist/cult/cultist_datum = IS_CULTIST(sacrifice)
+ var/datum/antagonist/cult/cultist_datum = GET_CULTIST(sacrifice)
// Heads give 3 points, cultists give 1 point (and a special reward), normal sacrifices give 2 points.
heretic_datum.total_sacrifices++
if((sac_job_flag & JOB_HEAD_OF_STAFF))
@@ -260,7 +260,7 @@
sacrifice.dust(TRUE, TRUE)
// Increase reward counter
- var/datum/antagonist/heretic/antag = IS_HERETIC(user)
+ var/datum/antagonist/heretic/antag = GET_HERETIC(user)
antag.rewards_given++
// Cool effect for the rune as well as the item
@@ -282,7 +282,7 @@
// Remove the outline, we don't need it anymore.
rune?.remove_filter("reward_outline")
playsound(loc, 'sound/magic/repulse.ogg', 75, TRUE)
- var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user)
+ var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user)
ASSERT(heretic_datum)
// This list will be almost identical to unlocked_heretic_items, with the same keys, the difference being the values will be 1 to 5.
var/list/rewards = heretic_datum.unlocked_heretic_items.Copy()
@@ -403,6 +403,8 @@
to_chat(sac_target, span_big(span_hypnophrase("Unnatural forces begin to claw at your every being from beyond the veil.")))
+ playsound(sac_target, 'sound/ambience/antag/heretic/heretic_sacrifice.ogg', 50, FALSE) // play theme
+
sac_target.apply_status_effect(/datum/status_effect/unholy_determination, SACRIFICE_REALM_DURATION)
addtimer(CALLBACK(src, PROC_REF(after_target_wakes), sac_target), SACRIFICE_SLEEP_DURATION * 0.5) // Begin the minigame
diff --git a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_map.dm b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_map.dm
index 2952eb1daed8c..5055d2d9628ce 100644
--- a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_map.dm
+++ b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_map.dm
@@ -91,8 +91,7 @@ GLOBAL_LIST_EMPTY(heretic_sacrifice_landmarks)
/area/centcom/heretic_sacrifice/Initialize(mapload)
if(!ambientsounds)
- ambientsounds = GLOB.ambience_assoc[ambience_index]
- ambientsounds += 'sound/ambience/ambiatm1.ogg'
+ ambientsounds = GLOB.ambience_assoc[ambience_index] + 'sound/ambience/ambiatm1.ogg'
return ..()
/area/centcom/heretic_sacrifice/ash //also, the default
diff --git a/code/modules/antagonists/heretic/knowledge/side_ash_moon.dm b/code/modules/antagonists/heretic/knowledge/side_ash_moon.dm
index 758ee0548d5fc..3ed3f110a802a 100644
--- a/code/modules/antagonists/heretic/knowledge/side_ash_moon.dm
+++ b/code/modules/antagonists/heretic/knowledge/side_ash_moon.dm
@@ -82,12 +82,3 @@
route = PATH_SIDE
poll_ignore_define = POLL_IGNORE_ASH_SPIRIT
depth = 10
-
-/datum/heretic_knowledge/summon/ashy/cleanup_atoms(list/selected_atoms)
- var/obj/item/bodypart/head/ritual_head = locate() in selected_atoms
- if(!ritual_head)
- CRASH("[type] required a head bodypart, yet did not have one in selected_atoms when it reached cleanup_atoms.")
-
- // Spill out any brains or stuff before we delete it.
- ritual_head.drop_organs()
- return ..()
diff --git a/code/modules/antagonists/heretic/knowledge/side_rust_cosmos.dm b/code/modules/antagonists/heretic/knowledge/side_rust_cosmos.dm
index 11918c66a2906..0a4f7fbe86a1c 100644
--- a/code/modules/antagonists/heretic/knowledge/side_rust_cosmos.dm
+++ b/code/modules/antagonists/heretic/knowledge/side_rust_cosmos.dm
@@ -86,7 +86,7 @@
/datum/heretic_knowledge/summon/rusty
name = "Rusted Ritual"
- desc = "Allows you to transmute a pool of vomit, some cable coil, and 5 sheets of titanium into a Rust Walker. \
+ desc = "Allows you to transmute a pool of vomit, some cable coil, and 10 sheets of iron into a Rust Walker. \
Rust Walkers excel at spreading rust and are moderately strong in combat."
gain_text = "I combined my knowledge of creation with my desire for corruption. The Marshal knew my name, and the Rusted Hills echoed out."
next_knowledge = list(
@@ -95,7 +95,7 @@
)
required_atoms = list(
/obj/effect/decal/cleanable/vomit = 1,
- /obj/item/stack/sheet/mineral/titanium = 5,
+ /obj/item/stack/sheet/iron = 10,
/obj/item/stack/cable_coil = 15,
)
mob_to_summon = /mob/living/basic/heretic_summon/rust_walker
@@ -104,11 +104,3 @@
poll_ignore_define = POLL_IGNORE_RUST_SPIRIT
depth = 8
-/datum/heretic_knowledge/summon/rusty/cleanup_atoms(list/selected_atoms)
- var/obj/item/bodypart/head/ritual_head = locate() in selected_atoms
- if(!ritual_head)
- CRASH("[type] required a head bodypart, yet did not have one in selected_atoms when it reached cleanup_atoms.")
-
- // Spill out any brains or stuff before we delete it.
- ritual_head.drop_organs()
- return ..()
diff --git a/code/modules/antagonists/heretic/knowledge/starting_lore.dm b/code/modules/antagonists/heretic/knowledge/starting_lore.dm
index 4e5e2910e0ef9..ad48bb8fee331 100644
--- a/code/modules/antagonists/heretic/knowledge/starting_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/starting_lore.dm
@@ -107,7 +107,7 @@ GLOBAL_LIST_INIT(heretic_start_knowledge, initialize_starting_knowledge())
return TRUE
/datum/heretic_knowledge/living_heart/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc)
- var/datum/antagonist/heretic/our_heretic = IS_HERETIC(user)
+ var/datum/antagonist/heretic/our_heretic = GET_HERETIC(user)
var/obj/item/organ/our_living_heart = user.get_organ_slot(our_heretic.living_heart_organ_slot)
// Obviously you need a heart in your chest to do a ritual on your... heart
if(!our_living_heart)
@@ -145,7 +145,7 @@ GLOBAL_LIST_INIT(heretic_start_knowledge, initialize_starting_knowledge())
return FALSE
/datum/heretic_knowledge/living_heart/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc)
- var/datum/antagonist/heretic/our_heretic = IS_HERETIC(user)
+ var/datum/antagonist/heretic/our_heretic = GET_HERETIC(user)
var/obj/item/organ/our_new_heart = user.get_organ_slot(our_heretic.living_heart_organ_slot)
// Our heart is robotic or synthetic - we need to replace it, and we fortunately should have one by here
@@ -271,7 +271,7 @@ GLOBAL_LIST_INIT(heretic_start_knowledge, initialize_starting_knowledge())
/datum/heretic_knowledge/codex_cicatrix/cleanup_atoms(list/selected_atoms)
var/mob/living/body = locate() in selected_atoms
if(!body)
- return
+ return ..()
// A golem or an android doesn't have skin!
var/exterior_text = "skin"
// If carbon, it's the limb. If not, it's the body.
@@ -309,20 +309,26 @@ GLOBAL_LIST_INIT(heretic_start_knowledge, initialize_starting_knowledge())
required_atoms = list()
research_tree_icon_path = 'icons/mob/actions/actions_animal.dmi'
research_tree_icon_state = "god_transmit"
+ /// amount of research points granted
+ var/reward = 5
/datum/heretic_knowledge/feast_of_owls/can_be_invoked(datum/antagonist/heretic/invoker)
return !invoker.feast_of_owls
/datum/heretic_knowledge/feast_of_owls/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc)
- //amount of research points granted
- var/reward = 5
var/alert = tgui_alert(user,"Do you really want to forsake your ascension? This action cannot be reverted.", "Feast of Owls", list("Yes I'm sure", "No"), 30 SECONDS)
- if( alert != "Yes I'm sure")
+ if(alert != "Yes I'm sure" || QDELETED(user) || QDELETED(src) || get_dist(user, loc) > 2)
return FALSE
- user.set_temp_blindness(reward SECONDS)
- user.AdjustParalyzed(reward SECONDS)
+ var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user)
+ if(QDELETED(heretic_datum) || heretic_datum.feast_of_owls)
+ return FALSE
+
+ . = TRUE
+
+ heretic_datum.feast_of_owls = TRUE
+ user.set_temp_blindness(reward * 1 SECONDS)
+ user.AdjustParalyzed(reward * 1 SECONDS)
user.playsound_local(get_turf(user), 'sound/ambience/antag/heretic/heretic_gain_intense.ogg', 100, FALSE, pressure_affected = FALSE, use_reverb = FALSE)
- var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user)
for(var/i in 1 to reward)
user.emote("scream")
playsound(loc, 'sound/items/eatfood.ogg', 100, TRUE)
@@ -330,7 +336,10 @@ GLOBAL_LIST_INIT(heretic_start_knowledge, initialize_starting_knowledge())
to_chat(user, span_danger("You feel something invisible tearing away at your very essence!"))
user.do_jitter_animation()
sleep(1 SECONDS)
- heretic_datum.feast_of_owls = TRUE
+ if(QDELETED(user) || QDELETED(heretic_datum))
+ return FALSE
+
to_chat(user, span_danger(span_big("Your ambition is ravaged, but something powerful remains in its wake...")))
- var/drain_message = pick(strings(HERETIC_INFLUENCE_FILE, "drain_message"))
+ var/drain_message = pick_list(HERETIC_INFLUENCE_FILE, "drain_message")
to_chat(user, span_hypnophrase(span_big("[drain_message]")))
+ return .
diff --git a/code/modules/antagonists/heretic/magic/ash_ascension.dm b/code/modules/antagonists/heretic/magic/ash_ascension.dm
index 8b564198a61eb..2be30ea5b0c49 100644
--- a/code/modules/antagonists/heretic/magic/ash_ascension.dm
+++ b/code/modules/antagonists/heretic/magic/ash_ascension.dm
@@ -151,7 +151,7 @@
if(L.can_block_magic())
L.visible_message(span_danger("The spell bounces off of [L]!"), span_danger("The spell bounces off of you!"))
continue
- if(L in hit_list || L == source)
+ if((L in hit_list) || L == source)
continue
hit_list += L
L.adjustFireLoss(20)
diff --git a/code/modules/antagonists/heretic/magic/space_crawl.dm b/code/modules/antagonists/heretic/magic/space_crawl.dm
index 90f74a37047f3..49b9ae96f3088 100644
--- a/code/modules/antagonists/heretic/magic/space_crawl.dm
+++ b/code/modules/antagonists/heretic/magic/space_crawl.dm
@@ -83,7 +83,6 @@
jaunter.put_in_hands(right_hand)
RegisterSignal(jaunter, SIGNAL_REMOVETRAIT(TRAIT_ALLOW_HERETIC_CASTING), PROC_REF(on_focus_lost))
- RegisterSignal(jaunter, COMSIG_MOB_STATCHANGE, PROC_REF(on_stat_change))
playsound(our_turf, 'sound/magic/cosmic_energy.ogg', 50, TRUE, -1)
our_turf.visible_message(span_warning("[jaunter] sinks into [our_turf]!"))
new /obj/effect/temp_visual/space_explosion(our_turf)
@@ -107,7 +106,7 @@
/datum/action/cooldown/spell/jaunt/space_crawl/on_jaunt_exited(obj/effect/dummy/phased_mob/jaunt, mob/living/unjaunter)
UnregisterSignal(jaunt, COMSIG_MOVABLE_MOVED)
- UnregisterSignal(unjaunter, list(SIGNAL_REMOVETRAIT(TRAIT_ALLOW_HERETIC_CASTING), COMSIG_MOB_STATCHANGE))
+ UnregisterSignal(unjaunter, list(SIGNAL_REMOVETRAIT(TRAIT_ALLOW_HERETIC_CASTING)))
playsound(get_turf(unjaunter), 'sound/magic/cosmic_energy.ogg', 50, TRUE, -1)
new /obj/effect/temp_visual/space_explosion(get_turf(unjaunter))
if(iscarbon(unjaunter))
@@ -122,13 +121,6 @@
var/turf/our_turf = get_turf(source)
try_exit_jaunt(our_turf, source, TRUE)
-/// Signal proc for [COMSIG_MOB_STATCHANGE], to throw us out of the jaunt if we lose consciousness.
-/datum/action/cooldown/spell/jaunt/space_crawl/proc/on_stat_change(mob/living/source, new_stat, old_stat)
- SIGNAL_HANDLER
- if(new_stat != CONSCIOUS)
- var/turf/our_turf = get_turf(source)
- try_exit_jaunt(our_turf, source, TRUE)
-
/// Spacecrawl "hands", prevent the user from holding items in spacecrawl
/obj/item/space_crawl
name = "space crawl"
diff --git a/code/modules/antagonists/heretic/status_effects/buffs.dm b/code/modules/antagonists/heretic/status_effects/buffs.dm
index c72e6bfdef113..1668ea5a11ef7 100644
--- a/code/modules/antagonists/heretic/status_effects/buffs.dm
+++ b/code/modules/antagonists/heretic/status_effects/buffs.dm
@@ -232,6 +232,7 @@
blade_orbit_radius = 20,
time_between_initial_blades = 0.25 SECONDS,
blade_recharge_time = 1 MINUTES,
+ blade_type = /obj/effect/floating_blade,
)
src.blade_recharge_time = blade_recharge_time
diff --git a/code/modules/antagonists/heretic/status_effects/mark_effects.dm b/code/modules/antagonists/heretic/status_effects/mark_effects.dm
index b234fb604c241..b647ba6ca8077 100644
--- a/code/modules/antagonists/heretic/status_effects/mark_effects.dm
+++ b/code/modules/antagonists/heretic/status_effects/mark_effects.dm
@@ -50,7 +50,7 @@
playsound(owner, 'sound/magic/repulse.ogg', 75, TRUE)
qdel(src) //what happens when this is procced.
-//Each mark has diffrent effects when it is destroyed that combine with the mansus grasp effect.
+//Each mark has different effects when it is destroyed that combine with the mansus grasp effect.
// MARK OF FLESH
@@ -284,5 +284,5 @@
. = ..()
UnregisterSignal (owner, COMSIG_MOB_APPLY_DAMAGE)
- // Incase the trait was not removed earlier
+ // In case the trait was not removed earlier
REMOVE_TRAIT(owner, TRAIT_PACIFISM, id)
diff --git a/code/modules/antagonists/heretic/structures/lock_final.dm b/code/modules/antagonists/heretic/structures/lock_final.dm
index 759bc8aa55e39..5512d6027ee5a 100644
--- a/code/modules/antagonists/heretic/structures/lock_final.dm
+++ b/code/modules/antagonists/heretic/structures/lock_final.dm
@@ -1,6 +1,6 @@
/obj/structure/lock_tear
name = "???"
- desc = "It stares back. Theres no reason to remain. Run."
+ desc = "It stares back. There's no reason to remain. Run."
max_integrity = INFINITE
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
icon = 'icons/obj/anomaly.dmi'
diff --git a/code/modules/antagonists/heretic/transmutation_rune.dm b/code/modules/antagonists/heretic/transmutation_rune.dm
index 5e6ad0fb1cf7f..3f7072201590f 100644
--- a/code/modules/antagonists/heretic/transmutation_rune.dm
+++ b/code/modules/antagonists/heretic/transmutation_rune.dm
@@ -50,7 +50,7 @@
/obj/effect/heretic_rune/proc/try_rituals(mob/living/user)
is_in_use = TRUE
- var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user)
+ var/datum/antagonist/heretic/heretic_datum = GET_HERETIC(user)
var/list/rituals = heretic_datum.get_rituals()
if(!length(rituals))
loc.balloon_alert(user, "no rituals available!")
diff --git a/code/modules/antagonists/malf_ai/malf_ai.dm b/code/modules/antagonists/malf_ai/malf_ai.dm
index 358b618df99aa..4dc2568fe0e89 100644
--- a/code/modules/antagonists/malf_ai/malf_ai.dm
+++ b/code/modules/antagonists/malf_ai/malf_ai.dm
@@ -207,7 +207,7 @@
return data
-/datum/antagonist/malf_ai/ui_act(action, list/params)
+/datum/antagonist/malf_ai/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/antagonists/malf_ai/malf_ai_module_picker.dm b/code/modules/antagonists/malf_ai/malf_ai_module_picker.dm
index 0ac27c14c97bf..5e95e11c41bca 100644
--- a/code/modules/antagonists/malf_ai/malf_ai_module_picker.dm
+++ b/code/modules/antagonists/malf_ai/malf_ai_module_picker.dm
@@ -62,7 +62,7 @@
return data
-/datum/module_picker/ui_act(action, list/params)
+/datum/module_picker/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/antagonists/malf_ai/malf_ai_modules.dm b/code/modules/antagonists/malf_ai/malf_ai_modules.dm
index 57e6ec444196e..90f3b76649230 100644
--- a/code/modules/antagonists/malf_ai/malf_ai_modules.dm
+++ b/code/modules/antagonists/malf_ai/malf_ai_modules.dm
@@ -446,7 +446,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module))
desc = "[desc] It has [uses] use\s remaining."
/datum/action/innate/ai/ranged/override_machine/do_ability(mob/living/caller, atom/clicked_on)
- if(caller.incapacitated())
+ if(caller.incapacitated)
unset_ranged_ability(caller)
return FALSE
if(!ismachinery(clicked_on))
@@ -539,7 +539,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module))
qdel(to_explode)
/datum/action/innate/ai/ranged/overload_machine/do_ability(mob/living/caller, atom/clicked_on)
- if(caller.incapacitated())
+ if(caller.incapacitated)
unset_ranged_ability(caller)
return FALSE
if(!ismachinery(clicked_on))
@@ -679,7 +679,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module))
C.images -= I
/mob/living/silicon/ai/proc/can_place_transformer(datum/action/innate/ai/place_transformer/action)
- if(!eyeobj || !isturf(loc) || incapacitated() || !action)
+ if(!eyeobj || !isturf(loc) || incapacitated || !action)
return
var/turf/middle = get_turf(eyeobj)
var/list/turfs = list(middle, locate(middle.x - 1, middle.y, middle.z), locate(middle.x + 1, middle.y, middle.z))
@@ -995,7 +995,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module))
data["selected"] = say_span || owner.speech_span
return data
-/obj/machinery/ai_voicechanger/ui_act(action, params)
+/obj/machinery/ai_voicechanger/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
if(..())
return
switch(action)
@@ -1096,7 +1096,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module))
var/mob/living/silicon/ai/ai_caller = caller
- if(ai_caller.incapacitated())
+ if(ai_caller.incapacitated)
unset_ranged_ability(caller)
return FALSE
@@ -1186,7 +1186,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module))
return FALSE
var/mob/living/silicon/ai/ai_caller = caller
- if (ai_caller.incapacitated() || !isturf(ai_caller.loc))
+ if (ai_caller.incapacitated || !isturf(ai_caller.loc))
return FALSE
var/turf/target = get_turf(clicked_on)
@@ -1214,7 +1214,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module))
COOLDOWN_START(src, time_til_next_tilt, roll_over_cooldown)
/datum/action/innate/ai/ranged/core_tilt/proc/do_roll_over(mob/living/silicon/ai/ai_caller, picked_dir)
- if (ai_caller.incapacitated() || !isturf(ai_caller.loc)) // prevents bugs where the ai is carded and rolls
+ if (ai_caller.incapacitated || !isturf(ai_caller.loc)) // prevents bugs where the ai is carded and rolls
return
var/turf/target = get_step(ai_caller, picked_dir) // in case we moved we pass the dir not the target turf
@@ -1228,7 +1228,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module))
/// Used in our radial menu, state-checking proc after the radial menu sleeps
/datum/action/innate/ai/ranged/core_tilt/proc/radial_check(mob/living/silicon/ai/caller)
- if (QDELETED(caller) || caller.incapacitated() || caller.stat == DEAD)
+ if (QDELETED(caller) || caller.incapacitated || caller.stat == DEAD)
return FALSE
if (uses <= 0)
@@ -1275,7 +1275,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module))
return FALSE
var/mob/living/silicon/ai/ai_caller = caller
- if(ai_caller.incapacitated())
+ if(ai_caller.incapacitated)
unset_ranged_ability(caller)
return FALSE
@@ -1331,7 +1331,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module))
/// Used in our radial menu, state-checking proc after the radial menu sleeps
/datum/action/innate/ai/ranged/remote_vendor_tilt/proc/radial_check(mob/living/silicon/ai/caller, obj/machinery/vending/clicked_vendor)
- if (QDELETED(caller) || caller.incapacitated() || caller.stat == DEAD)
+ if (QDELETED(caller) || caller.incapacitated || caller.stat == DEAD)
return FALSE
if (QDELETED(clicked_vendor))
diff --git a/code/modules/antagonists/nukeop/equipment/nuclear_bomb/_nuclear_bomb.dm b/code/modules/antagonists/nukeop/equipment/nuclear_bomb/_nuclear_bomb.dm
index 8d2e746f0a220..fb23cae705fab 100644
--- a/code/modules/antagonists/nukeop/equipment/nuclear_bomb/_nuclear_bomb.dm
+++ b/code/modules/antagonists/nukeop/equipment/nuclear_bomb/_nuclear_bomb.dm
@@ -328,7 +328,7 @@ GLOBAL_VAR(station_nuke_source)
return data
-/obj/machinery/nuclearbomb/ui_act(action, params)
+/obj/machinery/nuclearbomb/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/antagonists/pirate/pirate_outfits.dm b/code/modules/antagonists/pirate/pirate_outfits.dm
index 72318fe4987ca..14729908e65be 100644
--- a/code/modules/antagonists/pirate/pirate_outfits.dm
+++ b/code/modules/antagonists/pirate/pirate_outfits.dm
@@ -55,6 +55,8 @@
head = /obj/item/clothing/head/helmet/space/pirate
+ id_trim = /datum/id_trim/pirate/captain
+
/datum/outfit/pirate/silverscale
name = "Silver Scale Member"
@@ -151,6 +153,8 @@
suit = /obj/item/clothing/suit/jacket/oversized
head = /obj/item/clothing/head/costume/crown
+ id_trim = /datum/id_trim/pirate/captain
+
/datum/outfit/pirate/medieval
name = "Medieval Warmonger"
@@ -181,3 +185,6 @@
belt = /obj/item/gun/magic/hook
l_pocket = /obj/item/tank/internals/emergency_oxygen
r_pocket = /obj/item/flashlight/lantern
+
+
+ skillchips = list(/obj/item/skillchip/big_pointer) //they don't have an id, so this is needed
diff --git a/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm b/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm
index c2c8d872cf38c..602fcbe8b071f 100644
--- a/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm
+++ b/code/modules/antagonists/pirate/pirate_shuttle_equipment.dm
@@ -264,7 +264,7 @@
data["status_report"] = status_report
return data
-/obj/machinery/computer/piratepad_control/ui_act(action, params)
+/obj/machinery/computer/piratepad_control/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/antagonists/revolution/revolution.dm b/code/modules/antagonists/revolution/revolution.dm
index fa07215cf6715..d490944e1e310 100644
--- a/code/modules/antagonists/revolution/revolution.dm
+++ b/code/modules/antagonists/revolution/revolution.dm
@@ -15,9 +15,7 @@
/datum/antagonist/rev/can_be_owned(datum/mind/new_owner)
if(new_owner.assigned_role.job_flags & JOB_HEAD_OF_STAFF)
return FALSE
- if(new_owner.unconvertable)
- return FALSE
- if(new_owner.current && HAS_TRAIT(new_owner.current, TRAIT_MINDSHIELD))
+ if(new_owner.current && HAS_MIND_TRAIT(new_owner.current, TRAIT_UNCONVERTABLE))
return FALSE
return ..()
@@ -316,7 +314,7 @@
owner.current.visible_message(span_deconversion_message("[owner.current] looks like [owner.current.p_theyve()] just remembered [owner.current.p_their()] real allegiance!"), null, null, null, owner.current)
to_chat(owner, "You are no longer a brainwashed revolutionary! Your memory is hazy from the time you were a rebel...the only thing you remember is the name of the one who brainwashed you....")
else if(issilicon(owner.current))
- owner.current.visible_message(span_deconversion_message("The frame beeps contentedly, purging the hostile memory engram from the MMI before initalizing it."), null, null, null, owner.current)
+ owner.current.visible_message(span_deconversion_message("The frame beeps contentedly, purging the hostile memory engram from the MMI before initializing it."), null, null, null, owner.current)
to_chat(owner, span_userdanger("The frame's firmware detects and deletes your neural reprogramming! You remember nothing but the name of the one who flashed you."))
/datum/antagonist/rev/head/farewell()
@@ -329,7 +327,7 @@
else
to_chat(owner, "The sweet release of death. You are no longer a Head Revolutionary.")
else if(issilicon(owner.current))
- owner.current.visible_message(span_deconversion_message("The frame beeps contentedly, suppressing the disloyal personality traits from the MMI before initalizing it."), null, null, null, owner.current)
+ owner.current.visible_message(span_deconversion_message("The frame beeps contentedly, suppressing the disloyal personality traits from the MMI before initializing it."), null, null, null, owner.current)
to_chat(owner, span_userdanger("The frame's firmware detects and suppresses your unwanted personality traits! You feel more content with the leadership around these parts."))
/// Handles rev removal via IC methods such as borging, mindshielding, blunt force trauma to the head or revs losing.
@@ -433,7 +431,7 @@
var/list/datum/mind/promotable = list()
var/list/datum/mind/monkey_promotable = list()
for(var/datum/mind/khrushchev in non_heads)
- if(khrushchev.current && !khrushchev.current.incapacitated() && !HAS_TRAIT(khrushchev.current, TRAIT_RESTRAINED) && khrushchev.current.client)
+ if(khrushchev.current && !khrushchev.current.incapacitated && !HAS_TRAIT(khrushchev.current, TRAIT_RESTRAINED) && khrushchev.current.client)
if((ROLE_REV_HEAD in khrushchev.current.client.prefs.be_special) || (ROLE_PROVOCATEUR in khrushchev.current.client.prefs.be_special))
if(!ismonkey(khrushchev.current))
promotable += khrushchev
diff --git a/code/modules/antagonists/space_dragon/space_dragon.dm b/code/modules/antagonists/space_dragon/space_dragon.dm
index 17650faf93758..0d982dc492d4e 100644
--- a/code/modules/antagonists/space_dragon/space_dragon.dm
+++ b/code/modules/antagonists/space_dragon/space_dragon.dm
@@ -173,7 +173,7 @@
* Triggers when Space Dragon completes his objective.
* Calls the shuttle with a coefficient of 3, making it impossible to recall.
* Sets all of his rifts to allow for infinite sentient carp spawns
- * Also plays appropiate sounds and CENTCOM messages.
+ * Also plays appropriate sounds and CENTCOM messages.
*/
/datum/antagonist/space_dragon/proc/victory()
objective_complete = TRUE
@@ -188,9 +188,9 @@
rift.time_charged = rift.max_charge
/**
- * Gives Space Dragon their the rift speed buff permanantly and fully heals the user.
+ * Gives Space Dragon their the rift speed buff permanently and fully heals the user.
*
- * Gives Space Dragon the enraged speed buff from charging rifts permanantly.
+ * Gives Space Dragon the enraged speed buff from charging rifts permanently.
* Only happens in circumstances where Space Dragon completes their objective.
* Also gives them a full heal.
*/
diff --git a/code/modules/antagonists/spy/spy_bounty.dm b/code/modules/antagonists/spy/spy_bounty.dm
index 01a1a1baf7b9a..42ab0203e5c03 100644
--- a/code/modules/antagonists/spy/spy_bounty.dm
+++ b/code/modules/antagonists/spy/spy_bounty.dm
@@ -529,7 +529,7 @@
return TRUE
if(IS_WEAKREF_OF(stealing, target_ref))
var/mob/living/carbon/human/target = stealing
- if(!target.incapacitated(IGNORE_RESTRAINTS|IGNORE_STASIS))
+ if(!INCAPACITATED_IGNORING(target, INCAPABLE_RESTRAINTS|INCAPABLE_STASIS))
return FALSE
if(find_desired_thing(target))
return TRUE
diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm
index bbdfa77eceacd..661007d3163a6 100644
--- a/code/modules/antagonists/traitor/datum_traitor.dm
+++ b/code/modules/antagonists/traitor/datum_traitor.dm
@@ -1,6 +1,6 @@
///all the employers that are syndicate
#define FLAVOR_FACTION_SYNDICATE "syndicate"
-///all the employers that are nanotrasen
+///all the employers that are Nanotrasen
#define FLAVOR_FACTION_NANOTRASEN "nanotrasen"
/datum/antagonist/traitor
diff --git a/code/modules/antagonists/voidwalker/voidwalker.dm b/code/modules/antagonists/voidwalker/voidwalker.dm
index 6ba5ee4490dc0..6222dc0c35fbe 100644
--- a/code/modules/antagonists/voidwalker/voidwalker.dm
+++ b/code/modules/antagonists/voidwalker/voidwalker.dm
@@ -50,9 +50,10 @@
"They must see what you have seen. They must walk where you have walked. Bring them to the void and show them the truth. The dead cannot know what you know.",
"Recover what you have lost. Bring your children into the inky black and return them to your flock.",
)
- if(prob(20))
- explanation_text += "Man I fucking love glass."
explanation_text = pick(explanation_texts)
+
+ if(prob(5))
+ explanation_text = "Man I fucking love glass."
..()
/datum/objective/voidwalker_objective/check_completion()
diff --git a/code/modules/antagonists/voidwalker/voidwalker_abilities.dm b/code/modules/antagonists/voidwalker/voidwalker_abilities.dm
index 4fe88f50d01c6..3bf4e1b76c3a4 100644
--- a/code/modules/antagonists/voidwalker/voidwalker_abilities.dm
+++ b/code/modules/antagonists/voidwalker/voidwalker_abilities.dm
@@ -12,7 +12,7 @@
deactive_msg = "You refocus your eyes..."
/// how long we need to stare at someone to unsettle them (woooooh)
var/stare_time = 8 SECONDS
- /// how long we stun someone on succesful cast
+ /// how long we stun someone on successful cast
var/stun_time = 2 SECONDS
/// stamina damage we doooo
var/stamina_damage = 80
@@ -37,7 +37,7 @@
spookify(cast_on)
return
owner.balloon_alert(owner, "line of sight broken!")
- return SPELL_CANCEL_CAST
+ return SPELL_NO_IMMEDIATE_COOLDOWN
/datum/action/cooldown/spell/pointed/unsettle/proc/check_if_in_view(mob/living/carbon/human/target)
SIGNAL_HANDLER
diff --git a/code/modules/antagonists/voidwalker/voidwalker_kidnap.dm b/code/modules/antagonists/voidwalker/voidwalker_kidnap.dm
index b763d094cb75a..f0d4c4349cef7 100644
--- a/code/modules/antagonists/voidwalker/voidwalker_kidnap.dm
+++ b/code/modules/antagonists/voidwalker/voidwalker_kidnap.dm
@@ -72,6 +72,8 @@ GLOBAL_LIST_EMPTY(voidwalker_void)
/obj/effect/wisp_mobile/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change)
. = ..()
+ maybe_loop_us(movement_dir)
+
var/obj/food = locate(food_type) in loc
if(!food)
return
@@ -94,6 +96,23 @@ GLOBAL_LIST_EMPTY(voidwalker_void)
to_chat(gone, span_boldwarning("You feel it would be very bad to get caught again."))
qdel(src)
+/// Loop us around, maybe, if we're going to bump into a wall
+/obj/effect/wisp_mobile/proc/maybe_loop_us(movement_dir)
+ var/turf/check_turf = get_step(get_turf(src), movement_dir)
+ if(!check_turf?.density) //we're not facing a wall, so dont do anything
+ return
+
+ // Loop us to the other side
+ var/reversed_dir = turn(movement_dir, 180)
+ check_turf = get_turf(src)
+
+ while(!check_turf.density)
+ check_turf = get_step(check_turf, reversed_dir)
+
+ // We found the wall on the opposite side, so take two steps back (one to get off the wall, another to not be wall adjacent)
+ check_turf = get_step(get_step(check_turf, movement_dir), movement_dir)
+ forceMove(check_turf)
+
/// we only exist to be eaten by wisps for food 😔👊
/obj/effect/wisp_food
name = "wisp"
diff --git a/code/modules/antagonists/voidwalker/voidwalker_species.dm b/code/modules/antagonists/voidwalker/voidwalker_species.dm
index 069582fbb2c7e..5b50c3da69ed9 100644
--- a/code/modules/antagonists/voidwalker/voidwalker_species.dm
+++ b/code/modules/antagonists/voidwalker/voidwalker_species.dm
@@ -20,6 +20,7 @@
TRAIT_ADVANCEDTOOLUSER,
TRAIT_NO_BLOOD_OVERLAY,
TRAIT_NO_THROWING,
+ TRAIT_GENELESS,
)
changesource_flags = MIRROR_BADMIN
diff --git a/code/modules/antagonists/wizard/equipment/soulstone.dm b/code/modules/antagonists/wizard/equipment/soulstone.dm
index 3bea19a5bb309..f8f5cf22350a7 100644
--- a/code/modules/antagonists/wizard/equipment/soulstone.dm
+++ b/code/modules/antagonists/wizard/equipment/soulstone.dm
@@ -290,15 +290,15 @@
/// Procs for moving soul in and out off stone
/// Transfer the mind of a carbon mob (which is then dusted) into a shade mob inside src.
-/// If forced, sacrifical and stat checks are skipped.
+/// If forced, sacrificial and stat checks are skipped.
/obj/item/soulstone/proc/capture_soul(mob/living/carbon/victim, mob/user, forced = FALSE)
- if(!iscarbon(victim)) //TODO: Add sacrifice stoning for non-organics, just because you have no body doesnt mean you dont have a soul
+ if(!iscarbon(victim)) //TODO: Add sacrifice stoning for non-organics, just because you have no body doesn't mean you don't have a soul
return FALSE
if(contents.len)
return FALSE
if(!forced)
- var/datum/antagonist/cult/cultist = IS_CULTIST(user)
+ var/datum/antagonist/cult/cultist = GET_CULTIST(user)
if(cultist)
var/datum/team/cult/cult_team = cultist.get_team()
if(victim.mind && cult_team.is_sacrifice_target(victim.mind))
@@ -372,7 +372,7 @@
/obj/item/soulstone/proc/check_menu(mob/user, obj/structure/constructshell/shell)
if(!istype(user))
return FALSE
- if(user.incapacitated() || !user.is_holding(src) || !user.CanReach(shell, src))
+ if(user.incapacitated || !user.is_holding(src) || !user.CanReach(shell, src))
return FALSE
return TRUE
@@ -444,7 +444,7 @@
/// Called when a ghost is chosen to become a shade.
/obj/item/soulstone/proc/on_poll_concluded(mob/living/master, mob/living/victim, mob/dead/observer/ghost)
- if(isnull(victim) || master.incapacitated() || !master.is_holding(src) || !master.CanReach(victim, src))
+ if(isnull(victim) || master.incapacitated || !master.is_holding(src) || !master.CanReach(victim, src))
return FALSE
if(isnull(ghost?.client))
to_chat(master, span_danger("There were no spirits willing to become a shade."))
diff --git a/code/modules/antagonists/wizard/equipment/spellbook_entries/perks.dm b/code/modules/antagonists/wizard/equipment/spellbook_entries/perks.dm
index 6cebe8fa1e974..0230274b8e88b 100644
--- a/code/modules/antagonists/wizard/equipment/spellbook_entries/perks.dm
+++ b/code/modules/antagonists/wizard/equipment/spellbook_entries/perks.dm
@@ -42,9 +42,9 @@
/datum/spellbook_entry/perks/dejavu/proc/give_dejavu(mob/living/carbon/human/wizard, area/new_area)
SIGNAL_HANDLER
- if(new_area == GLOB.areas_by_type[/area/centcom/wizard_station])
+ if(istype(new_area, /area/centcom))
return
- wizard.AddComponent(/datum/component/dejavu/timeline, -1, 60 SECONDS)
+ wizard.AddComponent(/datum/component/dejavu/wizard, 1, 60 SECONDS, TRUE)
UnregisterSignal(wizard, COMSIG_ENTER_AREA)
/datum/spellbook_entry/perks/spell_lottery
diff --git a/code/modules/antagonists/wizard/equipment/wizard_spellbook.dm b/code/modules/antagonists/wizard/equipment/wizard_spellbook.dm
index b0016bffe5f43..18374e9bcff25 100644
--- a/code/modules/antagonists/wizard/equipment/wizard_spellbook.dm
+++ b/code/modules/antagonists/wizard/equipment/wizard_spellbook.dm
@@ -172,7 +172,7 @@
data["full_random_bonus"] = initial(uses) + full_random_bonus
return data
-/obj/item/spellbook/ui_act(action, params)
+/obj/item/spellbook/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/art/paintings.dm b/code/modules/art/paintings.dm
index 8affc71e568f3..2e330d31185da 100644
--- a/code/modules/art/paintings.dm
+++ b/code/modules/art/paintings.dm
@@ -159,7 +159,7 @@
. = ..()
ui_interact(user)
-/obj/item/canvas/ui_act(action, params)
+/obj/item/canvas/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
@@ -545,6 +545,8 @@
/obj/item/canvas/twentythree_twentythree,
/obj/item/canvas/twentyfour_twentyfour,
)
+ /// the type of wallframe it 'disassembles' into
+ var/wallframe_type = /obj/item/wallframe/painting
/obj/structure/sign/painting/Initialize(mapload, dir, building)
. = ..()
@@ -565,6 +567,16 @@
else
return ..()
+/obj/structure/sign/painting/knock_down(mob/living/user)
+ var/turf/drop_turf
+ if(user)
+ drop_turf = get_turf(user)
+ else
+ drop_turf = drop_location()
+ current_canvas?.forceMove(drop_turf)
+ var/obj/item/wallframe/frame = new wallframe_type(drop_turf)
+ frame.update_integrity(get_integrity()) //Transfer how damaged it is.
+
/obj/structure/sign/painting/examine(mob/user)
. = ..()
if(persistence_id)
@@ -768,6 +780,7 @@
/obj/item/canvas/thirtysix_twentyfour,
/obj/item/canvas/fortyfive_twentyseven,
)
+ wallframe_type = /obj/item/wallframe/painting/large
/obj/structure/sign/painting/large/Initialize(mapload)
. = ..()
diff --git a/code/modules/assembly/health.dm b/code/modules/assembly/health.dm
index 20316ebfd66d1..1f918888610da 100644
--- a/code/modules/assembly/health.dm
+++ b/code/modules/assembly/health.dm
@@ -100,7 +100,7 @@
data["target"] = health_target
return data
-/obj/item/assembly/health/ui_act(action, params)
+/obj/item/assembly/health/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return .
diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm
index 8dd4573fcfde1..addbad2704e1b 100644
--- a/code/modules/assembly/infrared.dm
+++ b/code/modules/assembly/infrared.dm
@@ -107,28 +107,14 @@
var/turf/last_turf = final_turfs[length(final_turfs)]
buffer_turf = get_step(last_turf, dir)
- var/beam_target_x = pixel_x
- var/beam_target_y = pixel_y
- // The beam by default will go to middle of turf (because items are in the middle of turfs)
- // So we need to offset it
- if(dir & NORTH)
- beam_target_y += 16
- else if(dir & SOUTH)
- beam_target_y -= 16
- if(dir & WEST)
- beam_target_x -= 16
- else if(dir & EAST)
- beam_target_x += 16
-
active_beam = start_loc.Beam(
BeamTarget = last_turf,
beam_type = /obj/effect/ebeam/reacting/infrared,
icon = 'icons/effects/beam.dmi',
- icon_state = "1-full",
- beam_color = COLOR_RED,
+ icon_state = "infrared",
emissive = TRUE,
- override_target_pixel_x = beam_target_x,
- override_target_pixel_y = beam_target_y,
+ override_target_pixel_x = pixel_x,
+ override_target_pixel_y = pixel_y,
)
RegisterSignal(active_beam, COMSIG_BEAM_ENTERED, PROC_REF(beam_entered))
RegisterSignal(active_beam, COMSIG_BEAM_TURFS_CHANGED, PROC_REF(beam_turfs_changed))
@@ -305,7 +291,7 @@
data["visible"] = visible
return data
-/obj/item/assembly/infra/ui_act(action, params)
+/obj/item/assembly/infra/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return .
diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm
index 031a3f78eadeb..61153738ee714 100644
--- a/code/modules/assembly/proximity.dm
+++ b/code/modules/assembly/proximity.dm
@@ -154,7 +154,7 @@
data["sensitivity"] = sensitivity
return data
-/obj/item/assembly/prox_sensor/ui_act(action, params)
+/obj/item/assembly/prox_sensor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm
index 8366bb0f2b382..fad912d42229a 100644
--- a/code/modules/assembly/timer.dm
+++ b/code/modules/assembly/timer.dm
@@ -67,6 +67,9 @@
if(!timing)
return
time -= seconds_per_tick
+ if (time == 9 || time == 19 || time == 29)
+ update_appearance()
+
if(time <= 0)
timing = FALSE
timer_end()
@@ -79,9 +82,14 @@
/obj/item/assembly/timer/update_overlays()
. = ..()
attached_overlays = list()
- if(timing)
- . += "timer_timing"
- attached_overlays += "timer_timing"
+ if(!timing)
+ return
+
+ attached_overlays += "timer_timing"
+ for (var/i in 1 to clamp(ceil(time / 10), 1, 3))
+ var/mutable_appearance/timer_light = mutable_appearance(icon, "timer_light", layer, src)
+ timer_light.pixel_x = (i - 1) * 2
+ . += timer_light
/obj/item/assembly/timer/ui_status(mob/user, datum/ui_state/state)
if(is_secured(user))
@@ -102,7 +110,7 @@
data["loop"] = loop
return data
-/obj/item/assembly/timer/ui_act(action, params)
+/obj/item/assembly/timer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
index 85b95feb6d549..e7c5f5d35c7fa 100644
--- a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
+++ b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
@@ -271,6 +271,12 @@
#endif
for(var/turf/open/enemy_tile as anything in adjacent_turfs)
+ #ifdef UNIT_TESTS
+ if(!istype(enemy_tile))
+ stack_trace("closed turf inside of adjacent turfs")
+ continue
+ #endif
+
// This var is only rarely set, exists so turfs can request to share at the end of our sharing
// We need this so we can assume share is communative, which we need to do to avoid a hellish amount of garbage_collect()s
if(enemy_tile.run_later)
diff --git a/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm b/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm
index 0cb82c5c77c7c..737018b24ad7d 100644
--- a/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm
+++ b/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm
@@ -8,7 +8,7 @@
idle_power_usage = BASE_MACHINE_IDLE_CONSUMPTION * 0.05
active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION * 0.02
power_channel = AREA_USAGE_ENVIRON
- req_access = list(ACCESS_ATMOSPHERICS)
+ req_access = list(ACCESS_ENGINEERING)
max_integrity = 250
integrity_failure = 0.33
armor_type = /datum/armor/machinery_airalarm
@@ -342,15 +342,15 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm)
return data
-/obj/machinery/airalarm/ui_act(action, params)
+/obj/machinery/airalarm/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(. || buildstage != AIR_ALARM_BUILD_COMPLETE)
return
- if((locked && !HAS_SILICON_ACCESS(usr)) || (HAS_SILICON_ACCESS(usr) && aidisabled))
+ var/mob/user = ui.user
+ if((locked && !HAS_SILICON_ACCESS(user)) || (HAS_SILICON_ACCESS(user) && aidisabled))
return
- var/mob/user = usr
var/area/area = connected_sensor ? get_area(connected_sensor) : get_area(src)
ASSERT(!isnull(area))
@@ -465,7 +465,7 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm)
var/threshold_type = params["threshold_type"]
var/value = params["value"]
tlv.set_value(threshold_type, value)
- investigate_log("threshold value for [threshold]:[threshold_type] was set to [value] by [key_name(usr)]", INVESTIGATE_ATMOS)
+ investigate_log("threshold value for [threshold]:[threshold_type] was set to [value] by [key_name(user)]", INVESTIGATE_ATMOS)
check_enviroment()
@@ -476,7 +476,7 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm)
return
var/threshold_type = params["threshold_type"]
tlv.reset_value(threshold_type)
- investigate_log("threshold value for [threshold]:[threshold_type] was reset by [key_name(usr)]", INVESTIGATE_ATMOS)
+ investigate_log("threshold value for [threshold]:[threshold_type] was reset by [key_name(user)]", INVESTIGATE_ATMOS)
check_enviroment()
@@ -493,7 +493,7 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm)
disconnect_sensor()
if ("lock")
- togglelock(usr)
+ togglelock(user)
return TRUE
update_appearance()
diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm
index 8674e6331e4ac..12e6c684079e6 100644
--- a/code/modules/atmospherics/machinery/atmosmachinery.dm
+++ b/code/modules/atmospherics/machinery/atmosmachinery.dm
@@ -112,7 +112,7 @@
turf_loc.add_blueprints_preround(src)
if(hide)
- RegisterSignal(src, COMSIG_OBJ_HIDE, PROC_REF(on_hide))
+ setup_hiding()
SSspatial_grid.add_grid_awareness(src, SPATIAL_GRID_CONTENTS_TYPE_ATMOS)
SSspatial_grid.add_grid_membership(src, turf_loc, SPATIAL_GRID_CONTENTS_TYPE_ATMOS)
@@ -133,9 +133,18 @@
return ..()
/**
- * Handler for `COMSIG_OBJ_HIDE`, connects only if `hide` is set to `TRUE`. Calls `update_cap_visuals` on pipe and its connected nodes
+ * Sets up our pipe hiding logic, consolidated in one place so subtypes may override it.
+ * This lets subtypes implement their own hiding logic without needing to worry about conflicts with the parent hiding logic.
*/
-/obj/machinery/atmospherics/proc/on_hide(datum/source, underfloor_accessibility)
+/obj/machinery/atmospherics/proc/setup_hiding()
+ // Register pipe cap updating when hidden/unhidden
+ RegisterSignal(src, COMSIG_OBJ_HIDE, PROC_REF(on_hide))
+
+/**
+ * Signal handler. Updates both our pipe cap visuals and those of adjacent nodes.
+ * We update adjacent nodes as their pipe caps are based partially on our state, so they need updating as well.
+ */
+/obj/machinery/atmospherics/proc/on_hide(datum/source)
SHOULD_CALL_PARENT(TRUE)
SIGNAL_HANDLER
@@ -651,7 +660,8 @@
if(HAS_TRAIT(node, TRAIT_UNDERFLOOR))
continue
- if(isplatingturf(get_turf(node)))
+ var/turf/node_turf = get_turf(node)
+ if(isplatingturf(node_turf) || iscatwalkturf(node_turf))
continue
var/connected_dir = get_dir(src, node)
diff --git a/code/modules/atmospherics/machinery/bluespace_vendor.dm b/code/modules/atmospherics/machinery/bluespace_vendor.dm
index 91da04afaf2e7..5eca214cee0da 100644
--- a/code/modules/atmospherics/machinery/bluespace_vendor.dm
+++ b/code/modules/atmospherics/machinery/bluespace_vendor.dm
@@ -244,7 +244,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/bluespace_vendor, 30)
data["tank_full"] = total_tank_pressure
return data
-/obj/machinery/bluespace_vendor/ui_act(action, params)
+/obj/machinery/bluespace_vendor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm
index 1d7657dd35276..567cfcc6a843b 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm
@@ -84,7 +84,7 @@ Passive gate is similar to the regular pump except:
data["max_pressure"] = round(MAX_OUTPUT_PRESSURE)
return data
-/obj/machinery/atmospherics/components/binary/passive_gate/ui_act(action, params)
+/obj/machinery/atmospherics/components/binary/passive_gate/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm b/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm
index ff9cc36d7cd61..b1e03743b5d89 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/pressure_valve.dm
@@ -84,7 +84,7 @@
data["max_pressure"] = round(ONE_ATMOSPHERE*100)
return data
-/obj/machinery/atmospherics/components/binary/pressure_valve/ui_act(action, params)
+/obj/machinery/atmospherics/components/binary/pressure_valve/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm
index 1e68bf9ad691a..848a41735c777 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm
@@ -81,7 +81,7 @@
data["max_pressure"] = round(MAX_OUTPUT_PRESSURE)
return data
-/obj/machinery/atmospherics/components/binary/pump/ui_act(action, params)
+/obj/machinery/atmospherics/components/binary/pump/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm b/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm
index 879f6b7fab8d3..0b6195f7b8425 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/temperature_gate.dm
@@ -107,7 +107,7 @@
data["max_temperature"] = round(max_temperature)
return data
-/obj/machinery/atmospherics/components/binary/temperature_gate/ui_act(action, params)
+/obj/machinery/atmospherics/components/binary/temperature_gate/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/temperature_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/temperature_pump.dm
index 3976e8db750c1..88ec2265c69f6 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/temperature_pump.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/temperature_pump.dm
@@ -88,7 +88,7 @@
data["max_heat_transfer_rate"] = round(max_heat_transfer_rate)
return data
-/obj/machinery/atmospherics/components/binary/temperature_pump/ui_act(action, params)
+/obj/machinery/atmospherics/components/binary/temperature_pump/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
index ae8965ae0561e..477ea40137632 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
@@ -122,7 +122,7 @@
data["max_rate"] = round(MAX_TRANSFER_RATE)
return data
-/obj/machinery/atmospherics/components/binary/volume_pump/ui_act(action, params)
+/obj/machinery/atmospherics/components/binary/volume_pump/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/atmospherics/machinery/components/fusion/hfr_parts.dm b/code/modules/atmospherics/machinery/components/fusion/hfr_parts.dm
index 194e3744ca6d7..96272858a96b7 100644
--- a/code/modules/atmospherics/machinery/components/fusion/hfr_parts.dm
+++ b/code/modules/atmospherics/machinery/components/fusion/hfr_parts.dm
@@ -313,7 +313,7 @@
return data
-/obj/machinery/hypertorus/interface/ui_act(action, params)
+/obj/machinery/hypertorus/interface/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer.dm b/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer.dm
index f0482c210a66a..565ada80b931e 100644
--- a/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer.dm
+++ b/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer.dm
@@ -300,7 +300,7 @@
data["gas_input"] = gas_input
return data
-/obj/machinery/atmospherics/components/binary/crystallizer/ui_act(action, params)
+/obj/machinery/atmospherics/components/binary/crystallizer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
index da6c75d699d08..593832ec7986b 100644
--- a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
+++ b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
@@ -141,7 +141,7 @@
return data
-/obj/machinery/atmospherics/components/trinary/filter/ui_act(action, params)
+/obj/machinery/atmospherics/components/trinary/filter/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm
index 8f90986baaa46..8f7aa4a2d5716 100644
--- a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm
+++ b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm
@@ -150,7 +150,7 @@
data["node2_concentration"] = round(node2_concentration*100, 1)
return data
-/obj/machinery/atmospherics/components/trinary/mixer/ui_act(action, params)
+/obj/machinery/atmospherics/components/trinary/mixer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/bluespace_sender.dm b/code/modules/atmospherics/machinery/components/unary_devices/bluespace_sender.dm
index ebe053663f9e0..04306fbbdb3bc 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/bluespace_sender.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/bluespace_sender.dm
@@ -198,7 +198,7 @@ GLOBAL_LIST_EMPTY_TYPED(bluespace_senders, /obj/machinery/atmospherics/component
data["credits"] = credits_gained
return data
-/obj/machinery/atmospherics/components/unary/bluespace_sender/ui_act(action, params)
+/obj/machinery/atmospherics/components/unary/bluespace_sender/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
index acb454a983689..70cafb11be888 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
@@ -660,7 +660,7 @@
if(isliving(target))
var/mob/living/living_mob = target
- if(living_mob.incapacitated())
+ if(living_mob.incapacitated)
close_machine(target)
return
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
index 3f87ca671fdc9..c0b584d9029cc 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
@@ -122,7 +122,7 @@
data["max_rate"] = round(MAX_TRANSFER_RATE)
return data
-/obj/machinery/atmospherics/components/unary/outlet_injector/ui_act(action, params)
+/obj/machinery/atmospherics/components/unary/outlet_injector/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm
index 619bf100a170f..cb49e572fd1f8 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm
@@ -283,7 +283,7 @@
data["pressure"] = port.return_pressure()
return data
-/obj/machinery/atmospherics/components/unary/thermomachine/ui_act(action, params)
+/obj/machinery/atmospherics/components/unary/thermomachine/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/atmospherics/machinery/datum_pipeline.dm b/code/modules/atmospherics/machinery/datum_pipeline.dm
index 9c953922c72a7..9d9a5a6292f5d 100644
--- a/code/modules/atmospherics/machinery/datum_pipeline.dm
+++ b/code/modules/atmospherics/machinery/datum_pipeline.dm
@@ -360,7 +360,7 @@
/obj/effect/abstract/gas_visual/Initialize(mapload)
. = ..()
- color_filter = filter(type="color", color=matrix())
+ color_filter = filter(type="color", color="white")
filters += color_filter
color_filter = filters[filters.len]
if(current_color)
diff --git a/code/modules/atmospherics/machinery/pipes/pipes.dm b/code/modules/atmospherics/machinery/pipes/pipes.dm
index 230edc9a897f0..ebc31e847b85a 100644
--- a/code/modules/atmospherics/machinery/pipes/pipes.dm
+++ b/code/modules/atmospherics/machinery/pipes/pipes.dm
@@ -27,12 +27,11 @@
volume = 35 * device_type
. = ..()
-///I have no idea why there's a new and at this point I'm too afraid to ask
-/obj/machinery/atmospherics/pipe/Initialize(mapload)
- . = ..()
+/obj/machinery/atmospherics/pipe/setup_hiding()
+ AddElement(/datum/element/undertile, TRAIT_T_RAY_VISIBLE) //if changing this, change the subtypes RemoveElements too, because thats how bespoke works
- if(hide)
- AddElement(/datum/element/undertile, TRAIT_T_RAY_VISIBLE) //if changing this, change the subtypes RemoveElements too, because thats how bespoke works
+ // Registering on `COMSIG_OBJ_HIDE` would cause order of operations issues with undertile, so we register to run when undertile updates instead
+ RegisterSignal(src, COMSIG_UNDERTILE_UPDATED, PROC_REF(on_hide))
/obj/machinery/atmospherics/pipe/on_deconstruction(disassembled)
//we delete the parent here so it initializes air_temporary for us. See /datum/pipeline/Destroy() which calls temporarily_store_air()
diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm
index af13be0bbbf9b..a5a03c3ba1204 100644
--- a/code/modules/atmospherics/machinery/portable/canister.dm
+++ b/code/modules/atmospherics/machinery/portable/canister.dm
@@ -566,7 +566,7 @@
"cellCharge" = internal_cell ? internal_cell.percent() : 0
)
-/obj/machinery/portable_atmospherics/canister/ui_act(action, params)
+/obj/machinery/portable_atmospherics/canister/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/atmospherics/machinery/portable/pipe_scrubber.dm b/code/modules/atmospherics/machinery/portable/pipe_scrubber.dm
index cde38f216ad70..434f243d6a3ca 100644
--- a/code/modules/atmospherics/machinery/portable/pipe_scrubber.dm
+++ b/code/modules/atmospherics/machinery/portable/pipe_scrubber.dm
@@ -129,7 +129,7 @@
data["pressureLimitTank"] = internal_tank.pressure_limit
return data
-/obj/machinery/portable_atmospherics/pipe_scrubber/ui_act(action, params)
+/obj/machinery/portable_atmospherics/pipe_scrubber/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/atmospherics/machinery/portable/pump.dm b/code/modules/atmospherics/machinery/portable/pump.dm
index 7b0dbef314ec0..3efc87e00ac3a 100644
--- a/code/modules/atmospherics/machinery/portable/pump.dm
+++ b/code/modules/atmospherics/machinery/portable/pump.dm
@@ -109,7 +109,7 @@
data["holding"] = null
return data
-/obj/machinery/portable_atmospherics/pump/ui_act(action, params)
+/obj/machinery/portable_atmospherics/pump/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm
index b292180683f88..29759e52e4278 100644
--- a/code/modules/atmospherics/machinery/portable/scrubber.dm
+++ b/code/modules/atmospherics/machinery/portable/scrubber.dm
@@ -161,7 +161,7 @@
else if(on && holding)
user.investigate_log("started a transfer into [holding].", INVESTIGATE_ATMOS)
-/obj/machinery/portable_atmospherics/scrubber/ui_act(action, params)
+/obj/machinery/portable_atmospherics/scrubber/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm
index e32db92339991..5e3cf1bb21eac 100644
--- a/code/modules/awaymissions/gateway.dm
+++ b/code/modules/awaymissions/gateway.dm
@@ -359,7 +359,7 @@ GLOBAL_LIST_EMPTY(gateway_destinations)
destinations += list(possible_destination.get_ui_data())
.["destinations"] = destinations
-/obj/machinery/computer/gateway_control/ui_act(action, list/params)
+/obj/machinery/computer/gateway_control/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/awaymissions/mission_code/Beach.dm b/code/modules/awaymissions/mission_code/Beach.dm
new file mode 100644
index 0000000000000..8e05cfe4a5eb1
--- /dev/null
+++ b/code/modules/awaymissions/mission_code/Beach.dm
@@ -0,0 +1,19 @@
+/area/awaymission/beach
+ name = "Beach"
+ icon_state = "away"
+ static_lighting = FALSE
+ base_lighting_alpha = 255
+ base_lighting_color = "#FFFFCC"
+ requires_power = FALSE
+ has_gravity = STANDARD_GRAVITY
+ ambientsounds = list('sound/ambience/shore.ogg', 'sound/ambience/seag1.ogg','sound/ambience/seag2.ogg','sound/ambience/seag2.ogg','sound/ambience/ambiodd.ogg','sound/ambience/ambinice.ogg')
+
+/obj/item/paper/fluff/old_pirate_note
+ name = "rum-stained letter"
+ icon_state = "scrap_mud"
+ desc = "An unsent letter from a terminally drunk pirate."
+ default_raw_text = {"Dear,
+ I'm sorry I won't sail back home soon,
+ son of a biscuit eater walked the plank with me coffer (or treasure chest as landlubbers call'em),
+ so I got me fishing rod, bottles, waiting to fish the booty back.
+ Luv you hun, I hope this letter find you we-"}
diff --git a/code/modules/bitrunning/event.dm b/code/modules/bitrunning/event.dm
index 16190851f3720..370957e2ebb0f 100644
--- a/code/modules/bitrunning/event.dm
+++ b/code/modules/bitrunning/event.dm
@@ -61,7 +61,7 @@
var/total = 0
for(var/datum/weakref/server_ref in cyber_control.active_servers)
var/obj/machinery/quantum_server/server = server_ref?.resolve()
- if(isnull(server))
+ if(isnull(server) || QDELETED(server))
continue
total += length(server.mutation_candidate_refs)
diff --git a/code/modules/bitrunning/netpod/ui.dm b/code/modules/bitrunning/netpod/ui.dm
index 93719fe64ebef..919ba1e174b53 100644
--- a/code/modules/bitrunning/netpod/ui.dm
+++ b/code/modules/bitrunning/netpod/ui.dm
@@ -27,7 +27,7 @@
return data
-/obj/machinery/netpod/ui_act(action, params)
+/obj/machinery/netpod/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return TRUE
diff --git a/code/modules/bitrunning/objects/landmarks.dm b/code/modules/bitrunning/objects/landmarks.dm
index ea55b96979edd..170e7ab3075b1 100644
--- a/code/modules/bitrunning/objects/landmarks.dm
+++ b/code/modules/bitrunning/objects/landmarks.dm
@@ -72,11 +72,13 @@
encrypted_crate.abstract_move(selected_crate.loc)
selected_crate.abstract_move(original_location)
+
/// A location for mobs to spawn.
/obj/effect/landmark/bitrunning/mob_segment
name = "Bitrunning modular mob segment"
icon_state = "mob_segment"
+
/// Bitrunning safehouses. Typically 7x6 rooms with a single entrance.
/obj/modular_map_root/safehouse
config_file = "strings/modular_maps/safehouse.toml"
diff --git a/code/modules/bitrunning/objects/vendor.dm b/code/modules/bitrunning/objects/vendor.dm
index abd63a9e78430..d44630bc3beed 100644
--- a/code/modules/bitrunning/objects/vendor.dm
+++ b/code/modules/bitrunning/objects/vendor.dm
@@ -62,7 +62,7 @@
/obj/machinery/computer/order_console/bitrunning/retrieve_points(obj/item/card/id/id_card)
return round(id_card.registered_account.bitrunning_points)
-/obj/machinery/computer/order_console/bitrunning/ui_act(action, params)
+/obj/machinery/computer/order_console/bitrunning/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(!.)
flick("vendor_off", src)
diff --git a/code/modules/bitrunning/orders/tech.dm b/code/modules/bitrunning/orders/tech.dm
index 7e987e4818104..9dd1db17c799d 100644
--- a/code/modules/bitrunning/orders/tech.dm
+++ b/code/modules/bitrunning/orders/tech.dm
@@ -2,38 +2,38 @@
category_index = CATEGORY_BITRUNNING_TECH
/datum/orderable_item/bitrunning_tech/item_tier1
- cost_per_order = 1000
+ cost_per_order = 750
item_path = /obj/item/bitrunning_disk/item/tier1
desc = "This disk contains a program that lets you equip a medical beamgun, a C4 explosive, or a box of infinite pizza."
/datum/orderable_item/bitrunning_tech/item_tier2
- cost_per_order = 1500
+ cost_per_order = 1250
item_path = /obj/item/bitrunning_disk/item/tier2
desc = "This disk contains a program that lets you equip a luxury medipen, a pistol, or an armour vest."
/datum/orderable_item/bitrunning_tech/item_tier3
- cost_per_order = 2500
+ cost_per_order = 2000
item_path = /obj/item/bitrunning_disk/item/tier3
desc = "This disk contains a program that lets you equip an advanced energy gun, a dual bladed energy sword, or a minibomb."
/datum/orderable_item/bitrunning_tech/ability_tier1
- cost_per_order = 1000
+ cost_per_order = 750
item_path = /obj/item/bitrunning_disk/ability/tier1
desc = "This disk contains a program that lets you cast Summon Cheese or Lesser Heal."
/datum/orderable_item/bitrunning_tech/ability_tier2
- cost_per_order = 1800
+ cost_per_order = 1500
item_path = /obj/item/bitrunning_disk/ability/tier2
desc = "This disk contains a program that lets you cast Fireball, Lightning Bolt, or Forcewall."
/datum/orderable_item/bitrunning_tech/ability_tier3
- cost_per_order = 3200
+ cost_per_order = 2500
item_path = /obj/item/bitrunning_disk/ability/tier3
desc = "This disk contains a program that lets you shapeshift into a lesser ashdrake, or a polar bear."
/datum/orderable_item/bitrunning_tech/flip_skillchip
- item_path = /obj/item/skillchip/matrix_flip
- cost_per_order = 2000
+ item_path = /obj/item/skillchip/matrix_taunt
+ cost_per_order = 1500
/datum/orderable_item/bitrunning_tech/pka_mod
item_path = /obj/item/bitrunning_disk/item/pka_mods
@@ -42,7 +42,7 @@
/datum/orderable_item/bitrunning_tech/pka_mod/premium
item_path = /obj/item/bitrunning_disk/item/pka_mods/premium
- cost_per_order = 1800
+ cost_per_order = 1600
desc = "This disk contains a program that lets you equip stronger modkits for the proto-kinetic accelerator. Proto-kinetic accelerator not included."
/datum/orderable_item/bitrunning_tech/pkc_mod
@@ -52,5 +52,5 @@
/datum/orderable_item/bitrunning_tech/pkc_mod/premium
item_path = /obj/item/bitrunning_disk/item/pkc_mods/premium
- cost_per_order = 1800
+ cost_per_order = 1600
desc = "This disk contains a program that lets you equip stronger trophies for the proto-kinetic crusher. Proto-kinetic crusher not included."
diff --git a/code/modules/bitrunning/server/obj_generation.dm b/code/modules/bitrunning/server/obj_generation.dm
index dabac8ae62dd9..baf427855a236 100644
--- a/code/modules/bitrunning/server/obj_generation.dm
+++ b/code/modules/bitrunning/server/obj_generation.dm
@@ -116,9 +116,13 @@
path = pick(generated_domain.mob_modules)
var/datum/modular_mob_segment/segment = new path()
- segment.spawn_mobs(get_turf(landmark))
- mutation_candidate_refs += segment.spawned_mob_refs
+
+ var/list/mob_spawns = landmark.spawn_mobs(get_turf(landmark), segment)
+ if(length(mob_spawns))
+ mutation_candidate_refs += mob_spawns
+
qdel(landmark)
+ qdel(segment)
return TRUE
diff --git a/code/modules/bitrunning/server/threats.dm b/code/modules/bitrunning/server/threats.dm
index 28d91aa4b3714..6b9a334d9252a 100644
--- a/code/modules/bitrunning/server/threats.dm
+++ b/code/modules/bitrunning/server/threats.dm
@@ -176,7 +176,7 @@
/// Removes any invalid candidates from the list
/obj/machinery/quantum_server/proc/validate_mutation_candidates()
for(var/datum/weakref/creature_ref as anything in mutation_candidate_refs)
- var/mob/living/creature = creature_ref.resolve()
+ var/mob/living/creature = creature_ref?.resolve()
if(isnull(creature) || creature.mind)
mutation_candidate_refs.Remove(creature_ref)
diff --git a/code/modules/bitrunning/virtual_domain/domains/grassland_hunt.dm b/code/modules/bitrunning/virtual_domain/domains/grassland_hunt.dm
new file mode 100644
index 0000000000000..9c9e1c7171a6c
--- /dev/null
+++ b/code/modules/bitrunning/virtual_domain/domains/grassland_hunt.dm
@@ -0,0 +1,28 @@
+/datum/lazy_template/virtual_domain/grasslands_hunt
+ name = "Grasslands Hunt"
+ desc = "A peaceful hunt in the wilderness."
+ help_text = "As a hunter, you must be able to track and kill your prey. Prove yourself."
+ is_modular = TRUE
+ key = "grasslands_hunt"
+ map_name = "grasslands_hunt"
+ mob_modules = list(/datum/modular_mob_segment/deer)
+
+
+/datum/lazy_template/virtual_domain/grasslands_hunt/setup_domain(list/created_atoms)
+ for(var/obj/effect/landmark/bitrunning/mob_segment/landmark in created_atoms)
+ RegisterSignal(landmark, COMSIG_BITRUNNING_MOB_SEGMENT_SPAWNED, PROC_REF(on_spawned))
+
+
+/// The mob segment has concluded spawning
+/datum/lazy_template/virtual_domain/grasslands_hunt/proc/on_spawned(datum/source, list/mobs)
+ SIGNAL_HANDLER
+
+ for(var/mob/living/fauna as anything in mobs)
+ RegisterSignal(fauna, COMSIG_LIVING_DEATH, PROC_REF(on_death))
+
+
+/// Handles deer being slain
+/datum/lazy_template/virtual_domain/grasslands_hunt/proc/on_death(datum/source)
+ SIGNAL_HANDLER
+
+ add_points(3.5)
diff --git a/code/modules/bitrunning/virtual_domain/domains/island_brawl.dm b/code/modules/bitrunning/virtual_domain/domains/island_brawl.dm
index b745a4746aa24..84eb53e026a29 100644
--- a/code/modules/bitrunning/virtual_domain/domains/island_brawl.dm
+++ b/code/modules/bitrunning/virtual_domain/domains/island_brawl.dm
@@ -21,9 +21,17 @@
for(var/obj/effect/mob_spawn/ghost_role/human/virtual_domain/islander/spawner in created_atoms)
custom_spawns += spawner
+ RegisterSignal(spawner, COMSIG_QDELETING, PROC_REF(on_spawner_qdeleted))
RegisterSignals(spawner, list(COMSIG_GHOSTROLE_SPAWNED, COMSIG_BITRUNNER_SPAWNED), PROC_REF(on_spawn))
+/datum/lazy_template/virtual_domain/island_brawl/proc/on_spawner_qdeleted(obj/effect/mob_spawn/ghost_role/human/virtual_domain/islander/source)
+ SIGNAL_HANDLER
+
+ custom_spawns -= source
+ UnregisterSignal(source, COMSIG_QDELETING)
+
+
/// Someone has spawned in, so we check for their death
/datum/lazy_template/virtual_domain/island_brawl/proc/on_spawn(datum/source, mob/living/spawned_mob)
SIGNAL_HANDLER
diff --git a/code/modules/bitrunning/virtual_domain/domains/meta_central.dm b/code/modules/bitrunning/virtual_domain/domains/meta_central.dm
new file mode 100644
index 0000000000000..0bc35ceaf40e4
--- /dev/null
+++ b/code/modules/bitrunning/virtual_domain/domains/meta_central.dm
@@ -0,0 +1,12 @@
+/datum/lazy_template/virtual_domain/meta_central
+ name = "Meta Central"
+ cost = BITRUNNER_COST_LOW
+ desc = "Every so often, workers demand rights from Nanotrasen. This is unprofitable."
+ difficulty = BITRUNNER_DIFFICULTY_LOW
+ forced_outfit = /datum/outfit/job/security/mod
+ help_text = "Respond to the worker's demands with sanctioned violence. Recover valuable materials that may be scattered around. Just remember your training: Always assume guilt, they can confess in medbay... Or something like that."
+ is_modular = TRUE
+ key = "meta_central"
+ map_name = "meta_central"
+ mob_modules = list(/datum/modular_mob_segment/revolutionary)
+ reward_points = BITRUNNER_REWARD_LOW
diff --git a/code/modules/bitrunning/virtual_domain/modular_mob_segment.dm b/code/modules/bitrunning/virtual_domain/modular_mob_segment.dm
index b8c5880a69c38..225912797b28a 100644
--- a/code/modules/bitrunning/virtual_domain/modular_mob_segment.dm
+++ b/code/modules/bitrunning/virtual_domain/modular_mob_segment.dm
@@ -3,27 +3,49 @@
#define SPAWN_UNLIKELY 35
#define SPAWN_RARE 10
+
+/// Handles spawning mobs for this landmark. Sends a signal when done.
+/obj/effect/landmark/bitrunning/mob_segment/proc/spawn_mobs(turf/origin, datum/modular_mob_segment/segment)
+ var/list/mob/living/spawned_mobs = list()
+
+ spawned_mobs += segment.spawn_mobs(origin)
+
+ SEND_SIGNAL(src, COMSIG_BITRUNNING_MOB_SEGMENT_SPAWNED, spawned_mobs)
+
+ var/list/datum/weakref/mob_refs = list()
+ for(var/mob/living/spawned as anything in spawned_mobs)
+ if(QDELETED(spawned))
+ continue
+
+ mob_refs += WEAKREF(spawned)
+
+ return mob_refs
+
+
+/**
+ * A list for mob spawning landmarks to use.
+ */
/datum/modular_mob_segment
- /// Spawn no more than this amount
- var/max = 4
/// Set this to false if you want explicitly what's in the list to spawn
var/exact = FALSE
/// The list of mobs to spawn
- var/list/mob/living/mobs = list()
- /// The mobs spawned from this segment
- var/list/spawned_mob_refs = list()
+ var/list/mobs = list()
+ /// Spawn no more than this amount
+ var/max = 4
/// Chance this will spawn (1 - 100)
var/probability = SPAWN_LIKELY
+
/// Spawns mobs in a circle around the location
/datum/modular_mob_segment/proc/spawn_mobs(turf/origin)
if(!prob(probability))
return
- var/total_amount = exact ? rand(1, max) : length(mobs)
+ var/list/mob/living/spawned_mobs = list()
- shuffle_inplace(mobs)
+ var/total_amount = exact ? length(mobs) : rand(1, max)
+ shuffle_inplace(mobs)
var/list/turf/nearby = list()
for(var/turf/tile as anything in RANGE_TURFS(2, origin))
@@ -46,7 +68,10 @@
var/mob/living/mob = new path(destination)
nearby -= destination
- spawned_mob_refs.Add(WEAKREF(mob))
+ spawned_mobs += mob
+
+ return spawned_mobs
+
// Some generic mob segments. If you want to add generic ones for any map, add them here
@@ -55,41 +80,48 @@
/mob/living/basic/pet/gondola,
)
+
/datum/modular_mob_segment/corgis
max = 2
mobs = list(
/mob/living/basic/pet/dog/corgi,
)
+
/datum/modular_mob_segment/monkeys
mobs = list(
/mob/living/carbon/human/species/monkey,
)
+
/datum/modular_mob_segment/syndicate_team
mobs = list(
/mob/living/basic/trooper/syndicate/ranged,
/mob/living/basic/trooper/syndicate/melee,
)
+
/datum/modular_mob_segment/abductor_agents
mobs = list(
/mob/living/basic/trooper/abductor/melee,
/mob/living/basic/trooper/abductor/ranged,
)
+
/datum/modular_mob_segment/syndicate_elite
mobs = list(
/mob/living/basic/trooper/syndicate/melee/sword/space/stormtrooper,
/mob/living/basic/trooper/syndicate/ranged/space/stormtrooper,
)
+
/datum/modular_mob_segment/bears
max = 2
mobs = list(
/mob/living/basic/bear,
)
+
/datum/modular_mob_segment/bees
exact = TRUE
mobs = list(
@@ -100,33 +132,39 @@
/mob/living/basic/bee/queen,
)
+
/datum/modular_mob_segment/bees_toxic
mobs = list(
/mob/living/basic/bee/toxin,
)
+
/datum/modular_mob_segment/blob_spores
mobs = list(
/mob/living/basic/blob_minion,
)
+
/datum/modular_mob_segment/carps
mobs = list(
/mob/living/basic/carp,
)
+
/datum/modular_mob_segment/hivebots
mobs = list(
/mob/living/basic/hivebot,
/mob/living/basic/hivebot/range,
)
+
/datum/modular_mob_segment/hivebots_strong
mobs = list(
/mob/living/basic/hivebot/strong,
/mob/living/basic/hivebot/range,
)
+
/datum/modular_mob_segment/lavaland_assorted
mobs = list(
/mob/living/basic/mining/basilisk,
@@ -135,6 +173,7 @@
/mob/living/basic/mining/lobstrosity,
)
+
/datum/modular_mob_segment/spiders
mobs = list(
/mob/living/basic/spider/giant/ambush,
@@ -144,11 +183,13 @@
/mob/living/basic/spider/giant/midwife,
)
+
/datum/modular_mob_segment/venus_trap
mobs = list(
/mob/living/basic/venus_human_trap,
)
+
/datum/modular_mob_segment/xenos
mobs = list(
/mob/living/basic/alien,
@@ -156,6 +197,20 @@
/mob/living/basic/alien/drone,
)
+
+/datum/modular_mob_segment/deer
+ max = 1
+ mobs = list(
+ /mob/living/basic/deer,
+ )
+
+
+/datum/modular_mob_segment/revolutionary
+ mobs = list(
+ /mob/living/basic/revolutionary,
+ )
+
+
#undef SPAWN_ALWAYS
#undef SPAWN_LIKELY
#undef SPAWN_UNLIKELY
diff --git a/code/modules/capture_the_flag/ctf_classes.dm b/code/modules/capture_the_flag/ctf_classes.dm
index 0482bd1ec88eb..8f6a03ba7dfc4 100644
--- a/code/modules/capture_the_flag/ctf_classes.dm
+++ b/code/modules/capture_the_flag/ctf_classes.dm
@@ -55,7 +55,7 @@
var/obj/item/radio/headset = human_to_equip.ears
headset.set_frequency(team_radio_freq)
headset.freqlock = RADIO_FREQENCY_LOCKED
- headset.independent = TRUE
+ headset.special_channels |= RADIO_SPECIAL_CENTCOM
human_to_equip.dna.species.stunmod = 0
/datum/outfit/ctf/instagib
diff --git a/code/modules/cards/cardhand.dm b/code/modules/cards/cardhand.dm
index ac14e17fea61b..8fc9b4d0dc70a 100644
--- a/code/modules/cards/cardhand.dm
+++ b/code/modules/cards/cardhand.dm
@@ -67,7 +67,7 @@
qdel(src) // cardhand is empty now so delete it
/obj/item/toy/cards/cardhand/proc/check_menu(mob/living/user)
- return isliving(user) && !user.incapacitated()
+ return isliving(user) && !user.incapacitated
/obj/item/toy/cards/cardhand/attackby(obj/item/weapon, mob/living/user, params, flip_card = FALSE)
var/obj/item/toy/singlecard/card
diff --git a/code/modules/cargo/centcom_podlauncher.dm b/code/modules/cargo/centcom_podlauncher.dm
index dd779c796ce8f..cd86761587680 100644
--- a/code/modules/cargo/centcom_podlauncher.dm
+++ b/code/modules/cargo/centcom_podlauncher.dm
@@ -191,7 +191,7 @@ ADMIN_VERB(centcom_podlauncher, R_ADMIN, "Config/Launch Supplypod", "Configure a
data["soundVolume"] = temp_pod.soundVolume //Admin sound to play when the pod leaves
return data
-/datum/centcom_podlauncher/ui_act(action, params)
+/datum/centcom_podlauncher/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/cargo/expressconsole.dm b/code/modules/cargo/expressconsole.dm
index 4942ea2c06a93..0a2dcfec4b0f0 100644
--- a/code/modules/cargo/expressconsole.dm
+++ b/code/modules/cargo/expressconsole.dm
@@ -128,6 +128,7 @@
if(.)
return
+ var/mob/user = ui.user
switch(action)
if("LZCargo")
usingBeacon = FALSE
@@ -143,7 +144,7 @@
if(D.adjust_money(-BEACON_COST))
cooldown = 10//a ~ten second cooldown for printing beacons to prevent spam
var/obj/item/supplypod_beacon/C = new /obj/item/supplypod_beacon(drop_location())
- C.link_console(src, usr)//rather than in beacon's Initialize(), we can assign the computer to the beacon by reusing this proc)
+ C.link_console(src, user)//rather than in beacon's Initialize(), we can assign the computer to the beacon by reusing this proc)
printed_beacons++//printed_beacons starts at 0, so the first one out will be called beacon # 1
beacon.name = "Supply Pod Beacon #[printed_beacons]"
@@ -159,13 +160,13 @@
CRASH("Unknown supply pack id given by express order console ui. ID: [params["id"]]")
var/name = "*None Provided*"
var/rank = "*None Provided*"
- var/ckey = usr.ckey
- if(ishuman(usr))
- var/mob/living/carbon/human/H = usr
+ var/ckey = user.ckey
+ if(ishuman(user))
+ var/mob/living/carbon/human/H = user
name = H.get_authentification_name()
rank = H.get_assignment(hand_first = TRUE)
- else if(HAS_SILICON_ACCESS(usr))
- name = usr.real_name
+ else if(HAS_SILICON_ACCESS(user))
+ name = user.real_name
rank = "Silicon"
var/reason = ""
var/list/empty_turfs
diff --git a/code/modules/cargo/goodies.dm b/code/modules/cargo/goodies.dm
index 4751b45aae89b..f7ce106d58048 100644
--- a/code/modules/cargo/goodies.dm
+++ b/code/modules/cargo/goodies.dm
@@ -221,7 +221,7 @@
/datum/supply_pack/goody/fishing_toolbox
name = "Fishing Toolbox"
- desc = "Complete toolbox set for your fishing adventure. Advanced hooks and lines sold separetely."
+ desc = "Complete toolbox set for your fishing adventure. Contains a valuable tip. Advanced hooks and lines sold separetely."
cost = PAYCHECK_CREW * 2
contains = list(/obj/item/storage/toolbox/fishing)
@@ -237,6 +237,12 @@
cost = PAYCHECK_CREW
contains = list(/obj/item/storage/box/fishing_lines)
+/datum/supply_pack/goody/fishing_lure_set
+ name = "Fishing Lures Set"
+ desc = "A set of bite-resistant fishing lures to fish all (most) sort of fish. Beat randomness to a curb today!"
+ cost = PAYCHECK_CREW * 8
+ contains = list(/obj/item/storage/box/fishing_lures)
+
/datum/supply_pack/goody/fishing_hook_rescue
name = "Rescue Fishing Hook Single-Pack"
desc = "For when your fellow miner has inevitably fallen into a chasm, and it's up to you to save them."
@@ -252,7 +258,7 @@
/datum/supply_pack/goody/fish_feed
name = "Can of Fish Food Single-Pack"
desc = "For keeping your little friends fed and alive."
- cost = PAYCHECK_CREW * 1
+ cost = PAYCHECK_CREW
contains = list(/obj/item/fish_feed)
/datum/supply_pack/goody/naturalbait
@@ -321,3 +327,9 @@
cost = PAYCHECK_COMMAND * 18
access_view = ACCESS_WEAPONS
contains = list(/obj/item/gun/ballistic/shotgun/doublebarrel)
+
+/datum/supply_pack/goody/experimental_medication
+ name = "Experimental Medication Single-Pack"
+ desc = "A single bottle of Interdyne brand experimental medication, used for treating people suffering from hereditary manifold disease."
+ cost = PAYCHECK_CREW * 6.5
+ contains = list(/obj/item/storage/pill_bottle/sansufentanyl)
diff --git a/code/modules/cargo/markets/market_item.dm b/code/modules/cargo/markets/market_item.dm
index d7a4dd4c0eef3..faa6c45d795c4 100644
--- a/code/modules/cargo/markets/market_item.dm
+++ b/code/modules/cargo/markets/market_item.dm
@@ -30,6 +30,9 @@
/// Probability for this item to be available. Used by SSmarket on init.
var/availability_prob
+ /// If set, this icon will be shown in the UI.
+ var/html_icon
+
///The identifier for the market item, generated on runtime and used to access them in the market categories.
var/identifier
@@ -51,9 +54,11 @@
//we're replacing the item to sell, and the old item is an instance!
if(ismovable(item))
UnregisterSignal(item, COMSIG_QDELETING)
+ html_icon = null
item = path_or_ref
identifier = "[path_or_ref]"
if(ismovable(path_or_ref))
+ html_icon = icon2base64(getFlatIcon(item, no_anim=TRUE))
RegisterSignal(item, COMSIG_QDELETING, PROC_REF(on_item_del))
identifier = "[REF(src)]"
diff --git a/code/modules/cargo/markets/market_items/local_goods.dm b/code/modules/cargo/markets/market_items/local_goods.dm
new file mode 100644
index 0000000000000..d81c38fec98ba
--- /dev/null
+++ b/code/modules/cargo/markets/market_items/local_goods.dm
@@ -0,0 +1,25 @@
+///A special category for goods placed on the market by station by someone with the LTSRBT.
+/datum/market_item/local_good
+ category = "Local Goods"
+ abstract_path = /datum/market_item/local_good
+ stock = 1
+ availability_prob = 100
+ restockable = FALSE
+ var/datum/bank_account/seller
+
+/datum/market_item/local_good/New(atom/movable/thing, datum/bank_account/seller)
+ ..()
+ set_item(thing)
+ src.seller = seller
+ if(seller)
+ RegisterSignal(seller, COMSIG_QDELETING, PROC_REF(delete_reference))
+
+/datum/market_item/local_good/buy(obj/item/market_uplink/uplink, mob/buyer, shipping_method, legal_status)
+ . = ..()
+ if(. && seller)
+ seller.adjust_money(round(price * (1 - MARKET_WITHHOLDING_TAX)), "Market: Item Sold")
+ QDEL_IN(src, 10 MINUTES) //This category cannot hold more than 40 items at a time, so we need to clear sold items.
+
+/datum/market_item/local_good/proc/delete_reference(datum/source)
+ SIGNAL_HANDLER
+ seller = null
diff --git a/code/modules/cargo/markets/market_items/weapons.dm b/code/modules/cargo/markets/market_items/weapons.dm
index 4f20cf865bc9b..12241450ba59a 100644
--- a/code/modules/cargo/markets/market_items/weapons.dm
+++ b/code/modules/cargo/markets/market_items/weapons.dm
@@ -24,6 +24,16 @@
stock_max = 4
availability_prob = 40
+/datum/market_item/weapon/buckshot
+ name = "Box of Buckshot Shells"
+ desc = "It wasn't easy since buckshot has been made illegal all over this sector of space, but \
+ we managed to find a large cache of it... somewhere. A word of caution, the stuff may be a tad old."
+ stock_max = 3
+ availability_prob = 35
+ item = /obj/item/storage/box/lethalshot/old
+ price_min = CARGO_CRATE_VALUE * 3
+ price_max = CARGO_CRATE_VALUE * 4.5
+
/datum/market_item/weapon/bone_spear
name = "Bone Spear"
desc = "Authentic tribal spear, made from real bones! A steal at any price, especially if you're a caveman."
diff --git a/code/modules/cargo/markets/market_telepad.dm b/code/modules/cargo/markets/market_telepad.dm
index 799395f30d125..53a3d73ee486a 100644
--- a/code/modules/cargo/markets/market_telepad.dm
+++ b/code/modules/cargo/markets/market_telepad.dm
@@ -1,4 +1,5 @@
-#define DEFAULT_RESTOCK_COST 675
+#define DEFAULT_RESTOCK_COST CARGO_CRATE_VALUE * 3.375
+#define PLACE_ON_MARKET_COST PAYCHECK_LOWER * 1.2
/obj/item/circuitboard/machine/ltsrbt
name = "LTSRBT (Machine Board)"
@@ -14,13 +15,14 @@
/obj/machinery/ltsrbt
name = "Long-To-Short-Range-Bluespace-Transceiver"
desc = "The LTSRBT is a compact teleportation machine for receiving and sending items outside the station and inside the station.\nUsing teleportation frequencies stolen from NT it is near undetectable.\nEssential for any illegal market operations on NT stations.\n"
- icon = 'icons/obj/machines/telecomms.dmi'
- icon_state = "exonet_node_idle"
- base_icon_state = "exonet_node"
+ icon = 'icons/obj/machines/ltsrbt.dmi'
+ icon_state = "ltsrbt_idle"
+ base_icon_state = "ltsrbt"
circuit = /obj/item/circuitboard/machine/ltsrbt
density = TRUE
idle_power_usage = BASE_MACHINE_IDLE_CONSUMPTION * 2
+ interaction_flags_atom = INTERACT_ATOM_ATTACK_HAND
/// Divider for energy_usage_per_teleport.
var/power_efficiency = 1
@@ -38,6 +40,12 @@
var/datum/market_purchase/transmitting
/// Queue for purchases that the machine should receive and send.
var/list/datum/market_purchase/queue = list()
+ /// The name of the market item that we've set on the UI
+ var/current_name = ""
+ /// The desc of the market item that we've set on the UI
+ var/current_desc = ""
+ /// The price of the market item that we've set on the UI
+ var/current_price = CARGO_CRATE_VALUE
/**
* Attacking the machinery with enough credits will restock the markets, allowing for more/better items.
* The cost doubles each time this is done.
@@ -48,32 +56,267 @@
. = ..()
register_context()
SSmarket.telepads += src
+ ADD_TRAIT(src, TRAIT_SECLUDED_LOCATION, INNATE_TRAIT) //you cannot sell disky, boss.
+ update_appearance()
/obj/machinery/ltsrbt/Destroy()
SSmarket.telepads -= src
// Bye bye orders.
if(length(SSmarket.telepads))
- for(var/datum/market_purchase/P in queue)
- SSmarket.queue_item(P)
- . = ..()
+ for(var/datum/market_purchase/purchase in queue)
+ SSmarket.queue_item(purchase)
+ if(receiving)
+ SSmarket.queue_item(receiving)
+ queue = null
+ receiving = null
+ transmitting = null
+ return ..()
/obj/machinery/ltsrbt/add_context(atom/source, list/context, obj/item/held_item, mob/user)
- if(held_item && held_item.get_item_credit_value())
- context[SCREENTIP_CONTEXT_LMB] = "Restock"
+ if(held_item)
+ if(state_open)
+ context[SCREENTIP_CONTEXT_LMB] = "Insert"
+ return CONTEXTUAL_SCREENTIP_SET
+ if(held_item.get_item_credit_value() && !(machine_stat & NOPOWER))
+ context[SCREENTIP_CONTEXT_LMB] = "Restock"
+ return CONTEXTUAL_SCREENTIP_SET
+ return NONE
+ if(state_open)
+ context[SCREENTIP_CONTEXT_LMB] = "Close"
return CONTEXTUAL_SCREENTIP_SET
- return NONE
+ context[SCREENTIP_CONTEXT_LMB] = "Open"
+ if(occupant && !(machine_stat & NOPOWER))
+ context[SCREENTIP_CONTEXT_RMB] = "Place on market"
+ return CONTEXTUAL_SCREENTIP_SET
/obj/machinery/ltsrbt/examine(mob/user)
. = ..()
- if(machine_stat & NOPOWER)
- . += span_info("A display reads: \"Current market restock price: [EXAMINE_HINT("[restock_cost] cr")]\".")
+ if(!(machine_stat & NOPOWER))
+ . += span_info("A small display reads:")
+ . += span_tinynoticeital("Current market restock price: [EXAMINE_HINT("[restock_cost] cr")].")
+ . += span_tinynoticeital("Market placement fee: [EXAMINE_HINT("[PLACE_ON_MARKET_COST] cr")].")
+ . += span_tinynoticeital("Withholding tax on local items: [EXAMINE_HINT("[MARKET_WITHHOLDING_TAX * 100]%")].")
/obj/machinery/ltsrbt/update_icon_state()
. = ..()
if(machine_stat & NOPOWER)
icon_state = "[base_icon_state]_off"
else
- icon_state = "[base_icon_state][(receiving || length(queue)) ? "" : "_idle"]"
+ icon_state = "[base_icon_state][(receiving || length(queue) || occupant) ? "" : "_idle"]"
+
+/obj/machinery/ltsrbt/update_overlays()
+ . = ..()
+ if(!state_open)
+ . += "[base_icon_state]_closed"
+ else
+ var/mutable_appearance/overlay = mutable_appearance(icon, "[base_icon_state]_open")
+ overlay.pixel_w -= 2
+ overlay.pixel_z -= 1
+ . += overlay
+
+/obj/machinery/ltsrbt/attack_hand(mob/user, list/modifiers)
+ . = ..()
+ if(.)
+ return
+ if(!state_open)
+ open_machine(density_to_set = TRUE)
+ else
+ close_machine()
+
+/obj/machinery/ltsrbt/open_machine(drop = TRUE, density_to_set = FALSE)
+ . = ..()
+ playsound(src, 'sound/machines/oven/oven_open.ogg', 75, TRUE)
+
+/obj/machinery/ltsrbt/close_machine(atom/movable/target, density_to_set = TRUE)
+ . = ..()
+ playsound(src, 'sound/machines/oven/oven_close.ogg', 75, TRUE)
+
+/obj/machinery/ltsrbt/set_occupant(obj/item/new_occupant)
+ . = ..()
+ if(new_occupant)
+ current_name = new_occupant.name
+ current_desc = new_occupant.desc
+
+/obj/machinery/ltsrbt/can_be_occupant(atom/movable/atom)
+ return isitem(atom) && !atom.anchored
+
+/obj/machinery/ltsrbt/Exited(atom/movable/gone)
+ if(gone == occupant)
+ current_price = initial(current_price)
+ current_name = ""
+ current_desc = ""
+ update_appearance(UPDATE_ICON_STATE)
+ return ..()
+
+/obj/machinery/ltsrbt/attack_hand_secondary(mob/user, list/modifiers)
+ . = ..()
+ if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN)
+ return
+ if(state_open)
+ balloon_alert(user, "close it first!")
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+ if(!occupant)
+ balloon_alert(user, "nothing loaded!")
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+ if(machine_stat & NOPOWER)
+ balloon_alert(user, "machine unpowered!")
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+ if(!COOLDOWN_FINISHED(src, recharge_cooldown))
+ balloon_alert(user, "on cooldown!")
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+ ui_interact(user)
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+
+/obj/machinery/ltsrbt/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+ if(user.combat_mode)
+ return NONE
+
+ var/creds_value = tool.get_item_credit_value()
+
+ if(state_open)
+ if(locate(/mob/living) in tool.get_all_contents())
+ say("Living being detected, cannot sell!")
+ playsound(src, 'sound/machines/buzz-sigh.ogg', 40, FALSE)
+ return ITEM_INTERACT_BLOCKING
+ if(!user.transferItemToLoc(tool, src))
+ balloon_alert(user, "stuck to your hands!")
+ return ITEM_INTERACT_BLOCKING
+ balloon_alert(user, "item loaded")
+ close_machine(tool)
+ return ITEM_INTERACT_SUCCESS
+ else if(!creds_value)
+ balloon_alert(user, "open the machine!")
+ return ITEM_INTERACT_BLOCKING
+
+ if(machine_stat & NOPOWER)
+ return
+
+ if(creds_value < restock_cost)
+ say("Insufficient credits!")
+ playsound(src, 'sound/machines/buzz-sigh.ogg', 40, FALSE)
+ return ITEM_INTERACT_BLOCKING
+
+ if(istype(tool, /obj/item/holochip))
+ var/obj/item/holochip/chip = tool
+ chip.spend(restock_cost)
+ else
+ qdel(tool)
+ if(creds_value != restock_cost)
+ var/obj/item/holochip/change = new(loc, creds_value - restock_cost)
+ user.put_in_hands(change)
+
+ SSmarket.restock()
+ restock_cost *= 2
+ return ITEM_INTERACT_SUCCESS
+
+/obj/machinery/ltsrbt/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "LTSRBT", name)
+ ui.open()
+
+/obj/machinery/ltsrbt/ui_state()
+ if(!occupant || !COOLDOWN_FINISHED(src, recharge_cooldown))
+ return GLOB.never_state //close it.
+ else
+ return GLOB.default_state
+
+#define LTSRBT_MIN_PRICE PAYCHECK_LOWER
+#define LTSRBT_MAX_PRICE CARGO_CRATE_VALUE * 50
+
+/obj/machinery/ltsrbt/ui_static_data(mob/user)
+ var/list/data = list()
+ data["loaded_icon"] = icon2base64(getFlatIcon(occupant, no_anim=TRUE))
+ data["min_price"] = LTSRBT_MIN_PRICE
+ data["max_price"] = LTSRBT_MAX_PRICE
+ return data
+
+/obj/machinery/ltsrbt/ui_data(mob/user)
+ var/list/data = list()
+ data["name"] = current_name
+ data["price"] = current_price
+ data["desc"] = current_desc
+ return data
+
+/obj/machinery/ltsrbt/ui_act(action, list/params)
+ . = ..()
+ if(.)
+ return
+ switch(action)
+ if("change_name")
+ var/value = params["value"]
+ if(!CAN_BYPASS_FILTER(usr) && is_ic_filtered_for_pdas(value))
+ return TRUE
+ current_name = trim(value, MAX_NAME_LEN)
+ return TRUE
+ if("change_desc")
+ var/value = params["value"]
+ if(!CAN_BYPASS_FILTER(usr) && is_ic_filtered_for_pdas(value))
+ return TRUE
+ current_desc = trim(value, MAX_DESC_LEN)
+ return TRUE
+ if("change_price")
+ current_price = clamp(params["value"], LTSRBT_MIN_PRICE, LTSRBT_MAX_PRICE)
+ return TRUE
+ if("place_on_market")
+ place_on_market(usr)
+ return TRUE
+
+#undef LTSRBT_MIN_PRICE
+#undef LTSRBT_MAX_PRICE
+
+#define LTSRBT_MAX_MARKET_ITEMS 40
+/obj/machinery/ltsrbt/proc/place_on_market(mob/user)
+ if(QDELETED(occupant))
+ return
+ if(locate(/mob/living) in occupant.get_all_contents())
+ say("Living being detected, cannot sell!")
+ playsound(src, 'sound/machines/buzz-sigh.ogg', 40, FALSE)
+ return
+ var/datum/bank_account/account
+ var/datum/market/our_market = SSmarket.markets[/datum/market/blackmarket]
+ if(!isAdminGhostAI(user))
+ if(!isliving(user))
+ return
+ if(length(our_market.available_items[/datum/market_item/local_good::category]) >= LTSRBT_MAX_MARKET_ITEMS)
+ say("Local market saturated, buy some goods first!")
+ playsound(src, 'sound/machines/buzz-sigh.ogg', 40, FALSE)
+ return
+ var/mob/living/living_user = user
+ var/obj/item/card/id/card = living_user.get_idcard(TRUE)
+ if(!(card?.registered_account))
+ say("No bank account to charge market fees detected!")
+ playsound(src, 'sound/machines/buzz-sigh.ogg', 40, FALSE)
+ return
+ if(!card.registered_account.adjust_money(-PLACE_ON_MARKET_COST, "Market: Placement Fee"))
+ say("Insufficient credits!")
+ playsound(src, 'sound/machines/buzz-sigh.ogg', 40, FALSE)
+ return
+ account = card.registered_account
+
+ var/obj/item/item = occupant //occupant, name, price and desc will be null'd once it exits the machine so we need this.
+ var/name_to_use = current_name || item.name
+ var/desc_to_use = current_desc
+ if(account)
+ desc_to_use += "[current_desc ? " - " : ""]Seller: [account.account_holder]"
+ var/price_to_use = current_price
+ item.moveToNullspace()
+ //Something happened and the item was deleted or relocated as soon as it was moved to nullspace.
+ if(QDELETED(item) || item.loc != null)
+ say("Runtime at market_placement.dm, line 153: item gone!") //metajoke
+ return
+ var/datum/market_item/local_good/new_item = new(item, account)
+ new_item.name = name_to_use
+ new_item.desc = desc_to_use
+ new_item.price = price_to_use
+
+ our_market.add_item(new_item)
+
+ say("Item placed on the market!")
+ playsound(src, 'sound/effects/cashregister.ogg', 40, FALSE)
+ COOLDOWN_START(src, recharge_cooldown, recharge_time * 3)
+
+#undef LTSRBT_MAX_MARKET_ITEMS
/obj/machinery/ltsrbt/RefreshParts()
. = ..()
@@ -81,7 +324,6 @@
// On tier 4 recharge_time should be 20 and by default it is 80 as scanning modules should be tier 1.
for(var/datum/stock_part/scanning_module/scanning_module in component_parts)
recharge_time -= scanning_module.tier * 1 SECONDS
- recharge_cooldown = recharge_time
power_efficiency = 0
for(var/datum/stock_part/micro_laser/laser in component_parts)
@@ -132,43 +374,17 @@
transmitting = receiving
receiving = null
- COOLDOWN_START(src, recharge_cooldown, recharge_time)
return
if(transmitting)
if(transmitting.item.loc == turf)
do_teleport(transmitting.item, get_turf(transmitting.uplink))
use_energy(energy_usage_per_teleport / power_efficiency)
QDEL_NULL(transmitting)
+ COOLDOWN_START(src, recharge_cooldown, recharge_time)
return
if(length(queue))
receiving = pick_n_take(queue)
-/obj/machinery/ltsrbt/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
- var/creds_value = tool.get_item_credit_value()
- if(!creds_value)
- return NONE
-
- . = ITEM_INTERACT_SUCCESS
-
- if(machine_stat & NOPOWER)
- return
-
- if(creds_value < restock_cost)
- say("Insufficient credits!")
- playsound(src, 'sound/machines/buzz-sigh.ogg', 40, FALSE)
- return
-
- if(istype(tool, /obj/item/holochip))
- var/obj/item/holochip/chip = tool
- chip.spend(restock_cost)
- else
- qdel(tool)
- if(creds_value != restock_cost)
- var/obj/item/holochip/change = new(creds_value - restock_cost)
- user.put_in_hands(change)
-
- SSmarket.restock()
- restock_cost *= 2
-
#undef DEFAULT_RESTOCK_COST
+#undef PLACE_ON_MARKET_COST
diff --git a/code/modules/cargo/markets/market_uplink.dm b/code/modules/cargo/markets/market_uplink.dm
index a324a2f0409be..17cad32042668 100644
--- a/code/modules/cargo/markets/market_uplink.dm
+++ b/code/modules/cargo/markets/market_uplink.dm
@@ -80,7 +80,8 @@
"name" = item.name,
"cost" = item.price,
"amount" = item.stock,
- "desc" = item.desc || item.name
+ "desc" = item.desc || item.name,
+ "html_icon" = item.html_icon,
))
return data
@@ -97,7 +98,7 @@
))
return data
-/obj/item/market_uplink/ui_act(action, params)
+/obj/item/market_uplink/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/cargo/order.dm b/code/modules/cargo/order.dm
index c675352d024b2..a10bb3da5c00c 100644
--- a/code/modules/cargo/order.dm
+++ b/code/modules/cargo/order.dm
@@ -10,10 +10,14 @@
#define MANIFEST_ERROR_ITEM (1 << 2)
/obj/item/paper/fluff/jobs/cargo/manifest
+ can_become_message_in_bottle = FALSE //A lot of these are spawned each round, they'd only dilute the pool and make it boring.
var/order_cost = 0
var/order_id = 0
var/errors = 0
+/obj/item/paper/requisition
+ can_become_message_in_bottle = FALSE //A lot of these are spawned each round, they'd only dilute the pool and make it boring.
+
/obj/item/paper/fluff/jobs/cargo/manifest/Initialize(mapload, id, cost, manifest_can_fail = TRUE)
. = ..()
order_id = id
@@ -99,7 +103,7 @@
return round(cost)
/datum/supply_order/proc/generateRequisition(turf/T)
- var/obj/item/paper/requisition_paper = new(T)
+ var/obj/item/paper/requisition/requisition_paper = new(T)
requisition_paper.name = "requisition form - #[id] ([pack.name])"
var/requisition_text = "
[station_name()] Supply Requisition
"
diff --git a/code/modules/cargo/orderconsole.dm b/code/modules/cargo/orderconsole.dm
index d835c52f1e859..ae46d9943818b 100644
--- a/code/modules/cargo/orderconsole.dm
+++ b/code/modules/cargo/orderconsole.dm
@@ -329,7 +329,7 @@
else
//create the paper from the SSshuttle.shopping_list
if(length(SSshuttle.shopping_list))
- var/obj/item/paper/requisition_paper = new(get_turf(src))
+ var/obj/item/paper/requisition/requisition_paper = new(get_turf(src))
requisition_paper.name = "requisition form - [station_time_timestamp()]"
var/requisition_text = "
[station_name()] Supply Requisition
"
requisition_text += ""
diff --git a/code/modules/cargo/packs/costumes_toys.dm b/code/modules/cargo/packs/costumes_toys.dm
index de84a263597da..a25c47c5d9f88 100644
--- a/code/modules/cargo/packs/costumes_toys.dm
+++ b/code/modules/cargo/packs/costumes_toys.dm
@@ -90,7 +90,7 @@
/datum/supply_pack/costumes_toys/knucklebones
name = "Knucklebones Game Crate"
desc = "A fun dice game definitely not invented by a cult. Consult your local chaplain regarding \
- approved religious activity. Contains eighteen d6, one white crayon, and instructions on how to play."
+ approved religious activity. Contains eighteen d6, one stick of chalk, and instructions on how to play."
cost = CARGO_CRATE_VALUE * 2
contains = list(/obj/item/dice/d6 = 18,
/obj/item/paper/guides/knucklebone,
diff --git a/code/modules/cargo/packs/engineering.dm b/code/modules/cargo/packs/engineering.dm
index 771cba47df61d..e8255a58e6431 100644
--- a/code/modules/cargo/packs/engineering.dm
+++ b/code/modules/cargo/packs/engineering.dm
@@ -76,7 +76,7 @@
cost = CARGO_CRATE_VALUE * 4
contains = list(/obj/item/inducer/orderable = 2)
crate_name = "inducer crate"
- crate_type = /obj/structure/closet/crate/engineering/electrical
+ crate_type = /obj/structure/closet/crate/nakamura
/datum/supply_pack/engineering/pacman
name = "P.A.C.M.A.N Generator Crate"
@@ -86,7 +86,7 @@
access_view = ACCESS_ENGINEERING
contains = list(/obj/machinery/power/port_gen/pacman)
crate_name = "\improper PACMAN generator crate"
- crate_type = /obj/structure/closet/crate/engineering/electrical
+ crate_type = /obj/structure/closet/crate/nakamura
/datum/supply_pack/engineering/power
name = "Power Cell Crate"
@@ -328,3 +328,12 @@
)
crate_name = "radioactive nebula shielding (IMPORTANT)"
crate_type = /obj/structure/closet/crate/engineering
+
+/datum/supply_pack/engineering/portagrav
+ name = "Portable Gravity Unit Crate"
+ desc = "Contains a portable gravity unit, to make the clown float into the ceiling."
+ cost = CARGO_CRATE_VALUE * 4
+ access_view = ACCESS_ENGINEERING
+ contains = list(/obj/machinery/power/portagrav = 1)
+ crate_name = "portable gravity unit crate"
+ crate_type = /obj/structure/closet/crate/engineering
diff --git a/code/modules/cargo/packs/imports.dm b/code/modules/cargo/packs/imports.dm
index 98fc4d650212c..fc35e473f5ada 100644
--- a/code/modules/cargo/packs/imports.dm
+++ b/code/modules/cargo/packs/imports.dm
@@ -17,6 +17,7 @@
cost = CARGO_CRATE_VALUE * 2
contains = list(/obj/item/gun/ballistic/shotgun/toy = 8)
crate_name = "foam force crate"
+ crate_type = /obj/structure/closet/crate/freezer/donk
discountable = SUPPLY_PACK_STD_DISCOUNTABLE
/datum/supply_pack/imports/foamforce/bonus
@@ -30,6 +31,7 @@
/obj/item/ammo_box/magazine/toy/pistol = 2,
)
crate_name = "foam force crate"
+ crate_type = /obj/structure/closet/crate/freezer/donk
/datum/supply_pack/imports/meatmeatmeatmeat // MEAT MEAT MEAT MEAT
name = "MEAT MEAT MEAT MEAT MEAT"
@@ -141,6 +143,7 @@
/obj/item/gun/ballistic/automatic/wt550 = 2,
/obj/item/ammo_box/magazine/wt550m9 = 2,
)
+ crate_type = /obj/structure/closet/crate/secure/gorlex_weapons/jammed
/datum/supply_pack/imports/wt550ammo
name = "Smuggled WT-550 Ammo Crate"
@@ -153,7 +156,7 @@
/obj/item/ammo_box/magazine/wt550m9/wtic = 2,
)
crate_name = "emergency crate"
- crate_type = /obj/structure/closet/crate/internals
+ crate_type = /obj/structure/closet/crate/secure/gorlex_weapons/jammed
/datum/supply_pack/imports/shocktrooper
name = "Shocktrooper Crate"
@@ -169,6 +172,7 @@
/obj/item/clothing/suit/armor/vest,
/obj/item/clothing/head/helmet,
)
+ crate_type = /obj/structure/closet/crate/secure/gorlex_weapons/jammed
/datum/supply_pack/imports/specialops
name = "Special Ops Crate"
@@ -184,6 +188,7 @@
/obj/item/switchblade,
/obj/item/grenade/mirage = 5,
)
+ crate_type = /obj/structure/closet/crate/secure/gorlex_weapons/jammed
/datum/supply_pack/imports/russian
name = "Russian Surplus Military Gear Crate"
diff --git a/code/modules/cargo/packs/medical.dm b/code/modules/cargo/packs/medical.dm
index 0c626223916af..a112ada0e554f 100644
--- a/code/modules/cargo/packs/medical.dm
+++ b/code/modules/cargo/packs/medical.dm
@@ -29,7 +29,7 @@
/obj/item/reagent_containers/hypospray/medipen/ekit = 3,
/obj/item/reagent_containers/hypospray/medipen/blood_loss = 3)
crate_name = "medipen crate"
- crate_type = /obj/structure/closet/crate/medical
+ crate_type = /obj/structure/closet/crate/deforest
/datum/supply_pack/medical/coroner_crate
name = "Autopsy Kit"
@@ -121,7 +121,7 @@
/datum/supply_pack/medical/experimentalmedicine
name = "Experimental Medicine Crate"
desc = "A crate containing the medication required for living with Hereditary Manifold Sickness, Sansufentanyl."
- cost = CARGO_CRATE_VALUE * 2
+ cost = CARGO_CRATE_VALUE * 3
contains = list(/obj/item/storage/pill_bottle/sansufentanyl = 2)
crate_name = "experimental medicine crate"
crate_type = /obj/structure/closet/crate/medical
@@ -138,6 +138,7 @@
/obj/item/emergency_bed,
)
crate_name = "surgical supplies crate"
+ crate_type = /obj/structure/closet/crate/deforest
/datum/supply_pack/medical/salglucanister
name = "Heavy-Duty Saline Canister"
diff --git a/code/modules/cargo/packs/science.dm b/code/modules/cargo/packs/science.dm
index dfa2a66359336..6b4f38b95a03a 100644
--- a/code/modules/cargo/packs/science.dm
+++ b/code/modules/cargo/packs/science.dm
@@ -189,4 +189,4 @@
access_view = ACCESS_ROBOTICS
contains = list(/obj/item/mod/core/standard = 3)
crate_name = "\improper MOD core crate"
- crate_type = /obj/structure/closet/crate/secure/science/robo
+ crate_type = /obj/structure/closet/crate/nakamura
diff --git a/code/modules/cargo/packs/security.dm b/code/modules/cargo/packs/security.dm
index 05360fe913f0a..1823ef5174f94 100644
--- a/code/modules/cargo/packs/security.dm
+++ b/code/modules/cargo/packs/security.dm
@@ -36,7 +36,7 @@
/datum/supply_pack/security/forensics
name = "Forensics Crate"
desc = "Stay hot on the criminal's heels with Nanotrasen's Detective Essentialsâ„¢. \
- Contains a forensics scanner, six evidence bags, camera, tape recorder, white crayon, \
+ Contains a forensics scanner, six evidence bags, camera, special board for evidences, tape recorder, stick of chalk, \
and of course, a fedora."
cost = CARGO_CRATE_VALUE * 2.5
access_view = ACCESS_MORGUE
@@ -46,6 +46,7 @@
/obj/item/taperecorder,
/obj/item/toy/crayon/white,
/obj/item/clothing/head/fedora/det_hat,
+ /obj/item/wallframe/detectiveboard
)
crate_name = "forensics crate"
diff --git a/code/modules/cargo/packs/service.dm b/code/modules/cargo/packs/service.dm
index bf6afe107d6c7..26af45f960a5e 100644
--- a/code/modules/cargo/packs/service.dm
+++ b/code/modules/cargo/packs/service.dm
@@ -245,7 +245,7 @@
/obj/item/food/ready_donk/donkhiladas,
)
crate_name = "\improper Ready-Donk crate"
- crate_type = /obj/structure/closet/crate/freezer/food
+ crate_type = /obj/structure/closet/crate/freezer/donk
discountable = SUPPLY_PACK_UNCOMMON_DISCOUNTABLE
/datum/supply_pack/service/randomized/ready_donk/fill(obj/structure/closet/crate/C)
@@ -269,6 +269,7 @@
/obj/item/reagent_containers/cup/bottle/syrup_bottle/caramel, //one extra syrup as a treat
)
crate_name = "coffee equipment crate"
+ crate_type = /obj/structure/closet/crate/robust
discountable = SUPPLY_PACK_UNCOMMON_DISCOUNTABLE
/datum/supply_pack/service/coffeemaker
diff --git a/code/modules/cargo/packs/vending_restock.dm b/code/modules/cargo/packs/vending_restock.dm
index 10ae874d5d6c9..e5ae6f25c9371 100644
--- a/code/modules/cargo/packs/vending_restock.dm
+++ b/code/modules/cargo/packs/vending_restock.dm
@@ -17,7 +17,14 @@
cost = CARGO_CRATE_VALUE * 2
contains = list(/obj/item/vending_refill/cigarette)
crate_name = "cigarette supply crate"
- crate_type = /obj/structure/closet/crate
+ crate_type = /obj/structure/closet/crate/robust
+
+/datum/supply_pack/vending/science/cytopro
+ name = "Cytology Vendor Supply Crate"
+ desc = "For all your vat-growing needs! Contains a CytoPro machine refill."
+ cost = CARGO_CRATE_VALUE * 3
+ contains = list(/obj/item/vending_refill/cytopro)
+ crate_name = "cytopro supply crate"
/datum/supply_pack/vending/dinnerware
name = "Dinnerware Supply Crate"
@@ -106,6 +113,7 @@
cost = CARGO_CRATE_VALUE * 2
contains = list(/obj/item/vending_refill/snack)
crate_name = "snacks supply crate"
+ crate_type = /obj/structure/closet/crate/robust
/datum/supply_pack/vending/cola
name = "Softdrinks Supply Crate"
diff --git a/code/modules/cargo/universal_scanner.dm b/code/modules/cargo/universal_scanner.dm
index 484f4a7a03201..9ce1771421e61 100644
--- a/code/modules/cargo/universal_scanner.dm
+++ b/code/modules/cargo/universal_scanner.dm
@@ -257,7 +257,7 @@
/obj/item/universal_scanner/proc/check_menu(mob/living/user)
if(!istype(user))
return FALSE
- if(user.incapacitated())
+ if(user.incapacitated)
return FALSE
return TRUE
diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm
index 2b60b3bdbb2e4..c8e9e9a64c270 100644
--- a/code/modules/client/client_defines.dm
+++ b/code/modules/client/client_defines.dm
@@ -45,8 +45,6 @@
var/datum/click_intercept = null
///Time when the click was intercepted
var/click_intercept_time = 0
- ///Used for admin AI interaction
- var/AI_Interact = FALSE
///Used to cache this client's bans to save on DB queries
var/ban_cache = null
diff --git a/code/modules/client/preferences/paraplegic.dm b/code/modules/client/preferences/paraplegic.dm
new file mode 100644
index 0000000000000..1ffa704c77d0b
--- /dev/null
+++ b/code/modules/client/preferences/paraplegic.dm
@@ -0,0 +1,20 @@
+/datum/preference/choiced/paraplegic
+ category = PREFERENCE_CATEGORY_MANUALLY_RENDERED
+ savefile_key = "paraplegic"
+ savefile_identifier = PREFERENCE_CHARACTER
+
+/datum/preference/choiced/paraplegic/init_possible_values()
+ return GLOB.paraplegic_choice
+
+/datum/preference/choiced/paraplegic/create_default_value()
+ return "Default"
+
+/datum/preference/choiced/paraplegic/is_accessible(datum/preferences/preferences)
+ . = ..()
+ if (!.)
+ return FALSE
+
+ return "Paraplegic" in preferences.all_quirks
+
+/datum/preference/choiced/paraplegic/apply_to_human(mob/living/carbon/human/target, value)
+ return
diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm
index baabaa610c523..954724ed520ff 100644
--- a/code/modules/client/verbs/ooc.dm
+++ b/code/modules/client/verbs/ooc.dm
@@ -58,7 +58,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8")
msg = emoji_parse(msg)
- if(SSticker.HasRoundStarted() && (msg[1] in list(".",";",":","#") || findtext_char(msg, "say", 1, 5)))
+ if(SSticker.HasRoundStarted() && ((msg[1] in list(".",";",":","#")) || findtext_char(msg, "say", 1, 5)))
if(tgui_alert(usr,"Your message \"[raw_msg]\" looks like it was meant for in game communication, say it in OOC?", "Meant for OOC?", list("Yes", "No")) != "Yes")
return
diff --git a/code/modules/clothing/chameleon/generic_chameleon_clothing.dm b/code/modules/clothing/chameleon/generic_chameleon_clothing.dm
index 47b6f4db185a5..69800031f73a3 100644
--- a/code/modules/clothing/chameleon/generic_chameleon_clothing.dm
+++ b/code/modules/clothing/chameleon/generic_chameleon_clothing.dm
@@ -107,6 +107,7 @@ do { \
greyscale_colors = null
resistance_flags = NONE
+ body_parts_covered = HANDS|ARMS
armor_type = /datum/armor/gloves_chameleon
actions_types = list(/datum/action/item_action/chameleon/change/gloves)
clothing_traits = list(TRAIT_FAST_CUFFING)
@@ -218,6 +219,7 @@ do { \
desc = "A pair of black shoes."
icon_state = "sneakers"
inhand_icon_state = "sneakers_back"
+ body_parts_covered = FEET|LEGS
greyscale_colors = "#545454#ffffff"
greyscale_config = /datum/greyscale_config/sneakers
greyscale_config_worn = /datum/greyscale_config/sneakers/worn
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 1998b7abc4db3..d4705aee14c43 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -528,7 +528,7 @@ BLIND // can't see anything
update_appearance() //most of the time the sprite changes
/obj/item/clothing/proc/can_use(mob/user)
- return istype(user) && !user.incapacitated()
+ return istype(user) && !user.incapacitated
/obj/item/clothing/proc/spawn_shreds()
new /obj/effect/decal/cleanable/shreds(get_turf(src), name)
diff --git a/code/modules/clothing/gloves/_gloves.dm b/code/modules/clothing/gloves/_gloves.dm
index 5f63e0c3464bf..418f8358f4d2a 100644
--- a/code/modules/clothing/gloves/_gloves.dm
+++ b/code/modules/clothing/gloves/_gloves.dm
@@ -12,6 +12,9 @@
siemens_coefficient = 0.5
body_parts_covered = HANDS
slot_flags = ITEM_SLOT_GLOVES
+ equip_sound = 'sound/items/equip/glove_equip.ogg'
+ drop_sound = 'sound/items/handling/glove_drop.ogg'
+ pickup_sound = 'sound/items/handling/glove_pick_up.ogg'
attack_verb_continuous = list("challenges")
attack_verb_simple = list("challenge")
strip_delay = 20
diff --git a/code/modules/clothing/gloves/punch_mitts.dm b/code/modules/clothing/gloves/punch_mitts.dm
new file mode 100644
index 0000000000000..07d93d5ab021c
--- /dev/null
+++ b/code/modules/clothing/gloves/punch_mitts.dm
@@ -0,0 +1,24 @@
+/obj/item/clothing/gloves/fingerless/punch_mitts
+ name = "punching mitts"
+ desc = "Fingerless gloves with nasty spikes attached. Allows the wearer to utilize the ill-reputed fighting technique known as Hunter Boxing. The style \
+ allows the user to punch wildlife rapidly to death. Supposedly, this is an incredible workout, but few people are insane enough to attempt to \
+ punch every dangerous creature they encounter in the wild to death with their bare hands. Also kinda works against humanoids as well. \
+ Not that you would... right?"
+ icon_state = "punch_mitts"
+ body_parts_covered = HANDS|ARMS
+ resistance_flags = LAVA_PROOF | FIRE_PROOF
+ armor_type = /datum/armor/gloves_mitts
+
+/obj/item/clothing/gloves/fingerless/punch_mitts/Initialize(mapload)
+ . = ..()
+
+ AddComponent(/datum/component/martial_art_giver, /datum/martial_art/boxing/hunter)
+
+/datum/armor/gloves_mitts
+ melee = 25
+ bullet = 5
+ laser = 5
+ energy = 5
+ bomb = 100
+ fire = 100
+ acid = 30
diff --git a/code/modules/clothing/gloves/special.dm b/code/modules/clothing/gloves/special.dm
index d7fb34ae7c7e6..1366a29ac4a6e 100644
--- a/code/modules/clothing/gloves/special.dm
+++ b/code/modules/clothing/gloves/special.dm
@@ -155,3 +155,95 @@
siemens_coefficient = 0.3
clothing_traits = list(TRAIT_QUICKER_CARRY, TRAIT_CHUNKYFINGERS)
clothing_flags = THICKMATERIAL
+
+///A pair of gloves that both allow the user to fish without the need of a held fishing rod and provides athletics experience.
+/obj/item/clothing/gloves/fishing
+ name = "athletic fishing gloves"
+ desc = "A pair of gloves to fish without a fishing rod but your raw athletics strength. It doubles as a good workout device. WARNING: May cause injuries when catching bigger fish."
+ icon_state = "fishing_gloves"
+
+/obj/item/clothing/gloves/fishing/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/profound_fisher, new /obj/item/fishing_rod/mob_fisher/athletic(src))
+
+/obj/item/clothing/gloves/fishing/equipped(mob/user, slot)
+ . = ..()
+ if(slot == ITEM_SLOT_GLOVES)
+ RegisterSignal(user, SIGNAL_ADDTRAIT(TRAIT_ACTIVELY_FISHING), PROC_REF(begin_workout))
+
+/obj/item/clothing/gloves/fishing/dropped(mob/user)
+ UnregisterSignal(user, list(SIGNAL_ADDTRAIT(TRAIT_ACTIVELY_FISHING), SIGNAL_REMOVETRAIT(TRAIT_ACTIVELY_FISHING)))
+ STOP_PROCESSING(SSprocessing, src)
+ return ..()
+
+/obj/item/clothing/gloves/fishing/proc/begin_workout(datum/source)
+ SIGNAL_HANDLER
+ RegisterSignal(source, SIGNAL_REMOVETRAIT(TRAIT_ACTIVELY_FISHING), PROC_REF(stop_workout))
+ if(HAS_TRAIT(source, TRAIT_PROFOUND_FISHER)) //Only begin working out if we're fishing with these gloves and not some other fishing rod..
+ START_PROCESSING(SSprocessing, src)
+
+/obj/item/clothing/gloves/fishing/proc/stop_workout(datum/source)
+ SIGNAL_HANDLER
+ UnregisterSignal(source, SIGNAL_REMOVETRAIT(TRAIT_ACTIVELY_FISHING))
+ STOP_PROCESSING(SSprocessing, src)
+
+/obj/item/clothing/gloves/fishing/process(seconds_per_tick)
+ var/mob/living/wearer = loc
+ var/list/trait_source = GET_TRAIT_SOURCES(wearer, TRAIT_ACTIVELY_FISHING)
+ var/datum/fishing_challenge/challenge = trait_source[1]
+ var/stamina_exhaustion = 2.5 + challenge.difficulty * 0.025
+ var/is_heavy_gravity = wearer.has_gravity() > STANDARD_GRAVITY
+ var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = wearer.get_organ_slot(ORGAN_SLOT_SPINE)
+ if(istype(potential_spine))
+ stamina_exhaustion *= potential_spine.athletics_boost_multiplier
+ if(HAS_TRAIT(wearer, TRAIT_STRENGTH))
+ stamina_exhaustion *= 0.5
+
+ var/experience = 0.3 + challenge.difficulty * 0.003
+ if(is_heavy_gravity)
+ stamina_exhaustion *= 1.5
+ experience *= 2
+
+ wearer.adjustStaminaLoss(stamina_exhaustion)
+ wearer.mind?.adjust_experience(/datum/skill/athletics, experience)
+ wearer.apply_status_effect(/datum/status_effect/exercised)
+
+///The internal fishing rod of the athletic fishing gloves. The more athletic you're, the easier the minigame will be.
+/obj/item/fishing_rod/mob_fisher/athletic
+ icon = /obj/item/clothing/gloves/fishing::icon
+ icon_state = /obj/item/clothing/gloves/fishing::icon_state
+ line = null
+ bait = null
+ ui_description = "The integrated fishing rod of a pair of athletic fishing gloves"
+
+/obj/item/fishing_rod/mob_fisher/athletic/Initialize(mapload)
+ . = ..()
+ RegisterSignal(src, COMSIG_FISHING_ROD_CAUGHT_FISH, PROC_REF(noodling_is_dangerous))
+
+/obj/item/fishing_rod/mob_fisher/athletic/get_fishing_overlays()
+ return list()
+
+/obj/item/fishing_rod/mob_fisher/athletic/hook_hit(atom/atom_hit_by_hook_projectile, mob/user)
+ difficulty_modifier = -3 * user.mind?.get_skill_level(/datum/skill/athletics)
+ return ..()
+
+/obj/item/fishing_rod/mob_fisher/athletic/proc/noodling_is_dangerous(datum/source, atom/movable/reward, mob/living/user)
+ SIGNAL_HANDLER
+ if(!isfish(reward))
+ return
+ var/damage = 0
+ var/obj/item/fish/fishe = reward
+ switch(fishe.w_class)
+ if(WEIGHT_CLASS_BULKY)
+ damage = 10
+ if(WEIGHT_CLASS_HUGE)
+ damage = 14
+ if(WEIGHT_CLASS_GIGANTIC)
+ damage = 18
+ if(!damage && fishe.weight >= 2000)
+ damage = 5
+ damage = round(damage * fishe.weight * 0.0005)
+ if(damage)
+ var/body_zone = pick(BODY_ZONE_R_ARM, BODY_ZONE_L_ARM)
+ user.apply_damage(damage, BRUTE, body_zone, user.run_armor_check(body_zone, MELEE))
+ playsound(src,'sound/weapons/bite.ogg', damage * 2, TRUE)
diff --git a/code/modules/clothing/head/costume.dm b/code/modules/clothing/head/costume.dm
index 13a6e549b0e91..a1cfd37ec0db0 100644
--- a/code/modules/clothing/head/costume.dm
+++ b/code/modules/clothing/head/costume.dm
@@ -87,6 +87,10 @@
clothing_flags = SNUG_FIT
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
+/obj/item/clothing/head/costume/lobsterhat/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/speechmod, replacements = strings("crustacean_replacement.json", "crustacean"))
+
/obj/item/clothing/head/costume/drfreezehat
name = "doctor freeze's wig"
desc = "A cool wig for cool people."
@@ -115,14 +119,10 @@
/obj/item/clothing/head/costume/cardborg/equipped(mob/living/user, slot)
..()
if(ishuman(user) && (slot & ITEM_SLOT_HEAD))
- var/mob/living/carbon/human/H = user
- if(istype(H.wear_suit, /obj/item/clothing/suit/costume/cardborg))
- var/obj/item/clothing/suit/costume/cardborg/CB = H.wear_suit
- CB.disguise(user, src)
-
-/obj/item/clothing/head/costume/cardborg/dropped(mob/living/user)
- ..()
- user.remove_alt_appearance("standard_borg_disguise")
+ var/mob/living/carbon/human/human_user = user
+ if(istype(human_user.wear_suit, /obj/item/clothing/suit/costume/cardborg))
+ var/obj/item/clothing/suit/costume/cardborg/suit = human_user.wear_suit
+ suit.disguise(user, src)
/obj/item/clothing/head/costume/bronze
name = "bronze hat"
diff --git a/code/modules/clothing/head/fedora.dm b/code/modules/clothing/head/fedora.dm
index e4e8d4b54368d..cf0d23ac37f58 100644
--- a/code/modules/clothing/head/fedora.dm
+++ b/code/modules/clothing/head/fedora.dm
@@ -35,3 +35,9 @@
name = "carpskin fedora"
icon_state = "fedora_carpskin"
inhand_icon_state = null
+
+/obj/item/clothing/head/fedora/beige/press
+ name = "press fedora"
+ desc = "An beige fedora with a piece of paper saying \"PRESS\" stuck in its rim."
+ icon_state = "fedora_press"
+ inhand_icon_state = null
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 76c230ca504d2..2874a27b72b98 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -75,6 +75,16 @@
update_appearance()
return CLICK_ACTION_SUCCESS
+/obj/item/clothing/head/helmet/press
+ name = "press helmet"
+ desc = "A blue helmet used to distinguish non-combatant \"PRESS\" members, like if anyone cares."
+ icon_state = "helmet_press"
+
+/obj/item/clothing/head/helmet/press/worn_overlays(mutable_appearance/standing, isinhands, icon_file)
+ . = ..()
+ if(!isinhands)
+ . += emissive_appearance(icon_file, "[icon_state]-emissive", src, alpha = src.alpha)
+
/obj/item/clothing/head/helmet/alt
name = "bulletproof helmet"
desc = "A bulletproof combat helmet that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent."
@@ -101,6 +111,7 @@
name = "tactical combat helmet"
desc = "A tactical black helmet, sealed from outside hazards with a plate of glass and not much else."
icon_state = "marine_command"
+ base_icon_state = "marine_command"
inhand_icon_state = "marine_helmet"
armor_type = /datum/armor/helmet_marine
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
@@ -126,14 +137,17 @@
/obj/item/clothing/head/helmet/marine/security
name = "marine heavy helmet"
icon_state = "marine_security"
+ base_icon_state = "marine_security"
/obj/item/clothing/head/helmet/marine/engineer
name = "marine utility helmet"
icon_state = "marine_engineer"
+ base_icon_state = "marine_engineer"
/obj/item/clothing/head/helmet/marine/medic
name = "marine medic helmet"
icon_state = "marine_medic"
+ base_icon_state = "marine_medic"
/obj/item/clothing/head/helmet/marine/pmc
icon_state = "marine"
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index a5041de7fa0a9..5d5fc87d409f4 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -54,7 +54,7 @@
/obj/item/clothing/head/utility/chefhat/proc/on_mouse_emote(mob/living/source, key, emote_message, type_override)
SIGNAL_HANDLER
var/mob/living/carbon/wearer = loc
- if(!wearer || wearer.incapacitated(IGNORE_RESTRAINTS))
+ if(!wearer || INCAPACITATED_IGNORING(wearer, INCAPABLE_RESTRAINTS))
return
if (!prob(mouse_control_probability))
return COMPONENT_CANT_EMOTE
@@ -68,7 +68,7 @@
return COMPONENT_MOVABLE_BLOCK_PRE_MOVE // Didn't roll well enough or on cooldown
var/mob/living/carbon/wearer = loc
- if(!wearer || wearer.incapacitated(IGNORE_RESTRAINTS))
+ if(!wearer || INCAPACITATED_IGNORING(wearer, INCAPABLE_RESTRAINTS))
return COMPONENT_MOVABLE_BLOCK_PRE_MOVE // Not worn or can't move
var/move_direction = get_dir(wearer, moved_to)
diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm
index cb0f9033960c3..f8e7e80532f16 100644
--- a/code/modules/clothing/head/soft_caps.dm
+++ b/code/modules/clothing/head/soft_caps.dm
@@ -33,7 +33,7 @@
/obj/item/clothing/head/soft/proc/flip(mob/user)
- if(!user.incapacitated())
+ if(!user.incapacitated)
flipped = !flipped
if(flipped)
icon_state = "[soft_type][soft_suffix]_flipped"
@@ -173,6 +173,7 @@
/obj/item/clothing/head/soft/fishing_hat/Initialize(mapload)
. = ..()
+ AddComponent(/datum/component/speechmod, replacements = strings("crustacean_replacement.json", "crustacean")) //you asked for this.
AddElement(/datum/element/skill_reward, /datum/skill/fishing)
#define PROPHAT_MOOD "prophat"
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index cab7a6557e3c4..c5871d23c1859 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -301,14 +301,14 @@ GLOBAL_LIST_INIT(clown_mask_options, list(
AddElement(/datum/element/swabable, CELL_LINE_TABLE_CLOWN, CELL_VIRUS_TABLE_GENERIC, rand(2,3), 0)
/obj/item/clothing/mask/gas/clown_hat/ui_action_click(mob/user)
- if(!istype(user) || user.incapacitated())
+ if(!istype(user) || user.incapacitated)
return
var/choice = show_radial_menu(user,src, clownmask_designs, custom_check = FALSE, radius = 36, require_near = TRUE)
if(!choice)
return FALSE
- if(src && choice && !user.incapacitated() && in_range(user,src))
+ if(src && choice && !user.incapacitated && in_range(user,src))
var/list/options = GLOB.clown_mask_options
icon_state = options[choice]
user.update_worn_mask()
@@ -355,7 +355,7 @@ GLOBAL_LIST_INIT(clown_mask_options, list(
)
/obj/item/clothing/mask/gas/mime/ui_action_click(mob/user)
- if(!istype(user) || user.incapacitated())
+ if(!istype(user) || user.incapacitated)
return
var/list/options = list()
@@ -368,7 +368,7 @@ GLOBAL_LIST_INIT(clown_mask_options, list(
if(!choice)
return FALSE
- if(src && choice && !user.incapacitated() && in_range(user,src))
+ if(src && choice && !user.incapacitated && in_range(user,src))
icon_state = options[choice]
user.update_worn_mask()
update_item_action_buttons()
diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm
index 2aa61b0046070..b14573a087cf1 100644
--- a/code/modules/clothing/outfits/ert.dm
+++ b/code/modules/clothing/outfits/ert.dm
@@ -104,6 +104,8 @@
l_pocket = /obj/item/healthanalyzer/advanced
additional_radio = /obj/item/encryptionkey/heads/cmo
+ skillchips = list(/obj/item/skillchip/entrails_reader)
+
/datum/outfit/centcom/ert/medic/alert
name = "ERT Medic - High Alert"
@@ -133,6 +135,9 @@
l_pocket = /obj/item/rcd_ammo/large
additional_radio = /obj/item/encryptionkey/heads/ce
+
+ skillchips = list(/obj/item/skillchip/job/engineer)
+
/datum/outfit/centcom/ert/engineer/alert
name = "ERT Engineer - High Alert"
@@ -520,6 +525,9 @@
glasses = /obj/item/clothing/glasses/hud/health/sunglasses
additional_radio = /obj/item/encryptionkey/heads/cmo
+
+ skillchips = list(/obj/item/skillchip/entrails_reader)
+
/datum/outfit/centcom/ert/marine/engineer
name = "Marine Engineer"
@@ -533,6 +541,8 @@
glasses = /obj/item/clothing/glasses/hud/diagnostic/sunglasses
additional_radio = /obj/item/encryptionkey/heads/ce
+ skillchips = list(/obj/item/skillchip/job/engineer)
+
/datum/outfit/centcom/militia
name = "Militia Man"
@@ -563,3 +573,72 @@
head = /obj/item/clothing/head/beret/militia
l_hand = /obj/item/megaphone
suit_store = /obj/item/gun/energy/laser/musket/prime
+
+/datum/outfit/centcom/ert/medical_commander
+ name = "Chief EMT"
+ id = /obj/item/card/id/advanced/centcom/ert/medical
+ uniform = /obj/item/clothing/under/rank/medical/chief_medical_officer
+ l_pocket = /obj/item/healthanalyzer/advanced
+ shoes = /obj/item/clothing/shoes/sneakers/white
+ backpack_contents = list(
+ /obj/item/reagent_containers/hypospray/combat = 1,
+ /obj/item/storage/medkit/regular = 1,
+ /obj/item/storage/medkit/advanced = 1,
+ /obj/item/melee/baton/telescopic = 1,
+ /obj/item/gun/energy/pulse/pistol/loyalpin = 1,
+ /obj/item/stack/medical/poultice = 1, //These stacks contain 15 by default. Great for getting corpses to defib range without surgery.
+ )
+ belt = /obj/item/storage/belt/medical/ert
+ glasses = /obj/item/clothing/glasses/hud/health/sunglasses
+ additional_radio = /obj/item/encryptionkey/heads/cmo
+ mask = /obj/item/clothing/mask/surgical
+ back = /obj/item/mod/control/pre_equipped/emergency_medical/corpsman
+ gloves = null
+ suit = null
+ head = null
+ suit_store = /obj/item/tank/internals/oxygen
+
+/datum/outfit/centcom/ert/medical_technician
+ name = "EMT Paramedic"
+ id = /obj/item/card/id/advanced/centcom/ert/medical
+ uniform = /obj/item/clothing/under/rank/medical/scrubs/blue
+ l_pocket = /obj/item/healthanalyzer
+ backpack_contents = list(
+ /obj/item/reagent_containers/hypospray/combat = 1,
+ /obj/item/storage/medkit/regular = 1,
+ /obj/item/reagent_containers/syringe = 1,
+ /obj/item/reagent_containers/cup/bottle/formaldehyde = 1,
+ /obj/item/reagent_containers/medigel/sterilizine = 1,
+ /obj/item/bodybag = 2,
+ )
+ mask = /obj/item/clothing/mask/surgical
+ belt = /obj/item/storage/belt/medical/ert
+ glasses = /obj/item/clothing/glasses/hud/health
+ additional_radio = /obj/item/encryptionkey/heads/cmo
+ shoes = /obj/item/clothing/shoes/sneakers/blue
+ back = /obj/item/mod/control/pre_equipped/emergency_medical
+ gloves = null
+ suit = null
+ head = null
+ suit_store = /obj/item/tank/internals/oxygen
+
+/obj/item/mod/control/pre_equipped/emergency_medical
+ theme = /datum/mod_theme/medical
+ starting_frequency = MODLINK_FREQ_CENTCOM
+ applied_cell = /obj/item/stock_parts/power_store/cell/hyper
+ applied_modules = list(
+ /obj/item/mod/module/organizer,
+ /obj/item/mod/module/defibrillator,
+ /obj/item/mod/module/flashlight,
+ /obj/item/mod/module/health_analyzer,
+ /obj/item/mod/module/injector,
+ /obj/item/mod/module/surgical_processor/emergency,
+ /obj/item/mod/module/storage/large_capacity,
+ )
+
+/obj/item/mod/control/pre_equipped/emergency_medical/corpsman
+ theme = /datum/mod_theme/medical/corpsman
+
+///Identical to medical MODsuit, but uses the alternate skin by default.
+/datum/mod_theme/medical/corpsman
+ default_skin = "corpsman"
diff --git a/code/modules/clothing/outfits/plasmaman.dm b/code/modules/clothing/outfits/plasmaman.dm
index 1b2e0ead14883..a0e927c631938 100644
--- a/code/modules/clothing/outfits/plasmaman.dm
+++ b/code/modules/clothing/outfits/plasmaman.dm
@@ -302,3 +302,15 @@
uniform = /obj/item/clothing/under/plasmaman //same
gloves = /obj/item/clothing/gloves/color/plasmaman/black
head = /obj/item/clothing/head/helmet/space/plasmaman
+
+/datum/outfit/plasmaman/medical_commander
+ name = "Chief EMT Plasmaman"
+ uniform = /obj/item/clothing/under/plasmaman/chief_medical_officer
+ gloves = /obj/item/clothing/gloves/color/plasmaman/white
+ head = /obj/item/clothing/head/helmet/space/plasmaman/chief_medical_officer
+
+/datum/outfit/plasmaman/medical_technician
+ name = "EMT Paramedic Plasmaman"
+ uniform = /obj/item/clothing/under/plasmaman/medical
+ gloves = /obj/item/clothing/gloves/color/plasmaman/white
+ head = /obj/item/clothing/head/helmet/space/plasmaman/medical
diff --git a/code/modules/clothing/shoes/boots.dm b/code/modules/clothing/shoes/boots.dm
index dbfa4f8b3c40d..03f174aa43c31 100644
--- a/code/modules/clothing/shoes/boots.dm
+++ b/code/modules/clothing/shoes/boots.dm
@@ -3,6 +3,7 @@
desc = "High speed, low drag combat boots."
icon_state = "jackboots"
inhand_icon_state = "jackboots"
+ body_parts_covered = FEET|LEGS
armor_type = /datum/armor/shoes_combat
strip_delay = 40
resistance_flags = NONE
@@ -49,6 +50,7 @@
resistance_flags = NONE
armor_type = /datum/armor/shoes_jackboots
can_be_tied = FALSE
+ body_parts_covered = FEET|LEGS
/datum/armor/shoes_jackboots
bio = 90
@@ -108,6 +110,7 @@
strip_delay = 4 SECONDS
equip_delay_other = 4 SECONDS
clothing_flags = THICKMATERIAL
+ body_parts_covered = FEET|LEGS
resistance_flags = NONE
/datum/armor/ice_boots_eva
@@ -177,6 +180,7 @@
strip_delay = 40
resistance_flags = NONE
lace_time = 12 SECONDS
+ body_parts_covered = FEET|LEGS
/datum/armor/shoes_pirate
melee = 25
diff --git a/code/modules/clothing/shoes/cowboy.dm b/code/modules/clothing/shoes/cowboy.dm
index 4295b91cad2f5..ab8ef30c99b60 100644
--- a/code/modules/clothing/shoes/cowboy.dm
+++ b/code/modules/clothing/shoes/cowboy.dm
@@ -109,3 +109,4 @@
desc = "And they sing, oh, ain't you glad you're single? And that song ain't so very far from wrong."
armor_type = /datum/armor/shoes_combat
has_spurs = TRUE
+ body_parts_covered = FEET|LEGS
diff --git a/code/modules/clothing/shoes/cult.dm b/code/modules/clothing/shoes/cult.dm
index 80d03d3a09e25..f1a856b42688b 100644
--- a/code/modules/clothing/shoes/cult.dm
+++ b/code/modules/clothing/shoes/cult.dm
@@ -1,5 +1,5 @@
/obj/item/clothing/shoes/cult
- name = "\improper Nar'Sien invoker boots"
+ name = "\improper Nar'Sian boots"
desc = "A pair of boots worn by the followers of Nar'Sie."
icon_state = "cult"
inhand_icon_state = null
@@ -10,7 +10,7 @@
lace_time = 10 SECONDS
/obj/item/clothing/shoes/cult/alt
- name = "cultist boots"
+ name = "\improper Nar'Sian invoker boots"
icon_state = "cultalt"
/obj/item/clothing/shoes/cult/alt/ghost
diff --git a/code/modules/clothing/shoes/jumpboots.dm b/code/modules/clothing/shoes/jumpboots.dm
index 3446c2e7c7873..dc9dadcea5a53 100644
--- a/code/modules/clothing/shoes/jumpboots.dm
+++ b/code/modules/clothing/shoes/jumpboots.dm
@@ -36,6 +36,7 @@
user.visible_message(span_warning("[usr] dashes forward into the air!"))
recharging_time = world.time + recharging_rate
else
+ REMOVE_TRAIT(user, TRAIT_MOVE_FLOATING, LEAPING_TRAIT)
to_chat(user, span_warning("Something prevents you from dashing forward!"))
/obj/item/clothing/shoes/bhop/rocket
diff --git a/code/modules/clothing/spacesuits/_spacesuits.dm b/code/modules/clothing/spacesuits/_spacesuits.dm
index 703000a1f9133..caf84d9562dcb 100644
--- a/code/modules/clothing/spacesuits/_spacesuits.dm
+++ b/code/modules/clothing/spacesuits/_spacesuits.dm
@@ -24,6 +24,7 @@
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF
resistance_flags = NONE
dog_fashion = null
+ slowdown = 0.5
/datum/armor/helmet_space
bio = 100
@@ -47,7 +48,7 @@
/obj/item/tank/internals,
/obj/item/tank/jetpack/oxygen/captain,
)
- slowdown = 1
+ slowdown = 0.5
armor_type = /datum/armor/suit_space
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
cold_protection = CHEST | GROIN | LEGS | FEET | ARMS | HANDS
diff --git a/code/modules/clothing/spacesuits/pirate.dm b/code/modules/clothing/spacesuits/pirate.dm
index ca041d68d036f..73feec525c548 100644
--- a/code/modules/clothing/spacesuits/pirate.dm
+++ b/code/modules/clothing/spacesuits/pirate.dm
@@ -3,6 +3,7 @@
desc = "A modified helmet to allow space pirates to intimidate their customers whilst staying safe from the void. Comes with some additional protection."
icon_state = "spacepirate"
inhand_icon_state = "space_pirate_helmet"
+ slowdown = 0
armor_type = /datum/armor/space_pirate
strip_delay = 40
equip_delay_other = 20
diff --git a/code/modules/clothing/spacesuits/santa.dm b/code/modules/clothing/spacesuits/santa.dm
index 138f52e046e47..f6bd1657606c5 100644
--- a/code/modules/clothing/spacesuits/santa.dm
+++ b/code/modules/clothing/spacesuits/santa.dm
@@ -7,6 +7,7 @@
inhand_icon_state = "santahat"
flags_cover = HEADCOVERSEYES
dog_fashion = /datum/dog_fashion/head/santa
+ slowdown = 0
/obj/item/clothing/head/helmet/space/santahat/beardless
icon = 'icons/obj/clothing/head/costume.dmi'
@@ -14,6 +15,7 @@
icon_state = "santahatnorm"
inhand_icon_state = "that"
flags_inv = NONE
+ slowdown = 0
/obj/item/clothing/suit/space/santa
name = "Santa's suit"
diff --git a/code/modules/clothing/spacesuits/softsuit.dm b/code/modules/clothing/spacesuits/softsuit.dm
index 510c9e7056f2f..0b644286063ec 100644
--- a/code/modules/clothing/spacesuits/softsuit.dm
+++ b/code/modules/clothing/spacesuits/softsuit.dm
@@ -16,13 +16,14 @@
name = "Engineering Void Helmet"
desc = "A CentCom engineering dark red space suit helmet. While old and dusty, it still gets the job done."
icon_state = "void"
+ slowdown = 2
/obj/item/clothing/suit/space/nasavoid/old
name = "Engineering Voidsuit"
icon_state = "void"
inhand_icon_state = "void_suit"
desc = "A CentCom engineering dark red space suit. Age has degraded the suit making it difficult to move around in."
- slowdown = 4
+ slowdown = 2
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/multitool)
//EVA suit
@@ -72,6 +73,7 @@
inhand_icon_state = "syndicate-helm-orange" //resprite?
armor_type = /datum/armor/space_fragile
strip_delay = 65
+ slowdown = 1
/obj/item/clothing/suit/space/fragile
name = "emergency space suit"
@@ -79,7 +81,7 @@
var/torn = FALSE
icon_state = "syndicate-orange"
inhand_icon_state = "syndicate-orange"
- slowdown = 2
+ slowdown = 1
armor_type = /datum/armor/space_fragile
strip_delay = 65
diff --git a/code/modules/clothing/spacesuits/specialops.dm b/code/modules/clothing/spacesuits/specialops.dm
index cf8fc2a475cc6..caaa32cc24be2 100644
--- a/code/modules/clothing/spacesuits/specialops.dm
+++ b/code/modules/clothing/spacesuits/specialops.dm
@@ -7,6 +7,7 @@
inhand_icon_state = null
greyscale_colors = "#397F3F#FFCE5B"
clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | SNUG_FIT
+ slowdown = 0
flags_inv = 0
armor_type = /datum/armor/space_beret
strip_delay = 130
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 3c7fa506b208d..6e56107173c46 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -59,6 +59,16 @@
/obj/item/clothing/suit/armor/vest/alt/sec
icon_state = "armor_sec"
+/obj/item/clothing/suit/armor/vest/press
+ name = "press armor vest"
+ desc = "A blue armor vest used to distinguish non-combatant \"PRESS\" members, like if anyone cares."
+ icon_state = "armor_press"
+
+/obj/item/clothing/suit/armor/vest/press/worn_overlays(mutable_appearance/standing, isinhands, icon_file)
+ . = ..()
+ if(!isinhands)
+ . += emissive_appearance(icon_file, "[icon_state]-emissive", src, alpha = src.alpha)
+
/obj/item/clothing/suit/armor/vest/marine
name = "tactical armor vest"
desc = "A set of the finest mass produced, stamped plasteel armor plates, containing an environmental protection unit for all-condition door kicking."
diff --git a/code/modules/clothing/suits/costume.dm b/code/modules/clothing/suits/costume.dm
index 929e8d931d5ca..566ca5557f728 100644
--- a/code/modules/clothing/suits/costume.dm
+++ b/code/modules/clothing/suits/costume.dm
@@ -168,6 +168,7 @@
body_parts_covered = CHEST|GROIN|LEGS
flags_inv = HIDEJUMPSUIT
dog_fashion = /datum/dog_fashion/back
+ var/in_use = FALSE
/obj/item/clothing/suit/costume/cardborg/equipped(mob/living/user, slot)
..()
@@ -176,17 +177,33 @@
/obj/item/clothing/suit/costume/cardborg/dropped(mob/living/user)
..()
+ if (!in_use)
+ return
user.remove_alt_appearance("standard_borg_disguise")
-
-/obj/item/clothing/suit/costume/cardborg/proc/disguise(mob/living/carbon/human/H, obj/item/clothing/head/costume/cardborg/borghead)
- if(istype(H))
- if(!borghead)
- borghead = H.head
- if(istype(borghead, /obj/item/clothing/head/costume/cardborg)) //why is this done this way? because equipped() is called BEFORE THE ITEM IS IN THE SLOT WHYYYY
- var/image/I = image(icon = 'icons/mob/silicon/robots.dmi' , icon_state = "robot", loc = H)
- I.override = 1
- I.add_overlay(mutable_appearance('icons/mob/silicon/robots.dmi', "robot_e")) //gotta look realistic
- add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/silicons, "standard_borg_disguise", I) //you look like a robot to robots! (including yourself because you're totally a robot)
+ in_use = FALSE
+ var/mob/living/carbon/human/human_user = user
+ if (istype(human_user.head, /obj/item/clothing/head/costume/cardborg))
+ UnregisterSignal(human_user.head, COMSIG_ITEM_DROPPED)
+
+/obj/item/clothing/suit/costume/cardborg/proc/disguise(mob/living/carbon/human/human_user, obj/item/clothing/head/costume/cardborg/borghead)
+ if(!istype(human_user))
+ return
+ if(!borghead)
+ borghead = human_user.head
+ if(!istype(borghead, /obj/item/clothing/head/costume/cardborg)) //why is this done this way? because equipped() is called BEFORE THE ITEM IS IN THE SLOT WHYYYY
+ return
+ RegisterSignal(borghead, COMSIG_ITEM_DROPPED, PROC_REF(helmet_drop)) // Don't need to worry about qdeleting since dropped will be called from there
+ in_use = TRUE
+ var/image/override_image = image(icon = 'icons/mob/silicon/robots.dmi' , icon_state = "robot", loc = human_user)
+ override_image.override = TRUE
+ override_image.add_overlay(mutable_appearance('icons/mob/silicon/robots.dmi', "robot_e")) //gotta look realistic
+ add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/silicons, "standard_borg_disguise", override_image) //you look like a robot to robots! (including yourself because you're totally a robot)
+
+/obj/item/clothing/suit/costume/cardborg/proc/helmet_drop(datum/source, mob/living/user)
+ SIGNAL_HANDLER
+ UnregisterSignal(source, COMSIG_ITEM_DROPPED)
+ user.remove_alt_appearance("standard_borg_disguise")
+ in_use = FALSE
/obj/item/clothing/suit/costume/snowman
name = "snowman outfit"
@@ -511,6 +528,14 @@
name = "bronze suit"
desc = "A big and clanky suit made of bronze that offers no protection and looks very unfashionable. Nice."
icon_state = "clockwork_cuirass_old"
+ allowed = list(
+ /obj/item/tank/internals/emergency_oxygen,
+ /obj/item/tank/internals/plasmaman,
+ /obj/item/tank/jetpack/oxygen/captain,
+ /obj/item/storage/belt/holster,
+ //new
+ /obj/item/toy/clockwork_watch,
+ )
armor_type = /datum/armor/costume_bronze
/obj/item/clothing/suit/hooded/mysticrobe
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index d211b3cc91edf..7e6bdde01cdfd 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -191,6 +191,11 @@
if(!isinhands)
. += emissive_appearance(icon_file, "[icon_state]-emissive", src, alpha = src.alpha)
+/obj/item/clothing/suit/hazardvest/press // Variant used by the Curator
+ name = "press hazard vest"
+ desc = "A blue high-visibility vest used to distinguish non-combatant \"PRESS\" members, like if anyone cares."
+ icon_state = "hazard_press"
+
//Lawyer
/obj/item/clothing/suit/toggle/lawyer
name = "blue formal suit jacket"
@@ -225,6 +230,10 @@
blood_overlay_type = "coat"
body_parts_covered = CHEST|ARMS
allowed = list(
+ /obj/item/tank/internals/emergency_oxygen,
+ /obj/item/tank/internals/plasmaman,
+ /obj/item/boxcutter,
+ /obj/item/dest_tagger,
/obj/item/stamp,
/obj/item/storage/bag/mail,
/obj/item/universal_scanner,
diff --git a/code/modules/clothing/under/accessories/_accessories.dm b/code/modules/clothing/under/accessories/_accessories.dm
index 91854bc386bf0..5b25418838ab6 100644
--- a/code/modules/clothing/under/accessories/_accessories.dm
+++ b/code/modules/clothing/under/accessories/_accessories.dm
@@ -89,7 +89,7 @@
atom_storage.close_all()
attach_to.clone_storage(atom_storage)
attach_to.atom_storage.set_real_location(src)
- attach_to.atom_storage.rustle_sound = TRUE // it's on the suit now
+ attach_to.atom_storage.do_rustle = TRUE // it's on the suit now
var/num_other_accessories = LAZYLEN(attach_to.attached_accessories)
layer = FLOAT_LAYER + clamp(attach_to.max_number_of_accessories - num_other_accessories, 0, 10)
diff --git a/code/modules/clothing/under/accessories/badges.dm b/code/modules/clothing/under/accessories/badges.dm
index 0ea3922893a76..cc66e9d406a57 100644
--- a/code/modules/clothing/under/accessories/badges.dm
+++ b/code/modules/clothing/under/accessories/badges.dm
@@ -241,3 +241,46 @@
if (ishuman(user))
var/mob/living/carbon/human/human_wearer = user
human_wearer.sec_hud_set_security_status()
+
+/obj/item/clothing/accessory/press_badge
+ name = "press badge"
+ desc = "A blue press badge that clearly identifies the wearer as a member of the media. While it signifies press affiliation, it does not grant any special privileges or rights no matter how much the wearer yells about it."
+ desc_controls = "Click person with it to show them it"
+ icon_state = "press_badge"
+ attachment_slot = NONE // actually NECK but that doesn't make sense
+ /// The name of the person in the badge
+ var/journalist_name
+ /// The name of the press person is working for
+ var/press_name
+
+/obj/item/clothing/accessory/press_badge/examine(mob/user)
+ . = ..()
+ if(!journalist_name || !press_name)
+ . += span_notice("Use it in hand to input information")
+ return
+
+ . += span_notice("It belongs to [journalist_name], [press_name]")
+
+/obj/item/clothing/accessory/press_badge/attack_self(mob/user, modifiers)
+ . = ..()
+ if(!journalist_name)
+ journalist_name = tgui_input_text(user, "What is your name?", "Journalist Name", "[user.name]", MAX_NAME_LEN)
+ if(!press_name)
+ press_name = tgui_input_text(user, "For what organization you work?", "Press Name", "Nanotrasen", MAX_CHARTER_LEN)
+
+/obj/item/clothing/accessory/press_badge/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ . = ..()
+ if(!isliving(interacting_with))
+ return
+
+ var/mob/living/interacting_living = interacting_with
+ if(user.combat_mode)
+ playsound(interacting_living, 'sound/weapons/throw.ogg', 30)
+ examine(interacting_living)
+ to_chat(interacting_living, span_userdanger("[user] shoves the [src] up your face!"))
+ user.visible_message(span_warning("[user] have shoved a [src] into [interacting_living] face."))
+ else
+ playsound(interacting_living, 'sound/weapons/throwsoft.ogg', 20)
+ examine(interacting_living)
+ to_chat(interacting_living, span_boldwarning("[user] shows the [src] to you."))
+ user.visible_message(span_notice("[user] shows a [src] to [interacting_living]."))
diff --git a/code/modules/deathmatch/deathmatch_controller.dm b/code/modules/deathmatch/deathmatch_controller.dm
index 0b098871624dc..de5132198881a 100644
--- a/code/modules/deathmatch/deathmatch_controller.dm
+++ b/code/modules/deathmatch/deathmatch_controller.dm
@@ -54,7 +54,7 @@
var/datum/deathmatch_lobby/lobby = lobbies[ckey]
if (user.ckey == ckey)
.["hosting"] = TRUE
- if (user.ckey in lobby.observers+lobby.players)
+ if (user.ckey in (lobby.observers+lobby.players))
.["playing"] = ckey
.["lobbies"] += list(list(
name = ckey,
@@ -67,7 +67,7 @@
/datum/deathmatch_controller/proc/find_lobby_by_user(ckey)
for(var/lobbykey in lobbies)
var/datum/deathmatch_lobby/lobby = lobbies[lobbykey]
- if(ckey in lobby.players+lobby.observers)
+ if(ckey in (lobby.players+lobby.observers))
return lobby
/datum/deathmatch_controller/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
diff --git a/code/modules/deathmatch/deathmatch_loadouts.dm b/code/modules/deathmatch/deathmatch_loadouts.dm
index 911e5bf6e1b15..d89fdd383c80f 100644
--- a/code/modules/deathmatch/deathmatch_loadouts.dm
+++ b/code/modules/deathmatch/deathmatch_loadouts.dm
@@ -8,7 +8,9 @@
/// If defined, using this outfit sets the targets species to it
var/datum/species/species_override
/// This outfit will grant these spells if applied
- var/list/granted_spells = list()
+ var/list/spells_to_add = list()
+ /// This outfit will grant these mutations if applied
+ var/list/mutations_to_add = list()
/datum/outfit/deathmatch_loadout/pre_equip(mob/living/carbon/human/user, visualsOnly = FALSE)
. = ..()
@@ -17,15 +19,20 @@
if(!isnull(species_override))
user.set_species(species_override)
+
else if (!isnull(user.dna.species.outfit_important_for_life)) //plasmamen get lit on fire and die
user.set_species(/datum/species/human)
- for(var/datum/action/act as anything in granted_spells)
+
+ for(var/datum/action/act as anything in spells_to_add)
var/datum/action/new_ability = new act(user)
if(istype(new_ability, /datum/action/cooldown/spell))
var/datum/action/cooldown/spell/new_spell = new_ability
- new_spell.spell_requirements = SPELL_REQUIRES_NO_ANTIMAGIC
+ new_spell.spell_requirements = NONE
new_ability.Grant(user)
+ for(var/mutation in mutations_to_add)
+ user.dna.add_mutation(mutation)
+
/datum/outfit/deathmatch_loadout/naked
name = "Deathmatch: Naked"
display_name = "Unarmed, Butt-naked"
@@ -349,7 +356,7 @@
suit = /obj/item/clothing/suit/hooded/explorer
shoes = /obj/item/clothing/shoes/workboots/mining
mask = /obj/item/clothing/mask/gas/explorer
- granted_spells = list(
+ spells_to_add = list(
/datum/action/cooldown/mob_cooldown/dash,
)
@@ -392,10 +399,10 @@
suit = /datum/outfit/wizard::suit
head = /datum/outfit/wizard::head
shoes = /datum/outfit/wizard::shoes
- granted_spells = list(
+ spells_to_add = list(
/datum/action/cooldown/spell/aoe/magic_missile,
/datum/action/cooldown/spell/forcewall,
- /datum/action/cooldown/spell/jaunt/ethereal_jaunt,
+ /datum/action/cooldown/spell/pointed/projectile/fireball,
)
/datum/outfit/deathmatch_loadout/wizard/pyro
@@ -406,7 +413,7 @@
suit = /obj/item/clothing/suit/wizrobe/red
head = /obj/item/clothing/head/wizard/red
mask = /obj/item/cigarette
- granted_spells = list(
+ spells_to_add = list(
/datum/action/cooldown/spell/pointed/projectile/fireball,
/datum/action/cooldown/spell/smoke,
)
@@ -418,7 +425,7 @@
suit = /obj/item/clothing/suit/wizrobe/magusred
head = /obj/item/clothing/head/wizard/magus
- granted_spells = list(
+ spells_to_add = list(
/datum/action/cooldown/spell/pointed/projectile/lightningbolt,
/datum/action/cooldown/spell/charged/beam/tesla,
)
@@ -431,7 +438,7 @@
species_override = /datum/species/skeleton
suit = /obj/item/clothing/suit/wizrobe/black
head = /obj/item/clothing/head/wizard/black
- granted_spells = list(
+ spells_to_add = list(
/datum/action/cooldown/spell/touch/scream_for_me,
/datum/action/cooldown/spell/teleport/radius_turf/blink,
)
@@ -445,7 +452,7 @@
suit = /obj/item/clothing/suit/wizrobe/fake
head = /obj/item/clothing/head/wizard/fake
shoes = /obj/item/clothing/shoes/sandal
- granted_spells = list(
+ spells_to_add = list(
/datum/action/cooldown/spell/conjure_item/spellpacket,
/datum/action/cooldown/spell/aoe/repulse/wizard,
)
@@ -459,7 +466,7 @@
suit = /obj/item/clothing/suit/wizrobe/marisa
head = /obj/item/clothing/head/wizard/marisa
shoes = /obj/item/clothing/shoes/sneakers/marisa
- granted_spells = list(
+ spells_to_add = list(
/datum/action/cooldown/spell/chuuni_invocations,
/datum/action/cooldown/spell/pointed/projectile/spell_cards,
)
@@ -472,7 +479,7 @@
l_hand = /obj/item/mjollnir
suit = /obj/item/clothing/suit/wizrobe/magusblue
head = /obj/item/clothing/head/wizard/magus
- granted_spells = list(
+ spells_to_add = list(
/datum/action/cooldown/spell/summonitem,
)
@@ -482,7 +489,7 @@
desc = "You feel severely under-leveled for this encounter..."
l_hand = null
- granted_spells = list(
+ spells_to_add = list(
/datum/action/cooldown/spell/charge,
)
@@ -495,7 +502,7 @@
suit = /obj/item/clothing/suit/wizrobe/tape
head = /obj/item/clothing/head/wizard/tape
shoes = /obj/item/clothing/shoes/jackboots
- granted_spells = list(
+ spells_to_add = list(
/datum/action/cooldown/spell/conjure_item/infinite_guns/gun,
/datum/action/cooldown/spell/aoe/knock,
)
@@ -510,7 +517,7 @@
suit = /obj/item/clothing/suit/costume/hawaiian
head = /obj/item/clothing/head/wizard/red
shoes = /obj/item/clothing/shoes/sneakers/marisa
- granted_spells = list(
+ spells_to_add = list(
/datum/action/cooldown/spell/rod_form,
/datum/action/cooldown/spell/conjure/the_traps,
)
@@ -527,7 +534,7 @@
mask = /obj/item/clothing/mask/gas/clown_hat
back = /obj/item/storage/backpack/clown
shoes = /obj/item/clothing/shoes/clown_shoes
- granted_spells = null
+ spells_to_add = null
/datum/outfit/deathmatch_loadout/wizard/monkey
name = "Deathmatch: Monkey"
@@ -540,7 +547,7 @@
suit = null
head = /obj/item/clothing/head/wizard
shoes = null
- granted_spells = list(
+ spells_to_add = list(
/datum/action/cooldown/spell/conjure/simian,
)
@@ -716,7 +723,7 @@
/obj/item/food/croissant/throwing = 2,
)
- granted_spells = list(
+ spells_to_add = list(
/datum/action/cooldown/spell/vow_of_silence,
/datum/action/cooldown/spell/conjure_item/invisible_box,
/datum/action/cooldown/spell/conjure/invisible_chair,
@@ -744,3 +751,414 @@
/obj/item/knife/butcher,
/obj/item/sharpener,
)
+
+//species
+
+/datum/outfit/deathmatch_loadout/humanity
+ name = "Deathmatch: Human Species"
+ display_name = "Humanity"
+ desc = "The most ambitious and successful species. Or just the most rapacious, depending on who you ask."
+ species_override = /datum/species/human
+
+ head = /obj/item/clothing/head/soft/black
+ glasses = /obj/item/clothing/glasses/sunglasses
+ ears = /obj/item/radio/headset/headset_com
+ neck = /obj/item/clothing/neck/large_scarf/blue
+ //suit
+ id_trim = /datum/id_trim/job/bridge_assistant // half tider half command
+ id = /obj/item/card/id/advanced/chameleon
+ uniform = /obj/item/clothing/under/trek/command/next
+ l_pocket = /obj/item/gun/energy/e_gun/mini
+ r_pocket = /obj/item/extinguisher/mini
+ gloves = /obj/item/clothing/gloves/fingerless
+ belt = /obj/item/storage/belt/utility/full/inducer
+ shoes = /obj/item/clothing/shoes/sneakers/black
+
+// Lizard: Desert, Soldier, Trash
+
+/datum/outfit/deathmatch_loadout/lizardkind
+ name = "Deathmatch: Lizard Species"
+ display_name = "Lizardfolk"
+ desc = "They may be heavily discrimated against, they may be most often seen doing menial activities, but at least they, uh, uhh..."
+ species_override = /datum/species/lizard
+
+ head = /obj/item/clothing/head/soft/purple
+ id_trim = /datum/id_trim/job/janitor
+ id = /obj/item/card/id/advanced/chameleon
+ uniform = /obj/item/clothing/under/rank/civilian/janitor
+ gloves = /obj/item/clothing/gloves/color/black
+ belt = /obj/item/storage/belt/janitor/full
+ shoes = /obj/item/clothing/shoes/chameleon/noslip
+ r_hand = /obj/item/mop/advanced
+ back = /obj/item/storage/backpack
+ backpack_contents = list(
+ /obj/item/toy/plush/lizard_plushie/green,
+ // reclaiming lizard racism
+ /obj/item/reagent_containers/cup/glass/bottle/lizardwine,
+ /obj/item/tailclub,
+ /obj/item/melee/chainofcommand/tailwhip,
+ /obj/item/reagent_containers/cup/glass/coffee
+ )
+
+/datum/outfit/deathmatch_loadout/mothman
+ name = "Deathmatch: Moth Species"
+ display_name = "Mothmen"
+ desc = "An innocent and fluffy visage hides the combat ability of a particularly hairy kitten."
+ species_override = /datum/species/moth
+
+ head = /obj/item/clothing/head/utility/head_mirror
+ glasses = /obj/item/clothing/glasses/hud/health
+ suit = /obj/item/clothing/suit/hooded/wintercoat/medical
+ suit_store = /obj/item/flashlight/pen/paramedic
+ id_trim = /datum/id_trim/job/medical_doctor
+ id = /obj/item/card/id/advanced/chameleon
+ uniform = /obj/item/clothing/under/rank/medical/scrubs/blue
+ belt = /obj/item/storage/belt/medical/paramedic
+ shoes = /obj/item/clothing/shoes/sneakers/white
+ l_hand = /obj/item/circular_saw
+
+ back = /obj/item/storage/backpack/medic
+
+ backpack_contents = list(
+ /obj/item/toy/plush/moth,
+ /obj/item/storage/medkit/brute,
+ /obj/item/storage/medkit/fire,
+ /obj/item/statuebust/hippocratic
+ )
+
+// Roboticist??
+/datum/outfit/deathmatch_loadout/ethereal
+ name = "Deathmatch: Ethereal Species"
+ display_name = "Etherealkind"
+ desc = "Prepare to be SHOCKED as you are reminded of this species's existence."
+ species_override = /datum/species/ethereal
+
+ head = /obj/item/clothing/head/soft/black
+ id_trim = /datum/id_trim/job/roboticist
+ id = /obj/item/card/id/advanced/chameleon
+ suit = /obj/item/clothing/suit/toggle/labcoat/roboticist
+ suit_store = /datum/id_trim/job/roboticist
+ uniform = /obj/item/clothing/under/rank/rnd/roboticist
+ l_pocket = /obj/item/assembly/flash
+ belt = /obj/item/storage/belt/utility/full
+ shoes = /obj/item/clothing/shoes/sneakers/black
+
+ back = /obj/item/storage/backpack/science
+
+ backpack_contents = list(
+ /obj/item/dnainjector/shock,
+ /obj/item/etherealballdeployer,
+ )
+
+/datum/outfit/deathmatch_loadout/plasmamen
+ name = "Deathmatch: Plasmaman Species"
+ display_name = "Plasmamen"
+ desc = "Burn baby burn!"
+ species_override = /datum/species/plasmaman
+
+ head = /obj/item/clothing/head/helmet/space/plasmaman/atmospherics
+ suit = /obj/item/clothing/suit/hazardvest
+ suit_store = /obj/item/flashlight
+ uniform = /obj/item/clothing/under/plasmaman/atmospherics
+ id_trim = /datum/id_trim/job/atmospheric_technician
+ id = /obj/item/card/id/advanced/chameleon
+ belt = /obj/item/storage/belt/utility/atmostech
+ gloves = /obj/item/clothing/gloves/color/plasmaman/atmos
+ shoes = /obj/item/clothing/shoes/workboots
+ r_pocket = /obj/item/tank/internals/plasmaman/belt/full
+
+ back = /obj/item/storage/backpack/industrial
+
+ backpack_contents = list(
+ /obj/item/toy/plush/plasmamanplushie,
+ /obj/item/tank/internals/plasma,
+ /obj/item/tank/internals/plasmaman,
+ /obj/item/stack/sheet/mineral/uranium/half,
+ /obj/item/stack/sheet/mineral/plasma/thirty,
+ /obj/item/reagent_containers/condiment/milk,
+ /obj/item/storage/medkit/fire,
+ /obj/item/reagent_containers/syringe/plasma
+ )
+
+/datum/outfit/deathmatch_loadout/felinid
+ name = "Deathmatch: Felinid Species"
+ display_name = "Felinids"
+ desc = "Strictly inferior to humans in every way."
+ species_override = /datum/species/human/felinid
+
+ head = /obj/item/clothing/head/soft/rainbow
+ glasses = null
+ ears = /obj/item/radio/headset
+ neck = /obj/item/clothing/neck/petcollar
+ //suit
+ uniform = /obj/item/clothing/under/color/rainbow
+ l_pocket = /obj/item/toy/cattoy
+ r_pocket = /obj/item/restraints/handcuffs/fake
+ gloves = /obj/item/clothing/gloves/color/rainbow
+ belt = /obj/item/melee/curator_whip
+ shoes = /obj/item/clothing/shoes/sneakers/rainbow
+
+//spleef
+
+/datum/outfit/deathmatch_loadout/lattice_battles
+ name = "Deathmatch: Lattice loadout"
+ display_name = "Lattice Battler"
+ desc = "Snip the catwalks under everyone else and win! You're pacifist, so no punching."
+
+ uniform = /obj/item/clothing/under/pants/jeans
+ suit = /obj/item/clothing/suit/costume/wellworn_shirt/graphic
+ back = /obj/item/storage/backpack
+ r_hand = /obj/item/wirecutters
+
+ backpack_contents = list(
+ /obj/item/stack/rods/fifty,
+ /obj/item/stack/rods/fifty,
+ /obj/item/stack/rods/fifty,
+ /obj/item/stack/rods/fifty,
+ )
+
+// We don't want them to just punch each other to death
+
+/datum/outfit/deathmatch_loadout/lattice_battles/pre_equip(mob/living/carbon/human/user, visualsOnly)
+ . = ..()
+ ADD_TRAIT(user, TRAIT_PACIFISM, REF(src))
+
+// Ragnarok: Fight between religions!
+
+/datum/outfit/deathmatch_loadout/cultish/pre_equip(mob/living/carbon/human/user, visualsOnly)
+ . = ..()
+ ADD_TRAIT(user, TRAIT_ACT_AS_CULTIST, REF(src))
+ user.AddElement(/datum/element/cult_halo, initial_delay = 0 SECONDS)
+ user.AddElement(/datum/element/cult_eyes, initial_delay = 0 SECONDS)
+
+// Cultist Invoker, has all the balanced cult gear
+
+/datum/outfit/deathmatch_loadout/cultish/invoker
+ name = "Deathmatch: Cultist Invoker"
+ display_name = "Cultist Invoker"
+ desc = "Prove Nar'sie's superiority with your well-balanced set of equipment."
+ //species_override = /datum/species/plasmaman
+
+ head = /obj/item/clothing/head/hooded/cult_hoodie/cult_shield
+ glasses = /obj/item/clothing/glasses/hud/health/night/cultblind
+ suit = /obj/item/clothing/suit/hooded/cultrobes/cult_shield // the dreaded return!
+ suit_store = /obj/item/melee/cultblade
+ uniform = /obj/item/clothing/under/color/black
+ id_trim = null
+ belt = /obj/item/melee/cultblade/dagger
+ l_pocket = /obj/item/flashlight/flare/culttorch
+ r_pocket = /obj/item/flashlight/flare/culttorch
+ gloves = /obj/item/clothing/gloves/color/black
+ shoes = /obj/item/clothing/shoes/cult/alt
+ l_hand = /obj/item/shield/mirror // the dreaded return!!
+
+ back = /obj/item/storage/backpack/cultpack
+
+ backpack_contents = list(
+ /obj/item/restraints/legcuffs/bola/cult,
+ /obj/item/reagent_containers/cup/beaker/unholywater,
+ )
+
+// Cultist Artificer, gets all the balanced cult magicks
+
+/datum/outfit/deathmatch_loadout/cultish/artificer
+ name = "Deathmatch: Cultist Artificer"
+ display_name = "Cultist Artificer"
+ desc = "Prove Nar'sie's superiority with your well-balanced blood magicks."
+ //species_override = /datum/species/plasmaman
+
+ head = /obj/item/clothing/head/hooded/cult_hoodie/berserkerhood
+ neck = /obj/item/clothing/neck/heretic_focus/crimson_medallion
+ suit = /obj/item/clothing/suit/hooded/cultrobes/berserker
+ suit_store = /obj/item/melee/sickly_blade/cursed
+ uniform = /obj/item/clothing/under/color/red
+ id_trim = null
+ belt = /obj/item/melee/cultblade/dagger
+ l_pocket = /obj/item/flashlight/flare/culttorch
+ r_pocket = /obj/item/flashlight/flare/culttorch
+ gloves = /obj/item/clothing/gloves/color/red
+ shoes = /obj/item/clothing/shoes/cult
+ l_hand = null
+
+ back = /obj/item/storage/backpack/cultpack
+
+ backpack_contents = list(
+ /obj/item/cult_shift,
+ /obj/item/reagent_containers/cup/beaker/unholywater,
+ /obj/item/reagent_containers/cup/beaker/unholywater,
+ /obj/item/reagent_containers/cup/beaker/unholywater,
+ )
+
+ spells_to_add = list(
+ /datum/action/innate/cult/blood_spell/horror,
+ /datum/action/innate/cult/blood_spell/horror,
+ /datum/action/innate/cult/blood_spell/stun,
+ /datum/action/innate/cult/blood_spell/stun,
+ /datum/action/innate/cult/blood_spell/manipulation,
+ )
+
+/datum/outfit/deathmatch_loadout/cultish/artificer/post_equip(mob/living/carbon/human/user, visualsOnly)
+ . = ..()
+ var/datum/action/innate/cult/blood_spell/manipulation/magick = locate() in user
+ magick.charges = 300
+
+/datum/outfit/deathmatch_loadout/heresy
+ /// Grants the effects of these knowledges to the DMer
+ var/list/knowledge_to_grant
+
+/datum/outfit/deathmatch_loadout/heresy/pre_equip(mob/living/carbon/human/user, visualsOnly)
+ . = ..()
+ ADD_TRAIT(user, TRAIT_ACT_AS_HERETIC, REF(src))
+ user.AddElement(/datum/element/leeching_walk)
+
+ // Creates the knowledge as an isolated datum inside the target, allowing passive knowledges to work still.
+ for(var/datum/heretic_knowledge/knowhow as anything in knowledge_to_grant)
+ knowhow = new knowhow(user)
+ knowhow.on_gain(user, null)
+
+// Heretic Warrior
+
+// Has spells of Ash, Blade, and Rust. Overall aggressive
+
+/datum/outfit/deathmatch_loadout/heresy/warrior
+ name = "Deathmatch: Heretic Warrior"
+ display_name = "Heretic Warrior"
+ desc = "Prove the furious strength of the Mansus."
+ //species_override = /datum/species/plasmaman
+
+ head = /obj/item/clothing/head/hooded/cult_hoodie/eldritch
+ neck = /obj/item/clothing/neck/heretic_focus
+ suit = /obj/item/clothing/suit/hooded/cultrobes/eldritch
+ suit_store = /obj/item/melee/sickly_blade/dark
+ uniform = /obj/item/clothing/under/color/darkgreen
+ id_trim = null
+ belt = /obj/item/melee/sickly_blade/ash
+ gloves = null
+ shoes = /obj/item/clothing/shoes/sandal
+ l_pocket = /obj/item/flashlight/lantern/jade/on
+ r_pocket = /obj/item/melee/rune_carver
+ l_hand = null
+
+ back = /obj/item/storage/backpack
+
+ backpack_contents = list(
+ /obj/item/reagent_containers/cup/beaker/eldritch,
+ /obj/item/reagent_containers/cup/beaker/eldritch,
+ /obj/item/eldritch_potion/wounded,
+ /obj/item/eldritch_potion/wounded,
+ )
+
+ // I mean is it really that bad if they don't even know half this stuff is added to them.
+ // It's like, forbidden knowledge. It fits with the mansus theme - great excuse for poor design!
+ knowledge_to_grant = list(
+ /datum/heretic_knowledge/duel_stance,
+ /datum/heretic_knowledge/blade_grasp,
+ /datum/heretic_knowledge/blade_dance,
+ /datum/heretic_knowledge/blade_upgrade/blade,
+ )
+
+ spells_to_add = list(
+ /datum/action/cooldown/spell/touch/mansus_grasp,
+ /datum/action/cooldown/spell/realignment,
+ /datum/action/cooldown/spell/pointed/projectile/furious_steel,
+ /datum/action/cooldown/spell/charged/beam/fire_blast,
+ /datum/action/cooldown/spell/aoe/fiery_rebirth,
+ /datum/action/cooldown/spell/cone/staggered/entropic_plume,
+ /datum/action/cooldown/spell/pointed/rust_construction,
+ )
+
+// Heretic Scribe
+
+// Has spells of Void, Moon, and Cosmos. Overall defensive/mobile
+
+/datum/outfit/deathmatch_loadout/heresy/scribe
+ name = "Deathmatch: Heretic Scribe"
+ display_name = "Heretic Scribe"
+ desc = "Reveal the forgotten knowledge of the Mansus."
+
+ head = /obj/item/clothing/head/helmet/chaplain/witchunter_hat
+ mask = /obj/item/clothing/mask/madness_mask
+ neck = /obj/item/clothing/neck/eldritch_amulet
+ suit = /obj/item/clothing/suit/hooded/cultrobes/void
+ suit_store = /obj/item/melee/sickly_blade
+ uniform = /obj/item/clothing/under/costume/gamberson/military
+ id_trim = null
+ belt = /obj/item/storage/belt/unfathomable_curio
+ gloves = null
+ shoes = /obj/item/clothing/shoes/winterboots/ice_boots
+ l_pocket = /obj/item/ammo_box/strilka310/lionhunter
+ r_pocket = /obj/item/codex_cicatrix
+
+ back = /obj/item/gun/ballistic/rifle/lionhunter // for his neutral b, he wields a gun
+
+ belt_contents = list(
+ /obj/item/heretic_labyrinth_handbook,
+ /obj/item/heretic_labyrinth_handbook,
+ /obj/item/eldritch_potion/crucible_soul,
+ /obj/item/clothing/neck/heretic_focus/moon_amulet = 3,
+ )
+
+ knowledge_to_grant = list(
+ /datum/heretic_knowledge/cosmic_grasp,
+ /datum/heretic_knowledge/moon_grasp,
+ /datum/heretic_knowledge/mark/moon_mark,
+ )
+
+ spells_to_add = list(
+ /datum/action/cooldown/spell/touch/mansus_grasp,
+ /datum/action/cooldown/spell/conjure/cosmic_expansion,
+ /datum/action/cooldown/spell/pointed/projectile/star_blast,
+ /datum/action/cooldown/spell/touch/star_touch,
+ /datum/action/cooldown/spell/cone/staggered/cone_of_cold/void,
+ /datum/action/cooldown/spell/aoe/void_pull,
+ )
+
+// Chaplain! No spells (other than smoke), but strong armor and weapons, and immune to others' spells
+
+/datum/outfit/deathmatch_loadout/holy_crusader
+ name = "Deathmatch: Holy Crusader"
+ display_name = "Holy Crusader"
+ desc = "Smite the heathens!!"
+ //species_override = /datum/species/plasmaman
+
+ head = /obj/item/clothing/head/helmet/chaplain
+ neck = /obj/item/camera/spooky
+ suit = /obj/item/clothing/suit/chaplainsuit/armor/templar
+ suit_store = /obj/item/book/bible/booze
+ uniform = /obj/item/clothing/under/rank/civilian/chaplain
+ id_trim = null
+ belt = /obj/item/nullrod // choose any!
+ gloves = /obj/item/clothing/gloves/plate
+ shoes = /obj/item/clothing/shoes/plate
+ l_pocket = /obj/item/flashlight/lantern/on
+ r_pocket = /obj/item/reagent_containers/cup/glass/bottle/holywater
+ l_hand = /obj/item/shield/buckler
+
+ back = /obj/item/claymore/weak // or don't
+
+ spells_to_add = list(
+ /datum/action/cooldown/spell/smoke/lesser
+ )
+ mutations_to_add = list(
+ /datum/mutation/human/medieval,
+ /datum/mutation/human/lay_on_hands, // useless, but fun
+ )
+
+// Rat'var Apostate
+
+/datum/outfit/deathmatch_loadout/clock_cult
+ name = "Deathmatch: Clock Cultist"
+ display_name = "Rat'var Apostate"
+ desc = "You're in a fight between the servants of gods, and yours is dead. Good luck?"
+ //species_override = /datum/species/plasmaman
+
+ head = /obj/item/clothing/head/costume/bronze
+ suit = /obj/item/clothing/suit/costume/bronze
+ suit_store = /obj/item/toy/clockwork_watch
+ uniform = /obj/item/clothing/under/chameleon
+ id_trim = null
+ belt = /obj/item/brass_spear
+ gloves = /obj/item/clothing/gloves/tinkerer
+ shoes = /obj/item/clothing/shoes/bronze
+ l_pocket = /obj/item/reagent_containers/cup/beaker/synthflesh // they used to turn their dmg into tox with a spell. close enough
+ r_pocket = /obj/item/reagent_containers/cup/beaker/synthflesh
diff --git a/code/modules/deathmatch/deathmatch_lobby.dm b/code/modules/deathmatch/deathmatch_lobby.dm
index ffc41c887162d..76c8eb5561c08 100644
--- a/code/modules/deathmatch/deathmatch_lobby.dm
+++ b/code/modules/deathmatch/deathmatch_lobby.dm
@@ -285,7 +285,7 @@
/datum/deathmatch_lobby/proc/join(mob/player)
if (playing || !player)
return
- if(!(player.ckey in players+observers))
+ if(!(player.ckey in (players+observers)))
if (players.len >= map.max_players)
add_observer(player)
else
diff --git a/code/modules/deathmatch/deathmatch_mapping.dm b/code/modules/deathmatch/deathmatch_mapping.dm
index 9f006e1524295..b83419490be76 100644
--- a/code/modules/deathmatch/deathmatch_mapping.dm
+++ b/code/modules/deathmatch/deathmatch_mapping.dm
@@ -11,9 +11,6 @@
/obj/effect/landmark/deathmatch_player_spawn
name = "Deathmatch Player Spawner"
-/area/deathmatch/teleport //Prevent access to cross-z teleportation in the map itself (no wands of safety/teleportation scrolls). Cordons should prevent same-z teleportations outside of the arena.
- area_flags = /area/deathmatch::area_flags & ~NOTELEPORT
-
// for the illusion of a moving train
/turf/open/chasm/true/no_smooth/fake_motion_sand
name = "air"
@@ -25,3 +22,12 @@
/turf/open/chasm/true/no_smooth/fake_motion_sand/fast
icon_state = "sandmovingfast"
base_icon_state = "sandmovingfast"
+
+// fakeout
+
+/turf/open/chasm/true/fakeout
+ name = /turf/open/floor/wood::name
+ // desc kept the same
+ icon_state = /turf/open/floor/wood::icon_state
+ base_icon_state = /turf/open/floor/wood::base_icon_state
+ icon = /turf/open/floor/wood::icon
diff --git a/code/modules/deathmatch/deathmatch_maps.dm b/code/modules/deathmatch/deathmatch_maps.dm
index 6a8a245abb795..da08ae0b3114c 100644
--- a/code/modules/deathmatch/deathmatch_maps.dm
+++ b/code/modules/deathmatch/deathmatch_maps.dm
@@ -1,6 +1,7 @@
-/datum/lazy_template/deathmatch //deathmatch maps that have any possibility of the walls being destroyed should use indestructible walls, because baseturf moment
+/datum/lazy_template/deathmatch
map_dir = "_maps/deathmatch"
place_on_top = TRUE
+ turf_reservation_type = /datum/turf_reservation/turf_not_baseturf
/// Map UI Name
var/name
/// Map Description
@@ -16,7 +17,6 @@
/// whether we are currently being loaded by a lobby
var/template_in_use = FALSE
-
/datum/lazy_template/deathmatch/ragecage
name = "Ragecage"
desc = "Fun for the whole family, the classic ragecage."
@@ -204,5 +204,45 @@
map_name = "finaldestination"
key = "finaldestination"
+/datum/lazy_template/deathmatch/species_warfare
+ name = "Species Warfare"
+ desc = "Choose your favorite species and prove its superiority against all the other, lamer species. And also anyone else of your own."
+ max_players = 8
+ allowed_loadouts = list(
+ /datum/outfit/deathmatch_loadout/humanity,
+ /datum/outfit/deathmatch_loadout/lizardkind,
+ /datum/outfit/deathmatch_loadout/mothman,
+ /datum/outfit/deathmatch_loadout/ethereal,
+ /datum/outfit/deathmatch_loadout/plasmamen,
+ /datum/outfit/deathmatch_loadout/felinid,
+ )
+ map_name = "species_warfare"
+ key = "species_warfare"
+
+/datum/lazy_template/deathmatch/lattice_battles
+ name = "Lattice Battles"
+ desc = "Tired of fisticuffs all the time? Just snip the catwalk underneath instead!"
+ max_players = 8
+ allowed_loadouts = list(
+ /datum/outfit/deathmatch_loadout/lattice_battles,
+ )
+ map_name = "lattice_battles"
+ key = "lattice_battles"
+
+/datum/lazy_template/deathmatch/ragnarok
+ name = "Ragnarok"
+ desc = "Cultists, heretics, and chaplains all duking it out in the jungle to retrieve the McGuffin."
+ max_players = 8
+ allowed_loadouts = list(
+ /datum/outfit/deathmatch_loadout/cultish/invoker,
+ /datum/outfit/deathmatch_loadout/cultish/artificer,
+ /datum/outfit/deathmatch_loadout/heresy/warrior,
+ /datum/outfit/deathmatch_loadout/heresy/scribe,
+ /datum/outfit/deathmatch_loadout/holy_crusader,
+ /datum/outfit/deathmatch_loadout/clock_cult,
+ )
+ map_name = "ragnarok"
+ key = "ragnarok"
+
/datum/turf_reservation/indestructible_plating
turf_type = /turf/open/indestructible/plating //a little hacky but i guess it has to be done
diff --git a/code/modules/deathmatch/deathmatch_modifier.dm b/code/modules/deathmatch/deathmatch_modifier.dm
index dadca49d70a4f..9faafa91a48b7 100644
--- a/code/modules/deathmatch/deathmatch_modifier.dm
+++ b/code/modules/deathmatch/deathmatch_modifier.dm
@@ -232,7 +232,7 @@
projectile.ricochets_max += 2
projectile.min_ricochets += 2
projectile.ricochet_incidence_leeway = 0
- ADD_TRAIT(projectile, TRAIT_ALWAYS_HIT_ZONE, DEATHMATCH_TRAIT)
+ projectile.accuracy_falloff = 0
/datum/deathmatch_modifier/stormtrooper
name = "Stormtrooper Aim"
diff --git a/code/modules/events/aurora_caelus.dm b/code/modules/events/aurora_caelus.dm
index 0acb0ad9781a7..875b8c0dcf23a 100644
--- a/code/modules/events/aurora_caelus.dm
+++ b/code/modules/events/aurora_caelus.dm
@@ -17,10 +17,12 @@
start_when = 21
end_when = 80
-/datum/round_event/aurora_caelus/announce()
+/datum/round_event/aurora_caelus/announce(fake)
priority_announce("[station_name()]: A harmless cloud of ions is approaching your station, and will exhaust their energy battering the hull. Nanotrasen has approved a short break for all employees to relax and observe this very rare event. During this time, starlight will be bright but gentle, shifting between quiet green and blue colors. Any staff who would like to view these lights for themselves may proceed to the area nearest to them with viewing ports to open space. We hope you enjoy the lights.",
sound = 'sound/misc/notice2.ogg',
sender_override = "Nanotrasen Meteorology Division")
+ if (fake)
+ return
for(var/V in GLOB.player_list)
var/mob/M = V
if((M.client.prefs.read_preference(/datum/preference/toggle/sound_midi)) && is_station_level(M.z))
@@ -31,6 +33,8 @@
/datum/round_event/aurora_caelus/start()
if(!prob(1) && !check_holidays(APRIL_FOOLS))
return
+
+ var/list/human_blacklist = list()
for(var/area/station/service/kitchen/affected_area in GLOB.areas)
var/obj/machinery/oven/roast_ruiner = locate() in affected_area
if(roast_ruiner)
@@ -40,10 +44,13 @@
message_admins("Aurora Caelus event caused an oven to ignite at [ADMIN_VERBOSEJMP(ruined_roast)].")
log_game("Aurora Caelus event caused an oven to ignite at [loc_name(ruined_roast)].")
announce_to_ghosts(roast_ruiner)
- for(var/mob/living/carbon/human/seymour as anything in GLOB.human_list)
- if(seymour.mind && istype(seymour.mind.assigned_role, /datum/job/cook))
- seymour.say("My roast is ruined!!!", forced = "ruined roast")
- seymour.emote("scream")
+ for(var/mob/living/carbon/human/seymour in viewers(roast_ruiner, 7))
+ if (seymour in human_blacklist)
+ continue
+ human_blacklist += seymour
+ if(seymour.mind && istype(seymour.mind.assigned_role, /datum/job/cook))
+ seymour.say("My roast is ruined!!!", forced = "ruined roast")
+ seymour.emote("scream")
/datum/round_event/aurora_caelus/tick()
if(activeFor % 8 != 0)
diff --git a/code/modules/events/ghost_role/sentience.dm b/code/modules/events/ghost_role/sentience.dm
index 4017361dba51a..092813008458a 100644
--- a/code/modules/events/ghost_role/sentience.dm
+++ b/code/modules/events/ghost_role/sentience.dm
@@ -3,6 +3,7 @@ GLOBAL_LIST_INIT(high_priority_sentience, typecacheof(list(
/mob/living/basic/butterfly,
/mob/living/basic/carp/pet/cayenne,
/mob/living/basic/chicken,
+ /mob/living/basic/crab,
/mob/living/basic/cow,
/mob/living/basic/goat,
/mob/living/basic/lizard,
@@ -18,6 +19,7 @@ GLOBAL_LIST_INIT(high_priority_sentience, typecacheof(list(
/mob/living/simple_animal/bot/secbot/beepsky,
/mob/living/simple_animal/hostile/retaliate/goose/vomit,
/mob/living/basic/bear/snow/misha,
+ /mob/living/basic/mining/lobstrosity/juvenile,
)))
/datum/round_event_control/sentience
diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm
index 686adf1e5d3f6..9c9d81d01d73f 100644
--- a/code/modules/events/ion_storm.dm
+++ b/code/modules/events/ion_storm.dm
@@ -34,7 +34,7 @@
//AI laws
for(var/mob/living/silicon/ai/M in GLOB.alive_mob_list)
M.laws_sanity_check()
- if(M.stat != DEAD && !M.incapacitated())
+ if(M.stat != DEAD && !M.incapacitated)
if(prob(replaceLawsetChance))
var/datum/ai_laws/ion_lawset = pick_weighted_lawset()
// pick_weighted_lawset gives us a typepath,
diff --git a/code/modules/events/space_vines/vine_event.dm b/code/modules/events/space_vines/vine_event.dm
index c4c805b1667e2..ce9881c990797 100644
--- a/code/modules/events/space_vines/vine_event.dm
+++ b/code/modules/events/space_vines/vine_event.dm
@@ -39,7 +39,7 @@
for(var/area/station/hallway/area in GLOB.areas)
for(var/turf/open/floor in area.get_turfs_from_all_zlevels())
- if(floor.Enter(vine))
+ if(!isopenspaceturf(floor) && floor.Enter(vine))
turfs += floor
qdel(vine)
@@ -64,7 +64,7 @@
/datum/event_admin_setup/set_location/spacevine/apply_to_event(datum/round_event/spacevine/event)
event.override_turf = chosen_turf
-
+
/datum/event_admin_setup/multiple_choice/spacevine
input_text = "Select starting mutations."
min_choices = 0
@@ -88,7 +88,7 @@
type_choices += text2path(choice)
event.mutations_overridden = TRUE
event.override_mutations = type_choices
-
+
/datum/event_admin_setup/input_number/spacevine_potency
input_text = "Set vine's potency (effects mutation frequency + max severity)"
max_value = 100
diff --git a/code/modules/experisci/experiment/handlers/experiment_handler.dm b/code/modules/experisci/experiment/handlers/experiment_handler.dm
index 622d84551a285..bb0cc2fb0a5e3 100644
--- a/code/modules/experisci/experiment/handlers/experiment_handler.dm
+++ b/code/modules/experisci/experiment/handlers/experiment_handler.dm
@@ -355,7 +355,7 @@
)
.["experiments"] += list(data)
-/datum/component/experiment_handler/ui_act(action, params)
+/datum/component/experiment_handler/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if (.)
return
diff --git a/code/modules/explorer_drone/control_console.dm b/code/modules/explorer_drone/control_console.dm
index 8cc8854f27dc8..78451dd71a168 100644
--- a/code/modules/explorer_drone/control_console.dm
+++ b/code/modules/explorer_drone/control_console.dm
@@ -97,7 +97,7 @@
icon_screen = initial(icon_screen)
. = ..()
-/obj/machinery/computer/exodrone_control_console/ui_act(action, list/params)
+/obj/machinery/computer/exodrone_control_console/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/explorer_drone/exodrone.dm b/code/modules/explorer_drone/exodrone.dm
index 5754ccc4a5e18..8ba0f64b4a6f6 100644
--- a/code/modules/explorer_drone/exodrone.dm
+++ b/code/modules/explorer_drone/exodrone.dm
@@ -63,12 +63,15 @@ GLOBAL_LIST_EMPTY(exodrone_launchers)
/obj/item/exodrone/Initialize(mapload)
. = ..()
- name = pick(strings(EXODRONE_FILE,"probe_names"))
- if(name_counter[name])
- name_counter[name]++
- name = "[name] \Roman[name_counter[name]]"
+ if(name == /obj/item/exodrone::name)
+ name = pick(strings(EXODRONE_FILE,"probe_names"))
+ if(name_counter[name])
+ name_counter[name]++
+ name = "[name] \Roman[name_counter[name]]"
+ else
+ name_counter[name] = 1
else
- name_counter[name] = 1
+ name = name
GLOB.exodrones += src
// Cargo storage
create_storage(max_slots = EXODRONE_CARGO_SLOTS, canthold = GLOB.blacklisted_cargo_types)
diff --git a/code/modules/explorer_drone/scanner_array.dm b/code/modules/explorer_drone/scanner_array.dm
index 6317ee273bed4..0cbeb684a8c6e 100644
--- a/code/modules/explorer_drone/scanner_array.dm
+++ b/code/modules/explorer_drone/scanner_array.dm
@@ -121,7 +121,7 @@ GLOBAL_LIST_INIT(scan_conditions,init_scan_conditions())
. = ..()
.["all_bands"] = GLOB.exoscanner_bands
-/obj/machinery/computer/exoscanner_control/ui_act(action, list/params)
+/obj/machinery/computer/exoscanner_control/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/fishing/admin.dm b/code/modules/fishing/admin.dm
index ba5c29a7fd172..f4643201a7788 100644
--- a/code/modules/fishing/admin.dm
+++ b/code/modules/fishing/admin.dm
@@ -51,7 +51,7 @@ ADMIN_VERB(fishing_calculator, R_DEBUG, "Fishing Calculator", "A calculator... f
temporary_rod.set_slot(new line_type(temporary_rod), ROD_SLOT_LINE)
var/result_table = list()
- var/modified_table = spot.get_modified_fish_table(temporary_rod,user)
+ var/modified_table = spot.get_modified_fish_table(temporary_rod, user, null)
for(var/result_type in spot.fish_table) // through this not modified to display 0 chance ones too
var/list/info = list()
info["result"] = result_type
diff --git a/code/modules/fishing/aquarium/aquarium.dm b/code/modules/fishing/aquarium/aquarium.dm
index 5afbf4b72d9a9..0d2cd462128d4 100644
--- a/code/modules/fishing/aquarium/aquarium.dm
+++ b/code/modules/fishing/aquarium/aquarium.dm
@@ -307,14 +307,30 @@
/obj/structure/aquarium/ui_data(mob/user)
. = ..()
- .["fluid_type"] = fluid_type
+ .["fluidType"] = fluid_type
.["temperature"] = fluid_temp
- .["allow_breeding"] = allow_breeding
- .["feeding_interval"] = feeding_interval / (1 MINUTES)
- var/list/content_data = list()
- for(var/atom/movable/fish in contents)
- content_data += list(list("name"=fish.name,"ref"=ref(fish)))
- .["contents"] = content_data
+ .["allowBreeding"] = allow_breeding
+ .["fishData"] = list()
+ .["feedingInterval"] = feeding_interval / (1 MINUTES)
+ .["propData"] = list()
+ for(var/atom/movable/item in contents)
+ if(isfish(item))
+ var/obj/item/fish/fish = item
+ .["fishData"] += list(list(
+ "fish_ref" = REF(fish),
+ "fish_name" = fish.name,
+ "fish_happiness" = fish.get_happiness_value(),
+ "fish_icon" = fish::icon,
+ "fish_icon_state" = fish::icon_state,
+ "fish_health" = fish.health,
+ ))
+ continue
+ .["propData"] += list(list(
+ "prop_ref" = REF(item),
+ "prop_name" = item.name,
+ "prop_icon" = item::icon,
+ "prop_icon_state" = item::icon_state,
+ ))
/obj/structure/aquarium/ui_static_data(mob/user)
. = ..()
@@ -322,8 +338,9 @@
.["minTemperature"] = min_fluid_temp
.["maxTemperature"] = max_fluid_temp
.["fluidTypes"] = fluid_types
+ .["heartIcon"] = 'icons/effects/effects.dmi'
-/obj/structure/aquarium/ui_act(action, params)
+/obj/structure/aquarium/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
@@ -345,14 +362,19 @@
if("feeding_interval")
feeding_interval = params["feeding_interval"] MINUTES
. = TRUE
- if("remove")
- var/atom/movable/inside = locate(params["ref"]) in contents
- if(inside)
- if(isitem(inside))
- user.put_in_hands(inside)
- else
- inside.forceMove(get_turf(src))
- to_chat(user,span_notice("You take out [inside] from [src]."))
+ if("pet_fish")
+ var/obj/item/fish/fish = locate(params["fish_reference"]) in contents
+ fish?.pet_fish(user)
+ if("remove_item")
+ var/atom/movable/item = locate(params["item_reference"]) in contents
+ item?.forceMove(drop_location())
+ to_chat(user, span_notice("You take out [item] from [src]."))
+ if("rename_fish")
+ var/new_name = sanitize_name(params["chosen_name"])
+ if(!new_name)
+ return
+ var/atom/movable/fish = locate(params["fish_reference"]) in contents
+ fish.name = new_name
/obj/structure/aquarium/ui_interact(mob/user, datum/tgui/ui)
. = ..()
@@ -399,9 +421,13 @@
new /obj/item/aquarium_prop/sand(src)
new /obj/item/aquarium_prop/seaweed(src)
- new /obj/item/fish/goldfish/gill(src)
+ if(prob(85))
+ new /obj/item/fish/goldfish/gill(src)
+ reagents.add_reagent(/datum/reagent/consumable/nutriment, 2)
+ else
+ new /obj/item/fish/goldfish/three_eyes/gill(src)
+ reagents.add_reagent(/datum/reagent/toxin/mutagen, 2) //three eyes goldfish feed on mutagen.
- reagents.add_reagent(/datum/reagent/consumable/nutriment, 2)
/obj/structure/aquarium/prefilled
anchored = TRUE
diff --git a/code/modules/fishing/aquarium/aquarium_kit.dm b/code/modules/fishing/aquarium/aquarium_kit.dm
index 1161648f7d15f..3257760f6a439 100644
--- a/code/modules/fishing/aquarium/aquarium_kit.dm
+++ b/code/modules/fishing/aquarium/aquarium_kit.dm
@@ -21,15 +21,15 @@
desc = "A resizable case keeping the fish inside in stasis."
icon = 'icons/obj/storage/case.dmi'
icon_state = "fishbox"
-
+ w_class = WEIGHT_CLASS_SMALL
inhand_icon_state = "syringe_kit"
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
- storage_type = /datum/storage/fish_case
+ storage_type = /datum/storage/fish_case/adjust_size
/obj/item/storage/fish_case/Initialize(mapload)
- ADD_TRAIT(src, TRAIT_FISH_SAFE_STORAGE, TRAIT_GENERIC) // Before populate so fish instatiates in ready container already
- return ..()
+ . = ..()
+ AddElement(/datum/element/fish_safe_storage)
/obj/item/storage/fish_case/PopulateContents()
var/fish_type = get_fish_type()
@@ -58,7 +58,7 @@
name = "ominous fish case"
/obj/item/storage/fish_case/syndicate/get_fish_type()
- return pick(/obj/item/fish/donkfish, /obj/item/fish/emulsijack, /obj/item/fish/jumpercable)
+ return pick(/obj/item/fish/donkfish, /obj/item/fish/emulsijack, /obj/item/fish/jumpercable, /obj/item/fish/chainsawfish)
/obj/item/storage/fish_case/tiziran
name = "imported fish case"
@@ -91,6 +91,13 @@
for(var/obj/item/fish/fish as anything in contents)
fish.set_status(FISH_DEAD)
+/obj/item/storage/fish_case/bluespace
+ name = "bluespace fish case"
+ icon_state = "fishbox_bluespace"
+ desc = "An improved fish case to keep large fish in stasis in a compact little space."
+ w_class = WEIGHT_CLASS_NORMAL
+ storage_type = /datum/storage/fish_case
+
/obj/item/aquarium_kit
name = "DIY Aquarium Construction Kit"
desc = "Everything you need to build your own aquarium. Raw materials sold separately."
@@ -109,6 +116,7 @@
icon = 'icons/obj/aquarium/supplies.dmi'
w_class = WEIGHT_CLASS_TINY
+ custom_materials = list(/datum/material/plastic = COIN_MATERIAL_AMOUNT)
var/layer_mode = AQUARIUM_LAYER_MODE_BOTTOM
var/beauty = 150
@@ -117,32 +125,37 @@
AddComponent(/datum/component/aquarium_content, icon, beauty = beauty)
/obj/item/aquarium_prop/rocks
- name = "rocks"
+ name = "decorative rocks"
+ desc = "A bunch of tiny plastic rocks for decorating an aquarium. Surely you could have just used real pebbles?"
icon_state = "rocks"
-/obj/item/aquarium_prop/seaweed_top
- name = "dense seaweeds"
- icon_state = "seaweeds_front"
- layer_mode = AQUARIUM_LAYER_MODE_TOP
-
/obj/item/aquarium_prop/seaweed
- name = "seaweeds"
+ name = "fake seaweed"
+ desc = "Little plastic sheets with weighted bottoms, designed to look like underwater foliage. They can be used to spruce up an aquarium."
icon_state = "seaweeds_back"
layer_mode = AQUARIUM_LAYER_MODE_BOTTOM
+/obj/item/aquarium_prop/seaweed/top
+ desc = "A bunch of artificial plants for an aquarium."
+ icon_state = "seaweeds_front"
+ layer_mode = AQUARIUM_LAYER_MODE_TOP
+
/obj/item/aquarium_prop/sand
name = "aquarium sand"
+ desc = "A plastic board for lining the bottom of an aquarium. It's got a bumpy patterned surface vaguely reminiscent of yellow sand."
icon_state = "sand"
layer_mode = AQUARIUM_LAYER_MODE_BEHIND_GLASS
/obj/item/aquarium_prop/treasure
name = "tiny treasure chest"
+ desc = "A very small plastic treaure chest, with nothing inside. You could put this in an aquarium, and it'll look like very small pirates hid treasure in there. Wouldn't that be nice?"
icon_state = "treasure"
layer_mode = AQUARIUM_LAYER_MODE_BOTTOM
/obj/item/storage/box/aquarium_props
name = "aquarium props box"
desc = "All you need to make your aquarium look good."
+ illustration = "fish"
/obj/item/storage/box/aquarium_props/PopulateContents()
for(var/prop_type in subtypesof(/obj/item/aquarium_prop))
diff --git a/code/modules/fishing/aquarium/fish_analyzer.dm b/code/modules/fishing/aquarium/fish_analyzer.dm
index f59f1901b8563..3d01479ef5a2f 100644
--- a/code/modules/fishing/aquarium/fish_analyzer.dm
+++ b/code/modules/fishing/aquarium/fish_analyzer.dm
@@ -65,6 +65,7 @@
if(isfish(target) || istype(target, /obj/structure/aquarium))
scanned_item = WEAKREF(target)
+ SEND_SIGNAL(src, COMSIG_FISH_ANALYZER_ANALYZE_STATUS, target, user)
ui_interact(user)
return ITEM_INTERACT_SUCCESS
diff --git a/code/modules/fishing/bait.dm b/code/modules/fishing/bait.dm
index b67298fab9fea..8fb66ad4c3d22 100644
--- a/code/modules/fishing/bait.dm
+++ b/code/modules/fishing/bait.dm
@@ -3,13 +3,16 @@
desc = "there's a lot of them in there, getting them out takes a while though"
icon = 'icons/obj/fishing.dmi'
icon_state = "bait_can"
+ base_icon_state = "bait_can"
w_class = WEIGHT_CLASS_SMALL
/// Tracking until we can take out another bait item
COOLDOWN_DECLARE(bait_removal_cooldown)
/// What bait item it produces
- var/bait_type
+ var/obj/item/bait_type = /obj/item/food/bait
/// Time between bait retrievals
- var/cooldown_time = 10 SECONDS
+ var/cooldown_time = 5 SECONDS
+ /// How many uses does it have left.
+ var/uses_left = 20
/obj/item/bait_can/attack_self(mob/user, modifiers)
. = ..()
@@ -17,19 +20,280 @@
if(fresh_bait)
user.put_in_hands(fresh_bait)
+/obj/item/bait_can/examine(mob/user)
+ . = ..()
+ . += span_info("It[uses_left ? " has got [uses_left] [bait_type::name] left" : "'s empty"].")
+
+/obj/item/bait_can/update_icon_state()
+ . = ..()
+ icon_state = base_icon_state
+ if(uses_left <= initial(uses_left))
+ if(!uses_left)
+ icon_state = "[icon_state]_empty"
+ else
+ icon_state = "[icon_state]_open"
+
/obj/item/bait_can/proc/retrieve_bait(mob/user)
+ if(!uses_left)
+ user.balloon_alert(user, "empty")
+ return
if(!COOLDOWN_FINISHED(src, bait_removal_cooldown))
- user.balloon_alert(user, "wait a bit") //I can't think of generic ic reason.
+ user.balloon_alert(user, "wait a bit")
return
COOLDOWN_START(src, bait_removal_cooldown, cooldown_time)
+ update_appearance()
+ uses_left--
return new bait_type(src)
/obj/item/bait_can/worm
name = "can o' worm"
- desc = "this can got worms."
+ desc = "This can got worms."
bait_type = /obj/item/food/bait/worm
/obj/item/bait_can/worm/premium
name = "can o' worm deluxe"
- desc = "this can got fancy worms."
+ desc = "This can got fancy worms."
bait_type = /obj/item/food/bait/worm/premium
+
+/obj/item/bait_can/super_baits
+ name = "can o' super-baits"
+ desc = "This can got the nectar of god."
+ bait_type = /obj/item/food/bait/doughball/synthetic/super
+ uses_left = 12
+
+/obj/item/fishing_lure
+ name = "artificial minnow"
+ desc = "A fishing lure meant to attract smaller omnivore fish."
+ icon = 'icons/obj/fishing.dmi'
+ icon_state = "minnow"
+ w_class = WEIGHT_CLASS_SMALL
+ /**
+ * A list with two keys delimiting the spinning interval in which a mouse click has to be pressed while fishing.
+ * This is passed down to the fishing rod, and then to the lure during the minigame.
+ */
+ var/spin_frequency = list(2 SECONDS, 3 SECONDS)
+
+/obj/item/fishing_lure/Initialize(mapload)
+ . = ..()
+ add_traits(list(TRAIT_FISHING_BAIT, TRAIT_BAIT_ALLOW_FISHING_DUD, TRAIT_OMNI_BAIT, TRAIT_BAIT_UNCONSUMABLE), INNATE_TRAIT)
+ RegisterSignal(src, COMSIG_FISHING_EQUIPMENT_SLOTTED, PROC_REF(lure_equipped))
+
+/obj/item/fishing_lure/proc/lure_equipped(datum/source, obj/item/fishing_rod/rod)
+ SIGNAL_HANDLER
+ rod.spin_frequency = spin_frequency
+ RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(on_removed))
+
+/obj/item/fishing_lure/proc/on_removed(atom/movable/source, obj/item/fishing_rod/rod, dir, forced)
+ SIGNAL_HANDLER
+ UnregisterSignal(src, COMSIG_MOVABLE_MOVED)
+ rod.spin_frequency = null
+
+///Called for every fish subtype by the fishing subsystem when initializing, to populate the list of fish that can be catched with this lure.
+/obj/item/fishing_lure/proc/is_catchable_fish(obj/item/fish/fish_type, list/fish_properties)
+ var/avg_size = initial(fish_type.average_size)
+ var/intermediate_size = FISH_SIZE_SMALL_MAX + (FISH_SIZE_NORMAL_MAX - FISH_SIZE_SMALL_MAX)
+ if(!ISINRANGE(avg_size, FISH_SIZE_TINY_MAX * 0.5, intermediate_size))
+ return FALSE
+ var/list/fish_traits = fish_properties[FISH_PROPERTIES_TRAITS]
+ if(length(list(/datum/fish_trait/vegan, /datum/fish_trait/picky_eater, /datum/fish_trait/nocturnal, /datum/fish_trait/heavy) & fish_traits))
+ return FALSE
+ return TRUE
+
+/obj/item/fishing_lure/examine(mob/user)
+ . = ..()
+ . += span_info("It has to be spun with a frequency of [spin_frequency[1] * 0.1] to [spin_frequency[2] * 0.1] seconds while fishing.")
+ if(HAS_MIND_TRAIT(user, TRAIT_EXAMINE_FISHING_SPOT))
+ . += span_tinynotice("Thanks to your experience, you can examine it again to get a list of fish you can catch with it.")
+
+/obj/item/fishing_lure/examine_more(mob/user)
+ . = ..()
+ if(!HAS_MIND_TRAIT(user, TRAIT_EXAMINE_FISHING_SPOT))
+ return
+
+ var/list/known_fishes = list()
+ for(var/obj/item/fish/fish_type as anything in SSfishing.lure_catchables[type])
+ if(initial(fish_type.show_in_catalog))
+ known_fishes += initial(fish_type.name)
+
+ if(!length(known_fishes))
+ return
+
+ . += span_info("You can catch the following fish with this lure: [english_list(known_fishes)].")
+
+///Check if the fish is in the list of catchable fish for this fishing lure. Return value is a multiplier.
+/obj/item/fishing_lure/check_bait(obj/item/fish/fish_type)
+ var/multiplier = 0
+ if(is_type_in_list(/obj/item/fishing_lure, SSfishing.fish_properties[fish_type][FISH_PROPERTIES_FAV_BAIT]))
+ multiplier += 2
+ if(fish_type in SSfishing.lure_catchables[type])
+ multiplier += 10
+ return multiplier
+
+/obj/item/fishing_lure/plug
+ name = "big plug lure"
+ desc = "A fishing lure used to catch larger omnivore fish."
+ icon_state = "plug"
+
+/obj/item/fishing_lure/plug/is_catchable_fish(obj/item/fish/fish_type, list/fish_properties)
+ var/avg_size = initial(fish_type.average_size)
+ if(avg_size <= FISH_SIZE_SMALL_MAX)
+ return FALSE
+ var/list/fish_traits = fish_properties[FISH_PROPERTIES_TRAITS]
+ if(length(list(/datum/fish_trait/vegan, /datum/fish_trait/picky_eater, /datum/fish_trait/nocturnal, /datum/fish_trait/heavy) & fish_traits))
+ return FALSE
+ return TRUE
+
+/obj/item/fishing_lure/dropping
+ name = "plastic dropping"
+ desc = "A fishing lure to catch all sort of slimy, ratty, disgusting and/or junk-loving fish."
+ icon_state = "dropping"
+ spin_frequency = list(1.5 SECONDS, 2.5 SECONDS)
+
+/obj/item/fishing_lure/dropping/is_catchable_fish(obj/item/fish/fish_type, list/fish_properties)
+ var/list/sources = list(/datum/fish_source/toilet, /datum/fish_source/moisture_trap)
+ for(var/datum/fish_source/source as anything in sources)
+ var/datum/fish_source/instance = GLOB.preset_fish_sources[/datum/fish_source/toilet]
+ if(fish_type in instance.fish_table)
+ return TRUE
+ var/list/fav_baits = fish_properties[FISH_PROPERTIES_FAV_BAIT]
+ for(var/list/identifier in fav_baits)
+ if(identifier[FISH_BAIT_TYPE] == FISH_BAIT_FOODTYPE && (identifier[FISH_BAIT_VALUE] & (JUNKFOOD|GROSS|TOXIC)))
+ return TRUE
+ if(initial(fish_type.beauty) <= FISH_BEAUTY_DISGUSTING)
+ return TRUE
+ return FALSE
+
+/obj/item/fishing_lure/spoon
+ name = "\improper Indy spoon lure"
+ desc = "A lustrous piece of metal mimicking the scales of a fish. Good for catching small to medium freshwater omnivore fish."
+ icon_state = "spoon"
+ spin_frequency = list(1.25 SECONDS, 2.1 SECONDS)
+
+/obj/item/fishing_lure/spoon/is_catchable_fish(obj/item/fish/fish_type, list/fish_properties)
+ var/avg_size = initial(fish_type.average_size)
+ if(!ISINRANGE(avg_size, FISH_SIZE_TINY_MAX + 1, FISH_SIZE_NORMAL_MAX))
+ return FALSE
+ var/list/fish_traits = fish_properties[FISH_PROPERTIES_TRAITS]
+ if(length(list(/datum/fish_trait/vegan, /datum/fish_trait/picky_eater, /datum/fish_trait/nocturnal, /datum/fish_trait/heavy) & fish_traits))
+ return FALSE
+ var/fluid_type = initial(fish_type.required_fluid_type)
+ if(fluid_type == AQUARIUM_FLUID_FRESHWATER || fluid_type == AQUARIUM_FLUID_ANADROMOUS || fluid_type == AQUARIUM_FLUID_ANY_WATER)
+ return TRUE
+ if((/datum/fish_trait/amphibious in fish_traits) && fluid_type == AQUARIUM_FLUID_AIR)
+ return TRUE
+ return FALSE
+
+/obj/item/fishing_lure/artificial_fly
+ name = "\improper Silkbuzz artificial fly"
+ desc = "A fishing lure resembling a large wooly fly. Good for catching all sort of picky fish."
+ icon_state = "artificial_fly"
+ spin_frequency = list(1.1 SECONDS, 1.9 SECONDS)
+
+/obj/item/fishing_lure/artificial_fly/is_catchable_fish(obj/item/fish/fish_type, list/fish_properties)
+ var/list/fish_traits = fish_properties[FISH_PROPERTIES_TRAITS]
+ if(/datum/fish_trait/picky_eater in fish_traits)
+ return TRUE
+ return FALSE
+
+/obj/item/fishing_lure/led
+ name = "\improper LED fishing lure"
+ desc = "A heavy, waterproof and fish-looking LED stick, used to catch abyssal and demersal fish alike."
+ icon_state = "led"
+ spin_frequency = list(3 SECONDS, 3.75 SECONDS)
+
+/obj/item/fishing_lure/led/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_BAIT_IGNORE_ENVIRONMENT, INNATE_TRAIT)
+ update_appearance(UPDATE_OVERLAYS)
+
+/obj/item/fishing_lure/led/update_overlays()
+ . = ..()
+ . += emissive_appearance(icon, "led_emissive", src)
+
+/obj/item/fishing_lure/led/is_catchable_fish(obj/item/fish/fish_type, list/fish_properties)
+ var/list/fish_traits = fish_properties[FISH_PROPERTIES_TRAITS]
+ if(length(list(/datum/fish_trait/nocturnal, /datum/fish_trait/heavy) & fish_traits))
+ return TRUE
+ return FALSE
+
+/obj/item/fishing_lure/lucky_coin
+ name = "\improper Maneki-Coin lure"
+ desc = "A faux-gold lure used to attract shiny-loving fish."
+ icon_state = "lucky_coin"
+ spin_frequency = list(1.5 SECONDS, 2.5 SECONDS)
+
+/obj/item/fishing_lure/lucky_coin/is_catchable_fish(obj/item/fish/fish_type, list/fish_properties)
+ var/list/fish_traits = fish_properties[FISH_PROPERTIES_TRAITS]
+ if(/datum/fish_trait/shiny_lover in fish_traits)
+ return TRUE
+ return FALSE
+
+/obj/item/fishing_lure/algae
+ name = "plastic algae lure"
+ desc = "A soft clump of fake algae used to attract herbivore water critters."
+ icon_state = "algae"
+ spin_frequency = list(3 SECONDS, 5 SECONDS)
+
+/obj/item/fishing_lure/algae/is_catchable_fish(obj/item/fish/fish_type, list/fish_properties)
+ var/list/fish_traits = fish_properties[FISH_PROPERTIES_TRAITS]
+ if(/datum/fish_trait/vegan in fish_traits)
+ return TRUE
+ return FALSE
+
+/obj/item/fishing_lure/grub
+ name = "\improper Twister Worm lure"
+ desc = "A soft plastic lure with the body of a grub and a twisting tail. Good for panfish and other small omnivore fish."
+ icon_state = "grub"
+ spin_frequency = list(1 SECONDS, 2.5 SECONDS)
+
+/obj/item/fishing_lure/grub/is_catchable_fish(obj/item/fish/fish_type, list/fish_properties)
+ if(initial(fish_type.average_size) >= FISH_SIZE_SMALL_MAX)
+ return FALSE
+ var/list/fish_traits = fish_properties[FISH_PROPERTIES_TRAITS]
+ if(length(list(/datum/fish_trait/vegan, /datum/fish_trait/picky_eater) & fish_traits))
+ return FALSE
+ return TRUE
+
+/obj/item/fishing_lure/buzzbait
+ name = "\improper Electric-Buzz lure"
+ desc = "A metallic, colored clanked attached to a series of cables that somehow attract shock-worthy fish."
+ icon_state = "buzzbait"
+ spin_frequency = list(0.8 SECONDS, 1.6 SECONDS)
+
+/obj/item/fishing_lure/buzzbait/is_catchable_fish(obj/item/fish/fish_type, list/fish_properties)
+ var/list/fish_traits = fish_properties[FISH_PROPERTIES_TRAITS]
+ if(/datum/fish_trait/electrogenesis in fish_traits)
+ return TRUE
+ return FALSE
+
+/obj/item/fishing_lure/spinnerbait
+ name = "spinnerbait lure"
+ desc = "A versatile lure, good for catching all sort of predatory freshwater fish."
+ icon_state = "spinnerbait"
+ spin_frequency = list(2 SECONDS, 4 SECONDS)
+
+/obj/item/fishing_lure/spinnerbait/is_catchable_fish(obj/item/fish/fish_type, list/fish_properties)
+ var/list/fish_traits = fish_properties[FISH_PROPERTIES_TRAITS]
+ if(!(/datum/fish_trait/predator in fish_traits))
+ return FALSE
+ var/init_fluid_type = initial(fish_type.required_fluid_type)
+ if(init_fluid_type == AQUARIUM_FLUID_FRESHWATER || init_fluid_type == AQUARIUM_FLUID_ANADROMOUS || init_fluid_type == AQUARIUM_FLUID_ANY_WATER)
+ return TRUE
+ if((/datum/fish_trait/amphibious in fish_traits) && init_fluid_type == AQUARIUM_FLUID_AIR) //fluid type is changed to freshwater on init
+ return TRUE
+ return FALSE
+
+/obj/item/fishing_lure/daisy_chain
+ name = "daisy chain lure"
+ desc = "A lure resembling a small school of fish, good for catching several saltwater predators."
+ icon_state = "daisy_chain"
+ spin_frequency = list(2 SECONDS, 4 SECONDS)
+
+/obj/item/fishing_lure/daisy_chain/is_catchable_fish(obj/item/fish/fish_type, list/fish_properties)
+ var/list/fish_traits = fish_properties[FISH_PROPERTIES_TRAITS]
+ if(!(/datum/fish_trait/predator in fish_traits))
+ return FALSE
+ var/init_fluid_type = initial(fish_type.required_fluid_type)
+ if(init_fluid_type == AQUARIUM_FLUID_SALTWATER || init_fluid_type == AQUARIUM_FLUID_ANADROMOUS || init_fluid_type == AQUARIUM_FLUID_ANY_WATER)
+ return TRUE
+ return FALSE
diff --git a/code/modules/fishing/fish/_fish.dm b/code/modules/fishing/fish/_fish.dm
index 19a20a40a816b..08d09188e6bdd 100644
--- a/code/modules/fishing/fish/_fish.dm
+++ b/code/modules/fishing/fish/_fish.dm
@@ -1,39 +1,44 @@
+#define FISH_SAD 0
+#define FISH_NEUTRAL 1
+#define FISH_SATISFIED 2
+#define FISH_HAPPY 3
+#define FISH_VERY_HAPPY 4
+
// Fish path used for autogenerated fish
/obj/item/fish
name = "generic looking aquarium fish"
desc = "very bland"
icon = 'icons/obj/aquarium/fish.dmi'
- icon_state = "bugfish"
lefthand_file = 'icons/mob/inhands/fish_lefthand.dmi'
righthand_file = 'icons/mob/inhands/fish_righthand.dmi'
- inhand_icon_state = "fish_normal"
force = 6
+ throwforce = 6
+ throw_range = 8
attack_verb_continuous = list("slaps", "whacks")
attack_verb_simple = list("slap", "whack")
- hitsound = 'sound/weapons/slap.ogg'
+ hitsound = SFX_DEFAULT_FISH_SLAP
+ drop_sound = 'sound/creatures/fish/fish_drop1.ogg'
+ pickup_sound = SFX_FISH_PICKUP
+ sound_vary = TRUE
///The grind results of the fish. They scale with the weight of the fish.
grind_results = list(/datum/reagent/blood = 5, /datum/reagent/consumable/liquidgibs = 5)
obj_flags = UNIQUE_RENAME
+ item_flags = IMMUTABLE_SLOW|SLOWS_WHILE_IN_HAND
- /// Resulting width of aquarium visual icon - default size of "fish_greyscale" state
- var/sprite_width = 3
- /// Resulting height of aquarium visual icon - default size of "fish_greyscale" state
- var/sprite_height = 3
-
- /// Original width of aquarium visual icon - used to calculate scaledown factor
- var/source_width = 32
- /// Original height of aquarium visual icon - used to calculate scaledown factor
- var/source_height = 32
+ /// width of aquarium visual icon
+ var/sprite_width
+ /// height of aquarium visual icon
+ var/sprite_height
+ ///this icon file will be used for in-aquarium visual for the fish
+ var/dedicated_in_aquarium_icon = 'icons/obj/aquarium/fish.dmi'
/**
- * If present and it also has a dedicated icon state, this icon file will
- * be used for in-aquarium visual for the fish instead of its icon
+ * The icon_state that will be used for in-aquarium visual for the fish
+ * If not set, "[initial(icon_state)]_small" will be used instead
*/
- var/dedicated_in_aquarium_icon
- /// If present this icon will be used for in-aquarium visual for the fish instead of icon_state
var/dedicated_in_aquarium_icon_state
- /// If present aquarium visual will be this color
+ /// If present aquarium visual will be of this color
var/aquarium_vc_color
/// Required fluid type for this fish to live.
@@ -82,12 +87,6 @@
var/list/compatible_types
/// A list of possible evolutions. If set, offsprings may be of a different, new fish type if conditions are met.
var/list/evolution_types
- /// The species' name(s) of the parents of the fish. Shown by the fish analyzer.
- var/progenitors
-
- var/flopping = FALSE
-
- var/in_stasis = FALSE
// Fishing related properties
@@ -97,8 +96,8 @@
*/
var/list/fish_traits = list()
- /// Fishing behaviour
- var/fish_ai_type = FISH_AI_DUMB
+ /// path to datums that dictate how the fish moves during the fishing minigame
+ var/fish_movement_type = /datum/fish_movement
/// Base additive modifier to fishing difficulty
var/fishing_difficulty_modifier = 0
@@ -125,6 +124,9 @@
/// Average weight for this fish type in grams
var/average_weight = 1000
+ ///The general deviation from the average weight and size this fish has in the wild
+ var/weight_size_deviation = 0.2
+
/// When outside of an aquarium, these gases that are checked (as well as pressure and temp) to assert if the environment is safe or not.
var/list/safe_air_limits = list(
/datum/gas/oxygen = list(12, 100),
@@ -145,6 +147,8 @@
/// The beauty this fish provides to the aquarium it's inserted in.
var/beauty = FISH_BEAUTY_GENERIC
+ ///have we recently pet this fish
+ var/recently_petted = FALSE
/obj/item/fish/Initialize(mapload, apply_qualities = TRUE)
. = ..()
@@ -164,7 +168,6 @@
if(apply_qualities)
apply_traits() //Make sure traits are applied before size and weight.
update_size_and_weight()
- progenitors = full_capitalize(name) //default value
register_evolutions()
@@ -190,12 +193,26 @@
/obj/item/fish/examine(mob/user)
. = ..()
- // All spacemen have magic eyes of fish weight perception until fish scale (get it?) is implemented.
- . += span_notice("It's [size] cm long.")
- . += span_notice("It weighs [weight] g.")
+ if(HAS_MIND_TRAIT(user, TRAIT_EXAMINE_DEEPER_FISH))
+ if(status == FISH_DEAD)
+ . += span_deadsay("it's dead.")
+ var/list/warnings = list()
+ if(is_hungry())
+ warnings += "starving"
+ if(!HAS_TRAIT(src, TRAIT_FISH_STASIS) && !proper_environment())
+ warnings += "drowning"
+ if(health < initial(health) * 0.6)
+ warnings += "sick"
+ if(length(warnings))
+ . += span_warning("it's [english_list(warnings)]")
+ if(HAS_MIND_TRAIT(user, TRAIT_EXAMINE_FISH))
+ . += span_notice("It's [size] cm long.")
+ . += span_notice("It weighs [weight] g.")
+ if(HAS_TRAIT(src, TRAIT_FISHING_BAIT))
+ . += span_smallnoticeital("It can be used as a fishing bait.")
///Randomizes weight and size.
-/obj/item/fish/proc/randomize_size_and_weight(base_size = average_size, base_weight = average_weight, deviation = 0.2)
+/obj/item/fish/proc/randomize_size_and_weight(base_size = average_size, base_weight = average_weight, deviation = weight_size_deviation)
var/size_deviation = 0.2 * base_size
var/new_size = round(clamp(gaussian(base_size, size_deviation), average_size * 1/MAX_FISH_DEVIATION_COEFF, average_size * MAX_FISH_DEVIATION_COEFF))
@@ -206,38 +223,139 @@
///Updates weight and size, along with weight class, number of fillets you can get and grind results.
/obj/item/fish/proc/update_size_and_weight(new_size = average_size, new_weight = average_weight)
- if(size && fillet_type)
- RemoveElement(/datum/element/processable, TOOL_KNIFE, fillet_type, num_fillets, 0.5 SECONDS, screentip_verb = "Cut")
+ SEND_SIGNAL(src, COMSIG_FISH_UPDATE_SIZE_AND_WEIGHT, new_size, new_weight)
+ if(size)
+ if(fillet_type)
+ RemoveElement(/datum/element/processable, TOOL_KNIFE, fillet_type, num_fillets, 0.5 SECONDS * num_fillets, screentip_verb = "Cut")
+ if(size > FISH_SIZE_TWO_HANDS_REQUIRED)
+ qdel(GetComponent(/datum/component/two_handed))
size = new_size
+ var/init_icon_state = initial(inhand_icon_state)
switch(size)
if(0 to FISH_SIZE_TINY_MAX)
update_weight_class(WEIGHT_CLASS_TINY)
- inhand_icon_state = "fish_small"
+ if(!init_icon_state)
+ inhand_icon_state = "fish_small"
if(FISH_SIZE_TINY_MAX to FISH_SIZE_SMALL_MAX)
- inhand_icon_state = "fish_small"
+ if(!init_icon_state)
+ inhand_icon_state = "fish_small"
update_weight_class(WEIGHT_CLASS_SMALL)
if(FISH_SIZE_SMALL_MAX to FISH_SIZE_NORMAL_MAX)
- inhand_icon_state = "fish_normal"
+ if(!init_icon_state)
+ inhand_icon_state = "fish_normal"
update_weight_class(WEIGHT_CLASS_NORMAL)
if(FISH_SIZE_NORMAL_MAX to FISH_SIZE_BULKY_MAX)
- inhand_icon_state = "fish_bulky"
+ if(!init_icon_state)
+ inhand_icon_state = "fish_bulky"
update_weight_class(WEIGHT_CLASS_BULKY)
- if(FISH_SIZE_BULKY_MAX to INFINITY)
- inhand_icon_state = "fish_huge"
+ if(FISH_SIZE_BULKY_MAX to FISH_SIZE_HUGE_MAX)
+ if(!init_icon_state)
+ inhand_icon_state = "fish_huge"
update_weight_class(WEIGHT_CLASS_HUGE)
+ if(FISH_SIZE_HUGE_MAX to INFINITY)
+ if(!init_icon_state)
+ inhand_icon_state = "fish_huge"
+ update_weight_class(WEIGHT_CLASS_GIGANTIC)
+
+ if(size > FISH_SIZE_TWO_HANDS_REQUIRED || (HAS_TRAIT(src, TRAIT_FISH_SHOULD_TWOHANDED) && w_class >= WEIGHT_CLASS_BULKY))
+ inhand_icon_state = "[inhand_icon_state]_wielded"
+ AddComponent(/datum/component/two_handed, require_twohands = TRUE)
+
if(fillet_type)
var/init_fillets = initial(num_fillets)
var/amount = max(round(init_fillets * size / FISH_FILLET_NUMBER_SIZE_DIVISOR, 1), 1)
num_fillets = amount
- AddElement(/datum/element/processable, TOOL_KNIFE, fillet_type, num_fillets, 0.5 SECONDS, screentip_verb = "Cut")
+ AddElement(/datum/element/processable, TOOL_KNIFE, fillet_type, num_fillets, 0.5 SECONDS * num_fillets, screentip_verb = "Cut")
if(weight)
for(var/reagent_type in grind_results)
grind_results[reagent_type] /= FLOOR(weight/FISH_GRIND_RESULTS_WEIGHT_DIVISOR, 0.1)
weight = new_weight
+
+ if(weight >= FISH_WEIGHT_SLOWDOWN)
+ slowdown = round(((weight/FISH_WEIGHT_SLOWDOWN_DIVISOR)**FISH_WEIGHT_SLOWDOWN_EXPONENT)-1.3, 0.1)
+ drag_slowdown = round(slowdown * 0.5, 1)
+ else
+ slowdown = 0
+ drag_slowdown = 0
+ if(ismob(loc))
+ var/mob/mob = loc
+ mob.update_equipment_speed_mods()
+
for(var/reagent_type in grind_results)
grind_results[reagent_type] *= FLOOR(weight/FISH_GRIND_RESULTS_WEIGHT_DIVISOR, 0.1)
+ update_fish_force()
+
+///Reset weapon-related variables of this items and recalculates those values based on the fish weight and size.
+/obj/item/fish/proc/update_fish_force()
+ if(force >= 15 && hitsound == SFX_ALT_FISH_SLAP)
+ hitsound = SFX_DEFAULT_FISH_SLAP
+ force = initial(force)
+ throwforce = initial(throwforce)
+ throw_range = initial(throw_range)
+ demolition_mod = initial(demolition_mod)
+ attack_verb_continuous = initial(attack_verb_continuous)
+ attack_verb_simple = initial(attack_verb_simple)
+ hitsound = initial(hitsound)
+ damtype = initial(damtype)
+ attack_speed = initial(attack_speed)
+ block_chance = initial(block_chance)
+ armour_penetration = initial(armour_penetration)
+ wound_bonus = initial(wound_bonus)
+ bare_wound_bonus = initial(bare_wound_bonus)
+ toolspeed = initial(toolspeed)
+
+ var/weight_rank = max(round(1 + log(2, weight/FISH_WEIGHT_FORCE_DIVISOR), 1), 1)
+
+ throw_range -= weight_rank
+ get_force_rank()
+
+ var/bonus_malus = weight_rank - w_class
+ if(bonus_malus)
+ calculate_fish_force_bonus(bonus_malus)
+
+ throwforce = force
+
+ SEND_SIGNAL(src, COMSIG_FISH_FORCE_UPDATED, weight_rank, bonus_malus)
+
+
+ if(material_flags & MATERIAL_EFFECTS) //struck by metal gen or something.
+ for(var/current_material in custom_materials)
+ var/datum/material/material = GET_MATERIAL_REF(current_material)
+ force *= material.strength_modifier
+ throwforce *= material.strength_modifier
+ if(material.item_sound_override)
+ hitsound = material.item_sound_override
+
+ if(force >=15 && hitsound == SFX_DEFAULT_FISH_SLAP) // don't override special attack sounds
+ hitsound = SFX_ALT_FISH_SLAP // do more damage - do heavier slap sound
+
+///A proc that makes the fish slightly stronger or weaker if there's a noticeable discrepancy between size and weight.
+/obj/item/fish/proc/calculate_fish_force_bonus(bonus_malus)
+ demolition_mod += bonus_malus * 0.1
+ attack_speed += bonus_malus * 0.1
+ force = round(force * (1 + bonus_malus * 0.1), 0.1)
+
+/obj/item/fish/proc/get_force_rank()
+ switch(w_class)
+ if(WEIGHT_CLASS_TINY)
+ force -= 3
+ attack_speed -= 0.1 SECONDS
+ if(WEIGHT_CLASS_NORMAL)
+ force += 2
+ if(WEIGHT_CLASS_BULKY)
+ force += 5
+ attack_speed += 0.1 SECONDS
+ if(WEIGHT_CLASS_HUGE)
+ force += 9
+ attack_speed += 0.2 SECONDS
+ demolition_mod += 0.2
+ if(WEIGHT_CLASS_GIGANTIC)
+ force += 13
+ attack_speed += 0.4 SECONDS
+ demolition_mod += 0.4
+
/**
* This proc has fish_traits list populated with fish_traits paths from three different lists:
* traits from x_traits and y_traits are compared, and inserted if conditions are met;
@@ -306,13 +424,13 @@
check_environment()
/obj/item/fish/proc/enter_stasis()
- in_stasis = TRUE
+ ADD_TRAIT(src, TRAIT_FISH_STASIS, INNATE_TRAIT)
// Stop processing until inserted into aquarium again.
stop_flopping()
STOP_PROCESSING(SSobj, src)
/obj/item/fish/proc/exit_stasis()
- in_stasis = FALSE
+ REMOVE_TRAIT(src, TRAIT_FISH_STASIS, INNATE_TRAIT)
if(status != FISH_DEAD)
START_PROCESSING(SSobj, src)
@@ -332,15 +450,9 @@
fed_reagents.remove_reagent(fed_reagent_type, 0.1)
SEND_SIGNAL(src, COMSIG_FISH_FED, fed_reagents, fed_reagent_type)
-/obj/item/fish/proc/check_environment(stasis_check = TRUE)
+/obj/item/fish/proc/check_environment()
if(QDELETED(src)) //we don't care anymore
return
- if(stasis_check)
- // Apply/remove stasis as needed
- if(loc && HAS_TRAIT(loc, TRAIT_FISH_SAFE_STORAGE))
- enter_stasis()
- else if(in_stasis)
- exit_stasis()
if(!do_flop_animation)
return
@@ -348,7 +460,7 @@
// Do additional stuff
var/in_aquarium = isaquarium(loc)
// Start flopping if outside of fish container
- var/should_be_flopping = status == FISH_ALIVE && loc && !HAS_TRAIT(loc,TRAIT_FISH_SAFE_STORAGE) && !in_aquarium
+ var/should_be_flopping = status == FISH_ALIVE && !HAS_TRAIT(src, TRAIT_FISH_STASIS) && !in_aquarium
if(should_be_flopping)
start_flopping()
@@ -356,7 +468,7 @@
stop_flopping()
/obj/item/fish/process(seconds_per_tick)
- if(in_stasis || status != FISH_ALIVE)
+ if(HAS_TRAIT(src, TRAIT_FISH_STASIS) || status != FISH_ALIVE)
return
process_health(seconds_per_tick)
@@ -368,7 +480,7 @@
SEND_SIGNAL(src, COMSIG_FISH_LIFE, seconds_per_tick)
-/obj/item/fish/proc/set_status(new_status)
+/obj/item/fish/proc/set_status(new_status, silent = FALSE)
if(status == new_status)
return
switch(new_status)
@@ -376,20 +488,36 @@
status = FISH_ALIVE
health = initial(health) // since the fishe has been revived
last_feeding = world.time //reset hunger
- check_environment(FALSE)
+ check_environment()
START_PROCESSING(SSobj, src)
if(FISH_DEAD)
status = FISH_DEAD
STOP_PROCESSING(SSobj, src)
stop_flopping()
- var/message = span_notice(replacetext(death_text, "%SRC", "[src]"))
- if(isaquarium(loc))
- loc.visible_message(message)
- else
- visible_message(message)
+ if(!silent)
+ var/message = span_notice(replacetext(death_text, "%SRC", "[src]"))
+ if(isaquarium(loc))
+ loc.visible_message(message)
+ else
+ visible_message(message)
update_appearance()
+ update_fish_force()
SEND_SIGNAL(src, COMSIG_FISH_STATUS_CHANGED)
+/obj/item/fish/expose_reagents(list/reagents, datum/reagents/source, methods = TOUCH, volume_modifier = 1, show_message = TRUE)
+ . = ..()
+ if(. & COMPONENT_NO_EXPOSE_REAGENTS || status != FISH_DEAD)
+ return
+ var/datum/reagent/medicine/strange_reagent/revival = locate() in reagents
+ if(!revival)
+ return
+ if(reagents[revival] >= 2 * w_class)
+ set_status(FISH_ALIVE)
+ else
+ balloon_alert_to_viewers("twitches for a moment!")
+ animate(src, pixel_x = 1, time = 0.1 SECONDS, loop = 2, flags = ANIMATION_RELATIVE|ANIMATION_PARALLEL)
+ animate(pixel_x = -1, flags = ANIMATION_RELATIVE)
+
/obj/item/fish/proc/use_lazarus(datum/source, obj/item/lazarus_injector/injector, mob/user)
SIGNAL_HANDLER
if(injector.revive_type != SENTIENCE_ORGANIC)
@@ -460,7 +588,7 @@
return FALSE
if(!being_targeted && length(aquarium.get_fishes()) >= AQUARIUM_MAX_BREEDING_POPULATION)
return FALSE
- return aquarium.allow_breeding && health >= initial(health) * 0.8 && stable_population > 1 && world.time >= breeding_wait
+ return aquarium.allow_breeding && health >= initial(health) * 0.8 && stable_population >= 1 && world.time >= breeding_wait
/obj/item/fish/proc/try_to_reproduce()
var/obj/structure/aquarium/aquarium = loc
@@ -495,36 +623,48 @@
second_fish = other_fish
break
- if(!second_fish && !HAS_TRAIT(src, TRAIT_FISH_SELF_REPRODUCE))
- return FALSE
+ if(!second_fish)
+ if(!HAS_TRAIT(src, TRAIT_FISH_SELF_REPRODUCE))
+ return FALSE
+ if(length(aquarium.tracked_fish_by_type[type]) >= stable_population)
+ return FALSE
+
+ if(PERFORM_ALL_TESTS(fish_breeding) && second_fish && !length(evolution_types))
+ return create_offspring(second_fish.type, second_fish)
var/chosen_type
var/datum/fish_evolution/chosen_evolution
- if(PERFORM_ALL_TESTS(fish_breeding) && second_fish && !length(evolution_types))
- chosen_type = second_fish.type
- else
- var/list/possible_evolutions = list()
- for(var/evolution_type in evolution_types)
+ var/list/possible_evolutions = list()
+ for(var/evolution_type in evolution_types)
+ var/datum/fish_evolution/evolution = GLOB.fish_evolutions[evolution_type]
+ if(evolution.check_conditions(src, second_fish, aquarium))
+ possible_evolutions += evolution
+ if(second_fish?.evolution_types)
+ var/secondary_evolutions = (second_fish.evolution_types - evolution_types)
+ for(var/evolution_type in secondary_evolutions)
var/datum/fish_evolution/evolution = GLOB.fish_evolutions[evolution_type]
- if(evolution.check_conditions(src, second_fish, aquarium))
+ if(evolution.check_conditions(second_fish, src, aquarium))
possible_evolutions += evolution
- if(second_fish?.evolution_types)
- var/secondary_evolutions = (second_fish.evolution_types - evolution_types)
- for(var/evolution_type in secondary_evolutions)
- var/datum/fish_evolution/evolution = GLOB.fish_evolutions[evolution_type]
- if(evolution.check_conditions(second_fish, src, aquarium))
- possible_evolutions += evolution
-
- if(length(possible_evolutions))
- chosen_evolution = pick(possible_evolutions)
- chosen_type = chosen_evolution.new_fish_type
- else if(second_fish)
- if(length(aquarium.tracked_fish_by_type[type]) >= stable_population)
+
+ if(length(possible_evolutions))
+ chosen_evolution = pick(possible_evolutions)
+ chosen_type = chosen_evolution.new_fish_type
+ else if(second_fish)
+ var/recessive = HAS_TRAIT(src, TRAIT_FISH_RECESSIVE)
+ var/recessive_partner = HAS_TRAIT(second_fish, TRAIT_FISH_RECESSIVE)
+ if(length(aquarium.tracked_fish_by_type[type]) >= stable_population)
+ if(recessive_partner && !recessive)
+ return FALSE
+ chosen_type = second_fish.type
+ else
+ if(recessive && !recessive_partner)
chosen_type = second_fish.type
+ else if(recessive_partner && !recessive)
+ chosen_type = type
else
chosen_type = pick(second_fish.type, type)
- else
- chosen_type = type
+ else
+ chosen_type = type
return create_offspring(chosen_type, second_fish, chosen_evolution)
@@ -540,12 +680,6 @@
partner.breeding_wait = world.time + breeding_timeout
else //Make a close of this fish.
new_fish.update_size_and_weight(size, weight, TRUE)
- new_fish.progenitors = initial(name)
- if(partner && type != partner.type)
- var/string = "[initial(name)] - [initial(partner.name)]"
- new_fish.progenitors = full_capitalize(string)
- else
- new_fish.progenitors = full_capitalize(initial(name))
breeding_wait = world.time + breeding_timeout
@@ -594,15 +728,15 @@
/// Starts flopping animation
/obj/item/fish/proc/start_flopping()
- if(flopping) //Requires update_transform/animate_wrappers to be less restrictive.
+ if(HAS_TRAIT(src, TRAIT_FISH_FLOPPING)) //Requires update_transform/animate_wrappers to be less restrictive.
return
- flopping = TRUE
+ ADD_TRAIT(src, TRAIT_FISH_FLOPPING, TRAIT_GENERIC)
flop_animation()
/// Stops flopping animation
/obj/item/fish/proc/stop_flopping()
- if(flopping)
- flopping = FALSE
+ if(HAS_TRAIT(src, TRAIT_FISH_FLOPPING))
+ REMOVE_TRAIT(src, TRAIT_FISH_FLOPPING, TRAIT_GENERIC)
animate(src, transform = matrix()) //stop animation
/// Refreshes flopping animation after temporary animation finishes
@@ -611,7 +745,7 @@
addtimer(CALLBACK(src, PROC_REF(refresh_flopping)), animation_duration)
/obj/item/fish/proc/refresh_flopping()
- if(flopping)
+ if(HAS_TRAIT(src, TRAIT_FISH_FLOPPING))
flop_animation()
/obj/item/fish/proc/try_electrogenesis()
@@ -634,6 +768,31 @@
if(HAS_TRAIT(src, TRAIT_FISH_FROM_CASE)) //Avoid printing money by simply ordering fish and sending it back.
calculated_price *= 0.05
return round(calculated_price)
+/obj/item/fish/proc/get_happiness_value()
+ var/happiness_value = 0
+ if(recently_petted)
+ happiness_value++
+ if(HAS_TRAIT(src, TRAIT_FISH_NO_HUNGER) || min((world.time - last_feeding) / feeding_frequency, 1) < 0.5)
+ happiness_value++
+ var/obj/structure/aquarium/aquarium = loc
+ if(!istype(aquarium))
+ return happiness_value
+ if(compatible_fluid_type(required_fluid_type, aquarium.fluid_type))
+ happiness_value++
+ if(ISINRANGE(aquarium.fluid_temp, required_temperature_min, required_temperature_max))
+ happiness_value++
+ return happiness_value
+
+/obj/item/fish/proc/pet_fish(mob/living/user)
+ if(recently_petted)
+ to_chat(user, span_warning("[src] runs away from your finger as you dip it into the water!"))
+ return
+ if(electrogenesis_power > 15 MEGA JOULES)
+ user.electrocute_act(5, src) //was it all worth it?
+ recently_petted = TRUE
+ SEND_SIGNAL(src, COMSIG_FISH_PETTED)
+ to_chat(user, span_notice("[src] dances around!"))
+ addtimer(VARSET_CALLBACK(src, recently_petted, FALSE), 30 SECONDS)
/// Returns random fish, using random_case_rarity probabilities.
/proc/random_fish_type(required_fluid)
diff --git a/code/modules/fishing/fish/chasm_detritus.dm b/code/modules/fishing/fish/chasm_detritus.dm
index ea9fcb4775770..9595c552e18d2 100644
--- a/code/modules/fishing/fish/chasm_detritus.dm
+++ b/code/modules/fishing/fish/chasm_detritus.dm
@@ -96,7 +96,7 @@ GLOBAL_LIST_INIT_TYPED(chasm_detritus_types, /datum/chasm_detritus, init_chasm_d
/// This also includes all mobs fallen into chasms, regardless of distance
/datum/chasm_detritus/restricted/bodies/get_chasm_contents(turf/fishing_spot)
. = ..()
- . |= GLOB.chasm_fallen_mobs
+ . |= GLOB.chasm_fallen_mobs[get_chasm_category(fishing_spot)]
/// Body detritus is selected in favor of bodies belonging to sentient mobs
/// The first sentient body found in the list of contents is returned, otherwise
diff --git a/code/modules/fishing/fish/fish_evolution.dm b/code/modules/fishing/fish/fish_evolution.dm
index e6e2f1d9570ac..688b0c201c7b4 100644
--- a/code/modules/fishing/fish/fish_evolution.dm
+++ b/code/modules/fishing/fish/fish_evolution.dm
@@ -78,6 +78,7 @@ GLOBAL_LIST_INIT(fish_evolutions, init_subtypes_w_path_keys(/datum/fish_evolutio
/datum/fish_evolution/purple_sludgefish
probability = 5
new_fish_type = /obj/item/fish/sludgefish/purple
+ new_traits = list(/datum/fish_trait/recessive)
removed_traits = list(/datum/fish_trait/no_mating)
/datum/fish_evolution/mastodon
@@ -85,7 +86,7 @@ GLOBAL_LIST_INIT(fish_evolutions, init_subtypes_w_path_keys(/datum/fish_evolutio
probability = 40
new_fish_type = /obj/item/fish/mastodon
new_traits = list(/datum/fish_trait/heavy, /datum/fish_trait/amphibious, /datum/fish_trait/predator, /datum/fish_trait/aggressive)
- conditions_note = "The fish (and its mate) need to be unusually big both in size and weight."
+ conditions_note = "The fish (and its mate) needs to be unusually big both in size and weight."
/datum/fish_evolution/mastodon/check_conditions(obj/item/fish/source, obj/item/fish/mate, obj/structure/aquarium/aquarium)
if((source.size < 120 || source.weight < 3000) || (mate && (mate.size < 120 || mate.weight < 3000)))
@@ -103,3 +104,23 @@ GLOBAL_LIST_INIT(fish_evolutions, init_subtypes_w_path_keys(/datum/fish_evolutio
new_fish_type = /obj/item/fish/chasm_crab/ice
required_temperature_min = MIN_AQUARIUM_TEMP+9
required_temperature_max = MIN_AQUARIUM_TEMP+10
+
+/datum/fish_evolution/three_eyes
+ name = "Three-eyed Goldfish"
+ probability = 3
+ new_fish_type = /obj/item/fish/goldfish/three_eyes
+ new_traits = list(/datum/fish_trait/recessive)
+
+/datum/fish_evolution/chainsawfish
+ name = "Chainsawfish"
+ probability = 30
+ new_fish_type = /obj/item/fish/chainsawfish
+ new_traits = list(/datum/fish_trait/predator, /datum/fish_trait/aggressive)
+ conditions_note = "The fish needs to be unusually big and aggressive"
+
+/datum/fish_evolution/chainsawfish/check_conditions(obj/item/fish/source, obj/item/fish/mate, obj/structure/aquarium/aquarium)
+ var/double_avg_size = /obj/item/fish/goldfish::average_size * 2
+ var/double_avg_weight = /obj/item/fish/goldfish::average_weight * 2
+ if(source.size >= double_avg_size && source.weight >= double_avg_weight && (/datum/fish_trait/aggressive in source.fish_traits))
+ return ..()
+ return FALSE
diff --git a/code/modules/fishing/fish/fish_traits.dm b/code/modules/fishing/fish/fish_traits.dm
index 76b0cc8691c21..e51b810d16b2e 100644
--- a/code/modules/fishing/fish/fish_traits.dm
+++ b/code/modules/fishing/fish/fish_traits.dm
@@ -37,6 +37,8 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
var/list/fish_whitelist
/// Depending on the value, fish with trait will be reported as more or less difficult in the catalog.
var/added_difficulty = 0
+ /// Reagents added to the fish when gained
+ var/list/reagents_to_add
/// Difficulty modifier from this mod, needs to return a list with two values
/datum/fish_trait/proc/difficulty_mod(obj/item/fishing_rod/rod, mob/fisherman)
@@ -44,7 +46,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
return list(ADDITIVE_FISHING_MOD = 0, MULTIPLICATIVE_FISHING_MOD = 1)
/// Catch weight table modifier from this mod, needs to return a list with two values
-/datum/fish_trait/proc/catch_weight_mod(obj/item/fishing_rod/rod, mob/fisherman)
+/datum/fish_trait/proc/catch_weight_mod(obj/item/fishing_rod/rod, mob/fisherman, atom/location, obj/item/fish/fish_type)
SHOULD_CALL_PARENT(TRUE)
return list(ADDITIVE_FISHING_MOD = 0, MULTIPLICATIVE_FISHING_MOD = 1)
@@ -54,7 +56,11 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
/// Applies some special qualities to the fish that has been spawned
/datum/fish_trait/proc/apply_to_fish(obj/item/fish/fish)
- return
+ SHOULD_CALL_PARENT(TRUE)
+ if(reagents_to_add)
+ for(var/reagent in reagents_to_add)
+ add_to_reagents(fish, reagent, reagents_to_add[reagent])
+ RegisterSignal(fish, COMSIG_ATOM_PROCESSED, PROC_REF(process_reagents))
/// Applies some special qualities to basic mobs generated by fish (i.e. chasm chrab --> young lobstrosity --> lobstrosity).
/datum/fish_trait/proc/apply_to_mob(mob/living/basic/mob)
@@ -79,6 +85,37 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
fish.grind_results.Insert(1, reagent_type)
fish.grind_results[reagent_type] = amount
+/// Proc that handles adding reagents from the trait to the fillets from butchered fish.
+/datum/fish_trait/proc/process_reagents(obj/item/fish/source, mob/living/user, obj/item/process_item, list/results)
+ SIGNAL_HANDLER
+ var/results_with_reagents = 0
+ for(var/atom/result as anything in results)
+ if(result.reagents)
+ results_with_reagents++
+ if(!results_with_reagents)
+ return
+ for(var/reagent in reagents_to_add)
+ var/amount = round(source.grind_results[reagent] / results_with_reagents, 0.1)
+ for(var/atom/result as anything in results)
+ result.reagents?.add_reagent(reagent, amount)
+
+/// Proc that adds or changes the venomous when the fish size and/or weight are updated
+/datum/fish_trait/proc/add_venom(obj/item/fish/source, venom_path, new_weight, mult = 0.25)
+ if(source.size)
+ var/old_amount = max(round((source.weight/FISH_GRIND_RESULTS_WEIGHT_DIVISOR) * mult, 0.1), mult)
+ source.RemoveElement(/datum/element/venomous, venom_path, old_amount)
+
+ var/new_amount = max(round((new_weight/FISH_GRIND_RESULTS_WEIGHT_DIVISOR) * mult, 0.1), mult)
+ source.AddElement(/datum/element/venomous, venom_path, new_amount)
+
+/// Proc that changes the venomous element based on if the fish is alive or dead (basically dead fish are weaker).
+/datum/fish_trait/proc/change_venom_on_death(obj/item/fish/source, venom_path, live_mult, dead_mult)
+ var/live_amount = max(round((source.weight/FISH_GRIND_RESULTS_WEIGHT_DIVISOR) * live_mult, 0.1), live_mult)
+ var/dead_amount = max(round((source.weight/FISH_GRIND_RESULTS_WEIGHT_DIVISOR) * dead_mult, 0.1), dead_mult)
+ var/is_dead = source.status == FISH_DEAD
+ source.RemoveElement(/datum/element/venomous, venom_path, is_dead ? live_amount : dead_amount, thrown_effect = TRUE)
+ source.AddElement(/datum/element/venomous, venom_path, is_dead ? dead_amount : live_amount, thrown_effect = TRUE)
+
/datum/fish_trait/wary
name = "Wary"
catalog_description = "This fish will avoid visible fish lines, cloaked line recommended."
@@ -101,31 +138,35 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
/datum/fish_trait/picky_eater
name = "Picky Eater"
- catalog_description = "This fish is very picky and will ignore low quality bait."
+ catalog_description = "This fish is very picky and will ignore low quality bait (unless it's amongst its favorites)."
-/datum/fish_trait/picky_eater/catch_weight_mod(obj/item/fishing_rod/rod, mob/fisherman)
+/datum/fish_trait/picky_eater/catch_weight_mod(obj/item/fishing_rod/rod, mob/fisherman, atom/location, obj/item/fish/fish_type)
. = ..()
if(!rod.bait)
.[MULTIPLICATIVE_FISHING_MOD] = 0
return
if(HAS_TRAIT(rod.bait, TRAIT_OMNI_BAIT))
return
- if(HAS_TRAIT(rod.bait, TRAIT_GOOD_QUALITY_BAIT) || HAS_TRAIT(rod.bait, TRAIT_GREAT_QUALITY_BAIT))
+ if(is_matching_bait(rod.bait, SSfishing.fish_properties[fish_type][FISH_PROPERTIES_FAV_BAIT])) //we like this bait anyway
+ return
+ if(!HAS_TRAIT(rod.bait, TRAIT_GOOD_QUALITY_BAIT) && !HAS_TRAIT(rod.bait, TRAIT_GREAT_QUALITY_BAIT))
.[MULTIPLICATIVE_FISHING_MOD] = 0
-
/datum/fish_trait/nocturnal
name = "Nocturnal"
catalog_description = "This fish avoids bright lights, fishing and storing in darkness recommended."
-/datum/fish_trait/nocturnal/catch_weight_mod(obj/item/fishing_rod/rod, mob/fisherman)
+/datum/fish_trait/nocturnal/catch_weight_mod(obj/item/fishing_rod/rod, mob/fisherman, atom/location, obj/item/fish/fish_type)
. = ..()
- var/turf/turf = get_turf(fisherman)
- var/light_amount = turf.get_lumcount()
+ if(rod.bait && HAS_TRAIT(rod.bait, TRAIT_BAIT_IGNORE_ENVIRONMENT))
+ return
+ var/turf/turf = get_turf(location)
+ var/light_amount = turf?.get_lumcount()
if(light_amount > SHADOW_SPECIES_LIGHT_THRESHOLD)
.[MULTIPLICATIVE_FISHING_MOD] = 0
/datum/fish_trait/nocturnal/apply_to_fish(obj/item/fish/fish)
+ . = ..()
RegisterSignal(fish, COMSIG_FISH_LIFE, PROC_REF(check_light))
/datum/fish_trait/nocturnal/proc/check_light(obj/item/fish/source, seconds_per_tick)
@@ -157,7 +198,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
mob.apply_status_effect(/datum/status_effect/shadow_regeneration)
/datum/fish_trait/heavy
- name = "Heavy"
+ name = "Demersal"
catalog_description = "This fish tends to stay near the waterbed."
/datum/fish_trait/heavy/apply_to_mob(mob/living/basic/mob)
@@ -170,25 +211,27 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
mob.obj_damage *= 1.3
/datum/fish_trait/heavy/minigame_mod(obj/item/fishing_rod/rod, mob/fisherman, datum/fishing_challenge/minigame)
- minigame.fish_idle_velocity -= 10
+ minigame.mover.fish_idle_velocity -= 10
/datum/fish_trait/carnivore
name = "Carnivore"
catalog_description = "This fish can only be baited with meat."
incompatible_traits = list(/datum/fish_trait/vegan)
-/datum/fish_trait/carnivore/catch_weight_mod(obj/item/fishing_rod/rod, mob/fisherman)
+/datum/fish_trait/carnivore/catch_weight_mod(obj/item/fishing_rod/rod, mob/fisherman, atom/location, obj/item/fish/fish_type)
. = ..()
if(!rod.bait)
.[MULTIPLICATIVE_FISHING_MOD] = 0
return
if(HAS_TRAIT(rod.bait, TRAIT_OMNI_BAIT))
return
+ if(isfish(rod.bait))
+ return
if(!istype(rod.bait, /obj/item/food))
.[MULTIPLICATIVE_FISHING_MOD] = 0
return
var/obj/item/food/food_bait = rod.bait
- if(!(food_bait.foodtypes & MEAT))
+ if(!(food_bait.foodtypes & (MEAT|SEAFOOD|BUGS)))
.[MULTIPLICATIVE_FISHING_MOD] = 0
/datum/fish_trait/vegan
@@ -196,14 +239,20 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
catalog_description = "This fish can only be baited with fresh produce."
incompatible_traits = list(/datum/fish_trait/carnivore, /datum/fish_trait/predator, /datum/fish_trait/necrophage)
-/datum/fish_trait/vegan/catch_weight_mod(obj/item/fishing_rod/rod, mob/fisherman)
+/datum/fish_trait/vegan/catch_weight_mod(obj/item/fishing_rod/rod, mob/fisherman, atom/location, obj/item/fish/fish_type)
. = ..()
if(!rod.bait)
.[MULTIPLICATIVE_FISHING_MOD] = 0
return
if(HAS_TRAIT(rod.bait, TRAIT_OMNI_BAIT))
return
- if(!istype(rod.bait, /obj/item/food/grown))
+ if(!istype(rod.bait, /obj/item/food))
+ .[MULTIPLICATIVE_FISHING_MOD] = 0
+ return
+ if(istype(rod.bait, /obj/item/food/grown))
+ return
+ var/obj/item/food/food_bait = rod.bait
+ if(food_bait.foodtypes & (MEAT|SEAFOOD|GORE|BUGS|DAIRY) || !(food_bait.foodtypes & (VEGETABLES|FRUIT)))
.[MULTIPLICATIVE_FISHING_MOD] = 0
/datum/fish_trait/emulsijack
@@ -211,6 +260,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
catalog_description = "This fish emits an invisible toxin that emulsifies other fish for it to feed on."
/datum/fish_trait/emulsijack/apply_to_fish(obj/item/fish/fish)
+ . = ..()
RegisterSignal(fish, COMSIG_FISH_LIFE, PROC_REF(emulsify))
ADD_TRAIT(fish, TRAIT_RESIST_EMULSIFY, FISH_TRAIT_DATUM)
@@ -250,6 +300,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
incompatible_traits = list(/datum/fish_trait/vegan)
/datum/fish_trait/necrophage/apply_to_fish(obj/item/fish/fish)
+ . = ..()
RegisterSignal(fish, COMSIG_FISH_LIFE, PROC_REF(eat_dead_fishes))
/datum/fish_trait/necrophage/proc/eat_dead_fishes(obj/item/fish/source, seconds_per_tick)
@@ -269,6 +320,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
diff_traits_inheritability = 25
/datum/fish_trait/parthenogenesis/apply_to_fish(obj/item/fish/fish)
+ . = ..()
ADD_TRAIT(fish, TRAIT_FISH_SELF_REPRODUCE, FISH_TRAIT_DATUM)
/**
@@ -282,8 +334,19 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
incompatible_traits = list(/datum/fish_trait/crossbreeder)
/datum/fish_trait/no_mating/apply_to_fish(obj/item/fish/fish)
+ . = ..()
ADD_TRAIT(fish, TRAIT_FISH_NO_MATING, FISH_TRAIT_DATUM)
+///Prevent offsprings of fish with this trait from being of the same type (unless self-mating or the partner also has the trait)
+/datum/fish_trait/recessive
+ name = "Recessive"
+ catalog_description = "If crossbred, offsprings will always be of the mate species, unless it also possess the trait."
+ diff_traits_inheritability = 0
+
+/datum/fish_trait/no_mating/apply_to_fish(obj/item/fish/fish)
+ . = ..()
+ ADD_TRAIT(fish, TRAIT_FISH_RECESSIVE, FISH_TRAIT_DATUM)
+
/datum/fish_trait/revival
diff_traits_inheritability = 15
name = "Self-Revival"
@@ -291,6 +354,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
spontaneous_manifest_types = list(/obj/item/fish/boned = 100, /obj/item/fish/mastodon = 100)
/datum/fish_trait/revival/apply_to_fish(obj/item/fish/fish)
+ . = ..()
RegisterSignal(fish, COMSIG_FISH_STATUS_CHANGED, PROC_REF(check_status))
/datum/fish_trait/revival/proc/check_status(obj/item/fish/source)
@@ -318,7 +382,13 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
catalog_description = "It's a predatory fish. It'll hunt down and eat live fishes of smaller size when hungry."
incompatible_traits = list(/datum/fish_trait/vegan)
+/datum/fish_trait/predator/catch_weight_mod(obj/item/fishing_rod/rod, mob/fisherman, atom/location, obj/item/fish/fish_type)
+ . = ..()
+ if(isfish(rod.bait))
+ .[MULTIPLICATIVE_FISHING_MOD] *= 2
+
/datum/fish_trait/predator/apply_to_fish(obj/item/fish/fish)
+ . = ..()
RegisterSignal(fish, COMSIG_FISH_LIFE, PROC_REF(eat_fishes))
/datum/fish_trait/predator/proc/eat_fishes(obj/item/fish/source, seconds_per_tick)
@@ -327,7 +397,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
return
var/obj/structure/aquarium/aquarium = source.loc
for(var/obj/item/fish/victim in aquarium.get_fishes(TRUE, source))
- if(victim.size < source.size * 0.75) // It's a big fish eat small fish world
+ if(victim.size < source.size * 0.7) // It's a big fish eat small fish world
continue
if(victim.status != FISH_ALIVE || victim == source || HAS_TRAIT(victim, TRAIT_YUCKY_FISH) || SPT_PROB(80, seconds_per_tick))
continue
@@ -337,31 +407,35 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
/datum/fish_trait/yucky
name = "Yucky"
catalog_description = "This fish tastes so repulsive, other fishes won't try to eat it."
+ reagents_to_add = list(/datum/reagent/yuck = 3)
/datum/fish_trait/yucky/apply_to_fish(obj/item/fish/fish)
- RegisterSignal(fish, COMSIG_ATOM_PROCESSED, PROC_REF(add_yuck))
+ . = ..()
ADD_TRAIT(fish, TRAIT_YUCKY_FISH, FISH_TRAIT_DATUM)
- add_to_reagents(fish, /datum/reagent/yuck, 3)
-
-/datum/fish_trait/yucky/proc/add_yuck(obj/item/fish/source, mob/living/user, obj/item/process_item, list/results)
- var/amount = source.grind_results[/datum/reagent/yuck] / length(results)
- for(var/atom/result as anything in results)
- result.reagents?.add_reagent(/datum/reagent/yuck, amount)
/datum/fish_trait/toxic
name = "Toxic"
- catalog_description = "This fish contains toxins in its liver. Feeding it to predatory fishes or people is not reccomended."
+ catalog_description = "This fish contains toxins. Feeding it to predatory fishes or people is not reccomended."
diff_traits_inheritability = 25
+ reagents_to_add = list(/datum/reagent/toxin/tetrodotoxin = 2.5)
/datum/fish_trait/toxic/apply_to_fish(obj/item/fish/fish)
- RegisterSignal(fish, COMSIG_ATOM_PROCESSED, PROC_REF(add_toxin))
+ . = ..()
+ RegisterSignal(fish, COMSIG_FISH_UPDATE_SIZE_AND_WEIGHT, PROC_REF(make_venomous))
+ RegisterSignal(fish, COMSIG_FISH_STATUS_CHANGED, PROC_REF(on_status_change))
RegisterSignal(fish, COMSIG_FISH_EATEN_BY_OTHER_FISH, PROC_REF(on_eaten))
- add_to_reagents(fish, /datum/reagent/toxin/tetrodotoxin, 2.5)
-/datum/fish_trait/toxic/proc/add_toxin(obj/item/fish/source, mob/living/user, obj/item/process_item, list/results)
- var/amount = source.grind_results[ /datum/reagent/toxin/tetrodotoxin] / length(results)
- for(var/atom/result as anything in results)
- result.reagents?.add_reagent(/datum/reagent/toxin/tetrodotoxin, amount)
+/datum/fish_trait/toxic/proc/make_venomous(obj/item/fish/source, new_size, new_weight)
+ SIGNAL_HANDLER
+ if(!HAS_TRAIT(source, TRAIT_FISH_STINGER))
+ return
+ add_venom(source, /datum/reagent/toxin/tetrodotoxin, new_weight, mult = source.status == FISH_DEAD ? 0.1 : 0.25)
+
+/datum/fish_trait/toxic/proc/on_status_change(obj/item/fish/source)
+ SIGNAL_HANDLER
+ if(!HAS_TRAIT(source, TRAIT_FISH_STINGER))
+ return
+ change_venom_on_death(source, /datum/reagent/toxin/tetrodotoxin, 0.25, 0.1)
/datum/fish_trait/toxic/proc/on_eaten(obj/item/fish/source, obj/item/fish/predator)
if(HAS_TRAIT(predator, TRAIT_FISH_TOXIN_IMMUNE))
@@ -388,6 +462,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
diff_traits_inheritability = 40
/datum/fish_trait/toxin_immunity/apply_to_fish(obj/item/fish/fish)
+ . = ..()
ADD_TRAIT(fish, TRAIT_FISH_TOXIN_IMMUNE, FISH_TRAIT_DATUM)
/datum/fish_trait/crossbreeder
@@ -398,6 +473,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
incompatible_traits = list(/datum/fish_trait/no_mating)
/datum/fish_trait/crossbreeder/apply_to_fish(obj/item/fish/fish)
+ . = ..()
ADD_TRAIT(fish, TRAIT_FISH_CROSSBREEDER, FISH_TRAIT_DATUM)
/datum/fish_trait/aggressive
@@ -407,6 +483,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
catalog_description = "This fish is aggressively territorial, and may attack fish that come close to it."
/datum/fish_trait/aggressive/apply_to_fish(obj/item/fish/fish)
+ . = ..()
RegisterSignal(fish, COMSIG_FISH_LIFE, PROC_REF(try_attack_fish))
/datum/fish_trait/aggressive/proc/try_attack_fish(obj/item/fish/source, seconds_per_tick)
@@ -431,6 +508,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
added_difficulty = 5
/datum/fish_trait/lubed/apply_to_fish(obj/item/fish/fish)
+ . = ..()
fish.AddComponent(/datum/component/slippery, 8 SECONDS, SLIDE|GALOSHES_DONT_HELP)
/datum/fish_trait/lubed/apply_to_mob(mob/living/basic/mob)
@@ -448,6 +526,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
catalog_description = "This fish has developed a primitive adaptation to life on both land and water."
/datum/fish_trait/amphibious/apply_to_fish(obj/item/fish/fish)
+ . = ..()
ADD_TRAIT(fish, TRAIT_FISH_AMPHIBIOUS, FISH_TRAIT_DATUM)
if(fish.required_fluid_type == AQUARIUM_FLUID_AIR)
fish.required_fluid_type = AQUARIUM_FLUID_FRESHWATER
@@ -460,6 +539,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
incompatible_traits = list(/datum/fish_trait/predator, /datum/fish_trait/necrophage)
/datum/fish_trait/mixotroph/apply_to_fish(obj/item/fish/fish)
+ . = ..()
ADD_TRAIT(fish, TRAIT_FISH_NO_HUNGER, FISH_TRAIT_DATUM)
/datum/fish_trait/antigrav
@@ -467,12 +547,13 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
inheritability = 75
diff_traits_inheritability = 25
catalog_description = "This fish will invert the gravity of the bait at random. May fall upward outside after being caught."
- added_difficulty = 15
+ added_difficulty = 20
/datum/fish_trait/antigrav/minigame_mod(obj/item/fishing_rod/rod, mob/fisherman, datum/fishing_challenge/minigame)
minigame.special_effects |= FISHING_MINIGAME_RULE_ANTIGRAV
/datum/fish_trait/antigrav/apply_to_fish(obj/item/fish/fish)
+ . = ..()
fish.AddElement(/datum/element/forced_gravity, NEGATIVE_GRAVITY)
/datum/fish_trait/antigrav/apply_to_mob(mob/living/basic/mob)
@@ -489,6 +570,7 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
catalog_description = "This fish tends to die of stress when forced to be around too many other fish."
/datum/fish_trait/anxiety/apply_to_fish(obj/item/fish/fish)
+ . = ..()
RegisterSignal(fish, COMSIG_FISH_LIFE, PROC_REF(on_fish_life))
///signal sent when the anxiety fish is fed, killing it if sharing contents with too many fish.
@@ -511,24 +593,18 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
catalog_description = "This fish is electroreceptive, and will generate electric fields. Can be harnessed inside a bioelectric generator."
/datum/fish_trait/electrogenesis/apply_to_fish(obj/item/fish/fish)
+ . = ..()
ADD_TRAIT(fish, TRAIT_FISH_ELECTROGENESIS, FISH_TRAIT_DATUM)
- RegisterSignal(fish, COMSIG_ITEM_ATTACK, PROC_REF(on_item_attack))
+ RegisterSignal(fish, COMSIG_FISH_FORCE_UPDATED, PROC_REF(on_force_updated))
-/datum/fish_trait/electrogenesis/proc/on_item_attack(obj/item/fish/fish, mob/living/target, mob/living/user)
+/datum/fish_trait/electrogenesis/proc/on_force_updated(obj/item/fish/fish, weight_rank, bonus_or_malus)
SIGNAL_HANDLER
-
if(fish.status == FISH_ALIVE)
- fish.force = 16
+ fish.force += 10 - fish.w_class
fish.damtype = BURN
fish.attack_verb_continuous = list("shocks", "zaps")
fish.attack_verb_simple = list("shock", "zap")
fish.hitsound = 'sound/effects/sparks4.ogg'
- else
- fish.force = fish::force
- fish.damtype = fish::damtype
- fish.attack_verb_continuous = fish::attack_verb_continuous
- fish.attack_verb_simple = fish::attack_verb_simple
- fish.hitsound = fish::hitsound
/datum/fish_trait/electrogenesis/apply_to_mob(mob/living/basic/mob)
. = ..()
@@ -546,3 +622,101 @@ GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
/datum/fish_trait/stunted/apply_to_mob(mob/living/basic/mob)
. = ..()
qdel(mob.GetComponent(/datum/component/growth_and_differentiation))
+
+/datum/fish_trait/stinger
+ name = "Stinger"
+ inheritability = 80
+ diff_traits_inheritability = 35
+ catalog_description = "This fish is equipped with a sharp stringer or bill capable of delivering damage and toxins."
+ spontaneous_manifest_types = list(/obj/item/fish/stingray = 100, /obj/item/fish/swordfish = 100, /obj/item/fish/chainsawfish = 100)
+
+/datum/fish_trait/stinger/apply_to_fish(obj/item/fish/fish)
+ . = ..()
+ ADD_TRAIT(fish, TRAIT_FISH_STINGER, FISH_TRAIT_DATUM)
+ RegisterSignal(fish, COMSIG_FISH_FORCE_UPDATED, PROC_REF(on_force_updated))
+
+/datum/fish_trait/stinger/proc/on_force_updated(obj/item/fish/fish, weight_rank, bonus_or_malus)
+ SIGNAL_HANDLER
+ fish.force += 1 + fish.w_class + bonus_or_malus
+
+/datum/fish_trait/toxic_barbs
+ name = "Toxic Barbs"
+ catalog_description = "This fish' stinger, bill or otherwise, is coated with simple, yet effetive venom."
+ spontaneous_manifest_types = list(/obj/item/fish/stingray = 35)
+
+/datum/fish_trait/toxic_barbs/apply_to_fish(obj/item/fish/fish)
+ . = ..()
+ RegisterSignal(fish, COMSIG_FISH_UPDATE_SIZE_AND_WEIGHT, PROC_REF(make_venomous))
+ RegisterSignal(fish, COMSIG_FISH_STATUS_CHANGED, PROC_REF(on_status_change))
+
+/datum/fish_trait/toxic_barbs/proc/make_venomous(obj/item/fish/source, new_size, new_weight)
+ SIGNAL_HANDLER
+ if(!HAS_TRAIT(source, TRAIT_FISH_STINGER))
+ ///Remove the trait from the fish so it doesn't show on the analyzer as it doesn't do anything on stingerless ones.
+ source.fish_traits -= type
+ UnregisterSignal(source, list(COMSIG_FISH_UPDATE_SIZE_AND_WEIGHT, COMSIG_FISH_STATUS_CHANGED))
+ return
+ add_venom(source, /datum/reagent/toxin/venom, new_weight, mult = source.status == FISH_DEAD ? 0.3 : 0.7)
+
+/datum/fish_trait/toxic_barbs/proc/on_status_change(obj/item/fish/source)
+ SIGNAL_HANDLER
+ if(!HAS_TRAIT(source, TRAIT_FISH_STINGER))
+ return
+ change_venom_on_death(source, /datum/reagent/toxin/venom, 0.7, 0.3)
+
+/datum/fish_trait/ink
+ name = "Ink Production"
+ catalog_description = "This fish possess a sac that produces ink."
+ diff_traits_inheritability = 70
+ spontaneous_manifest_types = list(/obj/item/fish/squid = 35)
+
+/datum/fish_trait/ink/apply_to_fish(obj/item/fish/fish)
+ . = ..()
+ RegisterSignal(fish, COMSIG_ATOM_PROCESSED, PROC_REF(on_process))
+ RegisterSignal(fish, COMSIG_ITEM_ATTACK_ZONE, PROC_REF(attacked_someone))
+
+/datum/fish_trait/ink/proc/attacked_someone(obj/item/fish/source, mob/living/target, mob/living/user, zone)
+ SIGNAL_HANDLER
+ if(HAS_TRAIT(source, TRAIT_FISH_INK_ON_COOLDOWN) || source.status == FISH_DEAD)
+ return
+ if(!iscarbon(target) || target.get_bodypart(BODY_ZONE_HEAD))
+ target.adjust_temp_blindness_up_to(4 SECONDS, 8 SECONDS)
+ target.adjust_confusion_up_to(1.5 SECONDS, 4 SECONDS)
+ target.AddComponent(/datum/component/face_decal/splat, \
+ color = COLOR_NEARLY_ALL_BLACK, \
+ memory_type = /datum/memory/witnessed_inking, \
+ mood_event_type = /datum/mood_event/inked, \
+ )
+ target.visible_message(span_warning("[target] is inked by [source]!"), span_userdanger("You've been inked by [source]!"))
+ playsound(target, SFX_DESECRATION, 50, TRUE)
+ ADD_TRAIT(source, TRAIT_FISH_INK_ON_COOLDOWN, FISH_TRAIT_DATUM)
+ addtimer(TRAIT_CALLBACK_REMOVE(source, TRAIT_FISH_INK_ON_COOLDOWN, FISH_TRAIT_DATUM), 9 SECONDS)
+
+/datum/fish_trait/ink/proc/on_process(obj/item/fish/source, mob/living/user, obj/item/process_item, list/results)
+ SIGNAL_HANDLER
+ new /obj/item/food/ink_sac(source.drop_location())
+
+/datum/fish_trait/camouflage
+ name = "Camouflage"
+ catalog_description = "This fish possess the ability to blend with its surroundings."
+ spontaneous_manifest_types = list(/obj/item/fish/squid = 35)
+
+/datum/fish_trait/camouflage/minigame_mod(obj/item/fishing_rod/rod, mob/fisherman, datum/fishing_challenge/minigame)
+ minigame.special_effects |= FISHING_MINIGAME_RULE_CAMO
+
+/datum/fish_trait/camouflage/apply_to_fish(obj/item/fish/fish)
+ . = ..()
+ RegisterSignal(fish, COMSIG_FISH_LIFE, PROC_REF(fade_out))
+ RegisterSignals(fish, list(COMSIG_MOVABLE_MOVED, COMSIG_FISH_STATUS_CHANGED), PROC_REF(reset_alpha))
+
+/datum/fish_trait/camouflage/proc/fade_out(obj/item/fish/source, seconds_per_tick)
+ SIGNAL_HANDLER
+ if(source.status == FISH_DEAD || source.last_move + 5 SECONDS >= world.time)
+ return
+ source.alpha = max(source.alpha - 10 * seconds_per_tick, 10)
+
+/datum/fish_trait/camouflage/proc/reset_alpha(obj/item/fish/source)
+ SIGNAL_HANDLER
+ var/init_alpha = initial(source.alpha)
+ if(init_alpha != source.alpha)
+ animate(source.alpha, alpha = init_alpha, time = 1.2 SECONDS, easing = CIRCULAR_EASING|EASE_OUT)
diff --git a/code/modules/fishing/fish/fish_types.dm b/code/modules/fishing/fish/fish_types.dm
deleted file mode 100644
index ce9f36f0553d6..0000000000000
--- a/code/modules/fishing/fish/fish_types.dm
+++ /dev/null
@@ -1,797 +0,0 @@
-// Freshwater fish
-
-/obj/item/fish/goldfish
- name = "goldfish"
- desc = "Despite common belief, goldfish do not have three-second memories. \
- They can actually remember things that happened up to three months ago."
- icon_state = "goldfish"
- sprite_width = 8
- sprite_height = 8
- stable_population = 3
- average_size = 30
- average_weight = 500
- favorite_bait = list(/obj/item/food/bait/worm)
- required_temperature_min = MIN_AQUARIUM_TEMP+18
- required_temperature_max = MIN_AQUARIUM_TEMP+26
-
-/obj/item/fish/goldfish/gill
- name = "McGill"
- desc = "A great rubber duck tool for Lawyers who can't get a grasp over their case."
- stable_population = 1
- random_case_rarity = FISH_RARITY_NOPE
- show_in_catalog = FALSE
- beauty = FISH_BEAUTY_GOOD
-
-/obj/item/fish/angelfish
- name = "angelfish"
- desc = "Young Angelfish often live in groups, while adults prefer solitary life. They become territorial and aggressive toward other fish when they reach adulthood."
- icon_state = "angelfish"
- dedicated_in_aquarium_icon_state = "bigfish"
- sprite_height = 7
- source_height = 7
- average_size = 30
- average_weight = 500
- stable_population = 3
- fish_traits = list(/datum/fish_trait/aggressive)
- required_temperature_min = MIN_AQUARIUM_TEMP+22
- required_temperature_max = MIN_AQUARIUM_TEMP+30
-
-/obj/item/fish/guppy
- name = "guppy"
- desc = "Guppy is also known as rainbow fish because of the brightly colored body and fins."
- icon_state = "guppy"
- dedicated_in_aquarium_icon_state = "fish_greyscale"
- aquarium_vc_color = "#91AE64"
- sprite_width = 8
- sprite_height = 5
- average_size = 30
- average_weight = 500
- stable_population = 6
- required_temperature_min = MIN_AQUARIUM_TEMP+20
- required_temperature_max = MIN_AQUARIUM_TEMP+28
-
-/obj/item/fish/plasmatetra
- name = "plasma tetra"
- desc = "Due to their small size, tetras are prey to many predators in their watery world, including eels, crustaceans, and invertebrates."
- icon_state = "plastetra"
- dedicated_in_aquarium_icon_state = "fish_greyscale"
- aquarium_vc_color = "#D30EB0"
- average_size = 30
- average_weight = 500
- stable_population = 3
- required_temperature_min = MIN_AQUARIUM_TEMP+20
- required_temperature_max = MIN_AQUARIUM_TEMP+28
-
-/obj/item/fish/catfish
- name = "cory catfish"
- desc = "A catfish has about 100,000 taste buds, and their bodies are covered with them to help detect chemicals present in the water and also to respond to touch."
- icon_state = "catfish"
- dedicated_in_aquarium_icon_state = "fish_greyscale"
- aquarium_vc_color = "#907420"
- average_size = 100
- average_weight = 2000
- stable_population = 3
- favorite_bait = list(
- list(
- "Type" = "Foodtype",
- "Value" = JUNKFOOD
- )
- )
- required_temperature_min = MIN_AQUARIUM_TEMP+12
- required_temperature_max = MIN_AQUARIUM_TEMP+30
- beauty = FISH_BEAUTY_GOOD
-
-/obj/item/fish/tadpole
- name = "tadpole"
- desc = "The larval spawn of an amphibian. A very minuscle, round creature with a long tail it uses to swim around."
- icon_state = "tadpole"
- dedicated_in_aquarium_icon_state = "tadpole small"
- average_size = 3
- average_weight = 10
- sprite_width = 3
- sprite_height = 1
- health = 50
- feeding_frequency = 1.5 MINUTES
- required_temperature_min = MIN_AQUARIUM_TEMP+15
- required_temperature_max = MIN_AQUARIUM_TEMP+20
- fillet_type = null
- fish_traits = list(/datum/fish_trait/no_mating) //They grow into frogs and that's it.
- beauty = FISH_BEAUTY_NULL
- random_case_rarity = FISH_RARITY_NOPE //Why would you want generic frog tadpoles you get from ponds inside fish cases?
- /// Once dead, tadpoles disappear after a dozen seconds, since you can get infinite tadpoles.
- var/del_timerid
-
-/obj/item/fish/tadpole/Initialize(mapload, apply_qualities = TRUE)
- . = ..()
- AddComponent(/datum/component/fish_growth, /mob/living/basic/frog, 100 / rand(2.5, 3 MINUTES) * 10)
- RegisterSignal(src, COMSIG_FISH_BEFORE_GROWING, PROC_REF(growth_checks))
- RegisterSignal(src, COMSIG_FISH_FINISH_GROWING, PROC_REF(on_growth))
-
-/obj/item/fish/tadpole/set_status(new_status)
- . = ..()
- if(status == FISH_DEAD)
- del_timerid = QDEL_IN_STOPPABLE(src, 12 SECONDS)
- else
- deltimer(del_timerid)
-
-/obj/item/fish/tadpole/proc/growth_checks(datum/source, seconds_per_tick)
- SIGNAL_HANDLER
- var/hunger = CLAMP01((world.time - last_feeding) / feeding_frequency)
- if(hunger >= 0.7) //too hungry to grow
- return COMPONENT_DONT_GROW
- var/obj/structure/aquarium/aquarium = loc
- if(!aquarium.allow_breeding) //the aquarium has breeding disabled
- return COMPONENT_DONT_GROW
-
-/obj/item/fish/tadpole/proc/on_growth(datum/source, mob/living/basic/frog/result)
- SIGNAL_HANDLER
- playsound(result, result.attack_sound, 50, TRUE) // reeeeeeeeeeeeeee...
-
-/obj/item/fish/tadpole/get_export_price(price, percent)
- return 2 //two credits. Tadpoles aren't really that valueable.
-
-// Saltwater fish below
-
-/obj/item/fish/clownfish
- name = "clownfish"
- desc = "Clownfish catch prey by swimming onto the reef, attracting larger fish, and luring them back to the anemone. The anemone will sting and eat the larger fish, leaving the remains for the clownfish."
- icon_state = "clownfish"
- dedicated_in_aquarium_icon_state = "clownfish_small"
- required_fluid_type = AQUARIUM_FLUID_SALTWATER
- sprite_width = 8
- sprite_height = 5
- average_size = 30
- average_weight = 500
- stable_population = 4
- fish_traits = list(/datum/fish_trait/picky_eater)
- evolution_types = list(/datum/fish_evolution/lubefish)
- compatible_types = list(/obj/item/fish/clownfish/lube)
- required_temperature_min = MIN_AQUARIUM_TEMP+22
- required_temperature_max = MIN_AQUARIUM_TEMP+30
-
-/obj/item/fish/clownfish/lube
- name = "lubefish"
- desc = "A clownfish exposed to cherry-flavored lube for far too long. First discovered the days following a cargo incident around the seas of Europa, when thousands of thousands of thousands..."
- icon_state = "lubefish"
- random_case_rarity = FISH_RARITY_VERY_RARE
- dedicated_in_aquarium_icon_state = "lubefish_small"
- fish_traits = list(/datum/fish_trait/picky_eater, /datum/fish_trait/lubed)
- evolution_types = null
- compatible_types = list(/obj/item/fish/clownfish)
- food = /datum/reagent/lube
- beauty = FISH_BEAUTY_GREAT
-
-/obj/item/fish/cardinal
- name = "cardinalfish"
- desc = "Cardinalfish are often found near sea urchins, where the fish hide when threatened."
- icon_state = "cardinalfish"
- dedicated_in_aquarium_icon_state = "fish_greyscale"
- required_fluid_type = AQUARIUM_FLUID_SALTWATER
- average_size = 30
- average_weight = 500
- stable_population = 4
- fish_traits = list(/datum/fish_trait/vegan)
- required_temperature_min = MIN_AQUARIUM_TEMP+22
- required_temperature_max = MIN_AQUARIUM_TEMP+30
-
-/obj/item/fish/greenchromis
- name = "green chromis"
- desc = "The Chromis can vary in color from blue to green depending on the lighting and distance from the lights."
- icon_state = "greenchromis"
- dedicated_in_aquarium_icon_state = "fish_greyscale"
- aquarium_vc_color = "#00ff00"
- required_fluid_type = AQUARIUM_FLUID_SALTWATER
- average_size = 30
- average_weight = 500
- stable_population = 5
- required_temperature_min = MIN_AQUARIUM_TEMP+23
- required_temperature_max = MIN_AQUARIUM_TEMP+28
-
- fishing_difficulty_modifier = 5 // Bit harder
-
-/obj/item/fish/firefish
- name = "firefish goby"
- desc = "To communicate in the wild, the firefish uses its dorsal fin to alert others of potential danger."
- icon_state = "firefish"
- sprite_width = 6
- sprite_height = 5
- required_fluid_type = AQUARIUM_FLUID_SALTWATER
- average_size = 30
- average_weight = 500
- stable_population = 3
- disliked_bait = list(/obj/item/food/bait/worm, /obj/item/food/bait/doughball)
- fish_ai_type = FISH_AI_ZIPPY
- required_temperature_min = MIN_AQUARIUM_TEMP+23
- required_temperature_max = MIN_AQUARIUM_TEMP+28
-
-/obj/item/fish/pufferfish
- name = "pufferfish"
- desc = "They say that one pufferfish contains enough toxins to kill 30 people, although in the last few decades they've been genetically engineered en masse to be less poisonous."
- icon_state = "pufferfish"
- required_fluid_type = AQUARIUM_FLUID_SALTWATER
- sprite_width = 8
- sprite_height = 8
- average_size = 60
- average_weight = 1000
- stable_population = 3
- required_temperature_min = MIN_AQUARIUM_TEMP+23
- required_temperature_max = MIN_AQUARIUM_TEMP+28
- fish_traits = list(/datum/fish_trait/heavy, /datum/fish_trait/toxic)
- beauty = FISH_BEAUTY_GOOD
-
-
-/obj/item/fish/lanternfish
- name = "lanternfish"
- desc = "Typically found in areas below 6600 feet below the surface of the ocean, they live in complete darkness."
- icon_state = "lanternfish"
- required_fluid_type = AQUARIUM_FLUID_SALTWATER
- random_case_rarity = FISH_RARITY_VERY_RARE
- source_width = 28
- source_height = 21
- sprite_width = 8
- sprite_height = 8
- average_size = 100
- average_weight = 1500
- stable_population = 3
- fish_traits = list(/datum/fish_trait/nocturnal)
- required_temperature_min = MIN_AQUARIUM_TEMP+2 //My source is that the water at a depth 6600 feet is pretty darn cold.
- required_temperature_max = MIN_AQUARIUM_TEMP+18
- beauty = FISH_BEAUTY_NULL
-
-//Tiziran Fish
-/obj/item/fish/dwarf_moonfish
- name = "dwarf moonfish"
- desc = "Ordinarily in the wild, the Zagoskian moonfish is around the size of a tuna, however through selective breeding a smaller breed suitable for being kept as an aquarium pet has been created."
- icon_state = "dwarf_moonfish"
- required_fluid_type = AQUARIUM_FLUID_SALTWATER
- stable_population = 2
- fillet_type = /obj/item/food/fishmeat/moonfish
- average_size = 100
- average_weight = 2000
- required_temperature_min = MIN_AQUARIUM_TEMP+20
- required_temperature_max = MIN_AQUARIUM_TEMP+30
- beauty = FISH_BEAUTY_GOOD
-
-/obj/item/fish/gunner_jellyfish
- name = "gunner jellyfish"
- desc = "So called due to their resemblance to an artillery shell, the gunner jellyfish is native to Tizira, where it is enjoyed as a delicacy. Produces a mild hallucinogen that is destroyed by cooking."
- icon_state = "gunner_jellyfish"
- required_fluid_type = AQUARIUM_FLUID_SALTWATER
- stable_population = 4
- fillet_type = /obj/item/food/fishmeat/gunner_jellyfish
- required_temperature_min = MIN_AQUARIUM_TEMP+24
- required_temperature_max = MIN_AQUARIUM_TEMP+32
- beauty = FISH_BEAUTY_GOOD
-
-/obj/item/fish/needlefish
- name = "needlefish"
- desc = "A tiny, transparent fish which resides in large schools in the oceans of Tizira. A common food for other, larger fish."
- icon_state = "needlefish"
- dedicated_in_aquarium_icon_state = "needlefish_small"
- sprite_width = 7
- required_fluid_type = AQUARIUM_FLUID_SALTWATER
- stable_population = 12
- fillet_type = null
- average_size = 20
- average_weight = 300
- fish_traits = list(/datum/fish_trait/carnivore)
- required_temperature_min = MIN_AQUARIUM_TEMP+10
- required_temperature_max = MIN_AQUARIUM_TEMP+32
-
-/obj/item/fish/armorfish
- name = "armorfish"
- desc = "A small shellfish native to Tizira's oceans, known for its exceptionally hard shell. Consumed similarly to prawns."
- icon_state = "armorfish"
- dedicated_in_aquarium_icon_state = "armorfish_small"
- sprite_height = 5
- sprite_width = 6
- required_fluid_type = AQUARIUM_FLUID_SALTWATER
- stable_population = 10
- fillet_type = /obj/item/food/fishmeat/armorfish
- fish_ai_type = FISH_AI_SLOW
- required_temperature_min = MIN_AQUARIUM_TEMP+10
- required_temperature_max = MIN_AQUARIUM_TEMP+32
-
-/// Commonly found on the mining fishing spots. Can be grown into lobstrosities
-/obj/item/fish/chasm_crab
- name = "chasm chrab"
- desc = "The young of the lobstrosity mature in pools below the earth, eating what falls in until large enough to clamber out. Those found near the station are well-fed."
- icon_state = "chrab"
- dedicated_in_aquarium_icon_state = "chrab_small"
- sprite_height = 9
- sprite_width = 8
- stable_population = 4
- feeding_frequency = 10 MINUTES
- random_case_rarity = FISH_RARITY_RARE
- fillet_type = /obj/item/food/meat/slab/rawcrab
- required_temperature_min = MIN_AQUARIUM_TEMP+9
- required_temperature_max = LAVALAND_MAX_TEMPERATURE+50
- min_pressure = HAZARD_LOW_PRESSURE
- safe_air_limits = list(
- /datum/gas/oxygen = list(2, 100),
- /datum/gas/nitrogen,
- /datum/gas/carbon_dioxide = list(0, 20),
- /datum/gas/water_vapor,
- /datum/gas/plasma = list(0, 5),
- /datum/gas/bz = list(0, 5),
- /datum/gas/miasma = list(0, 5),
- )
- evolution_types = list(/datum/fish_evolution/ice_chrab)
- compatible_types = list(/obj/item/fish/chasm_crab/ice)
- beauty = FISH_BEAUTY_GOOD
- ///This value represents how much the crab needs aren't being met. Higher values translate to a more likely hostile lobstrosity.
- var/anger = 0
- ///The lobstrosity type this matures into
- var/lob_type = /mob/living/basic/mining/lobstrosity/juvenile/lava
- ///at which rate the crab gains maturation
- var/growth_rate = 100 / (10 MINUTES) * 10
-
-/obj/item/fish/chasm_crab/Initialize(mapload, apply_qualities = TRUE)
- . = ..()
- RegisterSignal(src, COMSIG_FISH_BEFORE_GROWING, PROC_REF(growth_checks))
- RegisterSignal(src, COMSIG_FISH_FINISH_GROWING, PROC_REF(on_growth))
-
-///A chasm crab growth speed is determined by its initial weight and size, ergo bigger crabs for faster lobstrosities
-/obj/item/fish/chasm_crab/update_size_and_weight(new_size = average_size, new_weight = average_weight)
- . = ..()
- var/multiplier = 1
- switch(size)
- if(0 to FISH_SIZE_TINY_MAX)
- multiplier -= 0.2
- if(FISH_SIZE_SMALL_MAX to FISH_SIZE_NORMAL_MAX)
- multiplier += 0.2
- if(FISH_SIZE_NORMAL_MAX to FISH_SIZE_BULKY_MAX)
- multiplier += 0.5
- if(FISH_SIZE_BULKY_MAX to INFINITY)
- multiplier += 0.8
-
- if(weight <= 800)
- multiplier -= 0.1 * round((1000 - weight) / 200)
- else if(weight >= 1500)
- multiplier += min(0.1 * round((weight - 1000) / 500), 2)
-
- AddComponent(/datum/component/fish_growth, lob_type, initial(growth_rate) * multiplier)
-
-/obj/item/fish/chasm_crab/proc/growth_checks(datum/source, seconds_per_tick)
- SIGNAL_HANDLER
- var/hunger = CLAMP01((world.time - last_feeding) / feeding_frequency)
- if(health <= initial(health) * 0.6 || hunger >= 0.6) //if too hurt or hungry, don't grow.
- anger += growth_rate * 2 * seconds_per_tick
- return COMPONENT_DONT_GROW
-
- if(hunger >= 0.4) //I'm hungry and angry
- anger += growth_rate * 0.6 * seconds_per_tick
-
- if(!isaquarium(loc))
- return
-
- var/obj/structure/aquarium/aquarium = loc
- if(!aquarium.allow_breeding) //the aquarium has breeding disabled
- return COMPONENT_DONT_GROW
- if(!locate(/obj/item/aquarium_prop) in aquarium) //the aquarium deco is quite barren
- anger += growth_rate * 0.25 * seconds_per_tick
- var/fish_count = length(aquarium.get_fishes())
- if(!ISINRANGE(fish_count, 3, AQUARIUM_MAX_BREEDING_POPULATION * 0.5)) //too lonely or overcrowded
- anger += growth_rate * 0.3 * seconds_per_tick
- if(fish_count > AQUARIUM_MAX_BREEDING_POPULATION * 0.5) //check if there's enough room to maturate.
- return COMPONENT_DONT_GROW
-
-/obj/item/fish/chasm_crab/proc/on_growth(datum/source, mob/living/basic/mining/lobstrosity/juvenile/result)
- SIGNAL_HANDLER
- if(!prob(anger))
- result.AddElement(/datum/element/ai_retaliate)
- qdel(result.ai_controller)
- result.ai_controller = new /datum/ai_controller/basic_controller/lobstrosity/juvenile/calm(result)
- else if(anger < 30) //not really that mad, just a bit unstable.
- qdel(result.ai_controller)
- result.ai_controller = new /datum/ai_controller/basic_controller/lobstrosity/juvenile/capricious(result)
-
-/obj/item/fish/chasm_crab/ice
- name = "arctic chrab"
- desc = "A subspecies of chasm chrabs that has adapted to the cold climate and lack of abysmal holes of the icemoon."
- icon_state = "arctic_chrab"
- dedicated_in_aquarium_icon_state = "arctic_chrab_small"
- required_temperature_min = ICEBOX_MIN_TEMPERATURE-20
- required_temperature_max = MIN_AQUARIUM_TEMP+15
- evolution_types = list(/datum/fish_evolution/chasm_chrab)
- compatible_types = list(/obj/item/fish/chasm_crab)
- beauty = FISH_BEAUTY_GREAT
- lob_type = /mob/living/basic/mining/lobstrosity/juvenile
-
-/obj/item/fish/donkfish
- name = "donk co. company patent donkfish"
- desc = "A lab-grown donkfish. Its invention was an accident for the most part, as it was intended to be consumed in donk pockets. Unfortunately, it tastes horrible, so it has now become a pseudo-mascot."
- icon_state = "donkfish"
- random_case_rarity = FISH_RARITY_VERY_RARE
- required_fluid_type = AQUARIUM_FLUID_FRESHWATER
- stable_population = 4
- fillet_type = /obj/item/food/fishmeat/donkfish
- fish_traits = list(/datum/fish_trait/yucky)
- required_temperature_min = MIN_AQUARIUM_TEMP+15
- required_temperature_max = MIN_AQUARIUM_TEMP+28
- beauty = FISH_BEAUTY_EXCELLENT
-
-/obj/item/fish/emulsijack
- name = "toxic emulsijack"
- desc = "Ah, the terrifying emulsijack. Created in a laboratory, the only real use of this slimey, scaleless fish is for completely ruining a tank."
- icon_state = "emulsijack"
- random_case_rarity = FISH_RARITY_GOOD_LUCK_FINDING_THIS
- required_fluid_type = AQUARIUM_FLUID_ANADROMOUS
- stable_population = 3
- fish_traits = list(/datum/fish_trait/emulsijack)
- required_temperature_min = MIN_AQUARIUM_TEMP+5
- required_temperature_max = MIN_AQUARIUM_TEMP+40
- beauty = FISH_BEAUTY_BAD
-
-/obj/item/fish/jumpercable
- name = "monocloning jumpercable"
- desc = "A surprisingly useful if nasty looking creation from the syndicate fish labs. Drop one in a tank, and \
- watch it self-feed and multiply. Generates more and more power as a growing swarm!"
- icon_state = "jumpercable"
- dedicated_in_aquarium_icon_state = "jumpercable_small"
- sprite_width = 17
- sprite_height = 5
- stable_population = 12
- average_size = 110
- average_weight = 6000
- random_case_rarity = FISH_RARITY_GOOD_LUCK_FINDING_THIS
- required_temperature_min = MIN_AQUARIUM_TEMP+10
- required_temperature_max = MIN_AQUARIUM_TEMP+30
- favorite_bait = list(/obj/item/stock_parts/power_store/cell/lead)
- fish_traits = list(
- /datum/fish_trait/parthenogenesis,
- /datum/fish_trait/mixotroph,
- /datum/fish_trait/electrogenesis,
- )
- beauty = FISH_BEAUTY_UGLY
-
-/obj/item/fish/ratfish
- name = "ratfish"
- desc = "A rat exposed to the murky waters of maintenance too long. Any higher power, if it revealed itself, would state that the ratfish's continued existence is extremely unwelcome."
- icon_state = "ratfish"
- random_case_rarity = FISH_RARITY_RARE
- required_fluid_type = AQUARIUM_FLUID_FRESHWATER
- stable_population = 10 //set by New, but this is the default config value
- fillet_type = /obj/item/food/meat/slab/human/mutant/zombie //eww...
- fish_traits = list(/datum/fish_trait/necrophage)
- required_temperature_min = MIN_AQUARIUM_TEMP+15
- required_temperature_max = MIN_AQUARIUM_TEMP+35
- fish_ai_type = FISH_AI_ZIPPY
- favorite_bait = list(
- list(
- "Type" = "Foodtype",
- "Value" = DAIRY
- )
- )
- beauty = FISH_BEAUTY_DISGUSTING
-
-/obj/item/fish/ratfish/Initialize(mapload, apply_qualities = TRUE)
- . = ..()
- //stable pop reflects the config for how many mice migrate. powerful...
- stable_population = CONFIG_GET(number/mice_roundstart)
-
-/obj/item/fish/sludgefish
- name = "sludgefish"
- desc = "A misshapen, fragile, loosely fish-like living goop, the only thing that'd ever thrive in the acidic and claustrophobic cavities of the station's organic waste disposal system."
- icon_state = "sludgefish"
- dedicated_in_aquarium_icon_state = "sludgefish_small"
- sprite_width = 7
- sprite_height = 6
- required_fluid_type = AQUARIUM_FLUID_SULPHWATEVER
- stable_population = 8
- average_size = 20
- average_weight = 400
- health = 50
- breeding_timeout = 2.5 MINUTES
- fish_traits = list(/datum/fish_trait/parthenogenesis, /datum/fish_trait/no_mating)
- required_temperature_min = MIN_AQUARIUM_TEMP+10
- required_temperature_max = MIN_AQUARIUM_TEMP+40
- evolution_types = list(/datum/fish_evolution/purple_sludgefish)
- beauty = FISH_BEAUTY_NULL
-
-/obj/item/fish/sludgefish/purple
- name = "purple sludgefish"
- desc = "A misshapen, fragile, loosely fish-like living goop. This one has developed sexual reproduction mechanisms, and a purple tint to boot."
- icon_state = "sludgefish_purple"
- dedicated_in_aquarium_icon_state = "sludgefish_purple_small"
- random_case_rarity = FISH_RARITY_NOPE
- fish_traits = list(/datum/fish_trait/parthenogenesis)
-
-/obj/item/fish/slimefish
- name = "acquatic slime"
- desc = "Kids, this is what happens when a slime overcomes its hydrophobic nature. It goes glug glug."
- icon_state = "slimefish"
- icon_state_dead = "slimefish_dead"
- dedicated_in_aquarium_icon_state = "slimefish_small"
- sprite_width = 7
- sprite_height = 7
- do_flop_animation = FALSE //it already has a cute bouncy wiggle. :3
- random_case_rarity = FISH_RARITY_VERY_RARE
- required_fluid_type = AQUARIUM_FLUID_ANADROMOUS
- stable_population = 4
- health = 150
- fillet_type = /obj/item/slime_extract/grey
- grind_results = list(/datum/reagent/toxin/slimejelly = 10)
- fish_traits = list(/datum/fish_trait/toxin_immunity, /datum/fish_trait/crossbreeder)
- favorite_bait = list(
- list(
- "Type" = "Foodtype",
- "Value" = TOXIC,
- ),
- list(
- "Type" = "Reagent",
- "Value" = /datum/reagent/toxin,
- "Amount" = 5,
- ),
- )
- required_temperature_min = MIN_AQUARIUM_TEMP+20
- beauty = FISH_BEAUTY_GREAT
-
-/obj/item/fish/boned
- name = "unmarine bonemass"
- desc = "What one could mistake for fish remains, is in reality a species that chose to discard its weak flesh a long time ago. A living fossil, in its most literal sense."
- icon_state = "bonemass"
- dedicated_in_aquarium_icon_state = "bonemass_small"
- sprite_width = 10
- sprite_height = 7
- fish_ai_type = FISH_AI_ZIPPY
- random_case_rarity = FISH_RARITY_GOOD_LUCK_FINDING_THIS
- required_fluid_type = AQUARIUM_FLUID_ANY_WATER
- min_pressure = HAZARD_LOW_PRESSURE
- health = 150
- stable_population = 3
- grind_results = list(/datum/reagent/bone_dust = 10)
- fillet_type = /obj/item/stack/sheet/bone
- num_fillets = 2
- fish_traits = list(/datum/fish_trait/revival, /datum/fish_trait/carnivore)
- average_size = 70
- average_weight = 2000
- death_text = "%SRC stops moving." //It's dead... or is it?
- evolution_types = list(/datum/fish_evolution/mastodon)
- beauty = FISH_BEAUTY_UGLY
-
-/obj/item/fish/mastodon
- name = "unmarine mastodon"
- desc = "A monster of exposed muscles and innards, wrapped in a fish-like skeleton. You don't remember ever seeing it on the catalog."
- icon = 'icons/obj/aquarium/wide.dmi'
- icon_state = "mastodon"
- dedicated_in_aquarium_icon = 'icons/obj/aquarium/fish.dmi'
- dedicated_in_aquarium_icon_state = "mastodon_small"
- base_pixel_x = -16
- pixel_x = -16
- sprite_width = 12
- sprite_height = 7
- show_in_catalog = FALSE
- random_case_rarity = FISH_RARITY_NOPE
- fishing_difficulty_modifier = 5
- required_fluid_type = AQUARIUM_FLUID_ANY_WATER
- min_pressure = HAZARD_LOW_PRESSURE
- health = 300
- stable_population = 2 //This means they can only crossbreed.
- grind_results = list(/datum/reagent/bone_dust = 5, /datum/reagent/consumable/liquidgibs = 5)
- fillet_type = /obj/item/stack/sheet/bone
- num_fillets = 2
- feeding_frequency = 2 MINUTES
- breeding_timeout = 10 MINUTES
- average_size = 180
- average_weight = 5000
- death_text = "%SRC stops moving."
- fish_traits = list(/datum/fish_trait/heavy, /datum/fish_trait/amphibious, /datum/fish_trait/revival, /datum/fish_trait/carnivore, /datum/fish_trait/predator, /datum/fish_trait/aggressive)
- beauty = FISH_BEAUTY_BAD
-
-/obj/item/fish/holo
- name = "holographic goldfish"
- desc = "A holographic representation of a common goldfish, slowly flickering out, removed from its holo-habitat."
- icon_state = "goldfish"
- show_in_catalog = FALSE
- random_case_rarity = FISH_RARITY_NOPE
- sprite_width = 8
- sprite_height = 8
- stable_population = 1
- average_size = 30
- average_weight = 500
- required_fluid_type = AQUARIUM_FLUID_ANADROMOUS
- grind_results = null
- fillet_type = null
- death_text = "%SRC gently disappears."
- fish_traits = list(/datum/fish_trait/no_mating) //just to be sure, these shouldn't reproduce
- experisci_scannable = FALSE
-
-/obj/item/fish/holo/Initialize(mapload, apply_qualities = TRUE)
- . = ..()
- var/area/station/holodeck/holo_area = get_area(src)
- if(!istype(holo_area))
- addtimer(CALLBACK(src, PROC_REF(set_status), FISH_DEAD), 1 MINUTES)
- return
- holo_area.linked.add_to_spawned(src)
-
-/obj/item/fish/holo/set_status(new_status)
- . = ..()
- if(status == FISH_DEAD)
- animate(src, alpha = 0, 3 SECONDS, easing = SINE_EASING)
- QDEL_IN(src, 3 SECONDS)
-
-/obj/item/fish/holo/crab
- name = "holographic crab"
- desc = "A holographic represantion of a soul-crushingly soulless crab, unlike the cuter ones occasionally roaming around. It stares at you, with empty, beady eyes."
- icon_state = "crab"
- dedicated_in_aquarium_icon_state = "crab_small"
- average_weight = 1000
- sprite_height = 6
- sprite_width = 10
-
-/obj/item/fish/holo/puffer
- name = "holographic pufferfish"
- desc ="A holographic representation of 100% safe-to-eat pufferfish... that is, if holographic fishes were even edible."
- icon_state = "pufferfish"
- sprite_width = 8
- sprite_height = 8
- average_size = 60
- average_weight = 1000
- beauty = FISH_BEAUTY_GOOD
-
-/obj/item/fish/holo/angel
- name = "holographic angelfish"
- desc = "A holographic representation of a angelfish. I got nothing snarky to say about this one."
- icon_state = "angelfish"
- dedicated_in_aquarium_icon_state = "bigfish"
- sprite_height = 7
-
-/obj/item/fish/holo/clown
- name = "holographic clownfish"
- icon_state = "holo_clownfish"
- desc = "A holographic representation of a clownfish, or at least how they used to look like five centuries ago."
- dedicated_in_aquarium_icon_state = "holo_clownfish_small"
- required_fluid_type = AQUARIUM_FLUID_SALTWATER
- sprite_width = 8
- sprite_height = 5
-
-/obj/item/fish/holo/checkered
- name = "unrendered holographic fish"
- desc = "A checkered silhoutte of searing purple and pitch black presents itself before your eyes, like a tear in fabric of reality. It hurts to watch."
- icon_state = "checkered" //it's a meta joke, buddy.
- dedicated_in_aquarium_icon_state = "checkered_small"
- sprite_width = 4
- beauty = FISH_BEAUTY_NULL
-
-/obj/item/fish/holo/halffish
- name = "holographic half-fish"
- desc = "A holographic representation of... a fish reduced to all bones, except for its head. Isn't it supposed to be dead? Ehr, holo-dead?"
- icon_state = "half_fish"
- dedicated_in_aquarium_icon_state = "half_fish_small"
- sprite_height = 4
- sprite_width = 10
- average_size = 50
- beauty = FISH_BEAUTY_UGLY
-
-/obj/item/fish/starfish
- name = "cosmostarfish"
- desc = "A peculiar, gravity-defying, echinoderm-looking critter from hyperspace."
- icon_state = "starfish"
- dedicated_in_aquarium_icon_state = "starfish_small"
- icon_state_dead = "starfish_dead"
- sprite_width = 4
- average_size = 30
- average_weight = 300
- stable_population = 3
- required_fluid_type = AQUARIUM_FLUID_AIR
- random_case_rarity = FISH_RARITY_NOPE
- required_temperature_min = 0
- required_temperature_max = INFINITY
- safe_air_limits = null
- min_pressure = 0
- max_pressure = INFINITY
- grind_results = list(/datum/reagent/bluespace = 10)
- fillet_type = null
- fish_traits = list(/datum/fish_trait/antigrav, /datum/fish_trait/mixotroph)
- beauty = FISH_BEAUTY_GREAT
-
-/obj/item/fish/starfish/Initialize(mapload, apply_qualities = TRUE)
- . = ..()
- update_appearance(UPDATE_OVERLAYS)
-
-/obj/item/fish/starfish/update_overlays()
- . = ..()
- if(status == FISH_ALIVE)
- . += emissive_appearance(icon, "starfish_emissive", src)
-
-///It spins, and dimly glows in the dark.
-/obj/item/fish/starfish/flop_animation()
- DO_FLOATING_ANIM(src)
-
-/obj/item/fish/lavaloop
- name = "lavaloop fish"
- desc = "Due to its curvature, it can be used as make-shift boomerang."
- icon_state = "lava_loop"
- sprite_width = 3
- sprite_height = 5
- average_size = 30
- average_weight = 500
- resistance_flags = FIRE_PROOF | LAVA_PROOF
- required_fluid_type = AQUARIUM_FLUID_ANY_WATER //if we can survive hot lava and freezing plasrivers, we can survive anything
- fish_ai_type = FISH_AI_ZIPPY
- min_pressure = HAZARD_LOW_PRESSURE
- required_temperature_min = MIN_AQUARIUM_TEMP+30
- required_temperature_max = MIN_AQUARIUM_TEMP+35
- aquarium_vc_color = "#ce7e1d"
- fish_traits = list(
- /datum/fish_trait/carnivore,
- /datum/fish_trait/heavy,
- )
- hitsound = null
- throwforce = 5
- beauty = FISH_BEAUTY_GOOD
- ///maximum bonus damage when winded up
- var/maximum_bonus = 25
-
-/obj/item/fish/lavaloop/Initialize(mapload, apply_qualities = TRUE)
- . = ..()
- ADD_TRAIT(src, TRAIT_BYPASS_RANGED_ARMOR, INNATE_TRAIT)
- AddComponent(/datum/component/boomerang, throw_range, TRUE)
- AddComponent(\
- /datum/component/throwbonus_on_windup,\
- maximum_bonus = maximum_bonus,\
- windup_increment_speed = 2,\
- throw_text = "starts cooking in your hands, it may explode soon!",\
- pass_maximum_callback = CALLBACK(src, PROC_REF(explode_on_user)),\
- apply_bonus_callback = CALLBACK(src, PROC_REF(on_fish_land)),\
- sound_on_success = 'sound/weapons/parry.ogg',\
- effect_on_success = /obj/effect/temp_visual/guardian/phase,\
- )
-
-/obj/item/fish/lavaloop/proc/explode_on_user(mob/living/user)
- var/obj/item/bodypart/arm/active_arm = user.get_active_hand()
- active_arm?.dismember()
- to_chat(user, span_warning("[src] explodes!"))
- playsound(src, 'sound/effects/explosion1.ogg', 40, TRUE)
- user.flash_act(1, 1)
- qdel(src)
-
-/obj/item/fish/lavaloop/proc/on_fish_land(mob/living/target, bonus_value)
- if(!istype(target))
- return FALSE
- return (target.mob_size >= MOB_SIZE_LARGE)
-
-/obj/item/fish/lavaloop/plasma_river
- maximum_bonus = 30
-
-/obj/item/fish/lavaloop/plasma_river/explode_on_user(mob/living/user)
- playsound(src, 'sound/effects/explosion1.ogg', 40, TRUE)
- user.flash_act(1, 1)
- user.apply_status_effect(/datum/status_effect/ice_block_talisman, 5 SECONDS)
- qdel(src)
-
-/obj/item/fish/lavaloop/plasma_river/on_fish_land(mob/living/target, bonus_value)
- if(!istype(target))
- return FALSE
- if(target.mob_size < MOB_SIZE_LARGE)
- return FALSE
- var/freeze_timer = (bonus_value * 0.1)
- if(freeze_timer <= 0)
- return FALSE
- target.apply_status_effect(/datum/status_effect/ice_block_talisman, freeze_timer SECONDS)
- return FALSE
-
-/obj/item/fish/zipzap
- name = "anxious zipzap"
- desc = "A fish overflowing with crippling anxiety and electric potential. Worried about the walls of its tank closing in constantly. Both literally and as a general metaphorical unease about life's direction."
- icon_state = "zipzap"
- icon_state_dead = "zipzap_dead"
- sprite_width = 8
- sprite_height = 8
- stable_population = 3
- average_size = 30
- average_weight = 500
- random_case_rarity = FISH_RARITY_VERY_RARE
- favorite_bait = list(/obj/item/stock_parts/power_store/cell/lead)
- required_temperature_min = MIN_AQUARIUM_TEMP+18
- required_temperature_max = MIN_AQUARIUM_TEMP+26
- fish_traits = list(
- /datum/fish_trait/no_mating,
- /datum/fish_trait/wary,
- /datum/fish_trait/anxiety,
- /datum/fish_trait/electrogenesis,
- )
- //anxiety naturally limits the amount of zipzaps per tank, so they are stronger alone
- electrogenesis_power = 20 MEGA JOULES
- beauty = FISH_BEAUTY_GOOD
diff --git a/code/modules/fishing/fish/types/air_space.dm b/code/modules/fishing/fish/types/air_space.dm
new file mode 100644
index 0000000000000..f3b985edfa78a
--- /dev/null
+++ b/code/modules/fishing/fish/types/air_space.dm
@@ -0,0 +1,95 @@
+/obj/item/fish/sand_surfer
+ name = "sand surfer"
+ desc = "A bronze alien \"fish\" living and swimming underneath faraway sandy places."
+ icon_state = "sand_surfer"
+ sprite_height = 6
+ sprite_width = 6
+ stable_population = 5
+ average_size = 65
+ average_weight = 1100
+ weight_size_deviation = 0.35
+ random_case_rarity = FISH_RARITY_RARE
+ required_fluid_type = AQUARIUM_FLUID_AIR
+ required_temperature_min = MIN_AQUARIUM_TEMP+25
+ required_temperature_max = MIN_AQUARIUM_TEMP+60
+ fish_movement_type = /datum/fish_movement/plunger
+ fishing_difficulty_modifier = 5
+ fish_traits = list(/datum/fish_trait/shiny_lover)
+ beauty = FISH_BEAUTY_GOOD
+
+/obj/item/fish/sand_crab
+ name = "burrower crab"
+ desc = "A sand-dwelling crustacean. It looks like a crab and tastes like a crab, but waddles like a fish."
+ icon_state = "crab"
+ dedicated_in_aquarium_icon_state = "crab_small"
+ sprite_height = 6
+ sprite_width = 10
+ average_size = 60
+ average_weight = 1000
+ weight_size_deviation = 0.1
+ required_fluid_type = AQUARIUM_FLUID_SALTWATER
+ required_temperature_min = MIN_AQUARIUM_TEMP+20
+ required_temperature_max = MIN_AQUARIUM_TEMP+40
+ fillet_type = /obj/item/food/meat/slab/rawcrab
+ fish_traits = list(/datum/fish_trait/amphibious, /datum/fish_trait/shiny_lover, /datum/fish_trait/carnivore)
+ fish_movement_type = /datum/fish_movement/slow
+ favorite_bait = list(
+ list(
+ FISH_BAIT_TYPE = FISH_BAIT_FOODTYPE,
+ FISH_BAIT_VALUE = SEAFOOD,
+ ),
+ )
+
+/obj/item/fish/bumpy
+ name = "bump-fish"
+ desc = "An misshapen fish-thing all covered in stubby little tendrils"
+ icon_state = "bumpy"
+ sprite_height = 4
+ sprite_width = 5
+ stable_population = 4
+ required_fluid_type = AQUARIUM_FLUID_ANY_WATER
+ required_temperature_min = MIN_AQUARIUM_TEMP+15
+ required_temperature_max = MIN_AQUARIUM_TEMP+40
+ beauty = FISH_BEAUTY_BAD
+ fish_traits = list(/datum/fish_trait/amphibious, /datum/fish_trait/vegan)
+ favorite_bait = list(
+ list(
+ FISH_BAIT_TYPE = FISH_BAIT_FOODTYPE,
+ FISH_BAIT_VALUE = VEGETABLES,
+ ),
+ )
+
+/obj/item/fish/starfish
+ name = "cosmostarfish"
+ desc = "A peculiar, gravity-defying, echinoderm-looking critter from hyperspace."
+ icon_state = "starfish"
+ icon_state_dead = "starfish_dead"
+ sprite_height = 3
+ sprite_width = 4
+ average_size = 30
+ average_weight = 300
+ stable_population = 3
+ required_fluid_type = AQUARIUM_FLUID_AIR
+ random_case_rarity = FISH_RARITY_NOPE
+ required_temperature_min = 0
+ required_temperature_max = INFINITY
+ safe_air_limits = null
+ min_pressure = 0
+ max_pressure = INFINITY
+ grind_results = list(/datum/reagent/bluespace = 10)
+ fillet_type = null
+ fish_traits = list(/datum/fish_trait/antigrav, /datum/fish_trait/mixotroph)
+ beauty = FISH_BEAUTY_GREAT
+
+/obj/item/fish/starfish/Initialize(mapload, apply_qualities = TRUE)
+ . = ..()
+ update_appearance(UPDATE_OVERLAYS)
+
+/obj/item/fish/starfish/update_overlays()
+ . = ..()
+ if(status == FISH_ALIVE)
+ . += emissive_appearance(icon, "starfish_emissive", src)
+
+///It spins, and dimly glows in the dark.
+/obj/item/fish/starfish/flop_animation()
+ DO_FLOATING_ANIM(src)
diff --git a/code/modules/fishing/fish/types/anadromous.dm b/code/modules/fishing/fish/types/anadromous.dm
new file mode 100644
index 0000000000000..ecdbda1fde7d2
--- /dev/null
+++ b/code/modules/fishing/fish/types/anadromous.dm
@@ -0,0 +1,62 @@
+/obj/item/fish/sockeye_salmon
+ name = "sockeye salmon"
+ desc = "A fairly common and iconic salmon endemic of the Pacific Ocean. At some point imported into outer space, where we're now."
+ icon_state = "sockeye"
+ sprite_width = 6
+ sprite_height = 4
+ stable_population = 6
+ required_temperature_min = MIN_AQUARIUM_TEMP+3
+ required_temperature_max = MIN_AQUARIUM_TEMP+19
+ required_fluid_type = AQUARIUM_FLUID_ANADROMOUS
+ fillet_type = /obj/item/food/fishmeat/salmon
+ beauty = FISH_BEAUTY_GOOD
+
+/obj/item/fish/arctic_char
+ name = "arctic char"
+ desc = "A cold-water anadromous fish widespread around the Northern Hemisphere of Earth, yet it has somehow found a way here."
+ icon_state = "arctic_char"
+ sprite_width = 7
+ sprite_height = 4
+ stable_population = 6
+ average_size = 60
+ average_weight = 1200
+ weight_size_deviation = 0.5 // known for their size dismophism
+ required_temperature_min = MIN_AQUARIUM_TEMP+3
+ required_temperature_max = MIN_AQUARIUM_TEMP+19
+ required_fluid_type = AQUARIUM_FLUID_ANADROMOUS
+
+/obj/item/fish/pike
+ name = "pike"
+ desc = "A long-bodied predator with a snout that almost looks like a beak. Definitely not a weapon to swing around."
+ icon = 'icons/obj/aquarium/wide.dmi'
+ icon_state = "pike"
+ inhand_icon_state = "pike"
+ base_pixel_x = -16
+ pixel_x = -16
+ stable_population = 4
+ sprite_width = 10
+ sprite_height = 3
+ average_size = 100
+ average_weight = 2000
+ breeding_timeout = 4 MINUTES
+ health = 150
+ beauty = FISH_BEAUTY_GOOD
+ required_fluid_type = AQUARIUM_FLUID_ANADROMOUS
+ random_case_rarity = FISH_RARITY_RARE
+ fish_movement_type = /datum/fish_movement/plunger
+ fishing_difficulty_modifier = 10
+ required_temperature_min = MIN_AQUARIUM_TEMP+12
+ required_temperature_max = MIN_AQUARIUM_TEMP+27
+ fish_traits = list(/datum/fish_trait/carnivore, /datum/fish_trait/predator, /datum/fish_trait/aggressive)
+ compatible_types = list(/obj/item/fish/pike/armored)
+ favorite_bait = list(
+ list(
+ FISH_BAIT_TYPE = FISH_BAIT_FOODTYPE,
+ FISH_BAIT_VALUE = SEAFOOD|MEAT,
+ ),
+ /obj/item/fish,
+ )
+
+/obj/item/fish/pike/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_FISH_SHOULD_TWOHANDED, INNATE_TRAIT)
diff --git a/code/modules/fishing/fish/types/freshwater.dm b/code/modules/fishing/fish/types/freshwater.dm
new file mode 100644
index 0000000000000..129b738fc0ad8
--- /dev/null
+++ b/code/modules/fishing/fish/types/freshwater.dm
@@ -0,0 +1,213 @@
+/obj/item/fish/goldfish
+ name = "goldfish"
+ desc = "Despite common belief, goldfish do not have three-second memories. \
+ They can actually remember things that happened up to three months ago."
+ icon_state = "goldfish"
+ dedicated_in_aquarium_icon_state = "fish_greyscale"
+ aquarium_vc_color = "#D8540D"
+ sprite_width = 5
+ sprite_height = 3
+ stable_population = 9
+ average_size = 20
+ average_weight = 200
+ weight_size_deviation = 0.35
+ favorite_bait = list(/obj/item/food/bait/worm)
+ required_temperature_min = MIN_AQUARIUM_TEMP+18
+ required_temperature_max = MIN_AQUARIUM_TEMP+26
+ evolution_types = list(/datum/fish_evolution/three_eyes, /datum/fish_evolution/chainsawfish)
+ compatible_types = list(/obj/item/fish/goldfish/gill, /obj/item/fish/goldfish/three_eyes, /obj/item/fish/goldfish/three_eyes/gill)
+
+/obj/item/fish/goldfish/Initialize(mapload, apply_qualities = TRUE)
+ . = ..()
+ add_traits(list(TRAIT_FISHING_BAIT, TRAIT_GOOD_QUALITY_BAIT), INNATE_TRAIT)
+
+/obj/item/fish/goldfish/gill
+ name = "McGill"
+ desc = "A great rubber duck tool for Lawyers who can't get a grasp over their case."
+ stable_population = 1
+ random_case_rarity = FISH_RARITY_NOPE
+ show_in_catalog = FALSE
+ beauty = FISH_BEAUTY_GOOD
+ compatible_types = list(/obj/item/fish/goldfish, /obj/item/fish/goldfish/three_eyes)
+ fish_traits = list(/datum/fish_trait/recessive)
+
+/obj/item/fish/goldfish/three_eyes
+ name = "three-eyed goldfish"
+ desc = "A goldfish with an extra half a pair of eyes. You wonder what it's been feeding on lately..."
+ icon_state = "three_eyes"
+ stable_population = 4
+ fish_traits = list(/datum/fish_trait/recessive, /datum/fish_trait/shiny_lover)
+ compatible_types = list(/obj/item/fish/goldfish, /obj/item/fish/goldfish/gill, /obj/item/fish/goldfish/three_eyes/gill)
+ beauty = FISH_BEAUTY_GOOD
+ fishing_difficulty_modifier = 10
+ random_case_rarity = FISH_RARITY_VERY_RARE
+ food = /datum/reagent/toxin/mutagen
+ favorite_bait = list(
+ list(
+ "Type" = "Reagent",
+ "Value" = /datum/reagent/toxin/mutagen,
+ "Amount" = 3,
+ ),
+ )
+
+/obj/item/fish/goldfish/three_eyes/gill
+ name = "McGill"
+ desc = "A great rubber duck tool for Lawyers who can't get a grasp over their case. It looks kinda different today..."
+ compatible_types = list(/obj/item/fish/goldfish, /obj/item/fish/goldfish/three_eyes)
+ beauty = FISH_BEAUTY_GREAT
+ show_in_catalog = FALSE
+ stable_population = 1
+ random_case_rarity = FISH_RARITY_NOPE
+
+/obj/item/fish/angelfish
+ name = "angelfish"
+ desc = "Young Angelfish often live in groups, while adults prefer solitary life. They become territorial and aggressive toward other fish when they reach adulthood."
+ icon_state = "angelfish"
+ sprite_width = 4
+ sprite_height = 7
+ average_size = 30
+ average_weight = 500
+ stable_population = 3
+ fish_traits = list(/datum/fish_trait/aggressive)
+ required_temperature_min = MIN_AQUARIUM_TEMP+22
+ required_temperature_max = MIN_AQUARIUM_TEMP+30
+
+/obj/item/fish/guppy
+ name = "guppy"
+ desc = "Guppy is also known as rainbow fish because of the brightly colored body and fins."
+ icon_state = "guppy"
+ sprite_width = 5
+ sprite_height = 2
+ sprite_width = 8
+ sprite_height = 5
+ average_size = 30
+ average_weight = 500
+ stable_population = 6
+ required_temperature_min = MIN_AQUARIUM_TEMP+20
+ required_temperature_max = MIN_AQUARIUM_TEMP+28
+
+/obj/item/fish/plasmatetra
+ name = "plasma tetra"
+ desc = "Due to their small size, tetras are prey to many predators in their watery world, including eels, crustaceans, and invertebrates."
+ icon_state = "plastetra"
+ sprite_width = 4
+ sprite_height = 2
+ average_size = 30
+ average_weight = 500
+ stable_population = 3
+ required_temperature_min = MIN_AQUARIUM_TEMP+20
+ required_temperature_max = MIN_AQUARIUM_TEMP+28
+
+/obj/item/fish/catfish
+ name = "catfish"
+ desc = "A catfish has about 100,000 taste buds, and their bodies are covered with them to help detect chemicals present in the water and also to respond to touch."
+ icon_state = "catfish"
+ sprite_width = 8
+ sprite_height = 4
+ average_size = 80
+ average_weight = 1600
+ weight_size_deviation = 0.35
+ stable_population = 3
+ favorite_bait = list(
+ list(
+ FISH_BAIT_TYPE = FISH_BAIT_FOODTYPE,
+ FISH_BAIT_VALUE = JUNKFOOD
+ )
+ )
+ required_temperature_min = MIN_AQUARIUM_TEMP+12
+ required_temperature_max = MIN_AQUARIUM_TEMP+30
+ beauty = FISH_BEAUTY_GOOD
+
+/obj/item/fish/zipzap
+ name = "anxious zipzap"
+ desc = "A fish overflowing with crippling anxiety and electric potential. Worried about the walls of its tank closing in constantly. Both literally and as a general metaphorical unease about life's direction."
+ icon_state = "zipzap"
+ icon_state_dead = "zipzap_dead"
+ sprite_width = 6
+ sprite_height = 3
+ stable_population = 3
+ average_size = 30
+ average_weight = 500
+ random_case_rarity = FISH_RARITY_VERY_RARE
+ favorite_bait = list(/obj/item/stock_parts/power_store/cell/lead)
+ required_temperature_min = MIN_AQUARIUM_TEMP+18
+ required_temperature_max = MIN_AQUARIUM_TEMP+26
+ fish_traits = list(
+ /datum/fish_trait/no_mating,
+ /datum/fish_trait/wary,
+ /datum/fish_trait/anxiety,
+ /datum/fish_trait/electrogenesis,
+ )
+ //anxiety naturally limits the amount of zipzaps per tank, so they are stronger alone
+ electrogenesis_power = 20 MEGA JOULES
+ beauty = FISH_BEAUTY_GOOD
+
+/obj/item/fish/tadpole
+ name = "tadpole"
+ desc = "The larval spawn of an amphibian. A very minuscle, round creature with a long tail it uses to swim around."
+ icon_state = "tadpole"
+ average_size = 3
+ average_weight = 10
+ sprite_width = 3
+ sprite_height = 1
+ health = 50
+ feeding_frequency = 1.5 MINUTES
+ required_temperature_min = MIN_AQUARIUM_TEMP+15
+ required_temperature_max = MIN_AQUARIUM_TEMP+20
+ fillet_type = null
+ fish_traits = list(/datum/fish_trait/no_mating) //They grow into frogs and that's it.
+ beauty = FISH_BEAUTY_NULL
+ random_case_rarity = FISH_RARITY_NOPE //Why would you want generic frog tadpoles you get from ponds inside fish cases?
+ /// Once dead, tadpoles disappear after a dozen seconds, since you can get infinite tadpoles.
+ var/del_timerid
+
+/obj/item/fish/tadpole/Initialize(mapload, apply_qualities = TRUE)
+ . = ..()
+ AddComponent(/datum/component/fish_growth, /mob/living/basic/frog, 100 / rand(2.5, 3 MINUTES) * 10)
+ RegisterSignal(src, COMSIG_FISH_BEFORE_GROWING, PROC_REF(growth_checks))
+ RegisterSignal(src, COMSIG_FISH_FINISH_GROWING, PROC_REF(on_growth))
+
+/obj/item/fish/tadpole/set_status(new_status, silent = FALSE)
+ . = ..()
+ if(status == FISH_DEAD)
+ del_timerid = QDEL_IN_STOPPABLE(src, 12 SECONDS)
+ else
+ deltimer(del_timerid)
+
+/obj/item/fish/tadpole/proc/growth_checks(datum/source, seconds_per_tick)
+ SIGNAL_HANDLER
+ var/hunger = CLAMP01((world.time - last_feeding) / feeding_frequency)
+ if(hunger >= 0.7) //too hungry to grow
+ return COMPONENT_DONT_GROW
+ var/obj/structure/aquarium/aquarium = loc
+ if(!aquarium.allow_breeding) //the aquarium has breeding disabled
+ return COMPONENT_DONT_GROW
+
+/obj/item/fish/tadpole/proc/on_growth(datum/source, mob/living/basic/frog/result)
+ SIGNAL_HANDLER
+ playsound(result, result.attack_sound, 50, TRUE) // reeeeeeeeeeeeeee...
+
+/obj/item/fish/tadpole/get_export_price(price, percent)
+ return 2 //two credits. Tadpoles aren't really that valueable.
+
+/obj/item/fish/perch
+ name = "perch"
+ desc = "An all around popular panfish, game fish and unfortunate prey to other, bigger predators."
+ icon_state = "perch"
+ dedicated_in_aquarium_icon_state = "fish_greyscale"
+ aquarium_vc_color = "#9D8C64"
+ sprite_width = 5
+ sprite_height = 3
+ stable_population = 7
+ average_size = 25
+ average_weight = 400
+ required_temperature_min = MIN_AQUARIUM_TEMP+5
+ required_temperature_max = MIN_AQUARIUM_TEMP+26
+ favorite_bait = list(
+ list(
+ FISH_BAIT_TYPE = FISH_BAIT_FOODTYPE,
+ FISH_BAIT_VALUE = BUGS,
+ ),
+ /obj/item/fish,
+ /obj/item/fishing_lure, //they love lures in general.
+ )
diff --git a/code/modules/fishing/fish/types/holographic.dm b/code/modules/fishing/fish/types/holographic.dm
new file mode 100644
index 0000000000000..dfcdbeedb6b61
--- /dev/null
+++ b/code/modules/fishing/fish/types/holographic.dm
@@ -0,0 +1,108 @@
+
+/obj/item/fish/holo
+ name = "holographic goldfish"
+ desc = "A holographic representation of a common goldfish, slowly flickering out, removed from its holo-habitat."
+ icon_state = /obj/item/fish/goldfish::icon_state
+ show_in_catalog = FALSE
+ random_case_rarity = FISH_RARITY_NOPE
+ dedicated_in_aquarium_icon_state = /obj/item/fish/goldfish::dedicated_in_aquarium_icon_state
+ aquarium_vc_color = /obj/item/fish/goldfish::aquarium_vc_color
+ sprite_width = /obj/item/fish/goldfish::sprite_width
+ sprite_height = /obj/item/fish/goldfish::sprite_height
+ stable_population = 1
+ average_size = /obj/item/fish/goldfish::average_size
+ average_weight = /obj/item/fish/goldfish::average_weight
+ required_fluid_type = AQUARIUM_FLUID_ANADROMOUS
+ grind_results = null
+ fillet_type = null
+ death_text = "%SRC gently disappears."
+ fish_traits = list(/datum/fish_trait/no_mating) //just to be sure, these shouldn't reproduce
+ experisci_scannable = FALSE
+ beauty = /obj/item/fish/goldfish::beauty
+
+/obj/item/fish/holo/Initialize(mapload, apply_qualities = TRUE)
+ . = ..()
+ var/area/station/holodeck/holo_area = get_area(src)
+ if(!istype(holo_area))
+ addtimer(CALLBACK(src, PROC_REF(set_status), FISH_DEAD), 1 MINUTES)
+ return
+ holo_area.linked.add_to_spawned(src)
+
+/obj/item/fish/holo/set_status(new_status, silent = FALSE)
+ . = ..()
+ if(status == FISH_DEAD)
+ animate(src, alpha = 0, 3 SECONDS, easing = SINE_EASING)
+ QDEL_IN(src, 3 SECONDS)
+
+/obj/item/fish/holo/crab
+ name = "holographic crab"
+ desc = "A holographic represantion of a soul-crushingly soulless crab, unlike the cuter ones occasionally roaming around. It stares at you, with empty, beady eyes."
+ icon_state = "crab"
+ dedicated_in_aquarium_icon_state = null
+ aquarium_vc_color = null
+ average_size = 30
+ average_weight = 1000
+ sprite_height = 6
+ sprite_width = 10
+ beauty = FISH_BEAUTY_GOOD
+
+/obj/item/fish/holo/puffer
+ name = "holographic pufferfish"
+ desc ="A holographic representation of 100% safe-to-eat pufferfish... that is, if holographic fishes were even edible."
+ icon_state = /obj/item/fish/pufferfish::icon_state
+ dedicated_in_aquarium_icon_state = /obj/item/fish/pufferfish::dedicated_in_aquarium_icon_state
+ aquarium_vc_color = /obj/item/fish/pufferfish::aquarium_vc_color
+ average_size = /obj/item/fish/pufferfish::average_size
+ average_weight = /obj/item/fish/pufferfish::average_weight
+ sprite_height = /obj/item/fish/pufferfish::sprite_height
+ sprite_width = /obj/item/fish/pufferfish::sprite_width
+ beauty = /obj/item/fish/pufferfish::beauty
+
+/obj/item/fish/holo/angel
+ name = "holographic angelfish"
+ desc = "A holographic representation of a angelfish. I got nothing snarky to say about this one."
+ icon_state = /obj/item/fish/angelfish::icon_state
+ dedicated_in_aquarium_icon_state = /obj/item/fish/angelfish::dedicated_in_aquarium_icon_state
+ aquarium_vc_color = /obj/item/fish/angelfish::aquarium_vc_color
+ average_size = /obj/item/fish/angelfish::average_size
+ average_weight = /obj/item/fish/angelfish::average_weight
+ sprite_height = /obj/item/fish/angelfish::sprite_height
+ sprite_width = /obj/item/fish/angelfish::sprite_width
+ beauty = /obj/item/fish/angelfish::beauty
+
+/obj/item/fish/holo/clown
+ name = "holographic clownfish"
+ icon_state = "holo_clownfish"
+ desc = "A holographic representation of a clownfish, or at least how they used to look like five centuries ago."
+ dedicated_in_aquarium_icon_state = null
+ aquarium_vc_color = /obj/item/fish/clownfish::aquarium_vc_color
+ average_size = /obj/item/fish/clownfish::average_size
+ average_weight = /obj/item/fish/clownfish::average_weight
+ sprite_height = /obj/item/fish/clownfish::sprite_height
+ sprite_width = /obj/item/fish/clownfish::sprite_width
+ required_fluid_type = /obj/item/fish/clownfish::required_fluid_type
+ beauty = /obj/item/fish/clownfish::beauty
+
+/obj/item/fish/holo/checkered
+ name = "unrendered holographic fish"
+ desc = "A checkered silhoutte of searing purple and pitch black presents itself before your eyes, like a tear in fabric of reality. It hurts to watch."
+ icon_state = "checkered" //it's a meta joke, buddy.
+ dedicated_in_aquarium_icon_state = null
+ aquarium_vc_color = null
+ average_size = 30
+ average_weight = 500
+ sprite_width = 4
+ sprite_height = 3
+ beauty = FISH_BEAUTY_NULL
+
+/obj/item/fish/holo/halffish
+ name = "holographic half-fish"
+ desc = "A holographic representation of... a fish reduced to all bones, except for its head. Isn't it supposed to be dead? Ehr, holo-dead?"
+ icon_state = "half_fish"
+ dedicated_in_aquarium_icon_state = null
+ aquarium_vc_color = null
+ sprite_height = 4
+ sprite_width = 10
+ average_size = 50
+ average_weight = 500
+ beauty = FISH_BEAUTY_UGLY
diff --git a/code/modules/fishing/fish/types/mining.dm b/code/modules/fishing/fish/types/mining.dm
new file mode 100644
index 0000000000000..7614f259e5939
--- /dev/null
+++ b/code/modules/fishing/fish/types/mining.dm
@@ -0,0 +1,198 @@
+/// Commonly found on the mining fishing spots. Can be grown into lobstrosities
+/obj/item/fish/chasm_crab
+ name = "chasm chrab"
+ desc = "The young of the lobstrosity mature in pools below the earth, eating what falls in until large enough to clamber out. Those found near the station are well-fed."
+ icon_state = "chrab"
+ sprite_height = 9
+ sprite_width = 8
+ stable_population = 4
+ feeding_frequency = 10 MINUTES
+ random_case_rarity = FISH_RARITY_RARE
+ fillet_type = /obj/item/food/meat/slab/rawcrab
+ required_temperature_min = MIN_AQUARIUM_TEMP+9
+ required_temperature_max = LAVALAND_MAX_TEMPERATURE+50
+ min_pressure = HAZARD_LOW_PRESSURE
+ safe_air_limits = list(
+ /datum/gas/oxygen = list(2, 100),
+ /datum/gas/nitrogen,
+ /datum/gas/carbon_dioxide = list(0, 20),
+ /datum/gas/water_vapor,
+ /datum/gas/plasma = list(0, 5),
+ /datum/gas/bz = list(0, 5),
+ /datum/gas/miasma = list(0, 5),
+ )
+ evolution_types = list(/datum/fish_evolution/ice_chrab)
+ compatible_types = list(/obj/item/fish/chasm_crab/ice)
+ beauty = FISH_BEAUTY_GOOD
+ favorite_bait = list(/obj/item/fish/lavaloop)
+ ///This value represents how much the crab needs aren't being met. Higher values translate to a more likely hostile lobstrosity.
+ var/anger = 0
+ ///The lobstrosity type this matures into
+ var/lob_type = /mob/living/basic/mining/lobstrosity/juvenile/lava
+ ///at which rate the crab gains maturation
+ var/growth_rate = 100 / (10 MINUTES) * 10
+
+/obj/item/fish/chasm_crab/Initialize(mapload, apply_qualities = TRUE)
+ . = ..()
+ RegisterSignal(src, COMSIG_FISH_BEFORE_GROWING, PROC_REF(growth_checks))
+ RegisterSignal(src, COMSIG_FISH_FINISH_GROWING, PROC_REF(on_growth))
+
+///A chasm crab growth speed is determined by its initial weight and size, ergo bigger crabs for faster lobstrosities
+/obj/item/fish/chasm_crab/update_size_and_weight(new_size = average_size, new_weight = average_weight)
+ . = ..()
+ var/multiplier = 1
+ switch(size)
+ if(0 to FISH_SIZE_TINY_MAX)
+ multiplier -= 0.2
+ if(FISH_SIZE_SMALL_MAX to FISH_SIZE_NORMAL_MAX)
+ multiplier += 0.2
+ if(FISH_SIZE_NORMAL_MAX to FISH_SIZE_BULKY_MAX)
+ multiplier += 0.5
+ if(FISH_SIZE_BULKY_MAX to INFINITY)
+ multiplier += 0.8
+
+ if(weight <= 800)
+ multiplier -= 0.1 * round((1000 - weight) / 200)
+ else if(weight >= 1500)
+ multiplier += min(0.1 * round((weight - 1000) / 500), 2)
+
+ AddComponent(/datum/component/fish_growth, lob_type, initial(growth_rate) * multiplier)
+
+/obj/item/fish/chasm_crab/proc/growth_checks(datum/source, seconds_per_tick)
+ SIGNAL_HANDLER
+ var/hunger = CLAMP01((world.time - last_feeding) / feeding_frequency)
+ if(health <= initial(health) * 0.6 || hunger >= 0.6) //if too hurt or hungry, don't grow.
+ anger += growth_rate * 2 * seconds_per_tick
+ return COMPONENT_DONT_GROW
+
+ if(hunger >= 0.4) //I'm hungry and angry
+ anger += growth_rate * 0.6 * seconds_per_tick
+
+ if(!isaquarium(loc))
+ return
+
+ var/obj/structure/aquarium/aquarium = loc
+ if(!aquarium.allow_breeding) //the aquarium has breeding disabled
+ return COMPONENT_DONT_GROW
+ if(!locate(/obj/item/aquarium_prop) in aquarium) //the aquarium deco is quite barren
+ anger += growth_rate * 0.25 * seconds_per_tick
+ var/fish_count = length(aquarium.get_fishes())
+ if(!ISINRANGE(fish_count, 3, AQUARIUM_MAX_BREEDING_POPULATION * 0.5)) //too lonely or overcrowded
+ anger += growth_rate * 0.3 * seconds_per_tick
+ if(fish_count > AQUARIUM_MAX_BREEDING_POPULATION * 0.5) //check if there's enough room to maturate.
+ return COMPONENT_DONT_GROW
+
+/obj/item/fish/chasm_crab/proc/on_growth(datum/source, mob/living/basic/mining/lobstrosity/juvenile/result)
+ SIGNAL_HANDLER
+ if(!prob(anger))
+ result.AddElement(/datum/element/ai_retaliate)
+ qdel(result.ai_controller)
+ result.ai_controller = new /datum/ai_controller/basic_controller/lobstrosity/juvenile/calm(result)
+ else if(anger < 30) //not really that mad, just a bit unstable.
+ qdel(result.ai_controller)
+ result.ai_controller = new /datum/ai_controller/basic_controller/lobstrosity/juvenile/capricious(result)
+
+/obj/item/fish/chasm_crab/ice
+ name = "arctic chrab"
+ desc = "A subspecies of chasm chrabs that has adapted to the cold climate and lack of abysmal holes of the icemoon."
+ icon_state = "arctic_chrab"
+ required_temperature_min = ICEBOX_MIN_TEMPERATURE-20
+ required_temperature_max = MIN_AQUARIUM_TEMP+15
+ evolution_types = list(/datum/fish_evolution/chasm_chrab)
+ compatible_types = list(/obj/item/fish/chasm_crab)
+ beauty = FISH_BEAUTY_GREAT
+ lob_type = /mob/living/basic/mining/lobstrosity/juvenile
+
+/obj/item/fish/boned
+ name = "unmarine bonemass"
+ desc = "What one could mistake for fish remains, is in reality a species that chose to discard its weak flesh a long time ago. A living fossil, in its most literal sense."
+ icon_state = "bonemass"
+ sprite_width = 10
+ sprite_height = 7
+ fish_movement_type = /datum/fish_movement/zippy
+ random_case_rarity = FISH_RARITY_GOOD_LUCK_FINDING_THIS
+ required_fluid_type = AQUARIUM_FLUID_ANY_WATER
+ min_pressure = HAZARD_LOW_PRESSURE
+ health = 150
+ stable_population = 3
+ grind_results = list(/datum/reagent/bone_dust = 10)
+ fillet_type = /obj/item/stack/sheet/bone
+ num_fillets = 2
+ fish_traits = list(/datum/fish_trait/revival, /datum/fish_trait/carnivore)
+ average_size = 70
+ average_weight = 2000
+ death_text = "%SRC stops moving." //It's dead... or is it?
+ evolution_types = list(/datum/fish_evolution/mastodon)
+ beauty = FISH_BEAUTY_UGLY
+
+/obj/item/fish/lavaloop
+ name = "lavaloop fish"
+ desc = "Due to its curvature, it can be used as make-shift boomerang."
+ icon_state = "lava_loop"
+ sprite_width = 3
+ sprite_height = 5
+ average_size = 30
+ average_weight = 500
+ resistance_flags = FIRE_PROOF | LAVA_PROOF
+ required_fluid_type = AQUARIUM_FLUID_ANY_WATER //if we can survive hot lava and freezing plasrivers, we can survive anything
+ fish_movement_type = /datum/fish_movement/zippy
+ min_pressure = HAZARD_LOW_PRESSURE
+ required_temperature_min = MIN_AQUARIUM_TEMP+30
+ required_temperature_max = MIN_AQUARIUM_TEMP+35
+ fish_traits = list(
+ /datum/fish_trait/carnivore,
+ /datum/fish_trait/heavy,
+ )
+ hitsound = null
+ throwforce = 5
+ beauty = FISH_BEAUTY_GOOD
+ ///maximum bonus damage when winded up
+ var/maximum_bonus = 25
+
+/obj/item/fish/lavaloop/Initialize(mapload, apply_qualities = TRUE)
+ . = ..()
+ add_traits(list(TRAIT_FISHING_BAIT, TRAIT_GOOD_QUALITY_BAIT, TRAIT_BYPASS_RANGED_ARMOR), INNATE_TRAIT)
+ AddComponent(/datum/component/boomerang, throw_range, TRUE)
+ AddComponent(\
+ /datum/component/throwbonus_on_windup,\
+ maximum_bonus = maximum_bonus,\
+ windup_increment_speed = 2,\
+ throw_text = "starts cooking in your hands, it may explode soon!",\
+ pass_maximum_callback = CALLBACK(src, PROC_REF(explode_on_user)),\
+ apply_bonus_callback = CALLBACK(src, PROC_REF(on_fish_land)),\
+ sound_on_success = 'sound/weapons/parry.ogg',\
+ effect_on_success = /obj/effect/temp_visual/guardian/phase,\
+ )
+
+/obj/item/fish/lavaloop/proc/explode_on_user(mob/living/user)
+ var/obj/item/bodypart/arm/active_arm = user.get_active_hand()
+ active_arm?.dismember()
+ to_chat(user, span_warning("[src] explodes!"))
+ playsound(src, 'sound/effects/explosion1.ogg', 40, TRUE)
+ user.flash_act(1, 1)
+ qdel(src)
+
+/obj/item/fish/lavaloop/proc/on_fish_land(mob/living/target, bonus_value)
+ if(!istype(target))
+ return FALSE
+ return (target.mob_size >= MOB_SIZE_LARGE)
+
+/obj/item/fish/lavaloop/plasma_river
+ maximum_bonus = 30
+
+/obj/item/fish/lavaloop/plasma_river/explode_on_user(mob/living/user)
+ playsound(src, 'sound/effects/explosion1.ogg', 40, TRUE)
+ user.flash_act(1, 1)
+ user.apply_status_effect(/datum/status_effect/ice_block_talisman, 5 SECONDS)
+ qdel(src)
+
+/obj/item/fish/lavaloop/plasma_river/on_fish_land(mob/living/target, bonus_value)
+ if(!istype(target))
+ return FALSE
+ if(target.mob_size < MOB_SIZE_LARGE)
+ return FALSE
+ var/freeze_timer = (bonus_value * 0.1)
+ if(freeze_timer <= 0)
+ return FALSE
+ target.apply_status_effect(/datum/status_effect/ice_block_talisman, freeze_timer SECONDS)
+ return FALSE
diff --git a/code/modules/fishing/fish/types/ruins.dm b/code/modules/fishing/fish/types/ruins.dm
new file mode 100644
index 0000000000000..da9e8388c0c44
--- /dev/null
+++ b/code/modules/fishing/fish/types/ruins.dm
@@ -0,0 +1,73 @@
+///From oil puddles from the elephant graveyard. Also an evolution of the "unmarine bonemass"
+/obj/item/fish/mastodon
+ name = "unmarine mastodon"
+ desc = "A monster of exposed muscles and innards, wrapped in a fish-like skeleton. You don't remember ever seeing it on the catalog."
+ icon = 'icons/obj/aquarium/wide.dmi'
+ icon_state = "mastodon"
+ base_pixel_x = -16
+ pixel_x = -16
+ sprite_width = 12
+ sprite_height = 7
+ show_in_catalog = FALSE
+ random_case_rarity = FISH_RARITY_NOPE
+ fishing_difficulty_modifier = 30
+ required_fluid_type = AQUARIUM_FLUID_ANY_WATER
+ min_pressure = HAZARD_LOW_PRESSURE
+ health = 300
+ stable_population = 1 //This means they can only crossbreed.
+ grind_results = list(/datum/reagent/bone_dust = 5, /datum/reagent/consumable/liquidgibs = 5)
+ fillet_type = /obj/item/stack/sheet/bone
+ num_fillets = 2
+ feeding_frequency = 2 MINUTES
+ breeding_timeout = 5 MINUTES
+ average_size = 180
+ average_weight = 5000
+ death_text = "%SRC stops moving."
+ fish_traits = list(/datum/fish_trait/heavy, /datum/fish_trait/amphibious, /datum/fish_trait/revival, /datum/fish_trait/carnivore, /datum/fish_trait/predator, /datum/fish_trait/aggressive)
+ beauty = FISH_BEAUTY_BAD
+
+///From the cursed spring
+/obj/item/fish/soul
+ name = "soulfish"
+ desc = "A distant yet vaguely close critter, like a long lost relative. You feel your soul rejuvenated just from looking at it... Also, what the fuck is this shit?!"
+ icon_state = "soulfish"
+ sprite_width = 7
+ sprite_height = 6
+ average_size = 60
+ average_weight = 1200
+ stable_population = 4
+ show_in_catalog = FALSE
+ beauty = FISH_BEAUTY_EXCELLENT
+ fish_movement_type = /datum/fish_movement/choppy //Glideless legacy movement? in my fishing minigame?
+ favorite_bait = list(
+ list(
+ FISH_BAIT_TYPE = FISH_BAIT_FOODTYPE,
+ FISH_BAIT_VALUE = JUNKFOOD|FRIED,
+ ),
+ )
+ fillet_type = /obj/item/food/meat/cutlet/plain/human
+ required_temperature_min = MIN_AQUARIUM_TEMP+3
+ required_temperature_max = MIN_AQUARIUM_TEMP+38
+ random_case_rarity = FISH_RARITY_NOPE
+
+///From the cursed spring
+/obj/item/fish/skin_crab
+ name = "skin crab"
+ desc = "\"And on the eighth day, a demential mockery of both humanity and crabity was made.\" Fascinating."
+ icon_state = "skin_crab"
+ sprite_width = 7
+ sprite_height = 6
+ average_size = 40
+ average_weight = 750
+ stable_population = 5
+ show_in_catalog = FALSE
+ beauty = FISH_BEAUTY_GREAT
+ favorite_bait = list(
+ list(
+ FISH_BAIT_TYPE = FISH_BAIT_FOODTYPE,
+ FISH_BAIT_VALUE = JUNKFOOD|FRIED
+ ),
+ )
+ fillet_type = /obj/item/food/meat/slab/rawcrab
+ random_case_rarity = FISH_RARITY_NOPE
+
diff --git a/code/modules/fishing/fish/types/saltwater.dm b/code/modules/fishing/fish/types/saltwater.dm
new file mode 100644
index 0000000000000..0271c7f300876
--- /dev/null
+++ b/code/modules/fishing/fish/types/saltwater.dm
@@ -0,0 +1,275 @@
+/obj/item/fish/clownfish
+ name = "clownfish"
+ desc = "Clownfish catch prey by swimming onto the reef, attracting larger fish, and luring them back to the anemone. The anemone will sting and eat the larger fish, leaving the remains for the clownfish."
+ icon_state = "clownfish"
+ required_fluid_type = AQUARIUM_FLUID_SALTWATER
+ sprite_width = 7
+ sprite_height = 4
+ average_size = 30
+ average_weight = 500
+ stable_population = 4
+ fish_traits = list(/datum/fish_trait/picky_eater)
+ evolution_types = list(/datum/fish_evolution/lubefish)
+ compatible_types = list(/obj/item/fish/clownfish/lube)
+ required_temperature_min = MIN_AQUARIUM_TEMP+22
+ required_temperature_max = MIN_AQUARIUM_TEMP+30
+
+/obj/item/fish/clownfish/lube
+ name = "lubefish"
+ desc = "A clownfish exposed to cherry-flavored lube for far too long. First discovered the days following a cargo incident around the seas of Europa, when thousands of thousands of thousands..."
+ icon_state = "lubefish"
+ random_case_rarity = FISH_RARITY_VERY_RARE
+ fish_traits = list(/datum/fish_trait/picky_eater, /datum/fish_trait/lubed)
+ evolution_types = null
+ compatible_types = list(/obj/item/fish/clownfish)
+ food = /datum/reagent/lube
+ fishing_difficulty_modifier = 5
+ beauty = FISH_BEAUTY_GREAT
+
+/obj/item/fish/cardinal
+ name = "cardinalfish"
+ desc = "Cardinalfish are often found near sea urchins, where the fish hide when threatened."
+ icon_state = "cardinalfish"
+ sprite_width = 6
+ sprite_height = 3
+ required_fluid_type = AQUARIUM_FLUID_SALTWATER
+ average_size = 30
+ average_weight = 500
+ stable_population = 4
+ fish_traits = list(/datum/fish_trait/vegan)
+ required_temperature_min = MIN_AQUARIUM_TEMP+22
+ required_temperature_max = MIN_AQUARIUM_TEMP+30
+
+/obj/item/fish/greenchromis
+ name = "green chromis"
+ desc = "The Chromis can vary in color from blue to green depending on the lighting and distance from the lights."
+ icon_state = "greenchromis"
+ sprite_width = 5
+ sprite_height = 3
+ required_fluid_type = AQUARIUM_FLUID_SALTWATER
+ average_size = 30
+ average_weight = 500
+ stable_population = 5
+ required_temperature_min = MIN_AQUARIUM_TEMP+23
+ required_temperature_max = MIN_AQUARIUM_TEMP+28
+
+ fishing_difficulty_modifier = 5 // Bit harder
+
+/obj/item/fish/firefish
+ name = "firefish goby"
+ desc = "To communicate in the wild, the firefish uses its dorsal fin to alert others of potential danger."
+ icon_state = "firefish"
+ sprite_width = 5
+ sprite_height = 3
+ required_fluid_type = AQUARIUM_FLUID_SALTWATER
+ average_size = 30
+ average_weight = 500
+ stable_population = 3
+ disliked_bait = list(/obj/item/food/bait/worm, /obj/item/food/bait/doughball)
+ fish_movement_type = /datum/fish_movement/zippy
+ required_temperature_min = MIN_AQUARIUM_TEMP+23
+ required_temperature_max = MIN_AQUARIUM_TEMP+28
+
+/obj/item/fish/pufferfish
+ name = "pufferfish"
+ desc = "They say that one pufferfish contains enough toxins to kill 30 people, although in the last few decades they've been genetically engineered en masse to be less poisonous."
+ icon_state = "pufferfish"
+ required_fluid_type = AQUARIUM_FLUID_SALTWATER
+ sprite_width = 8
+ sprite_height = 6
+ average_size = 60
+ average_weight = 1000
+ stable_population = 3
+ required_temperature_min = MIN_AQUARIUM_TEMP+23
+ required_temperature_max = MIN_AQUARIUM_TEMP+28
+ fillet_type = /obj/item/food/fishmeat/quality //Too bad they're poisonous
+ fish_traits = list(/datum/fish_trait/heavy, /datum/fish_trait/toxic)
+ beauty = FISH_BEAUTY_GOOD
+
+/obj/item/fish/lanternfish
+ name = "lanternfish"
+ desc = "Typically found in areas below 6600 feet below the surface of the ocean, they live in complete darkness."
+ icon_state = "lanternfish"
+ required_fluid_type = AQUARIUM_FLUID_SALTWATER
+ random_case_rarity = FISH_RARITY_VERY_RARE
+ sprite_width = 6
+ sprite_height = 5
+ average_size = 50
+ average_weight = 1000
+ stable_population = 3
+ fish_traits = list(/datum/fish_trait/nocturnal)
+ required_temperature_min = MIN_AQUARIUM_TEMP+2 //My source is that the water at a depth 6600 feet is pretty darn cold.
+ required_temperature_max = MIN_AQUARIUM_TEMP+18
+ beauty = FISH_BEAUTY_NULL
+
+/obj/item/fish/stingray
+ name = "stingray"
+ desc = "A type of ray, most known for its venomous stinger. Despite that, They're normally docile, if not a bit easily frightened."
+ icon_state = "stingray"
+ stable_population = 4
+ sprite_height = 7
+ sprite_width = 8
+ average_size = 60
+ average_weight = 700
+ beauty = FISH_BEAUTY_GREAT
+ random_case_rarity = FISH_RARITY_RARE
+ required_fluid_type = AQUARIUM_FLUID_SALTWATER //Someone ought to add river rays later I guess.
+ fish_traits = list(/datum/fish_trait/stinger, /datum/fish_trait/toxic_barbs, /datum/fish_trait/wary, /datum/fish_trait/carnivore, /datum/fish_trait/predator)
+
+/obj/item/fish/swordfish
+ name = "swordfish"
+ desc = "A large billfish, most famous for its elongated bill, while also fairly popular for cooking, and as a fearsome weapon in the hands of a veteran spess-fisherman."
+ icon = 'icons/obj/aquarium/wide.dmi'
+ icon_state = "swordfish"
+ inhand_icon_state = "swordfish"
+ force = 18
+ sharpness = SHARP_EDGED
+ attack_verb_continuous = list("slashes", "cuts", "pierces")
+ attack_verb_simple = list("slash", "cut", "pierce")
+ block_sound = 'sound/weapons/parry.ogg'
+ hitsound = 'sound/weapons/rapierhit.ogg'
+ demolition_mod = 0.75
+ attack_speed = 1 SECONDS
+ block_chance = 50
+ wound_bonus = 10
+ bare_wound_bonus = 20
+ armour_penetration = 75
+ base_pixel_x = -18
+ pixel_x = -18
+ sprite_width = 13
+ sprite_height = 6
+ stable_population = 3
+ average_size = 140
+ average_weight = 4000
+ breeding_timeout = 4.5 MINUTES
+ feeding_frequency = 4 MINUTES
+ health = 180
+ beauty = FISH_BEAUTY_EXCELLENT
+ random_case_rarity = FISH_RARITY_GOOD_LUCK_FINDING_THIS
+ required_fluid_type = AQUARIUM_FLUID_SALTWATER
+ fish_movement_type = /datum/fish_movement/plunger
+ fishing_difficulty_modifier = 25
+ fillet_type = /obj/item/food/fishmeat/quality
+ favorite_bait = list(
+ list(
+ FISH_BAIT_TYPE = FISH_BAIT_FOODTYPE,
+ FISH_BAIT_VALUE = SEAFOOD,
+ ),
+ /obj/item/fish,
+ )
+ fish_traits = list(/datum/fish_trait/carnivore, /datum/fish_trait/predator, /datum/fish_trait/stinger)
+
+/obj/item/fish/swordfish/get_force_rank()
+ switch(w_class)
+ if(WEIGHT_CLASS_TINY)
+ force -= 11
+ attack_speed -= 0.4 SECONDS
+ block_chance -= 45
+ armour_penetration -= 20
+ wound_bonus -= 15
+ bare_wound_bonus -= 20
+ if(WEIGHT_CLASS_SMALL)
+ force -= 8
+ attack_speed -= 0.3 SECONDS
+ block_chance -= 30
+ armour_penetration -= 15
+ wound_bonus -= 10
+ bare_wound_bonus -= 20
+ if(WEIGHT_CLASS_NORMAL)
+ force -= 5
+ attack_speed -= 0.2 SECONDS
+ block_chance -= 20
+ armour_penetration -= 10
+ wound_bonus -= 10
+ bare_wound_bonus -= 15
+ if(WEIGHT_CLASS_BULKY)
+ force -= 3
+ attack_speed -= 0.1 SECONDS
+ block_chance -= 10
+ armour_penetration -= 5
+ wound_bonus -= 5
+ bare_wound_bonus -= 10
+ if(WEIGHT_CLASS_GIGANTIC)
+ force += 5
+ attack_speed += 0.2 SECONDS
+ demolition_mod += 0.15
+ block_chance += 10
+ armour_penetration += 5
+ wound_bonus += 5
+ bare_wound_bonus += 10
+
+ if(status == FISH_DEAD)
+ force -= 4 + w_class
+ block_chance -= 25
+ armour_penetration -= 30
+ wound_bonus -= 10
+ bare_wound_bonus -= 10
+
+/obj/item/fish/swordfish/calculate_fish_force_bonus(bonus_malus)
+ . = ..()
+ armour_penetration += bonus_malus * 5
+ wound_bonus += bonus_malus * 3
+ bare_wound_bonus += bonus_malus * 5
+ block_chance += bonus_malus * 7
+
+/obj/item/fish/squid
+ name = "squid"
+ desc = "An elongated mollusk with eight tentacles, natural camouflage and ink clouds to spray at predators. One of the most intelligent, well-equipped invertebrates out there."
+ icon_state = "squid"
+ sprite_width = 4
+ sprite_height = 5
+ stable_population = 6
+ weight_size_deviation = 0.5 // They vary greatly in size.
+ average_weight = 500 //They're quite lighter than they're long.
+ required_fluid_type = AQUARIUM_FLUID_SALTWATER
+ beauty = FISH_BEAUTY_GOOD
+ required_temperature_min = MIN_AQUARIUM_TEMP+5
+ required_temperature_max = MIN_AQUARIUM_TEMP+26
+ fish_traits = list(/datum/fish_trait/heavy, /datum/fish_trait/carnivore, /datum/fish_trait/predator, /datum/fish_trait/ink, /datum/fish_trait/camouflage, /datum/fish_trait/wary)
+
+/obj/item/fish/monkfish
+ name = "monkfish"
+ desc = "A member of the Lophiid family of anglerfish. It goes by several different names, however none of them will make it look any prettier, nor any less delicious."
+ icon_state = "monkfish"
+ required_fluid_type = AQUARIUM_FLUID_SALTWATER
+ sprite_height = 7
+ sprite_width = 7
+ beauty = FISH_BEAUTY_UGLY
+ required_temperature_min = MIN_AQUARIUM_TEMP+2
+ required_temperature_max = MIN_AQUARIUM_TEMP+23
+ average_size = 60
+ average_weight = 1400
+ stable_population = 4
+ fish_traits = list(/datum/fish_trait/heavy)
+ fillet_type = /obj/item/food/fishmeat/quality
+ favorite_bait = list(
+ list(
+ FISH_BAIT_TYPE = FISH_BAIT_FOODTYPE,
+ FISH_BAIT_VALUE = SEAFOOD|BUGS,
+ ),
+ )
+
+/obj/item/fish/monkfish/Initialize(mapload, apply_qualities = TRUE)
+ . = ..()
+ name = pick("monkfish", "fishing-frog", "frog-fish", "sea-devil", "goosefish")
+
+/obj/item/fish/plaice
+ name = "plaice"
+ desc = "Perhaps the most prominent flatfish in the space-market. Nature really pulled out the rolling pin on this one."
+ icon_state = "plaice"
+ sprite_height = 7
+ sprite_width = 6
+ required_fluid_type = AQUARIUM_FLUID_SALTWATER
+ required_temperature_min = MIN_AQUARIUM_TEMP+2
+ required_temperature_max = MIN_AQUARIUM_TEMP+18
+ average_size = 40
+ average_weight = 700
+ stable_population = 5
+ fish_traits = list(/datum/fish_trait/heavy)
+ favorite_bait = list(
+ list(
+ FISH_BAIT_TYPE = FISH_BAIT_FOODTYPE,
+ FISH_BAIT_VALUE = SEAFOOD|BUGS,
+ ),
+ )
+
diff --git a/code/modules/fishing/fish/types/station.dm b/code/modules/fishing/fish/types/station.dm
new file mode 100644
index 0000000000000..8dd459452ab91
--- /dev/null
+++ b/code/modules/fishing/fish/types/station.dm
@@ -0,0 +1,80 @@
+/obj/item/fish/ratfish
+ name = "ratfish"
+ desc = "A rat exposed to the murky waters of maintenance too long. Any higher power, if it revealed itself, would state that the ratfish's continued existence is extremely unwelcome."
+ icon_state = "ratfish"
+ sprite_width = 7
+ sprite_height = 5
+ random_case_rarity = FISH_RARITY_RARE
+ required_fluid_type = AQUARIUM_FLUID_FRESHWATER
+ stable_population = 10 //set by New, but this is the default config value
+ fillet_type = /obj/item/food/meat/slab/human/mutant/zombie //eww...
+ fish_traits = list(/datum/fish_trait/necrophage)
+ required_temperature_min = MIN_AQUARIUM_TEMP+15
+ required_temperature_max = MIN_AQUARIUM_TEMP+35
+ fish_movement_type = /datum/fish_movement/zippy
+ favorite_bait = list(
+ list(
+ FISH_BAIT_TYPE = FISH_BAIT_FOODTYPE,
+ FISH_BAIT_VALUE = DAIRY
+ )
+ )
+ beauty = FISH_BEAUTY_DISGUSTING
+
+/obj/item/fish/ratfish/Initialize(mapload, apply_qualities = TRUE)
+ . = ..()
+ //stable pop reflects the config for how many mice migrate. powerful...
+ stable_population = CONFIG_GET(number/mice_roundstart)
+
+/obj/item/fish/sludgefish
+ name = "sludgefish"
+ desc = "A misshapen, fragile, loosely fish-like living goop, the only thing that'd ever thrive in the acidic and claustrophobic cavities of the station's organic waste disposal system."
+ icon_state = "sludgefish"
+ sprite_width = 7
+ sprite_height = 6
+ required_fluid_type = AQUARIUM_FLUID_SULPHWATEVER
+ stable_population = 8
+ average_size = 20
+ average_weight = 400
+ health = 50
+ breeding_timeout = 2.5 MINUTES
+ fish_traits = list(/datum/fish_trait/parthenogenesis, /datum/fish_trait/no_mating)
+ required_temperature_min = MIN_AQUARIUM_TEMP+10
+ required_temperature_max = MIN_AQUARIUM_TEMP+40
+ evolution_types = list(/datum/fish_evolution/purple_sludgefish)
+ beauty = FISH_BEAUTY_NULL
+
+/obj/item/fish/sludgefish/purple
+ name = "purple sludgefish"
+ desc = "A misshapen, fragile, loosely fish-like living goop. This one has developed sexual reproduction mechanisms, and a purple tint to boot."
+ icon_state = "sludgefish_purple"
+ random_case_rarity = FISH_RARITY_NOPE
+ fish_traits = list(/datum/fish_trait/parthenogenesis)
+
+/obj/item/fish/slimefish
+ name = "acquatic slime"
+ desc = "Kids, this is what happens when a slime overcomes its hydrophobic nature. It goes glug glug."
+ icon_state = "slimefish"
+ icon_state_dead = "slimefish_dead"
+ sprite_width = 7
+ sprite_height = 7
+ do_flop_animation = FALSE //it already has a cute bouncy wiggle. :3
+ random_case_rarity = FISH_RARITY_VERY_RARE
+ required_fluid_type = AQUARIUM_FLUID_ANADROMOUS
+ stable_population = 4
+ health = 150
+ fillet_type = /obj/item/slime_extract/grey
+ grind_results = list(/datum/reagent/toxin/slimejelly = 10)
+ fish_traits = list(/datum/fish_trait/toxin_immunity, /datum/fish_trait/crossbreeder)
+ favorite_bait = list(
+ list(
+ FISH_BAIT_TYPE = FISH_BAIT_FOODTYPE,
+ FISH_BAIT_VALUE = TOXIC,
+ ),
+ list(
+ FISH_BAIT_TYPE = FISH_BAIT_REAGENT,
+ FISH_BAIT_VALUE = /datum/reagent/toxin,
+ FISH_BAIT_AMOUNT = 5,
+ ),
+ )
+ required_temperature_min = MIN_AQUARIUM_TEMP+20
+ beauty = FISH_BEAUTY_GREAT
diff --git a/code/modules/fishing/fish/types/syndicate.dm b/code/modules/fishing/fish/types/syndicate.dm
new file mode 100644
index 0000000000000..a3e9a8519b4f3
--- /dev/null
+++ b/code/modules/fishing/fish/types/syndicate.dm
@@ -0,0 +1,256 @@
+///Contains fish that can be found in the syndicate fishing portal setting as well as the ominous fish case.
+/obj/item/fish/emulsijack
+ name = "toxic emulsijack"
+ desc = "Ah, the terrifying emulsijack. Created in a laboratory, the only real use of this slimey, scaleless fish is for completely ruining a tank."
+ icon_state = "emulsijack"
+ random_case_rarity = FISH_RARITY_GOOD_LUCK_FINDING_THIS
+ required_fluid_type = AQUARIUM_FLUID_ANADROMOUS
+ stable_population = 3
+ sprite_width = 7
+ sprite_height = 3
+ fish_traits = list(/datum/fish_trait/emulsijack)
+ required_temperature_min = MIN_AQUARIUM_TEMP+5
+ required_temperature_max = MIN_AQUARIUM_TEMP+40
+ beauty = FISH_BEAUTY_BAD
+
+/obj/item/fish/donkfish
+ name = "donk co. company patent donkfish"
+ desc = "A lab-grown donkfish. Its invention was an accident for the most part, as it was intended to be consumed in donk pockets. Unfortunately, it tastes horrible, so it has now become a pseudo-mascot."
+ icon_state = "donkfish"
+ random_case_rarity = FISH_RARITY_VERY_RARE
+ stable_population = 4
+ sprite_width = 5
+ sprite_height = 4
+ fillet_type = /obj/item/food/fishmeat/donkfish
+ fish_traits = list(/datum/fish_trait/yucky)
+ required_temperature_min = MIN_AQUARIUM_TEMP+15
+ required_temperature_max = MIN_AQUARIUM_TEMP+28
+ beauty = FISH_BEAUTY_EXCELLENT
+
+/obj/item/fish/jumpercable
+ name = "monocloning jumpercable"
+ desc = "A surprisingly useful if nasty looking creation from the syndicate fish labs. Drop one in a tank, and \
+ watch it self-feed and multiply. Generates more and more power as a growing swarm!"
+ icon_state = "jumpercable"
+ sprite_width = 16
+ sprite_height = 5
+ stable_population = 12
+ average_size = 110
+ average_weight = 6000
+ random_case_rarity = FISH_RARITY_GOOD_LUCK_FINDING_THIS
+ required_temperature_min = MIN_AQUARIUM_TEMP+10
+ required_temperature_max = MIN_AQUARIUM_TEMP+30
+ favorite_bait = list(/obj/item/stock_parts/power_store/cell/lead)
+ fish_traits = list(
+ /datum/fish_trait/parthenogenesis,
+ /datum/fish_trait/mixotroph,
+ /datum/fish_trait/electrogenesis,
+ )
+ beauty = FISH_BEAUTY_UGLY
+
+/obj/item/fish/chainsawfish
+ name = "chainsawfish"
+ desc = "A very, very angry bioweapon, whose sole purpose is to rip and tear."
+ icon = 'icons/obj/aquarium/wide.dmi'
+ icon_state = "chainsawfish"
+ inhand_icon_state = "chainsawfish"
+ icon_state_dead = "chainsawfish_dead"
+ force = 22
+ demolition_mod = 1.5
+ block_chance = 15
+ attack_verb_continuous = list("saws", "tears", "lacerates", "cuts", "chops", "dices")
+ attack_verb_simple = list("saw", "tear", "lacerate", "cut", "chop", "dice")
+ hitsound = 'sound/weapons/chainsawhit.ogg'
+ sharpness = SHARP_EDGED
+ tool_behaviour = TOOL_SAW
+ toolspeed = 0.5
+ base_pixel_x = -16
+ pixel_x = -16
+ sprite_width = 8
+ sprite_height = 5
+ stable_population = 3
+ average_size = 85
+ average_weight = 2500
+ breeding_timeout = 4.25 MINUTES
+ feeding_frequency = 3 MINUTES
+ health = 180
+ beauty = FISH_BEAUTY_GREAT
+ random_case_rarity = FISH_RARITY_GOOD_LUCK_FINDING_THIS
+ required_fluid_type = AQUARIUM_FLUID_FRESHWATER
+ fish_movement_type = /datum/fish_movement/accelerando
+ fishing_difficulty_modifier = 30
+ favorite_bait = list(
+ list(
+ FISH_BAIT_TYPE = FISH_BAIT_FOODTYPE,
+ FISH_BAIT_VALUE = GORE,
+ ),
+ )
+ fish_traits = list(/datum/fish_trait/aggressive, /datum/fish_trait/carnivore, /datum/fish_trait/predator, /datum/fish_trait/stinger)
+ required_temperature_min = MIN_AQUARIUM_TEMP+18
+ required_temperature_max = MIN_AQUARIUM_TEMP+26
+
+/obj/item/fish/chainsawfish/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/update_icon_updates_onmob)
+
+/obj/item/fish/chainsawfish/update_icon_state()
+ if(status == FISH_DEAD)
+ inhand_icon_state = "chainsawfish_dead"
+ else
+ inhand_icon_state = "chainsawfish"
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
+ inhand_icon_state = "[inhand_icon_state]_wielded"
+ return ..()
+
+/obj/item/fish/chainsawfish/get_force_rank()
+ switch(w_class)
+ if(WEIGHT_CLASS_TINY)
+ force -= 10
+ attack_speed -= 0.2 SECONDS
+ demolition_mod -= 0.4
+ block_chance -= 15
+ armour_penetration -= 10
+ wound_bonus -= 10
+ bare_wound_bonus -= 10
+ toolspeed += 0.6
+ if(WEIGHT_CLASS_SMALL)
+ force -= 8
+ attack_speed -= 0.1 SECONDS
+ demolition_mod -= 0.3
+ block_chance -= 10
+ armour_penetration -= 10
+ wound_bonus -= 10
+ bare_wound_bonus -= 10
+ toolspeed += 0.4
+ if(WEIGHT_CLASS_NORMAL)
+ force -= 5
+ demolition_mod -= 0.15
+ block_chance -= 5
+ armour_penetration -= 5
+ wound_bonus -= 5
+ bare_wound_bonus -= 5
+ toolspeed += 0.2
+ if(WEIGHT_CLASS_HUGE)
+ force += 2
+ attack_speed += 0.2 SECONDS
+ demolition_mod += 0.15
+ armour_penetration += 10
+ block_chance += 10
+ wound_bonus += 10
+ bare_wound_bonus += 5
+ if(WEIGHT_CLASS_GIGANTIC)
+ force += 4
+ attack_speed += 0.4 SECONDS
+ demolition_mod += 0.3
+ block_chance += 20
+ armour_penetration += 20
+ wound_bonus += 15
+ bare_wound_bonus += 10
+ toolspeed -= 0.1
+
+ if(status == FISH_DEAD)
+ force -= 8 + w_class
+ hitsound = SFX_SWING_HIT
+ block_chance -= 25
+ demolition_mod -= 0.3
+ armour_penetration -= 15
+ wound_bonus -= 5
+ bare_wound_bonus -= 5
+ toolspeed += 1
+
+/obj/item/fish/chainsawfish/calculate_fish_force_bonus(bonus_malus)
+ . = ..()
+ armour_penetration += bonus_malus * 3
+ wound_bonus += bonus_malus * 2
+ bare_wound_bonus += bonus_malus * 3
+ block_chance += bonus_malus * 2
+ toolspeed -= bonus_malus * 0.1
+
+/obj/item/fish/pike/armored
+ name = "armored pike"
+ desc = "A long-bodied, metal-clad predator with a snout that almost looks like an halberd. Definitely a weapon to swing around."
+ icon_state = "armored_pike"
+ inhand_icon_state = "armored_pike"
+ attack_verb_continuous = list("attacks", "pokes", "jabs", "tears", "lacerates", "gores")
+ attack_verb_simple = list("attack", "poke", "jab", "tear", "lacerate", "gore")
+ hitsound = 'sound/weapons/bladeslice.ogg'
+ block_sound = 'sound/weapons/parry.ogg'
+ force = 20
+ sharpness = SHARP_EDGED
+ wound_bonus = -15
+ attack_speed = 1 SECONDS
+ block_chance = 25
+ bare_wound_bonus = 15
+ demolition_mod = 0.8
+ armour_penetration = 10
+ stable_population = 3
+ average_weight = 3000
+ breeding_timeout = 5 MINUTES
+ feeding_frequency = 4 MINUTES
+ health = 180
+ random_case_rarity = FISH_RARITY_GOOD_LUCK_FINDING_THIS
+ beauty = FISH_BEAUTY_GREAT
+ fishing_difficulty_modifier = 20
+ fish_traits = list(/datum/fish_trait/carnivore, /datum/fish_trait/predator, /datum/fish_trait/aggressive, /datum/fish_trait/picky_eater, /datum/fish_trait/stinger)
+ compatible_types = list(/obj/item/fish/pike)
+ favorite_bait = list(
+ list(
+ FISH_BAIT_TYPE = FISH_BAIT_FOODTYPE,
+ FISH_BAIT_VALUE = SEAFOOD,
+ ),
+ /obj/item/fish,
+ )
+
+/obj/item/fish/swordfish/get_force_rank()
+ switch(w_class)
+ if(WEIGHT_CLASS_TINY)
+ force -= 11
+ attack_speed -= 0.4 SECONDS
+ block_chance -= 25
+ armour_penetration -= 15
+ wound_bonus -= 15
+ bare_wound_bonus -= 30
+ if(WEIGHT_CLASS_SMALL)
+ force -= 6
+ attack_speed -= 0.3 SECONDS
+ block_chance -= 20
+ armour_penetration -= 10
+ wound_bonus -= 10
+ bare_wound_bonus -= 25
+ if(WEIGHT_CLASS_NORMAL)
+ force -= 4
+ attack_speed -= 0.2 SECONDS
+ block_chance -= 20
+ armour_penetration -= 5
+ wound_bonus -= 10
+ bare_wound_bonus -= 15
+ if(WEIGHT_CLASS_HUGE)
+ force += 3
+ attack_speed += 0.2 SECONDS
+ block_chance += 10
+ demolition_mod += 0.1
+ armour_penetration += 5
+ wound_bonus += 10
+ bare_wound_bonus += 5
+ if(WEIGHT_CLASS_GIGANTIC)
+ force += 7
+ attack_speed += 0.3 SECONDS
+ demolition_mod += 0.2
+ block_chance += 20
+ armour_penetration += 10
+ wound_bonus += 15
+ bare_wound_bonus += 10
+
+ if(status == FISH_DEAD)
+ force -= 5 + w_class
+ block_chance -= 15
+ armour_penetration -= 10
+ wound_bonus -= 5
+ bare_wound_bonus -= 15
+
+/obj/item/fish/pike/armored/calculate_fish_force_bonus(bonus_malus)
+ . = ..()
+ armour_penetration += bonus_malus * 3
+ wound_bonus += bonus_malus * 2
+ bare_wound_bonus += bonus_malus * 4
+ block_chance += bonus_malus * 4
diff --git a/code/modules/fishing/fish/types/tiziran.dm b/code/modules/fishing/fish/types/tiziran.dm
new file mode 100644
index 0000000000000..a39e82ce6c422
--- /dev/null
+++ b/code/modules/fishing/fish/types/tiziran.dm
@@ -0,0 +1,69 @@
+//Tiziran Fish.
+
+/obj/item/fish/dwarf_moonfish
+ name = "dwarf moonfish"
+ desc = "Ordinarily in the wild, the Zagoskian moonfish is around the size of a tuna, however through selective breeding a smaller breed suitable for being kept as an aquarium pet has been created."
+ icon_state = "dwarf_moonfish"
+ sprite_height = 6
+ sprite_width = 6
+ required_fluid_type = AQUARIUM_FLUID_SALTWATER
+ stable_population = 2
+ fillet_type = /obj/item/food/fishmeat/moonfish
+ average_size = 60
+ average_weight = 1000
+ required_temperature_min = MIN_AQUARIUM_TEMP+20
+ required_temperature_max = MIN_AQUARIUM_TEMP+30
+ beauty = FISH_BEAUTY_GOOD
+
+/obj/item/fish/gunner_jellyfish
+ name = "gunner jellyfish"
+ desc = "So called due to their resemblance to an artillery shell, the gunner jellyfish is native to Tizira, where it is enjoyed as a delicacy. Produces a mild hallucinogen that is destroyed by cooking."
+ icon_state = "gunner_jellyfish"
+ sprite_height = 4
+ sprite_width = 5
+ required_fluid_type = AQUARIUM_FLUID_SALTWATER
+ stable_population = 4
+ fillet_type = /obj/item/food/fishmeat/gunner_jellyfish
+ required_temperature_min = MIN_AQUARIUM_TEMP+24
+ required_temperature_max = MIN_AQUARIUM_TEMP+32
+ beauty = FISH_BEAUTY_GOOD
+
+/obj/item/fish/needlefish
+ name = "needlefish"
+ desc = "A tiny, transparent fish which resides in large schools in the oceans of Tizira. A common food for other, larger fish."
+ icon_state = "needlefish"
+ sprite_height = 3
+ sprite_width = 7
+ required_fluid_type = AQUARIUM_FLUID_SALTWATER
+ stable_population = 12
+ breeding_timeout = 1 MINUTES
+ fillet_type = null
+ average_size = 20
+ average_weight = 300
+ fish_traits = list(/datum/fish_trait/carnivore)
+ required_temperature_min = MIN_AQUARIUM_TEMP+10
+ required_temperature_max = MIN_AQUARIUM_TEMP+32
+
+/obj/item/fish/needlefish/Initialize(mapload, apply_qualities = TRUE)
+ . = ..()
+ add_traits(list(TRAIT_FISHING_BAIT, TRAIT_GOOD_QUALITY_BAIT), INNATE_TRAIT)
+
+/obj/item/fish/armorfish
+ name = "armorfish"
+ desc = "A small shellfish native to Tizira's oceans, known for its exceptionally hard shell. Consumed similarly to prawns."
+ icon_state = "armorfish"
+ sprite_height = 5
+ sprite_width = 6
+ average_size = 25
+ average_weight = 350
+ required_fluid_type = AQUARIUM_FLUID_SALTWATER
+ stable_population = 10
+ breeding_timeout = 1.25 MINUTES
+ fillet_type = /obj/item/food/fishmeat/armorfish
+ fish_movement_type = /datum/fish_movement/slow
+ required_temperature_min = MIN_AQUARIUM_TEMP+10
+ required_temperature_max = MIN_AQUARIUM_TEMP+32
+
+/obj/item/fish/armorfish/Initialize(mapload, apply_qualities = TRUE)
+ . = ..()
+ add_traits(list(TRAIT_FISHING_BAIT, TRAIT_GOOD_QUALITY_BAIT), INNATE_TRAIT)
diff --git a/code/modules/fishing/fish_catalog.dm b/code/modules/fishing/fish_catalog.dm
index 49a84413ded06..f0880804f8eb0 100644
--- a/code/modules/fishing/fish_catalog.dm
+++ b/code/modules/fishing/fish_catalog.dm
@@ -90,7 +90,7 @@
if(source.catalog_description && (fish_type in source.fish_table))
spot_descriptions += source.catalog_description
.["spots"] = english_list(spot_descriptions, nothing_text = "Unknown")
- var/list/fish_list_properties = collect_fish_properties()
+ var/list/fish_list_properties = SSfishing.fish_properties
var/list/fav_bait = fish_list_properties[fishy][NAMEOF(fishy, favorite_bait)]
var/list/disliked_bait = fish_list_properties[fishy][NAMEOF(fishy, disliked_bait)]
var/list/bait_list = list()
diff --git a/code/modules/fishing/fish_movement.dm b/code/modules/fishing/fish_movement.dm
new file mode 100644
index 0000000000000..a328903617f62
--- /dev/null
+++ b/code/modules/fishing/fish_movement.dm
@@ -0,0 +1,214 @@
+/// Any lower than this, and the target position of the fish is considered null
+#define FISH_TARGET_MIN_DISTANCE 6
+/// The friction applied to fish jumps, so that it decelerates over time
+#define FISH_FRICTION_MULT 0.9
+/// Used to decide whether the fish can jump in a certain direction
+#define FISH_SHORT_JUMP_MIN_DISTANCE 100
+/// The maximum distance for a short jump
+#define FISH_SHORT_JUMP_MAX_DISTANCE 200
+
+///Fish movements are simple datums, generated by the fishing minigame, that represent how the fish moves suring the minigame.
+/datum/fish_movement
+ /// The minigame that spawned us
+ var/datum/fishing_challenge/master
+ /// How many times move_fish() has been called
+ var/times_fired = 0
+ /// How likely the fish is to perform a standard jump, then multiplied by difficulty
+ var/short_jump_chance = 2.25
+ /// How likely the fish is to perform a long jump, then multiplied by difficulty
+ var/long_jump_chance = 0.0625
+ /// The speed limit for the short jump
+ var/short_jump_velocity_limit = 400
+ /// The speed limit for the long jump
+ var/long_jump_velocity_limit = 200
+ /// The current speed limit used
+ var/current_velocity_limit
+ /// The base velocity of the fish, which may affect jump distances and falling speed.
+ var/fish_idle_velocity = 0
+ /// A position on the slider the fish wants to get to
+ var/target_position
+ /// If true, the fish can jump while a target position is set, thus overriding it
+ var/can_interrupt_move = TRUE
+ /// The current speed the fish is moving at
+ var/fish_velocity = 0
+
+/datum/fish_movement/New(datum/fishing_challenge/master)
+ src.master = master
+
+/**
+ * Proc that adjusts movement values to the difficulty of the minigame.
+ * The operations can be a tad complex, but basically it ensures that jump
+ * chances with a probability higher than 1% increase in a smooth curve so that
+ * they still reach 100% prob when the difficulty peakes.
+ */
+/datum/fish_movement/proc/adjust_to_difficulty()
+ var/square_angle_rad = TORADIANS(90)
+ var/zero_one_difficulty = master.difficulty/100
+ if(short_jump_chance > 1)
+ short_jump_chance = (zero_one_difficulty**(square_angle_rad-TORADIANS(arctan(short_jump_chance * 1/square_angle_rad))))*100
+ else
+ short_jump_chance *= master.difficulty
+ if(long_jump_chance > 1)
+ long_jump_chance = (zero_one_difficulty**(square_angle_rad-TORADIANS(arctan(long_jump_chance * 1/square_angle_rad))))*100
+ else
+ long_jump_chance *= master.difficulty
+
+///The main proc, called by minigame every SSfishing tick while it's in the 'active' phase.
+/datum/fish_movement/proc/move_fish(seconds_per_tick)
+ times_fired++
+ /**
+ * The jump chances are meant to run every odd tick (each every decisecond)
+ * We cannot do it every tick because the fish would be jumpier than intended
+ * and we cannot cut the chances in half to fit on each tick, because the maximum probability
+ * would go from 100% to 75%.
+ */
+ var/can_roll = times_fired % 2
+
+ var/long_chance = long_jump_chance * seconds_per_tick * (1/seconds_per_tick)
+ var/short_chance = short_jump_chance * seconds_per_tick * (1/seconds_per_tick)
+
+ // If we have the target but we're close enough, mark as target reached
+ if(abs(target_position - master.fish_position) < FISH_TARGET_MIN_DISTANCE)
+ target_position = null
+
+ // Switching to new long jump target can interrupt any other
+ if(can_roll && (can_interrupt_move || isnull(target_position)) && prob(long_chance))
+ /**
+ * Move at least 0.75 to full of the availible bar in given direction,
+ * and more likely to move in the direction where there's more space
+ */
+ var/distance_from_top = FISHING_MINIGAME_AREA - master.fish_position - master.fish_height
+ var/distance_from_bottom = master.fish_position
+ var/top_chance
+ if(distance_from_top < FISH_SHORT_JUMP_MIN_DISTANCE)
+ top_chance = 0
+ else
+ top_chance = (distance_from_top/max(distance_from_bottom, 1)) * 100
+ var/new_target = master.fish_position
+ if(prob(top_chance))
+ new_target += distance_from_top * rand(75, 100)/100
+ else
+ new_target -= distance_from_bottom * rand(75, 100)/100
+ target_position = round(new_target)
+ current_velocity_limit = long_jump_velocity_limit
+
+ // Move towards target
+ if(!isnull(target_position))
+ var/distance = target_position - master.fish_position
+ // about 5 at diff 15 , 10 at diff 30, 30 at diff 100
+ var/acceleration_mult = get_acceleration(seconds_per_tick)
+ var/target_acceleration = distance * acceleration_mult * seconds_per_tick
+
+ fish_velocity = fish_velocity * FISH_FRICTION_MULT + target_acceleration
+ else if(can_roll && prob(short_chance))
+ var/distance_from_top = FISHING_MINIGAME_AREA - master.fish_position - master.fish_height
+ var/distance_from_bottom = master.fish_position
+ var/jump_length
+ if(distance_from_top >= FISH_SHORT_JUMP_MIN_DISTANCE)
+ jump_length = rand(FISH_SHORT_JUMP_MIN_DISTANCE, FISH_SHORT_JUMP_MAX_DISTANCE)
+ if(distance_from_bottom >= FISH_SHORT_JUMP_MIN_DISTANCE && (!jump_length || prob(50)))
+ jump_length = -rand(FISH_SHORT_JUMP_MIN_DISTANCE, FISH_SHORT_JUMP_MAX_DISTANCE)
+ target_position = clamp(master.fish_position + jump_length, 0, FISHING_MINIGAME_AREA - master.fish_height)
+ current_velocity_limit = short_jump_velocity_limit
+
+ fish_velocity = clamp(fish_velocity + fish_idle_velocity, -current_velocity_limit, current_velocity_limit)
+ set_fish_position(seconds_per_tick)
+
+///Proc that returns the acceleration of the fish during the minigame.
+/datum/fish_movement/proc/get_acceleration(seconds_per_tick)
+ return 0.3 * master.difficulty + 0.5
+
+///Called at the end of move_fish(), for updating the position of the fish in the fishing minigame.
+/datum/fish_movement/proc/set_fish_position(seconds_per_tick)
+ master.fish_position = clamp(master.fish_position + fish_velocity * seconds_per_tick, 0, FISHING_MINIGAME_AREA - master.fish_height)
+
+///Generic fish movement datum that only performs slow, uninterrupted long jumps
+/datum/fish_movement/slow
+ short_jump_chance = 0
+ long_jump_chance = 1.5
+ long_jump_velocity_limit = 150
+ can_interrupt_move = FALSE
+
+///Generic fish movement datum with triple the short jump chance.
+/datum/fish_movement/zippy
+ short_jump_chance = parent_type::short_jump_chance * 3
+
+///fish movement datum that progressively gets faster until acceleration and velocity are double the starting ones.
+/datum/fish_movement/accelerando
+ ///The jump velocity to add each tick
+ var/short_jump_vel_add
+ ///The long jump velocity to add each tick
+ var/long_jump_vel_add
+ ///Time to reach full speed, in seconds.
+ var/accel_time_cap = 30
+
+/datum/fish_movement/accelerando/move_fish(seconds_per_tick)
+ var/seconds_elapsed = (times_fired * seconds_per_tick)
+ if(seconds_elapsed >= accel_time_cap)
+ return ..()
+ if(!times_fired) //First tick, cache the initial jump velocities
+ short_jump_vel_add = short_jump_velocity_limit/accel_time_cap
+ long_jump_vel_add = long_jump_velocity_limit/accel_time_cap
+ return ..()
+
+ if(current_velocity_limit)
+ var/vel_add = current_velocity_limit == short_jump_velocity_limit ? short_jump_vel_add : long_jump_vel_add
+ current_velocity_limit += round(vel_add * seconds_per_tick, 0.01)
+
+ short_jump_velocity_limit += round(short_jump_vel_add * seconds_per_tick, 0.01)
+ long_jump_velocity_limit += round(long_jump_vel_add * seconds_per_tick, 0.01)
+ return ..()
+
+/datum/fish_movement/accelerando/get_acceleration(seconds_per_tick)
+ var/acceleration = ..()
+ return acceleration + min(acceleration, acceleration * times_fired * seconds_per_tick / accel_time_cap)
+
+/datum/fish_movement/accelerando/set_fish_position(seconds_per_tick)
+ fish_velocity = round(fish_velocity)
+ return ..()
+
+///Fish movement datum that updates the fish position twice per second.
+/datum/fish_movement/choppy
+ ///We keep of the theorical fish position to eventually use
+ var/faux_position = 0
+
+/datum/fish_movement/choppy/set_fish_position(seconds_per_tick)
+ faux_position = clamp(faux_position + fish_velocity * seconds_per_tick, 0, FISHING_MINIGAME_AREA - master.fish_height)
+ if(!((times_fired * SSfishing.wait) % (0.5 SECONDS)))
+ master.fish_position = faux_position
+
+///Fish movement datum that weakly pushes the fish up and then down with greater force once it reaches the top of the minigame.
+/datum/fish_movement/plunger
+ ///Is the fish plunging to the bottom of the minigame area, or should it swim up?
+ var/is_plunging = TRUE
+ ///The added idle velocity when plunging
+ var/plunging_speed = -22
+
+/datum/fish_movement/plunger/adjust_to_difficulty()
+ . = ..()
+ //Adjust the fleeing velocity, up to five times the initial value.
+ plunging_speed += round(plunging_speed * master.difficulty * 0.03)
+ fish_idle_velocity += plunging_speed //so it can be safely subtracted if the fish starts at the bottom.
+
+/datum/fish_movement/plunger/move_fish(seconds_per_tick)
+ var/fish_area = FISHING_MINIGAME_AREA - master.fish_height
+ if(is_plunging)
+ if(target_position > master.fish_position) //nothing should stop us from plunging.
+ target_position = null
+ var/dist_bot_percent = master.fish_position/fish_area
+ if(dist_bot_percent <= 0.04)
+ fish_idle_velocity -= plunging_speed
+ is_plunging = FALSE
+ else
+ var/dist_top_percent = (fish_area - master.fish_position)/fish_area
+ if(dist_top_percent <= 0.04)
+ fish_idle_velocity += plunging_speed
+ is_plunging = TRUE
+
+ return ..()
+
+
+#undef FISH_TARGET_MIN_DISTANCE
+#undef FISH_FRICTION_MULT
+#undef FISH_SHORT_JUMP_MIN_DISTANCE
+#undef FISH_SHORT_JUMP_MAX_DISTANCE
diff --git a/code/modules/fishing/fishing_equipment.dm b/code/modules/fishing/fishing_equipment.dm
index f6b49a9b52314..e20f6c54a9104 100644
--- a/code/modules/fishing/fishing_equipment.dm
+++ b/code/modules/fishing/fishing_equipment.dm
@@ -52,7 +52,7 @@
*/
/obj/item/fishing_line/auto_reel
name = "fishing line auto-reel"
- desc = "A fishing line that automatically starts reeling in fish the moment they bite. Also good for hurling things at yourself."
+ desc = "A fishing line that automatically spins lures and begins reeling in fish the moment it bites. Also good for hurling things towards you."
icon_state = "reel_auto"
fishing_line_traits = FISHING_LINE_AUTOREEL
line_color = "#F88414"
@@ -163,6 +163,20 @@
rod_overlay_icon_state = "hook_treasure_overlay"
chasm_detritus_type = /datum/chasm_detritus/restricted/objects
+/obj/item/fishing_hook/magnet/Initialize(mapload)
+ . = ..()
+ RegisterSignal(src, COMSIG_FISHING_EQUIPMENT_SLOTTED, PROC_REF(hook_equipped))
+
+///We make sure that the fishng rod doesn't need a bait to reliably catch non-fish loot.
+/obj/item/fishing_hook/magnet/proc/hook_equipped(datum/source, obj/item/fishing_rod/rod)
+ SIGNAL_HANDLER
+ ADD_TRAIT(rod, TRAIT_ROD_REMOVE_FISHING_DUD, type)
+ RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(on_removed))
+
+/obj/item/fishing_hook/magnet/proc/on_removed(atom/movable/source, atom/old_loc, dir, forced)
+ SIGNAL_HANDLER
+ REMOVE_TRAIT(old_loc, TRAIT_ROD_REMOVE_FISHING_DUD, type)
+ UnregisterSignal(src, COMSIG_MOVABLE_MOVED)
/obj/item/fishing_hook/magnet/get_hook_bonus_multiplicative(fish_type, datum/fish_source/source)
if(fish_type == FISHING_DUD || ispath(fish_type, /obj/item/fish))
@@ -171,7 +185,6 @@
// We multiply the odds by five for everything that's not a fish nor a dud
return MAGNET_HOOK_BONUS_MULTIPLIER
-
/obj/item/fishing_hook/shiny
name = "shiny lure hook"
icon_state = "gold_shiny"
@@ -260,7 +273,6 @@
// Can hold fishing rod despite the size
var/static/list/exception_cache = typecacheof(list(
/obj/item/fishing_rod,
- /obj/item/fishing_line,
))
atom_storage.exception_hold = exception_cache
@@ -269,6 +281,7 @@
new /obj/item/fishing_rod/unslotted(src)
new /obj/item/fishing_hook(src)
new /obj/item/fishing_line(src)
+ new /obj/item/paper/paperslip/fishing_tip(src)
/obj/item/storage/toolbox/fishing/small
name = "compact fishing toolbox"
@@ -285,31 +298,121 @@
new /obj/item/fishing_rod/unslotted(src)
new /obj/item/fishing_hook(src)
new /obj/item/fishing_line(src)
+ new /obj/item/paper/paperslip/fishing_tip(src)
+
+/obj/item/storage/toolbox/fishing/master
+ name = "super fishing toolbox"
+ desc = "Contains EVERYTHING (almost) you need for your fishing trip."
+ icon_state = "gold"
+ inhand_icon_state = "toolbox_gold"
+
+/obj/item/storage/toolbox/fishing/master/PopulateContents()
+ new /obj/item/fishing_rod/telescopic/master(src)
+ new /obj/item/storage/box/fishing_hooks/master(src)
+ new /obj/item/storage/box/fishing_lines/master(src)
+ new /obj/item/bait_can/super_baits(src)
+ new /obj/item/fish_feed(src)
+ new /obj/item/aquarium_kit(src)
+ new /obj/item/fish_analyzer(src)
+ new /obj/item/experi_scanner(src)
/obj/item/storage/box/fishing_hooks
name = "fishing hook set"
+ illustration = "fish"
/obj/item/storage/box/fishing_hooks/PopulateContents()
- . = ..()
new /obj/item/fishing_hook/magnet(src)
new /obj/item/fishing_hook/shiny(src)
new /obj/item/fishing_hook/weighted(src)
+/obj/item/storage/box/fishing_hooks/master
+
+/obj/item/storage/box/fishing_hooks/master/PopulateContents()
+ . = ..()
+ new /obj/item/fishing_hook/stabilized(src)
+ new /obj/item/fishing_hook/jaws(src)
+
/obj/item/storage/box/fishing_lines
name = "fishing line set"
+ illustration = "fish"
/obj/item/storage/box/fishing_lines/PopulateContents()
- . = ..()
new /obj/item/fishing_line/bouncy(src)
new /obj/item/fishing_line/reinforced(src)
new /obj/item/fishing_line/cloaked(src)
+/obj/item/storage/box/fishing_lines/master
+
+/obj/item/storage/box/fishing_lines/master/PopulateContents()
+ . = ..()
+ new /obj/item/fishing_line/auto_reel(src)
+
/obj/item/storage/box/fish_debug
name = "box full of fish"
+ illustration = "fish"
/obj/item/storage/box/fish_debug/PopulateContents()
for(var/fish_type in subtypesof(/obj/item/fish))
new fish_type(src)
+///Used to give the average player info about fishing stuff that's unknown to many.
+/obj/item/paper/paperslip/fishing_tip
+ name = "fishing tip"
+ desc = "A slip of paper containing a pearl of wisdom about fishing within it, though you wish it were an actual pearl."
+
+/obj/item/paper/paperslip/fortune/Initialize(mapload)
+ default_raw_text = pick(GLOB.fishing_tips)
+ return ..()
+
+///From the fishing mystery box. It's basically a lazarus and a few bottles of strange reagents.
+/obj/item/storage/box/fish_revival_kit
+ name = "fish revival kit"
+ desc = "Become a fish doctor today."
+ illustration = "fish"
+
+/obj/item/storage/box/fish_revival_kit/PopulateContents()
+ new /obj/item/lazarus_injector(src)
+ new /obj/item/reagent_containers/cup/bottle/strange_reagent(src)
+ new /obj/item/reagent_containers/cup(src) //to splash the reagents on the fish.
+ new /obj/item/storage/fish_case(src)
+ new /obj/item/storage/fish_case(src)
+
+/obj/item/storage/box/fishing_lures
+ name = "fishing lures set"
+ desc = "A small tackle box containing all the fishing lures you will ever need to curb randomness."
+ icon_state = "plasticbox"
+ foldable_result = null
+ illustration = "fish"
+
+/obj/item/storage/box/fishing_lures/PopulateContents()
+ new /obj/item/paper/lures_instructions(src)
+ var/list/typesof = typesof(/obj/item/fishing_lure)
+ for(var/type in typesof)
+ new type (src)
+ atom_storage.set_holdable(/obj/item/fishing_lure) //can only hold lures
+ //adds an extra slot, so we can put back the lures even if we didn't take out the instructions.
+ atom_storage.max_slots = length(typesof) + 1
+ atom_storage.max_total_storage = WEIGHT_CLASS_SMALL * (atom_storage.max_slots + 1)
+
+/obj/item/paper/lures_instructions
+ name = "instructions paper"
+ icon_state = "slipfull"
+ show_written_words = FALSE
+ desc = "A piece of grey paper with a how-to for dummies about fishing lures printed on it. Smells cheap."
+ default_raw_text = "Thank you for buying this set. \
+ This a simple non-exhaustive set of instructions on how to use fishing lures, some information may \
+ be slightly incorrect or oversimplified.
\
+
+ First and foremost, fishing lures are inedible, artificial baits sturdy enough to not end up being \
+ consumed by the hungry fish. However, they need to be spun at intervals to replicate \
+ the motion of a prey or organic bait and tempt the fish, since a piece of plastic and metal ins't \
+ all that appetitizing by itself. Different lures can be used to catch different fish.
\
+
+ To help you, each lure comes with a small light diode that's attached to the float of your fishing rod. \
+ A float is basically the thing bobbing up'n'down above the fishing spot. \
+ The light will flash green and a sound cue will be played when the lure is ready to be spun. \
+ Do not spin while the light is still red.
\
+ That's all, best of luck to your angling journey."
+
#undef MAGNET_HOOK_BONUS_MULTIPLIER
#undef RESCUE_HOOK_FISH_MULTIPLIER
diff --git a/code/modules/fishing/fishing_minigame.dm b/code/modules/fishing/fishing_minigame.dm
index 9c70d474a62d7..fc30d2aa6970f 100644
--- a/code/modules/fishing/fishing_minigame.dm
+++ b/code/modules/fishing/fishing_minigame.dm
@@ -1,20 +1,10 @@
-// Lure bobbing
+// float bobbing
#define WAIT_PHASE 1
// Click now to start tgui part
#define BITING_PHASE 2
// UI minigame phase
#define MINIGAME_PHASE 3
-/// The height of the minigame slider. Not in pixels, but minigame units.
-#define FISHING_MINIGAME_AREA 1000
-/// Any lower than this, and the target position of the fish is considered null
-#define FISH_TARGET_MIN_DISTANCE 6
-/// The friction applied to fish jumps, so that it decelerates over time
-#define FISH_FRICTION_MULT 0.9
-/// Used to decide whether the fish can jump in a certain direction
-#define FISH_SHORT_JUMP_MIN_DISTANCE 100
-/// The maximum distance for a short jump
-#define FISH_SHORT_JUMP_MAX_DISTANCE 200
// Acceleration mod when bait is over fish
#define FISH_ON_BAIT_ACCELERATION_MULT 0.6
/// The minimum velocity required for the bait to bounce
@@ -47,8 +37,6 @@
var/start_time
/// Is it finished (either by win/lose or window closing)
var/completed = FALSE
- /// Fish AI type to use
- var/fish_ai = FISH_AI_DUMB
/// Rule modifiers (eg weighted bait)
var/special_effects = NONE
/// A list of possible active minigame effects. If not empty, one will be picked from time to time.
@@ -65,16 +53,18 @@
var/phase = WAIT_PHASE
// Timer for the next phase
var/next_phase_timer
+ // The last time we clicked during the baiting phase
+ var/last_baiting_click
/// Fishing mob
var/mob/user
/// Rod that is used for the challenge
var/obj/item/fishing_rod/used_rod
- /// Lure visual
- var/obj/effect/fishing_lure/lure
+ /// float visual
+ var/obj/effect/fishing_float/float
/// Background icon state from fishing_hud.dmi
var/background = "background_default"
/// Fish icon state from fishing_hud.dmi
- var/fish_icon = "fish"
+ var/fish_icon = FISH_ICON_DEF
/// Fishing line visual
var/datum/beam/fishing_line
@@ -93,8 +83,6 @@
var/fish_position = 0
/// The position of the bait on the minigame slider
var/bait_position = 0
- /// The current speed the fish is moving at
- var/fish_velocity = 0
/// The current speed the bait is moving at
var/bait_velocity = 0
@@ -105,22 +93,7 @@
/// How much completion is gained per second when the bait area is intersecting with the fish's
var/completion_gain = 5
- /// How likely the fish is to perform a standard jump, then multiplied by difficulty
- var/short_jump_chance = 2.25
- /// How likely the fish is to perform a long jump, then multiplied by difficulty
- var/long_jump_chance = 0.0625
- /// The speed limit for the short jump
- var/short_jump_velocity_limit = 400
- /// The speed limit for the long jump
- var/long_jump_velocity_limit = 200
- /// The current speed limit used
- var/current_velocity_limit = 200
- /// The base velocity of the fish, which may affect jump distances and falling speed.
- var/fish_idle_velocity = 0
- /// A position on the slider the fish wants to get to
- var/target_position
- /// If true, the fish can jump while a target position is set, thus overriding it
- var/can_interrupt_move = TRUE
+ var/datum/fish_movement/mover
/// Whether the bait is idle or reeling up or down (left and right click)
var/reeling_state = REELING_STATE_IDLE
@@ -139,29 +112,27 @@
src.reward_path = reward_path
src.used_rod = rod
var/atom/spot = comp.parent
- lure = new(get_turf(spot), spot)
+ float = new(get_turf(spot), spot)
+ float.spin_frequency = rod.spin_frequency
RegisterSignal(spot, COMSIG_QDELETING, PROC_REF(on_spot_gone))
RegisterSignal(comp.fish_source, COMSIG_FISHING_SOURCE_INTERRUPT_CHALLENGE, PROC_REF(interrupt_challenge))
comp.fish_source.RegisterSignal(src, COMSIG_FISHING_CHALLENGE_COMPLETED, TYPE_PROC_REF(/datum/fish_source, on_challenge_completed))
background = comp.fish_source.background
+
/// Fish minigame properties
if(ispath(reward_path,/obj/item/fish))
var/obj/item/fish/fish = reward_path
- fish_ai = initial(fish.fish_ai_type)
- switch(fish_ai)
- if(FISH_AI_ZIPPY) // Keeps on jumping
- short_jump_chance *= 3
- if(FISH_AI_SLOW) // Only does long jump, and doesn't change direction until it gets there
- short_jump_chance = 0
- long_jump_chance = 1.5
- long_jump_velocity_limit = 150
- long_jump_velocity_limit = FALSE
+ var/movement_path = initial(fish.fish_movement_type)
+ mover = new movement_path(src)
// Apply fish trait modifiers
- var/list/fish_list_properties = collect_fish_properties()
+ var/list/fish_list_properties = SSfishing.fish_properties
var/list/fish_traits = fish_list_properties[fish][NAMEOF(fish, fish_traits)]
for(var/fish_trait in fish_traits)
var/datum/fish_trait/trait = GLOB.fish_traits[fish_trait]
trait.minigame_mod(rod, user, src)
+ else
+ mover = new /datum/fish_movement(src)
+
/// Enable special parameters
if(rod.line)
completion_gain += 1 // Any fishing line will provide a small boost by default
@@ -196,24 +167,9 @@
completion -= MAX_FISH_COMPLETION_MALUS * (difficulty * 0.01)
if(HAS_MIND_TRAIT(user, TRAIT_REVEAL_FISH))
- fish_icon = GLOB.specific_fish_icons[reward_path] || "fish"
+ fish_icon = GLOB.specific_fish_icons[reward_path] || FISH_ICON_DEF
- /**
- * If the chances are higher than 1% (100% at maximum difficulty), they'll scale
- * less than proportionally (exponent less than 1) instead.
- * This way we ensure fish with high jump chances won't get TOO jumpy until
- * they near the maximum difficulty, at which they hit 100%
- */
- var/square_angle_rad = TORADIANS(90)
- var/zero_one_difficulty = difficulty/100
- if(short_jump_chance > 1)
- short_jump_chance = (zero_one_difficulty**(square_angle_rad-TORADIANS(arctan(short_jump_chance * 1/square_angle_rad))))*100
- else
- short_jump_chance *= difficulty
- if(long_jump_chance > 1)
- long_jump_chance = (zero_one_difficulty**(square_angle_rad-TORADIANS(arctan(long_jump_chance * 1/square_angle_rad))))*100
- else
- long_jump_chance *= difficulty
+ mover.adjust_to_difficulty()
bait_height -= round(difficulty * BAIT_HEIGHT_DIFFICULTY_MALUS)
bait_pixel_height = round(MINIGAME_BAIT_HEIGHT * (bait_height/initial(bait_height)), 1)
@@ -225,16 +181,16 @@
//Stops the line snapped message from appearing everytime the minigame is over.
UnregisterSignal(fishing_line, COMSIG_QDELETING)
QDEL_NULL(fishing_line)
- if(lure)
- QDEL_NULL(lure)
+ QDEL_NULL(float)
SStgui.close_uis(src)
user = null
used_rod = null
+ QDEL_NULL(mover)
return ..()
/datum/fishing_challenge/proc/send_alert(message)
- var/turf/lure_turf = get_turf(lure)
- lure_turf?.balloon_alert(user, message)
+ var/turf/float_turf = get_turf(float)
+ float_turf?.balloon_alert(user, message)
/datum/fishing_challenge/proc/on_spot_gone(datum/source)
SIGNAL_HANDLER
@@ -242,50 +198,115 @@
interrupt()
/datum/fishing_challenge/proc/interrupt_challenge(datum/source, reason)
+ SIGNAL_HANDLER
if(reason)
send_alert(reason)
interrupt()
/datum/fishing_challenge/proc/start(mob/living/user)
/// Create fishing line visuals
- if(used_rod.display_fishing_line)
- fishing_line = used_rod.create_fishing_line(lure, target_py = 5)
+ if(!used_rod.internal)
+ fishing_line = used_rod.create_fishing_line(float, user, target_py = 5)
+ if(isnull(fishing_line)) //couldn't create a fishing line, probably because we don't have a good line of sight.
+ qdel(src)
+ return
RegisterSignal(fishing_line, COMSIG_QDELETING, PROC_REF(on_line_deleted))
else //if the rod doesnt have a fishing line, then it ends when they move away
- RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(on_user_move))
+ RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(on_float_or_user_move))
+ RegisterSignal(float, COMSIG_MOVABLE_MOVED, PROC_REF(on_float_or_user_move))
+ RegisterSignal(user, SIGNAL_ADDTRAIT(TRAIT_HANDS_BLOCKED), PROC_REF(on_hands_blocked))
+ RegisterSignal(user, SIGNAL_REMOVETRAIT(TRAIT_PROFOUND_FISHER), PROC_REF(no_longer_fishing))
active_effects = bitfield_to_list(special_effects & FISHING_MINIGAME_ACTIVE_EFFECTS)
// If fishing line breaks los / rod gets dropped / deleted
RegisterSignal(used_rod, COMSIG_ITEM_ATTACK_SELF, PROC_REF(on_attack_self))
- ADD_TRAIT(user, TRAIT_GONE_FISHING, REF(src))
+ ADD_TRAIT(user, TRAIT_GONE_FISHING, WEAKREF(src))
user.add_mood_event("fishing", /datum/mood_event/fishing)
RegisterSignal(user, COMSIG_MOB_CLICKON, PROC_REF(handle_click))
start_baiting_phase()
to_chat(user, span_notice("You start fishing..."))
- playsound(lure, 'sound/effects/splash.ogg', 100)
+ playsound(float, 'sound/effects/splash.ogg', 100)
+
+///Set the timers for lure that need to be spun at intervals.
+/datum/fishing_challenge/proc/set_lure_timers()
+ float.spin_ready = FALSE
+ addtimer(CALLBACK(src, PROC_REF(set_lure_ready)), float.spin_frequency[1], TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_DELETE_ME)
+ addtimer(CALLBACK(src, PROC_REF(missed_lure)), float.spin_frequency[2], TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_DELETE_ME)
+ float.update_appearance(UPDATE_OVERLAYS)
+
+/datum/fishing_challenge/proc/set_lure_ready()
+ if(phase != WAIT_PHASE)
+ return
+ float.spin_ready = TRUE
+ float.update_appearance(UPDATE_OVERLAYS)
+ if(special_effects & FISHING_MINIGAME_AUTOREEL)
+ addtimer(CALLBACK(src, PROC_REF(auto_spin)), 0.2 SECONDS)
+ playsound(float, 'sound/machines/ping.ogg', 10, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+
+/datum/fishing_challenge/proc/auto_spin()
+ if(phase != WAIT_PHASE || !float.spin_ready)
+ return
+ float.spin_ready = FALSE
+ float.update_appearance(UPDATE_OVERLAYS)
+ set_lure_timers()
+ send_alert("spun")
+
+/datum/fishing_challenge/proc/missed_lure()
+ if(phase != WAIT_PHASE)
+ return
+ send_alert("miss!")
+ start_baiting_phase(TRUE) //Add in another 3 to 5 seconds for not spinning the lure.
/datum/fishing_challenge/proc/on_line_deleted(datum/source)
SIGNAL_HANDLER
fishing_line = null
- ///The lure may be out of sight if the user has moed around a corner, so the message should be displayed over him instead.
+ ///The float may be out of sight if the user has moed around a corner, so the message should be displayed over him instead.
user.balloon_alert(user, user.is_holding(used_rod) ? "line snapped" : "rod dropped")
interrupt()
-/datum/fishing_challenge/proc/on_user_move(datum/source)
+/datum/fishing_challenge/proc/on_float_or_user_move(datum/source)
SIGNAL_HANDLER
- user.balloon_alert(user, "too far!")
+ if(!user.CanReach(float))
+ user.balloon_alert(user, "too far!")
+ interrupt()
+
+/datum/fishing_challenge/proc/on_hands_blocked(datum/source)
+ SIGNAL_HANDLER
+ if(completed) //the rod was dropped and therefore challenge already completed.
+ return
+ user.balloon_alert(user, "hands blocked!")
+ interrupt()
+
+/datum/fishing_challenge/proc/no_longer_fishing(datum/source)
+ SIGNAL_HANDLER
+ user.balloon_alert(user, "interrupted!")
interrupt()
/datum/fishing_challenge/proc/handle_click(mob/source, atom/target, modifiers)
SIGNAL_HANDLER
- //You need to be holding the rod to use it.
+ if(HAS_TRAIT(source, TRAIT_HANDS_BLOCKED)) //blocked, can't do stuff
+ return
+ //Doing other stuff
if(LAZYACCESS(modifiers, SHIFT_CLICK) || LAZYACCESS(modifiers, CTRL_CLICK) || LAZYACCESS(modifiers, ALT_CLICK))
return
+ //You need to be actively holding on the fishing rod to use it, unless you've the profound_fisher trait.
if(!HAS_TRAIT(source, TRAIT_PROFOUND_FISHER) && source.get_active_held_item() != used_rod)
return
if(phase == WAIT_PHASE)
- send_alert("miss!")
- start_baiting_phase(TRUE) //Add in another 3 to 5 seconds for that blunder.
+ if(world.time < last_baiting_click + 0.25 SECONDS)
+ return //Don't punish players if they accidentally double clicked.
+ if(float.spin_frequency)
+ if(!float.spin_ready)
+ send_alert("too early!")
+ start_baiting_phase(TRUE) //Add in another 3 to 5 seconds for that blunder.
+ else
+ send_alert("spun")
+ last_baiting_click = world.time
+ float.spin_ready = FALSE
+ set_lure_timers()
+ else
+ send_alert("miss!")
+ start_baiting_phase(TRUE) //Add in another 3 to 5 seconds for that blunder.
else if(phase == BITING_PHASE)
start_minigame_phase()
return COMSIG_MOB_CANCEL_CLICKON
@@ -313,8 +334,9 @@
completed = TRUE
if(phase == MINIGAME_PHASE)
remove_minigame_hud()
- if(user)
- REMOVE_TRAIT(user, TRAIT_GONE_FISHING, REF(src))
+ if(!QDELETED(user))
+ UnregisterSignal(user, SIGNAL_REMOVETRAIT(TRAIT_GONE_FISHING))
+ user.remove_traits(list(TRAIT_GONE_FISHING, TRAIT_ACTIVELY_FISHING), WEAKREF(src))
if(start_time)
var/seconds_spent = (world.time - start_time) * 0.1
if(!(special_effects & FISHING_MINIGAME_RULE_NO_EXP))
@@ -323,30 +345,33 @@
user.client?.give_award(/datum/award/achievement/skill/legendary_fisher, user)
if(win)
if(reward_path != FISHING_DUD)
- playsound(lure, 'sound/effects/bigsplash.ogg', 100)
+ playsound(float, 'sound/effects/bigsplash.ogg', 100)
SEND_SIGNAL(src, COMSIG_FISHING_CHALLENGE_COMPLETED, user, win)
if(!QDELETED(src))
qdel(src)
/datum/fishing_challenge/proc/start_baiting_phase(penalty = FALSE)
var/wait_time
+ last_baiting_click = world.time
if(penalty)
wait_time = min(timeleft(next_phase_timer) + rand(3 SECONDS, 5 SECONDS), 30 SECONDS)
else
- wait_time = rand(3 SECONDS, 25 SECONDS)
+ wait_time = float.spin_frequency ? rand(11 SECONDS, 17 SECONDS) : rand(3 SECONDS, 25 SECONDS)
if(special_effects & FISHING_MINIGAME_AUTOREEL && wait_time >= 15 SECONDS)
wait_time = max(wait_time - 7.5 SECONDS, 15 SECONDS)
deltimer(next_phase_timer)
phase = WAIT_PHASE
//Bobbing animation
- animate(lure, pixel_y = 1, time = 1 SECONDS, loop = -1, flags = ANIMATION_RELATIVE)
+ animate(float, pixel_y = 1, time = 1 SECONDS, loop = -1, flags = ANIMATION_RELATIVE)
animate(pixel_y = -1, time = 1 SECONDS, flags = ANIMATION_RELATIVE)
- next_phase_timer = addtimer(CALLBACK(src, PROC_REF(start_biting_phase)), wait_time, TIMER_STOPPABLE)
+ next_phase_timer = addtimer(CALLBACK(src, PROC_REF(start_biting_phase)), wait_time, TIMER_STOPPABLE|TIMER_DELETE_ME)
+ if(float.spin_frequency)
+ set_lure_timers()
/datum/fishing_challenge/proc/start_biting_phase()
phase = BITING_PHASE
// Trashing animation
- playsound(lure, 'sound/effects/fish_splash.ogg', 100)
+ playsound(float, 'sound/effects/fish_splash.ogg', 100)
if(HAS_MIND_TRAIT(user, TRAIT_REVEAL_FISH))
switch(fish_icon)
if(FISH_ICON_DEF)
@@ -369,15 +394,31 @@
send_alert("crustacean!!!")
if(FISH_ICON_BONE)
send_alert("bones!!!")
+ if(FISH_ICON_ELECTRIC)
+ send_alert("zappy!!!")
+ if(FISH_ICON_WEAPON)
+ send_alert("weapon!!!")
+ if(FISH_ICON_CRITTER)
+ send_alert("critter!!!")
+ if(FISH_ICON_SEED)
+ send_alert("seed!!!")
+ if(FISH_ICON_BOTTLE)
+ send_alert("bottle!!!")
else
send_alert("!!!")
- animate(lure, pixel_y = 3, time = 5, loop = -1, flags = ANIMATION_RELATIVE)
+ animate(float, pixel_y = 3, time = 5, loop = -1, flags = ANIMATION_RELATIVE)
animate(pixel_y = -3, time = 5, flags = ANIMATION_RELATIVE)
if(special_effects & FISHING_MINIGAME_AUTOREEL)
- start_minigame_phase(auto_reel = TRUE)
- return
+ addtimer(CALLBACK(src, PROC_REF(automatically_start_minigame)), 0.2 SECONDS)
// Setup next phase
- next_phase_timer = addtimer(CALLBACK(src, PROC_REF(start_baiting_phase)), BITING_TIME_WINDOW, TIMER_STOPPABLE)
+ next_phase_timer = addtimer(CALLBACK(src, PROC_REF(start_baiting_phase)), BITING_TIME_WINDOW, TIMER_STOPPABLE|TIMER_DELETE_ME)
+ ///If we're using a lure, we want the float to show a little green light during the minigame phase and not a red one.
+ float.spin_ready = TRUE
+ float.update_appearance(UPDATE_OVERLAYS)
+
+/datum/fishing_challenge/proc/automatically_start_minigame()
+ if(phase == BITING_PHASE)
+ start_minigame_phase(auto_reel = TRUE)
///The damage dealt per second to the fish when FISHING_MINIGAME_RULE_KILL is active.
#define FISH_DAMAGE_PER_SECOND 2
@@ -413,22 +454,45 @@
completion *= 1.2
if(BITING_TIME_WINDOW - 0.5 SECONDS to BITING_TIME_WINDOW)
completion *= 1.4
+ //randomize the position of the fish a little
+ fish_position = rand(0, (FISHING_MINIGAME_AREA - fish_height) * 0.8)
+ var/diff_dist = 100 + difficulty
+ bait_position = clamp(round(fish_position + rand(-diff_dist, diff_dist) - bait_height * 0.5), 0, FISHING_MINIGAME_AREA - bait_height)
if(!prepare_minigame_hud())
+ get_stack_trace("couldn't prepare minigame hud for a fishing challenge.") //just to be sure. This shouldn't happen.
+ qdel(src)
return
+ ADD_TRAIT(user, TRAIT_ACTIVELY_FISHING, WEAKREF(src))
phase = MINIGAME_PHASE
deltimer(next_phase_timer)
if((FISHING_MINIGAME_RULE_KILL in special_effects) && ispath(reward_path,/obj/item/fish))
var/obj/item/fish/fish = reward_path
var/wait_time = (initial(fish.health) / FISH_DAMAGE_PER_SECOND) SECONDS
- addtimer(CALLBACK(src, PROC_REF(win_anyway)), wait_time)
+ addtimer(CALLBACK(src, PROC_REF(win_anyway)), wait_time, TIMER_DELETE_ME)
start_time = world.time
experience_multiplier += difficulty * FISHING_SKILL_DIFFIULTY_EXP_MULT
+///Throws a stack with prefixed text.
+/datum/fishing_challenge/proc/get_stack_trace(init_text)
+ var/text = "[init_text] "
+ text += "used rod: [used_rod || "null"], "
+ if(used_rod)
+ text += "bait: [used_rod.bait || "null"], "
+ text += "reward: [reward_path || "null"], "
+ text += "user: [user || "null"]"
+ if(user)
+ if(QDELING(user))
+ text += ", user qdeling"
+ else if(!user.client)
+ text += ", user clientless"
+ text += "."
+ stack_trace(text)
+
#undef FISH_DAMAGE_PER_SECOND
///Initialize the minigame hud and register some signals to make it work.
/datum/fishing_challenge/proc/prepare_minigame_hud()
- if(!user.client || user.incapacitated())
+ if(!user.client || user.incapacitated)
return FALSE
. = TRUE
fishing_hud = new
@@ -465,7 +529,7 @@
/datum/fishing_challenge/process(seconds_per_tick)
if(length(active_effects) && COOLDOWN_FINISHED(src, active_effect_cd))
select_active_effect()
- move_fish(seconds_per_tick)
+ mover.move_fish(seconds_per_tick)
move_bait(seconds_per_tick)
if(!QDELETED(fishing_hud))
update_visuals()
@@ -485,6 +549,11 @@
fishing_hud.transform = fishing_hud.transform.Scale(1, -1)
SEND_SOUND(user, sound('sound/effects/boing.ogg'))
COOLDOWN_START(src, active_effect_cd, rand(5, 6) SECONDS)
+ if(FISHING_MINIGAME_RULE_CAMO)
+ fishing_hud.icon_state = "background_camo"
+ SEND_SOUND(user, sound('sound/effects/nightmare_poof.ogg', volume = 15))
+ COOLDOWN_START(src, active_effect_cd, rand(6, 8) SECONDS)
+ animate(fishing_hud.hud_fish, alpha = 7, time = 2 SECONDS)
return
///go back to normal
@@ -497,62 +566,14 @@
if(FISHING_MINIGAME_RULE_FLIP)
fishing_hud.transform = fishing_hud.transform.Scale(1, -1)
COOLDOWN_START(src, active_effect_cd, rand(8, 12) SECONDS)
+ if(FISHING_MINIGAME_RULE_CAMO)
+ COOLDOWN_START(src, active_effect_cd, rand(9, 16) SECONDS)
+ SEND_SOUND(user, sound('sound/effects/nightmare_reappear.ogg', volume = 15))
+ animate(fishing_hud.hud_fish, alpha = 255, time = 1.2 SECONDS)
fishing_hud.icon_state = background
current_active_effect = null
-///The proc that moves the fish around, just like in the old TGUI, mostly.
-/datum/fishing_challenge/proc/move_fish(seconds_per_tick)
- var/long_chance = long_jump_chance * seconds_per_tick * 10
- var/short_chance = short_jump_chance * seconds_per_tick * 10
-
- // If we have the target but we're close enough, mark as target reached
- if(abs(target_position - fish_position) < FISH_TARGET_MIN_DISTANCE)
- target_position = null
-
- // Switching to new long jump target can interrupt any other
- if((can_interrupt_move || isnull(target_position)) && prob(long_chance))
- /**
- * Move at least 0.75 to full of the availible bar in given direction,
- * and more likely to move in the direction where there's more space
- */
- var/distance_from_top = FISHING_MINIGAME_AREA - fish_position - fish_height
- var/distance_from_bottom = fish_position
- var/top_chance
- if(distance_from_top < FISH_SHORT_JUMP_MIN_DISTANCE)
- top_chance = 0
- else
- top_chance = (distance_from_top/max(distance_from_bottom, 1)) * 100
- var/new_target = fish_position
- if(prob(top_chance))
- new_target += distance_from_top * rand(75, 100)/100
- else
- new_target -= distance_from_bottom * rand(75, 100)/100
- target_position = round(new_target)
- current_velocity_limit = long_jump_velocity_limit
-
- // Move towards target
- if(!isnull(target_position))
- var/distance = target_position - fish_position
- // about 5 at diff 15 , 10 at diff 30, 30 at diff 100
- var/acceleration_mult = 0.3 * difficulty + 0.5
- var/target_acceleration = distance * acceleration_mult * seconds_per_tick
-
- fish_velocity = fish_velocity * FISH_FRICTION_MULT + target_acceleration
- else if(prob(short_chance))
- var/distance_from_top = FISHING_MINIGAME_AREA - fish_position - fish_height
- var/distance_from_bottom = fish_position
- var/jump_length
- if(distance_from_top >= FISH_SHORT_JUMP_MIN_DISTANCE)
- jump_length = rand(FISH_SHORT_JUMP_MIN_DISTANCE, FISH_SHORT_JUMP_MAX_DISTANCE)
- if(distance_from_bottom >= FISH_SHORT_JUMP_MIN_DISTANCE && (!jump_length || prob(50)))
- jump_length = -rand(FISH_SHORT_JUMP_MIN_DISTANCE, FISH_SHORT_JUMP_MAX_DISTANCE)
- target_position = clamp(fish_position + jump_length, 0, FISHING_MINIGAME_AREA - fish_height)
- current_velocity_limit = short_jump_velocity_limit
-
- fish_velocity = clamp(fish_velocity + fish_idle_velocity, -current_velocity_limit, current_velocity_limit)
- fish_position = clamp(fish_position + fish_velocity * seconds_per_tick, 0, FISHING_MINIGAME_AREA - fish_height)
-
///The proc that moves the bait around, just like in the old TGUI, mostly.
/datum/fishing_challenge/proc/move_bait(seconds_per_tick)
var/should_bounce = abs(bait_velocity) > BAIT_MIN_VELOCITY_BOUNCE
@@ -613,9 +634,7 @@
bait_velocity += velocity_change
//check that the fish area is still intersecting the bait now that it has moved
- fish_on_bait = (fish_position + fish_height >= bait_position) && (bait_position + bait_height >= fish_position)
-
- if(fish_on_bait)
+ if(is_fish_on_bait())
completion += completion_gain * seconds_per_tick
if(completion >= 100)
complete(TRUE)
@@ -627,6 +646,10 @@
completion = clamp(completion, 0, 100)
+///Returns TRUE if the fish and the bait are intersecting
+/datum/fishing_challenge/proc/is_fish_on_bait()
+ return (fish_position + fish_height >= bait_position) && (bait_position + bait_height >= fish_position)
+
///update the vertical pixel position of both fish and bait, and the icon state of the completion bar
/datum/fishing_challenge/proc/update_visuals()
var/bait_offset_mult = bait_position/FISHING_MINIGAME_AREA
@@ -707,34 +730,43 @@
icon_state = "completion_[FLOOR(challenge.completion, 5)]"
/// The visual that appears over the fishing spot
-/obj/effect/fishing_lure
+/obj/effect/fishing_float
+ name = "float"
icon = 'icons/obj/fishing.dmi'
- icon_state = "lure_idle"
+ icon_state = "float"
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+ /**
+ * A list with two keys delimiting the spinning interval in which a mouse click has to be pressed while fishing.
+ * If set, an emissive overlay will be added, colored green when the lure is ready to be spun, otherwise red.
+ */
+ var/list/spin_frequency
+ ///Is the bait ready to be spun?
+ var/spin_ready = FALSE
-/obj/effect/fishing_lure/Initialize(mapload, atom/spot)
+/obj/effect/fishing_float/Initialize(mapload, atom/spot)
. = ..()
- if(ismovable(spot)) // we want the lure and therefore the fishing line to stay connected with the fishing spot.
+ if(ismovable(spot)) // we want the float and therefore the fishing line to stay connected with the fishing spot.
RegisterSignal(spot, COMSIG_MOVABLE_MOVED, PROC_REF(follow_movable))
-/obj/effect/fishing_lure/proc/follow_movable(atom/movable/source)
+/obj/effect/fishing_float/proc/follow_movable(atom/movable/source)
SIGNAL_HANDLER
set_glide_size(source.glide_size)
forceMove(source.loc)
+/obj/effect/fishing_float/update_overlays()
+ . = ..()
+ if(!spin_frequency)
+ return
+ var/mutable_appearance/overlay = mutable_appearance(icon, "lure_light")
+ overlay.color = spin_ready ? COLOR_GREEN : COLOR_RED
+ . += overlay
+ . += emissive_appearance(icon, "lure_light_emissive", src, alpha = src.alpha)
+
#undef WAIT_PHASE
#undef BITING_PHASE
#undef MINIGAME_PHASE
-#undef FISHING_MINIGAME_AREA
-#undef FISH_TARGET_MIN_DISTANCE
-#undef FISH_FRICTION_MULT
-#undef FISH_SHORT_JUMP_MIN_DISTANCE
-#undef FISH_SHORT_JUMP_MAX_DISTANCE
-#undef FISH_ON_BAIT_ACCELERATION_MULT
-#undef BAIT_MIN_VELOCITY_BOUNCE
-#undef BAIT_DECELERATION_MULT
-
#undef MINIGAME_SLIDER_HEIGHT
#undef MINIGAME_BAIT_HEIGHT
#undef MINIGAME_FISH_HEIGHT
@@ -745,5 +777,9 @@
#undef REELING_STATE_UP
#undef REELING_STATE_DOWN
+#undef FISH_ON_BAIT_ACCELERATION_MULT
+#undef BAIT_MIN_VELOCITY_BOUNCE
+#undef BAIT_DECELERATION_MULT
+
#undef MAX_FISH_COMPLETION_MALUS
#undef BITING_TIME_WINDOW
diff --git a/code/modules/fishing/fishing_portal_machine.dm b/code/modules/fishing/fishing_portal_machine.dm
index 494b29b4183ee..8b157cbebfff3 100644
--- a/code/modules/fishing/fishing_portal_machine.dm
+++ b/code/modules/fishing/fishing_portal_machine.dm
@@ -100,3 +100,7 @@
if(!choice || !can_interact(user))
return
activate(available_fish_sources[choice])
+
+/obj/machinery/fishing_portal_generator/emagged
+ obj_flags = parent_type::obj_flags | EMAGGED
+ circuit = /obj/item/circuitboard/machine/fishing_portal_generator/emagged
diff --git a/code/modules/fishing/fishing_rod.dm b/code/modules/fishing/fishing_rod.dm
index c36ea48b15c02..28ae51d423662 100644
--- a/code/modules/fishing/fishing_rod.dm
+++ b/code/modules/fishing/fishing_rod.dm
@@ -36,12 +36,18 @@
/// The default color for the reel overlay if no line is equipped.
var/default_line_color = "gray"
- ///should there be a fishing line?
- var/display_fishing_line = TRUE
+ ///Is this currently being used by the profound fisher component?
+ var/internal = FALSE
///The name of the icon state of the reel overlay
var/reel_overlay = "reel_overlay"
+ /**
+ * A list with two keys delimiting the spinning interval in which a mouse click has to be pressed while fishing.
+ * Inherited from baits, passed down to the minigame lure.
+ */
+ var/list/spin_frequency
+
///Prevents spamming the line casting, without affecting the player's click cooldown.
COOLDOWN_DECLARE(casting_cd)
@@ -69,9 +75,11 @@
/obj/item/fishing_rod/add_item_context(obj/item/source, list/context, atom/target, mob/living/user)
. = ..()
- if(currently_hooked)
- context[SCREENTIP_CONTEXT_LMB] = "Reel in"
- context[SCREENTIP_CONTEXT_RMB] = "Unhook"
+ var/gone_fishing = HAS_TRAIT(user, TRAIT_GONE_FISHING)
+ if(currently_hooked || gone_fishing)
+ context[SCREENTIP_CONTEXT_LMB] = (gone_fishing && spin_frequency) ? "Spin" : "Reel in"
+ if(!gone_fishing)
+ context[SCREENTIP_CONTEXT_RMB] = "Unhook"
return CONTEXTUAL_SCREENTIP_SET
return NONE
@@ -107,8 +115,19 @@
var/mob/living/caught_mob = reward
if(caught_mob.stat == DEAD)
return
- else if(!isfish(reward))
- return
+ else
+ if(!isfish(reward))
+ return
+ var/obj/item/fish/fish = reward
+ if(HAS_TRAIT(bait, TRAIT_POISONOUS_BAIT) && !HAS_TRAIT(fish, TRAIT_FISH_TOXIN_IMMUNE))
+ var/kill_fish = TRUE
+ for(var/bait_identifer in fish.favorite_bait)
+ if(is_matching_bait(bait, bait_identifer))
+ kill_fish = FALSE
+ break
+ if(kill_fish)
+ fish.set_status(FISH_DEAD, silent = TRUE)
+
QDEL_NULL(bait)
update_icon()
@@ -127,9 +146,10 @@
return
//Try to move it 'till it's under the user's feet, then try to pick it up
if(isitem(currently_hooked))
- step_towards(currently_hooked, get_turf(src))
- if(currently_hooked.loc == user.loc)
- user.put_in_inactive_hand(currently_hooked)
+ var/obj/item/item = currently_hooked
+ step_towards(item, get_turf(src))
+ if(item.loc == user.loc && (item.interaction_flags_item & INTERACT_ITEM_ATTACK_HAND_PICKUP))
+ user.put_in_inactive_hand(item)
QDEL_NULL(fishing_line)
//Not an item, so just delete the line if it's adjacent to the user.
else if(get_dist(currently_hooked,get_turf(src)) > 1)
@@ -147,21 +167,20 @@
ui_interact(user)
/// Generates the fishing line visual from the current user to the target and updates inhands
-/obj/item/fishing_rod/proc/create_fishing_line(atom/movable/target, target_py = null)
- if(!display_fishing_line)
- return null
- var/mob/user = loc
- if(!istype(user))
+/obj/item/fishing_rod/proc/create_fishing_line(atom/movable/target, mob/living/firer, target_py = null)
+ if(internal)
return null
if(fishing_line)
QDEL_NULL(fishing_line)
var/beam_color = line?.line_color || default_line_color
- fishing_line = new(user, target, icon_state = "fishing_line", beam_color = beam_color, emissive = FALSE, override_target_pixel_y = target_py)
- fishing_line.lefthand = user.get_held_index_of_item(src) % 2 == 1
+ fishing_line = new(firer, target, icon_state = "fishing_line", beam_color = beam_color, emissive = FALSE, override_target_pixel_y = target_py)
+ fishing_line.lefthand = firer.get_held_index_of_item(src) % 2 == 1
RegisterSignal(fishing_line, COMSIG_BEAM_BEFORE_DRAW, PROC_REF(check_los))
RegisterSignal(fishing_line, COMSIG_QDELETING, PROC_REF(clear_line))
INVOKE_ASYNC(fishing_line, TYPE_PROC_REF(/datum/beam/, Start))
- user.update_held_items()
+ if(QDELETED(fishing_line))
+ return null
+ firer.update_held_items()
return fishing_line
/obj/item/fishing_rod/proc/clear_line(datum/source)
@@ -183,7 +202,7 @@
if(!hook.can_be_hooked(target_atom))
return
currently_hooked = target_atom
- create_fishing_line(target_atom)
+ create_fishing_line(target_atom, user)
hook.hook_attached(target_atom, src)
SEND_SIGNAL(src, COMSIG_FISHING_ROD_HOOKED_ITEM, target_atom, user)
@@ -197,6 +216,9 @@
return BEAM_CANCEL_DRAW
/obj/item/fishing_rod/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ //this prevent trying to use telekinesis to fish (which would be broken anyway)
+ if(!user.contains(src))
+ return ..()
return ranged_interact_with_atom(interacting_with, user, modifiers)
/obj/item/fishing_rod/ranged_interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
@@ -245,9 +267,8 @@
COOLDOWN_START(src, casting_cd, 1 SECONDS)
/// Called by hook projectile when hitting things
-/obj/item/fishing_rod/proc/hook_hit(atom/atom_hit_by_hook_projectile)
- var/mob/user = loc
- if(!hook || !istype(user))
+/obj/item/fishing_rod/proc/hook_hit(atom/atom_hit_by_hook_projectile, mob/user)
+ if(!hook)
return
if(SEND_SIGNAL(atom_hit_by_hook_projectile, COMSIG_FISHING_ROD_CAST, src, user) & FISHING_ROD_CAST_HANDLED)
return
@@ -261,6 +282,12 @@
ui.set_autoupdate(FALSE)
ui.open()
+/obj/item/fishing_rod/ui_state()
+ if(internal)
+ return GLOB.deep_inventory_state
+ else
+ return GLOB.default_state
+
/obj/item/fishing_rod/update_overlays()
. = ..()
. += get_fishing_overlays()
@@ -365,7 +392,7 @@
return FALSE
return TRUE
-/obj/item/fishing_rod/ui_act(action, list/params)
+/obj/item/fishing_rod/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return .
@@ -379,6 +406,8 @@
/// Ideally this will be replaced with generic slotted storage datum + display
/obj/item/fishing_rod/proc/use_slot(slot, mob/user, obj/item/new_item)
+ if(fishing_line || HAS_TRAIT(user, TRAIT_GONE_FISHING))
+ return
var/obj/item/current_item
switch(slot)
if(ROD_SLOT_BAIT)
@@ -400,23 +429,20 @@
if(user.transferItemToLoc(new_item,src))
set_slot(new_item, slot)
balloon_alert(user, "[slot] installed")
+ else
+ balloon_alert(user, "stuck to your hands!")
+ return
/// Trying to swap item
else if(new_item && current_item)
if(!slot_check(new_item,slot))
return
- if(user.transferItemToLoc(new_item,src))
- switch(slot)
- if(ROD_SLOT_BAIT)
- bait = new_item
- if(ROD_SLOT_HOOK)
- hook = new_item
- if(ROD_SLOT_LINE)
- line = new_item
- user.put_in_hands(current_item)
- balloon_alert(user, "[slot] swapped")
-
- if(new_item)
- SEND_SIGNAL(new_item, COMSIG_FISHING_EQUIPMENT_SLOTTED, src)
+ if(user.transferItemToLoc(new_item, src))
+ user.put_in_hands(current_item)
+ set_slot(new_item, slot)
+ balloon_alert(user, "[slot] swapped")
+ else
+ balloon_alert(user, "stuck to your hands!")
+ return
update_icon()
playsound(src, 'sound/items/click.ogg', 50, TRUE)
@@ -426,16 +452,23 @@
switch(slot)
if(ROD_SLOT_BAIT)
bait = equipment
+ if(!HAS_TRAIT(bait, TRAIT_BAIT_ALLOW_FISHING_DUD))
+ ADD_TRAIT(src, TRAIT_ROD_REMOVE_FISHING_DUD, INNATE_TRAIT)
if(ROD_SLOT_HOOK)
hook = equipment
if(ROD_SLOT_LINE)
line = equipment
cast_range += FISHING_ROD_REEL_CAST_RANGE
+ else
+ CRASH("set_slot called with an undefined slot: [slot]")
+
+ SEND_SIGNAL(equipment, COMSIG_FISHING_EQUIPMENT_SLOTTED, src)
/obj/item/fishing_rod/Exited(atom/movable/gone, direction)
. = ..()
if(gone == bait)
bait = null
+ REMOVE_TRAIT(src, TRAIT_ROD_REMOVE_FISHING_DUD, INNATE_TRAIT)
if(gone == line)
cast_range -= FISHING_ROD_REEL_CAST_RANGE
line = null
@@ -585,13 +618,13 @@
transform = transform.Scale(1, -1)
. = ..()
if(!QDELETED(src))
- our_line = owner.create_fishing_line(src)
+ our_line = owner.create_fishing_line(src, firer)
/obj/projectile/fishing_cast/on_hit(atom/target, blocked = 0, pierce_hit)
. = ..()
if(blocked < 100)
QDEL_NULL(our_line) //we need to delete the old beam datum, otherwise it won't let you fish.
- owner.hook_hit(target)
+ owner.hook_hit(target, firer)
/obj/projectile/fishing_cast/Destroy()
QDEL_NULL(our_line)
diff --git a/code/modules/fishing/sources/_fish_source.dm b/code/modules/fishing/sources/_fish_source.dm
index 4a0419f98f55f..a63c087fcc652 100644
--- a/code/modules/fishing/sources/_fish_source.dm
+++ b/code/modules/fishing/sources/_fish_source.dm
@@ -8,30 +8,51 @@ GLOBAL_LIST_INIT(preset_fish_sources, init_subtypes_w_path_keys(/datum/fish_sour
* A lot of the icons here may be a tad inaccurate, but since we're limited to the free font awesome icons we
* have access to, we got to make do.
*/
-GLOBAL_LIST_INIT(specific_fish_icons, zebra_typecacheof(list(
- /mob/living/basic/carp = FISH_ICON_DEF,
- /mob/living/basic/mining = FISH_ICON_HOSTILE,
- /obj/effect/decal/remains = FISH_ICON_BONE,
- /obj/effect/mob_spawn/corpse = FISH_ICON_BONE,
- /obj/item/coin = FISH_ICON_COIN,
- /obj/item/fish = FISH_ICON_DEF,
- /obj/item/fish/armorfish = FISH_ICON_CRAB,
- /obj/item/fish/boned = FISH_ICON_BONE,
- /obj/item/fish/chasm_crab = FISH_ICON_CRAB,
- /obj/item/fish/gunner_jellyfish = FISH_ICON_JELLYFISH,
- /obj/item/fish/holo/crab = FISH_ICON_CRAB,
- /obj/item/fish/holo/puffer = FISH_ICON_CHUNKY,
- /obj/item/fish/mastodon = FISH_ICON_BONE,
- /obj/item/fish/pufferfish = FISH_ICON_CHUNKY,
- /obj/item/fish/slimefish = FISH_ICON_SLIME,
- /obj/item/fish/sludgefish = FISH_ICON_SLIME,
- /obj/item/fish/starfish = FISH_ICON_STAR,
- /obj/item/storage/wallet = FISH_ICON_COIN,
- /obj/item/stack/sheet/bone = FISH_ICON_BONE,
- /obj/item/stack/sheet/mineral = FISH_ICON_GEM,
- /obj/item/stack/ore = FISH_ICON_GEM,
- /obj/structure/closet/crate = FISH_ICON_COIN,
-)))
+GLOBAL_LIST_INIT(specific_fish_icons, generate_specific_fish_icons())
+
+/proc/generate_specific_fish_icons()
+ var/list/return_list = zebra_typecacheof(list(
+ /mob/living/basic/axolotl = FISH_ICON_CRITTER,
+ /mob/living/basic/frog = FISH_ICON_CRITTER,
+ /mob/living/basic/carp = FISH_ICON_DEF,
+ /mob/living/basic/mining = FISH_ICON_HOSTILE,
+ /obj/effect/decal/remains = FISH_ICON_BONE,
+ /obj/effect/mob_spawn/corpse = FISH_ICON_BONE,
+ /obj/effect/spawner/message_in_a_bottle = FISH_ICON_BOTTLE,
+ /obj/item/coin = FISH_ICON_COIN,
+ /obj/item/fish = FISH_ICON_DEF,
+ /obj/item/fish/armorfish = FISH_ICON_CRAB,
+ /obj/item/fish/boned = FISH_ICON_BONE,
+ /obj/item/fish/chainsawfish = FISH_ICON_WEAPON,
+ /obj/item/fish/chasm_crab = FISH_ICON_CRAB,
+ /obj/item/fish/gunner_jellyfish = FISH_ICON_JELLYFISH,
+ /obj/item/fish/holo/crab = FISH_ICON_CRAB,
+ /obj/item/fish/holo/puffer = FISH_ICON_CHUNKY,
+ /obj/item/fish/jumpercable = FISH_ICON_ELECTRIC,
+ /obj/item/fish/lavaloop = FISH_ICON_WEAPON,
+ /obj/item/fish/mastodon = FISH_ICON_BONE,
+ /obj/item/fish/pike/armored = FISH_ICON_WEAPON,
+ /obj/item/fish/pufferfish = FISH_ICON_CHUNKY,
+ /obj/item/fish/sand_crab = FISH_ICON_CRAB,
+ /obj/item/fish/skin_crab = FISH_ICON_CRAB,
+ /obj/item/fish/slimefish = FISH_ICON_SLIME,
+ /obj/item/fish/sludgefish = FISH_ICON_SLIME,
+ /obj/item/fish/starfish = FISH_ICON_STAR,
+ /obj/item/fish/stingray = FISH_ICON_WEAPON,
+ /obj/item/fish/swordfish = FISH_ICON_WEAPON,
+ /obj/item/fish/zipzap = FISH_ICON_ELECTRIC,
+ /obj/item/seeds/grass = FISH_ICON_SEED,
+ /obj/item/seeds/random = FISH_ICON_SEED,
+ /obj/item/storage/wallet = FISH_ICON_COIN,
+ /obj/item/stack/sheet/bone = FISH_ICON_BONE,
+ /obj/item/stack/sheet/mineral = FISH_ICON_GEM,
+ /obj/item/stack/ore = FISH_ICON_GEM,
+ /obj/structure/closet/crate = FISH_ICON_COIN,
+ /obj/structure/mystery_box = FISH_ICON_COIN,
+ ))
+
+ return_list[FISHING_RANDOM_SEED] = FISH_ICON_SEED
+ return return_list
/**
* Where the fish actually come from - every fishing spot has one assigned but multiple fishing holes
@@ -45,6 +66,10 @@ GLOBAL_LIST_INIT(specific_fish_icons, zebra_typecacheof(list(
var/list/fish_table = list()
/// If a key from fish_table is present here, that fish is availible in limited quantity and is reduced by one on successful fishing
var/list/fish_counts = list()
+ /// Any limited quantity stuff in this list will be readded to the counts after a while
+ var/list/fish_count_regen
+ /// A list of stuff that's currently waiting to be readded to fish_counts
+ var/list/currently_on_regen
/// Text shown as baloon alert when you roll a dud in the table
var/duds = list("it was nothing", "the hook is empty")
/// Baseline difficulty for fishing in this spot
@@ -75,9 +100,12 @@ GLOBAL_LIST_INIT(specific_fish_icons, zebra_typecacheof(list(
return ..()
///Called when src is set as the fish source of a fishing spot component
-/datum/fish_source/proc/on_fishing_spot_init(/datum/component/fishing_spot/spot)
+/datum/fish_source/proc/on_fishing_spot_init(datum/component/fishing_spot/spot)
return
+///Called whenever a fishing spot with this fish source attached is deleted
+/datum/fish_source/proc/on_fishing_spot_del(datum/component/fishing_spot/spot)
+
/// Can we fish in this spot at all. Returns DENIAL_REASON or null if we're good to go
/datum/fish_source/proc/reason_we_cant_fish(obj/item/fishing_rod/rod, mob/fisherman, atom/parent)
return rod.reason_we_cant_fish(src)
@@ -112,8 +140,8 @@ GLOBAL_LIST_INIT(specific_fish_icons, zebra_typecacheof(list(
// In the future non-fish rewards can have variable difficulty calculated here
return
- var/list/fish_list_properties = collect_fish_properties()
var/obj/item/fish/caught_fish = result
+ var/list/fish_properties = SSfishing.fish_properties[caught_fish]
// Baseline fish difficulty
. += initial(caught_fish.fishing_difficulty_modifier)
@@ -121,18 +149,18 @@ GLOBAL_LIST_INIT(specific_fish_icons, zebra_typecacheof(list(
if(rod.bait)
var/obj/item/bait = rod.bait
//Fav bait makes it easier
- var/list/fav_bait = fish_list_properties[caught_fish][NAMEOF(caught_fish, favorite_bait)]
+ var/list/fav_bait = fish_properties[FISH_PROPERTIES_FAV_BAIT]
for(var/bait_identifer in fav_bait)
if(is_matching_bait(bait, bait_identifer))
. += FAV_BAIT_DIFFICULTY_MOD
//Disliked bait makes it harder
- var/list/disliked_bait = fish_list_properties[caught_fish][NAMEOF(caught_fish, disliked_bait)]
+ var/list/disliked_bait = fish_properties[FISH_PROPERTIES_BAD_BAIT]
for(var/bait_identifer in disliked_bait)
if(is_matching_bait(bait, bait_identifer))
. += DISLIKED_BAIT_DIFFICULTY_MOD
// Matching/not matching fish traits and equipment
- var/list/fish_traits = fish_list_properties[caught_fish][NAMEOF(caught_fish, fish_traits)]
+ var/list/fish_traits = fish_properties[FISH_PROPERTIES_TRAITS]
var/additive_mod = 0
var/multiplicative_mod = 1
@@ -146,8 +174,8 @@ GLOBAL_LIST_INIT(specific_fish_icons, zebra_typecacheof(list(
. *= multiplicative_mod
/// In case you want more complex rules for specific spots
-/datum/fish_source/proc/roll_reward(obj/item/fishing_rod/rod, mob/fisherman)
- return pick_weight(get_modified_fish_table(rod,fisherman))
+/datum/fish_source/proc/roll_reward(obj/item/fishing_rod/rod, mob/fisherman, atom/location)
+ return pick_weight(get_modified_fish_table(rod, fisherman, location)) || FISHING_DUD
/**
* Used to register signals or add traits and the such right after conditions have been cleared
@@ -171,7 +199,7 @@ GLOBAL_LIST_INIT(specific_fish_icons, zebra_typecacheof(list(
return
var/obj/item/fish/caught = source.reward_path
user.add_mob_memory(/datum/memory/caught_fish, protagonist = user, deuteragonist = initial(caught.name))
- var/turf/fishing_spot = get_turf(source.lure)
+ var/turf/fishing_spot = get_turf(source.float)
var/atom/movable/reward = dispense_reward(source.reward_path, user, fishing_spot)
if(source.used_rod)
SEND_SIGNAL(source.used_rod, COMSIG_FISHING_ROD_CAUGHT_FISH, reward, user)
@@ -198,16 +226,26 @@ GLOBAL_LIST_INIT(specific_fish_icons, zebra_typecacheof(list(
/datum/fish_source/proc/simple_dispense_reward(reward_path, atom/spawn_location, turf/fishing_spot)
if(isnull(reward_path))
return null
- if((reward_path in fish_counts)) // This is limited count result
+ if(reward_path in fish_counts) // This is limited count result
fish_counts[reward_path] -= 1
- if(!fish_counts[reward_path])
- fish_counts -= reward_path //Ran out of these since rolling (multiple fishermen on same source most likely)
- fish_table -= reward_path
+ var/regen_time = fish_count_regen?[reward_path]
+ if(regen_time)
+ LAZYADDASSOC(currently_on_regen, reward_path, 1)
+ if(currently_on_regen[reward_path] == 1)
+ addtimer(CALLBACK(src, PROC_REF(regen_count), reward_path), regen_time)
var/atom/movable/reward = spawn_reward(reward_path, spawn_location, fishing_spot)
SEND_SIGNAL(src, COMSIG_FISH_SOURCE_REWARD_DISPENSED, reward)
return reward
+/datum/fish_source/proc/regen_count(reward_path, regen_time)
+ fish_counts[reward_path] += 1
+ currently_on_regen[reward_path] -= 1
+ if(!currently_on_regen[reward_path])
+ LAZYREMOVE(currently_on_regen, reward_path)
+ else
+ addtimer(CALLBACK(src, PROC_REF(regen_count), reward_path), regen_time)
+
/// Spawns a reward from a atom path right where the fisherman is. Part of the dispense_reward() logic.
/datum/fish_source/proc/spawn_reward(reward_path, atom/spawn_location, turf/fishing_spot)
if(reward_path == FISHING_DUD)
@@ -222,42 +260,16 @@ GLOBAL_LIST_INIT(specific_fish_icons, zebra_typecacheof(list(
caught_fish.randomize_size_and_weight()
return reward
-/// Cached fish list properties so we don't have to initalize fish every time, init deffered
-GLOBAL_LIST(fishing_property_cache)
-
-/// Awful workaround around initial(x.list_variable) not being a thing while trying to keep some semblance of being structured
-/proc/collect_fish_properties()
- if(GLOB.fishing_property_cache == null)
- var/list/fish_property_table = list()
- for(var/fish_type in subtypesof(/obj/item/fish))
- var/obj/item/fish/fish = new fish_type(null, FALSE)
- fish_property_table[fish_type] = list()
- fish_property_table[fish_type][NAMEOF(fish, favorite_bait)] = fish.favorite_bait.Copy()
- fish_property_table[fish_type][NAMEOF(fish, disliked_bait)] = fish.disliked_bait.Copy()
- fish_property_table[fish_type][NAMEOF(fish, fish_traits)] = fish.fish_traits.Copy()
- QDEL_NULL(fish)
- GLOB.fishing_property_cache = fish_property_table
- return GLOB.fishing_property_cache
-
-/// Checks if bait matches identifier from fav/disliked bait list
-/datum/fish_source/proc/is_matching_bait(obj/item/bait, identifier)
- if(ispath(identifier)) //Just a path
- return istype(bait, identifier)
- if(islist(identifier))
- var/list/special_identifier = identifier
- switch(special_identifier["Type"])
- if("Foodtype")
- var/obj/item/food/food_bait = bait
- return istype(food_bait) && food_bait.foodtypes & special_identifier["Value"]
- if("Reagent")
- return bait.reagents?.has_reagent(special_identifier["Value"], special_identifier["Amount"], check_subtypes = TRUE)
- else
- CRASH("Unknown bait identifier in fish favourite/disliked list")
- else
- return HAS_TRAIT(bait, identifier)
+/// Returns the fish table, with with the unavailable items from fish_counts removed.
+/datum/fish_source/proc/get_fish_table()
+ var/list/table = fish_table.Copy()
+ for(var/result in table)
+ if(fish_counts[result] == 0)
+ table -= result
+ return table
/// Builds a fish weights table modified by bait/rod/user properties
-/datum/fish_source/proc/get_modified_fish_table(obj/item/fishing_rod/rod, mob/fisherman)
+/datum/fish_source/proc/get_modified_fish_table(obj/item/fishing_rod/rod, mob/fisherman, atom/location)
var/obj/item/bait = rod.bait
///An exponent used to level out the difference in probabilities between fishes/mobs on the table depending on bait quality.
var/leveling_exponent = 0
@@ -277,9 +289,9 @@ GLOBAL_LIST(fishing_property_cache)
else if(HAS_TRAIT(bait, TRAIT_BASIC_QUALITY_BAIT))
result_multiplier = 2
leveling_exponent = 0.1
- final_table -= FISHING_DUD
- var/list/fish_list_properties = collect_fish_properties()
+ if(HAS_TRAIT(rod, TRAIT_ROD_REMOVE_FISHING_DUD))
+ final_table -= FISHING_DUD
if(HAS_TRAIT(fisherman, TRAIT_PROFOUND_FISHER) && !fisherman.client)
@@ -289,37 +301,17 @@ GLOBAL_LIST(fishing_property_cache)
final_table[result] += rod.hook?.get_hook_bonus_additive(result)//Decide on order here so it can be multiplicative
if(ispath(result, /obj/item/fish))
- //Modify fish roll chance
- var/obj/item/fish/caught_fish = result
-
if(bait)
final_table[result] = round(final_table[result] * result_multiplier, 1)
- if(!HAS_TRAIT(bait, TRAIT_OMNI_BAIT))
- //Bait matching likes doubles the chance
- var/list/fav_bait = fish_list_properties[result][NAMEOF(caught_fish, favorite_bait)]
- for(var/bait_identifer in fav_bait)
- if(is_matching_bait(bait, bait_identifer))
- final_table[result] *= 2
- //Bait matching dislikes
- var/list/disliked_bait = fish_list_properties[result][NAMEOF(caught_fish, disliked_bait)]
- for(var/bait_identifer in disliked_bait)
- if(is_matching_bait(bait, bait_identifer))
- final_table[result] = round(final_table[result] * 0.5, 1)
+ var/mult = bait.check_bait(result)
+ final_table[result] = round(final_table[result] * mult, 1)
+ if(mult > 1 && HAS_TRAIT(bait, TRAIT_BAIT_ALLOW_FISHING_DUD))
+ final_table -= FISHING_DUD
else
final_table[result] = round(final_table[result] * 0.15, 1) //Fishing without bait is not going to be easy
// Apply fish trait modifiers
- var/list/fish_traits = fish_list_properties[caught_fish][NAMEOF(caught_fish, fish_traits)]
- var/additive_mod = 0
- var/multiplicative_mod = 1
- for(var/fish_trait in fish_traits)
- var/datum/fish_trait/trait = GLOB.fish_traits[fish_trait]
- var/list/mod = trait.catch_weight_mod(rod, fisherman)
- additive_mod += mod[ADDITIVE_FISHING_MOD]
- multiplicative_mod *= mod[MULTIPLICATIVE_FISHING_MOD]
-
- final_table[result] += additive_mod
- final_table[result] = round(final_table[result] * multiplicative_mod, 1)
+ final_table[result] = get_fish_trait_catch_mods(final_table[result], result, rod, fisherman, location)
if(final_table[result] <= 0)
final_table -= result
@@ -343,6 +335,63 @@ GLOBAL_LIST(fishing_property_cache)
return final_table
+/datum/fish_source/proc/get_fish_trait_catch_mods(weight, obj/item/fish/fish, obj/item/fishing_rod/rod, mob/user, atom/location)
+ if(!ispath(fish, /obj/item/fish))
+ return weight
+ var/multiplier = 1
+ for(var/fish_trait in SSfishing.fish_properties[fish][FISH_PROPERTIES_TRAITS])
+ var/datum/fish_trait/trait = GLOB.fish_traits[fish_trait]
+ var/list/mod = trait.catch_weight_mod(rod, user, location, fish)
+ weight += mod[ADDITIVE_FISHING_MOD]
+ multiplier *= mod[MULTIPLICATIVE_FISHING_MOD]
+
+ return round(weight * multiplier, 1)
+
+///returns true if this fishing spot has fish that are shown in the catalog.
+/datum/fish_source/proc/has_known_fishes()
+ for(var/reward in fish_table)
+ if(!ispath(reward, /obj/item/fish))
+ continue
+ var/obj/item/fish/prototype = reward
+ if(initial(prototype.show_in_catalog))
+ return TRUE
+ return FALSE
+
+///Add a string with the names of catchable fishes to the examine text.
+/datum/fish_source/proc/get_catchable_fish_names(mob/user, atom/location, list/examine_text)
+ var/list/known_fishes = list()
+
+ var/obj/item/fishing_rod/rod = user.get_active_held_item()
+ if(!istype(rod))
+ rod = null
+
+ for(var/reward in fish_table)
+ if(!ispath(reward, /obj/item/fish))
+ continue
+ var/obj/item/fish/prototype = reward
+ if(initial(prototype.show_in_catalog))
+ var/init_name = initial(prototype.name)
+ if(rod)
+ var/init_weight = fish_table[reward]
+ var/weight = (rod.bait ? rod.bait.check_bait(prototype) : 1)
+ weight = get_fish_trait_catch_mods(weight, reward, rod, user, location)
+ if(weight > init_weight)
+ init_name = span_bold(init_name)
+ if(weight/init_weight >= 3.5)
+ init_name = "init_name"
+ else if(weight < init_weight)
+ init_name = span_small(reward)
+ known_fishes += init_name
+
+ if(!length(known_fishes))
+ return
+
+ var/info = "You can catch the following fish here"
+
+ if(rod)
+ info = span_tooltip("boldened are the fish you're more likely to catch with your current setup. The opposite is true for smaller names", info)
+ examine_text += span_info("[info]: [english_list(known_fishes)].")
+
/datum/fish_source/proc/spawn_reward_from_explosion(atom/location, severity)
if(!explosive_malus)
explosive_spawn(location, severity)
@@ -360,17 +409,17 @@ GLOBAL_LIST(fishing_property_cache)
explosive_spawn(turf, exploded_turfs[turf], multiplier)
exploded_turfs = null
-/datum/fish_source/proc/explosive_spawn(location, severity, multiplier = 1)
+/datum/fish_source/proc/explosive_spawn(atom/location, severity, multiplier = 1)
for(var/i in 1 to (severity + 2))
if(!prob((100 + 100 * severity)/i * multiplier))
continue
- var/reward_loot = pick_weight(fish_table)
+ var/reward_loot = pick_weight(get_fish_table())
var/atom/movable/reward = simple_dispense_reward(reward_loot, location, location)
if(isnull(reward))
continue
if(isfish(reward))
var/obj/item/fish/fish = reward
- fish.set_status(FISH_DEAD)
+ fish.set_status(FISH_DEAD, silent = TRUE)
if(isitem(reward))
reward.pixel_x = rand(-9, 9)
reward.pixel_y = rand(-9, 9)
diff --git a/code/modules/fishing/sources/source_types.dm b/code/modules/fishing/sources/source_types.dm
index dd5602b12f99d..6aea78b994368 100644
--- a/code/modules/fishing/sources/source_types.dm
+++ b/code/modules/fishing/sources/source_types.dm
@@ -1,17 +1,32 @@
/datum/fish_source/ocean
fish_table = list(
- FISHING_DUD = 15,
- /obj/item/coin/gold = 5,
- /obj/item/fish/clownfish = 15,
- /obj/item/fish/pufferfish = 15,
- /obj/item/fish/cardinal = 15,
- /obj/item/fish/greenchromis = 15,
- /obj/item/fish/lanternfish = 5,
- /obj/item/fish/zipzap = 5,
- /obj/item/fish/clownfish/lube = 3,
+ FISHING_DUD = 10,
+ /obj/effect/spawner/message_in_a_bottle = 4,
+ /obj/item/coin/gold = 6,
+ /obj/item/fish/clownfish = 11,
+ /obj/item/fish/pufferfish = 11,
+ /obj/item/fish/cardinal = 11,
+ /obj/item/fish/greenchromis = 11,
+ /obj/item/fish/squid = 11,
+ /obj/item/fish/stingray = 8,
+ /obj/item/fish/plaice = 8,
+ /obj/item/fish/monkfish = 5,
+ /obj/item/fish/stingray = 10,
+ /obj/item/fish/lanternfish = 7,
+ /obj/item/fish/zipzap = 7,
+ /obj/item/fish/clownfish/lube = 5,
+ /obj/item/fish/swordfish = 5,
+ /obj/item/fish/swordfish = 3,
+ /obj/structure/mystery_box/fishing = 2,
)
fish_counts = list(
/obj/item/fish/clownfish/lube = 2,
+ /obj/item/fish/swordfish = 2,
+ /obj/structure/mystery_box/fishing = 1,
+ )
+ fish_count_regen = list(
+ /obj/item/fish/clownfish/lube = 3 MINUTES,
+ /obj/item/fish/swordfish = 5 MINUTES,
)
fishing_difficulty = FISHING_DEFAULT_DIFFICULTY + 5
explosive_malus = TRUE
@@ -19,12 +34,73 @@
/datum/fish_source/ocean/beach
catalog_description = "Beach shore water"
+/datum/fish_source/ice_fishing
+ catalog_description = "Ice-covered water"
+ fish_table = list(
+ FISHING_DUD = 4,
+ /obj/item/fish/arctic_char = 5,
+ /obj/item/fish/sockeye_salmon = 5,
+ /obj/item/fish/chasm_crab/ice = 2,
+ /obj/item/fish/boned = 1,
+ )
+ fishing_difficulty = FISHING_DEFAULT_DIFFICULTY + 20
+
+/datum/fish_source/river
+ catalog_description = "River water"
+ fish_table = list(
+ FISHING_DUD = 4,
+ /obj/item/fish/goldfish = 5,
+ /obj/item/fish/guppy = 5,
+ /obj/item/fish/perch = 4,
+ /obj/item/fish/angelfish = 4,
+ /obj/item/fish/catfish = 4,
+ /obj/item/fish/perch = 5,
+ /obj/item/fish/slimefish = 2,
+ /obj/item/fish/sockeye_salmon = 1,
+ /obj/item/fish/arctic_char = 1,
+ /obj/item/fish/pike = 1,
+ /obj/item/fish/goldfish/three_eyes = 1,
+ )
+ fish_counts = list(
+ /obj/item/fish/pike = 3,
+ )
+ fish_count_regen = list(
+ /obj/item/fish/pike = 4 MINUTES,
+ )
+ fishing_difficulty = FISHING_DEFAULT_DIFFICULTY + 5
+
+/datum/fish_source/sand
+ catalog_description = "Sand"
+ fish_table = list(
+ FISHING_DUD = 8,
+ /obj/item/fish/sand_crab = 10,
+ /obj/item/fish/sand_surfer = 10,
+ /obj/item/fish/bumpy = 10,
+ /obj/item/coin/gold = 3,
+ )
+ fishing_difficulty = FISHING_DEFAULT_DIFFICULTY + 20
+
+/datum/fish_source/cursed_spring
+ catalog_description = null //it's a secret (sorta, I know you're reading this)
+ fish_table = list(
+ FISHING_DUD = 2,
+ /obj/item/fish/soul = 3,
+ /obj/item/fish/skin_crab = 3,
+ /obj/item/fishing_rod/telescopic/master = 1,
+ )
+ fish_counts = list(
+ /obj/item/fishing_rod/telescopic/master = 1,
+ )
+ fishing_difficulty = FISHING_DEFAULT_DIFFICULTY + 25
+
/datum/fish_source/portal
fish_table = list(
FISHING_DUD = 7,
/obj/item/fish/goldfish = 10,
/obj/item/fish/guppy = 10,
/obj/item/fish/angelfish = 10,
+ /obj/item/fish/perch = 5,
+ /obj/item/fish/goldfish/three_eyes = 3,
)
catalog_description = "Aquarium dimension (Fishing portal generator)"
///The name of this option shown in the radial menu on the fishing portal generator
@@ -36,17 +112,26 @@
/datum/fish_source/portal/beach
fish_table = list(
- FISHING_DUD = 10,
+ FISHING_DUD = 7,
+ /obj/effect/spawner/message_in_a_bottle = 3,
/obj/item/fish/clownfish = 10,
/obj/item/fish/pufferfish = 10,
/obj/item/fish/cardinal = 10,
/obj/item/fish/greenchromis = 10,
+ /obj/item/fish/squid = 8,
+ /obj/item/fish/plaice = 8,
)
catalog_description = "Beach dimension (Fishing portal generator)"
radial_name = "Beach"
radial_state = "palm_beach"
overlay_state = "portal_beach"
+/datum/fish_source/portal/beach/on_fishing_spot_init(datum/component/fishing_spot/spot)
+ ADD_TRAIT(spot.parent, TRAIT_MESSAGE_IN_A_BOTTLE_LOCATION, INNATE_TRAIT)
+
+/datum/fish_source/portal/beach/on_fishing_spot_del(datum/component/fishing_spot/spot)
+ REMOVE_TRAIT(spot.parent, TRAIT_MESSAGE_IN_A_BOTTLE_LOCATION, INNATE_TRAIT)
+
/datum/fish_source/portal/chasm
background = "background_lavaland"
fish_table = list(
@@ -63,7 +148,8 @@
/datum/fish_source/portal/ocean
fish_table = list(
- FISHING_DUD = 5,
+ FISHING_DUD = 3,
+ /obj/effect/spawner/message_in_a_bottle = 2,
/obj/item/fish/lanternfish = 5,
/obj/item/fish/firefish = 5,
/obj/item/fish/dwarf_moonfish = 5,
@@ -71,6 +157,15 @@
/obj/item/fish/needlefish = 5,
/obj/item/fish/armorfish = 5,
/obj/item/fish/zipzap = 5,
+ /obj/item/fish/stingray = 4,
+ /obj/item/fish/monkfish = 4,
+ /obj/item/fish/swordfish = 3,
+ )
+ fish_counts = list(
+ /obj/item/fish/swordfish = 2,
+ )
+ fish_count_regen = list(
+ /obj/item/fish/swordfish = 5 MINUTES,
)
catalog_description = "Ocean dimension (Fishing portal generator)"
fishing_difficulty = FISHING_DEFAULT_DIFFICULTY + 10
@@ -78,6 +173,12 @@
overlay_state = "portal_ocean"
radial_state = "seaboat"
+/datum/fish_source/portal/ocean/on_fishing_spot_init(datum/component/fishing_spot/spot)
+ ADD_TRAIT(spot.parent, TRAIT_MESSAGE_IN_A_BOTTLE_LOCATION, INNATE_TRAIT)
+
+/datum/fish_source/portal/ocean/on_fishing_spot_del(datum/component/fishing_spot/spot)
+ REMOVE_TRAIT(spot.parent, TRAIT_MESSAGE_IN_A_BOTTLE_LOCATION, INNATE_TRAIT)
+
/datum/fish_source/portal/hyperspace
fish_table = list(
FISHING_DUD = 5,
@@ -102,6 +203,16 @@
/obj/item/fish/donkfish = 5,
/obj/item/fish/emulsijack = 5,
/obj/item/fish/jumpercable = 5,
+ /obj/item/fish/chainsawfish = 2,
+ /obj/item/fish/pike/armored = 2,
+ )
+ fish_counts = list(
+ /obj/item/fish/chainsawfish = 1,
+ /obj/item/fish/pike/armored = 1,
+ )
+ fish_count_regen = list(
+ /obj/item/fish/chainsawfish = 7 MINUTES,
+ /obj/item/fish/pike/armored = 7 MINUTES,
)
catalog_description = "Syndicate dimension (Fishing portal generator)"
radial_name = "Syndicate"
@@ -153,8 +264,8 @@
challenge.bait_bounce_mult = clamp(challenge.bait_bounce_mult + (rand(-3, 3) * 0.1), 0.1, 1)
challenge.completion_loss = max(challenge.completion_loss + rand(-2, 2), 0)
challenge.completion_gain = max(challenge.completion_gain + rand(-1, 1), 2)
- challenge.short_jump_velocity_limit += rand(-100, 100)
- challenge.long_jump_velocity_limit += rand(-100, 100)
+ challenge.mover.short_jump_velocity_limit += rand(-100, 100)
+ challenge.mover.long_jump_velocity_limit += rand(-100, 100)
var/static/list/active_effects = bitfield_to_list(FISHING_MINIGAME_ACTIVE_EFFECTS)
for(var/effect in active_effects)
if(prob(30))
@@ -178,7 +289,6 @@
new_traits |= pick_weight(weighted_traits)
caught_fish.inherit_traits(new_traits)
caught_fish.randomize_size_and_weight(deviation = 0.3)
- caught_fish.progenitors = full_capitalize(caught_fish.name)
return caught_fish
@@ -317,16 +427,19 @@
/obj/item/clothing/gloves/bracer = 2,
/obj/effect/decal/remains/human = 2,
/obj/item/fish/mastodon = 1,
+ /obj/item/fishing_rod/telescopic/master = 1,
)
fish_counts = list(
/obj/item/clothing/gloves/bracer = 1,
/obj/effect/decal/remains/human = 1,
/obj/item/fish/mastodon = 1,
+ /obj/item/fishing_rod/telescopic/master = 1,
+ )
+ fish_count_regen = list(
+ /obj/item/fish/mastodon = 8 MINUTES,
)
fishing_difficulty = FISHING_DEFAULT_DIFFICULTY + 15
-#define RANDOM_SEED "Random seed"
-
/datum/fish_source/hydro_tray
catalog_description = "Hydroponics trays"
fish_table = list(
@@ -370,7 +483,7 @@
return ..()
/datum/fish_source/hydro_tray/spawn_reward(reward_path, mob/fisherman, turf/fishing_spot)
- if(reward_path != RANDOM_SEED)
+ if(reward_path != FISHING_RANDOM_SEED)
var/mob/living/created_reward = ..()
if(istype(created_reward))
created_reward.name = "small [created_reward.name]"
@@ -391,5 +504,3 @@
var/picked_path = pick(seeds_to_draw_from)
return new picked_path(get_turf(fishing_spot))
-
-#undef RANDOM_SEED
diff --git a/code/modules/food_and_drinks/machinery/coffeemaker.dm b/code/modules/food_and_drinks/machinery/coffeemaker.dm
index 5fdd296d7fc69..bb532b3162483 100644
--- a/code/modules/food_and_drinks/machinery/coffeemaker.dm
+++ b/code/modules/food_and_drinks/machinery/coffeemaker.dm
@@ -731,7 +731,7 @@
coffeepot.reagents.add_reagent_list(reagent_delta)
qdel(reference_bean)
-
+
// remove the coffee beans from the machine
coffee.Cut(1,2)
coffee_amount--
diff --git a/code/modules/food_and_drinks/machinery/icecream_vat.dm b/code/modules/food_and_drinks/machinery/icecream_vat.dm
index 355601693b9d2..b58af21331eab 100644
--- a/code/modules/food_and_drinks/machinery/icecream_vat.dm
+++ b/code/modules/food_and_drinks/machinery/icecream_vat.dm
@@ -1,5 +1,5 @@
///How many units of a reagent is needed to make a cone.
-#define CONE_REAGENET_NEEDED 1
+#define CONE_REAGENT_NEEDED 1
///The vat is set to dispense ice cream.
#define VAT_MODE_ICECREAM "ice cream"
@@ -242,7 +242,7 @@
///Makes an ice cream cone of the make_type, using ingredients list as reagents used to make it. Puts in user's hand if possible.
/obj/machinery/icecream_vat/proc/make_cone(mob/user, make_type, list/ingredients)
for(var/reagents_needed in ingredients)
- if(!reagents.has_reagent(reagents_needed, CONE_REAGENET_NEEDED))
+ if(!reagents.has_reagent(reagents_needed, CONE_REAGENT_NEEDED))
balloon_alert(user, "not enough ingredients!")
return
var/cone_type = cone_prototypes[make_type].type
@@ -251,7 +251,7 @@
var/obj/item/food/icecream/cone = new cone_type(src)
for(var/reagents_used in ingredients)
- reagents.remove_reagent(reagents_used, CONE_REAGENET_NEEDED)
+ reagents.remove_reagent(reagents_used, CONE_REAGENT_NEEDED)
balloon_alert_to_viewers("cooks up [cone.name]", "cooks up [cone.name]")
try_put_in_hand(cone, user)
@@ -262,14 +262,14 @@
CRASH("[user] was making ice cream of [selected_flavour] but had no flavor datum for it!")
for(var/reagents_needed in flavor.ingredients)
- if(!reagents.has_reagent(reagents_needed, CONE_REAGENET_NEEDED))
+ if(!reagents.has_reagent(reagents_needed, CONE_REAGENT_NEEDED))
balloon_alert(user, "not enough ingredients!")
return
var/should_use_custom_ingredients = (flavor.takes_custom_ingredients && custom_ice_cream_beaker && custom_ice_cream_beaker.reagents.total_volume)
if(flavor.add_flavour(source, should_use_custom_ingredients ? custom_ice_cream_beaker.reagents : null))
for(var/reagents_used in flavor.ingredients)
- reagents.remove_reagent(reagents_used, CONE_REAGENET_NEEDED)
+ reagents.remove_reagent(reagents_used, CONE_REAGENT_NEEDED)
balloon_alert_to_viewers("scoops [selected_flavour]", "scoops [selected_flavour]")
if(istype(cone))
@@ -297,4 +297,4 @@
#undef VAT_MODE_ICECREAM
#undef VAT_MODE_CONES
-#undef CONE_REAGENET_NEEDED
+#undef CONE_REAGENT_NEEDED
diff --git a/code/modules/food_and_drinks/machinery/microwave.dm b/code/modules/food_and_drinks/machinery/microwave.dm
index 2b790306b5ac7..4fa586401ff56 100644
--- a/code/modules/food_and_drinks/machinery/microwave.dm
+++ b/code/modules/food_and_drinks/machinery/microwave.dm
@@ -416,32 +416,7 @@
balloon_alert(user, "max 1 device!")
return ITEM_INTERACT_BLOCKING
- if(istype(item, /obj/item/storage))
- var/obj/item/storage/tray = item
- var/loaded = 0
-
- if(!istype(item, /obj/item/storage/bag/tray))
- // Non-tray dumping requires a do_after
- to_chat(user, span_notice("You start dumping out the contents of [item] into [src]..."))
- if(!do_after(user, 2 SECONDS, target = tray))
- return ITEM_INTERACT_BLOCKING
-
- for(var/obj/tray_item in tray.contents)
- if(!IS_EDIBLE(tray_item))
- continue
- if(ingredients.len >= max_n_of_items)
- balloon_alert(user, "it's full!")
- return ITEM_INTERACT_BLOCKING
- if(tray.atom_storage.attempt_remove(tray_item, src))
- loaded++
- ingredients += tray_item
- if(loaded)
- open(autoclose = 0.6 SECONDS)
- to_chat(user, span_notice("You insert [loaded] items into \the [src]."))
- update_appearance()
- return ITEM_INTERACT_SUCCESS
-
- if(item.w_class <= WEIGHT_CLASS_NORMAL && !user.combat_mode)
+ if(item.w_class <= WEIGHT_CLASS_NORMAL && !user.combat_mode && isnull(item.atom_storage))
if(ingredients.len >= max_n_of_items)
balloon_alert(user, "it's full!")
return ITEM_INTERACT_BLOCKING
@@ -455,6 +430,43 @@
update_appearance()
return ITEM_INTERACT_SUCCESS
+/obj/machinery/microwave/item_interaction_secondary(mob/living/user, obj/item/tool, list/modifiers)
+ if (isnull(tool.atom_storage))
+ return
+ handle_dumping(user, tool)
+ return ITEM_INTERACT_BLOCKING
+
+/obj/machinery/microwave/proc/handle_dumping(mob/living/user, obj/item/tool)
+ if(isnull(tool.atom_storage))
+ return
+
+ var/loaded = 0
+ if(!istype(tool, /obj/item/storage/bag/tray))
+ // Non-tray dumping requires a do_after
+ to_chat(user, span_notice("You start dumping out the contents of [tool] into [src]..."))
+ if(!do_after(user, 2 SECONDS, target = tool))
+ return
+
+ for(var/obj/tray_item in tool.contents)
+ if(!IS_EDIBLE(tray_item))
+ continue
+ if(ingredients.len >= max_n_of_items)
+ balloon_alert(user, "it's full!")
+ return
+ if(tool.atom_storage.attempt_remove(tray_item, src))
+ loaded++
+ ingredients += tray_item
+
+ if(loaded)
+ open(autoclose = 0.6 SECONDS)
+ to_chat(user, span_notice("You insert [loaded] items into \the [src]."))
+ update_appearance()
+
+/obj/machinery/microwave/mouse_drop_receive(obj/item/tool, mob/user, params)
+ if (!istype(tool) || isnull(tool.atom_storage))
+ return
+ handle_dumping(user, tool)
+
/obj/machinery/microwave/attack_hand_secondary(mob/user, list/modifiers)
if(user.can_perform_action(src, ALLOW_SILICON_REACH))
if(!length(ingredients))
diff --git a/code/modules/food_and_drinks/machinery/smartfridge.dm b/code/modules/food_and_drinks/machinery/smartfridge.dm
index a8d07dc8d8769..1dca29b950422 100644
--- a/code/modules/food_and_drinks/machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/machinery/smartfridge.dm
@@ -343,7 +343,7 @@
if(ismob(weapon.loc))
var/mob/owner = weapon.loc
if(!owner.transferItemToLoc(weapon, src))
- to_chat(usr, span_warning("\the [weapon] is stuck to your hand, you cannot put it in \the [src]!"))
+ to_chat(owner, span_warning("\the [weapon] is stuck to your hand, you cannot put it in \the [src]!"))
return FALSE
return TRUE
else
@@ -396,43 +396,39 @@
if(. || !ui.user.can_perform_action(src, FORBID_TELEKINESIS_REACH))
return
- . = TRUE
var/mob/living_mob = ui.user
switch(action)
if("Release")
var/amount = text2num(params["amount"])
- var/desired = 1
+ if(isnull(amount) || !isnum(amount))
+ return TRUE
var/dispensed_amount = 0
if(isAI(living_mob))
to_chat(living_mob, span_warning("[src] does not respect your authority!"))
- return
-
- if (amount > 1)
- desired = tgui_input_number(living_mob, "How many items would you like to take out?", "Release", default = min(amount, 50), max_value = min(amount, 50))
- if(!desired)
- return
+ return TRUE
- for(var/obj/item/dispensed_item in src)
- if(desired <= 0)
+ for(var/obj/item/dispensed_item in contents)
+ if(amount <= 0)
break
var/item_name = "[dispensed_item.type]-[replacetext(replacetext(dispensed_item.name, "\proper", ""), "\improper", "")]"
- if(params["path"] == item_name)
- if(dispensed_item in component_parts)
- CRASH("Attempted removal of [dispensed_item] component_part from smartfridge via smartfridge interface.")
- //dispense the item
- if(!living_mob.put_in_hands(dispensed_item))
- dispensed_item.forceMove(drop_location())
- adjust_item_drop_location(dispensed_item)
- use_energy(active_power_usage)
- dispensed_amount++
- desired--
+ if(params["path"] != item_name)
+ continue
+ if(dispensed_item in component_parts)
+ CRASH("Attempted removal of [dispensed_item] component_part from smartfridge via smartfridge interface.")
+ //dispense the item
+ if(!living_mob.put_in_hands(dispensed_item))
+ dispensed_item.forceMove(drop_location())
+ adjust_item_drop_location(dispensed_item)
+ use_energy(active_power_usage)
+ dispensed_amount++
+ amount--
if(dispensed_amount && vend_sound)
playsound(src, vend_sound, 50, TRUE, extrarange = -3)
if (visible_contents)
update_appearance()
- return
+ return TRUE
return FALSE
@@ -480,15 +476,16 @@
.["isdryer"] = TRUE
.["drying"] = drying
-/obj/machinery/smartfridge/drying/ui_act(action, params)
+/obj/machinery/smartfridge/drying/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
update_appearance() // This is to handle a case where the last item is taken out manually instead of through drying pop-out
return
+ var/mob/user = ui.user
switch(action)
if("Dry")
- toggle_drying(FALSE, usr)
+ toggle_drying(FALSE, user)
return TRUE
/obj/machinery/smartfridge/drying/powered()
diff --git a/code/modules/food_and_drinks/recipes/processor_recipes.dm b/code/modules/food_and_drinks/recipes/processor_recipes.dm
index 3ff29e194c719..14f93b45cd8dc 100644
--- a/code/modules/food_and_drinks/recipes/processor_recipes.dm
+++ b/code/modules/food_and_drinks/recipes/processor_recipes.dm
@@ -139,3 +139,7 @@
output = /obj/item/popsicle_stick
food_multiplier = 3
preserve_materials = FALSE
+
+/datum/food_processor_process/canned_ink
+ input = /obj/item/food/ink_sac
+ output = /obj/item/food/canned/squid_ink
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm
index e5589fcc42d43..5a754361ffb1f 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_drink.dm
@@ -1,6 +1,10 @@
// This is the home of drink related tablecrafting recipes, I have opted to only let players bottle fancy boozes to reduce the number of entries.
+///Abstract types for all drink recipes that use bottles and result in another bottle, so that the message_in_a_bottle item is properly transferred.
+/datum/crafting_recipe/bottled
+ parts = list(/obj/item/reagent_containers/cup/glass/bottle = 1)
+
///////////////// Booze & Bottles ///////////////////
/datum/crafting_recipe/lizardwine
@@ -14,7 +18,7 @@
result = /obj/item/reagent_containers/cup/glass/bottle/lizardwine
category = CAT_DRINK
-/datum/crafting_recipe/moonshinejug
+/datum/crafting_recipe/bottled/moonshinejug
name = "Moonshine Jug"
time = 30
reqs = list(
@@ -24,7 +28,7 @@
result = /obj/item/reagent_containers/cup/glass/bottle/moonshine
category = CAT_DRINK
-/datum/crafting_recipe/hoochbottle
+/datum/crafting_recipe/bottled/hoochbottle
name = "Hooch Bottle"
time = 30
reqs = list(
@@ -35,7 +39,7 @@
result = /obj/item/reagent_containers/cup/glass/bottle/hooch
category = CAT_DRINK
-/datum/crafting_recipe/blazaambottle
+/datum/crafting_recipe/bottled/blazaambottle
name = "Blazaam Bottle"
time = 20
reqs = list(
@@ -45,7 +49,7 @@
result = /obj/item/reagent_containers/cup/glass/bottle/blazaam
category = CAT_DRINK
-/datum/crafting_recipe/champagnebottle
+/datum/crafting_recipe/bottled/champagnebottle
name = "Champagne Bottle"
time = 30
reqs = list(
@@ -55,7 +59,7 @@
result = /obj/item/reagent_containers/cup/glass/bottle/champagne
category = CAT_DRINK
-/datum/crafting_recipe/trappistbottle
+/datum/crafting_recipe/bottled/trappistbottle
name = "Trappist Bottle"
time = 15
reqs = list(
@@ -65,7 +69,7 @@
result = /obj/item/reagent_containers/cup/glass/bottle/trappist
category = CAT_DRINK
-/datum/crafting_recipe/goldschlagerbottle
+/datum/crafting_recipe/bottled/goldschlagerbottle
name = "Goldschlager Bottle"
time = 30
reqs = list(
@@ -75,7 +79,7 @@
result = /obj/item/reagent_containers/cup/glass/bottle/goldschlager
category = CAT_DRINK
-/datum/crafting_recipe/patronbottle
+/datum/crafting_recipe/bottled/patronbottle
name = "Patron Bottle"
time = 30
reqs = list(
@@ -87,7 +91,7 @@
////////////////////// Non-alcoholic recipes ///////////////////
-/datum/crafting_recipe/holybottle
+/datum/crafting_recipe/bottled/holybottle
name = "Holy Water Flask"
time = 30
reqs = list(
@@ -99,7 +103,7 @@
//flask of unholy water is a beaker for some reason, I will try making it a bottle and add it here once the antag freeze is over. t. kryson
-/datum/crafting_recipe/nothingbottle
+/datum/crafting_recipe/bottled/nothingbottle
name = "Nothing Bottle"
time = 30
reqs = list(
@@ -116,7 +120,7 @@
reqs = list(/obj/item/stack/sheet/cardboard = 1)
category = CAT_CONTAINERS
-/datum/crafting_recipe/candycornliquor
+/datum/crafting_recipe/bottled/candycornliquor
name = "candy corn liquor"
result = /obj/item/reagent_containers/cup/glass/bottle/candycornliquor
time = 30
@@ -125,7 +129,7 @@
/obj/item/reagent_containers/cup/glass/bottle = 1)
category = CAT_DRINK
-/datum/crafting_recipe/kong
+/datum/crafting_recipe/bottled/kong
name = "Kong"
result = /obj/item/reagent_containers/cup/glass/bottle/kong
time = 30
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm
index ec8eda8d3cfff..7b8c071b3a539 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_egg.dm
@@ -13,7 +13,7 @@
category = CAT_EGG
/datum/crafting_recipe/food/omelette
- name = "Omelette"
+ name = "Omelette du fromage"
reqs = list(
/obj/item/food/egg = 2,
/obj/item/food/cheese/wedge = 2
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_lizard.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_lizard.dm
index 71716a1ee7c2a..7b253f32ce17d 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_lizard.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_lizard.dm
@@ -74,7 +74,8 @@
/obj/item/food/grown/garlic = 1,
/datum/reagent/consumable/lemonjuice = 3,
/datum/reagent/consumable/blackpepper = 2,
- /datum/reagent/consumable/nutriment/fat/oil/olive = 3
+ /datum/reagent/consumable/nutriment/fat/oil/olive = 3,
+ /obj/item/reagent_containers/cup/bowl = 1,
)
result = /obj/item/food/lizard_escargot
category = CAT_LIZARD
@@ -94,7 +95,8 @@
reqs = list(
/obj/item/food/fries = 1,
/obj/item/food/meat/cutlet = 2,
- /datum/reagent/consumable/bbqsauce = 5
+ /datum/reagent/consumable/bbqsauce = 5,
+ /obj/item/plate = 1,
)
result = /obj/item/food/lizard_fries
category = CAT_LIZARD
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_martian.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_martian.dm
index 02bb9ae7bf82c..9048964df1c7c 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_martian.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_martian.dm
@@ -45,6 +45,7 @@
/obj/item/food/grown/onion = 1,
/datum/reagent/consumable/sugar = 3,
/datum/reagent/consumable/limejuice = 3,
+ /obj/item/reagent_containers/cup/bowl = 1,
)
result = /obj/item/food/sambal
category = CAT_MARTIAN
@@ -78,6 +79,7 @@
/obj/item/food/meat/cutlet = 1,
/obj/item/food/pineappleslice = 1,
/datum/reagent/consumable/soysauce = 3,
+ /obj/item/reagent_containers/cup/bowl = 1,
)
result = /obj/item/food/salad/hurricane_rice
category = CAT_MARTIAN
@@ -91,6 +93,7 @@
/obj/item/food/onion_slice = 1,
/obj/item/food/sausage = 1,
/obj/item/food/grown/chili = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
)
result = /obj/item/food/salad/ikareis
category = CAT_MARTIAN
@@ -103,7 +106,8 @@
/obj/item/food/grown/bell_pepper = 1,
/obj/item/food/pineappleslice = 1,
/obj/item/food/onion_slice = 1,
- /datum/reagent/consumable/soysauce = 5
+ /datum/reagent/consumable/soysauce = 5,
+ /obj/item/reagent_containers/cup/bowl = 1,
)
result = /obj/item/food/salad/hawaiian_fried_rice
category = CAT_MARTIAN
@@ -118,6 +122,7 @@
/obj/item/food/grown/peas = 1,
/datum/reagent/consumable/ketchup = 5,
/datum/reagent/consumable/worcestershire = 2,
+ /obj/item/reagent_containers/cup/bowl = 1,
)
result = /obj/item/food/salad/ketchup_fried_rice
category = CAT_MARTIAN
@@ -131,6 +136,7 @@
/obj/item/food/cheese/firm_cheese_slice = 1,
/obj/item/food/grown/olive = 1,
/obj/item/food/meatball = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
)
result = /obj/item/food/salad/mediterranean_fried_rice
category = CAT_MARTIAN
@@ -141,6 +147,7 @@
/obj/item/food/boiledrice = 1,
/obj/item/food/egg = 1,
/datum/reagent/consumable/soysauce = 3,
+ /obj/item/reagent_containers/cup/bowl = 1,
)
result = /obj/item/food/salad/egg_fried_rice
category = CAT_MARTIAN
@@ -154,6 +161,7 @@
/obj/item/food/meat/cutlet = 1,
/obj/item/food/kimchi = 1,
/obj/item/food/egg = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
)
result = /obj/item/food/salad/bibimbap
category = CAT_MARTIAN
@@ -167,6 +175,7 @@
/obj/item/food/grown/garlic = 1,
/obj/item/food/onion_slice = 1,
/datum/reagent/consumable/nutriment/soup/teriyaki = 4,
+ /obj/item/reagent_containers/cup/bowl = 1,
)
result = /obj/item/food/salad/bulgogi_noodles
category = CAT_MARTIAN
@@ -180,6 +189,7 @@
/obj/item/food/onion_slice = 1,
/obj/item/food/katsu_fillet = 1,
/datum/reagent/consumable/worcestershire = 3,
+ /obj/item/reagent_containers/cup/bowl = 1,
)
result = /obj/item/food/salad/yakisoba_katsu
category = CAT_MARTIAN
@@ -194,6 +204,7 @@
/obj/item/food/egg = 1,
/datum/reagent/consumable/soysauce = 3,
/datum/reagent/consumable/red_bay = 3,
+ /obj/item/reagent_containers/cup/bowl = 1,
)
result = /obj/item/food/salad/martian_fried_noodles
category = CAT_MARTIAN
@@ -203,6 +214,7 @@
reqs = list(
/obj/item/food/spaghetti/boilednoodles = 1,
/datum/reagent/consumable/soysauce = 3,
+ /obj/item/reagent_containers/cup/bowl = 1,
)
result = /obj/item/food/salad/simple_fried_noodles
category = CAT_MARTIAN
@@ -222,6 +234,7 @@
/obj/item/food/grown/onion = 1,
/obj/item/food/grown/carrot = 1,
/obj/item/food/grown/potato = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
)
result = /obj/item/food/salad/setagaya_curry
category = CAT_MARTIAN
@@ -545,6 +558,7 @@
/obj/item/food/meat/slab/chicken = 1,
/datum/reagent/consumable/coconut_milk = 5,
/datum/reagent/consumable/curry_powder = 3,
+ /obj/item/reagent_containers/cup/bowl = 1,
)
result = /obj/item/food/salad/po_kok_gai
category = CAT_MARTIAN
@@ -579,6 +593,7 @@
/obj/item/food/grown/tomato = 1,
/obj/item/food/uncooked_rice = 1,
/datum/reagent/blood = 5,
+ /obj/item/reagent_containers/cup/bowl = 1,
)
result = /obj/item/food/salad/galinha_de_cabidela
category = CAT_MARTIAN
@@ -589,6 +604,7 @@
/obj/item/food/katsu_fillet = 1,
/obj/item/food/boiledrice = 1,
/datum/reagent/consumable/nutriment/soup/curry_sauce = 5,
+ /obj/item/reagent_containers/cup/bowl = 1,
)
result = /obj/item/food/salad/katsu_curry
category = CAT_MARTIAN
@@ -600,6 +616,7 @@
/obj/item/food/onion_slice = 1,
/obj/item/food/boiledrice = 1,
/datum/reagent/consumable/nutriment/soup/dashi = 5,
+ /obj/item/reagent_containers/cup/bowl = 1,
)
result = /obj/item/food/salad/beef_bowl
category = CAT_MARTIAN
@@ -613,6 +630,7 @@
/obj/item/food/boiledrice = 1,
/datum/reagent/consumable/salt = 2,
/datum/reagent/consumable/nutriment/soup/curry_sauce = 5,
+ /obj/item/reagent_containers/cup/bowl = 1,
)
result = /obj/item/food/salad/salt_chilli_bowl
category = CAT_MARTIAN
@@ -625,6 +643,7 @@
/obj/item/food/grown/onion = 1,
/obj/item/food/boiledrice = 1,
/datum/reagent/consumable/nutriment/soup/dashi = 5,
+ /obj/item/reagent_containers/cup/bowl = 1,
)
result = /obj/item/food/salad/kansai_bowl
category = CAT_MARTIAN
@@ -637,6 +656,7 @@
/obj/item/food/fishmeat = 1,
/obj/item/food/boiledrice = 1,
/datum/reagent/consumable/cafe_latte = 5,
+ /obj/item/reagent_containers/cup/bowl = 1,
)
result = /obj/item/food/salad/eigamudo_curry
category = CAT_MARTIAN
@@ -681,6 +701,7 @@
/datum/reagent/consumable/caramel = 2,
/obj/item/food/icecream = 1,
/datum/reagent/consumable/ethanol/rum = 2,
+ /obj/item/reagent_containers/cup/bowl = 1,
)
result = /obj/item/food/salad/pineapple_foster
category = CAT_MARTIAN
@@ -848,6 +869,7 @@
/obj/item/food/fishmeat = 1,
/obj/item/food/boiledrice = 1,
/datum/reagent/consumable/nutriment/soup/dashi = 5,
+ /obj/item/reagent_containers/cup/bowl = 1,
)
result = /obj/item/food/salad/sprout_bowl
category = CAT_MARTIAN
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
index 98eafb66823df..804956cbeed5b 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
@@ -243,6 +243,7 @@
/obj/item/food/grown/onion = 1,
/obj/item/food/grown/tomato = 1,
/obj/item/food/meat/steak = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
)
result = /obj/item/food/beef_stroganoff
category = CAT_MEAT
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm
index 8778ee976ef25..840d3a8c08b1a 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_mexican.dm
@@ -120,7 +120,8 @@
/obj/item/food/cornchips = 1,
/obj/item/food/grown/chili = 1,
/obj/item/food/grown/onion = 1,
- /obj/item/food/grown/tomato = 1
+ /obj/item/food/grown/tomato = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
)
result = /obj/item/food/chipsandsalsa
category = CAT_MEXICAN
@@ -198,6 +199,7 @@
/obj/item/food/grown/tomato = 1,
/obj/item/food/grown/onion = 1,
/obj/item/food/grown/chili = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
)
result = /obj/item/food/pineapple_salsa
category = CAT_MEXICAN
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_moth.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_moth.dm
index bb20f4ab0b370..aeb27f026b251 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_moth.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_moth.dm
@@ -2,7 +2,8 @@
name = "Herby cheese"
reqs = list(
/obj/item/food/cheese/curd_cheese = 1,
- /obj/item/food/grown/herbs = 4
+ /obj/item/food/grown/herbs = 4,
+ /obj/item/reagent_containers/cup/bowl = 1,
)
result = /obj/item/food/herby_cheese
category = CAT_MOTH
@@ -187,7 +188,8 @@
reqs = list(
/datum/reagent/consumable/nutriment/soup/rice_porridge = 10,
/obj/item/food/meat/bacon = 1,
- /obj/item/food/friedegg = 2
+ /obj/item/food/friedegg = 2,
+ /obj/item/reagent_containers/cup/bowl = 1,
)
result = /obj/item/food/bowled/hua_mulan_congee
category = CAT_MOTH
@@ -199,7 +201,8 @@
/obj/item/food/grown/eggplant = 1,
/obj/item/food/breadslice/plain = 2,
/obj/item/food/tomato_sauce = 1,
- /obj/item/food/cheese/mozzarella = 1
+ /obj/item/food/cheese/mozzarella = 1,
+ /obj/item/reagent_containers/cup/bowl = 1,
)
result = /obj/item/food/bowled/fried_eggplant_polenta
category = CAT_MOTH
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm
index 376c1d4f84509..c965526bcb1c6 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm
@@ -604,6 +604,16 @@
result = /obj/item/food/cherrycupcake/blue
category = CAT_PASTRY
+/datum/crafting_recipe/food/jupitercupcake
+ name = "Jupiter-cup-cake"
+ reqs = list(
+ /obj/item/food/pastrybase = 1,
+ /obj/item/food/grown/mushroom/jupitercup = 1,
+ /datum/reagent/consumable/caramel = 3,
+ )
+ result = /obj/item/food/jupitercupcake
+ category = CAT_PASTRY
+
/datum/crafting_recipe/food/honeybun
name = "Honey bun"
reqs = list(
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm
index 589235eacb70c..edf82287373f0 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_spaghetti.dm
@@ -44,7 +44,7 @@
/obj/item/reagent_containers/cup/bowl = 1,
/obj/item/food/spaghetti/boiledspaghetti = 1,
/obj/item/food/meat/cutlet = 2,
- /obj/item/food/grown/cabbage = 1
+ /obj/item/food/grown/cabbage = 1,
)
result = /obj/item/food/spaghetti/beefnoodle
category = CAT_SPAGHETTI
@@ -157,3 +157,15 @@
)
result = /obj/item/food/spaghetti/pad_thai
category = CAT_SPAGHETTI
+
+/datum/crafting_recipe/food/carbonara
+ name = "Spaghetti Carbonara"
+ reqs = list(
+ /obj/item/food/spaghetti/boiledspaghetti = 1,
+ /obj/item/food/cheese/firm_cheese_slice = 1,
+ /obj/item/food/meat/bacon = 1,
+ /obj/item/food/egg = 1,
+ /datum/reagent/consumable/blackpepper = 2,
+ )
+ result = /obj/item/food/spaghetti/carbonara
+ category = CAT_SPAGHETTI
diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm
index b98d66f6bd2c7..1107c8c25793a 100644
--- a/code/modules/holodeck/computer.dm
+++ b/code/modules/holodeck/computer.dm
@@ -146,10 +146,10 @@ GLOBAL_LIST_INIT(typecache_holodeck_linked_floorcheck_ok, typecacheof(list(/turf
data["emagged"] = TRUE
data["emag_programs"] = emag_programs
data["program"] = program
- data["can_toggle_safety"] = issilicon(user) || isAdminGhostAI(user)
+ data["can_toggle_safety"] = HAS_SILICON_ACCESS(user)
return data
-/obj/machinery/computer/holodeck/ui_act(action, params)
+/obj/machinery/computer/holodeck/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm
index 52df09c29cdf8..3549b3e965f48 100644
--- a/code/modules/hydroponics/biogenerator.dm
+++ b/code/modules/hydroponics/biogenerator.dm
@@ -526,7 +526,7 @@
return data
-/obj/machinery/biogenerator/ui_act(action, list/params)
+/obj/machinery/biogenerator/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm
index 9d1d802916bff..9af495f6a6128 100644
--- a/code/modules/hydroponics/grown/mushrooms.dm
+++ b/code/modules/hydroponics/grown/mushrooms.dm
@@ -205,11 +205,11 @@
to_chat(user, span_notice("You hollow up the chanterelle with [I]."))
remove_item_from_storage(user)
- qdel(src)
if(seed.resistance_flags & FIRE_PROOF)
user.put_in_hands(new /obj/item/clothing/head/wizard/chanterelle/fr())
else
user.put_in_hands(new /obj/item/clothing/head/wizard/chanterelle())
+ qdel(src)
//Jupiter Cup
/obj/item/seeds/chanter/jupitercup
diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm
index ed17254fa9b05..041ff97b73cee 100644
--- a/code/modules/hydroponics/hydroponics.dm
+++ b/code/modules/hydroponics/hydroponics.dm
@@ -157,6 +157,11 @@
icon = 'icons/obj/service/hydroponics/equipment.dmi'
icon_state = "hydrotray3"
+/obj/machinery/hydroponics/constructable/fullupgrade
+ name = "deluxe hydroponics tray"
+ desc = "A basin used to grown plants in, packed full of cutting-edge technology."
+ circuit = /obj/item/circuitboard/machine/hydroponics/fullupgrade
+
/obj/machinery/hydroponics/constructable/Initialize(mapload)
. = ..()
AddComponent(/datum/component/simple_rotation)
diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm
index f59adad783968..aa63f5d41f13b 100644
--- a/code/modules/hydroponics/plant_genes.dm
+++ b/code/modules/hydroponics/plant_genes.dm
@@ -202,7 +202,7 @@
return
RegisterSignal(our_plant, COMSIG_PLANT_ON_SLIP, PROC_REF(squash_plant))
- RegisterSignal(our_plant, COMSIG_MOVABLE_IMPACT, PROC_REF(squash_plant))
+ RegisterSignal(our_plant, COMSIG_MOVABLE_IMPACT, PROC_REF(squash_plant_if_not_caught))
RegisterSignal(our_plant, COMSIG_ITEM_ATTACK_SELF, PROC_REF(squash_plant))
/*
@@ -239,6 +239,10 @@
qdel(our_plant)
+/datum/plant_gene/trait/squash/proc/squash_plant_if_not_caught(datum/source, atom/hit_atom, datum/thrownthing/throwing_datum, caught)
+ if(!caught)
+ squash_plant(source, hit_atom)
+
/*
* Makes plant slippery, unless it has a grown-type trash. Then the trash gets slippery.
* Applies other trait effects (teleporting, etc) to the target by signal.
diff --git a/code/modules/hydroponics/seed_extractor.dm b/code/modules/hydroponics/seed_extractor.dm
index c558cba8b3eab..93d9cc0aea773 100644
--- a/code/modules/hydroponics/seed_extractor.dm
+++ b/code/modules/hydroponics/seed_extractor.dm
@@ -276,7 +276,7 @@
data["trait_db"] += trait_data
return data
-/obj/machinery/seed_extractor/ui_act(action, params)
+/obj/machinery/seed_extractor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/instruments/items.dm b/code/modules/instruments/items.dm
index 170000eb11557..f0176e6453092 100644
--- a/code/modules/instruments/items.dm
+++ b/code/modules/instruments/items.dm
@@ -27,7 +27,7 @@
if(!ismob(music_player))
return STOP_PLAYING
var/mob/user = music_player
- if(user.incapacitated() || !((loc == user) || (isturf(loc) && Adjacent(user)))) // sorry, no more TK playing.
+ if(user.incapacitated || !((loc == user) || (isturf(loc) && Adjacent(user)))) // sorry, no more TK playing.
return STOP_PLAYING
/obj/item/instrument/suicide_act(mob/living/user)
diff --git a/code/modules/jobs/job_types/bartender.dm b/code/modules/jobs/job_types/bartender.dm
index 13a4162ff3be9..c0f200c82f7b6 100644
--- a/code/modules/jobs/job_types/bartender.dm
+++ b/code/modules/jobs/job_types/bartender.dm
@@ -59,6 +59,8 @@
glasses = /obj/item/clothing/glasses/sunglasses/reagent
shoes = /obj/item/clothing/shoes/laceup
+ skillchips = list(/obj/item/skillchip/drunken_brawler)
+
/datum/outfit/job/bartender/post_equip(mob/living/carbon/human/H, visualsOnly)
. = ..()
diff --git a/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm b/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm
index b02dee12cf826..dd7208d170618 100644
--- a/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm
+++ b/code/modules/jobs/job_types/chaplain/chaplain_nullrod.dm
@@ -586,11 +586,10 @@
AddComponent(/datum/component/two_handed, \
force_unwielded = 14, \
force_wielded = 18, \
- icon_wielded = "[base_icon_state]1", \
)
/obj/item/nullrod/bostaff/update_icon_state()
- icon_state = "[base_icon_state]0"
+ icon_state = inhand_icon_state = "[base_icon_state][HAS_TRAIT(src, TRAIT_WIELDED)]"
return ..()
@@ -706,6 +705,28 @@
hitsound = 'sound/weapons/bladeslice.ogg'
menu_description = "A pointy spear which penetrates armor a little. Can be worn only on the belt."
+// Unholy version of above, since the gamemode is dead in the water
+
+/obj/item/brass_spear
+ name = "dull brass spear"
+ desc = "An ancient spear made of brass. The point seems sharp, but it feels so dull.. you get a feeling brass isn't good nonmagical material for a weapon."
+ icon = 'icons/obj/weapons/spear.dmi'
+ icon_state = "ratvarian_spear"
+ inhand_icon_state = "ratvarian_spear"
+ lefthand_file = 'icons/mob/inhands/antag/clockwork_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/antag/clockwork_righthand.dmi'
+ slot_flags = ITEM_SLOT_BELT
+ force = 15
+ throw_speed = 3
+ throw_range = 7
+ throwforce = 15
+ armour_penetration = 10
+ sharpness = SHARP_POINTY
+ w_class = WEIGHT_CLASS_HUGE
+ attack_verb_continuous = list("stabs", "pokes", "slashes", "clocks")
+ attack_verb_simple = list("stab", "poke", "slash", "clock")
+ hitsound = 'sound/weapons/bladeslice.ogg'
+
// Nullblade - For when you really want to feel like rolling dice during combat
/obj/item/nullrod/nullblade
diff --git a/code/modules/jobs/job_types/curator.dm b/code/modules/jobs/job_types/curator.dm
index e2eb35af5497e..93475fdc79e23 100644
--- a/code/modules/jobs/job_types/curator.dm
+++ b/code/modules/jobs/job_types/curator.dm
@@ -47,7 +47,7 @@
/obj/item/choice_beacon/hero = 1,
)
belt = /obj/item/modular_computer/pda/curator
- ears = /obj/item/radio/headset/headset_srv
+ ears = /obj/item/radio/headset/headset_srvent
shoes = /obj/item/clothing/shoes/laceup
l_pocket = /obj/item/laser_pointer/green
r_pocket = /obj/item/key/displaycase
@@ -55,6 +55,18 @@
accessory = /obj/item/clothing/accessory/pocketprotector/full
+/datum/outfit/job/curator/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+ if(visualsOnly)
+ return ..()
+
+ /// There can be only one cameraman on this station, and no, not that kind
+ var/static/cameraman_choosen = FALSE
+ if(!cameraman_choosen)
+ backpack_contents[/obj/item/broadcast_camera] = 1
+ cameraman_choosen = TRUE
+ return ..()
+
+
/datum/outfit/job/curator/post_equip(mob/living/carbon/human/translator, visualsOnly = FALSE)
..()
diff --git a/code/modules/jobs/job_types/mime.dm b/code/modules/jobs/job_types/mime.dm
index eba86ec2af07a..46090cdbe30ac 100644
--- a/code/modules/jobs/job_types/mime.dm
+++ b/code/modules/jobs/job_types/mime.dm
@@ -131,7 +131,7 @@
return FALSE
if(!user.is_holding(src))
return FALSE
- if(user.incapacitated())
+ if(user.incapacitated)
return FALSE
if(!user.mind)
return FALSE
diff --git a/code/modules/language/_language_manuals.dm b/code/modules/language/_language_manuals.dm
index eb4ca456440d8..7a4298a06b150 100644
--- a/code/modules/language/_language_manuals.dm
+++ b/code/modules/language/_language_manuals.dm
@@ -85,6 +85,14 @@
. = ..()
name = "extended [initial(language.name)] manual"
+/obj/item/language_manual/piratespeak
+ name = "\improper Captain Pete's Guide to Pirate Lingo"
+ icon_state = "book_pirate"
+ desc = "A book containing all the knowledge, jargon and buzzwords to speak like a true old salt."
+ language = /datum/language/piratespeak
+ flavour_text = "Blimey! I feel less of a landlubber now."
+ charges = 5
+
// So drones can teach borgs and AI dronespeak. For best effect, combine with mother drone lawset.
/obj/item/language_manual/dronespeak_manual
name = "dronespeak manual"
diff --git a/code/modules/language/_language_menu.dm b/code/modules/language/_language_menu.dm
index 0bfb7a79977af..905be8169e26a 100644
--- a/code/modules/language/_language_menu.dm
+++ b/code/modules/language/_language_menu.dm
@@ -56,7 +56,7 @@
return data
-/datum/language_menu/ui_act(action, params)
+/datum/language_menu/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/library/bibles.dm b/code/modules/library/bibles.dm
index 5221dc8047422..0c6a1aad71d63 100644
--- a/code/modules/library/bibles.dm
+++ b/code/modules/library/bibles.dm
@@ -186,7 +186,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list(
return FALSE
if(!istype(user) || !user.is_holding(src))
return FALSE
- if(user.incapacitated())
+ if(user.incapacitated)
return FALSE
if(user.mind?.holy_role != HOLY_ROLE_HIGHPRIEST)
return FALSE
diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm
index a65159a3f8225..35def980eb922 100644
--- a/code/modules/library/lib_machines.dm
+++ b/code/modules/library/lib_machines.dm
@@ -80,7 +80,7 @@ GLOBAL_VAR_INIT(library_table_modified, 0)
data["params_changed"] = params_changed
return data
-/obj/machinery/computer/libraryconsole/ui_act(action, params)
+/obj/machinery/computer/libraryconsole/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
@@ -424,7 +424,7 @@ GLOBAL_VAR_INIT(library_table_modified, 0)
scanner = WEAKREF(foundya)
return foundya
-/obj/machinery/computer/libraryconsole/bookmanagement/ui_act(action, params)
+/obj/machinery/computer/libraryconsole/bookmanagement/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
//The parent call takes care of stuff like searching, don't forget about that yeah?
. = ..()
if(.)
diff --git a/code/modules/library/skill_learning/generic_skillchips/matrix_flip.dm b/code/modules/library/skill_learning/generic_skillchips/matrix_flip.dm
deleted file mode 100644
index a836442eca052..0000000000000
--- a/code/modules/library/skill_learning/generic_skillchips/matrix_flip.dm
+++ /dev/null
@@ -1,40 +0,0 @@
-#define FLIP_STAMINA_COST 19
-
-/obj/item/skillchip/matrix_flip
- name = "BULLET_DODGER skillchip"
- skill_name = "Flip 2 Dodge"
- skill_description = "At the cost of stamina, your flips can also be used to dodge incoming projectiles."
- skill_icon = FA_ICON_SPINNER
- activate_message = span_notice("You feel the urge to flip scenically as if you are the 'Chosen One'.")
- deactivate_message = span_notice("The urge to flip goes away.")
-
-/obj/item/skillchip/matrix_flip/on_activate(mob/living/carbon/user, silent = FALSE)
- . = ..()
- ADD_TRAIT(user, TRAIT_SLOW_FLIP, SKILLCHIP_TRAIT)
- RegisterSignal(user, COMSIG_MOB_EMOTED("flip"), PROC_REF(on_flip))
- RegisterSignal(user, COMSIG_MOB_PRE_EMOTED, PROC_REF(check_if_we_can_flip))
-
-/obj/item/skillchip/matrix_flip/on_deactivate(mob/living/carbon/user, silent=FALSE)
- REMOVE_TRAIT(user, TRAIT_SLOW_FLIP, SKILLCHIP_TRAIT)
- UnregisterSignal(user, list(COMSIG_MOB_EMOTED("flip"), COMSIG_MOB_PRE_EMOTED))
- return ..()
-
-///Prevent players from stamcritting from INTENTIONAL flips. 1.4s of bullet immunity isn't worth several secs of stun.
-/obj/item/skillchip/matrix_flip/proc/check_if_we_can_flip(mob/living/source, key, params, type_override, intentional, datum/emote/emote)
- SIGNAL_HANDLER
- if(key != "flip" || !intentional)
- return
- if((source.maxHealth - (source.getStaminaLoss() + FLIP_STAMINA_COST)) <= source.crit_threshold)
- source.balloon_alert(source, "too tired!")
- return COMPONENT_CANT_EMOTE
-
-/obj/item/skillchip/matrix_flip/proc/on_flip(mob/living/source)
- SIGNAL_HANDLER
- if(HAS_TRAIT_FROM(source, TRAIT_UNHITTABLE_BY_PROJECTILES, SKILLCHIP_TRAIT))
- return
- playsound(source, 'sound/weapons/fwoosh.ogg', 90, FALSE, frequency = 0.7)
- ADD_TRAIT(source, TRAIT_UNHITTABLE_BY_PROJECTILES, SKILLCHIP_TRAIT)
- source.adjustStaminaLoss(FLIP_STAMINA_COST)
- addtimer(TRAIT_CALLBACK_REMOVE(source, TRAIT_UNHITTABLE_BY_PROJECTILES, SKILLCHIP_TRAIT), FLIP_EMOTE_DURATION * 2)
-
-#undef FLIP_STAMINA_COST
diff --git a/code/modules/library/skill_learning/generic_skillchips/matrix_taunt.dm b/code/modules/library/skill_learning/generic_skillchips/matrix_taunt.dm
new file mode 100644
index 0000000000000..cfe61b08e0c3c
--- /dev/null
+++ b/code/modules/library/skill_learning/generic_skillchips/matrix_taunt.dm
@@ -0,0 +1,37 @@
+#define TAUNT_STAMINA_COST 19
+
+/obj/item/skillchip/matrix_taunt
+ name = "BULLET_DODGER skillchip"
+ skill_name = "Taunt 2 Dodge"
+ skill_description = "At the cost of stamina, your taunts can also be used to dodge incoming projectiles."
+ skill_icon = FA_ICON_SPINNER
+ activate_message = span_notice("You feel the urge to taunt scenically as if you are the 'Chosen One'.")
+ deactivate_message = span_notice("The urge to taunt goes away.")
+
+/obj/item/skillchip/matrix_taunt/on_activate(mob/living/carbon/user, silent = FALSE)
+ . = ..()
+ RegisterSignal(user, COMSIG_MOB_EMOTED("taunt"), PROC_REF(on_taunt))
+ RegisterSignal(user, COMSIG_MOB_PRE_EMOTED, PROC_REF(check_if_we_can_taunt))
+
+/obj/item/skillchip/matrix_taunt/on_deactivate(mob/living/carbon/user, silent=FALSE)
+ UnregisterSignal(user, list(COMSIG_MOB_EMOTED("taunt"), COMSIG_MOB_PRE_EMOTED))
+ return ..()
+
+///Prevent players from stamcritting from INTENTIONAL flips. 1.4s of bullet immunity isn't worth several secs of stun.
+/obj/item/skillchip/matrix_taunt/proc/check_if_we_can_taunt(mob/living/source, key, params, type_override, intentional, datum/emote/emote)
+ SIGNAL_HANDLER
+ if(key != "taunt" || !intentional)
+ return
+ if((source.maxHealth - (source.getStaminaLoss() + TAUNT_STAMINA_COST)) <= source.crit_threshold)
+ source.balloon_alert(source, "too tired!")
+ return COMPONENT_CANT_EMOTE
+
+/obj/item/skillchip/matrix_taunt/proc/on_taunt(mob/living/source)
+ SIGNAL_HANDLER
+ if(HAS_TRAIT_FROM(source, TRAIT_UNHITTABLE_BY_PROJECTILES, SKILLCHIP_TRAIT))
+ return
+ ADD_TRAIT(source, TRAIT_UNHITTABLE_BY_PROJECTILES, SKILLCHIP_TRAIT)
+ source.adjustStaminaLoss(TAUNT_STAMINA_COST)
+ addtimer(TRAIT_CALLBACK_REMOVE(source, TRAIT_UNHITTABLE_BY_PROJECTILES, SKILLCHIP_TRAIT), TAUNT_EMOTE_DURATION * 1.5)
+
+#undef TAUNT_STAMINA_COST
diff --git a/code/modules/library/skill_learning/generic_skillchips/point.dm b/code/modules/library/skill_learning/generic_skillchips/point.dm
new file mode 100644
index 0000000000000..761a482268952
--- /dev/null
+++ b/code/modules/library/skill_learning/generic_skillchips/point.dm
@@ -0,0 +1,99 @@
+/**
+ * A skillchip that gives the user bigger arrows when pointing at things (like some id trims do).
+ * As a bonus, they can costumize the color of the arrow/pointer too.
+ */
+/obj/item/skillchip/big_pointer
+ name = "Kommand skillchip"
+ desc = "A biochip detailing various techniques employed by historical leaders to points at things like a true boss."
+ skill_name = "Enhanced pointing"
+ skill_description = "Learn to point at things in a more noticeable way."
+ skill_icon = FA_ICON_ARROW_DOWN
+ activate_message = span_notice("From \"The Definitive Compendium of Body Language for the Aspiring Leader\", page 164, paragraph 3...")
+ deactivate_message = span_notice("So, uh, yeah, how do I point at things again?")
+
+ ///The action for changing the pointer color
+ var/datum/action/change_pointer_color/action
+
+/obj/item/skillchip/big_pointer/Destroy()
+ action = null
+ return ..()
+
+/obj/item/skillchip/big_pointer/on_activate(mob/living/carbon/user, silent=FALSE)
+ . = ..()
+ RegisterSignal(user, COMSIG_MOVABLE_POINTED, PROC_REF(fancier_pointer))
+ if(!action)
+ action = new(src)
+ action.Grant(user)
+
+/obj/item/skillchip/big_pointer/on_deactivate(mob/living/carbon/user, silent=FALSE)
+ UnregisterSignal(user, COMSIG_MOVABLE_POINTED)
+ action?.arrow_color = null
+ action?.arrow_overlay = null
+ action?.Remove(user)
+ return ..()
+
+/obj/item/skillchip/big_pointer/proc/fancier_pointer(mob/living/user, atom/pointed, obj/effect/temp_visual/point/point)
+ SIGNAL_HANDLER
+ if(HAS_TRAIT(user, TRAIT_UNKNOWN))
+ return
+ point.cut_overlays()
+ if(!action.arrow_color)
+ point.icon_state = "arrow_large"
+ return
+ point.icon_state = "arrow_large_white"
+ point.color = action.arrow_color
+ var/mutable_appearance/highlight = mutable_appearance(point.icon, "arrow_large_white_highlights", appearance_flags = RESET_COLOR)
+ point.add_overlay(highlight)
+
+/datum/action/change_pointer_color
+ name = "Change Pointer Color"
+ desc = "Set your custom pointer color, or reset it to the default."
+ button_icon = /obj/effect/temp_visual/point::icon
+ button_icon_state = "arrow_large_still"
+ check_flags = AB_CHECK_CONSCIOUS
+ ///the color of our arrow
+ var/arrow_color
+ ///the arrow overlay shown on the button
+ var/mutable_appearance/arrow_overlay
+
+/datum/action/change_pointer_color/Destroy()
+ . = ..()
+ arrow_overlay = null
+
+/datum/action/change_pointer_color/Trigger(trigger_flags)
+ . = ..()
+ if(!.)
+ return
+ var/mob/user = owner
+ if(!arrow_color)
+ pick_color(user)
+ return
+ var/choice = tgui_alert(owner, "Reset or update pointer color?","Pointer Color", list("Reset","Update"))
+ if(user != owner || !choice || !IsAvailable(feedback = TRUE))
+ return
+ if(choice == "Update")
+ pick_color(user)
+ else
+ arrow_color = null
+ owner.balloon_alert(owner, "pointer reset")
+ build_all_button_icons(update_flags = UPDATE_BUTTON_ICON, force = TRUE)
+
+/datum/action/change_pointer_color/proc/pick_color(mob/user)
+ var/ncolor = input(owner, "Pick new color", "Pointer Color", arrow_color) as color|null
+ if(user != owner || !IsAvailable(feedback = TRUE))
+ return
+ arrow_color = ncolor
+ owner.balloon_alert(owner, "pointer updated")
+ build_all_button_icons(update_flags = UPDATE_BUTTON_ICON, force = TRUE)
+
+/datum/action/change_pointer_color/apply_button_icon(atom/movable/screen/movable/action_button/current_button, force = FALSE)
+ if(!arrow_color)
+ return ..()
+
+ current_button.icon = current_button.icon_state = null
+ current_button.cut_overlay(arrow_overlay)
+
+ arrow_overlay = mutable_appearance(icon = /obj/effect/temp_visual/point::icon, icon_state = "arrow_large_white_still")
+ arrow_overlay.color = arrow_color
+ arrow_overlay.overlays += mutable_appearance(icon = /obj/effect/temp_visual/point::icon, icon_state = "arrow_large_white_still_highlights", appearance_flags = RESET_COLOR)
+ current_button.add_overlay(arrow_overlay)
diff --git a/code/modules/library/skill_learning/skill_station.dm b/code/modules/library/skill_learning/skill_station.dm
index b376501f758fd..2dec45a6abf77 100644
--- a/code/modules/library/skill_learning/skill_station.dm
+++ b/code/modules/library/skill_learning/skill_station.dm
@@ -252,7 +252,7 @@
current_skills += list(skill_chip.get_chip_data())
.["current"] = current_skills
-/obj/machinery/skill_station/ui_act(action, list/params)
+/obj/machinery/skill_station/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/library/skill_learning/skillchip.dm b/code/modules/library/skill_learning/skillchip.dm
index cc284b91454aa..b8903e5bde09a 100644
--- a/code/modules/library/skill_learning/skillchip.dm
+++ b/code/modules/library/skill_learning/skillchip.dm
@@ -141,6 +141,7 @@
* * silent - Boolean. Whether or not an activation message should be shown to the user.
*/
/obj/item/skillchip/proc/on_activate(mob/living/carbon/user, silent=FALSE)
+ SHOULD_CALL_PARENT(TRUE)
if(!silent && activate_message)
to_chat(user, activate_message)
@@ -175,6 +176,7 @@
* * silent - Boolean. Whether or not a deactivation message should be shown to the user.
*/
/obj/item/skillchip/proc/on_deactivate(mob/living/carbon/user, silent=FALSE)
+ SHOULD_CALL_PARENT(TRUE)
if(!silent && deactivate_message)
to_chat(user, deactivate_message)
@@ -484,9 +486,9 @@
/obj/item/skillchip/master_angler
name = "Mast-Angl-Er skillchip"
- auto_traits = list(TRAIT_REVEAL_FISH, TRAIT_EXAMINE_FISHING_SPOT)
+ auto_traits = list(TRAIT_REVEAL_FISH, TRAIT_EXAMINE_FISHING_SPOT, TRAIT_EXAMINE_FISH, TRAIT_EXAMINE_DEEPER_FISH)
skill_name = "Fisherman's Discernment"
- skill_description = "Lists fishes when examining a fishing spot, and gives a hint of whatever thing's biting the hook."
+ skill_description = "Lists fishes when examining a fishing spot, gives a hint of whatever thing's biting the hook and more."
skill_icon = "fish"
activate_message = span_notice("You feel the knowledge and passion of several sunbaked, seasoned fishermen burn within you.")
deactivate_message = span_notice("You no longer feel like casting a fishing rod by the sunny riverside.")
@@ -499,3 +501,104 @@
skill_icon = FA_ICON_DRUMSTICK_BITE
activate_message = span_notice("You think of your favourite food and realise that you can rotate its flavour in your mind.")
deactivate_message = span_notice("You feel your food-based mind palace crumbling...")
+
+/obj/item/skillchip/drunken_brawler
+ name = "F0RC3 4DD1CT10N skillchip"
+ auto_traits = list(TRAIT_DRUNKEN_BRAWLER)
+ skill_name = "Drunken Unarmed Proficiency"
+ skill_description = "When intoxicated, you gain increased unarmed effectiveness."
+ skill_icon = "wine-bottle"
+ activate_message = span_notice("You honestly could do with a drink. Never know when someone might try and jump you around here.")
+ deactivate_message = span_notice("You suddenly feel a lot safer going around the station sober... ")
+
+/obj/item/skillchip/musical
+ name = "\improper Old Copy of \"Space Station 13: The Musical\""
+ desc = "An old copy of \"Space Station 13: The Musical\", \
+ ran on the station's 100th anniversary...Or maybe it was the 200th?"
+ skill_name = "Memory of a Musical"
+ skill_description = "Allows you to hit that high note, like those that came a century before us."
+ skill_icon = FA_ICON_MUSIC
+ activate_message = span_notice("You feel like you could \u2669 sing a soooong! \u266B")
+ deactivate_message = span_notice("The musical fades from your mind, leaving you with a sense of nostalgia.")
+ custom_premium_price = PAYCHECK_CREW * 4
+
+/obj/item/skillchip/musical/Initialize(mapload, is_removable)
+ . = ..()
+ name = replacetext(name, "Old", round(CURRENT_STATION_YEAR - pick(50, 100, 150, 200, 250), 5))
+
+/obj/item/skillchip/musical/on_activate(mob/living/carbon/user, silent = FALSE)
+ . = ..()
+ RegisterSignal(user, COMSIG_MOB_SAY, PROC_REF(make_music))
+
+/obj/item/skillchip/musical/on_deactivate(mob/living/carbon/user, silent)
+ . = ..()
+ UnregisterSignal(user, COMSIG_MOB_SAY)
+
+/obj/item/skillchip/musical/proc/make_music(mob/living/carbon/source, list/say_args)
+ SIGNAL_HANDLER
+
+ var/raw_message = say_args[SPEECH_MESSAGE]
+ var/list/words = splittext(raw_message, " ")
+ if(length(words) <= 1)
+ say_args[SPEECH_MODS][MODE_SING] = TRUE
+ return
+ var/last_word = words[length(words)]
+ var/num_chars = length_char(last_word)
+ var/last_vowel = ""
+ // find the last vowel present in the word
+ for(var/i in 1 to num_chars)
+ var/char = copytext_char(last_word, i, i + 1)
+ if(char in VOWELS)
+ last_vowel = char
+
+ // now we'll reshape the final word to make it sound like they're singing it
+ var/final_word = ""
+ var/has_ellipsis = copytext(last_word, -3) == "..."
+ for(var/i in 1 to num_chars)
+ var/char = copytext_char(last_word, i, i + 1)
+ // replacing any final periods with exclamation marks (so long as it's not an ellipsis)
+ if(char == "." && i == num_chars && !has_ellipsis)
+ final_word += "!"
+ // or if it's the vowel we found, we're gonna repeat it a few times (holding the note)
+ else if(char == last_vowel)
+ for(var/j in 1 to 4)
+ final_word += char
+ // if we dragged out the last character of the word, just period it
+ if(i == num_chars)
+ final_word += "."
+ // no special handing otherwise
+ else
+ final_word += char
+
+ if(!has_ellipsis)
+ // adding an extra exclamation mark at the end if there's no period
+ var/last_char = copytext_char(final_word, -1)
+ if(last_char != ".")
+ final_word += "!"
+
+ words[length(words)] = final_word
+ // now we siiiiiiing
+ say_args[SPEECH_MESSAGE] = jointext(words, " ")
+ say_args[SPEECH_MODS][MODE_SING] = TRUE
+
+/obj/item/skillchip/musical/examine(mob/user)
+ . = ..()
+ . += span_tinynoticeital("Huh, looks like it'd fit in a skillchip adapter.")
+
+/obj/item/skillchip/musical/examine_more(mob/user)
+ . = ..()
+ var/list/songs = list()
+ songs += "• \"The Ballad of Space Station 13\""
+ songs += "• \"The Captain's Call\""
+ songs += "• \"A Mime's Lament\""
+ songs += "• \"Banned from Cargo\""
+ songs += "• \"Botany Blues\""
+ songs += "• \"Clown Song\""
+ songs += "• \"Elegy to an Engineer\""
+ songs += "• \"Medical Malpractitioner\""
+ songs += "• \"Security Strike\""
+ songs += "• \"Send for the Shuttle\""
+ songs += "• And one song scratched out..."
+
+ . += span_notice("On the back of the chip, you see a list of songs:")
+ . += span_smallnotice("[jointext(songs, " ")]")
diff --git a/code/modules/lootpanel/_lootpanel.dm b/code/modules/lootpanel/_lootpanel.dm
index 45862ebf45542..ab13a7c211677 100644
--- a/code/modules/lootpanel/_lootpanel.dm
+++ b/code/modules/lootpanel/_lootpanel.dm
@@ -56,13 +56,13 @@
/datum/lootpanel/ui_status(mob/user, datum/ui_state/state)
- if(user.incapacitated())
+ if(user.incapacitated)
return UI_DISABLED
return UI_INTERACTIVE
-/datum/lootpanel/ui_act(action, list/params)
+/datum/lootpanel/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/mapfluff/ruins/icemoonruin_code/hotsprings.dm b/code/modules/mapfluff/ruins/icemoonruin_code/hotsprings.dm
index 9e188d4585638..7c674e98e24a1 100644
--- a/code/modules/mapfluff/ruins/icemoonruin_code/hotsprings.dm
+++ b/code/modules/mapfluff/ruins/icemoonruin_code/hotsprings.dm
@@ -14,6 +14,7 @@
baseturfs = /turf/open/water/cursed_spring
planetary_atmos = TRUE
initial_gas_mix = ICEMOON_DEFAULT_ATMOS
+ fishing_datum = /datum/fish_source/cursed_spring
/turf/open/water/cursed_spring/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs)
. = ..()
diff --git a/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm b/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm
index 860eb8c816882..646de6a2186ef 100644
--- a/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm
+++ b/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm
@@ -161,7 +161,7 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate)
/obj/structure/necropolis_gate/legion_gate/attack_hand(mob/user, list/modifiers)
if(!open && !changing_openness)
var/safety = tgui_alert(user, "You think this might be a bad idea...", "Knock on the door?", list("Proceed", "Abort"))
- if(safety == "Abort" || !in_range(src, user) || !src || open || changing_openness || user.incapacitated())
+ if(safety == "Abort" || !in_range(src, user) || !src || open || changing_openness || user.incapacitated)
return
user.visible_message(span_warning("[user] knocks on [src]..."), span_boldannounce("You tentatively knock on [src]..."))
playsound(user.loc, 'sound/effects/shieldbash.ogg', 100, TRUE)
diff --git a/code/modules/mapfluff/ruins/spaceruin_code/TheDerelict.dm b/code/modules/mapfluff/ruins/spaceruin_code/TheDerelict.dm
index ce50fcccc1568..8be91920719c1 100644
--- a/code/modules/mapfluff/ruins/spaceruin_code/TheDerelict.dm
+++ b/code/modules/mapfluff/ruins/spaceruin_code/TheDerelict.dm
@@ -140,7 +140,7 @@
ui = new(user, src, "VaultController", name)
ui.open()
-/obj/machinery/computer/vaultcontroller/ui_act(action, params)
+/obj/machinery/computer/vaultcontroller/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm
index 21075cea38add..b42618f94ee21 100644
--- a/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm
+++ b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm
@@ -72,7 +72,7 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
to_chat(target, span_warning("You too far away from \the [src] to enter it!"))
// If the target is incapacitated after selecting a room, they're not allowed to teleport.
- if(target.incapacitated())
+ if(target.incapacitated)
to_chat(target, span_warning("You aren't able to activate \the [src] anymore!"))
// Has the user thrown it away or otherwise disposed of it such that it's no longer in their hands or in some storage connected to them?
@@ -358,7 +358,7 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
to_chat(user, span_warning("Drats! Your vision is too poor to use this!"))
return CLICK_ACTION_BLOCKING
- to_chat(user, span_notice("You peak through the door's bluespace peephole..."))
+ to_chat(user, span_notice("You peek through the door's bluespace peephole..."))
user.reset_perspective(parentSphere)
var/datum/action/peephole_cancel/PHC = new
user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/impaired, 1)
diff --git a/code/modules/mapping/space_management/space_reservation.dm b/code/modules/mapping/space_management/space_reservation.dm
index 04ba59ab5a459..fe0050d418d23 100644
--- a/code/modules/mapping/space_management/space_reservation.dm
+++ b/code/modules/mapping/space_management/space_reservation.dm
@@ -28,6 +28,9 @@
/// The turf type the reservation is initially made with
var/turf_type = /turf/open/space
+ /// Do we override baseturfs with turf_type?
+ var/turf_type_is_baseturf = TRUE
+
///Distance away from the cordon where we can put a "sort-cordon" and run some extra code (see make_repel). 0 makes nothing happen
var/pre_cordon_distance = 0
@@ -52,6 +55,10 @@
for(var/turf/reserved_turf as anything in release_turfs)
SEND_SIGNAL(reserved_turf, COMSIG_TURF_RESERVATION_RELEASED, src)
+ // immediately disconnect from atmos
+ reserved_turf.blocks_air = TRUE
+ CALCULATE_ADJACENT_TURFS(reserved_turf, KILL_EXCITED)
+
// Makes the linter happy, even tho we don't await this
INVOKE_ASYNC(SSmapping, TYPE_PROC_REF(/datum/controller/subsystem/mapping, reserve_turfs), release_turfs)
@@ -90,7 +97,7 @@
// Its no longer unused, but its also not "used"
cordon_turf.turf_flags &= ~UNUSED_RESERVATION_TURF
- cordon_turf.ChangeTurf(/turf/cordon, /turf/cordon)
+ cordon_turf.empty(/turf/cordon, /turf/cordon)
SSmapping.unused_turfs["[cordon_turf.z]"] -= cordon_turf
// still gets linked to us though
SSmapping.used_turfs[cordon_turf] = src
@@ -138,6 +145,9 @@
if(!HAS_TRAIT(enterer, TRAIT_FREE_HYPERSPACE_SOFTCORDON_MOVEMENT))
space_dump(source, enterer)
+/datum/turf_reservation/turf_not_baseturf
+ turf_type_is_baseturf = FALSE
+
/// Internal proc which handles reserving the area for the reservation.
/datum/turf_reservation/proc/_reserve_area(width, height, zlevel)
src.width = width
@@ -181,7 +191,7 @@
SSmapping.unused_turfs["[T.z]"] -= T
SSmapping.used_turfs[T] = src
T.turf_flags = (T.turf_flags | RESERVATION_TURF) & ~UNUSED_RESERVATION_TURF
- T.ChangeTurf(turf_type, turf_type)
+ T.empty(turf_type, turf_type_is_baseturf ? turf_type : null)
bottom_left_turfs += BL
top_right_turfs += TR
diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm
index a1503b7f63420..82cdaffa71468 100644
--- a/code/modules/mining/aux_base.dm
+++ b/code/modules/mining/aux_base.dm
@@ -133,7 +133,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/auxiliary_base, 32)
return FALSE
return TRUE
-/obj/machinery/computer/auxiliary_base/ui_act(action, params)
+/obj/machinery/computer/auxiliary_base/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/mining/boulder_processing/brm.dm b/code/modules/mining/boulder_processing/brm.dm
index 61c5469b45901..9b9186968918b 100644
--- a/code/modules/mining/boulder_processing/brm.dm
+++ b/code/modules/mining/boulder_processing/brm.dm
@@ -153,6 +153,23 @@
playsound(src, MANUAL_TELEPORT_SOUND, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
return TRUE
+/obj/machinery/brm/attack_ai(mob/user)
+ . = ..()
+ if(. || panel_open)
+ return
+ if(!handle_teleport_conditions(user))
+ return
+
+ var/result = pre_collect_boulder()
+ if(result == TURF_BLOCKED_BY_BOULDER)
+ balloon_alert(user, "no space")
+ else if(result)
+ balloon_alert(user, "teleporting")
+
+ COOLDOWN_START(src, manual_teleport_cooldown, TELEPORTATION_TIME)
+
+ return TRUE
+
/obj/machinery/brm/attack_robot(mob/user)
. = ..()
if(. || panel_open)
@@ -206,6 +223,17 @@
end_processing()
update_appearance(UPDATE_ICON_STATE)
+/obj/machinery/brm/attack_ai_secondary(mob/user, list/modifiers)
+ . = ..()
+ if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN || panel_open)
+ return
+ if(!anchored)
+ balloon_alert(user, "anchor first!")
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+
+ toggle_auto_on(user)
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+
/obj/machinery/brm/attack_robot_secondary(mob/user, list/modifiers)
. = ..()
if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN || panel_open)
diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm
index abf5ca77e181d..0685dda148dee 100644
--- a/code/modules/mining/equipment/mining_tools.dm
+++ b/code/modules/mining/equipment/mining_tools.dm
@@ -285,7 +285,7 @@
/obj/item/trench_tool/proc/check_menu(mob/user)
if(!istype(user))
return FALSE
- if(user.incapacitated() || !user.Adjacent(src))
+ if(user.incapacitated || !user.Adjacent(src))
return FALSE
return TRUE
diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm
index cd5a60a22f2ae..ee700e3d9774b 100644
--- a/code/modules/mining/laborcamp/laborstacker.dm
+++ b/code/modules/mining/laborcamp/laborstacker.dm
@@ -68,7 +68,7 @@
data["can_go_home"] = can_go_home
return data
-/obj/machinery/mineral/labor_claim_console/ui_act(action, params)
+/obj/machinery/mineral/labor_claim_console/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/mining/lavaland/megafauna_loot.dm b/code/modules/mining/lavaland/megafauna_loot.dm
index 0bbf15352318d..f0270b66d377b 100644
--- a/code/modules/mining/lavaland/megafauna_loot.dm
+++ b/code/modules/mining/lavaland/megafauna_loot.dm
@@ -601,6 +601,10 @@
animate(src)
SpinAnimation(15)
+/obj/item/soulscythe/Destroy(force)
+ soul.ghostize()
+ QDEL_NULL(soul)
+ . = ..()
/mob/living/simple_animal/soulscythe
name = "mysterious spirit"
maxHealth = 200
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index a553415176ea5..f833e15d3f3de 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -18,7 +18,7 @@
/obj/structure/closet/crate/necropolis/tendril/attackby(obj/item/item, mob/user, params)
if(!istype(item, /obj/item/skeleton_key) || spawned_loot)
return ..()
- var/loot = rand(1,20)
+ var/loot = rand(1,21)
var/mod
switch(loot)
if(1)
@@ -71,6 +71,9 @@
new /obj/item/bedsheet/cult(src)
if(20)
new /obj/item/clothing/neck/necklace/memento_mori(src)
+ if(21)
+ new /obj/item/clothing/gloves/fingerless/punch_mitts(src)
+ new /obj/item/clothing/head/cowboy(src)
if(!contents.len)
to_chat(user, span_warning("[src] makes a clunking sound as you try to open it. You feel compelled to let the gods know! (Please open an adminhelp and try again!)"))
CRASH("Failed to generate loot. loot number: [loot][mod ? "subloot: [mod]" : null]")
diff --git a/code/modules/mining/lavaland/tendril_loot.dm b/code/modules/mining/lavaland/tendril_loot.dm
index 7670c4e312844..0403e17ad796a 100644
--- a/code/modules/mining/lavaland/tendril_loot.dm
+++ b/code/modules/mining/lavaland/tendril_loot.dm
@@ -621,6 +621,7 @@
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
+ body_parts_covered = HANDS|ARMS
resistance_flags = LAVA_PROOF | FIRE_PROOF //they are from lavaland after all
armor_type = /datum/armor/gloves_gauntlets
diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm
index 61318f63b92a5..d0c63bd3b7aa8 100644
--- a/code/modules/mining/machine_processing.dm
+++ b/code/modules/mining/machine_processing.dm
@@ -94,7 +94,7 @@
/obj/machinery/mineral/processing_unit_console/ui_data(mob/user)
return processing_machine.ui_data()
-/obj/machinery/mineral/processing_unit_console/ui_act(action, list/params)
+/obj/machinery/mineral/processing_unit_console/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm
index 14460cffb1b66..312acb6672014 100644
--- a/code/modules/mining/machine_redemption.dm
+++ b/code/modules/mining/machine_redemption.dm
@@ -297,7 +297,7 @@
return data
-/obj/machinery/mineral/ore_redemption/ui_act(action, params)
+/obj/machinery/mineral/ore_redemption/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/mining/machine_silo.dm b/code/modules/mining/machine_silo.dm
index 97c3a90b78eb1..7fe2e9468f186 100644
--- a/code/modules/mining/machine_silo.dm
+++ b/code/modules/mining/machine_silo.dm
@@ -143,7 +143,7 @@
return data
-/obj/machinery/ore_silo/ui_act(action, list/params)
+/obj/machinery/ore_silo/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm
index c8a58a1d0f493..1c250b578668c 100644
--- a/code/modules/mining/machine_stacking.dm
+++ b/code/modules/mining/machine_stacking.dm
@@ -62,7 +62,7 @@
))
return data
-/obj/machinery/mineral/stacking_unit_console/ui_act(action, list/params)
+/obj/machinery/mineral/stacking_unit_console/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm
index e9e8b3a7c3daf..7ad08083df3a8 100644
--- a/code/modules/mining/ores_coins.dm
+++ b/code/modules/mining/ores_coins.dm
@@ -517,7 +517,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
playsound(user.loc, 'sound/items/coinflip.ogg', 50, TRUE)
var/oldloc = loc
sleep(1.5 SECONDS)
- if(loc == oldloc && user && !user.incapacitated())
+ if(loc == oldloc && user && !user.incapacitated)
user.visible_message(span_notice("[user] flips [src]. It lands on [coinflip]."), \
span_notice("You flip [src]. It lands on [coinflip]."), \
span_hear("You hear the clattering of loose change."))
@@ -599,7 +599,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
playsound(user.loc, 'sound/items/coinflip.ogg', 50, TRUE)
var/oldloc = loc
sleep(1.5 SECONDS)
- if(loc == oldloc && user && !user.incapacitated())
+ if(loc == oldloc && user && !user.incapacitated)
user.visible_message(span_notice("[user] flips [src]. It lands on [coinflip]."), \
span_notice("You flip [src]. It lands on [coinflip]."), \
span_hear("You hear the clattering of loose change."))
diff --git a/code/modules/mining/satchel_ore_box.dm b/code/modules/mining/satchel_ore_box.dm
index b94796b161433..94be35108d0b0 100644
--- a/code/modules/mining/satchel_ore_box.dm
+++ b/code/modules/mining/satchel_ore_box.dm
@@ -95,7 +95,7 @@
return list("materials" = materials)
-/obj/structure/ore_box/ui_act(action, params)
+/obj/structure/ore_box/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/mob/dead/observer/login.dm b/code/modules/mob/dead/observer/login.dm
index c239817a30e14..cf5863163c884 100644
--- a/code/modules/mob/dead/observer/login.dm
+++ b/code/modules/mob/dead/observer/login.dm
@@ -7,9 +7,6 @@
ghost_others = client.prefs.read_preference(/datum/preference/choiced/ghost_others)
var/preferred_form = null
- if(isAdminGhostAI(src))
- has_unlimited_silicon_privilege = TRUE
-
if(client.prefs.unlock_content)
preferred_form = client.prefs.read_preference(/datum/preference/choiced/ghost_form)
ghost_orbit = client.prefs.read_preference(/datum/preference/choiced/ghost_orbit)
diff --git a/code/modules/mob/dead/observer/notificationprefs.dm b/code/modules/mob/dead/observer/notificationprefs.dm
index 802da5e2b8011..5e14f1e5ce9bc 100644
--- a/code/modules/mob/dead/observer/notificationprefs.dm
+++ b/code/modules/mob/dead/observer/notificationprefs.dm
@@ -38,7 +38,7 @@
"desc" = GLOB.poll_ignore_desc[key]
))
-/datum/notificationpanel/ui_act(action, params)
+/datum/notificationpanel/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index bf4411a0d482d..80f7be5e3180e 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -141,11 +141,8 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
add_to_dead_mob_list()
- for(var/v in GLOB.active_alternate_appearances)
- if(!v)
- continue
- var/datum/atom_hud/alternate_appearance/AA = v
- AA.onNewMob(src)
+ for(var/datum/atom_hud/alternate_appearance/alt_hud as anything in GLOB.active_alternate_appearances)
+ alt_hud.apply_to_new_mob(src)
. = ..()
diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm
index 84b00249a4972..0fae07a4442dd 100644
--- a/code/modules/mob/emote.dm
+++ b/code/modules/mob/emote.dm
@@ -83,15 +83,10 @@
/datum/emote/flip/run_emote(mob/user, params , type_override, intentional)
. = ..()
- user.SpinAnimation(HAS_TRAIT(user, TRAIT_SLOW_FLIP) ? FLIP_EMOTE_DURATION * 2 : FLIP_EMOTE_DURATION, 1)
+ user.SpinAnimation(FLIP_EMOTE_DURATION, 1)
/datum/emote/flip/check_cooldown(mob/user, intentional)
- var/slow_flipper = HAS_TRAIT(user, TRAIT_SLOW_FLIP)
- if(slow_flipper)
- cooldown *= 2
. = ..()
- if(slow_flipper)
- cooldown *= 0.5
if(.)
return
if(!can_run_emote(user, intentional=intentional))
@@ -147,3 +142,27 @@
#undef BEYBLADE_DIZZINESS_DURATION
#undef BEYBLADE_CONFUSION_INCREMENT
#undef BEYBLADE_CONFUSION_LIMIT
+
+
+/datum/emote/jump
+ key = "jump"
+ key_third_person = "jumps"
+ message = "jumps!"
+ // Allows ghosts to jump
+ mob_type_ignore_stat_typecache = list(/mob/dead/observer)
+
+/datum/emote/jump/run_emote(mob/user, params, type_override, intentional)
+ . = ..()
+
+ var/original_transform = user.transform
+ animate(user, transform = user.transform.Translate(0, 4), time = 0.1 SECONDS, flags = ANIMATION_PARALLEL)
+ animate(transform = original_transform, time = 0.1 SECONDS)
+
+/datum/emote/jump/get_sound(mob/user)
+ return 'sound/weapons/thudswoosh.ogg'
+
+// Avoids playing sounds if we're a ghost
+/datum/emote/jump/should_play_sound(mob/user, intentional)
+ if(isliving(user))
+ return ..()
+ return FALSE
diff --git a/code/modules/mob/living/basic/basic.dm b/code/modules/mob/living/basic/basic.dm
index 582af27c3161b..9501c4e21d3e9 100644
--- a/code/modules/mob/living/basic/basic.dm
+++ b/code/modules/mob/living/basic/basic.dm
@@ -266,7 +266,7 @@
REMOVE_TRAIT(src, TRAIT_NO_GLIDE, SPEED_TRAIT)
/mob/living/basic/relaymove(mob/living/user, direction)
- if(user.incapacitated())
+ if(user.incapacitated)
return
return relaydrive(user, direction)
diff --git a/code/modules/mob/living/basic/blob_minions/blob_ai.dm b/code/modules/mob/living/basic/blob_minions/blob_ai.dm
index 5aad05d4656ff..5fc90f3dd676b 100644
--- a/code/modules/mob/living/basic/blob_minions/blob_ai.dm
+++ b/code/modules/mob/living/basic/blob_minions/blob_ai.dm
@@ -46,7 +46,7 @@
ai_movement = /datum/ai_movement/jps
idle_behavior = /datum/idle_behavior/idle_random_walk
planning_subtrees = list(
- /datum/ai_planning_subtree/find_and_hunt_target/corpses,
+ /datum/ai_planning_subtree/find_and_hunt_target/corpses/human,
/datum/ai_planning_subtree/travel_to_point/and_clear_target,
/datum/ai_planning_subtree/simple_find_target,
/datum/ai_planning_subtree/attack_obstacle_in_path,
diff --git a/code/modules/mob/living/basic/bots/_bots.dm b/code/modules/mob/living/basic/bots/_bots.dm
index 04b3a7864d21e..cc6ac85c6cbc4 100644
--- a/code/modules/mob/living/basic/bots/_bots.dm
+++ b/code/modules/mob/living/basic/bots/_bots.dm
@@ -26,7 +26,6 @@ GLOBAL_LIST_INIT(command_strings, list(
maximum_survivable_temperature = INFINITY
minimum_survivable_temperature = 0
- has_unlimited_silicon_privilege = TRUE
sentience_type = SENTIENCE_ARTIFICIAL
status_flags = NONE //no default canpush
@@ -59,6 +58,7 @@ GLOBAL_LIST_INIT(command_strings, list(
///All initial access this bot started with.
var/list/initial_access = list()
///Bot-related mode flags on the Bot indicating how they will act. BOT_MODE_ON | BOT_MODE_AUTOPATROL | BOT_MODE_REMOTE_ENABLED | BOT_MODE_CAN_BE_SAPIENT | BOT_MODE_ROUNDSTART_POSSESSION
+ /// DO NOT MODIFY MANUALLY, USE set_bot_mode_flags. If you don't shit breaks BAD
var/bot_mode_flags = BOT_MODE_ON | BOT_MODE_REMOTE_ENABLED | BOT_MODE_CAN_BE_SAPIENT | BOT_MODE_ROUNDSTART_POSSESSION
///Bot-related cover flags on the Bot to deal with what has been done to their cover, including emagging. BOT_COVER_MAINTS_OPEN | BOT_COVER_LOCKED | BOT_COVER_EMAGGED | BOT_COVER_HACKED
var/bot_access_flags = BOT_COVER_LOCKED
@@ -109,6 +109,7 @@ GLOBAL_LIST_INIT(command_strings, list(
/mob/living/basic/bot/Initialize(mapload)
. = ..()
+ add_traits(list(TRAIT_SILICON_ACCESS, TRAIT_REAGENT_SCANNER, TRAIT_UNOBSERVANT), INNATE_TRAIT)
AddElement(/datum/element/ai_retaliate)
RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(handle_loop_movement))
RegisterSignal(src, COMSIG_ATOM_WAS_ATTACKED, PROC_REF(after_attacked))
@@ -151,6 +152,11 @@ GLOBAL_LIST_INIT(command_strings, list(
ai_controller.set_blackboard_key(BB_RADIO_CHANNEL, radio_channel)
update_appearance()
+/mob/living/basic/bot/proc/set_mode_flags(mode_flags)
+ SHOULD_CALL_PARENT(TRUE)
+ bot_mode_flags = mode_flags
+ SEND_SIGNAL(src, COMSIG_BOT_MODE_FLAGS_SET, mode_flags)
+
/mob/living/basic/bot/proc/get_mode()
if(client) //Player bots do not have modes, thus the override. Also an easy way for PDA users/AI to know when a bot is a player.
return span_bold("[paicard ? "pAI Controlled" : "Autonomous"]")
@@ -181,7 +187,7 @@ GLOBAL_LIST_INIT(command_strings, list(
/mob/living/basic/bot/proc/turn_on()
if(stat == DEAD)
return FALSE
- bot_mode_flags |= BOT_MODE_ON
+ set_mode_flags(bot_mode_flags | BOT_MODE_ON)
remove_traits(list(TRAIT_INCAPACITATED, TRAIT_IMMOBILIZED, TRAIT_HANDS_BLOCKED), POWER_LACK_TRAIT)
set_light_on(bot_mode_flags & BOT_MODE_ON ? TRUE : FALSE)
update_appearance()
@@ -190,7 +196,7 @@ GLOBAL_LIST_INIT(command_strings, list(
return TRUE
/mob/living/basic/bot/proc/turn_off()
- bot_mode_flags &= ~BOT_MODE_ON
+ set_mode_flags(bot_mode_flags & ~BOT_MODE_ON)
add_traits(on_toggle_traits, POWER_LACK_TRAIT)
set_light_on(bot_mode_flags & BOT_MODE_ON ? TRUE : FALSE)
bot_reset() //Resets an AI's call, should it exist.
@@ -308,7 +314,7 @@ GLOBAL_LIST_INIT(command_strings, list(
return FALSE
bot_access_flags |= BOT_COVER_EMAGGED
bot_access_flags |= BOT_COVER_LOCKED
- bot_mode_flags &= ~BOT_MODE_REMOTE_ENABLED //Manually emagging the bot also locks the AI from controlling it.
+ set_mode_flags(bot_mode_flags & ~BOT_MODE_REMOTE_ENABLED) //Manually emagging the bot also locks the AI from controlling it.
bot_reset()
turn_on() //The bot automatically turns on when emagged, unless recently hit with EMP.
to_chat(src, span_userdanger("(#$*#$^^( OVERRIDE DETECTED"))
@@ -553,9 +559,9 @@ GLOBAL_LIST_INIT(command_strings, list(
switch(command)
if("patroloff")
bot_reset() //HOLD IT!! //OBJECTION!!
- bot_mode_flags &= ~BOT_MODE_AUTOPATROL
+ set_mode_flags(bot_mode_flags & ~BOT_MODE_AUTOPATROL)
if("patrolon")
- bot_mode_flags |= BOT_MODE_AUTOPATROL
+ set_mode_flags(bot_mode_flags | BOT_MODE_AUTOPATROL)
if("summon")
summon_bot(user, user_access = user_access)
if("ejectpai")
@@ -607,10 +613,10 @@ GLOBAL_LIST_INIT(command_strings, list(
if("maintenance")
bot_access_flags ^= BOT_COVER_MAINTS_OPEN
if("patrol")
- bot_mode_flags ^= BOT_MODE_AUTOPATROL
+ set_mode_flags(bot_mode_flags ^ BOT_MODE_AUTOPATROL)
bot_reset()
if("airplane")
- bot_mode_flags ^= BOT_MODE_REMOTE_ENABLED
+ set_mode_flags(bot_mode_flags ^ BOT_MODE_REMOTE_ENABLED)
if("hack")
if(!HAS_SILICON_ACCESS(the_user))
return
diff --git a/code/modules/mob/living/basic/bots/bot_ai.dm b/code/modules/mob/living/basic/bots/bot_ai.dm
index b7cd5dcabd394..a0abbbfd48b40 100644
--- a/code/modules/mob/living/basic/bots/bot_ai.dm
+++ b/code/modules/mob/living/basic/bots/bot_ai.dm
@@ -55,7 +55,15 @@
var/mob/living/basic/bot/bot_pawn = pawn
bot_pawn.bot_reset()
-/datum/ai_controller/basic_controller/bot/able_to_run()
+/datum/ai_controller/basic_controller/bot/setup_able_to_run()
+ . = ..()
+ RegisterSignal(pawn, COMSIG_BOT_MODE_FLAGS_SET, PROC_REF(update_able_to_run))
+
+/datum/ai_controller/basic_controller/bot/clear_able_to_run()
+ UnregisterSignal(pawn, list(COMSIG_BOT_MODE_FLAGS_SET))
+ return ..()
+
+/datum/ai_controller/basic_controller/bot/get_able_to_run()
var/mob/living/basic/bot/bot_pawn = pawn
if(!(bot_pawn.bot_mode_flags & BOT_MODE_ON))
return FALSE
diff --git a/code/modules/mob/living/basic/bots/bot_hud.dm b/code/modules/mob/living/basic/bots/bot_hud.dm
index 61aee9f10b180..345fcd2bbe7bf 100644
--- a/code/modules/mob/living/basic/bots/bot_hud.dm
+++ b/code/modules/mob/living/basic/bots/bot_hud.dm
@@ -47,12 +47,14 @@
if(isnull(ai_controller))
return
+ //Removes path images and handles removing hud client images
clear_path_hud()
+ var/list/path_huds_watching_me = list(GLOB.huds[DATA_HUD_DIAGNOSTIC], GLOB.huds[DATA_HUD_BOT_PATH])
+
var/list/path_images = active_hud_list[DIAG_PATH_HUD]
LAZYCLEARLIST(path_images)
- var/list/path_huds_watching_me = list(GLOB.huds[DATA_HUD_DIAGNOSTIC], GLOB.huds[DATA_HUD_BOT_PATH])
var/atom/move_target = ai_controller.current_movement_target
if(move_target != ai_controller.blackboard[BB_BEACON_TARGET])
@@ -62,9 +64,6 @@
if(!length(our_path))
return
- for(var/datum/atom_hud/hud as anything in path_huds_watching_me)
- hud.remove_atom_from_hud(src)
-
for(var/index in 1 to our_path.len)
if(index == 1 || index == our_path.len)
continue
@@ -75,7 +74,9 @@
var/next_direction = get_dir(previous_turf, next_turf)
var/previous_direction = get_dir(current_turf, previous_turf)
- var/image/path_display = image(icon = path_image_icon, loc = current_turf, icon_state = path_image_icon_state, layer = GAME_PLANE, dir = next_direction)
+ var/image/path_display = image(icon = path_image_icon, loc = current_turf, icon_state = path_image_icon_state, layer = BOT_PATH_LAYER, dir = next_direction)
+
+ SET_PLANE(path_display, GAME_PLANE, current_turf)
if((ISDIAGONALDIR(next_direction) && (previous_direction & (NORTH|SOUTH))))
var/turn_value = (next_direction == SOUTHWEST || next_direction == NORTHEAST) ? 90 : -90
@@ -118,3 +119,8 @@
animate(our_image, alpha = 0, time = 0.3 SECONDS)
current_pathed_turfs -= index
+ // Call hud remove handlers to ensure viewing user client images are removed
+ var/list/path_huds_watching_me = list(GLOB.huds[DATA_HUD_DIAGNOSTIC], GLOB.huds[DATA_HUD_BOT_PATH])
+ for(var/datum/atom_hud/hud as anything in path_huds_watching_me)
+ hud.remove_atom_from_hud(src)
+
diff --git a/code/modules/mob/living/basic/bots/cleanbot/cleanbot.dm b/code/modules/mob/living/basic/bots/cleanbot/cleanbot.dm
index cd30dd4057d0e..1e2bfdb732b16 100644
--- a/code/modules/mob/living/basic/bots/cleanbot/cleanbot.dm
+++ b/code/modules/mob/living/basic/bots/cleanbot/cleanbot.dm
@@ -239,7 +239,8 @@
// Actions received from TGUI
/mob/living/basic/bot/cleanbot/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
- if(. || (bot_access_flags & BOT_COVER_LOCKED) && !HAS_SILICON_ACCESS(ui.user))
+ var/mob/user = ui.user
+ if(. || (bot_access_flags & BOT_COVER_LOCKED) && !HAS_SILICON_ACCESS(user))
return
switch(action)
diff --git a/code/modules/mob/living/basic/bots/firebot/firebot.dm b/code/modules/mob/living/basic/bots/firebot/firebot.dm
index e6eeaa2031cc6..921909aa8a531 100644
--- a/code/modules/mob/living/basic/bots/firebot/firebot.dm
+++ b/code/modules/mob/living/basic/bots/firebot/firebot.dm
@@ -112,9 +112,10 @@
return data
// Actions received from TGUI
-/mob/living/basic/bot/firebot/ui_act(action, params)
+/mob/living/basic/bot/firebot/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
- if(. || (bot_access_flags & BOT_COVER_LOCKED && !HAS_SILICON_ACCESS(usr)))
+ var/mob/user = ui.user
+ if(. || (bot_access_flags & BOT_COVER_LOCKED && !HAS_SILICON_ACCESS(user)))
return
switch(action)
diff --git a/code/modules/mob/living/basic/bots/honkbots/honkbot.dm b/code/modules/mob/living/basic/bots/honkbots/honkbot.dm
index 7f869995c31a3..38884bec503da 100644
--- a/code/modules/mob/living/basic/bots/honkbots/honkbot.dm
+++ b/code/modules/mob/living/basic/bots/honkbots/honkbot.dm
@@ -88,7 +88,7 @@
/mob/living/basic/bot/honkbot/ui_data(mob/user)
var/list/data = ..()
- if(!(bot_access_flags & BOT_COVER_LOCKED) || issilicon(user) || isAdminGhostAI(user))
+ if(!(bot_access_flags & BOT_COVER_LOCKED) || HAS_SILICON_ACCESS(user))
data["custom_controls"]["slip_people"] = honkbot_flags & HONKBOT_MODE_SLIP
data["custom_controls"]["fake_cuff"] = honkbot_flags & HONKBOT_HANDCUFF_TARGET
data["custom_controls"]["check_ids"] = honkbot_flags & HONKBOT_CHECK_IDS
@@ -97,7 +97,8 @@
/mob/living/basic/bot/honkbot/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
- if(. || !isliving(ui.user) || (bot_access_flags & BOT_COVER_LOCKED) && !(ui.user.has_unlimited_silicon_privilege))
+ var/mob/user = ui.user
+ if(. || !isliving(user) || (bot_access_flags & BOT_COVER_LOCKED) && !HAS_SILICON_ACCESS(user))
return
switch(action)
if("slip_people")
diff --git a/code/modules/mob/living/basic/bots/medbot/medbot.dm b/code/modules/mob/living/basic/bots/medbot/medbot.dm
index 945dd5c709fb6..7b100aa554582 100644
--- a/code/modules/mob/living/basic/bots/medbot/medbot.dm
+++ b/code/modules/mob/living/basic/bots/medbot/medbot.dm
@@ -210,9 +210,9 @@
// Actions received from TGUI
/mob/living/basic/bot/medbot/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
- if(. || !isliving(ui.user) || (bot_access_flags & BOT_COVER_LOCKED) && !HAS_SILICON_ACCESS(ui.user))
+ var/mob/user = ui.user
+ if(. || !isliving(ui.user) || (bot_access_flags & BOT_COVER_LOCKED) && !HAS_SILICON_ACCESS(user))
return
- var/mob/living/our_user = ui.user
switch(action)
if("heal_threshold")
var/adjust_num = round(text2num(params["threshold"]))
@@ -229,7 +229,7 @@
medical_mode_flags ^= MEDBOT_STATIONARY_MODE
if("sync_tech")
if(!linked_techweb)
- to_chat(our_user, span_notice("No research techweb connected."))
+ to_chat(user, span_notice("No research techweb connected."))
return
var/oldheal_amount = heal_amount
var/tech_boosters
diff --git a/code/modules/mob/living/basic/drone/_drone.dm b/code/modules/mob/living/basic/drone/_drone.dm
index 6501e35d51dc2..983ade8de0bcc 100644
--- a/code/modules/mob/living/basic/drone/_drone.dm
+++ b/code/modules/mob/living/basic/drone/_drone.dm
@@ -37,7 +37,6 @@
bubble_icon = "machine"
initial_language_holder = /datum/language_holder/drone
mob_size = MOB_SIZE_SMALL
- has_unlimited_silicon_privilege = TRUE
damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, STAMINA = 0, OXY = 0)
hud_possible = list(DIAG_STAT_HUD, DIAG_HUD, ANTAG_HUD)
unique_name = TRUE
@@ -202,7 +201,16 @@
for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
diag_hud.add_atom_to_hud(src)
- add_traits(list(TRAIT_VENTCRAWLER_ALWAYS, TRAIT_NEGATES_GRAVITY, TRAIT_LITERATE, TRAIT_KNOW_ENGI_WIRES, TRAIT_ADVANCEDTOOLUSER), INNATE_TRAIT)
+ add_traits(list(
+ TRAIT_VENTCRAWLER_ALWAYS,
+ TRAIT_NEGATES_GRAVITY,
+ TRAIT_LITERATE,
+ TRAIT_KNOW_ENGI_WIRES,
+ TRAIT_ADVANCEDTOOLUSER,
+ TRAIT_SILICON_ACCESS,
+ TRAIT_REAGENT_SCANNER,
+ TRAIT_UNOBSERVANT,
+ ), INNATE_TRAIT)
listener = new(list(ALARM_ATMOS, ALARM_FIRE, ALARM_POWER), list(z))
RegisterSignal(listener, COMSIG_ALARM_LISTENER_TRIGGERED, PROC_REF(alarm_triggered))
@@ -222,7 +230,7 @@
holder.pixel_y = hud_icon.Height() - world.icon_size
if(stat == DEAD)
holder.icon_state = "huddead2"
- else if(incapacitated())
+ else if(incapacitated)
holder.icon_state = "hudoffline"
else
holder.icon_state = "hudstat"
diff --git a/code/modules/mob/living/basic/drone/drone_tools.dm b/code/modules/mob/living/basic/drone/drone_tools.dm
index 32ec1bb152848..7effefcd7f906 100644
--- a/code/modules/mob/living/basic/drone/drone_tools.dm
+++ b/code/modules/mob/living/basic/drone/drone_tools.dm
@@ -25,7 +25,7 @@
atom_storage.max_total_storage = 40
atom_storage.max_specific_storage = WEIGHT_CLASS_NORMAL
atom_storage.max_slots = 10
- atom_storage.rustle_sound = FALSE
+ atom_storage.do_rustle = FALSE
atom_storage.set_holdable(drone_builtins)
diff --git a/code/modules/mob/living/basic/drone/visuals_icons.dm b/code/modules/mob/living/basic/drone/visuals_icons.dm
index 7a2122022f81b..32ff97da305a1 100644
--- a/code/modules/mob/living/basic/drone/visuals_icons.dm
+++ b/code/modules/mob/living/basic/drone/visuals_icons.dm
@@ -108,7 +108,7 @@
/mob/living/basic/drone/proc/check_menu()
if(!istype(src))
return FALSE
- if(incapacitated())
+ if(incapacitated)
return FALSE
return TRUE
diff --git a/code/modules/mob/living/basic/farm_animals/deer.dm b/code/modules/mob/living/basic/farm_animals/deer/deer.dm
similarity index 74%
rename from code/modules/mob/living/basic/farm_animals/deer.dm
rename to code/modules/mob/living/basic/farm_animals/deer/deer.dm
index c51be81b77d04..eb443def65996 100644
--- a/code/modules/mob/living/basic/farm_animals/deer.dm
+++ b/code/modules/mob/living/basic/farm_animals/deer/deer.dm
@@ -24,28 +24,16 @@
/// Things that will scare us into being stationary. Vehicles are scary to deers because they might have headlights.
var/static/list/stationary_scary_things = list(/obj/vehicle)
+
/mob/living/basic/deer/Initialize(mapload)
. = ..()
+ AddElement(/datum/element/ai_retaliate)
AddElement(/datum/element/footstep, footstep_type = FOOTSTEP_MOB_SHOE)
var/time_to_freeze_for = (rand(5, 10) SECONDS)
ai_controller.set_blackboard_key(BB_STATIONARY_SECONDS, time_to_freeze_for)
ai_controller.set_blackboard_key(BB_STATIONARY_COOLDOWN, (time_to_freeze_for * (rand(3, 5))))
ai_controller.set_blackboard_key(BB_STATIONARY_TARGETS, typecacheof(stationary_scary_things))
-/datum/ai_controller/basic_controller/deer
- blackboard = list(
- BB_STATIONARY_MOVE_TO_TARGET = TRUE,
- BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic,
- )
- ai_traits = STOP_MOVING_WHEN_PULLED
- ai_movement = /datum/ai_movement/basic_avoidance
- idle_behavior = /datum/idle_behavior/idle_random_walk
- planning_subtrees = list(
- /datum/ai_planning_subtree/random_speech/deer,
- /datum/ai_planning_subtree/stare_at_thing,
- /datum/ai_planning_subtree/find_nearest_thing_which_attacked_me_to_flee,
- /datum/ai_planning_subtree/flee_target,
- )
/// Cold resistent and doesn't need to breathe
/mob/living/basic/deer/ice
diff --git a/code/modules/mob/living/basic/farm_animals/deer/deer_ai.dm b/code/modules/mob/living/basic/farm_animals/deer/deer_ai.dm
new file mode 100644
index 0000000000000..f17e0c9014fba
--- /dev/null
+++ b/code/modules/mob/living/basic/farm_animals/deer/deer_ai.dm
@@ -0,0 +1,156 @@
+/datum/ai_controller/basic_controller/deer
+ blackboard = list(
+ BB_STATIONARY_MOVE_TO_TARGET = TRUE,
+ BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic,
+ )
+ ai_traits = STOP_MOVING_WHEN_PULLED
+ ai_movement = /datum/ai_movement/basic_avoidance
+ idle_behavior = /datum/idle_behavior/idle_random_walk
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/random_speech/deer,
+ /datum/ai_planning_subtree/stare_at_thing,
+ /datum/ai_planning_subtree/find_nearest_thing_which_attacked_me_to_flee,
+ /datum/ai_planning_subtree/flee_target,
+ /datum/ai_planning_subtree/rest_at_home,
+ /datum/ai_planning_subtree/play_with_friends,
+ /datum/ai_planning_subtree/find_and_hunt_target/mark_territory,
+ /datum/ai_planning_subtree/find_and_hunt_target/graze,
+ /datum/ai_planning_subtree/find_and_hunt_target/drink_water,
+ )
+
+
+///subtree to go around drinking water
+/datum/ai_planning_subtree/find_and_hunt_target/drink_water
+ target_key = BB_DEER_WATER_TARGET
+ finding_behavior = /datum/ai_behavior/find_and_set/in_list/turf_types
+ hunting_behavior = /datum/ai_behavior/hunt_target/drink_water
+ hunt_targets = list(/turf/open/water)
+ hunt_range = 7
+ hunt_chance = 5
+
+
+/datum/ai_behavior/hunt_target/drink_water
+ always_reset_target = TRUE
+ hunt_cooldown = 20 SECONDS
+
+
+/datum/ai_behavior/hunt_target/drink_water/target_caught(mob/living/hunter, atom/hunted)
+ var/static/list/possible_emotes = list("drinks the water!", "dances in the water!", "splashes around happily!")
+ hunter.manual_emote(pick(possible_emotes))
+
+
+///subtree to go around grazing
+/datum/ai_planning_subtree/find_and_hunt_target/graze
+ target_key = BB_DEER_GRASS_TARGET
+ finding_behavior = /datum/ai_behavior/find_and_set/in_list/turf_types
+ hunting_behavior = /datum/ai_behavior/hunt_target/eat_grass
+ hunt_targets = list(/turf/open/floor/grass)
+ hunt_range = 7
+ hunt_chance = 45
+
+
+/datum/ai_behavior/hunt_target/eat_grass
+ always_reset_target = TRUE
+ hunt_cooldown = 15 SECONDS
+
+
+/datum/ai_behavior/hunt_target/eat_grass/target_caught(mob/living/hunter, atom/hunted)
+ var/static/list/possible_emotes = list("eats the grass!", "munches down the grass!", "chews on the grass!")
+ hunter.manual_emote(pick(possible_emotes))
+
+
+///subtree to go around playing with other deers
+/datum/ai_planning_subtree/play_with_friends
+
+
+/datum/ai_planning_subtree/play_with_friends/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
+ var/static/list/emote_list = list("plays with", "dances with", "celebrates with")
+ var/static/list/friend_types = typecacheof(list(/mob/living/basic/deer))
+ if(controller.blackboard_key_exists(BB_DEER_PLAYFRIEND))
+ controller.queue_behavior(/datum/ai_behavior/emote_on_target, BB_DEER_PLAYFRIEND, emote_list)
+ if(SPT_PROB(3, seconds_per_tick))
+ controller.queue_behavior(/datum/ai_behavior/find_hunt_target/valid_deer, BB_DEER_PLAYFRIEND, friend_types)
+ return SUBTREE_RETURN_FINISH_PLANNING
+
+
+/datum/ai_behavior/emote_on_target/deer_play
+
+
+/datum/ai_behavior/emote_on_target/deer_play/run_emote(mob/living/living_pawn, atom/target, list/emote_list)
+ . = ..()
+ living_pawn.spin(spintime = 4, speed = 1)
+
+
+/datum/ai_behavior/find_hunt_target/valid_deer/valid_dinner(mob/living/source, mob/living/deer, radius, datum/ai_controller/controller, seconds_per_tick)
+ if(deer.stat == DEAD)
+ return FALSE
+ if(!can_see(source, deer, radius))
+ return FALSE
+ deer.ai_controller?.set_blackboard_key(BB_DEER_PLAYFRIEND, source)
+ return can_see(source, deer, radius)
+
+
+///subtree to mark trees as territories
+/datum/ai_planning_subtree/find_and_hunt_target/mark_territory
+ target_key = BB_DEER_TREE_TARGET
+ finding_behavior = /datum/ai_behavior/find_hunt_target
+ hunting_behavior = /datum/ai_behavior/hunt_target/mark_territory
+ hunt_targets = list(/obj/structure/flora/tree)
+ hunt_range = 7
+ hunt_chance = 75
+
+
+/datum/ai_behavior/hunt_target/mark_territory
+ always_reset_target = TRUE
+ hunt_cooldown = 15 SECONDS
+
+
+/datum/ai_behavior/hunt_target/mark_territory/target_caught(mob/living/hunter, atom/hunted)
+ hunter.manual_emote("marks [hunted] with its hooves!")
+ hunter.ai_controller.set_blackboard_key(BB_DEER_TREEHOME, hunted)
+
+
+/datum/ai_planning_subtree/find_and_hunt_target/mark_territory/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
+ if(controller.blackboard_key_exists(BB_DEER_TREEHOME)) //already found our home, abort!
+ return
+ return ..()
+
+
+/datum/ai_planning_subtree/rest_at_home/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
+ if(controller.blackboard[BB_DEER_RESTING] > world.time) //we're resting for now, nothing more to do
+ return SUBTREE_RETURN_FINISH_PLANNING
+ if(!controller.blackboard_key_exists(BB_DEER_TREEHOME) || controller.blackboard[BB_DEER_NEXT_REST_TIMER] > world.time)
+ return
+ controller.queue_behavior(/datum/ai_behavior/return_home, BB_DEER_TREEHOME)
+
+
+/datum/ai_behavior/return_home
+ required_distance = 0
+ behavior_flags = AI_BEHAVIOR_REQUIRE_MOVEMENT | AI_BEHAVIOR_CAN_PLAN_DURING_EXECUTION
+ ///minimum time till next rest
+ var/minimum_time = 2 MINUTES
+ ///maximum time till next rest
+ var/maximum_time = 4 MINUTES
+
+
+/datum/ai_behavior/return_home/setup(datum/ai_controller/controller, target_key)
+ . = ..()
+ var/atom/target = controller.blackboard[target_key]
+ if(QDELETED(target))
+ return FALSE
+ var/list/possible_turfs = get_adjacent_open_turfs(target)
+ shuffle_inplace(possible_turfs)
+ for(var/turf/possible_turf as anything in possible_turfs)
+ if(!possible_turf.is_blocked_turf())
+ set_movement_target(controller, possible_turf)
+ return TRUE
+ return FALSE
+
+
+/datum/ai_behavior/return_home/perform(seconds_per_tick, datum/ai_controller/controller, target_key)
+ var/mob/living/living_pawn = controller.pawn
+ var/static/list/possible_emotes = list("rests its legs...", "yawns and naps...", "curls up and rests...")
+ living_pawn.manual_emote(pick(possible_emotes))
+ controller.set_blackboard_key(BB_DEER_RESTING, world.time + 15 SECONDS)
+ controller.set_blackboard_key(BB_DEER_NEXT_REST_TIMER, world.time + rand(minimum_time, maximum_time))
+ return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_SUCCEEDED
diff --git a/code/modules/mob/living/basic/guardian/guardian_creator.dm b/code/modules/mob/living/basic/guardian/guardian_creator.dm
index 441a60124a7bf..08a28041cc845 100644
--- a/code/modules/mob/living/basic/guardian/guardian_creator.dm
+++ b/code/modules/mob/living/basic/guardian/guardian_creator.dm
@@ -129,7 +129,7 @@ GLOBAL_LIST_INIT(guardian_radial_images, setup_guardian_radial())
/obj/item/guardian_creator/proc/check_menu(mob/living/user)
if(!istype(user))
return FALSE
- if(user.incapacitated() || !user.is_holding(src) || used)
+ if(user.incapacitated || !user.is_holding(src) || used)
return FALSE
return TRUE
diff --git a/code/modules/mob/living/basic/lavaland/brimdemon/brimdemon_loot.dm b/code/modules/mob/living/basic/lavaland/brimdemon/brimdemon_loot.dm
index 11fd7b6aa260f..0556affe76184 100644
--- a/code/modules/mob/living/basic/lavaland/brimdemon/brimdemon_loot.dm
+++ b/code/modules/mob/living/basic/lavaland/brimdemon/brimdemon_loot.dm
@@ -8,7 +8,7 @@
var/static/list/comic_phrases = list("BOOM", "BANG", "KABLOW", "KAPOW", "OUCH", "BAM", "KAPOW", "WHAM", "POW", "KABOOM")
/obj/item/crusher_trophy/brimdemon_fang/effect_desc()
- return "mark detonation creates visual and audiosensory effects on the target"
+ return "mark detonation to create visual and audiosensory effects at the target"
/obj/item/crusher_trophy/brimdemon_fang/on_mark_detonation(mob/living/target, mob/living/user)
target.balloon_alert_to_viewers("[pick(comic_phrases)]!")
diff --git a/code/modules/mob/living/basic/lavaland/legion/legion.dm b/code/modules/mob/living/basic/lavaland/legion/legion.dm
index 1abd916461bb8..12bf6555d97d4 100644
--- a/code/modules/mob/living/basic/lavaland/legion/legion.dm
+++ b/code/modules/mob/living/basic/lavaland/legion/legion.dm
@@ -10,7 +10,7 @@
icon_living = "legion"
icon_dead = "legion"
icon_gib = "syndicate_gib"
- mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
+ mob_biotypes = MOB_ORGANIC|MOB_SPECIAL|MOB_UNDEAD
basic_mob_flags = DEL_ON_DEATH
speed = 3
maxHealth = 75
diff --git a/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity.dm b/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity.dm
index 7dcbc4ae325b0..8c879d3ab48c8 100644
--- a/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity.dm
+++ b/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity.dm
@@ -45,6 +45,7 @@
AddElement(/datum/element/mob_grabber)
AddElement(/datum/element/footstep, FOOTSTEP_MOB_CLAW)
AddElement(/datum/element/basic_eating, food_types = target_foods)
+ AddComponent(/datum/component/speechmod, replacements = strings("crustacean_replacement.json", "crustacean"))
AddComponent(\
/datum/component/amputating_limbs,\
surgery_time = snip_speed, \
diff --git a/code/modules/mob/living/basic/lavaland/raptor/raptor_ai_controller.dm b/code/modules/mob/living/basic/lavaland/raptor/raptor_ai_controller.dm
index 7ae64e9fb8a5c..a23bcf7801b2e 100644
--- a/code/modules/mob/living/basic/lavaland/raptor/raptor_ai_controller.dm
+++ b/code/modules/mob/living/basic/lavaland/raptor/raptor_ai_controller.dm
@@ -46,9 +46,10 @@
/datum/targeting_strategy/basic/raptor
-//dont attack anyone with the neutral faction.
+//dont attack anyone that shares our factions.
/datum/targeting_strategy/basic/raptor/faction_check(datum/ai_controller/controller, mob/living/living_mob, mob/living/the_target)
- return (the_target.faction.Find(FACTION_NEUTRAL) || the_target.faction.Find(FACTION_RAPTOR))
+ . = ..()
+ return .
/datum/ai_controller/basic_controller/baby_raptor
blackboard = list(
diff --git a/code/modules/mob/living/basic/revolutionary.dm b/code/modules/mob/living/basic/revolutionary.dm
new file mode 100644
index 0000000000000..407f2c0997504
--- /dev/null
+++ b/code/modules/mob/living/basic/revolutionary.dm
@@ -0,0 +1,146 @@
+/mob/living/basic/revolutionary
+ name = "Revolutionary"
+ desc = "They stand for a cause..."
+ mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
+ faction = list(FACTION_HOSTILE)
+ icon = 'icons/mob/simple/simple_human.dmi'
+ gender = MALE
+ basic_mob_flags = DEL_ON_DEATH
+ attack_verb_continuous = "robusts"
+ attack_verb_simple = "robust"
+ maxHealth = 50
+ health = 50
+ melee_damage_lower = 15
+ melee_damage_upper = 20
+ obj_damage = 20
+ attack_sound = 'sound/weapons/smash.ogg'
+ ai_controller = /datum/ai_controller/basic_controller/revolutionary
+ /// list of weapons we can have
+ var/static/list/possible_weapons = list(
+ /obj/item/storage/toolbox/mechanical = "robust",
+ /obj/item/spear = "pierce",
+ /obj/item/fireaxe = "slice",
+ /obj/item/melee/baseball_bat = "bat",
+ /obj/item/melee/baton = "discipline",
+ )
+ /// List of things to shout
+ var/static/list/phrases = list(
+ "The revolution will not be televized!",
+ "VIVA!",
+ "Dirty pig!",
+ "Gondola meat is murder!",
+ "Free Cargonia!",
+ "Mime rights are human rights!",
+ "猫娘 Free Terry!",
+ )
+ /// List of causes to #support
+ var/static/list/causes = list(
+ "Worker's rights",
+ "Icemoon climate change",
+ "Fair clown treatment",
+ "Lizards",
+ "Moths",
+ "Stop Lavaland drilling",
+ "The Captain has been replaced by a robot",
+ "Free Cargonia",
+ "Befriend all space dragons",
+ "The Grey Tide",
+ "Rising cost of medbay",
+ )
+ /// Monkey screeches
+ var/static/list/monkey_screeches = list(
+ 'sound/creatures/monkey/monkey_screech_1.ogg',
+ 'sound/creatures/monkey/monkey_screech_2.ogg',
+ 'sound/creatures/monkey/monkey_screech_3.ogg',
+ 'sound/creatures/monkey/monkey_screech_4.ogg',
+ )
+ /// Male screams
+ var/static/list/male_screams = list(
+ 'sound/voice/human/malescream_1.ogg',
+ 'sound/voice/human/malescream_2.ogg',
+ 'sound/voice/human/malescream_3.ogg',
+ 'sound/voice/human/malescream_4.ogg',
+ 'sound/voice/human/malescream_5.ogg',
+ )
+ /// Female screams
+ var/static/list/female_screams = list(
+ 'sound/voice/human/femalescream_1.ogg',
+ 'sound/voice/human/femalescream_2.ogg',
+ 'sound/voice/human/femalescream_3.ogg',
+ 'sound/voice/human/femalescream_4.ogg',
+ 'sound/voice/human/femalescream_5.ogg',
+ )
+
+
+/mob/living/basic/revolutionary/Initialize(mapload)
+ . = ..()
+ shuffle_inplace(phrases)
+ var/static/list/display_emote = list(
+ BB_EMOTE_SAY = phrases,
+ BB_EMOTE_SOUND = monkey_screeches,
+ BB_SPEAK_CHANCE = 5,
+ )
+ ai_controller.set_blackboard_key(BB_BASIC_MOB_SPEAK_LINES, display_emote)
+ var/obj/item/weapon_of_choice = pick(possible_weapons)
+ attack_sound = weapon_of_choice::hitsound
+ attack_verb_simple = possible_weapons[weapon_of_choice]
+ attack_verb_continuous = "[attack_verb_simple]s"
+
+ var/static/list/death_loot = list(/obj/effect/mob_spawn/corpse/human/revolutionary)
+ AddElement(/datum/element/death_drops, death_loot)
+ apply_dynamic_human_appearance(src, mob_spawn_path = /obj/effect/mob_spawn/corpse/human/revolutionary, l_hand = weapon_of_choice)
+
+ gender = pick(MALE, FEMALE, PLURAL)
+ var/first_name
+ switch(gender)
+ if(MALE)
+ first_name = pick(GLOB.first_names_male)
+ death_sound = pick(male_screams + monkey_screeches)
+ if(FEMALE)
+ first_name = pick(GLOB.first_names_female)
+ death_sound = pick(female_screams + monkey_screeches)
+ if(PLURAL)
+ first_name = pick(GLOB.first_names)
+ death_sound = pick(male_screams + female_screams + monkey_screeches)
+
+ fully_replace_character_name(name, "[first_name] [pick(GLOB.last_names)]")
+ desc += span_infoplain("\nToday, that cause is: ")
+ shuffle_inplace(causes)
+ desc += span_notice("#[pick(causes)].")
+
+
+/obj/effect/mob_spawn/corpse/human/revolutionary
+ name = "Revolutionary"
+ outfit = /datum/outfit/revolution
+
+
+/datum/outfit/revolution
+ name = "Revolution"
+ uniform = /obj/item/clothing/under/color/grey
+ head = /obj/item/clothing/head/costume/ushanka
+ mask = /obj/item/clothing/mask/gas
+ gloves = /obj/item/clothing/gloves/color/black
+ shoes = /obj/item/clothing/shoes/jackboots
+
+
+/datum/ai_controller/basic_controller/revolutionary
+ blackboard = list(
+ BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic,
+ )
+ ai_movement = /datum/ai_movement/basic_avoidance
+ idle_behavior = /datum/idle_behavior/idle_random_walk/less_walking
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/random_speech/blackboard/revolutionary,
+ /datum/ai_planning_subtree/simple_find_target,
+ /datum/ai_planning_subtree/basic_melee_attack_subtree,
+ )
+
+
+/datum/ai_planning_subtree/random_speech/blackboard/revolutionary
+
+
+/datum/ai_planning_subtree/random_speech/blackboard/revolutionary/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
+ if(!controller.blackboard_key_exists(BB_BASIC_MOB_CURRENT_TARGET))
+ return
+
+ return ..()
diff --git a/code/modules/mob/living/basic/slime/ai/behaviours.dm b/code/modules/mob/living/basic/slime/ai/behaviours.dm
index 1cd4677994531..35fe1a60c91a1 100644
--- a/code/modules/mob/living/basic/slime/ai/behaviours.dm
+++ b/code/modules/mob/living/basic/slime/ai/behaviours.dm
@@ -30,14 +30,14 @@
/datum/ai_behavior/find_hunt_target/find_slime_food/valid_dinner(mob/living/basic/slime/hunter, mob/living/dinner, radius, datum/ai_controller/controller, seconds_per_tick)
if(REF(dinner) in hunter.faction) //Don't eat our friends...
- return
+ return FALSE
var/static/list/slime_faction = list(FACTION_SLIME)
if(faction_check(slime_faction, dinner.faction)) //Don't try to eat slimy things, no matter how hungry we are. Anyone else can be betrayed.
- return
+ return FALSE
if(!hunter.can_feed_on(dinner, check_adjacent = FALSE)) //Are they tasty to slimes?
- return
+ return FALSE
//If we are retaliating on someone edible, lets eat them instead
if(dinner == controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET])
@@ -57,6 +57,10 @@
/datum/ai_behavior/hunt_target/unarmed_attack_target/slime
/datum/ai_behavior/hunt_target/unarmed_attack_target/slime/target_caught(mob/living/basic/slime/hunter, mob/living/hunted)
+ if (!hunter.can_feed_on(hunted)) // Target is no longer edible
+ hunter.UnarmedAttack(hunted, TRUE)
+ return
+
if((hunted.body_position != STANDING_UP) || prob(20)) //Not standing, or we rolled well? Feed.
hunter.start_feeding(hunted)
return
@@ -69,6 +73,7 @@
/datum/ai_behavior/hunt_target/unarmed_attack_target/slime/finish_action(datum/ai_controller/controller, succeeded, hunting_target_key, hunting_cooldown_key)
. = ..()
- var/mob/living/living_pawn = controller.pawn
- if(living_pawn.buckled)
+ var/mob/living/basic/slime/slime_pawn = controller.pawn
+ var/atom/target = controller.blackboard[hunting_target_key]
+ if(!slime_pawn.can_feed_on(target))
controller.clear_blackboard_key(hunting_target_key)
diff --git a/code/modules/mob/living/basic/slime/ai/subtrees.dm b/code/modules/mob/living/basic/slime/ai/subtrees.dm
index 66c01e6f6c3c6..056befece5d4b 100644
--- a/code/modules/mob/living/basic/slime/ai/subtrees.dm
+++ b/code/modules/mob/living/basic/slime/ai/subtrees.dm
@@ -31,11 +31,11 @@
/datum/ai_planning_subtree/find_and_hunt_target/find_slime_food/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
var/mob/living/living_pawn = controller.pawn
if(living_pawn.buckled)
- return FALSE
+ return
//Slimes don't want to hunt if they are neither rabid, hungry or feeling attack right now
if( (controller.blackboard[BB_SLIME_HUNGER_LEVEL] == SLIME_HUNGER_NONE) && !controller.blackboard[BB_SLIME_RABID] && isnull(controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET]))
- return FALSE
+ return
return ..()
diff --git a/code/modules/mob/living/basic/slime/feeding.dm b/code/modules/mob/living/basic/slime/feeding.dm
index 2c69aad800113..064ec441cb60b 100644
--- a/code/modules/mob/living/basic/slime/feeding.dm
+++ b/code/modules/mob/living/basic/slime/feeding.dm
@@ -20,7 +20,7 @@
if(check_friendship && (REF(meal) in faction))
return FALSE
- if(check_adjacent && !Adjacent(meal))
+ if(check_adjacent && (!Adjacent(meal) || !isturf(loc)))
return FALSE
if(meal.stat == DEAD)
diff --git a/code/modules/mob/living/basic/slime/slime.dm b/code/modules/mob/living/basic/slime/slime.dm
index 352a8149ca616..6adf4e35f3582 100644
--- a/code/modules/mob/living/basic/slime/slime.dm
+++ b/code/modules/mob/living/basic/slime/slime.dm
@@ -286,7 +286,7 @@
/mob/living/basic/slime/proc/on_slime_pre_attack(mob/living/basic/slime/our_slime, atom/target, proximity, modifiers)
SIGNAL_HANDLER
- if(LAZYACCESS(modifiers, RIGHT_CLICK) && isliving(target) && target != src && usr == src)
+ if(LAZYACCESS(modifiers, RIGHT_CLICK) && isliving(target) && target != src)
if(our_slime.can_feed_on(target))
our_slime.start_feeding(target)
return COMPONENT_HOSTILE_NO_ATTACK
diff --git a/code/modules/mob/living/basic/space_fauna/carp/carp.dm b/code/modules/mob/living/basic/space_fauna/carp/carp.dm
index 816bb7cd838e1..1d32b7809a89e 100644
--- a/code/modules/mob/living/basic/space_fauna/carp/carp.dm
+++ b/code/modules/mob/living/basic/space_fauna/carp/carp.dm
@@ -44,6 +44,8 @@
minimum_survivable_temperature = 0
maximum_survivable_temperature = 1500
+ /// If true we will run away from attackers even at full health
+ var/cowardly = FALSE
/// Cytology cells you can swab from this creature
var/cell_line = CELL_LINE_TABLE_CARP
/// What colour is our 'healing' outline?
@@ -88,7 +90,8 @@
if (cell_line)
AddElement(/datum/element/swabable, cell_line, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5)
AddElement(/datum/element/simple_flying)
- AddElement(/datum/element/ai_flee_while_injured)
+ if (!cowardly)
+ AddElement(/datum/element/ai_flee_while_injured)
setup_eating()
AddComponent(/datum/component/aggro_emote, emote_list = string_list(list("gnashes")))
@@ -267,8 +270,8 @@
///Wild carp that just vibe ya know
/mob/living/basic/carp/passive
- name = "passive carp"
- desc = "A timid, sucker-bearing creature that resembles a fish. "
+ name = "false carp"
+ desc = "A close relative of the space carp which is entirely toothless and feeds by stealing its cousin's leftovers."
icon_state = "base_friend"
icon_living = "base_friend"
@@ -278,11 +281,19 @@
attack_verb_continuous = "suckers"
attack_verb_simple = "suck"
- melee_damage_lower = 4
- melee_damage_upper = 4
+ melee_damage_lower = 0
+ melee_damage_upper = 0
+ cowardly = TRUE
ai_controller = /datum/ai_controller/basic_controller/carp/passive
+ gold_core_spawnable = FRIENDLY_SPAWN
/mob/living/basic/carp/passive/Initialize(mapload)
. = ..()
- AddElement(/datum/element/ai_retaliate)
+ AddComponent(/datum/component/ai_retaliate_advanced, CALLBACK(src, PROC_REF(on_attacked)))
AddElement(/datum/element/pet_bonus, "bloops happily!")
+ ADD_TRAIT(src, TRAIT_PACIFISM, INNATE_TRAIT)
+
+/// If someone slaps one of the school, scatter
+/mob/living/basic/carp/passive/proc/on_attacked(mob/living/attacker)
+ for(var/mob/living/basic/carp/passive/schoolmate in oview(src, 9))
+ schoolmate.ai_controller?.insert_blackboard_key_lazylist(BB_BASIC_MOB_RETALIATE_LIST, attacker)
diff --git a/code/modules/mob/living/basic/space_fauna/carp/carp_abilities.dm b/code/modules/mob/living/basic/space_fauna/carp/carp_abilities.dm
index 9a6aea8eff1d2..322d4db193c21 100644
--- a/code/modules/mob/living/basic/space_fauna/carp/carp_abilities.dm
+++ b/code/modules/mob/living/basic/space_fauna/carp/carp_abilities.dm
@@ -28,6 +28,11 @@
projectile_type = pick(permitted_projectiles)
return ..()
+/datum/action/cooldown/mob_cooldown/projectile_attack/magicarp_bolt/InterceptClickOn(mob/living/caller, params, atom/target)
+ if (!caller.combat_mode)
+ return FALSE
+ return ..()
+
/**
* # Lesser Carp Rift
* Teleport a short distance and leave a short-lived portal for people to follow through
diff --git a/code/modules/mob/living/basic/space_fauna/carp/carp_ai_rift_actions.dm b/code/modules/mob/living/basic/space_fauna/carp/carp_ai_rift_actions.dm
index f104d3566b347..260dce64bdc29 100644
--- a/code/modules/mob/living/basic/space_fauna/carp/carp_ai_rift_actions.dm
+++ b/code/modules/mob/living/basic/space_fauna/carp/carp_ai_rift_actions.dm
@@ -7,18 +7,20 @@
var/datum/ai_behavior/rift_behaviour
/// If true we finish planning after this
var/finish_planning = FALSE
+ /// Key to read for flee target
+ var/target_key = BB_BASIC_MOB_CURRENT_TARGET
/datum/ai_planning_subtree/make_carp_rift/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
if (!rift_behaviour)
CRASH("Forgot to specify rift behaviour for [src]")
- if (!controller.blackboard_key_exists(BB_BASIC_MOB_CURRENT_TARGET))
+ if (!controller.blackboard_key_exists(target_key))
return
var/datum/action/cooldown/using_action = controller.blackboard[BB_CARP_RIFT]
if (!using_action?.IsAvailable())
return
- controller.queue_behavior(rift_behaviour, BB_CARP_RIFT, BB_BASIC_MOB_CURRENT_TARGET)
+ controller.queue_behavior(rift_behaviour, BB_CARP_RIFT, target_key)
if (finish_planning)
return SUBTREE_RETURN_FINISH_PLANNING
@@ -31,13 +33,17 @@
finish_planning = TRUE
/datum/ai_planning_subtree/make_carp_rift/panic_teleport/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
- var/atom/movable/fleeing_from = controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET]
+ var/atom/movable/fleeing_from = controller.blackboard[target_key]
if(!QDELETED(fleeing_from) && controller.blackboard[BB_CARPS_FEAR_FISHERMAN] && HAS_TRAIT(fleeing_from, TRAIT_SCARY_FISHERMAN))
return ..()
if (controller.blackboard[BB_BASIC_MOB_STOP_FLEEING])
return
return ..()
+/datum/ai_planning_subtree/make_carp_rift/panic_teleport/flee_key
+ target_key = BB_BASIC_MOB_FLEE_TARGET
+
+
/**
* # Make carp rift (aggressive)
* Plan to teleport towards our target so we can fuck them up
@@ -46,7 +52,7 @@
rift_behaviour = /datum/ai_behavior/make_carp_rift/towards/aggressive
/datum/ai_planning_subtree/make_carp_rift/aggressive_teleport/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
- var/atom/movable/target = controller.blackboard[BB_BASIC_MOB_CURRENT_TARGET]
+ var/atom/movable/target = controller.blackboard[target_key]
if(!QDELETED(target) && controller.blackboard[BB_CARPS_FEAR_FISHERMAN] && HAS_TRAIT(target, TRAIT_SCARY_FISHERMAN))
return
return ..()
diff --git a/code/modules/mob/living/basic/space_fauna/carp/carp_controllers.dm b/code/modules/mob/living/basic/space_fauna/carp/carp_controllers.dm
index 4491ef1149137..ae011f5b14a31 100644
--- a/code/modules/mob/living/basic/space_fauna/carp/carp_controllers.dm
+++ b/code/modules/mob/living/basic/space_fauna/carp/carp_controllers.dm
@@ -106,22 +106,21 @@
*/
/datum/ai_controller/basic_controller/carp/passive
blackboard = list(
- BB_BASIC_MOB_STOP_FLEEING = TRUE,
- BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic,
+ BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic/require_traits,
+ BB_FLEE_TARGETING_STRATEGY = /datum/targeting_strategy/basic,
BB_PET_TARGETING_STRATEGY = /datum/targeting_strategy/basic/not_friends,
- BB_TARGET_PRIORITY_TRAIT = TRAIT_SCARY_FISHERMAN,
BB_CARPS_FEAR_FISHERMAN = TRUE,
+ BB_TARGET_ONLY_WITH_TRAITS = list(TRAIT_SCARY_FISHERMAN),
)
ai_traits = STOP_MOVING_WHEN_PULLED
planning_subtrees = list(
/datum/ai_planning_subtree/pet_planning,
- /datum/ai_planning_subtree/simple_find_nearest_target_to_flee,
- /datum/ai_planning_subtree/make_carp_rift/panic_teleport,
- /datum/ai_planning_subtree/flee_target/from_fisherman,
+ /datum/ai_planning_subtree/simple_find_target/to_flee, // This should only find master fishermen because of the targeting strategy
+ /datum/ai_planning_subtree/find_nearest_thing_which_attacked_me_to_flee/from_flee_key,
+ /datum/ai_planning_subtree/make_carp_rift/panic_teleport/flee_key,
+ /datum/ai_planning_subtree/flee_target/from_flee_key,
/datum/ai_planning_subtree/find_food,
- /datum/ai_planning_subtree/attack_obstacle_in_path/carp,
- /datum/ai_planning_subtree/shortcut_to_target_through_carp_rift,
/datum/ai_planning_subtree/make_carp_rift/aggressive_teleport,
- /datum/ai_planning_subtree/basic_melee_attack_subtree/no_fisherman,
+ /datum/ai_planning_subtree/basic_melee_attack_subtree,
/datum/ai_planning_subtree/carp_migration,
)
diff --git a/code/modules/mob/living/basic/space_fauna/netherworld/creature.dm b/code/modules/mob/living/basic/space_fauna/netherworld/creature.dm
index c55376c4fcc8f..15dfcdc29c045 100644
--- a/code/modules/mob/living/basic/space_fauna/netherworld/creature.dm
+++ b/code/modules/mob/living/basic/space_fauna/netherworld/creature.dm
@@ -55,7 +55,7 @@
// This loop will, at most, loop twice.
for(var/atom/check in check_list)
for(var/mob/living/mob_target in oview(src, 7)) // They probably cannot see us if we cannot see them... can they?
- if(mob_target.client && !mob_target.is_blind() && !mob_target.has_unlimited_silicon_privilege)
+ if(mob_target.client && !mob_target.is_blind() && !HAS_TRAIT(mob_target, TRAIT_UNOBSERVANT))
return mob_target
for(var/obj/vehicle/sealed/mecha/mecha_mob_target in oview(src, 7))
for(var/mob/mechamob_target as anything in mecha_mob_target.occupants)
@@ -79,7 +79,7 @@
. = ..()
if (!owner)
return
- observed_blocker = owner.AddComponent(/datum/component/unobserved_actor, unobserved_flags = NO_OBSERVED_ACTIONS)
+ observed_blocker = owner.AddComponent(/datum/component/unobserved_actor, unobserved_flags = NO_OBSERVED_ACTIONS, affected_actions = list(type))
/datum/action/cooldown/spell/jaunt/creature_teleport/Remove(mob/living/remove_from)
QDEL_NULL(observed_blocker)
diff --git a/code/modules/mob/living/basic/space_fauna/spider/spider_abilities/wrap.dm b/code/modules/mob/living/basic/space_fauna/spider/spider_abilities/wrap.dm
index e7771f075a871..088905a5ae2f3 100644
--- a/code/modules/mob/living/basic/space_fauna/spider/spider_abilities/wrap.dm
+++ b/code/modules/mob/living/basic/space_fauna/spider/spider_abilities/wrap.dm
@@ -26,7 +26,7 @@
/datum/action/cooldown/mob_cooldown/wrap/IsAvailable(feedback = FALSE)
. = ..()
- if(!. || owner.incapacitated())
+ if(!. || owner.incapacitated)
return FALSE
if(DOING_INTERACTION(owner, DOAFTER_SOURCE_SPIDER))
if (feedback)
diff --git a/code/modules/mob/living/basic/vermin/crab.dm b/code/modules/mob/living/basic/vermin/crab.dm
index 18a935443a11d..3c1c9146a064d 100644
--- a/code/modules/mob/living/basic/vermin/crab.dm
+++ b/code/modules/mob/living/basic/vermin/crab.dm
@@ -34,6 +34,7 @@
AddElement(/datum/element/tiny_mob_hunter, MOB_SIZE_TINY)
AddElement(/datum/element/ai_retaliate)
AddElement(/datum/element/ai_flee_while_injured)
+ AddComponent(/datum/component/speechmod, replacements = strings("crustacean_replacement.json", "crustacean"))
//COFFEE! SQUEEEEEEEEE!
/mob/living/basic/crab/coffee
@@ -88,7 +89,6 @@
planning_subtrees = list(
/datum/ai_planning_subtree/find_nearest_thing_which_attacked_me_to_flee/from_flee_key,
/datum/ai_planning_subtree/flee_target/from_flee_key,
- /datum/ai_planning_subtree/target_retaliate/to_flee,
/datum/ai_planning_subtree/simple_find_target,
/datum/ai_planning_subtree/basic_melee_attack_subtree,
/datum/ai_planning_subtree/random_speech/crab,
diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm
index b4c6f8e682d2d..46419d70e6dee 100644
--- a/code/modules/mob/living/brain/brain_item.dm
+++ b/code/modules/mob/living/brain/brain_item.dm
@@ -437,14 +437,21 @@
/obj/item/organ/internal/brain/lustrous/on_mob_remove(mob/living/carbon/organ_owner, special)
. = ..()
organ_owner.cure_trauma_type(/datum/brain_trauma/special/bluespace_prophet, TRAUMA_RESILIENCE_ABSOLUTE)
+ organ_owner.RemoveElement(/datum/element/tenacious)
/obj/item/organ/internal/brain/lustrous/on_mob_insert(mob/living/carbon/organ_owner, special)
. = ..()
organ_owner.gain_trauma(/datum/brain_trauma/special/bluespace_prophet, TRAUMA_RESILIENCE_ABSOLUTE)
+ organ_owner.AddElement(/datum/element/tenacious)
/obj/item/organ/internal/brain/felinid //A bit smaller than average
brain_size = 0.8
+/obj/item/organ/internal/brain/lizard //A bit smaller than average
+ name = "lizard brain"
+ desc = "This juicy piece of meat has a oversized brain stem and cerebellum, with not much of a limbic system to speak of at all. You would expect it's owner to be pretty cold blooded."
+ organ_traits = list(TRAIT_TACKLING_TAILED_DEFENDER)
+
/obj/item/organ/internal/brain/abductor
name = "grey brain"
desc = "A piece of juicy meat found in an ayy lmao's head."
diff --git a/code/modules/mob/living/carbon/alien/adult/adult.dm b/code/modules/mob/living/carbon/alien/adult/adult.dm
index ad005888178ac..663419ce22cff 100644
--- a/code/modules/mob/living/carbon/alien/adult/adult.dm
+++ b/code/modules/mob/living/carbon/alien/adult/adult.dm
@@ -78,6 +78,7 @@ GLOBAL_LIST_INIT(strippable_alien_humanoid_items, create_strippable_list(list(
SEND_SIGNAL(src, COMSIG_MOVABLE_SET_GRAB_STATE, newstate)
. = grab_state
grab_state = newstate
+ update_incapacitated()
switch(grab_state) // Current state.
if(GRAB_PASSIVE)
REMOVE_TRAIT(pulling, TRAIT_IMMOBILIZED, CHOKEHOLD_TRAIT)
@@ -101,7 +102,7 @@ GLOBAL_LIST_INIT(strippable_alien_humanoid_items, create_strippable_list(list(
/mob/living/carbon/alien/adult/proc/can_consume(atom/movable/poor_soul)
if(!isliving(poor_soul) || pulling != poor_soul)
return FALSE
- if(incapacitated() || grab_state < GRAB_AGGRESSIVE || stat != CONSCIOUS)
+ if(incapacitated || grab_state < GRAB_AGGRESSIVE || stat != CONSCIOUS)
return FALSE
if(get_dir(src, poor_soul) != dir) // Gotta face em 4head
return FALSE
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 95103340bdae9..a4becbcd0eb60 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -1206,7 +1206,7 @@
return bodyparts.len > 2 && ..()
/mob/living/carbon/proc/hypnosis_vulnerable()
- if(HAS_TRAIT(src, TRAIT_MINDSHIELD))
+ if(HAS_MIND_TRAIT(src, TRAIT_UNCONVERTABLE))
return FALSE
if(has_status_effect(/datum/status_effect/hallucination) || has_status_effect(/datum/status_effect/drugginess))
return TRUE
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 79af6c802d623..978714e9bf7a3 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -395,7 +395,7 @@
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
// Shake animation
- if (incapacitated())
+ if (incapacitated)
shake_up_animation()
/mob/proc/shake_up_animation()
@@ -650,6 +650,12 @@
/// Randomise a body part and organ of this mob
/mob/living/carbon/proc/bioscramble(scramble_source)
+ if(!(mob_biotypes & MOB_ORGANIC))
+ return FALSE
+
+ if (HAS_TRAIT(src, TRAIT_GENELESS))
+ return FALSE
+
if (run_armor_check(attack_flag = BIO, absorb_text = "Your armor protects you from [scramble_source]!") >= 100)
return FALSE
diff --git a/code/modules/mob/living/carbon/human/_species.dm b/code/modules/mob/living/carbon/human/_species.dm
index 5ed52fd84b628..dec49c2e0f726 100644
--- a/code/modules/mob/living/carbon/human/_species.dm
+++ b/code/modules/mob/living/carbon/human/_species.dm
@@ -601,7 +601,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
// Anything that's small or smaller can fit into a pocket by default
if((slot & (ITEM_SLOT_RPOCKET|ITEM_SLOT_LPOCKET)) && I.w_class <= POCKET_WEIGHT_CLASS)
excused = TRUE
- else if(slot & (ITEM_SLOT_SUITSTORE|ITEM_SLOT_BACKPACK|ITEM_SLOT_HANDS))
+ else if(slot & (ITEM_SLOT_SUITSTORE|ITEM_SLOT_BACKPACK|ITEM_SLOT_BELTPACK|ITEM_SLOT_HANDS))
excused = TRUE
if(!excused)
return FALSE
@@ -642,6 +642,10 @@ GLOBAL_LIST_EMPTY(features_by_species)
to_chat(H, span_warning("You need a jumpsuit before you can attach this [I.name]!"))
return FALSE
return equip_delay_self_check(I, H, bypass_equip_delay_self)
+ if(ITEM_SLOT_BELTPACK)
+ if(H.belt && H.belt.atom_storage?.can_insert(I, H, messages = TRUE, force = indirect_action ? STORAGE_SOFT_LOCKED : STORAGE_NOT_LOCKED))
+ return TRUE
+ return FALSE
if(ITEM_SLOT_EYES)
if(!H.get_bodypart(BODY_ZONE_HEAD))
return FALSE
@@ -863,14 +867,32 @@ GLOBAL_LIST_EMPTY(features_by_species)
var/damage = rand(attacking_bodypart.unarmed_damage_low, attacking_bodypart.unarmed_damage_high)
var/limb_accuracy = attacking_bodypart.unarmed_effectiveness
+ // In a brawl, drunkenness can make you swing more wildly and with more force, and thus catch your opponent off guard, but it could also totally throw you off if you're too intoxicated
+ // But god is it going to make you sick moving too much while drunk
+ var/user_drunkenness = user.get_drunk_amount()
+
+ if(user_drunkenness && HAS_TRAIT(user, TRAIT_DRUNKEN_BRAWLER)) // Drunken brawlers only need to be intoxicated, doesn't matter how much
+ limb_accuracy += clamp((user.getFireLoss() + user.getBruteLoss()) * 0.5, 10, 200)
+ damage += damage * clamp((user.getFireLoss() + user.getBruteLoss()) / 100, 0.3, 2) //Basically a multiplier of how much extra damage you get based on how low your health is overall. A floor of about a 30%.
+ var/drunken_martial_descriptor = pick("Drunken", "Intoxicated", "Tipsy", "Inebriated", "Delirious", "Day-Drinker's", "Firegut", "Blackout")
+ atk_verb = "[drunken_martial_descriptor] [atk_verb]"
+
+ else if(user_drunkenness > 30 && user_drunkenness < 60)
+ limb_accuracy *= 1.2
+ user.adjust_disgust(2)
+
+ else if(user_drunkenness >= 60)
+ limb_accuracy = -limb_accuracy // good luck landing a punch now, you drunk fuck
+ user.adjust_disgust(5)
+
var/obj/item/bodypart/affecting = target.get_bodypart(target.get_random_valid_zone(user.zone_selected))
var/miss_chance = 100//calculate the odds that a punch misses entirely. considers stamina and brute damage of the puncher. punches miss by default to prevent weird cases
if(attacking_bodypart.unarmed_damage_low)
- if((target.body_position == LYING_DOWN) || HAS_TRAIT(user, TRAIT_PERFECT_ATTACKER) || staggered) //kicks and attacks against staggered targets never miss (provided your species deals more than 0 damage)
+ if((target.body_position == LYING_DOWN) || HAS_TRAIT(user, TRAIT_PERFECT_ATTACKER) || staggered || user_drunkenness && HAS_TRAIT(user, TRAIT_DRUNKEN_BRAWLER)) //kicks and attacks against staggered targets never miss (provided your species deals more than 0 damage). Drunken brawlers while drunk also don't miss
miss_chance = 0
else
- miss_chance = clamp(UNARMED_MISS_CHANCE_BASE - limb_accuracy + user.getStaminaLoss() + (user.getBruteLoss()*0.5), 0, UNARMED_MISS_CHANCE_MAX) //Limb miss chance + various damage. capped at 80 so there is at least a chance to land a hit.
+ miss_chance = clamp(UNARMED_MISS_CHANCE_BASE - limb_accuracy + (user.getFireLoss()*0.5 + user.getBruteLoss()*0.5), 0, UNARMED_MISS_CHANCE_MAX) //Limb miss chance + various damage. capped at 80 so there is at least a chance to land a hit.
if(!damage || !affecting || prob(miss_chance))//future-proofing for species that have 0 damage/weird cases where no zone is targeted
playsound(target.loc, attacking_bodypart.unarmed_miss_sound, 25, TRUE, -1)
@@ -882,6 +904,20 @@ GLOBAL_LIST_EMPTY(features_by_species)
var/armor_block = target.run_armor_check(affecting, MELEE)
+ // In a brawl, drunkenness is a boon if you're a bit drunk but not too much. Else you're easier to hit.
+ // But, generally, getting hit while drunk is probably a good way to start throwing up
+ var/target_drunkenness = target.get_drunk_amount()
+ if(target_drunkenness && HAS_TRAIT(target, TRAIT_DRUNKEN_BRAWLER)) // Drunken brawlers only need to be intoxicated, doesn't matter how much
+ armor_block += 20
+
+ else if(target_drunkenness > 30 && target_drunkenness < 60)
+ armor_block += 10
+ target.adjust_disgust(2)
+
+ else if(target_drunkenness >= 60)
+ armor_block *= 0.5
+ target.adjust_disgust(5)
+
playsound(target.loc, attacking_bodypart.unarmed_attack_sound, 25, TRUE, -1)
if(grappled && attacking_bodypart.grappled_attack_verb)
@@ -909,6 +945,65 @@ GLOBAL_LIST_EMPTY(features_by_species)
target.force_say()
log_combat(user, target, "punched")
+ // If our target is staggered and has sustained enough damage, we can apply a randomly determined status effect to inflict when we punch them.
+ // The effects are based on the punching effectiveness of our attacker. Some effects are not reachable by the average human, and require augmentation to reach or being a species with a heavy punch effectiveness.
+ // Or they're just drunk enough.
+ if(HAS_TRAIT(target, TRAIT_BRAWLING_KNOCKDOWN_BLOCKED) || target.stat == DEAD) //If our target is dead or has specailized armor, there is no way to inflict these effects.
+ return
+
+ // If our target is staggered, the target's armor, minus our limb effectiveness sets the minimum necessary amount of damage sustained to cause an effect. Minimum 40, max 200 for sanity reasons
+ if(staggered && (target.getFireLoss()*0.5 + target.getBruteLoss()*0.5) >= min(armor_block - limb_accuracy, 40, 200))
+ stagger_combo(user, target, atk_verb, limb_accuracy, armor_block)
+
+/// Handles the stagger combo effect of our punch. Follows the same logic as the above proc, target is our owner, user is our attacker.
+/datum/species/proc/stagger_combo(mob/living/carbon/human/user, mob/living/carbon/human/target, atk_verb = "hit", limb_accuracy = 0, armor_block = 0)
+ // Randomly determines the effects of our punch. Limb accuracy is a bonus, armor block is a defense
+ var/roll_them_bones = rand(-20, 20) + limb_accuracy - armor_block
+
+ switch(roll_them_bones)
+ if (-INFINITY to 0) //Mostly a gimmie, this one just keeps them staggered briefly
+ target.adjust_staggered_up_to(1 SECONDS, 10 SECONDS)
+ target.visible_message(span_warning("[user]'s [atk_verb] briefly winds [target]!"), \
+ span_warning("You are briefly winded by [user]'s [atk_verb]!"), span_hear("You hear a thud!"), COMBAT_MESSAGE_RANGE, user)
+ to_chat(user, span_warning("Your [atk_verb] briefly winds [target]!"))
+
+ if (1 to 10)
+ target.adjust_eye_blur_up_to(5 SECONDS, 10 SECONDS)
+ target.visible_message(span_warning("[user]'s [atk_verb] hits [target] so hard, their eyes water! Ouch!"), \
+ span_warning("You are hit viciously by [user]'s [atk_verb], and your eyes begin to water!"), span_hear("You hear a thud!"), COMBAT_MESSAGE_RANGE, user)
+ to_chat(user, span_warning("Your [atk_verb] causes [target] to tear up!"))
+
+ if (11 to 30)
+ target.adjust_dizzy_up_to(5 SECONDS, 10 SECONDS)
+ target.adjust_eye_blur_up_to(5 SECONDS, 10 SECONDS)
+ target.adjust_confusion_up_to(5 SECONDS, 10 SECONDS)
+ target.visible_message(span_warning("[user]'s [atk_verb] hits [target] so hard, they are sent reeling in agony! Damn!"), \
+ span_warning("You are hit viciously by [user]'s [atk_verb], and everything becomes a dizzying blur!"), span_hear("You hear a thud!"), COMBAT_MESSAGE_RANGE, user)
+ to_chat(user, span_warning("Your [atk_verb] causes [target] to go stumbling about in a confuzed daze!"))
+
+ if(31 to 40)
+ target.adjust_dizzy_up_to(5 SECONDS, 10 SECONDS)
+ target.adjust_confusion_up_to(5 SECONDS, 10 SECONDS)
+ target.adjust_temp_blindness_up_to(5 SECONDS, 10 SECONDS)
+ target.visible_message(span_warning("[user]'s [atk_verb] hits [target] so hard, they are sent reeling blindly in agony! Goddamn!"), \
+ span_warning("You are hit viciously by [user]'s [atk_verb], and everything becomes a dizzying, blinding blur!"), span_hear("You hear a thud!"), COMBAT_MESSAGE_RANGE, user)
+ to_chat(user, span_warning("Your [atk_verb] causes [target] to go stumbling about in a confuzed, blind daze!"))
+
+ if (41 to 45)
+ target.apply_effect(4 SECONDS, EFFECT_KNOCKDOWN, armor_block)
+ target.visible_message(span_warning("[user]'s [atk_verb] hits [target] so hard, you knock them off their feet! Holy shit!"), \
+ span_warning("You are hit viciously by [user]'s [atk_verb] and sent toppling head over heels!"), span_hear("You hear a sickening thud!"), COMBAT_MESSAGE_RANGE, user)
+ to_chat(user, span_warning("Your [atk_verb] lands, and you send [target] sailing off their feet!"))
+
+ if (46 to INFINITY)
+ target.apply_effect(4 SECONDS, EFFECT_KNOCKDOWN, armor_block)
+ var/obj/item/bodypart/affecting = target.get_bodypart(target.get_random_valid_zone(user.zone_selected))
+ target.apply_damage(5, BRUTE, affecting, armor_block, wound_bonus = limb_accuracy * 2) //Mostly for the crunchy wounding effect than actually doing damage
+ target.visible_message(span_warning("[user]'s [atk_verb] hits [target] so hard, you hit them off their feet with a loud crunch! Fucking hell!"), \
+ span_warning("You are hit viciously by [user]'s [atk_verb], and suddenly feel an overwhelming pain as you topple head over heels!"), span_hear("You hear a sickening crack and a loud thud!"), COMBAT_MESSAGE_RANGE, user)
+ to_chat(user, span_warning("Your [atk_verb] lands, and [target] is sent crashing to the floor with the immense force! Good god!"))
+
+
/datum/species/proc/disarm(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style)
if(user.body_position != STANDING_UP)
return FALSE
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 9816012218225..cf73704600c7f 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -909,7 +909,7 @@
return ishuman(target) && target.body_position == LYING_DOWN
/mob/living/carbon/human/proc/fireman_carry(mob/living/carbon/target)
- if(!can_be_firemanned(target) || incapacitated(IGNORE_GRAB))
+ if(!can_be_firemanned(target) || INCAPACITATED_IGNORING(src, INCAPABLE_GRAB))
to_chat(src, span_warning("You can't fireman carry [target] while [target.p_they()] [target.p_are()] standing!"))
return
@@ -940,7 +940,7 @@
return
//Second check to make sure they're still valid to be carried
- if(!can_be_firemanned(target) || incapacitated(IGNORE_GRAB) || target.buckled)
+ if(!can_be_firemanned(target) || INCAPACITATED_IGNORING(src, INCAPABLE_GRAB) || target.buckled)
visible_message(span_warning("[src] fails to fireman carry [target]!"))
return
@@ -956,7 +956,7 @@
visible_message(span_warning("[target] fails to climb onto [src]!"))
return
- if(target.incapacitated(IGNORE_GRAB) || incapacitated(IGNORE_GRAB))
+ if(INCAPACITATED_IGNORING(target, INCAPABLE_GRAB) || INCAPACITATED_IGNORING(src, INCAPABLE_GRAB))
target.visible_message(span_warning("[target] can't hang onto [src]!"))
return
diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm
index 3a9004618470f..c561ca28999f1 100644
--- a/code/modules/mob/living/carbon/human/human_helpers.dm
+++ b/code/modules/mob/living/carbon/human/human_helpers.dm
@@ -58,10 +58,13 @@
//repurposed proc. Now it combines get_id_name() and get_face_name() to determine a mob's name variable. Made into a separate proc as it'll be useful elsewhere
/mob/living/carbon/human/get_visible_name(add_id_name = TRUE, force_real_name = FALSE)
- var/list/identity = list(null, null)
+ var/list/identity = list(null, null, null)
SEND_SIGNAL(src, COMSIG_HUMAN_GET_VISIBLE_NAME, identity)
var/signal_face = LAZYACCESS(identity, VISIBLE_NAME_FACE)
var/signal_id = LAZYACCESS(identity, VISIBLE_NAME_ID)
+ var/force_set = LAZYACCESS(identity, VISIBLE_NAME_FORCED)
+ if(force_set) // our name is overriden by something
+ return signal_face // no need to null-check, because force_set will always set a signal_face
var/face_name = !isnull(signal_face) ? signal_face : get_face_name("")
var/id_name = !isnull(signal_id) ? signal_id : get_id_name("")
if (force_real_name)
@@ -107,6 +110,11 @@
var/obj/item/card/id/id = wear_id
if(HAS_TRAIT(src, TRAIT_UNKNOWN))
. = if_no_id //You get NOTHING, no id name, good day sir
+ var/list/identity = list(null, null, null)
+ SEND_SIGNAL(src, COMSIG_HUMAN_GET_FORCED_NAME, identity)
+ if(identity[VISIBLE_NAME_FORCED])
+ . = identity[VISIBLE_NAME_FACE] // to return forced names when unknown, instead of ID
+ return
if(istype(wallet))
id = wallet.front_id
if(istype(id))
diff --git a/code/modules/mob/living/carbon/human/human_say.dm b/code/modules/mob/living/carbon/human/human_say.dm
index 0ce34ffa27205..8edeeb8088403 100644
--- a/code/modules/mob/living/carbon/human/human_say.dm
+++ b/code/modules/mob/living/carbon/human/human_say.dm
@@ -73,7 +73,7 @@
var/area/our_area = get_area(src)
if(our_area.area_flags & BINARY_JAMMING)
return FALSE
- return dongle.translate_binary
+ return (dongle.special_channels & RADIO_SPECIAL_BINARY)
/mob/living/carbon/human/radio(message, list/message_mods = list(), list/spans, language) //Poly has a copy of this, lazy bastard
. = ..()
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index a24e9cd070d86..d2ad1ad89ae2d 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -52,6 +52,9 @@
if(looking_for == belt)
return ITEM_SLOT_BELT
+ if(belt && (looking_for in belt))
+ return ITEM_SLOT_BELTPACK
+
if(looking_for == wear_id)
return ITEM_SLOT_ID
@@ -197,6 +200,9 @@
return
s_store = equipping
update_suit_storage()
+ if(ITEM_SLOT_BELTPACK)
+ if(!belt || !belt.atom_storage?.attempt_insert(equipping, src, override = TRUE, force = indirect_action ? STORAGE_SOFT_LOCKED : STORAGE_NOT_LOCKED))
+ not_handled = TRUE
else
to_chat(src, span_danger("You are trying to equip this item to an unsupported inventory slot. Report this to a coder!"))
@@ -368,7 +374,7 @@
/// take the most recent item out of a slot or place held item in a slot
/mob/living/carbon/human/proc/smart_equip_targeted(slot_type = ITEM_SLOT_BELT, slot_item_name = "belt")
- if(incapacitated())
+ if(incapacitated)
return
var/obj/item/thing = get_active_held_item()
var/obj/item/equipped_item = get_item_by_slot(slot_type)
diff --git a/code/modules/mob/living/carbon/human/species_types/ethereal.dm b/code/modules/mob/living/carbon/human/species_types/ethereal.dm
index 4c307107f153d..669b4f6b18dbc 100644
--- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm
+++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm
@@ -11,10 +11,8 @@
siemens_coeff = 0.5 //They thrive on energy
payday_modifier = 1.0
inherent_traits = list(
- TRAIT_NO_UNDERWEAR,
TRAIT_MUTANT_COLORS,
TRAIT_FIXED_MUTANT_COLORS,
- TRAIT_FIXED_HAIRCOLOR,
TRAIT_AGENDER,
)
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
@@ -247,12 +245,9 @@
mutantbrain = /obj/item/organ/internal/brain/lustrous
changesource_flags = MIRROR_BADMIN | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN
inherent_traits = list(
- TRAIT_NO_UNDERWEAR,
TRAIT_MUTANT_COLORS,
TRAIT_FIXED_MUTANT_COLORS,
- TRAIT_FIXED_HAIRCOLOR,
TRAIT_AGENDER,
- TRAIT_TENACIOUS, // this doesn't work. tenacity is an element
TRAIT_NOBREATH,
TRAIT_RESISTHIGHPRESSURE,
TRAIT_RESISTLOWPRESSURE,
diff --git a/code/modules/mob/living/carbon/human/species_types/flypeople.dm b/code/modules/mob/living/carbon/human/species_types/flypeople.dm
index 44e8981c55315..0f2072b777353 100644
--- a/code/modules/mob/living/carbon/human/species_types/flypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/flypeople.dm
@@ -2,10 +2,6 @@
name = "Flyperson"
plural_form = "Flypeople"
id = SPECIES_FLYPERSON
- inherent_traits = list(
- TRAIT_TACKLING_FRAIL_ATTACKER,
- TRAIT_ANTENNAE,
- )
inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BUG
meat = /obj/item/food/meat/slab/human/mutant/fly
mutanteyes = /obj/item/organ/internal/eyes/fly
diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
index 276d4a0fa7a5f..811ae45ea8cb3 100644
--- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
@@ -412,7 +412,7 @@
return data
-/datum/action/innate/swap_body/ui_act(action, params)
+/datum/action/innate/swap_body/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
index 9370db5f5a8f8..65945467f5eb1 100644
--- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
@@ -5,7 +5,6 @@
id = SPECIES_LIZARD
inherent_traits = list(
TRAIT_MUTANT_COLORS,
- TRAIT_TACKLING_TAILED_DEFENDER,
)
inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_REPTILE
body_markings = list(/datum/bodypart_overlay/simple/body_marking/lizard = "None")
diff --git a/code/modules/mob/living/carbon/human/species_types/monkeys.dm b/code/modules/mob/living/carbon/human/species_types/monkeys.dm
index 2c205c150c08a..1ca2979d3d6fc 100644
--- a/code/modules/mob/living/carbon/human/species_types/monkeys.dm
+++ b/code/modules/mob/living/carbon/human/species_types/monkeys.dm
@@ -12,7 +12,6 @@
meat = /obj/item/food/meat/slab/monkey
knife_butcher_results = list(/obj/item/food/meat/slab/monkey = 5, /obj/item/stack/sheet/animalhide/monkey = 1)
inherent_traits = list(
- TRAIT_GUN_NATURAL,
TRAIT_NO_AUGMENTS,
TRAIT_NO_BLOOD_OVERLAY,
TRAIT_NO_DNA_COPY,
@@ -128,7 +127,7 @@
/obj/item/organ/internal/brain/primate //Ook Ook
name = "Primate Brain"
desc = "This wad of meat is small, but has enlaged occipital lobes for spotting bananas."
- organ_traits = list(TRAIT_CAN_STRIP, TRAIT_PRIMITIVE) // No literacy or advanced tool usage.
+ organ_traits = list(TRAIT_CAN_STRIP, TRAIT_PRIMITIVE, TRAIT_GUN_NATURAL) // No literacy or advanced tool usage.
actions_types = list(/datum/action/item_action/organ_action/toggle_trip)
/// Will this monkey stumble if they are crossed by a simple mob or a carbon in combat mode? Toggable by monkeys with clients, and is messed automatically set to true by monkey AI.
var/tripping = TRUE
diff --git a/code/modules/mob/living/carbon/human/species_types/mothmen.dm b/code/modules/mob/living/carbon/human/species_types/mothmen.dm
index 0ebfb6a5f93ff..f9a17b310fae9 100644
--- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm
+++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm
@@ -2,10 +2,6 @@
name = "\improper Mothman"
plural_form = "Mothmen"
id = SPECIES_MOTH
- inherent_traits = list(
- TRAIT_TACKLING_WINGED_ATTACKER,
- TRAIT_ANTENNAE,
- )
inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BUG
body_markings = list(/datum/bodypart_overlay/simple/body_marking/moth = "None")
mutant_organs = list(/obj/item/organ/external/wings/moth = "Plain", /obj/item/organ/external/antennae = "Plain")
diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
index 0cb0d9d85f084..8b347a22cca96 100644
--- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
+++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
@@ -27,7 +27,7 @@
heatmod = 1.5
payday_modifier = 1.0
breathid = GAS_PLASMA
- changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC
+ changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | ERT_SPAWN
species_cookie = /obj/item/reagent_containers/condiment/milk
outfit_important_for_life = /datum/outfit/plasmaman
species_language_holder = /datum/language_holder/skeleton
diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm
index 62030cf1eba59..a626cb47cc6d8 100644
--- a/code/modules/mob/living/emote.dm
+++ b/code/modules/mob/living/emote.dm
@@ -4,6 +4,16 @@
mob_type_allowed_typecache = /mob/living
mob_type_blacklist_typecache = list(/mob/living/brain)
+/datum/emote/living/taunt
+ key = "taunt"
+ key_third_person = "taunts"
+ message = "taunts!"
+ cooldown = 1.6 SECONDS //note when changing this- this is used by the matrix taunt to block projectiles.
+
+/datum/emote/living/taunt/run_emote(mob/living/user, params, type_override, intentional)
+ . = ..()
+ user.spin(TAUNT_EMOTE_DURATION, 0.1 SECONDS)
+
/datum/emote/living/blush
key = "blush"
key_third_person = "blushes"
@@ -225,20 +235,6 @@
key_third_person = "grimaces"
message = "grimaces."
-/datum/emote/living/jump
- key = "jump"
- key_third_person = "jumps"
- message = "jumps!"
- hands_use_check = TRUE
-
-/datum/emote/living/jump/run_emote(mob/living/user, params, type_override, intentional)
- . = ..()
- animate(user, pixel_y = user.pixel_y + 4, time = 0.1 SECONDS)
- animate(pixel_y = user.pixel_y - 4, time = 0.1 SECONDS)
-
-/datum/emote/living/jump/get_sound(mob/living/user)
- return 'sound/weapons/thudswoosh.ogg'
-
/datum/emote/living/kiss
key = "kiss"
key_third_person = "kisses"
@@ -248,6 +244,9 @@
. = ..()
var/kiss_type = /obj/item/hand_item/kisser
+ if(HAS_TRAIT(user, TRAIT_SYNDIE_KISS))
+ kiss_type = /obj/item/hand_item/kisser/syndie
+
if(HAS_TRAIT(user, TRAIT_KISS_OF_DEATH))
kiss_type = /obj/item/hand_item/kisser/death
diff --git a/code/modules/mob/living/init_signals.dm b/code/modules/mob/living/init_signals.dm
index 4bf0407c4670a..0797f77c08210 100644
--- a/code/modules/mob/living/init_signals.dm
+++ b/code/modules/mob/living/init_signals.dm
@@ -40,6 +40,8 @@
RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_DEAF), PROC_REF(on_hearing_loss))
RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_DEAF), PROC_REF(on_hearing_regain))
+ RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_STASIS), PROC_REF(on_stasis_trait_gain))
+ RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_STASIS), PROC_REF(on_stasis_trait_loss))
RegisterSignals(src, list(
SIGNAL_ADDTRAIT(TRAIT_CRITICAL_CONDITION),
@@ -187,24 +189,36 @@
SIGNAL_HANDLER
add_traits(list(TRAIT_UI_BLOCKED, TRAIT_PULL_BLOCKED), TRAIT_INCAPACITATED)
update_appearance()
+ update_incapacitated()
/// Called when [TRAIT_INCAPACITATED] is removed from the mob.
/mob/living/proc/on_incapacitated_trait_loss(datum/source)
SIGNAL_HANDLER
remove_traits(list(TRAIT_UI_BLOCKED, TRAIT_PULL_BLOCKED), TRAIT_INCAPACITATED)
update_appearance()
-
+ update_incapacitated()
/// Called when [TRAIT_RESTRAINED] is added to the mob.
/mob/living/proc/on_restrained_trait_gain(datum/source)
SIGNAL_HANDLER
ADD_TRAIT(src, TRAIT_HANDS_BLOCKED, TRAIT_RESTRAINED)
+ update_incapacitated()
/// Called when [TRAIT_RESTRAINED] is removed from the mob.
/mob/living/proc/on_restrained_trait_loss(datum/source)
SIGNAL_HANDLER
REMOVE_TRAIT(src, TRAIT_HANDS_BLOCKED, TRAIT_RESTRAINED)
+ update_incapacitated()
+
+/// Called when [TRAIT_STASIS] is added to the mob
+/mob/living/proc/on_stasis_trait_gain(datum/source)
+ SIGNAL_HANDLER
+ update_incapacitated()
+/// Called when [TRAIT_STASIS] is removed from the mob
+/mob/living/proc/on_stasis_trait_loss(datum/source)
+ SIGNAL_HANDLER
+ update_incapacitated()
/**
* Called when traits that alter succumbing are added/removed.
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 70f268c2a454a..005eff4d542c8 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -70,7 +70,7 @@
damage_softening_multiplier *= potential_spine.athletics_boost_multiplier
// If you are incapped, you probably can't brace yourself
- var/can_help_themselves = !incapacitated(IGNORE_RESTRAINTS)
+ var/can_help_themselves = !INCAPACITATED_IGNORING(src, INCAPABLE_RESTRAINTS)
if(levels <= 1 && can_help_themselves)
var/obj/item/organ/external/wings/gliders = get_organ_by_type(/obj/item/organ/external/wings)
if(HAS_TRAIT(src, TRAIT_FREERUNNING) || gliders?.can_soften_fall()) // the power of parkour or wings allows falling short distances unscathed
@@ -516,7 +516,7 @@
//same as above
/mob/living/pointed(atom/A as mob|obj|turf in view(client.view, src))
- if(incapacitated())
+ if(incapacitated)
return FALSE
return ..()
@@ -545,31 +545,21 @@
investigate_log("has succumbed to death.", INVESTIGATE_DEATHS)
death()
-/**
- * Checks if a mob is incapacitated
- *
- * Normally being restrained, agressively grabbed, or in stasis counts as incapacitated
- * unless there is a flag being used to check if it's ignored
- *
- * args:
- * * flags (optional) bitflags that determine if special situations are exempt from being considered incapacitated
- *
- * bitflags: (see code/__DEFINES/status_effects.dm)
- * * IGNORE_RESTRAINTS - mob in a restraint (handcuffs) is not considered incapacitated
- * * IGNORE_STASIS - mob in stasis (stasis bed, etc.) is not considered incapacitated
- * * IGNORE_GRAB - mob that is agressively grabbed is not considered incapacitated
-**/
-/mob/living/incapacitated(flags)
+// Remember, anything that influences this needs to call update_incapacitated somehow when it changes
+// Most often best done in [code/modules/mob/living/init_signals.dm]
+/mob/living/build_incapacitated(flags)
+ // Holds a set of flags that describe how we are currently incapacitated
+ var/incap_status = NONE
if(HAS_TRAIT(src, TRAIT_INCAPACITATED))
- return TRUE
+ incap_status |= TRADITIONAL_INCAPACITATED
+ if(HAS_TRAIT(src, TRAIT_RESTRAINED))
+ incap_status |= INCAPABLE_RESTRAINTS
+ if(pulledby && pulledby.grab_state >= GRAB_AGGRESSIVE)
+ incap_status |= INCAPABLE_GRAB
+ if(HAS_TRAIT(src, TRAIT_STASIS))
+ incap_status |= INCAPABLE_STASIS
- if(!(flags & IGNORE_RESTRAINTS) && HAS_TRAIT(src, TRAIT_RESTRAINED))
- return TRUE
- if(!(flags & IGNORE_GRAB) && pulledby && pulledby.grab_state >= GRAB_AGGRESSIVE)
- return TRUE
- if(!(flags & IGNORE_STASIS) && HAS_TRAIT(src, TRAIT_STASIS))
- return TRUE
- return FALSE
+ return incap_status
/mob/living/canUseStorage()
if (usable_hands <= 0)
@@ -1124,7 +1114,7 @@
/mob/living/proc/itch(obj/item/bodypart/target_part = null, damage = 0.5, can_scratch = TRUE, silent = FALSE)
if ((mob_biotypes & (MOB_ROBOTIC | MOB_SPIRIT)))
return FALSE
- var/will_scratch = can_scratch && !incapacitated()
+ var/will_scratch = can_scratch && !incapacitated
var/applied_damage = 0
if (will_scratch && damage)
applied_damage = apply_damage(damage, damagetype = BRUTE, def_zone = target_part)
@@ -1210,7 +1200,7 @@
/mob/living/resist_grab(moving_resist)
. = TRUE
//If we're in an aggressive grab or higher, we're lying down, we're vulnerable to grabs, or we're staggered and we have some amount of stamina loss, we must resist
- if(pulledby.grab_state || body_position == LYING_DOWN || HAS_TRAIT(src, TRAIT_GRABWEAKNESS) || get_timed_status_effect_duration(/datum/status_effect/staggered) && getStaminaLoss() >= 30)
+ if(pulledby.grab_state || body_position == LYING_DOWN || HAS_TRAIT(src, TRAIT_GRABWEAKNESS) || get_timed_status_effect_duration(/datum/status_effect/staggered) && (getFireLoss()*0.5 + getBruteLoss()*0.5) >= 40)
var/altered_grab_state = pulledby.grab_state
if((body_position == LYING_DOWN || HAS_TRAIT(src, TRAIT_GRABWEAKNESS) || get_timed_status_effect_duration(/datum/status_effect/staggered)) && pulledby.grab_state < GRAB_KILL) //If prone, resisting out of a grab is equivalent to 1 grab state higher. won't make the grab state exceed the normal max, however
altered_grab_state++
@@ -1354,11 +1344,11 @@
if(!(interaction_flags_atom & INTERACT_ATOM_IGNORE_INCAPACITATED))
var/ignore_flags = NONE
if(interaction_flags_atom & INTERACT_ATOM_IGNORE_RESTRAINED)
- ignore_flags |= IGNORE_RESTRAINTS
+ ignore_flags |= INCAPABLE_RESTRAINTS
if(!(interaction_flags_atom & INTERACT_ATOM_CHECK_GRAB))
- ignore_flags |= IGNORE_GRAB
+ ignore_flags |= INCAPABLE_GRAB
- if(incapacitated(ignore_flags))
+ if(INCAPACITATED_IGNORING(src, ignore_flags))
to_chat(src, span_warning("You are incapacitated at the moment!"))
return FALSE
@@ -1842,7 +1832,7 @@ GLOBAL_LIST_EMPTY(fire_appearances)
var/old_level_new_clients = (registered_z ? SSmobs.clients_by_zlevel[registered_z].len : null)
//No one is left after we're gone, shut off inactive ones
if(registered_z && old_level_new_clients == 0)
- for(var/datum/ai_controller/controller as anything in SSai_controllers.ai_controllers_by_zlevel[registered_z])
+ for(var/datum/ai_controller/controller as anything in GLOB.ai_controllers_by_zlevel[registered_z])
controller.set_ai_status(AI_STATUS_OFF)
if(new_z)
@@ -1853,7 +1843,7 @@ GLOBAL_LIST_EMPTY(fire_appearances)
SSmobs.clients_by_zlevel[new_z] += src
if(new_level_old_clients == 0) //No one was here before, wake up all the AIs.
- for (var/datum/ai_controller/controller as anything in SSai_controllers.ai_controllers_by_zlevel[new_z])
+ for (var/datum/ai_controller/controller as anything in GLOB.ai_controllers_by_zlevel[new_z])
//We don't set them directly on, for instances like AIs acting while dead and other cases that may exist in the future.
//This isn't a problem for AIs with a client since the client will prevent this from being called anyway.
controller.set_ai_status(controller.get_expected_ai_status())
@@ -2152,10 +2142,9 @@ GLOBAL_LIST_EMPTY(fire_appearances)
/mob/living/proc/can_look_up()
if(next_move > world.time)
return FALSE
- if(incapacitated(IGNORE_RESTRAINTS))
+ if(INCAPACITATED_IGNORING(src, INCAPABLE_RESTRAINTS))
return FALSE
return TRUE
-
/**
* look_up Changes the perspective of the mob to any openspace turf above the mob
*
@@ -2289,12 +2278,14 @@ GLOBAL_LIST_EMPTY(fire_appearances)
if(. >= UNCONSCIOUS)
REMOVE_TRAIT(src, TRAIT_IMMOBILIZED, TRAIT_KNOCKEDOUT)
remove_traits(list(TRAIT_HANDS_BLOCKED, TRAIT_INCAPACITATED, TRAIT_FLOORED, TRAIT_CRITICAL_CONDITION), STAT_TRAIT)
+ log_combat(src, src, "regained consciousness")
if(SOFT_CRIT)
if(pulledby)
ADD_TRAIT(src, TRAIT_IMMOBILIZED, PULLED_WHILE_SOFTCRIT_TRAIT) //adding trait sources should come before removing to avoid unnecessary updates
if(. >= UNCONSCIOUS)
REMOVE_TRAIT(src, TRAIT_IMMOBILIZED, TRAIT_KNOCKEDOUT)
ADD_TRAIT(src, TRAIT_CRITICAL_CONDITION, STAT_TRAIT)
+ log_combat(src, src, "entered soft crit")
if(UNCONSCIOUS)
if(. != HARD_CRIT)
become_blind(UNCONSCIOUS_TRAIT)
@@ -2302,14 +2293,17 @@ GLOBAL_LIST_EMPTY(fire_appearances)
ADD_TRAIT(src, TRAIT_CRITICAL_CONDITION, STAT_TRAIT)
else
REMOVE_TRAIT(src, TRAIT_CRITICAL_CONDITION, STAT_TRAIT)
+ log_combat(src, src, "lost consciousness")
if(HARD_CRIT)
if(. != UNCONSCIOUS)
become_blind(UNCONSCIOUS_TRAIT)
ADD_TRAIT(src, TRAIT_CRITICAL_CONDITION, STAT_TRAIT)
+ log_combat(src, src, "entered hard crit")
if(DEAD)
REMOVE_TRAIT(src, TRAIT_CRITICAL_CONDITION, STAT_TRAIT)
remove_from_alive_mob_list()
add_to_dead_mob_list()
+ log_combat(src, src, "died")
if(!can_hear())
stop_sound_channel(CHANNEL_AMBIENCE)
refresh_looping_ambience()
@@ -2346,6 +2340,7 @@ GLOBAL_LIST_EMPTY(fire_appearances)
/mob/living/set_pulledby(new_pulledby)
. = ..()
+ update_incapacitated()
if(. == FALSE) //null is a valid value here, we only want to return if FALSE is explicitly passed.
return
if(pulledby)
@@ -2819,3 +2814,25 @@ GLOBAL_LIST_EMPTY(fire_appearances)
return "[span_notice("You'd estimate [p_their()] fitness level at about...")] [span_boldwarning("What?!? [our_fitness_level]???")]"
return span_notice("You'd estimate [p_their()] fitness level at about [our_fitness_level]. [comparative_fitness <= 0.33 ? "Pathetic." : ""]")
+
+///Performs the aftereffects of blocking a projectile.
+/mob/living/proc/block_projectile_effects()
+ var/static/list/icon/blocking_overlay
+ if(isnull(blocking_overlay))
+ blocking_overlay = list(
+ mutable_appearance('icons/mob/effects/blocking.dmi', "wow"),
+ mutable_appearance('icons/mob/effects/blocking.dmi', "nice"),
+ mutable_appearance('icons/mob/effects/blocking.dmi', "good"),
+ )
+ ADD_TRAIT(src, TRAIT_BLOCKING_PROJECTILES, BLOCKING_TRAIT)
+ var/icon/selected_overlay = pick(blocking_overlay)
+ add_overlay(selected_overlay)
+ playsound(src, 'sound/weapons/fwoosh.ogg', 90, FALSE, frequency = 0.7)
+ update_transform(1.25)
+ addtimer(CALLBACK(src, PROC_REF(end_block_effects), selected_overlay), 0.6 SECONDS)
+
+///Remoevs the effects of blocking a projectile and allows the user to block another.
+/mob/living/proc/end_block_effects(selected_overlay)
+ REMOVE_TRAIT(src, TRAIT_BLOCKING_PROJECTILES, BLOCKING_TRAIT)
+ cut_overlay(selected_overlay)
+ update_transform(0.8)
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 99538836476d6..7e724d8862117 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -269,6 +269,7 @@
return FALSE
grippedby(user)
+ update_incapacitated()
//proc to upgrade a simple pull into a more aggressive grab.
/mob/living/proc/grippedby(mob/living/user, instant = FALSE)
diff --git a/code/modules/mob/living/living_movement.dm b/code/modules/mob/living/living_movement.dm
index 62c290217fd3f..4522b6ca69a52 100644
--- a/code/modules/mob/living/living_movement.dm
+++ b/code/modules/mob/living/living_movement.dm
@@ -124,7 +124,7 @@
return ..()
/mob/living/can_z_move(direction, turf/start, turf/destination, z_move_flags = ZMOVE_FLIGHT_FLAGS, mob/living/rider)
- if(z_move_flags & ZMOVE_INCAPACITATED_CHECKS && incapacitated())
+ if(z_move_flags & ZMOVE_INCAPACITATED_CHECKS && incapacitated)
if(z_move_flags & ZMOVE_FEEDBACK)
to_chat(rider || src, span_warning("[rider ? src : "You"] can't do that right now!"))
return FALSE
diff --git a/code/modules/mob/living/living_say.dm b/code/modules/mob/living/living_say.dm
index 459410d0a026a..c5f41678732cf 100644
--- a/code/modules/mob/living/living_say.dm
+++ b/code/modules/mob/living/living_say.dm
@@ -28,6 +28,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
// Misc
RADIO_KEY_AI_PRIVATE = RADIO_CHANNEL_AI_PRIVATE, // AI Upload channel
+ RADIO_KEY_ENTERTAINMENT = RADIO_CHANNEL_ENTERTAINMENT, // Entertainment monitors
//kinda localization -- rastaf0
@@ -56,7 +57,8 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
"в" = MODE_KEY_DEADMIN,
// Misc
- "щ" = RADIO_CHANNEL_AI_PRIVATE
+ "щ" = RADIO_CHANNEL_AI_PRIVATE,
+ "з" = RADIO_CHANNEL_ENTERTAINMENT,
))
/**
diff --git a/code/modules/mob/living/living_update_icons.dm b/code/modules/mob/living/living_update_icons.dm
index a9e1a136800b0..4e8b809e047f9 100644
--- a/code/modules/mob/living/living_update_icons.dm
+++ b/code/modules/mob/living/living_update_icons.dm
@@ -58,7 +58,8 @@
if(!changed) //Nothing has been changed, nothing has to be done.
return
- SEND_SIGNAL(src, COMSIG_PAUSE_FLOATING_ANIM, 0.3 SECONDS)
+ ADD_TRAIT(src, TRAIT_NO_FLOATING_ANIM, UPDATE_TRANSFORM_TRAIT)
+ addtimer(TRAIT_CALLBACK_REMOVE(src, TRAIT_NO_FLOATING_ANIM, UPDATE_TRANSFORM_TRAIT), 0.3 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE)
//if true, we want to avoid any animation time, it'll tween and not rotate at all otherwise.
var/is_opposite_angle = SIMPLIFY_DEGREES(lying_angle+180) == lying_prev
animate(src, transform = ntransform, time = is_opposite_angle ? 0 : UPDATE_TRANSFORM_ANIMATION_TIME, pixel_y = final_pixel_y, dir = final_dir, easing = (EASE_IN|EASE_OUT))
diff --git a/code/modules/mob/living/navigation.dm b/code/modules/mob/living/navigation.dm
index 3096efb3a7c47..a18342c445616 100644
--- a/code/modules/mob/living/navigation.dm
+++ b/code/modules/mob/living/navigation.dm
@@ -12,7 +12,7 @@
set name = "Navigate"
set category = "IC"
- if(incapacitated())
+ if(incapacitated)
return
if(length(client.navigation_images))
addtimer(CALLBACK(src, PROC_REF(cut_navigation)), world.tick_lag)
@@ -46,7 +46,7 @@
if(isnull(navigate_target))
return
- if(incapacitated())
+ if(incapacitated)
return
COOLDOWN_START(src, navigate_cooldown, 15 SECONDS)
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 7e0cd4e5ef3e7..92c853ba72c4c 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -181,7 +181,7 @@
RegisterSignal(ai_tracking_tool, COMSIG_TRACKABLE_TRACKING_TARGET, PROC_REF(on_track_target))
RegisterSignal(ai_tracking_tool, COMSIG_TRACKABLE_GLIDE_CHANGED, PROC_REF(tracked_glidesize_changed))
- add_traits(list(TRAIT_PULL_BLOCKED, TRAIT_HANDS_BLOCKED), ROUNDSTART_TRAIT)
+ add_traits(list(TRAIT_PULL_BLOCKED, TRAIT_AI_ACCESS, TRAIT_HANDS_BLOCKED), INNATE_TRAIT)
alert_control = new(src, list(ALARM_ATMOS, ALARM_FIRE, ALARM_POWER, ALARM_CAMERA, ALARM_BURGLAR, ALARM_MOTION), list(z), camera_view = TRUE)
RegisterSignal(alert_control.listener, COMSIG_ALARM_LISTENER_TRIGGERED, PROC_REF(alarm_triggered))
@@ -288,7 +288,7 @@
/mob/living/silicon/ai/verb/pick_icon()
set category = "AI Commands"
set name = "Set AI Core Display"
- if(incapacitated())
+ if(incapacitated)
return
icon = initial(icon)
icon_state = "ai"
@@ -306,7 +306,7 @@
view_core()
var/ai_core_icon = show_radial_menu(src, src , iconstates, radius = 42)
- if(!ai_core_icon || incapacitated())
+ if(!ai_core_icon || incapacitated)
return
display_icon_override = ai_core_icon
@@ -347,7 +347,7 @@
var/reason = tgui_input_text(src, "What is the nature of your emergency? ([CALL_SHUTTLE_REASON_LENGTH] characters required.)", "Confirm Shuttle Call")
- if(incapacitated())
+ if(incapacitated)
return
if(trim(reason))
@@ -409,7 +409,7 @@
return // stop
if(stat == DEAD)
return
- if(incapacitated())
+ if(incapacitated)
if(battery < 50)
to_chat(src, span_warning("Insufficient backup power!"))
return
@@ -481,14 +481,14 @@
if(usr != src)
return
- if(href_list["emergencyAPC"]) //This check comes before incapacitated() because the only time it would be useful is when we have no power.
+ if(href_list["emergencyAPC"]) //This check comes before incapacitated because the only time it would be useful is when we have no power.
if(!apc_override)
to_chat(src, span_notice("APC backdoor is no longer available."))
return
apc_override.ui_interact(src)
return
- if(incapacitated())
+ if(incapacitated)
return
if (href_list["switchcamera"])
@@ -638,7 +638,7 @@
ai_tracking_tool.reset_tracking()
var/cameralist[0]
- if(incapacitated())
+ if(incapacitated)
return
var/mob/living/silicon/ai/U = usr
@@ -680,7 +680,7 @@
set desc = "Change the default hologram available to AI to something else."
set category = "AI Commands"
- if(incapacitated())
+ if(incapacitated)
return
var/input
switch(tgui_input_list(usr, "Would you like to select a hologram based on a custom character, an animal, or switch to a unique avatar?", "Customize", list("Custom Character","Unique","Animal")))
@@ -830,7 +830,7 @@
set desc = "Allows you to change settings of your radio."
set category = "AI Commands"
- if(incapacitated())
+ if(incapacitated)
return
to_chat(src, "Accessing Subspace Transceiver control...")
@@ -846,7 +846,7 @@
set desc = "Modify the default radio setting for your automatic announcements."
set category = "AI Commands"
- if(incapacitated())
+ if(incapacitated)
return
set_autosay()
@@ -1046,7 +1046,7 @@
set category = "AI Commands"
set name = "Deploy to Shell"
- if(incapacitated())
+ if(incapacitated)
return
if(control_disabled)
to_chat(src, span_warning("Wireless networking module is offline."))
diff --git a/code/modules/mob/living/silicon/ai/ai_defense.dm b/code/modules/mob/living/silicon/ai/ai_defense.dm
index 0c5eb6ec164b2..55a00a6ffc0bc 100644
--- a/code/modules/mob/living/silicon/ai/ai_defense.dm
+++ b/code/modules/mob/living/silicon/ai/ai_defense.dm
@@ -63,7 +63,7 @@
. = ..()
if(user.combat_mode)
return
- if(stat != DEAD && !incapacitated() && (client || deployed_shell?.client))
+ if(stat != DEAD && !incapacitated && (client || deployed_shell?.client))
// alive and well AIs control their floor bolts
balloon_alert(user, "the AI's bolt motors resist.")
return ITEM_INTERACT_SUCCESS
diff --git a/code/modules/mob/living/silicon/ai/ai_portrait_picker.dm b/code/modules/mob/living/silicon/ai/ai_portrait_picker.dm
index 2d099ea8bb00a..5415b7b1931b7 100644
--- a/code/modules/mob/living/silicon/ai/ai_portrait_picker.dm
+++ b/code/modules/mob/living/silicon/ai/ai_portrait_picker.dm
@@ -47,7 +47,7 @@
data["search_mode"] = search_mode == PAINTINGS_FILTER_SEARCH_TITLE ? "Title" : "Author"
return data
-/datum/portrait_picker/ui_act(action, params)
+/datum/portrait_picker/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/mob/living/silicon/ai/ai_say.dm b/code/modules/mob/living/silicon/ai/ai_say.dm
index 48b3cdc437350..a71074f9a014c 100644
--- a/code/modules/mob/living/silicon/ai/ai_say.dm
+++ b/code/modules/mob/living/silicon/ai/ai_say.dm
@@ -18,12 +18,23 @@
return ..()
/mob/living/silicon/ai/radio(message, list/message_mods = list(), list/spans, language)
- if(incapacitated())
+ if(incapacitated)
return FALSE
if(!radio_enabled) //AI cannot speak if radio is disabled (via intellicard) or depowered.
to_chat(src, span_danger("Your radio transmitter is offline!"))
return FALSE
- ..()
+ . = ..()
+ if(.)
+ return .
+ if(message_mods[MODE_HEADSET])
+ if(radio)
+ radio.talk_into(src, message, , spans, language, message_mods)
+ return NOPASS
+ else if(message_mods[RADIO_EXTENSION] in GLOB.radiochannels)
+ if(radio)
+ radio.talk_into(src, message, message_mods[RADIO_EXTENSION], spans, language, message_mods)
+ return NOPASS
+ return FALSE
//For holopads only. Usable by AI.
/mob/living/silicon/ai/proc/holopad_talk(message, language)
@@ -56,7 +67,7 @@
set desc = "Display a list of vocal words to announce to the crew."
set category = "AI Commands"
- if(incapacitated())
+ if(incapacitated)
return
var/dat = {"
@@ -95,7 +106,7 @@
last_announcement = message
- if(incapacitated())
+ if(incapacitated)
return
if(control_disabled)
diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm
index 98a2e629776b1..32382b663398b 100644
--- a/code/modules/mob/living/silicon/ai/freelook/eye.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm
@@ -235,7 +235,7 @@
set category = "AI Commands"
set name = "Toggle Camera Acceleration"
- if(incapacitated())
+ if(incapacitated)
return
acceleration = !acceleration
to_chat(usr, "Camera acceleration has been toggled [acceleration ? "on" : "off"].")
diff --git a/code/modules/mob/living/silicon/ai/robot_control.dm b/code/modules/mob/living/silicon/ai/robot_control.dm
index d963fc77be62f..a04d1c3af75c4 100644
--- a/code/modules/mob/living/silicon/ai/robot_control.dm
+++ b/code/modules/mob/living/silicon/ai/robot_control.dm
@@ -7,7 +7,7 @@
owner = new_owner
/datum/robot_control/proc/is_interactable(mob/user)
- if(user != owner || owner.incapacitated())
+ if(user != owner || owner.incapacitated)
return FALSE
if(owner.control_disabled)
to_chat(user, span_warning("Wireless control is disabled."))
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 4871370d16c3d..2f670c5fbe21b 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -389,7 +389,7 @@
return ..()
/mob/living/silicon/robot/execute_mode()
- if(incapacitated())
+ if(incapacitated)
return
var/obj/item/W = get_active_held_item()
if(W)
@@ -504,14 +504,19 @@
lampButton?.update_appearance()
update_icons()
+///Completely deconstructs the borg, dropping the MMI/posibrain, removing applied upgrades and stripping the exoskeleton of all limbs,
+///while also burning out the flashes and prying out the cabling and the cell used in construction
/mob/living/silicon/robot/proc/cyborg_deconstruct()
SEND_SIGNAL(src, COMSIG_BORG_SAFE_DECONSTRUCT)
if(shell)
undeploy()
var/turf/drop_to = drop_location()
- if (robot_suit)
+ //remove installed upgrades
+ for(var/obj/item/borg/upgrade/upgrade_to_remove in upgrades)
+ upgrade_to_remove.forceMove(drop_to)
+ if(robot_suit)
robot_suit.drop_all_parts(drop_to)
-
+ robot_suit.forceMove(drop_to)
else
new /obj/item/robot_suit(drop_to)
new /obj/item/bodypart/leg/left/robot(drop_to)
@@ -874,7 +879,7 @@
lawupdate = TRUE
lawsync()
if(radio && AI.radio) //AI keeps all channels, including Syndie if it is a Traitor
- if(AI.radio.syndie)
+ if((AI.radio.special_channels & RADIO_SPECIAL_SYNDIE))
radio.make_syndie()
radio.subspace_transmission = TRUE
radio.channels = AI.radio.channels
@@ -936,7 +941,7 @@
M.visible_message(span_warning("[M] really can't seem to mount [src]..."))
return
- if(stat || incapacitated())
+ if(stat || incapacitated)
return
if(model && !model.allow_riding)
M.visible_message(span_boldwarning("Unfortunately, [M] just can't seem to hold onto [src]!"))
diff --git a/code/modules/mob/living/silicon/robot/robot_model.dm b/code/modules/mob/living/silicon/robot/robot_model.dm
index 015f23182dca3..7aabdafaa4825 100644
--- a/code/modules/mob/living/silicon/robot/robot_model.dm
+++ b/code/modules/mob/living/silicon/robot/robot_model.dm
@@ -327,7 +327,7 @@
/obj/item/robot_model/proc/check_menu(mob/living/silicon/robot/user, obj/item/robot_model/old_model)
if(!istype(user))
return FALSE
- if(user.incapacitated())
+ if(user.incapacitated)
return FALSE
if(user.model != old_model)
return FALSE
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index e41cd2157080f..507008caf943c 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -1,6 +1,5 @@
/mob/living/silicon
gender = NEUTER
- has_unlimited_silicon_privilege = TRUE
verb_say = "states"
verb_ask = "queries"
verb_exclaim = "declares"
@@ -75,6 +74,9 @@
TRAIT_NOFIRE_SPREAD,
TRAIT_BRAWLING_KNOCKDOWN_BLOCKED,
TRAIT_FENCE_CLIMBER,
+ TRAIT_SILICON_ACCESS,
+ TRAIT_REAGENT_SCANNER,
+ TRAIT_UNOBSERVANT,
)
add_traits(traits_to_apply, ROUNDSTART_TRAIT)
@@ -400,7 +402,7 @@
silicon_hud.show_to(src)
/mob/living/silicon/proc/toggle_sensors()
- if(incapacitated())
+ if(incapacitated)
return
sensors_on = !sensors_on
if (!sensors_on)
diff --git a/code/modules/mob/living/silicon/silicon_say.dm b/code/modules/mob/living/silicon/silicon_say.dm
index 9310211aa0e6d..824bba98dc070 100644
--- a/code/modules/mob/living/silicon/silicon_say.dm
+++ b/code/modules/mob/living/silicon/silicon_say.dm
@@ -82,10 +82,10 @@
if(message_mods[MODE_HEADSET])
if(radio)
radio.talk_into(src, message, , spans, language, message_mods)
- return REDUCE_RANGE
+ return NOPASS
else if(message_mods[RADIO_EXTENSION] in GLOB.radiochannels)
if(radio)
radio.talk_into(src, message, message_mods[RADIO_EXTENSION], spans, language, message_mods)
- return ITALICS | REDUCE_RANGE
+ return NOPASS
return FALSE
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index e2bb112e1565e..ee7cd1357989e 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -12,7 +12,6 @@
hud_possible = list(DIAG_STAT_HUD, DIAG_BOT_HUD, DIAG_HUD, DIAG_BATT_HUD, DIAG_PATH_HUD = HUD_LIST_LIST)
maxbodytemp = INFINITY
minbodytemp = 0
- has_unlimited_silicon_privilege = TRUE
sentience_type = SENTIENCE_ARTIFICIAL
status_flags = NONE //no default canpush
pass_flags = PASSFLAPS
@@ -163,6 +162,7 @@
/mob/living/simple_animal/bot/Initialize(mapload)
. = ..()
+ add_traits(list(TRAIT_SILICON_ACCESS, TRAIT_REAGENT_SCANNER, TRAIT_UNOBSERVANT), INNATE_TRAIT)
GLOB.bots_list += src
path_hud = new /datum/atom_hud/data/bot_path/private()
@@ -378,9 +378,9 @@
if(HAS_TRAIT(src, TRAIT_COMMISSIONED) && COOLDOWN_FINISHED(src, next_salute_check))
COOLDOWN_START(src, next_salute_check, BOT_COMMISSIONED_SALUTE_DELAY)
- for(var/mob/living/simple_animal/bot/B in view(5, src))
- if(!HAS_TRAIT(B, TRAIT_COMMISSIONED) && B.bot_mode_flags & BOT_MODE_ON)
- manual_emote("performs an elaborate salute for [src]!")
+ for(var/mob/living/simple_animal/bot/nearby_bot in view(5, src))
+ if(!HAS_TRAIT(nearby_bot, TRAIT_COMMISSIONED) && nearby_bot.bot_mode_flags & BOT_MODE_ON)
+ manual_emote("performs an elaborate salute for [nearby_bot]!")
break
switch(mode) //High-priority overrides are processed first. Bots can do nothing else while under direct command.
@@ -976,13 +976,13 @@ Pass a positive integer as an argument to override a bot's default speed.
return data
// Actions received from TGUI
-/mob/living/simple_animal/bot/ui_act(action, params)
+/mob/living/simple_animal/bot/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
- var/mob/user = usr
+ var/mob/user = ui.user
if(!allowed(user))
- to_chat(usr, span_warning("Access denied."))
+ to_chat(user, span_warning("Access denied."))
return
if(action == "lock")
@@ -1002,38 +1002,38 @@ Pass a positive integer as an argument to override a bot's default speed.
if("airplane")
bot_mode_flags ^= BOT_MODE_REMOTE_ENABLED
if("hack")
- if(!HAS_SILICON_ACCESS(usr))
+ if(!HAS_SILICON_ACCESS(user))
return
if(!(bot_cover_flags & BOT_COVER_EMAGGED))
bot_cover_flags |= (BOT_COVER_EMAGGED|BOT_COVER_HACKED|BOT_COVER_LOCKED)
- to_chat(usr, span_warning("You overload [src]'s [hackables]."))
- message_admins("Safety lock of [ADMIN_LOOKUPFLW(src)] was disabled by [ADMIN_LOOKUPFLW(usr)] in [ADMIN_VERBOSEJMP(src)]")
- usr.log_message("disabled safety lock of [src]", LOG_GAME)
+ to_chat(user, span_warning("You overload [src]'s [hackables]."))
+ message_admins("Safety lock of [ADMIN_LOOKUPFLW(src)] was disabled by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(src)]")
+ user.log_message("disabled safety lock of [src]", LOG_GAME)
bot_reset()
to_chat(src, span_userdanger("(#$*#$^^( OVERRIDE DETECTED"))
to_chat(src, span_boldnotice(get_emagged_message()))
return
if(!(bot_cover_flags & BOT_COVER_HACKED))
- to_chat(usr, span_boldannounce("You fail to repair [src]'s [hackables]."))
+ to_chat(user, span_boldannounce("You fail to repair [src]'s [hackables]."))
return
bot_cover_flags &= ~(BOT_COVER_EMAGGED|BOT_COVER_HACKED)
- to_chat(usr, span_notice("You reset the [src]'s [hackables]."))
- usr.log_message("re-enabled safety lock of [src]", LOG_GAME)
+ to_chat(user, span_notice("You reset the [src]'s [hackables]."))
+ user.log_message("re-enabled safety lock of [src]", LOG_GAME)
bot_reset()
to_chat(src, span_userdanger("Software restored to standard."))
to_chat(src, span_boldnotice(possessed_message))
if("eject_pai")
if(!paicard)
return
- to_chat(usr, span_notice("You eject [paicard] from [initial(src.name)]."))
- ejectpai(usr)
+ to_chat(user, span_notice("You eject [paicard] from [initial(src.name)]."))
+ ejectpai(user)
if("toggle_personality")
if (can_be_possessed)
- disable_possession(usr)
+ disable_possession(user)
else
- enable_possession(usr)
+ enable_possession(user)
if("rename")
- rename(usr)
+ rename(user)
/mob/living/simple_animal/bot/update_icon_state()
icon_state = "[isnull(base_icon_state) ? initial(icon_state) : base_icon_state][get_bot_flag(bot_mode_flags, BOT_MODE_ON)]"
diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
index 6c0cd6d16ab55..bbd45e12a2733 100644
--- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
@@ -42,7 +42,7 @@
var/list/targets = list()
for(var/mob/living/carbon/nearby_carbon in view(7, src)) //Let's find us a target
var/threatlevel = 0
- if(nearby_carbon.incapacitated())
+ if(nearby_carbon.incapacitated)
continue
threatlevel = nearby_carbon.assess_threat(judgement_criteria)
if(threatlevel < THREAT_ASSESS_DANGEROUS)
diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm
index 4bedf0d3d621b..c670f6561c86b 100644
--- a/code/modules/mob/living/simple_animal/bot/floorbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm
@@ -142,7 +142,8 @@
// Actions received from TGUI
/mob/living/simple_animal/bot/floorbot/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
- if(. || (bot_cover_flags & BOT_COVER_LOCKED && !HAS_SILICON_ACCESS(usr)))
+ var/mob/user = ui.user
+ if(. || (bot_cover_flags & BOT_COVER_LOCKED && !HAS_SILICON_ACCESS(user)))
return
switch(action)
@@ -160,7 +161,7 @@
if(tilestack)
tilestack.forceMove(drop_location())
if("line_mode")
- var/setdir = tgui_input_list(usr, "Select construction direction", "Direction", list("north", "east", "south", "west", "disable"))
+ var/setdir = tgui_input_list(user, "Select construction direction", "Direction", list("north", "east", "south", "west", "disable"))
if(isnull(setdir) || QDELETED(ui) || ui.status != UI_INTERACTIVE)
return
switch(setdir)
diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm
index f3194e88b1862..dbfe987cac57a 100644
--- a/code/modules/mob/living/simple_animal/bot/mulebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm
@@ -286,29 +286,30 @@
data["paiInserted"] = !!paicard
return data
-/mob/living/simple_animal/bot/mulebot/ui_act(action, params)
+/mob/living/simple_animal/bot/mulebot/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
- if(. || (bot_cover_flags & BOT_COVER_LOCKED && !HAS_SILICON_ACCESS(usr)))
+ var/mob/user = ui.user
+ if(. || (bot_cover_flags & BOT_COVER_LOCKED && !HAS_SILICON_ACCESS(user)))
return
switch(action)
if("lock")
- if(HAS_SILICON_ACCESS(usr))
+ if(HAS_SILICON_ACCESS(user))
bot_cover_flags ^= BOT_COVER_LOCKED
return TRUE
if("on")
if(bot_mode_flags & BOT_MODE_ON)
turn_off()
else if(bot_cover_flags & BOT_COVER_MAINTS_OPEN)
- to_chat(usr, span_warning("[name]'s maintenance panel is open!"))
+ to_chat(user, span_warning("[name]'s maintenance panel is open!"))
return
else if(cell)
if(!turn_on())
- to_chat(usr, span_warning("You can't switch on [src]!"))
+ to_chat(user, span_warning("You can't switch on [src]!"))
return
return TRUE
else
- bot_control(action, usr, params) // Kill this later. // Kill PDAs in general please
+ bot_control(action, user, params) // Kill this later. // Kill PDAs in general please
return TRUE
/mob/living/simple_animal/bot/mulebot/bot_control(command, mob/user, list/params = list(), pda = FALSE)
@@ -711,7 +712,7 @@
// player on mulebot attempted to move
/mob/living/simple_animal/bot/mulebot/relaymove(mob/living/user, direction)
- if(user.incapacitated())
+ if(user.incapacitated)
return
if(load == user)
unload(0)
@@ -805,7 +806,7 @@
/mob/living/simple_animal/bot/mulebot/paranormal/mouse_drop_receive(atom/movable/AM, mob/user, params)
var/mob/living/L = user
- if(user.incapacitated() || (istype(L) && L.body_position == LYING_DOWN))
+ if(user.incapacitated || (istype(L) && L.body_position == LYING_DOWN))
return
if(!istype(AM) || iscameramob(AM) || istype(AM, /obj/effect/dummy/phased_mob)) //allows ghosts!
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index 7448f6d34bc79..ea09441687202 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -202,9 +202,10 @@
return data
// Actions received from TGUI
-/mob/living/simple_animal/bot/secbot/ui_act(action, params)
+/mob/living/simple_animal/bot/secbot/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
- if(. || (bot_cover_flags & BOT_COVER_LOCKED && !HAS_SILICON_ACCESS(usr)))
+ var/mob/user = ui.user
+ if(. || (bot_cover_flags & BOT_COVER_LOCKED && !HAS_SILICON_ACCESS(user)))
return
switch(action)
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index 507563e7c207c..0803d96a706b9 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -320,7 +320,7 @@
/mob/living/simple_animal/hostile/proc/CheckAndAttack()
var/atom/target_from = GET_TARGETS_FROM(src)
- if(target && isturf(target_from.loc) && target.Adjacent(target_from) && !incapacitated())
+ if(target && isturf(target_from.loc) && target.Adjacent(target_from) && !incapacitated)
AttackingTarget(target)
/mob/living/simple_animal/hostile/proc/MoveToTarget(list/possible_targets)//Step 5, handle movement between us and our target
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm
index 31d2e62fba7dc..231977a323954 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/_megafauna.dm
@@ -64,7 +64,7 @@
if(gps_name && true_spawn)
AddComponent(/datum/component/gps, gps_name)
ADD_TRAIT(src, TRAIT_SPACEWALK, INNATE_TRAIT)
- add_traits(list(TRAIT_NO_TELEPORT, TRAIT_MARTIAL_ARTS_IMMUNE), MEGAFAUNA_TRAIT)
+ add_traits(list(TRAIT_NO_TELEPORT), MEGAFAUNA_TRAIT)
grant_actions_by_list(attack_action_types)
/mob/living/simple_animal/hostile/megafauna/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change = TRUE)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
index 193545d9985fa..935ed7a7215b0 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
@@ -27,7 +27,7 @@ Difficulty: Medium
icon_living = "miner"
icon = 'icons/mob/simple/broadMobs.dmi'
health_doll_icon = "miner"
- mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
+ mob_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_SPECIAL
light_color = COLOR_LIGHT_GRAYISH_RED
speak_emote = list("roars")
speed = 3
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm
index 2af3018bed306..448896e3700de 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm
@@ -18,7 +18,7 @@ Difficulty: Extremely Hard
attack_verb_continuous = "pummels"
attack_verb_simple = "pummels"
attack_sound = 'sound/weapons/sonic_jackhammer.ogg'
- mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
+ mob_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_SPECIAL
light_color = COLOR_LIGHT_GRAYISH_RED
movement_type = GROUND
weather_immunities = list(TRAIT_SNOWSTORM_IMMUNE)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
index 4156d9678bca0..6bf09bc5a490e 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
@@ -432,7 +432,7 @@ Difficulty: Hard
/mob/living/simple_animal/hostile/megafauna/hierophant/celebrate_kill(mob/living/L)
visible_message(span_hierophant_warning("\"[pick(kill_phrases)]\""))
- visible_message(span_hierophant_warning("[src] obliterates [L]!"),span_userdanger("You absorb [L]'s life force, restoring your health!"))
+ visible_message(span_hierophant_warning("[src] absorbs [L]'s life force!"),span_userdanger("You absorb [L]'s life force, restoring your health!"))
/mob/living/simple_animal/hostile/megafauna/hierophant/CanAttack(atom/the_target)
. = ..()
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 25d0e566b15dd..9d5041fe870a4 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -495,7 +495,7 @@
//ANIMAL RIDING
/mob/living/simple_animal/user_buckle_mob(mob/living/M, mob/user, check_loc = TRUE)
- if(user.incapacitated())
+ if(user.incapacitated)
return
for(var/atom/movable/A in get_turf(src))
if(A != src && A != M && A.density)
@@ -521,7 +521,7 @@
return
/mob/living/simple_animal/relaymove(mob/living/user, direction)
- if(user.incapacitated())
+ if(user.incapacitated)
return
return relaydrive(user, direction)
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index d017a2acca1be..17e929ba42290 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -91,11 +91,9 @@
sync_mind()
//Reload alternate appearances
- for(var/v in GLOB.active_alternate_appearances)
- if(!v)
- continue
- var/datum/atom_hud/alternate_appearance/AA = v
- AA.onNewMob(src)
+ for(var/datum/atom_hud/alternate_appearance/alt_hud as anything in GLOB.active_alternate_appearances)
+ if(!alt_hud.apply_to_new_mob(src))
+ alt_hud.hide_from(src, absolute = TRUE)
update_client_colour()
update_mouse_pointer()
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index c90c81b6ce43d..f321a8396a379 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -83,13 +83,12 @@
add_to_dead_mob_list()
else
add_to_alive_mob_list()
+ update_incapacitated()
set_focus(src)
prepare_huds()
- for(var/v in GLOB.active_alternate_appearances)
- if(!v)
- continue
- var/datum/atom_hud/alternate_appearance/AA = v
- AA.onNewMob(src)
+ for(var/datum/atom_hud/alternate_appearance/alt_hud as anything in GLOB.active_alternate_appearances)
+ alt_hud.apply_to_new_mob(src)
+
set_nutrition(rand(NUTRITION_LEVEL_START_MIN, NUTRITION_LEVEL_START_MAX))
. = ..()
setup_hud_traits()
@@ -414,9 +413,21 @@
return null
-///Is the mob incapacitated
-/mob/proc/incapacitated(flags)
- return
+/// Called whenever anything that modifes incapacitated is ran, updates it and sends a signal if it changes
+/// Returns TRUE if anything changed, FALSE otherwise
+/mob/proc/update_incapacitated()
+ SIGNAL_HANDLER
+ var/old_incap = incapacitated
+ incapacitated = build_incapacitated()
+ if(old_incap == incapacitated)
+ return FALSE
+
+ SEND_SIGNAL(src, COMSIG_MOB_INCAPACITATE_CHANGED, old_incap, incapacitated)
+ return TRUE
+
+/// Returns an updated incapacitated bitflag. If a flag is set it means we're incapacitated in that case
+/mob/proc/build_incapacitated()
+ return NONE
/**
* This proc is called whenever someone clicks an inventory ui slot.
@@ -543,7 +554,7 @@
/mob/living/blind_examine_check(atom/examined_thing)
//need to be next to something and awake
- if(!Adjacent(examined_thing) || incapacitated())
+ if(!Adjacent(examined_thing) || incapacitated)
to_chat(src, span_warning("Something is there, but you can't see it!"))
return FALSE
@@ -702,7 +713,7 @@
if(ismecha(loc))
return
- if(incapacitated())
+ if(incapacitated)
return
var/obj/item/I = get_active_held_item()
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 2206efd0e13ce..24e95cad60800 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -66,6 +66,20 @@
/// Whether a mob is alive or dead. TODO: Move this to living - Nodrak (2019, still here)
var/stat = CONSCIOUS
+ /**
+ * Whether and how a mob is incapacitated
+ *
+ * Normally being restrained, agressively grabbed, or in stasis counts as incapacitated
+ * unless there is a flag being used to check if it's ignored
+ *
+ * * bitflags: (see code/__DEFINES/status_effects.dm)
+ * * INCAPABLE_RESTRAINTS - if our mob is in a restraint (handcuffs)
+ * * INCAPABLE_STASIS - if our mob is in stasis (stasis bed, etc.)
+ * * INCAPABLE_GRAB - if our mob is being agressively grabbed
+ *
+ **/
+ VAR_FINAL/incapacitated = NONE
+
/* A bunch of this stuff really needs to go under their own defines instead of being globally attached to mob.
A variable should only be globally attached to turfs/objects/whatever, when it is in fact needed as such.
The current method unnecessarily clusters up the variable list, especially for humans (although rearranging won't really clean it up a lot but the difference will be noticable for other mobs).
@@ -137,9 +151,6 @@
/// bitflags defining which status effects can be inflicted (replaces canknockdown, canstun, etc)
var/status_flags = CANSTUN|CANKNOCKDOWN|CANUNCONSCIOUS|CANPUSH
- /// Can they interact with station electronics
- var/has_unlimited_silicon_privilege = FALSE
-
///Calls relay_move() to whatever this is set to when the mob tries to move
var/atom/movable/remote_control
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index a6a1c58c7eddf..a3fceb0493e8c 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -345,12 +345,14 @@
return
return TRUE
-///Is the passed in mob an admin ghost WITH AI INTERACT enabled
+///Returns TRUE/FALSE on whether the mob is an Admin Ghost AI.
+///This requires this snowflake check because AI interact gives the access to the mob's client, rather
+///than the mob like everyone else, and we keep it that way so they can't accidentally give someone Admin AI access.
/proc/isAdminGhostAI(mob/user)
if(!isAdminObserver(user))
- return
- if(!user.client.AI_Interact) // Do they have it enabled?
- return
+ return FALSE
+ if(!HAS_TRAIT_FROM(user.client, TRAIT_AI_ACCESS, ADMIN_TRAIT)) // Do they have it enabled?
+ return FALSE
return TRUE
/**
@@ -428,7 +430,7 @@
///Can the mob see reagents inside of containers?
/mob/proc/can_see_reagents()
- return stat == DEAD || has_unlimited_silicon_privilege || HAS_TRAIT(src, TRAIT_REAGENT_SCANNER) //Dead guys and silicons can always see reagents
+ return stat == DEAD || HAS_TRAIT(src, TRAIT_REAGENT_SCANNER) //Dead guys and silicons can always see reagents
///Can this mob hold items
/mob/proc/can_hold_items(obj/item/I)
diff --git a/code/modules/mob_spawn/corpses/mob_corpses.dm b/code/modules/mob_spawn/corpses/mob_corpses.dm
index f83dc13f1eded..c6d0cbd55cf4c 100644
--- a/code/modules/mob_spawn/corpses/mob_corpses.dm
+++ b/code/modules/mob_spawn/corpses/mob_corpses.dm
@@ -162,6 +162,16 @@
head = /obj/item/clothing/head/helmet/space/pirate
back = /obj/item/tank/jetpack/carbondioxide
+/obj/effect/mob_spawn/corpse/human/old_pirate_captain
+ name = "Pirate Captain Skeleton"
+ outfit = /datum/outfit/piratecorpse/captain
+ mob_species = /datum/species/skeleton
+
+/datum/outfit/piratecorpse/captain
+ glasses = /obj/item/clothing/glasses/eyepatch
+ head = /obj/item/clothing/head/costume/pirate
+ suit = /obj/item/clothing/suit/costume/pirate
+
/obj/effect/mob_spawn/corpse/human/russian
name = "Russian"
outfit = /datum/outfit/russiancorpse
diff --git a/code/modules/mob_spawn/ghost_roles/space_roles.dm b/code/modules/mob_spawn/ghost_roles/space_roles.dm
index 79d028bdbcb27..411f6bfd970ff 100644
--- a/code/modules/mob_spawn/ghost_roles/space_roles.dm
+++ b/code/modules/mob_spawn/ghost_roles/space_roles.dm
@@ -160,6 +160,8 @@
l_pocket = /obj/item/uplink/nuclear
r_pocket = /obj/item/modular_computer/pda/nukeops
+ skillchips = list(/obj/item/skillchip/disk_verifier)
+
/obj/effect/mob_spawn/ghost_role/human/syndicate/battlecruiser/captain
name = "Syndicate Battlecruiser Captain"
you_are_text = "You are the captain aboard the syndicate flagship: the SBC Starfury."
diff --git a/code/modules/mob_spawn/mob_spawn.dm b/code/modules/mob_spawn/mob_spawn.dm
index 6a47eb5a7f17b..c43164fb62a5f 100644
--- a/code/modules/mob_spawn/mob_spawn.dm
+++ b/code/modules/mob_spawn/mob_spawn.dm
@@ -42,6 +42,12 @@
if(faction)
faction = string_list(faction)
+/obj/effect/mob_spawn/Destroy()
+ spawned_mob_ref = null
+ if(istype(outfit))
+ QDEL_NULL(outfit)
+ return ..()
+
/// Creates whatever mob the spawner makes. Return FALSE if we want to exit from here without doing that, returning NULL will be logged to admins.
/obj/effect/mob_spawn/proc/create(mob/mob_possessor, newname)
var/mob/living/spawned_mob = new mob_type(get_turf(src)) //living mobs only
@@ -158,7 +164,7 @@
SSpoints_of_interest.make_point_of_interest(src)
LAZYADD(GLOB.mob_spawners[name], src)
-/obj/effect/mob_spawn/Destroy()
+/obj/effect/mob_spawn/ghost_role/Destroy()
var/list/spawners = GLOB.mob_spawners[name]
LAZYREMOVE(spawners, src)
if(!LAZYLEN(spawners))
@@ -290,6 +296,7 @@
///these mob spawn subtypes trigger immediately (New or Initialize) and are not player controlled... since they're dead, you know?
/obj/effect/mob_spawn/corpse
+ density = FALSE //these are pretty much abstract objects that leave a corpse in their place.
///when this mob spawn should auto trigger.
var/spawn_when = CORPSE_INSTANT
diff --git a/code/modules/mod/mod_activation.dm b/code/modules/mod/mod_activation.dm
index 237e151bcb2c0..8c4de3be84d84 100644
--- a/code/modules/mod/mod_activation.dm
+++ b/code/modules/mod/mod_activation.dm
@@ -17,8 +17,8 @@
if(!pick)
return
var/part_reference = display_names[pick]
- var/obj/item/part = locate(part_reference) in parts
- if(!istype(part) || user.incapacitated())
+ var/obj/item/part = locate(part_reference) in get_parts()
+ if(!istype(part) || user.incapacitated)
return
if(active || activating)
balloon_alert(user, "deactivate the suit first!")
diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm
index cf91aaf482c22..cbd299e8b58b0 100644
--- a/code/modules/mod/mod_control.dm
+++ b/code/modules/mod/mod_control.dm
@@ -233,7 +233,7 @@
balloon_alert(wearer, "retract parts first!")
playsound(src, 'sound/machines/scanbuzz.ogg', 25, FALSE, SILENCED_SOUND_EXTRARANGE)
return
- if(!wearer.incapacitated())
+ if(!wearer.incapacitated)
var/atom/movable/screen/inventory/hand/ui_hand = over_object
if(wearer.putItemFromInventoryInHandIfPossible(src, ui_hand.held_index))
add_fingerprint(user)
@@ -572,6 +572,11 @@
balloon_alert(user, "[new_module] incompatible with [src]'s parts!")
playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
return
+ if(!new_module.can_install(src))
+ if(user)
+ balloon_alert(user, "[new_module] cannot be installed into [src]!")
+ playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+ return
new_module.forceMove(src)
modules += new_module
complexity += new_module.complexity
diff --git a/code/modules/mod/mod_paint.dm b/code/modules/mod/mod_paint.dm
index 7897b60b794a7..0693b05a34854 100644
--- a/code/modules/mod/mod_paint.dm
+++ b/code/modules/mod/mod_paint.dm
@@ -55,7 +55,7 @@
data["currentColor"] = current_color
return data
-/obj/item/mod/paint/ui_act(action, list/params)
+/obj/item/mod/paint/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
@@ -126,7 +126,7 @@
mod.theme.set_skin(mod, pick)
/obj/item/mod/paint/proc/check_menu(obj/item/mod/control/mod, mob/user)
- if(user.incapacitated() || !user.is_holding(src) || !mod || mod.active || mod.activating)
+ if(user.incapacitated || !user.is_holding(src) || !mod || mod.active || mod.activating)
return FALSE
return TRUE
diff --git a/code/modules/mod/mod_theme.dm b/code/modules/mod/mod_theme.dm
index 230f53e9403be..15dcf4f9bef94 100644
--- a/code/modules/mod/mod_theme.dm
+++ b/code/modules/mod/mod_theme.dm
@@ -199,6 +199,8 @@
UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL,
UNSEALED_MESSAGE = HELMET_UNSEAL_MESSAGE,
SEALED_MESSAGE = HELMET_SEAL_MESSAGE,
+ UNSEALED_INVISIBILITY = HIDEFACIALHAIR|HIDEEARS|HIDEEYES|HIDEHAIR|HIDESNOUT,
+ SEALED_COVER = HEADCOVERSEYES,
),
/obj/item/clothing/suit/mod = list(
UNSEALED_CLOTHING = THICKMATERIAL,
@@ -1351,6 +1353,7 @@
siemens_coefficient = 0
slowdown_inactive = 0
slowdown_active = 0
+ activation_step_time = MOD_ACTIVATION_STEP_TIME * 0.5
ui_theme = "syndicate"
slot_flags = ITEM_SLOT_BELT
inbuilt_modules = list(/obj/item/mod/module/infiltrator, /obj/item/mod/module/storage/belt, /obj/item/mod/module/demoralizer)
diff --git a/code/modules/mod/mod_types.dm b/code/modules/mod/mod_types.dm
index db9d150f3438a..b20efa4c66641 100644
--- a/code/modules/mod/mod_types.dm
+++ b/code/modules/mod/mod_types.dm
@@ -493,7 +493,7 @@
/obj/item/mod/control/pre_equipped/responsory/janitor
insignia_type = /obj/item/mod/module/insignia/janitor
- additional_module = /obj/item/mod/module/clamp
+ additional_module = /obj/item/mod/module/noslip
/obj/item/mod/control/pre_equipped/responsory/clown
insignia_type = /obj/item/mod/module/insignia/clown
diff --git a/code/modules/mod/modules/_module.dm b/code/modules/mod/modules/_module.dm
index 4bd4ef0d2ab80..551145b5e6d3a 100644
--- a/code/modules/mod/modules/_module.dm
+++ b/code/modules/mod/modules/_module.dm
@@ -94,6 +94,10 @@
needed_slots -= needed_slot
return !length(needed_slots)
+/// Additional checks for whenever a module can be installed into a suit or not
+/obj/item/mod/module/proc/can_install(obj/item/mod/control/mod)
+ return TRUE
+
/// Called when the module is selected from the TGUI, radial or the action button
/obj/item/mod/module/proc/on_select()
if(!mod.wearer)
@@ -200,7 +204,7 @@
/// Called when an activated module without a device is used
/obj/item/mod/module/proc/on_select_use(atom/target)
- if(!(allow_flags & MODULE_ALLOW_INCAPACITATED) && mod.wearer.incapacitated(IGNORE_GRAB))
+ if(!(allow_flags & MODULE_ALLOW_INCAPACITATED) && INCAPACITATED_IGNORING(mod.wearer, INCAPABLE_GRAB))
return FALSE
mod.wearer.face_atom(target)
if(!used())
diff --git a/code/modules/mod/modules/module_kinesis.dm b/code/modules/mod/modules/module_kinesis.dm
index 9048701f1d017..374be840d9507 100644
--- a/code/modules/mod/modules/module_kinesis.dm
+++ b/code/modules/mod/modules/module_kinesis.dm
@@ -67,7 +67,7 @@
clear_grab(playsound = !deleting)
/obj/item/mod/module/anomaly_locked/kinesis/process(seconds_per_tick)
- if(!mod.wearer.client || mod.wearer.incapacitated(IGNORE_GRAB))
+ if(!mod.wearer.client || INCAPACITATED_IGNORING(mod.wearer, INCAPABLE_GRAB))
clear_grab()
return
if(!range_check(grabbed_atom))
diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm
index 2ab0b0a1fd269..3b7803a517aac 100644
--- a/code/modules/mod/modules/modules_general.dm
+++ b/code/modules/mod/modules/modules_general.dm
@@ -310,6 +310,15 @@
mask.flags_cover &= ~(MASKCOVERSMOUTH |PEPPERPROOF)
mask.visor_flags_cover &= ~(MASKCOVERSMOUTH |PEPPERPROOF)
+/obj/item/mod/module/mouthhole/can_install(obj/item/mod/control/mod)
+ var/obj/item/clothing/helmet = mod.get_part_from_slot(ITEM_SLOT_HEAD)
+ var/obj/item/clothing/mask = mod.get_part_from_slot(ITEM_SLOT_MASK)
+ if(istype(helmet) && ((helmet.flags_cover|helmet.visor_flags_cover) & (HEADCOVERSMOUTH|PEPPERPROOF)))
+ return ..()
+ if(istype(mask) && ((mask.flags_cover|mask.visor_flags_cover) & (MASKCOVERSMOUTH|PEPPERPROOF)))
+ return ..()
+ return FALSE
+
/obj/item/mod/module/mouthhole/on_uninstall(deleting = FALSE)
if(deleting)
return
@@ -953,6 +962,76 @@
balloon_alert(mod.wearer, "ammo box dispensed.")
playsound(src, 'sound/machines/microwave/microwave-end.ogg', 50, TRUE)
+/obj/item/mod/module/fishing_glove
+ name = "MOD fishing glove module"
+ desc = "A MOD module that takes in an external fishing rod to enable the user to fish without having to hold one."
+ icon_state = "fishing_glove"
+ complexity = 1
+ overlay_state_inactive = "fishing_glove"
+ incompatible_modules = (/obj/item/mod/module/fishing_glove)
+ required_slots = list(ITEM_SLOT_GLOVES)
+ var/obj/item/fishing_rod/equipped
+
+/obj/item/mod/module/fishing_glove/Initialize(mapload)
+ . = ..()
+ register_context()
+
+/obj/item/mod/module/fishing_glove/add_context(atom/source, list/context, obj/item/held_item, mob/user)
+ if(!held_item && equipped)
+ context[SCREENTIP_CONTEXT_RMB] = "Remove rod"
+ return CONTEXTUAL_SCREENTIP_SET
+ if(istype(held_item, /obj/item/fishing_rod))
+ context[SCREENTIP_CONTEXT_LMB] = "Insert rod"
+ return CONTEXTUAL_SCREENTIP_SET
+
+/obj/item/mod/module/fishing_glove/examine(mob/user)
+ . = ..()
+ . += span_info("You can [EXAMINE_HINT("right-click")] the modsuit gloves to open the fishing rod interface once attached and activated.")
+ if(equipped)
+ . += span_info("it has a [icon2html(equipped, user)] installed. [EXAMINE_HINT("Right-Click")] to remove it.")
+
+/obj/item/mod/module/fishing_glove/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+ if(!istype(tool, /obj/item/fishing_rod))
+ return ..()
+ if(equipped)
+ balloon_alert(user, "remove current rod first!")
+ if(!user.transferItemToLoc(tool, src))
+ user.balloon_alert(user, "it's stuck!")
+ equipped = tool
+ balloon_alert(user, "rod inserted")
+ playsound(src, 'sound/items/click.ogg', 50, TRUE)
+ return ITEM_INTERACT_SUCCESS
+
+/obj/item/mod/module/fishing_glove/attack_hand_secondary(mob/user, list/modifiers)
+ . = ..()
+ if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN)
+ return
+ if(!equipped)
+ return
+ user.put_in_hands(equipped)
+ balloon_alert(user, "rod removed")
+ playsound(src, 'sound/items/click.ogg', 50, TRUE)
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+
+/obj/item/mod/module/fishing_glove/Exited(atom/movable/gone)
+ if(gone == equipped)
+ equipped = null
+ var/obj/item/gloves = mod?.get_part_from_slot(ITEM_SLOT_GLOVES)
+ if(gloves && !QDELETED(mod))
+ qdel(gloves.GetComponent(/datum/component/profound_fisher))
+
+/obj/item/mod/module/fishing_glove/on_suit_activation()
+ if(!equipped)
+ return
+ var/obj/item/gloves = mod.get_part_from_slot(ITEM_SLOT_GLOVES)
+ if(gloves)
+ gloves.AddComponent(/datum/component/profound_fisher, equipped)
+
+/obj/item/mod/module/fishing_glove/on_suit_deactivation(deleting = FALSE)
+ var/obj/item/gloves = mod.get_part_from_slot(ITEM_SLOT_GLOVES)
+ if(gloves && !deleting)
+ qdel(gloves.GetComponent(/datum/component/profound_fisher))
+
/obj/item/mod/module/shock_absorber
name = "MOD shock absorption module"
desc = "A module that makes the user resistant to the knockdown inflicted by Stun Batons."
diff --git a/code/modules/mod/modules/modules_medical.dm b/code/modules/mod/modules/modules_medical.dm
index 8a1d31a92f6b0..0f44570201776 100644
--- a/code/modules/mod/modules/modules_medical.dm
+++ b/code/modules/mod/modules/modules_medical.dm
@@ -428,3 +428,22 @@
/datum/surgery/advanced/bioware/cortex_folding,
/datum/surgery/advanced/bioware/cortex_folding/mechanic,
)
+
+/obj/item/mod/module/surgical_processor/emergency
+ desc = "A module using an onboard surgical computer which can be connected to other computers to download and \
+ perform advanced surgeries on the go. This one came pre-loaded with some emergency surgeries."
+ device = /obj/item/surgical_processor/mod/emergency
+
+/obj/item/surgical_processor/mod/emergency
+ loaded_surgeries = list(
+ /datum/surgery/healing/combo/upgraded/femto,
+ /datum/surgery/blood_filter,
+ /datum/surgery/brain_surgery,
+ /datum/surgery/coronary_bypass,
+ /datum/surgery/ear_surgery,
+ /datum/surgery/eye_surgery,
+ /datum/surgery/hepatectomy,
+ /datum/surgery/revival,
+ /datum/surgery/stomach_pump,
+ /datum/surgery/advanced/wing_reconstruction,
+ )
diff --git a/code/modules/mod/modules/modules_ninja.dm b/code/modules/mod/modules/modules_ninja.dm
index cfa95fb8a591e..a5215341a06d2 100644
--- a/code/modules/mod/modules/modules_ninja.dm
+++ b/code/modules/mod/modules/modules_ninja.dm
@@ -72,9 +72,11 @@
cooldown_time = 3 SECONDS
/obj/item/mod/module/stealth/ninja/on_activation()
+ . = ..()
ADD_TRAIT(mod.wearer, TRAIT_SILENT_FOOTSTEPS, MOD_TRAIT)
/obj/item/mod/module/stealth/ninja/on_deactivation(display_message = TRUE, deleting = FALSE)
+ . = ..()
REMOVE_TRAIT(mod.wearer, TRAIT_SILENT_FOOTSTEPS, MOD_TRAIT)
///Camera Vision - Prevents flashes, blocks tracking.
diff --git a/code/modules/mod/modules/modules_security.dm b/code/modules/mod/modules/modules_security.dm
index 752273fa0748c..5da8ff00241c9 100644
--- a/code/modules/mod/modules/modules_security.dm
+++ b/code/modules/mod/modules/modules_security.dm
@@ -568,7 +568,7 @@
projectile.ricochets_max += 1
projectile.min_ricochets += 1
projectile.ricochet_incidence_leeway = 0 //allows the projectile to bounce at any angle.
- ADD_TRAIT(projectile, TRAIT_ALWAYS_HIT_ZONE, MOD_TRAIT)
+ projectile.accuracy_falloff = 0
#undef SHOOTING_ASSISTANT_OFF
#undef STORMTROOPER_MODE
diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm
index 08bd61945ef47..03503ac36d864 100644
--- a/code/modules/modular_computers/computers/item/computer.dm
+++ b/code/modules/modular_computers/computers/item/computer.dm
@@ -727,6 +727,8 @@
UpdateDisplay()
/obj/item/modular_computer/ui_action_click(mob/user, actiontype)
+ if(!issilicon(user))
+ playsound(src, SFX_KEYBOARD_CLICKS, 10, TRUE, FALSE)
if(istype(actiontype, /datum/action/item_action/toggle_computer_light))
toggle_flashlight(user)
return
diff --git a/code/modules/modular_computers/computers/item/disks/role_disks.dm b/code/modules/modular_computers/computers/item/disks/role_disks.dm
index f7f20efb70b43..2191aaccdff1d 100644
--- a/code/modules/modular_computers/computers/item/disks/role_disks.dm
+++ b/code/modules/modular_computers/computers/item/disks/role_disks.dm
@@ -6,7 +6,6 @@
max_capacity = 32
///Static list of programss ALL command tablets have.
var/static/list/datum/computer_file/command_programs = list(
- /datum/computer_file/program/crew_manifest,
/datum/computer_file/program/science,
/datum/computer_file/program/status,
)
@@ -74,7 +73,6 @@
icon_state = "datadisk9"
starting_programs = list(
/datum/computer_file/program/records/security,
- /datum/computer_file/program/crew_manifest,
)
/**
diff --git a/code/modules/modular_computers/computers/item/disks/unique_disks.dm b/code/modules/modular_computers/computers/item/disks/unique_disks.dm
index 1fd31957befca..a5e9d9750f3ea 100644
--- a/code/modules/modular_computers/computers/item/disks/unique_disks.dm
+++ b/code/modules/modular_computers/computers/item/disks/unique_disks.dm
@@ -23,7 +23,6 @@
/datum/computer_file/program/supermatter_monitor,
/datum/computer_file/program/newscaster,
/datum/computer_file/program/secureye,
- /datum/computer_file/program/crew_manifest,
/datum/computer_file/program/status,
)
potential_programs += subtypesof(/datum/computer_file/program/maintenance) - /datum/computer_file/program/maintenance/theme
diff --git a/code/modules/modular_computers/computers/item/pda.dm b/code/modules/modular_computers/computers/item/pda.dm
index b40ae45f27f91..ae63639aef6f9 100644
--- a/code/modules/modular_computers/computers/item/pda.dm
+++ b/code/modules/modular_computers/computers/item/pda.dm
@@ -38,6 +38,7 @@
/datum/computer_file/program/messenger,
/datum/computer_file/program/nt_pay,
/datum/computer_file/program/notepad,
+ /datum/computer_file/program/crew_manifest,
)
///List of items that can be stored in a PDA
var/static/list/contained_item = list(
@@ -419,7 +420,7 @@
return TRUE
/obj/item/modular_computer/pda/silicon/ui_state(mob/user)
- return GLOB.reverse_contained_state
+ return GLOB.deep_inventory_state
/obj/item/modular_computer/pda/silicon/cyborg/syndicate
icon_state = "tablet-silicon-syndicate"
diff --git a/code/modules/modular_computers/computers/item/role_tablet_presets.dm b/code/modules/modular_computers/computers/item/role_tablet_presets.dm
index 7e4c7402c770b..cbd784b1ef0d4 100644
--- a/code/modules/modular_computers/computers/item/role_tablet_presets.dm
+++ b/code/modules/modular_computers/computers/item/role_tablet_presets.dm
@@ -6,14 +6,19 @@
greyscale_config = /datum/greyscale_config/tablet/head
greyscale_colors = "#67A364#a92323"
max_capacity = parent_type::max_capacity * 2
- starting_programs = list(
- /datum/computer_file/program/crew_manifest,
+ var/static/list/datum/computer_file/head_programs = list(
/datum/computer_file/program/status,
/datum/computer_file/program/science,
/datum/computer_file/program/robocontrol,
/datum/computer_file/program/budgetorders,
)
+/obj/item/modular_computer/pda/heads/Initialize(mapload)
+ . = ..()
+ for(var/programs in head_programs)
+ var/datum/computer_file/program/program_type = new programs
+ store_file(program_type)
+
/obj/item/modular_computer/pda/heads/captain
name = "captain PDA"
greyscale_config = /datum/greyscale_config/tablet/captain
@@ -35,11 +40,6 @@
greyscale_config = /datum/greyscale_config/tablet/stripe_thick/head
greyscale_colors = "#374f7e#a52f29#a52f29"
starting_programs = list(
- /datum/computer_file/program/crew_manifest,
- /datum/computer_file/program/status,
- /datum/computer_file/program/science,
- /datum/computer_file/program/robocontrol,
- /datum/computer_file/program/budgetorders,
/datum/computer_file/program/records/security,
/datum/computer_file/program/job_management,
)
@@ -50,11 +50,6 @@
greyscale_colors = "#EA3232#0000CC"
inserted_item = /obj/item/pen/red/security
starting_programs = list(
- /datum/computer_file/program/crew_manifest,
- /datum/computer_file/program/status,
- /datum/computer_file/program/science,
- /datum/computer_file/program/robocontrol,
- /datum/computer_file/program/budgetorders,
/datum/computer_file/program/records/security,
)
@@ -63,11 +58,6 @@
greyscale_config = /datum/greyscale_config/tablet/stripe_thick/head
greyscale_colors = "#D99A2E#69DBF3#FAFAFA"
starting_programs = list(
- /datum/computer_file/program/crew_manifest,
- /datum/computer_file/program/status,
- /datum/computer_file/program/science,
- /datum/computer_file/program/robocontrol,
- /datum/computer_file/program/budgetorders,
/datum/computer_file/program/atmosscan,
/datum/computer_file/program/alarm_monitor,
/datum/computer_file/program/supermatter_monitor,
@@ -78,11 +68,6 @@
greyscale_config = /datum/greyscale_config/tablet/stripe_thick/head
greyscale_colors = "#FAFAFA#000099#3F96CC"
starting_programs = list(
- /datum/computer_file/program/crew_manifest,
- /datum/computer_file/program/status,
- /datum/computer_file/program/science,
- /datum/computer_file/program/robocontrol,
- /datum/computer_file/program/budgetorders,
/datum/computer_file/program/maintenance/phys_scanner,
/datum/computer_file/program/records/medical,
)
@@ -94,12 +79,7 @@
inserted_item = /obj/item/pen/fountain
starting_programs = list(
/datum/computer_file/program/borg_monitor,
- /datum/computer_file/program/budgetorders,
- /datum/computer_file/program/crew_manifest,
- /datum/computer_file/program/robocontrol,
- /datum/computer_file/program/science,
/datum/computer_file/program/scipaper_program,
- /datum/computer_file/program/status,
/datum/computer_file/program/signal_commander,
)
@@ -110,11 +90,6 @@
inserted_item = /obj/item/pen/survival
stored_paper = 20
starting_programs = list(
- /datum/computer_file/program/crew_manifest,
- /datum/computer_file/program/status,
- /datum/computer_file/program/science,
- /datum/computer_file/program/robocontrol,
- /datum/computer_file/program/budgetorders,
/datum/computer_file/program/shipping,
/datum/computer_file/program/restock_tracker,
)
@@ -129,7 +104,6 @@
inserted_item = /obj/item/pen/red/security
starting_programs = list(
/datum/computer_file/program/records/security,
- /datum/computer_file/program/crew_manifest,
/datum/computer_file/program/robocontrol,
)
@@ -139,7 +113,6 @@
inserted_item = /obj/item/pen/red/security
starting_programs = list(
/datum/computer_file/program/records/security,
- /datum/computer_file/program/crew_manifest,
/datum/computer_file/program/robocontrol,
)
@@ -150,7 +123,6 @@
inserted_item = /obj/item/pen/red/security
starting_programs = list(
/datum/computer_file/program/records/security,
- /datum/computer_file/program/crew_manifest,
/datum/computer_file/program/robocontrol,
)
@@ -244,7 +216,6 @@
greyscale_colors = "#FAFAFA#000099#1f2026"
starting_programs = list(
/datum/computer_file/program/records/medical,
- /datum/computer_file/program/crew_manifest,
)
/**
@@ -405,7 +376,6 @@
greyscale_colors = "#333333#000099#3F96CC"
starting_programs = list(
/datum/computer_file/program/records/medical,
- /datum/computer_file/program/crew_manifest,
/datum/computer_file/program/robocontrol,
)
@@ -422,7 +392,6 @@
name = "bridge assistant PDA"
greyscale_colors = "#374f7e#a92323"
starting_programs = list(
- /datum/computer_file/program/crew_manifest,
/datum/computer_file/program/status,
)
@@ -432,7 +401,6 @@
inserted_item = /obj/item/pen/fountain
starting_programs = list(
/datum/computer_file/program/records/security,
- /datum/computer_file/program/crew_manifest,
/datum/computer_file/program/coupon, //veteran discount
/datum/computer_file/program/skill_tracker,
)
diff --git a/code/modules/modular_computers/file_system/programs/crewmanifest.dm b/code/modules/modular_computers/file_system/programs/crewmanifest.dm
index 39a9d8c3c7fe5..d0dcf0ae873fe 100644
--- a/code/modules/modular_computers/file_system/programs/crewmanifest.dm
+++ b/code/modules/modular_computers/file_system/programs/crewmanifest.dm
@@ -1,15 +1,13 @@
/datum/computer_file/program/crew_manifest
filename = "plexagoncrew"
filedesc = "Plexagon Crew List"
- downloader_category = PROGRAM_CATEGORY_SECURITY
+ downloader_category = PROGRAM_CATEGORY_DEVICE
program_open_overlay = "id"
extended_desc = "Program for viewing and printing the current crew manifest"
- download_access = list(ACCESS_SECURITY, ACCESS_COMMAND)
program_flags = PROGRAM_ON_NTNET_STORE | PROGRAM_REQUIRES_NTNET
- size = 4
+ size = 0
tgui_id = "NtosCrewManifest"
program_icon = "clipboard-list"
- detomatix_resistance = DETOMATIX_RESIST_MAJOR
/datum/computer_file/program/crew_manifest/ui_static_data(mob/user)
var/list/data = list()
diff --git a/code/modules/modular_computers/file_system/programs/frontier.dm b/code/modules/modular_computers/file_system/programs/frontier.dm
index c8030287e8943..04e902a5e8d4c 100644
--- a/code/modules/modular_computers/file_system/programs/frontier.dm
+++ b/code/modules/modular_computers/file_system/programs/frontier.dm
@@ -8,7 +8,7 @@
program_open_overlay = "research"
tgui_id = "NtosScipaper"
program_icon = "paper-plane"
- download_access = list(ACCESS_ORDNANCE, ACCESS_SCIENCE, ACCESS_AWAY_SCIENCE)
+ download_access = list(ACCESS_ORDNANCE, ACCESS_SCIENCE, ACCESS_AWAY_SCIENCE, ACCESS_ATMOSPHERICS)
var/datum/techweb/linked_techweb
/// Unpublished, temporary paper datum.
diff --git a/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm b/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm
index 4ad633aa94df4..6436e6be2b862 100644
--- a/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm
+++ b/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm
@@ -157,7 +157,7 @@
/datum/computer_file/program/messenger/ui_state(mob/user)
if(issilicon(user))
- return GLOB.reverse_contained_state
+ return GLOB.deep_inventory_state
return GLOB.default_state
/datum/computer_file/program/messenger/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
diff --git a/code/modules/modular_computers/file_system/programs/records.dm b/code/modules/modular_computers/file_system/programs/records.dm
index 063c19d35e18b..fbd0b9edabd66 100644
--- a/code/modules/modular_computers/file_system/programs/records.dm
+++ b/code/modules/modular_computers/file_system/programs/records.dm
@@ -29,6 +29,7 @@
download_access = list(ACCESS_SECURITY, ACCESS_FLAG_COMMAND)
program_flags = PROGRAM_ON_NTNET_STORE
mode = "security"
+ detomatix_resistance = DETOMATIX_RESIST_MINOR
/datum/computer_file/program/records/proc/GetRecordsReadable()
var/list/all_records = list()
diff --git a/code/modules/modular_computers/file_system/programs/statusdisplay.dm b/code/modules/modular_computers/file_system/programs/statusdisplay.dm
index fa844215b93b9..a57940d99c1fa 100644
--- a/code/modules/modular_computers/file_system/programs/statusdisplay.dm
+++ b/code/modules/modular_computers/file_system/programs/statusdisplay.dm
@@ -11,6 +11,7 @@
can_run_on_flags = PROGRAM_ALL
program_flags = PROGRAM_REQUIRES_NTNET
+ detomatix_resistance = DETOMATIX_RESIST_MAJOR
var/upper_text = ""
var/lower_text = ""
diff --git a/code/modules/modular_computers/file_system/programs/virtual_pet.dm b/code/modules/modular_computers/file_system/programs/virtual_pet.dm
index 78a9148b013fe..8f1eef074d46a 100644
--- a/code/modules/modular_computers/file_system/programs/virtual_pet.dm
+++ b/code/modules/modular_computers/file_system/programs/virtual_pet.dm
@@ -429,7 +429,7 @@ GLOBAL_LIST_EMPTY(virtual_pets_list)
var/static/list/possible_emotes = list(
/datum/emote/flip,
- /datum/emote/living/jump,
+ /datum/emote/jump,
/datum/emote/living/shiver,
/datum/emote/spin,
/datum/emote/silicon/beep,
diff --git a/code/modules/pai/hud.dm b/code/modules/pai/hud.dm
index b104c7b90eab4..77bcafefc82d2 100644
--- a/code/modules/pai/hud.dm
+++ b/code/modules/pai/hud.dm
@@ -5,7 +5,7 @@
var/required_software
/atom/movable/screen/pai/Click()
- if(isobserver(usr) || usr.incapacitated())
+ if(isobserver(usr) || usr.incapacitated)
return FALSE
var/mob/living/silicon/pai/user = usr
if(required_software && !user.installed_software.Find(required_software))
diff --git a/code/modules/pai/say.dm b/code/modules/pai/say.dm
index b35abfe7f9d80..c7ed1a566d883 100644
--- a/code/modules/pai/say.dm
+++ b/code/modules/pai/say.dm
@@ -1,2 +1,2 @@
/mob/living/silicon/pai/binarycheck()
- return radio?.translate_binary
+ return (radio?.special_channels & RADIO_SPECIAL_BINARY)
diff --git a/code/modules/pai/shell.dm b/code/modules/pai/shell.dm
index 2ef3cf3d8e2dd..6a8a8e709c82b 100644
--- a/code/modules/pai/shell.dm
+++ b/code/modules/pai/shell.dm
@@ -30,7 +30,7 @@
* FALSE otherwise.
*/
/mob/living/silicon/pai/proc/check_menu(atom/anchor)
- if(incapacitated())
+ if(incapacitated)
return FALSE
if(get_turf(src) != get_turf(anchor))
return FALSE
diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm
index 17ecc92708cbd..7750b3926465f 100644
--- a/code/modules/paperwork/clipboard.dm
+++ b/code/modules/paperwork/clipboard.dm
@@ -158,7 +158,7 @@
return data
-/obj/item/clipboard/ui_act(action, params)
+/obj/item/clipboard/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/paperwork/fax.dm b/code/modules/paperwork/fax.dm
index e652b92e97805..fc1b986ce6d67 100644
--- a/code/modules/paperwork/fax.dm
+++ b/code/modules/paperwork/fax.dm
@@ -43,6 +43,9 @@ GLOBAL_VAR_INIT(nt_fax_department, pick("NT HR Department", "NT Legal Department
/obj/item/card,
/obj/item/folder/biscuit,
/obj/item/food/breadslice,
+ /obj/item/food/chapslice,
+ /obj/item/food/cookie,
+ /obj/item/food/grilled_chapslice,
/obj/item/food/pizza/flatbread,
/obj/item/food/pizzaslice,
/obj/item/food/root_flatbread,
@@ -66,6 +69,27 @@ GLOBAL_VAR_INIT(nt_fax_department, pick("NT HR Department", "NT Legal Department
fax_name = "[current_area.name]"
return ..()
+/obj/machinery/fax/admin/syndicate
+ name = "Syndicate Fax Machine"
+
+/obj/machinery/fax/admin/syndicate/Initialize(mapload)
+ fax_name = "[special_networks["syndicate"]["fax_name"]]"
+ fax_id = special_networks["syndicate"]["fax_id"]
+ syndicate_network = TRUE
+ return ..()
+
+/obj/machinery/fax/admin
+ name = "CentCom Fax Machine"
+
+/obj/machinery/fax/admin/Initialize(mapload)
+ if (!fax_name)
+ fax_name = "[GLOB.nt_fax_department]"
+ if(!fax_id)
+ fax_id = special_networks["nanotrasen"]["fax_id"]
+ name = "[fax_name] Fax Machine"
+ visible_to_network = FALSE
+ return ..()
+
/obj/machinery/fax/Initialize(mapload)
. = ..()
if (!fax_id)
@@ -232,7 +256,7 @@ GLOBAL_VAR_INIT(nt_fax_department, pick("NT HR Department", "NT Legal Department
var/list/data = list()
//Record a list of all existing faxes.
for(var/obj/machinery/fax/FAX as anything in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/fax))
- if(FAX.fax_id == fax_id || is_centcom_level(FAX.z)) //skip yourself and the centcom fax machine.
+ if(FAX.fax_id == fax_id) //skip yourself
continue
var/list/fax_data = list()
fax_data["fax_name"] = FAX.fax_name
@@ -253,11 +277,13 @@ GLOBAL_VAR_INIT(nt_fax_department, pick("NT HR Department", "NT Legal Department
data["fax_history"] = fax_history
var/list/special_networks_data = list()
for(var/key in special_networks)
+ if(special_networks[key]["fax_id"] == fax_id)
+ continue
special_networks_data += list(special_networks[key])
data["special_faxes"] = special_networks_data
return data
-/obj/machinery/fax/ui_act(action, list/params)
+/obj/machinery/fax/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
@@ -300,7 +326,7 @@ GLOBAL_VAR_INIT(nt_fax_department, pick("NT HR Department", "NT Legal Department
history_add("Send", params["name"])
GLOB.requests.fax_request(usr.client, "sent a fax message from [fax_name]/[fax_id] to [params["name"]]", fax_paper)
- to_chat(GLOB.admins, span_adminnotice("[icon2html(src.icon, GLOB.admins)]FAX REQUEST: [ADMIN_FULLMONTY(usr)]: [span_linkify("sent a fax message from [fax_name]/[fax_id][ADMIN_FLW(src)] to [html_encode(params["name"])]")] [ADMIN_SHOW_PAPER(fax_paper)] [ADMIN_PRINT_FAX(fax_paper, fax_name)]"), confidential = TRUE)
+ to_chat(GLOB.admins, span_adminnotice("[icon2html(src.icon, GLOB.admins)]FAX REQUEST: [ADMIN_FULLMONTY(usr)]: [span_linkify("sent a fax message from [fax_name]/[fax_id][ADMIN_FLW(src)] to [html_encode(params["name"])]")] [ADMIN_SHOW_PAPER(fax_paper)] [ADMIN_PRINT_FAX(fax_paper, fax_name, params["id"])]"), confidential = TRUE)
for(var/client/staff as anything in GLOB.admins)
if(staff?.prefs.read_preference(/datum/preference/toggle/comms_notification))
SEND_SOUND(staff, sound('sound/misc/server-ready.ogg'))
diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm
index 46b9b8f31fdd2..41d9aabb54ac8 100644
--- a/code/modules/paperwork/filingcabinet.dm
+++ b/code/modules/paperwork/filingcabinet.dm
@@ -83,7 +83,7 @@
return data
-/obj/structure/filingcabinet/ui_act(action, params)
+/obj/structure/filingcabinet/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm
index 3ee556b3adf4f..50c833ca89fd5 100644
--- a/code/modules/paperwork/folders.dm
+++ b/code/modules/paperwork/folders.dm
@@ -106,7 +106,7 @@
return data
-/obj/item/folder/ui_act(action, params)
+/obj/item/folder/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index fe2de7e752030..14202b1bf3b36 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -64,6 +64,9 @@
///If TRUE, staff can read paper everywhere, but usually from requests panel.
var/request_state = FALSE
+ ///If this paper can be selected as a candidate for a future message in a bottle when spawned outside of mapload. Doesn't affect manually doing that.
+ var/can_become_message_in_bottle = TRUE
+
/obj/item/paper/Initialize(mapload)
. = ..()
pixel_x = base_pixel_x + rand(-9, 9)
@@ -74,10 +77,14 @@
update_appearance()
+ if(can_become_message_in_bottle && !mapload && prob(MESSAGE_BOTTLE_CHANCE))
+ LAZYADD(SSpersistence.queued_message_bottles, src)
+
/obj/item/paper/Destroy()
- . = ..()
camera_holder = null
clear_paper()
+ LAZYREMOVE(SSpersistence.queued_message_bottles, src)
+ return ..()
/// Determines whether this paper has been written or stamped to.
/obj/item/paper/proc/is_empty()
@@ -306,7 +313,7 @@
set category = "Object"
set src in usr
- if(!usr.can_read(src) || usr.is_blind() || usr.incapacitated(IGNORE_RESTRAINTS|IGNORE_GRAB) || (isobserver(usr) && !isAdminGhostAI(usr)))
+ if(!usr.can_read(src) || usr.is_blind() || INCAPACITATED_IGNORING(usr, INCAPABLE_RESTRAINTS|INCAPABLE_GRAB) || (isobserver(usr) && !isAdminGhostAI(usr)))
return
if(ishuman(usr))
var/mob/living/carbon/human/H = usr
@@ -351,7 +358,7 @@
return UI_UPDATE
if(!in_range(user, src) && !isobserver(user))
return UI_CLOSE
- if(user.incapacitated(IGNORE_RESTRAINTS|IGNORE_GRAB) || (isobserver(user) && !isAdminGhostAI(user)))
+ if(INCAPACITATED_IGNORING(user, INCAPABLE_RESTRAINTS|INCAPABLE_GRAB) || (isobserver(user) && !isAdminGhostAI(user)))
return UI_UPDATE
// Even harder to read if your blind...braile? humm
// .. or if you cannot read
@@ -527,22 +534,10 @@
static_data["user_name"] = user.real_name
- static_data["raw_text_input"] = list()
- for(var/datum/paper_input/text_input as anything in raw_text_inputs)
- static_data["raw_text_input"] += list(text_input.to_list())
-
- static_data["raw_field_input"] = list()
- for(var/datum/paper_field/field_input as anything in raw_field_input_data)
- static_data["raw_field_input"] += list(field_input.to_list())
-
- static_data["raw_stamp_input"] = list()
- for(var/datum/paper_stamp/stamp_input as anything in raw_stamp_data)
- static_data["raw_stamp_input"] += list(stamp_input.to_list())
+ static_data += convert_to_data()
static_data["max_length"] = MAX_PAPER_LENGTH
static_data["max_input_field_length"] = MAX_PAPER_INPUT_FIELD_LENGTH
- static_data["paper_color"] = color ? color : COLOR_WHITE
- static_data["paper_name"] = name
static_data["default_pen_font"] = PEN_FONT
static_data["default_pen_color"] = COLOR_BLACK
@@ -550,6 +545,43 @@
return static_data;
+/obj/item/paper/proc/convert_to_data()
+ var/list/data = list()
+
+ data[LIST_PAPER_RAW_TEXT_INPUT] = list()
+ for(var/datum/paper_input/text_input as anything in raw_text_inputs)
+ data[LIST_PAPER_RAW_TEXT_INPUT] += list(text_input.to_list())
+
+ data[LIST_PAPER_RAW_FIELD_INPUT] = list()
+ for(var/datum/paper_field/field_input as anything in raw_field_input_data)
+ data[LIST_PAPER_RAW_FIELD_INPUT] += list(field_input.to_list())
+
+ data[LIST_PAPER_RAW_STAMP_INPUT] = list()
+ for(var/datum/paper_stamp/stamp_input as anything in raw_stamp_data)
+ data[LIST_PAPER_RAW_STAMP_INPUT] += list(stamp_input.to_list())
+
+ data[LIST_PAPER_COLOR] = color ? color : COLOR_WHITE
+ data[LIST_PAPER_NAME] = name
+
+ return data
+
+/obj/item/paper/proc/write_from_data(list/data)
+ for(var/list/input as anything in data[LIST_PAPER_RAW_TEXT_INPUT])
+ add_raw_text(input[LIST_PAPER_RAW_TEXT], input[LIST_PAPER_FONT], input[LIST_PAPER_FIELD_COLOR], input[LIST_PAPER_BOLD], input[LIST_PAPER_ADVANCED_HTML])
+
+ for(var/list/field as anything in data[LIST_PAPER_RAW_FIELD_INPUT])
+ var/list/input = field[LIST_PAPER_FIELD_DATA]
+ add_field_input(field[LIST_PAPER_FIELD_INDEX], input[LIST_PAPER_RAW_TEXT], input[LIST_PAPER_FONT], input[LIST_PAPER_FIELD_COLOR], input[LIST_PAPER_BOLD], field[LIST_PAPER_IS_SIGNATURE])
+
+ for(var/list/stamp as anything in data[LIST_PAPER_RAW_STAMP_INPUT])
+ add_stamp(stamp[LIST_PAPER_CLASS], stamp[LIST_PAPER_STAMP_X], stamp[LIST_PAPER_STAMP_Y], stamp[LIST_PAPER_ROTATION])
+
+ var/new_color = data[LIST_PAPER_COLOR]
+ if(new_color != COLOR_WHITE)
+ add_atom_colour(new_color, FIXED_COLOUR_PRIORITY)
+
+ name = data[LIST_PAPER_NAME]
+
/obj/item/paper/ui_data(mob/user)
var/list/data = list()
@@ -753,11 +785,11 @@
/datum/paper_input/proc/to_list()
return list(
- raw_text = raw_text,
- font = font,
- color = colour,
- bold = bold,
- advanced_html = advanced_html,
+ LIST_PAPER_RAW_TEXT = raw_text,
+ LIST_PAPER_FONT = font,
+ LIST_PAPER_FIELD_COLOR = colour,
+ LIST_PAPER_BOLD = bold,
+ LIST_PAPER_ADVANCED_HTML = advanced_html,
)
/// Returns the raw contents of the input as html, with **ZERO SANITIZATION**
@@ -793,10 +825,10 @@
/datum/paper_stamp/proc/to_list()
return list(
- class = class,
- x = stamp_x,
- y = stamp_y,
- rotation = rotation,
+ LIST_PAPER_CLASS = class,
+ LIST_PAPER_STAMP_X = stamp_x,
+ LIST_PAPER_STAMP_Y = stamp_y,
+ LIST_PAPER_ROTATION = rotation,
)
/// A reference to some data that replaces a modifiable input field at some given index in paper raw input parsing.
@@ -818,9 +850,9 @@
/datum/paper_field/proc/to_list()
return list(
- field_index = field_index,
- field_data = field_data.to_list(),
- is_signature = is_signature,
+ LIST_PAPER_FIELD_INDEX = field_index,
+ LIST_PAPER_FIELD_DATA = field_data.to_list(),
+ LIST_PAPER_IS_SIGNATURE = is_signature,
)
/obj/item/paper/construction
diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm
index 7b734c1530666..1d913f4a236b0 100644
--- a/code/modules/paperwork/paperplane.dm
+++ b/code/modules/paperwork/paperplane.dm
@@ -91,7 +91,7 @@
/obj/item/paperplane/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
if(iscarbon(hit_atom) && HAS_TRAIT(hit_atom, TRAIT_PAPER_MASTER))
var/mob/living/carbon/hit_carbon = hit_atom
- if(hit_carbon.can_catch_item(TRUE))
+ if(hit_carbon.can_catch_item(src, skip_throw_mode_check = TRUE))
hit_carbon.throw_mode_on(THROW_MODE_TOGGLE)
. = ..()
diff --git a/code/modules/paperwork/paperwork.dm b/code/modules/paperwork/paperwork.dm
index cd26482bf6c8a..2acedcf00f093 100644
--- a/code/modules/paperwork/paperwork.dm
+++ b/code/modules/paperwork/paperwork.dm
@@ -44,7 +44,7 @@
if(.)
return
- if(stamped || istype(attacking_item, /obj/item/stamp))
+ if(stamped || !istype(attacking_item, /obj/item/stamp))
return
if(istype(attacking_item, stamp_requested))
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
index b72a232017029..1c54aefa269dc 100644
--- a/code/modules/paperwork/photocopier.dm
+++ b/code/modules/paperwork/photocopier.dm
@@ -179,7 +179,7 @@ GLOBAL_LIST_INIT(paper_blanks, init_paper_blanks())
return data
-/obj/machinery/photocopier/ui_act(action, list/params)
+/obj/machinery/photocopier/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/photography/camera/silicon_camera.dm b/code/modules/photography/camera/silicon_camera.dm
index 9cdbee1bc2b7a..a8bf7a3ba90e7 100644
--- a/code/modules/photography/camera/silicon_camera.dm
+++ b/code/modules/photography/camera/silicon_camera.dm
@@ -7,7 +7,7 @@
/// Checks if we can take a picture at this moment. Returns TRUE if we can, FALSE if we can't.
/obj/item/camera/siliconcam/proc/can_take_picture(mob/living/silicon/clicker)
- if(clicker.stat != CONSCIOUS || clicker.incapacitated())
+ if(clicker.stat != CONSCIOUS || clicker.incapacitated)
return FALSE
return TRUE
diff --git a/code/modules/photography/photos/photo.dm b/code/modules/photography/photos/photo.dm
index b009c5b2e7913..342abb1625c5a 100644
--- a/code/modules/photography/photos/photo.dm
+++ b/code/modules/photography/photos/photo.dm
@@ -9,12 +9,21 @@
w_class = WEIGHT_CLASS_TINY
resistance_flags = FLAMMABLE
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/Initialize(mapload, datum/picture/P, datum_name = TRUE, datum_desc = TRUE)
set_picture(P, datum_name, datum_desc, TRUE)
+ //Photos are quite rarer than papers, so they're more likely to be added to the queue to make things even.
+ if(!mapload && prob(MESSAGE_BOTTLE_CHANCE * 5) && picture?.id)
+ LAZYADD(SSpersistence.queued_message_bottles, src)
+ return ..()
+
+/obj/item/photo/Destroy()
+ LAZYREMOVE(SSpersistence.queued_message_bottles, src)
return ..()
/obj/item/photo/proc/set_picture(datum/picture/P, setname, setdesc, name_override = FALSE)
@@ -104,7 +113,7 @@
var/n_name = tgui_input_text(usr, "What would you like to label the photo?", "Photo Labelling", max_length = MAX_NAME_LEN)
//loc.loc check is for making possible renaming photos in clipboards
- if(n_name && (loc == usr || loc.loc && loc.loc == usr) && usr.stat == CONSCIOUS && !usr.incapacitated())
+ if(n_name && (loc == usr || loc.loc && loc.loc == usr) && usr.stat == CONSCIOUS && !usr.incapacitated)
name = "photo[(n_name ? "- '[n_name]'" : null)]"
add_fingerprint(usr)
diff --git a/code/modules/plumbing/plumbers/acclimator.dm b/code/modules/plumbing/plumbers/acclimator.dm
index 014ff8499018d..51300af110b01 100644
--- a/code/modules/plumbing/plumbers/acclimator.dm
+++ b/code/modules/plumbing/plumbers/acclimator.dm
@@ -88,7 +88,7 @@
data["emptying"] = emptying
return data
-/obj/machinery/plumbing/acclimator/ui_act(action, params)
+/obj/machinery/plumbing/acclimator/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/plumbing/plumbers/pill_press.dm b/code/modules/plumbing/plumbers/pill_press.dm
index 2f2528a1765c1..23a7c7b03e54f 100644
--- a/code/modules/plumbing/plumbers/pill_press.dm
+++ b/code/modules/plumbing/plumbers/pill_press.dm
@@ -136,7 +136,7 @@
return data
-/obj/machinery/plumbing/pill_press/ui_act(action, params)
+/obj/machinery/plumbing/pill_press/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/plumbing/plumbers/splitters.dm b/code/modules/plumbing/plumbers/splitters.dm
index b87a07d694cc4..c2f9216c92b90 100644
--- a/code/modules/plumbing/plumbers/splitters.dm
+++ b/code/modules/plumbing/plumbers/splitters.dm
@@ -32,7 +32,7 @@
data["max_transfer"] = max_transfer
return data
-/obj/machinery/plumbing/splitter/ui_act(action, params)
+/obj/machinery/plumbing/splitter/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/plumbing/plumbers/synthesizer.dm b/code/modules/plumbing/plumbers/synthesizer.dm
index 0399ad85f3c04..ed4121d6ad02a 100644
--- a/code/modules/plumbing/plumbers/synthesizer.dm
+++ b/code/modules/plumbing/plumbers/synthesizer.dm
@@ -89,7 +89,7 @@
.["current_reagent"] = initial(reagent_id.name)
-/obj/machinery/plumbing/synthesizer/ui_act(action, params)
+/obj/machinery/plumbing/synthesizer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/point/point.dm b/code/modules/point/point.dm
index 6e61b1154d59c..681fbce2c6bac 100644
--- a/code/modules/point/point.dm
+++ b/code/modules/point/point.dm
@@ -7,22 +7,30 @@
*
* Not intended as a replacement for the mob verb
*/
-/atom/movable/proc/point_at(atom/pointed_atom)
+/atom/movable/proc/point_at(atom/pointed_atom, intentional = FALSE)
if(!isturf(loc))
- return
+ return FALSE
if (pointed_atom in src)
create_point_bubble(pointed_atom)
- return
+ return FALSE
var/turf/tile = get_turf(pointed_atom)
if (!tile)
- return
+ return FALSE
var/turf/our_tile = get_turf(src)
var/obj/visual = new /obj/effect/temp_visual/point(our_tile, invisibility)
+ SEND_SIGNAL(src, COMSIG_MOVABLE_POINTED, pointed_atom, visual, intentional)
+
animate(visual, pixel_x = (tile.x - our_tile.x) * world.icon_size + pointed_atom.pixel_x, pixel_y = (tile.y - our_tile.y) * world.icon_size + pointed_atom.pixel_y, time = 1.7, easing = EASE_OUT)
+ return TRUE
+
+/mob/point_at(atom/pointed_atom, intentional = FALSE)
+ . = ..()
+ if(.)
+ face_atom(pointed_atom)
/atom/movable/proc/create_point_bubble(atom/pointed_atom)
var/mutable_appearance/thought_bubble = mutable_appearance(
@@ -109,7 +117,6 @@
if(client && !(pointing_at in view(client.view, src)))
return FALSE
- point_at(pointing_at)
+ point_at(pointing_at, TRUE)
- SEND_SIGNAL(src, COMSIG_MOB_POINTED, pointing_at)
return TRUE
diff --git a/code/modules/power/apc/apc_main.dm b/code/modules/power/apc/apc_main.dm
index 481ccde663b72..b0c5035a1f845 100644
--- a/code/modules/power/apc/apc_main.dm
+++ b/code/modules/power/apc/apc_main.dm
@@ -444,16 +444,17 @@
if(!QDELETED(remote_control_user) && user == remote_control_user)
. = UI_INTERACTIVE
-/obj/machinery/power/apc/ui_act(action, params)
+/obj/machinery/power/apc/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
+ var/mob/user = ui.user
- if(. || !can_use(usr, 1) || (locked && !HAS_SILICON_ACCESS(usr) && !failure_timer && action != "toggle_nightshift"))
+ if(. || !can_use(user, 1) || (locked && !HAS_SILICON_ACCESS(user) && !failure_timer && action != "toggle_nightshift"))
return
switch(action)
if("lock")
- if(HAS_SILICON_ACCESS(usr))
+ if(HAS_SILICON_ACCESS(user))
if((obj_flags & EMAGGED) || (machine_stat & (BROKEN|MAINT)) || remote_control_user)
- to_chat(usr, span_warning("The APC does not respond to the command!"))
+ to_chat(user, span_warning("The APC does not respond to the command!"))
else
locked = !locked
update_appearance()
@@ -462,10 +463,10 @@
coverlocked = !coverlocked
. = TRUE
if("breaker")
- toggle_breaker(usr)
+ toggle_breaker(user)
. = TRUE
if("toggle_nightshift")
- toggle_nightshift_lights(usr)
+ toggle_nightshift_lights(user)
. = TRUE
if("charge")
chargemode = !chargemode
@@ -488,17 +489,17 @@
update()
. = TRUE
if("overload")
- if(HAS_SILICON_ACCESS(usr))
+ if(HAS_SILICON_ACCESS(user))
overload_lighting()
. = TRUE
if("hack")
- if(get_malf_status(usr))
- malfhack(usr)
+ if(get_malf_status(user))
+ malfhack(user)
if("occupy")
- if(get_malf_status(usr))
- malfoccupy(usr)
+ if(get_malf_status(user))
+ malfoccupy(user)
if("deoccupy")
- if(get_malf_status(usr))
+ if(get_malf_status(user))
malfvacate()
if("reboot")
failure_timer = 0
@@ -684,7 +685,7 @@
/obj/machinery/power/apc/proc/overload_lighting()
if(!operating || shorted)
return
- if(cell && cell.use(0.02 * STANDARD_CELL_CHARGE))
+ if(cell && cell.use(0.02 * STANDARD_BATTERY_CHARGE))
INVOKE_ASYNC(src, PROC_REF(break_lights))
/obj/machinery/power/apc/proc/break_lights()
diff --git a/code/modules/power/apc/apc_tool_act.dm b/code/modules/power/apc/apc_tool_act.dm
index 8e4d51a703da6..9d7c008c6165c 100644
--- a/code/modules/power/apc/apc_tool_act.dm
+++ b/code/modules/power/apc/apc_tool_act.dm
@@ -110,7 +110,7 @@
if(isnull(choice) \
|| !user.is_holding(installing_cable) \
|| !user.Adjacent(src) \
- || user.incapacitated() \
+ || user.incapacitated \
|| !can_place_terminal(user, installing_cable, silent = TRUE) \
)
return ITEM_INTERACT_BLOCKING
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 65b4f01722959..f68319f4205fb 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -497,7 +497,7 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri
if(!ISADVANCEDTOOLUSER(user))
to_chat(user, span_warning("You don't have the dexterity to do this!"))
return FALSE
- if(user.incapacitated() || !user.Adjacent(src))
+ if(user.incapacitated || !user.Adjacent(src))
return FALSE
return TRUE
@@ -581,8 +581,9 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri
if(isnull(affecting) || !IS_ROBOTIC_LIMB(affecting))
return NONE
- if (!affecting.get_damage())
- return
+ if (!affecting.burn_dam)
+ balloon_alert(user, "limb not damaged")
+ return ITEM_INTERACT_BLOCKING
user.visible_message(span_notice("[user] starts to fix some of the wires in [attacked_humanoid == user ? user.p_their() : "[attacked_humanoid]'s"] [affecting.name]."),
span_notice("You start fixing some of the wires in [attacked_humanoid == user ? "your" : "[attacked_humanoid]'s"] [affecting.name]."))
@@ -766,7 +767,7 @@ GLOBAL_LIST(hub_radial_layer_list)
if(!ISADVANCEDTOOLUSER(user))
to_chat(user, span_warning("You don't have the dexterity to do this!"))
return FALSE
- if(user.incapacitated() || !user.Adjacent(src))
+ if(user.incapacitated || !user.Adjacent(src))
return FALSE
return TRUE
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index fbb36703cc569..addb8cdb6b835 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -20,6 +20,11 @@
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)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_FISHING_BAIT, INNATE_TRAIT)
+ ADD_TRAIT(src, TRAIT_POISONOUS_BAIT, INNATE_TRAIT) //bro is fishing using lithium...
+
/* Cell variants*/
/obj/item/stock_parts/power_store/cell/empty
empty = TRUE
@@ -221,9 +226,6 @@
custom_materials = null
grind_results = null
-/obj/item/stock_parts/power_store/cell/inducer_supply
- maxcharge = STANDARD_CELL_CHARGE * 5
-
/obj/item/stock_parts/power_store/cell/ethereal
name = "ahelp it"
desc = "you sohuldn't see this"
diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm
index ecab6e4eee9a1..4cfce3c5bc90a 100644
--- a/code/modules/power/gravitygenerator.dm
+++ b/code/modules/power/gravitygenerator.dm
@@ -289,7 +289,7 @@ GLOBAL_LIST_EMPTY(gravity_generators)
return data
-/obj/machinery/gravity_generator/main/ui_act(action, params)
+/obj/machinery/gravity_generator/main/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/power/pipecleaners.dm b/code/modules/power/pipecleaners.dm
index 4c91301978940..4700004904796 100644
--- a/code/modules/power/pipecleaners.dm
+++ b/code/modules/power/pipecleaners.dm
@@ -233,7 +233,7 @@ By design, d1 is the smallest direction and d2 is the highest
return FALSE
if(!user.is_holding(src))
return FALSE
- if(user.incapacitated())
+ if(user.incapacitated)
return FALSE
return TRUE
diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm
index c5353ce62d537..e27ea98f8ca5f 100644
--- a/code/modules/power/port_gen.dm
+++ b/code/modules/power/port_gen.dm
@@ -10,7 +10,7 @@
use_power = NO_POWER_USE
var/active = FALSE
- var/power_gen = 5000
+ var/power_gen = 5 KILO JOULES
var/power_output = 1
var/consumption = 0
var/datum/looping_sound/generator/soundloop
@@ -81,13 +81,13 @@
/obj/machinery/power/port_gen/pacman
name = "\improper P.A.C.M.A.N.-type portable generator"
circuit = /obj/item/circuitboard/machine/pacman
- power_gen = 5000
+ power_gen = 10 KILO JOULES
var/sheets = 0
var/max_sheets = 50
var/sheet_name = ""
var/sheet_path = /obj/item/stack/sheet/mineral/plasma
var/sheet_left = 0 // How much is left of the sheet
- var/time_per_sheet = 60
+ var/time_per_sheet = 180
var/current_heat = 0
/obj/machinery/power/port_gen/pacman/Initialize(mapload)
@@ -108,8 +108,8 @@
icon_state = "portgen1_0"
base_icon_state = "portgen1"
max_sheets = 20
- time_per_sheet = 20
- power_gen = 15000
+ time_per_sheet = 60
+ power_gen = 30 KILO JOULES
sheet_path = /obj/item/stack/sheet/mineral/uranium
/obj/machinery/power/port_gen/pacman/examine(mob/user)
@@ -246,7 +246,7 @@
data["current_heat"] = current_heat
. = data
-/obj/machinery/power/port_gen/pacman/ui_act(action, params)
+/obj/machinery/power/port_gen/pacman/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
@@ -274,8 +274,8 @@
icon_state = "portgen1_0"
base_icon_state = "portgen1"
max_sheets = 20
- time_per_sheet = 20
- power_gen = 15000
+ time_per_sheet = 60
+ power_gen = 30 KILO JOULES
sheet_path = /obj/item/stack/sheet/mineral/uranium
/obj/machinery/power/port_gen/pacman/pre_loaded
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 562bf4c0825cd..b288fd6aa87cd 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -421,7 +421,7 @@
. = ..()
/obj/machinery/power/emitter/prototype/user_buckle_mob(mob/living/buckled_mob, mob/user, check_loc = TRUE)
- if(user.incapacitated() || !istype(user))
+ if(user.incapacitated || !istype(user))
return
for(var/atom/movable/atom in get_turf(src))
if(atom.density && (atom != src && atom != buckled_mob))
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index 935601b834bc3..f74a93e263da4 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -121,7 +121,7 @@
if(isnull(choice) \
|| !user.is_holding(item) \
|| !user.Adjacent(src) \
- || user.incapacitated() \
+ || user.incapacitated \
|| !can_place_terminal(user, item, silent = TRUE) \
)
return
@@ -366,7 +366,7 @@
)
return data
-/obj/machinery/power/smes/ui_act(action, params)
+/obj/machinery/power/smes/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index 370140a4f74cd..cd36823a207e9 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -486,7 +486,7 @@
data["history"] = history
return data
-/obj/machinery/power/solar_control/ui_act(action, params)
+/obj/machinery/power/solar_control/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/power/supermatter/supermatter_extra_effects.dm b/code/modules/power/supermatter/supermatter_extra_effects.dm
index 35c96d298dd34..b6cc1b792bdcf 100644
--- a/code/modules/power/supermatter/supermatter_extra_effects.dm
+++ b/code/modules/power/supermatter/supermatter_extra_effects.dm
@@ -173,7 +173,7 @@
if(VORTEX_ANOMALY)
new /obj/effect/anomaly/bhole(local_turf, 20, FALSE)
if(BIOSCRAMBLER_ANOMALY)
- new /obj/effect/anomaly/bioscrambler(local_turf, null, FALSE)
+ new /obj/effect/anomaly/bioscrambler/docile(local_turf, null, FALSE)
#undef CHANCE_EQUATION_SLOPE
#undef INTEGRITY_EXPONENTIAL_DEGREE
diff --git a/code/modules/power/turbine/turbine_computer.dm b/code/modules/power/turbine/turbine_computer.dm
index f983e11c1f128..2ad777edd6228 100644
--- a/code/modules/power/turbine/turbine_computer.dm
+++ b/code/modules/power/turbine/turbine_computer.dm
@@ -68,7 +68,7 @@
return data
-/obj/machinery/computer/turbine_computer/ui_act(action, params)
+/obj/machinery/computer/turbine_computer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/projectiles/ammunition/_ammunition.dm b/code/modules/projectiles/ammunition/_ammunition.dm
index 45e09db624caf..42751441fca4f 100644
--- a/code/modules/projectiles/ammunition/_ammunition.dm
+++ b/code/modules/projectiles/ammunition/_ammunition.dm
@@ -32,6 +32,12 @@
var/firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect
///pacifism check for boolet, set to FALSE if bullet is non-lethal
var/harmful = TRUE
+ ///If set to true or false, this ammunition can or cannot misfire, regardless the gun can_misfire setting
+ var/can_misfire = null
+ ///This is how much misfire probability is added to the gun when it fires this casing.
+ var/misfire_increment = 0
+ ///If set, this casing will damage any gun it's fired from by the specified amount
+ var/integrity_damage = 0
/obj/item/ammo_casing/spent
name = "spent bullet casing"
diff --git a/code/modules/projectiles/ammunition/_firing.dm b/code/modules/projectiles/ammunition/_firing.dm
index e2afc1bd67e7f..282c722b169e6 100644
--- a/code/modules/projectiles/ammunition/_firing.dm
+++ b/code/modules/projectiles/ammunition/_firing.dm
@@ -52,12 +52,19 @@
loaded_projectile.suppressed = quiet
if(isgun(fired_from))
- var/obj/item/gun/G = fired_from
- loaded_projectile.damage *= G.projectile_damage_multiplier
- loaded_projectile.stamina *= G.projectile_damage_multiplier
+ var/obj/item/gun/gun = fired_from
- loaded_projectile.wound_bonus += G.projectile_wound_bonus
- loaded_projectile.bare_wound_bonus += G.projectile_wound_bonus
+ var/integrity_mult = 0.5 + gun.get_integrity_percentage() * 0.5
+ if(integrity_mult >= 0.95) //Guns that are only mildly smudged don't debuff projectiles.
+ integrity_mult = 1
+
+ loaded_projectile.damage *= gun.projectile_damage_multiplier * integrity_mult
+ loaded_projectile.stamina *= gun.projectile_damage_multiplier * integrity_mult
+
+ loaded_projectile.wound_bonus += gun.projectile_wound_bonus
+ loaded_projectile.wound_bonus *= loaded_projectile.wound_bonus >= 0 ? 1 : 2 - integrity_mult
+ loaded_projectile.bare_wound_bonus += gun.projectile_wound_bonus
+ loaded_projectile.bare_wound_bonus *= loaded_projectile.bare_wound_bonus >= 0 ? 1 : 2 - integrity_mult
if(tk_firing(user, fired_from))
loaded_projectile.ignore_source_check = TRUE
diff --git a/code/modules/projectiles/ammunition/ballistic/shotgun.dm b/code/modules/projectiles/ammunition/ballistic/shotgun.dm
index b7cda3e93e1a8..84c75ed24935e 100644
--- a/code/modules/projectiles/ammunition/ballistic/shotgun.dm
+++ b/code/modules/projectiles/ammunition/ballistic/shotgun.dm
@@ -82,6 +82,20 @@
pellets = 6
variance = 25
+/obj/item/ammo_casing/shotgun/buckshot/old
+ projectile_type = /obj/projectile/bullet/pellet/shotgun_buckshot/old
+ can_misfire = TRUE
+ misfire_increment = 2
+ integrity_damage = 4
+
+/obj/item/ammo_casing/shotgun/buckshot/old/fire_casing(atom/target, mob/living/user, params, distro, quiet, zone_override, spread, atom/fired_from)
+ . = ..()
+ if(!fired_from)
+ return
+
+ var/datum/effect_system/fluid_spread/smoke/smoke = new
+ smoke.set_up(0, holder = fired_from, location = fired_from)
+
/obj/item/ammo_casing/shotgun/buckshot/spent
projectile_type = null
diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm
index 0b1623e9877ab..a77dcfec663b1 100644
--- a/code/modules/projectiles/ammunition/energy/laser.dm
+++ b/code/modules/projectiles/ammunition/energy/laser.dm
@@ -53,6 +53,7 @@
/obj/item/ammo_casing/energy/chameleon
projectile_type = /obj/projectile/energy/chameleon
e_cost = 0 // Can't really use the macro here, unfortunately
+ harmful = FALSE
var/projectile_vars = list()
/obj/item/ammo_casing/energy/chameleon/ready_proj()
diff --git a/code/modules/projectiles/boxes_magazines/internal/rifle.dm b/code/modules/projectiles/boxes_magazines/internal/rifle.dm
index b092e207c10d6..b1f761831ee62 100644
--- a/code/modules/projectiles/boxes_magazines/internal/rifle.dm
+++ b/code/modules/projectiles/boxes_magazines/internal/rifle.dm
@@ -60,5 +60,5 @@
/obj/item/ammo_box/magazine/internal/boltaction/rebarxbow/syndie
max_ammo = 3
caliber = CALIBER_REBAR_SYNDIE
- ammo_type = /obj/item/ammo_casing/rebar
+ ammo_type = /obj/item/ammo_casing/rebar/syndie
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 1452d879799fa..190f9e1a7aca8 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -153,6 +153,15 @@
else
. += "It doesn't have a firing pin installed, and won't fire."
+ var/healthpercent = (atom_integrity/max_integrity) * 100
+ switch(healthpercent)
+ if(60 to 95)
+ . += span_info("It looks slightly damaged.")
+ if(25 to 60)
+ . += span_warning("It appears heavily damaged.")
+ if(0 to 25)
+ . += span_boldwarning("It's falling apart!")
+
//called after the gun has successfully fired its chambered ammo.
/obj/item/gun/proc/process_chamber(empty_chamber = TRUE, from_firing = TRUE, chamber_next_round = TRUE)
handle_chamber(empty_chamber, from_firing, chamber_next_round)
@@ -179,36 +188,48 @@
else
playsound(src, fire_sound, fire_sound_volume, vary_fire_sound)
-/obj/item/gun/proc/shoot_live_shot(mob/living/user, pointblank = 0, atom/pbtarget = null, message = 1)
+/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)
fire_sounds()
- if(!suppressed)
- if(message)
- if(tk_firing(user))
- visible_message(
- span_danger("[src] fires itself[pointblank ? " point blank at [pbtarget]!" : "!"]"),
- blind_message = span_hear("You hear a gunshot!"),
- vision_distance = COMBAT_MESSAGE_RANGE
- )
- else if(pointblank)
- user.visible_message(
- span_danger("[user] fires [src] point blank at [pbtarget]!"),
- span_danger("You fire [src] point blank at [pbtarget]!"),
- span_hear("You hear a gunshot!"), COMBAT_MESSAGE_RANGE, pbtarget
- )
- to_chat(pbtarget, span_userdanger("[user] fires [src] point blank at you!"))
- if(pb_knockback > 0 && ismob(pbtarget))
- var/mob/PBT = pbtarget
- var/atom/throw_target = get_edge_target_turf(PBT, user.dir)
- PBT.throw_at(throw_target, pb_knockback, 2)
- else if(!tk_firing(user))
- user.visible_message(
- span_danger("[user] fires [src]!"),
- blind_message = span_hear("You hear a gunshot!"),
- vision_distance = COMBAT_MESSAGE_RANGE,
- ignored_mobs = user
- )
+ if(suppressed || !message)
+ return
+ if(tk_firing(user))
+ visible_message(
+ span_danger("[src] fires itself[pointblank ? " point blank at [pbtarget]!" : "!"]"),
+ blind_message = span_hear("You hear a gunshot!"),
+ vision_distance = COMBAT_MESSAGE_RANGE
+ )
+ else if(pointblank)
+ user.visible_message(
+ span_danger("[user] fires [src] point blank at [pbtarget]!"),
+ span_danger("You fire [src] point blank at [pbtarget]!"),
+ span_hear("You hear a gunshot!"), COMBAT_MESSAGE_RANGE, pbtarget
+ )
+ to_chat(pbtarget, span_userdanger("[user] fires [src] point blank at you!"))
+ if(pb_knockback > 0 && ismob(pbtarget))
+ var/mob/PBT = pbtarget
+ var/atom/throw_target = get_edge_target_turf(PBT, user.dir)
+ PBT.throw_at(throw_target, pb_knockback, 2)
+ else if(!tk_firing(user))
+ user.visible_message(
+ span_danger("[user] fires [src]!"),
+ blind_message = span_hear("You hear a gunshot!"),
+ vision_distance = COMBAT_MESSAGE_RANGE,
+ ignored_mobs = user
+ )
+
+ if(chambered?.integrity_damage)
+ take_damage(chambered.integrity_damage, sound_effect = FALSE)
+
+/obj/item/gun/atom_destruction(damage_flag)
+ if(!isliving(loc))
+ return ..()
+ var/mob/living/holder = loc
+ if(holder.is_holding(src) && holder.stat < UNCONSCIOUS)
+ to_chat(holder, span_boldwarning("[src] breaks down!"))
+ holder.playsound_local(get_turf(src), 'sound/weapons/smash.ogg', 50, TRUE)
+ return ..()
/obj/item/gun/emp_act(severity)
. = ..()
@@ -403,9 +424,9 @@
return FALSE
else
if(get_dist(user, target) <= 1) //Making sure whether the target is in vicinity for the pointblank shot
- shoot_live_shot(user, 1, target, message)
+ shoot_live_shot(user, TRUE, target, message)
else
- shoot_live_shot(user, 0, target, message)
+ shoot_live_shot(user, FALSE, target, message)
if (iteration >= burst_size)
firing_burst = FALSE
else
@@ -459,9 +480,9 @@
return
else
if(get_dist(user, target) <= 1) //Making sure whether the target is in vicinity for the pointblank shot
- shoot_live_shot(user, 1, target, message)
+ shoot_live_shot(user, TRUE, target, message)
else
- shoot_live_shot(user, 0, target, message)
+ shoot_live_shot(user, FALSE, target, message)
else
shoot_with_empty_chamber(user)
return
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index 8a8b4dbacfccc..2d77185f1d255 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -7,6 +7,7 @@
w_class = WEIGHT_CLASS_NORMAL
pickup_sound = 'sound/items/gun_pick_up.ogg'
drop_sound = 'sound/items/gun_drop.ogg'
+ sound_vary = TRUE
///sound when inserting magazine
var/load_sound = 'sound/weapons/gun/general/magazine_insert_full.ogg'
@@ -451,7 +452,7 @@
if (sawoff(user, A))
return
- if(can_misfire && istype(A, /obj/item/stack/sheet/cloth))
+ if(misfire_probability && istype(A, /obj/item/stack/sheet/cloth))
if(guncleaning(user, A))
return
@@ -463,7 +464,8 @@
return TRUE
/obj/item/gun/ballistic/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
- if(target != user && chambered.loaded_projectile && can_misfire && prob(misfire_probability) && blow_up(user))
+ var/could_it_misfire = (can_misfire && chambered.can_misfire != FALSE) || chambered.can_misfire
+ if(target != user && chambered.loaded_projectile && could_it_misfire && prob(misfire_probability) && blow_up(user))
to_chat(user, span_userdanger("[src] misfires!"))
return
@@ -473,9 +475,14 @@
return ..()
/obj/item/gun/ballistic/shoot_live_shot(mob/living/user, pointblank = 0, atom/pbtarget = null, message = 1)
- if(can_misfire)
+ if(isnull(chambered))
+ return ..()
+ if(can_misfire && chambered.can_misfire != FALSE)
misfire_probability += misfire_percentage_increment
misfire_probability = clamp(misfire_probability, 0, misfire_probability_cap)
+ if(chambered.can_misfire)
+ misfire_probability += chambered.misfire_increment
+ misfire_probability = clamp(misfire_probability, 0, misfire_probability_cap)
return ..()
///Installs a new suppressor, assumes that the suppressor is already in the contents of src
@@ -579,6 +586,9 @@
. += span_danger("You get the feeling this might explode if you fire it...")
if(misfire_probability > 0)
. += span_danger("Given the state of the gun, there is a [misfire_probability]% chance it'll misfire.")
+ else if(misfire_probability > 0)
+ . += span_warning("You get a feeling this might explode if you fire it with the wrong ammunitions...")
+ . += span_warning("Given the state of the gun, there is a [EXAMINE_HINT("[misfire_probability]%")] chance it'll misfire.")
///Gets the number of bullets in the gun
/obj/item/gun/ballistic/proc/get_ammo(countchambered = TRUE)
diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm
index 024f8353ddb48..888b784ddf86c 100644
--- a/code/modules/projectiles/guns/ballistic/rifle.dm
+++ b/code/modules/projectiles/guns/ballistic/rifle.dm
@@ -193,18 +193,17 @@
/obj/item/gun/ballistic/rifle/rebarxbow
name = "Heated Rebar Crossbow"
- desc = "Made from an inducer, iron rods, and some wire, this crossbow fires sharpened iron rods, made from the plentiful iron rods found stationwide. \
- Additionally, can fire specialty ammo made from the materials in the atmos crystalizer - zaukerite, metallic hydrogen, and healium crytals all work. \
- Very slow to reload - you can craft the crossbow with a crowbar to try loosen the crossbar, but risks a misfire, or worse..."
+ desc = "A handcrafted crossbow. \
+ Aside from conventional sharpened iron rods, it can also fire specialty ammo made from the atmos crystalizer - zaukerite, metallic hydrogen, and healium rods all work. \
+ Very slow to reload - you can craft the crossbow with a crowbar to loosen the crossbar, but risk a misfire, or worse..."
icon = 'icons/obj/weapons/guns/ballistic.dmi'
icon_state = "rebarxbow"
inhand_icon_state = "rebarxbow"
worn_icon_state = "rebarxbow"
rack_sound = 'sound/weapons/gun/sniper/rack.ogg'
- must_hold_to_load = TRUE
mag_display = FALSE
empty_indicator = TRUE
- bolt_type = BOLT_TYPE_LOCKING
+ bolt_type = BOLT_TYPE_OPEN
semi_auto = FALSE
internal_magazine = TRUE
can_modify_ammo = FALSE
@@ -212,7 +211,6 @@
bolt_wording = "bowstring"
magazine_wording = "rod"
cartridge_wording = "rod"
- misfire_probability = 25
weapon_weight = WEAPON_HEAVY
initial_caliber = CALIBER_REBAR
accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/rebarxbow/normal
@@ -250,10 +248,22 @@
return FALSE
return ..()
+/obj/item/gun/ballistic/rifle/rebarxbow/shoot_with_empty_chamber(mob/living/user)
+ if(chambered || !magazine || !length(magazine.contents))
+ return ..()
+ drop_bolt(user)
+
/obj/item/gun/ballistic/rifle/rebarxbow/examine(mob/user)
. = ..()
. += "The crossbow is [bolt_locked ? "not ready" : "ready"] to fire."
+/obj/item/gun/ballistic/rifle/rebarxbow/update_overlays()
+ . = ..()
+ if(!magazine)
+ . += "[initial(icon_state)]" + "_empty"
+ if(!bolt_locked)
+ . += "[initial(icon_state)]" + "_bolt_locked"
+
/obj/item/gun/ballistic/rifle/rebarxbow/forced
name = "Stressed Rebar Crossbow"
desc = "Some idiot decided that they would risk shooting themselves in the face if it meant they could have a draw this crossbow a bit faster. Hopefully, it was worth it."
@@ -266,7 +276,7 @@
/obj/item/gun/ballistic/rifle/rebarxbow/syndie
name = "Syndicate Rebar Crossbow"
desc = "The syndicate liked the bootleg rebar crossbow NT engineers made, so they showed what it could be if properly developed. \
- Holds three shots without a chance of exploding, and features a built in scope. Compatable with all known crossbow ammunition."
+ Holds three shots without a chance of exploding, and features a built in scope. Compatible with all known crossbow ammunition."
icon_state = "rebarxbowsyndie"
inhand_icon_state = "rebarxbowsyndie"
worn_icon_state = "rebarxbowsyndie"
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index 9f854926dbdff..9be59ffb5344b 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -24,6 +24,7 @@
cartridge_wording = "shell"
tac_reloads = FALSE
weapon_weight = WEAPON_HEAVY
+ misfire_probability_cap = 35 // Even if the misfire probability and increment are both zero, we've some shots that may do that.
pb_knockback = 2
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index 9c16133e1ea35..39e55f94fca17 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -5,6 +5,7 @@
icon = 'icons/obj/weapons/guns/energy.dmi'
pickup_sound = 'sound/items/gun_pick_up.ogg'
drop_sound = 'sound/items/gun_drop.ogg'
+ sound_vary = TRUE
/// What type of power cell this uses
var/obj/item/stock_parts/power_store/cell
diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
index 53cbe825085b2..1180a90e8d217 100644
--- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
@@ -123,7 +123,7 @@
/obj/item/gun/energy/recharge/kinetic_accelerator/proc/check_menu(mob/living/carbon/human/user)
if(!istype(user))
return FALSE
- if(user.incapacitated())
+ if(user.incapacitated)
return FALSE
return TRUE
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index c501f15db90e6..5e06f115acea3 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -209,6 +209,10 @@
var/wound_falloff_tile
///How much we want to drop the embed_chance value, if we can embed, per tile, for falloff purposes
var/embed_falloff_tile
+ ///How much accuracy is lost for each tile travelled
+ var/accuracy_falloff = 7
+ ///How much accuracy before falloff starts to matter. Formula is range - falloff * tiles travelled
+ var/accurate_range = 100
var/static/list/projectile_connections = list(COMSIG_ATOM_ENTERED = PROC_REF(on_entered))
/// If true directly targeted turfs can be hit
var/can_hit_turfs = FALSE
@@ -296,6 +300,12 @@
hitx = target.pixel_x + rand(-8, 8)
hity = target.pixel_y + rand(-8, 8)
+ if(isturf(target) && hitsound_wall)
+ var/volume = clamp(vol_by_damage() + 20, 0, 100)
+ if(suppressed)
+ volume = 5
+ playsound(loc, hitsound_wall, volume, TRUE, -1)
+
if(damage > 0 && (damage_type == BRUTE || damage_type == BURN) && iswallturf(target_turf) && prob(75))
var/turf/closed/wall/target_wall = target_turf
if(impact_effect_type && !hitscan)
@@ -308,11 +318,7 @@
if(!isliving(target))
if(impact_effect_type && !hitscan)
new impact_effect_type(target_turf, hitx, hity)
- if(isturf(target) && hitsound_wall)
- var/volume = clamp(vol_by_damage() + 20, 0, 100)
- if(suppressed)
- volume = 5
- playsound(loc, hitsound_wall, volume, TRUE, -1)
+
return BULLET_ACT_HIT
var/mob/living/living_target = target
@@ -450,9 +456,8 @@
store_hitscan_collision(point_cache)
return TRUE
- if(!HAS_TRAIT(src, TRAIT_ALWAYS_HIT_ZONE))
- var/distance = get_dist(T, starting) // Get the distance between the turf shot from and the mob we hit and use that for the calculations.
- def_zone = ran_zone(def_zone, max(100-(7*distance), 5)) //Lower accurancy/longer range tradeoff. 7 is a balanced number to use.
+ var/distance = get_dist(T, starting) // Get the distance between the turf shot from and the mob we hit and use that for the calculations.
+ def_zone = ran_zone(def_zone, clamp(accurate_range - (accuracy_falloff * distance), 5, 100)) //Lower accurancy/longer range tradeoff. 7 is a balanced number to use.
return process_hit(T, select_target(T, A, A), A) // SELECT TARGET FIRST!
@@ -569,6 +574,9 @@
if((target.pass_flags_self & pass_flags) && !direct_target)
return FALSE
if(HAS_TRAIT(target, TRAIT_UNHITTABLE_BY_PROJECTILES))
+ if(!HAS_TRAIT(target, TRAIT_BLOCKING_PROJECTILES) && isliving(target))
+ var/mob/living/living_target = target
+ living_target.block_projectile_effects()
return FALSE
if(!ignore_source_check && firer)
var/mob/M = firer
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index 542c2aaa35d92..0e50326f1b07c 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -50,13 +50,11 @@
//overclocked laser, does a bit more damage but has much higher wound power (-0 vs -20)
/obj/projectile/beam/laser/hellfire
name = "hellfire laser"
+ icon_state = "hellfire"
wound_bonus = 0
damage = 30
speed = 0.6 // higher power = faster, that's how light works right
-
-/obj/projectile/beam/laser/hellfire/Initialize(mapload)
- . = ..()
- transform *= 2
+ light_color = "#FF969D"
/obj/projectile/beam/laser/heavylaser
name = "heavy laser"
diff --git a/code/modules/projectiles/projectile/bullets/rifle.dm b/code/modules/projectiles/projectile/bullets/rifle.dm
index 6f14df2f4c8bd..2915e3e59bd6c 100644
--- a/code/modules/projectiles/projectile/bullets/rifle.dm
+++ b/code/modules/projectiles/projectile/bullets/rifle.dm
@@ -140,27 +140,38 @@
/obj/projectile/bullet/rebar/hydrogen
name = "metallic hydrogen bolt"
icon_state = "rebar_hydrogen"
- damage = 40
+ damage = 55
speed = 0.6
+ projectile_piercing = PASSMOB|PASSVEHICLE
+ projectile_phasing = ~(PASSMOB|PASSVEHICLE)
+ phasing_ignore_direct_target = TRUE
dismemberment = 0 //goes through clean.
damage_type = BRUTE
armour_penetration = 30 //very pointy.
- projectile_piercing = PASSMOB //felt this might have been a nice compromise for the lower damage for the difficulty of getting it
wound_bonus = -15
bare_wound_bonus = 10
+ shrapnel_type = /obj/item/ammo_casing/rebar/hydrogen
embed_type = /datum/embed_data/rebar_hydrogen
embed_falloff_tile = -3
shrapnel_type = /obj/item/ammo_casing/rebar/hydrogen
+ accurate_range = 205 //15 tiles before falloff starts to kick in
+
+/obj/projectile/bullet/rebar/hydrogen/Impact(atom/A)
+ . = ..()
+ def_zone = ran_zone(def_zone, clamp(205-(7*get_dist(get_turf(A), starting)), 5, 100))
/datum/embed_data/rebar_hydrogen
- embed_chance = 50
- fall_chance = 2
- jostle_chance = 3
- ignore_throwspeed_threshold = TRUE
- pain_stam_pct = 0.6
- pain_mult = 4
- jostle_pain_mult = 2
- rip_time =18
+ embed_chance = 0
+
+/obj/projectile/bullet/rebar/hydrogen/on_hit(atom/target, blocked, pierce_hit)
+ if(isAI(target))
+ return BULLET_ACT_FORCE_PIERCE
+ return ..()
+
+/obj/projectile/bullet/rebar/hydrogen/process_hit(turf/T, atom/target, atom/bumped, hit_something)
+ . = ..()
+ if(pierces >= 3)
+ qdel(src)
/obj/projectile/bullet/rebar/healium
name = "healium bolt"
diff --git a/code/modules/projectiles/projectile/bullets/shotgun.dm b/code/modules/projectiles/projectile/bullets/shotgun.dm
index 7ae5741f3b992..215093c9f100e 100644
--- a/code/modules/projectiles/projectile/bullets/shotgun.dm
+++ b/code/modules/projectiles/projectile/bullets/shotgun.dm
@@ -79,6 +79,15 @@
bare_wound_bonus = 5
wound_falloff_tile = -2.5 // low damage + additional dropoff will already curb wounding potential anything past point blank
+/**
+ * A slightly weaker version of the buckshot, available from the blackmarket.
+ * The casings they're in have a very small chance to misfire and will gradually damage the firearm, making it weaker.
+ */
+/obj/projectile/bullet/pellet/shotgun_buckshot/old
+ damage_falloff_tile = -0.47
+ wound_bonus = -100
+ bare_wound_bonus = -100
+
/obj/projectile/bullet/pellet/shotgun_rubbershot
name = "rubber shot pellet"
damage = 3
diff --git a/code/modules/reagents/chemistry/holder/holder.dm b/code/modules/reagents/chemistry/holder/holder.dm
index 11117142d70e5..f084a7eaa39d4 100644
--- a/code/modules/reagents/chemistry/holder/holder.dm
+++ b/code/modules/reagents/chemistry/holder/holder.dm
@@ -344,26 +344,29 @@
stack_trace("invalid reagent path passed to convert reagent [source_reagent_typepath]")
return FALSE
- var/reagent_amount
- var/reagent_purity
- var/reagent_ph
+ var/reagent_amount = 0
+ var/reagent_purity = 0
+ var/reagent_ph = 0
if(include_source_subtypes)
reagent_ph = ph
var/weighted_purity
var/list/reagent_type_list = typecacheof(source_reagent_typepath)
for(var/datum/reagent/reagent as anything in reagent_list)
- if(reagent.type in reagent_type_list)
+ if(is_type_in_typecache(reagent, reagent_type_list))
weighted_purity += reagent.volume * reagent.purity
reagent_amount += reagent.volume
remove_reagent(reagent.type, reagent.volume * multiplier)
reagent_purity = weighted_purity / reagent_amount
else
var/datum/reagent/source_reagent = has_reagent(source_reagent_typepath)
- reagent_amount = source_reagent.volume
- reagent_purity = source_reagent.purity
- reagent_ph = source_reagent.ph
- remove_reagent(source_reagent_typepath, reagent_amount)
- add_reagent(target_reagent_typepath, reagent_amount * multiplier, reagtemp = chem_temp, added_purity = reagent_purity, added_ph = reagent_ph)
+ if(istype(source_reagent))
+ reagent_amount = source_reagent.volume
+ reagent_purity = source_reagent.purity
+ reagent_ph = source_reagent.ph
+ remove_reagent(source_reagent_typepath, reagent_amount)
+
+ if(reagent_amount > 0)
+ add_reagent(target_reagent_typepath, reagent_amount * multiplier, reagtemp = chem_temp, added_purity = reagent_purity, added_ph = reagent_ph)
/// Removes all reagents
/datum/reagents/proc/clear_reagents()
diff --git a/code/modules/reagents/chemistry/holder/mob_life.dm b/code/modules/reagents/chemistry/holder/mob_life.dm
index 03421f1577098..611de150920e4 100644
--- a/code/modules/reagents/chemistry/holder/mob_life.dm
+++ b/code/modules/reagents/chemistry/holder/mob_life.dm
@@ -1,3 +1,8 @@
+#define HAS_SILENT_TOXIN 0 //don't provide a feedback message if this is the only toxin present
+#define HAS_NO_TOXIN 1
+#define HAS_PAINFUL_TOXIN 2
+#define MAX_TOXIN_LIVER_DAMAGE 2 //the max damage the liver can receive per second (~1 min at max damage will destroy liver)
+
/**
* Triggers metabolizing for all the reagents in this holder
*
@@ -16,16 +21,22 @@
var/need_mob_update = FALSE
var/obj/item/organ/internal/stomach/belly = owner.get_organ_slot(ORGAN_SLOT_STOMACH)
var/obj/item/organ/internal/liver/liver = owner.get_organ_slot(ORGAN_SLOT_LIVER)
- var/liver_tolerance
+ var/liver_tolerance = 0
+ var/liver_damage = 0
+ var/provide_pain_message
+ var/amount
if(liver)
var/liver_health_percent = (liver.maxHealth - liver.damage) / liver.maxHealth
liver_tolerance = liver.toxTolerance * liver_health_percent
+ provide_pain_message = HAS_NO_TOXIN
for(var/datum/reagent/reagent as anything in cached_reagents)
+ var/datum/reagent/toxin/toxin
+ if(istype(reagent, /datum/reagent/toxin))
+ toxin = reagent
// skip metabolizing effects for small units of toxins
- if(istype(reagent, /datum/reagent/toxin) && liver && !dead)
- var/datum/reagent/toxin/toxin = reagent
- var/amount = toxin.volume
+ if(toxin && liver && !dead)
+ amount = toxin.volume
if(belly)
amount += belly.reagents.get_reagent_amount(toxin.type)
@@ -35,10 +46,35 @@
need_mob_update += metabolize_reagent(owner, reagent, seconds_per_tick, times_fired, can_overdose, liverless, dead)
+ // If applicable, calculate any toxin-related liver damage
+ // Note: we have to do this AFTER metabolize_reagent, because we want handle_reagent to run before we make the determination.
+ // The order is really important unfortunately.
+ if(toxin && !liverless && liver && liver.filterToxins && !HAS_TRAIT(owner, TRAIT_TOXINLOVER))
+ if(toxin.affected_organ_flags && !(liver.organ_flags & toxin.affected_organ_flags)) //this particular toxin does not affect this type of organ
+ continue
+
+ // a 15u syringe is a nice baseline to scale lethality by
+ liver_damage += ((amount/15) * toxin.toxpwr * toxin.liver_damage_multiplier) / liver.liver_resistance
+
+ if(provide_pain_message != HAS_PAINFUL_TOXIN)
+ provide_pain_message = toxin.silent_toxin ? HAS_SILENT_TOXIN : HAS_PAINFUL_TOXIN
+
+ // if applicable, apply our liver damage and display the accompanying pain message
+ if(liver_damage)
+ liver.apply_organ_damage(min(liver_damage * seconds_per_tick , MAX_TOXIN_LIVER_DAMAGE * seconds_per_tick))
+
+ if(provide_pain_message && liver.damage > 10 && SPT_PROB(liver.damage/6, seconds_per_tick)) //the higher the damage the higher the probability
+ to_chat(owner, span_warning("You feel a dull pain in your abdomen."))
+
if(owner && need_mob_update) //some of the metabolized reagents had effects on the mob that requires some updates.
owner.updatehealth()
update_total()
+#undef HAS_SILENT_TOXIN
+#undef HAS_NO_TOXIN
+#undef HAS_PAINFUL_TOXIN
+#undef MAX_TOXIN_LIVER_DAMAGE
+
/*
* Metabolises a single reagent for a target owner carbon mob. See above.
*
diff --git a/code/modules/reagents/chemistry/holder/ui_data.dm b/code/modules/reagents/chemistry/holder/ui_data.dm
index 97820c2fd6c0e..244b264721fd2 100644
--- a/code/modules/reagents/chemistry/holder/ui_data.dm
+++ b/code/modules/reagents/chemistry/holder/ui_data.dm
@@ -297,7 +297,7 @@
var/datum/chemical_reaction/reaction = sub_reactions[ui_reaction_index]
return reaction.type
-/datum/reagents/ui_act(action, params)
+/datum/reagents/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index cf193decb6931..5f665d876afaa 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -572,6 +572,7 @@
/obj/machinery/chem_dispenser/drinks/fullupgrade //fully ugpraded stock parts, emagged
desc = "Contains a large reservoir of soft drinks. This model has had its safeties shorted out."
obj_flags = CAN_BE_HIT | EMAGGED
+ circuit = /obj/item/circuitboard/machine/chem_dispenser/drinks/fullupgrade
/obj/machinery/chem_dispenser/drinks/fullupgrade/Initialize(mapload)
. = ..()
diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm
index dca2b603ca40f..c9ad2424b2de7 100644
--- a/code/modules/reagents/chemistry/machinery/pandemic.dm
+++ b/code/modules/reagents/chemistry/machinery/pandemic.dm
@@ -153,7 +153,7 @@
data["resistances"] = get_resistance_data(blood)
return data
-/obj/machinery/computer/pandemic/ui_act(action, params)
+/obj/machinery/computer/pandemic/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/reagents/chemistry/machinery/portable_chem_mixer.dm b/code/modules/reagents/chemistry/machinery/portable_chem_mixer.dm
index 9c92cc631be79..21f23a209b6b7 100644
--- a/code/modules/reagents/chemistry/machinery/portable_chem_mixer.dm
+++ b/code/modules/reagents/chemistry/machinery/portable_chem_mixer.dm
@@ -1,5 +1,5 @@
/obj/item/storage/portable_chem_mixer
- name = "Portable Chemical Mixer"
+ name = "portable chemical mixer"
desc = "A portable device that dispenses and mixes chemicals using the beakers inserted inside."
icon = 'icons/obj/medical/chemical.dmi'
icon_state = "portablechemicalmixer_open"
@@ -132,10 +132,12 @@
return
beaker = new_beaker
-/obj/item/storage/portable_chem_mixer/ui_interact(mob/user, datum/tgui/ui)
+/obj/item/storage/portable_chem_mixer/ui_status(mob/user, datum/ui_state/state)
if(loc != user)
- balloon_alert(user, "hold it in your hand!")
- return
+ return UI_CLOSE
+ return ..()
+
+/obj/item/storage/portable_chem_mixer/ui_interact(mob/user, datum/tgui/ui)
if(!atom_storage.locked)
balloon_alert(user, "lock it first!")
return
diff --git a/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
index 3f5b7e3a24479..da57f6ce405a1 100644
--- a/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
@@ -344,6 +344,28 @@
taste_description = "spiked butterscotch"
ph = 6.5
default_container = /obj/item/reagent_containers/cup/glass/bottle/rum
+ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
+
+/datum/reagent/consumable/ethanol/rum/aged
+ name = "Aged Rum"
+ description = "Sink me! That's some fancy rum to share with buckoos."
+ color = "#c0b675" // rgb: 192,183,117
+ boozepwr = 70
+ taste_description = "extra-spiked butterscotch"
+ default_container = /obj/item/reagent_containers/cup/glass/bottle/rum/aged
+ quality = DRINK_FANTASTIC
+ metabolized_traits = list(TRAIT_STRONG_STOMACH)
+
+/datum/reagent/consumable/ethanol/rum/aged/on_mob_metabolize(mob/living/drinker)
+ . = ..()
+ drinker.add_blocked_language(subtypesof(/datum/language) - /datum/language/piratespeak, LANGUAGE_DRINK)
+ drinker.grant_language(/datum/language/piratespeak, source = LANGUAGE_DRINK)
+
+/datum/reagent/consumable/ethanol/rum/aged/on_mob_end_metabolize(mob/living/drinker)
+ if(!QDELING(drinker))
+ drinker.remove_blocked_language(subtypesof(/datum/language), LANGUAGE_DRINK)
+ drinker.remove_language(/datum/language/piratespeak, source = LANGUAGE_DRINK)
+ return ..()
/datum/reagent/consumable/ethanol/tequila
name = "Tequila"
@@ -2637,7 +2659,7 @@
var/mob/living/carbon/exposed_carbon = exposed_mob
var/obj/item/organ/internal/stomach/ethereal/stomach = exposed_carbon.get_organ_slot(ORGAN_SLOT_STOMACH)
if(istype(stomach))
- stomach.adjust_charge(reac_volume * 0.003 * STANDARD_CELL_CHARGE)
+ stomach.adjust_charge(reac_volume * 0.003 * ETHEREAL_CHARGE_NORMAL)
/datum/reagent/consumable/ethanol/telepole
name = "Telepole"
@@ -2657,7 +2679,7 @@
var/mob/living/carbon/exposed_carbon = exposed_mob
var/obj/item/organ/internal/stomach/ethereal/stomach = exposed_carbon.get_organ_slot(ORGAN_SLOT_STOMACH)
if(istype(stomach))
- stomach.adjust_charge(reac_volume * 0.002 * STANDARD_CELL_CHARGE)
+ stomach.adjust_charge(reac_volume * 0.002 * ETHEREAL_CHARGE_NORMAL)
/datum/reagent/consumable/ethanol/pod_tesla
name = "Pod Tesla"
@@ -2684,7 +2706,7 @@
var/mob/living/carbon/exposed_carbon = exposed_mob
var/obj/item/organ/internal/stomach/ethereal/stomach = exposed_carbon.get_organ_slot(ORGAN_SLOT_STOMACH)
if(istype(stomach))
- stomach.adjust_charge(reac_volume * 0.005 * STANDARD_CELL_CHARGE)
+ stomach.adjust_charge(reac_volume * 0.005 * ETHEREAL_CHARGE_NORMAL)
// Welcome to the Blue Room Bar and Grill, home to Mars' finest cocktails
/datum/reagent/consumable/ethanol/rice_beer
diff --git a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm
index d3070474558d7..34b2dce4170e6 100644
--- a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm
@@ -650,13 +650,13 @@
. = ..()
affected_mob.adjust_drowsiness(3 SECONDS * REM * seconds_per_tick)
var/need_mob_update
- switch(affected_mob.mob_mood.sanity)
- if (SANITY_INSANE to SANITY_CRAZY)
- need_mob_update = affected_mob.adjustStaminaLoss(3 * REM * seconds_per_tick, updating_stamina = FALSE)
- if (SANITY_UNSTABLE to SANITY_DISTURBED)
- affected_mob.add_mood_event("wellcheers", /datum/mood_event/wellcheers)
- if (SANITY_NEUTRAL to SANITY_GREAT)
+ switch(affected_mob.mob_mood.sanity_level)
+ if (SANITY_LEVEL_GREAT to SANITY_LEVEL_NEUTRAL)
need_mob_update = affected_mob.adjustBruteLoss(-1.5 * REM * seconds_per_tick, updating_health = FALSE)
+ if (SANITY_LEVEL_DISTURBED to SANITY_LEVEL_UNSTABLE)
+ affected_mob.add_mood_event("wellcheers", /datum/mood_event/wellcheers)
+ if (SANITY_LEVEL_CRAZY to SANITY_LEVEL_INSANE)
+ need_mob_update = affected_mob.adjustStaminaLoss(3 * REM * seconds_per_tick, updating_stamina = FALSE)
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -1291,4 +1291,4 @@
var/mob/living/carbon/exposed_carbon = exposed_mob
var/obj/item/organ/internal/stomach/ethereal/stomach = exposed_carbon.get_organ_slot(ORGAN_SLOT_STOMACH)
if(istype(stomach))
- stomach.adjust_charge(reac_volume * 0.003 * STANDARD_CELL_CHARGE)
+ stomach.adjust_charge(reac_volume * 0.003 * ETHEREAL_CHARGE_NORMAL)
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index 4f7377d407fec..5365be6fe8d7f 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -949,7 +949,7 @@
var/mob/living/carbon/exposed_carbon = exposed_mob
var/obj/item/organ/internal/stomach/ethereal/stomach = exposed_carbon.get_organ_slot(ORGAN_SLOT_STOMACH)
if(istype(stomach))
- stomach.adjust_charge(reac_volume * 0.03 * STANDARD_CELL_CHARGE)
+ stomach.adjust_charge(reac_volume * 0.03 * ETHEREAL_CHARGE_NORMAL)
/datum/reagent/consumable/liquidelectricity/enriched/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
diff --git a/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm
index 3a633e5c83679..ce829a6ac1222 100644
--- a/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm
@@ -230,7 +230,7 @@ Basically, we fill the time between now and 2s from now with hands based off the
//Just the removed itching mechanism - omage to its origins.
/datum/reagent/inverse/ichiyuri/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
- if(prob(resetting_probability) && !(HAS_TRAIT(affected_mob, TRAIT_RESTRAINED) || affected_mob.incapacitated()))
+ if(prob(resetting_probability) && !(HAS_TRAIT(affected_mob, TRAIT_RESTRAINED) || affected_mob.incapacitated))
. = TRUE
if(spammer < world.time)
to_chat(affected_mob,span_warning("You can't help but itch yourself."))
diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm
index cf9c7ae38c64e..bff4d526333be 100644
--- a/code/modules/reagents/chemistry/recipes/others.dm
+++ b/code/modules/reagents/chemistry/recipes/others.dm
@@ -38,6 +38,13 @@
results = list(/datum/reagent/consumable/salt = 2)
required_reagents = list(/datum/reagent/sodium = 1, /datum/reagent/chlorine = 1) // That's what I said! Sodium Chloride!
reaction_tags = REACTION_TAG_EASY | REACTION_TAG_FOOD
+ required_other = TRUE
+
+/datum/chemical_reaction/sodiumchloride/pre_reaction_other_checks(datum/reagents/holder)
+ . = ..()
+ if(holder.has_reagent(/datum/reagent/consumable/liquidelectricity) || holder.has_reagent(/datum/reagent/consumable/liquidelectricity/enriched))
+ return FALSE
+
/datum/chemical_reaction/stable_plasma
results = list(/datum/reagent/stable_plasma = 1)
@@ -600,6 +607,18 @@
results = list(/datum/reagent/oxygen = 2.5, /datum/reagent/hydrogen = 5)
required_reagents = list(/datum/reagent/consumable/liquidelectricity/enriched = 1, /datum/reagent/water = 5)
reaction_tags = REACTION_TAG_EASY | REACTION_TAG_CHEMICAL
+
+//salt electrolysis
+/datum/chemical_reaction/saltelectrolysis
+ results = list(/datum/reagent/chlorine = 2.5, /datum/reagent/sodium = 2.5)
+ required_reagents = list(/datum/reagent/consumable/salt = 5)
+ required_catalysts = list(/datum/reagent/consumable/liquidelectricity = 1)
+ reaction_tags = REACTION_TAG_EASY | REACTION_TAG_CHEMICAL
+
+/datum/chemical_reaction/saltelectrolysis/enriched
+ required_catalysts = list(/datum/reagent/consumable/liquidelectricity/enriched = 1)
+
+
//butterflium
/datum/chemical_reaction/butterflium
required_reagents = list(/datum/reagent/colorful_reagent = 1, /datum/reagent/medicine/omnizine = 1, /datum/reagent/medicine/strange_reagent = 1, /datum/reagent/consumable/nutriment = 1)
diff --git a/code/modules/reagents/reagent_containers/cups/_cup.dm b/code/modules/reagents/reagent_containers/cups/_cup.dm
index 87df7765233ec..5590be84f4386 100644
--- a/code/modules/reagents/reagent_containers/cups/_cup.dm
+++ b/code/modules/reagents/reagent_containers/cups/_cup.dm
@@ -161,7 +161,7 @@
to_chat(user, span_notice("You fill [src] with [trans] unit\s of the contents of [target]."))
target.update_appearance()
- return ITEM_INTERACT_SUCCESS
+ return NONE
/obj/item/reagent_containers/cup/attackby(obj/item/attacking_item, mob/user, params)
var/hotness = attacking_item.get_temperature()
@@ -230,6 +230,7 @@
fill_icon_thresholds = list(0, 1, 20, 40, 60, 80, 100)
pickup_sound = 'sound/items/handling/beaker_pickup.ogg'
drop_sound = 'sound/items/handling/beaker_place.ogg'
+ sound_vary = TRUE
/obj/item/reagent_containers/cup/beaker/Initialize(mapload)
. = ..()
diff --git a/code/modules/reagents/reagent_containers/cups/bottle.dm b/code/modules/reagents/reagent_containers/cups/bottle.dm
index fda39ed4877ba..2259cda34d79c 100644
--- a/code/modules/reagents/reagent_containers/cups/bottle.dm
+++ b/code/modules/reagents/reagent_containers/cups/bottle.dm
@@ -129,6 +129,11 @@
desc = "A small bottle. Contains cold sauce."
list_reagents = list(/datum/reagent/consumable/frostoil = 30)
+/obj/item/reagent_containers/cup/bottle/strange_reagent
+ name = "Strange Reagent Bottle"
+ desc = "A small bottle. May be used to revive people."
+ list_reagents = list(/datum/reagent/medicine/strange_reagent = 30)
+
/obj/item/reagent_containers/cup/bottle/traitor
name = "syndicate bottle"
desc = "A small bottle. Contains a random nasty chemical."
diff --git a/code/modules/reagents/reagent_containers/cups/drinkingglass.dm b/code/modules/reagents/reagent_containers/cups/drinkingglass.dm
index 7441614682c06..fa3a53434bbcc 100644
--- a/code/modules/reagents/reagent_containers/cups/drinkingglass.dm
+++ b/code/modules/reagents/reagent_containers/cups/drinkingglass.dm
@@ -14,6 +14,7 @@
obj_flags = UNIQUE_RENAME
drop_sound = 'sound/items/handling/drinkglass_drop.ogg'
pickup_sound = 'sound/items/handling/drinkglass_pickup.ogg'
+ sound_vary = TRUE
custom_price = PAYCHECK_LOWER
//the screwdriver cocktail can make a drinking glass into the world's worst screwdriver. beautiful.
toolspeed = 25
diff --git a/code/modules/reagents/reagent_containers/cups/glassbottle.dm b/code/modules/reagents/reagent_containers/cups/glassbottle.dm
index b246cc01e07e9..a214ea47eb148 100644
--- a/code/modules/reagents/reagent_containers/cups/glassbottle.dm
+++ b/code/modules/reagents/reagent_containers/cups/glassbottle.dm
@@ -39,11 +39,93 @@
var/bottle_knockdown_duration = BOTTLE_KNOCKDOWN_DEFAULT_DURATION
tool_behaviour = TOOL_ROLLINGPIN // Used to knock out the Chef.
toolspeed = 1.3 //it's a little awkward to use, but it's a cylinder alright.
+ /// A contained piece of paper, a photo, or space cash, that we can use as a message or gift to future spessmen.
+ var/obj/item/message_in_a_bottle
/obj/item/reagent_containers/cup/glass/bottle/Initialize(mapload, vol)
. = ..()
var/static/list/recipes = list(/datum/crafting_recipe/molotov)
AddElement(/datum/element/slapcrafting, recipes)
+ register_context()
+ register_item_context()
+
+/obj/item/reagent_containers/cup/glass/bottle/add_context(atom/source, list/context, obj/item/held_item, mob/living/user)
+ if(message_in_a_bottle)
+ return NONE
+ if(istype(held_item, /obj/item/paper) || istype(held_item, /obj/item/stack/spacecash) || istype(held_item, /obj/item/photo))
+ context[SCREENTIP_CONTEXT_LMB] = "Insert message"
+ return CONTEXTUAL_SCREENTIP_SET
+ return NONE
+
+/obj/item/reagent_containers/cup/glass/bottle/add_item_context(obj/item/source, list/context, atom/target, mob/living/user)
+ if(message_in_a_bottle && HAS_TRAIT(target, TRAIT_MESSAGE_IN_A_BOTTLE_LOCATION))
+ context[SCREENTIP_CONTEXT_RMB] = "Toss message"
+ return CONTEXTUAL_SCREENTIP_SET
+ return NONE
+
+/obj/item/reagent_containers/cup/glass/bottle/Exited(atom/movable/gone, atom/newloc)
+ if(gone == message_in_a_bottle)
+ message_in_a_bottle = null
+ if(!QDELETED(src))
+ update_icon(UPDATE_OVERLAYS)
+ return ..()
+
+/obj/item/reagent_containers/cup/glass/bottle/CheckParts(list/parts_list)
+ . = ..()
+ var/obj/item/reagent_containers/cup/glass/bottle/bottle = locate() in contents
+ if(bottle.message_in_a_bottle)
+ message_in_a_bottle = bottle.message_in_a_bottle
+ bottle.message_in_a_bottle.forceMove(src)
+
+/obj/item/reagent_containers/cup/glass/bottle/examine(mob/user)
+ . = ..()
+ if(message_in_a_bottle)
+ . += span_info("there's \a [message_in_a_bottle] inside it. Break it to take it out, or find a beach or ocean and toss it with [EXAMINE_HINT("right-click")].")
+ else if(isGlass)
+ . += span_tinynoticeital("you could place a paper, photo or space cash inside it...")
+
+/obj/item/reagent_containers/cup/glass/bottle/update_overlays()
+ . = ..()
+ if(message_in_a_bottle)
+ var/overlay = add_message_overlay()
+ if(overlay)
+ . += overlay
+
+/obj/item/reagent_containers/cup/glass/bottle/interact_with_atom_secondary(atom/target, mob/living/user, list/modifiers)
+ if(user.combat_mode || !HAS_TRAIT(target, TRAIT_MESSAGE_IN_A_BOTTLE_LOCATION))
+ return ..()
+ if(!user.temporarilyRemoveItemFromInventory(src))
+ balloon_alert(user, "it's stuck to your hand!")
+ return ITEM_INTERACT_BLOCKING
+ user.visible_message(span_notice("[user] tosses [src] in [target]"), span_notice("You toss [src] in [target]"), span_notice("you hear a splash."))
+ SSpersistence.save_message_bottle(message_in_a_bottle, type)
+ playsound(target, 'sound/effects/bigsplash.ogg', 70)
+ qdel(src)
+ return ITEM_INTERACT_SUCCESS
+
+/obj/item/reagent_containers/cup/glass/bottle/item_interaction(mob/living/user, obj/item/item, list/modifiers)
+ if(!isGlass)
+ return NONE
+ if(!istype(item, /obj/item/paper) && !istype(item, /obj/item/stack/spacecash) && !istype(item, /obj/item/photo))
+ return NONE
+ if(message_in_a_bottle)
+ balloon_alert(user, "has a message already!")
+ return ITEM_INTERACT_BLOCKING
+ if(!user.transferItemToLoc(item, src))
+ balloon_alert(user, "it's stuck to your hand!")
+ return ITEM_INTERACT_BLOCKING
+ balloon_alert(user, "message inserted")
+ message_in_a_bottle = item
+ update_icon(UPDATE_OVERLAYS)
+ return ITEM_INTERACT_SUCCESS
+
+/obj/item/reagent_containers/cup/glass/bottle/proc/add_message_overlay()
+ if(istype(message_in_a_bottle, /obj/item/paper))
+ return "paper_in_bottle"
+ if(istype(message_in_a_bottle, /obj/item/photo))
+ return "photo_in_bottle"
+ if(istype(message_in_a_bottle, /obj/item/stack/spacecash))
+ return "cash_in_bottle"
/obj/item/reagent_containers/cup/glass/bottle/small
name = "small glass bottle"
@@ -56,14 +138,16 @@
if(bartender_check(target) && ranged)
return
SplashReagents(target, ranged, override_spillable = TRUE)
- var/obj/item/broken_bottle/B = new(drop_location())
+ var/obj/item/broken_bottle/broken = new(drop_location())
if(!ranged && thrower)
- thrower.put_in_hands(B)
- B.mimic_broken(src, target, break_top)
- B.inhand_icon_state = broken_inhand_icon_state
+ thrower.put_in_hands(broken)
+ broken.mimic_broken(src, target, break_top)
+ broken.inhand_icon_state = broken_inhand_icon_state
+ if(message_in_a_bottle)
+ message_in_a_bottle.forceMove(drop_location())
qdel(src)
- target.Bumped(B)
+ target.Bumped(broken)
/obj/item/reagent_containers/cup/glass/bottle/try_splash(mob/living/user, atom/target)
@@ -316,6 +400,12 @@
icon_state = "rumbottle"
list_reagents = list(/datum/reagent/consumable/ethanol/rum = 100)
+/obj/item/reagent_containers/cup/glass/bottle/rum/aged
+ name = "Captain Pete's Vintage spiced rum"
+ desc = "Shiver me timbers, a vintage edition of Captain Pete's rum. It's pratically GRIFF in a bottle from over 50 years ago."
+ icon_state = "rumbottle_gold"
+ list_reagents = list(/datum/reagent/consumable/ethanol/rum/aged = 100)
+
/obj/item/reagent_containers/cup/glass/bottle/maltliquor
name = "\improper Rabid Bear malt liquor"
desc = "A 40 full of malt liquor. Kicks stronger than, well, a rabid bear."
@@ -333,6 +423,9 @@
list_reagents = list(/datum/reagent/water/holywater = 100)
drink_type = NONE
+/obj/item/reagent_containers/cup/glass/bottle/holywater/add_message_overlay()
+ return //looks too weird...
+
/obj/item/reagent_containers/cup/glass/bottle/holywater/hell
desc = "A flask of holy water...it's been sitting in the Necropolis a while though."
icon_state = "unholyflask"
@@ -495,7 +588,6 @@
list_reagents = list(/datum/reagent/consumable/ethanol/sake = 100)
/obj/item/reagent_containers/cup/glass/bottle/sake/Initialize(mapload)
- . = ..()
if(prob(10))
name = "Fluffy Tail Sake"
desc += " On the bottle is a picture of a kitsune with nine touchable tails."
@@ -504,6 +596,12 @@
name = "Inubashiri's Home Brew"
desc += " Awoo."
icon_state = "sakebottle_i"
+ return ..()
+
+/obj/item/reagent_containers/cup/glass/bottle/sake/add_message_overlay()
+ if(icon_state == "sakebottle_k") //doesn't fit the sprite
+ return
+ return ..()
/obj/item/reagent_containers/cup/glass/bottle/fernet
name = "Fernet Bronca"
@@ -524,6 +622,9 @@
icon_state = "curacao_bottle"
list_reagents = list(/datum/reagent/consumable/ethanol/curacao = 100)
+/obj/item/reagent_containers/cup/glass/bottle/curacao/add_message_overlay()
+ return //doesn't fit the sprite
+
/obj/item/reagent_containers/cup/glass/bottle/navy_rum
name = "Pride of the Union Navy-Strength Rum"
desc = "Ironically named, given it's made in Bermuda."
@@ -568,6 +669,9 @@
///Whether this bottle was a victim of a successful sabrage attempt
var/sabraged = FALSE
+/obj/item/reagent_containers/cup/glass/bottle/champagne/add_message_overlay()
+ return //doesn't stylistically fit the sprite
+
/obj/item/reagent_containers/cup/glass/bottle/champagne/cursed
sabrage_success_percentile = 0 //force of the sharp item used to sabrage will not increase success chance
@@ -727,12 +831,18 @@
icon_state = "hoochbottle"
list_reagents = list(/datum/reagent/consumable/ethanol/hooch = 100)
+/obj/item/reagent_containers/cup/glass/bottle/hooch/add_message_overlay()
+ return //doesn't fit the sprite
+
/obj/item/reagent_containers/cup/glass/bottle/moonshine
name = "moonshine jug"
desc = "It is said that the ancient Applalacians used these stoneware jugs to capture lightning in a bottle."
icon_state = "moonshinebottle"
list_reagents = list(/datum/reagent/consumable/ethanol/moonshine = 100)
+/obj/item/reagent_containers/cup/glass/bottle/moonshine/add_message_overlay()
+ return //doesn't fit the sprite
+
/obj/item/reagent_containers/cup/glass/bottle/mushi_kombucha
name = "Solzara Brewing Company Mushi Kombucha"
desc = "Best drunk over ice to savour the mushroomy flavour."
@@ -784,15 +894,15 @@
)
/obj/item/reagent_containers/cup/glass/bottle/molotov/CheckParts(list/parts_list)
- ..()
- var/obj/item/reagent_containers/cup/glass/bottle/B = locate() in contents
- if(B)
- icon_state = B.icon_state
- B.reagents.copy_to(src, 100)
- if(istype(B, /obj/item/reagent_containers/cup/glass/bottle/juice))
- desc += " You're not sure if making this out of a carton was the brightest idea."
- isGlass = FALSE
- return
+ . = ..()
+ var/obj/item/reagent_containers/cup/glass/bottle/bottle = locate() in contents
+ if(!bottle)
+ return
+ icon_state = bottle.icon_state
+ bottle.reagents.copy_to(src, 100)
+ if(istype(bottle, /obj/item/reagent_containers/cup/glass/bottle/juice))
+ desc += " You're not sure if making this out of a carton was the brightest idea."
+ isGlass = FALSE
/obj/item/reagent_containers/cup/glass/bottle/molotov/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum, do_splash = FALSE)
..(hit_atom, throwingdatum, do_splash = FALSE)
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index dc54dcd7db44b..4b6ee9c8c7860 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -154,7 +154,7 @@
set name = "Empty Spray Bottle"
set category = "Object"
set src in usr
- if(usr.incapacitated())
+ if(usr.incapacitated)
return
if (tgui_alert(usr, "Are you sure you want to empty that?", "Empty Bottle:", list("Yes", "No")) != "Yes")
return
diff --git a/code/modules/recycling/conveyor.dm b/code/modules/recycling/conveyor.dm
index 21c5aa7a1a902..0d207ed7e11fc 100644
--- a/code/modules/recycling/conveyor.dm
+++ b/code/modules/recycling/conveyor.dm
@@ -434,6 +434,8 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
/// Updates the switch's `position` and `last_pos` variable. Useful so that the switch can properly cycle between the forwards, backwards and neutral positions.
/obj/machinery/conveyor_switch/proc/update_position(direction)
if(position == CONVEYOR_OFF)
+ playsound(src, 'sound/machines/lever_start.ogg', 40, TRUE)
+
if(oneway) //is it a oneway switch
position = oneway
else
@@ -442,6 +444,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
else
position = CONVEYOR_BACKWARDS
else
+ playsound(src, 'sound/machines/lever_stop.ogg', 40, TRUE)
position = CONVEYOR_OFF
/obj/machinery/conveyor_switch/proc/on_user_activation(mob/user, direction)
diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm
index 4b54cf9f4b023..46d023dbfaf3f 100644
--- a/code/modules/recycling/disposal/bin.dm
+++ b/code/modules/recycling/disposal/bin.dm
@@ -416,7 +416,7 @@
data["isai"] = HAS_AI_ACCESS(user)
return data
-/obj/machinery/disposal/bin/ui_act(action, params)
+/obj/machinery/disposal/bin/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
@@ -624,6 +624,12 @@
SIGNAL_HANDLER
if((shove_flags & SHOVE_KNOCKDOWN_BLOCKED) || !(shove_flags & SHOVE_BLOCKED))
return
+ var/cur_density = density
+ density = FALSE
+ if (!target.Move(get_turf(src), get_dir(target, src)))
+ density = cur_density
+ return
+ density = cur_density
target.Knockdown(SHOVE_KNOCKDOWN_SOLID)
target.forceMove(src)
target.visible_message(span_danger("[shover.name] shoves [target.name] into \the [src]!"),
diff --git a/code/modules/recycling/disposal/holder.dm b/code/modules/recycling/disposal/holder.dm
index b842a69413d7d..78469d491912b 100644
--- a/code/modules/recycling/disposal/holder.dm
+++ b/code/modules/recycling/disposal/holder.dm
@@ -195,7 +195,7 @@
// called when player tries to move while in a pipe
/obj/structure/disposalholder/relaymove(mob/living/user, direction)
- if(user.incapacitated())
+ if(user.incapacitated)
return
for(var/mob/M in range(5, get_turf(src)))
M.show_message("CLONG, clong!", MSG_AUDIBLE)
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index a6be96a43a811..a61bf0f59445b 100644
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -309,7 +309,7 @@
return data
/** User clicks a button on the tagger */
-/obj/item/dest_tagger/ui_act(action, params)
+/obj/item/dest_tagger/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/religion/sparring/sparring_contract.dm b/code/modules/religion/sparring/sparring_contract.dm
index c31be81f64945..8d6c34a90d724 100644
--- a/code/modules/religion/sparring/sparring_contract.dm
+++ b/code/modules/religion/sparring/sparring_contract.dm
@@ -65,7 +65,7 @@
area_names += key
return area_names
-/obj/item/sparring_contract/ui_act(action, list/params)
+/obj/item/sparring_contract/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
@@ -84,7 +84,7 @@
if(!isnull(resolved))
resolved_opponents += resolved
- if(user in resolved_opponents && params["stakes"] == STAKES_HOLY_MATCH)
+ if((user in resolved_opponents) && params["stakes"] == STAKES_HOLY_MATCH)
to_chat(user, span_warning("This contract refuses to be signed up for a holy match by a previous holy match loser. Pick a different stake!"))
//any updating of the terms should update the UI to display new terms
diff --git a/code/modules/research/anomaly/anomaly_core.dm b/code/modules/research/anomaly/anomaly_core.dm
index febb25add5301..9cf762e58d219 100644
--- a/code/modules/research/anomaly/anomaly_core.dm
+++ b/code/modules/research/anomaly/anomaly_core.dm
@@ -20,8 +20,9 @@
A.anomalyNeutralize()
return TRUE
-/obj/item/assembly/signaler/anomaly/manual_suicide(mob/living/carbon/user)
- user.visible_message(span_suicide("[user]'s [src] is reacting to the radio signal, warping [user.p_their()] body!"))
+/obj/item/assembly/signaler/anomaly/manual_suicide(datum/mind/suicidee)
+ var/mob/living/user = suicidee.current
+ user.visible_message(span_suicide("[user]'s [name] is reacting to the radio signal, warping [user.p_their()] body!"))
user.set_suicide(TRUE)
user.gib(DROP_ALL_REMAINS)
diff --git a/code/modules/research/anomaly/anomaly_refinery.dm b/code/modules/research/anomaly/anomaly_refinery.dm
index bae2b4f116261..1269edb926561 100644
--- a/code/modules/research/anomaly/anomaly_refinery.dm
+++ b/code/modules/research/anomaly/anomaly_refinery.dm
@@ -315,7 +315,7 @@
ui = new(user, src, "AnomalyRefinery")
ui.open()
-/obj/machinery/research/anomaly_refinery/ui_act(action, list/params)
+/obj/machinery/research/anomaly_refinery/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if (.)
return
diff --git a/code/modules/research/designs/autolathe/service_designs.dm b/code/modules/research/designs/autolathe/service_designs.dm
index e7177037e522c..94772421b69ab 100644
--- a/code/modules/research/designs/autolathe/service_designs.dm
+++ b/code/modules/research/designs/autolathe/service_designs.dm
@@ -581,7 +581,7 @@
/datum/design/telescreen_entertainment
name = "Entertainment Telescreen"
id = "telescreen_entertainment"
- build_type = PROTOLATHE
+ build_type = AUTOLATHE | PROTOLATHE
materials = list(
/datum/material/iron = SHEET_MATERIAL_AMOUNT*5,
/datum/material/glass =SHEET_MATERIAL_AMOUNT * 2.5,
@@ -593,6 +593,21 @@
)
departmental_flags = DEPARTMENT_BITFLAG_SERVICE
+/datum/design/entertainment_radio
+ name = "Entertainment Radio"
+ id = "radio_entertainment"
+ build_type = AUTOLATHE | PROTOLATHE
+ materials = list(
+ /datum/material/iron = SMALL_MATERIAL_AMOUNT*0.75,
+ /datum/material/glass =SMALL_MATERIAL_AMOUNT*0.25
+ )
+ build_path = /obj/item/radio/entertainment/speakers/physical
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MOUNTS,
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_SERVICE
+
/datum/design/barcode_scanner
name = "Barcode Scanner"
id = "barcode_scanner"
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index 53104494c820e..d07deca292691 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -540,7 +540,7 @@
category = list(
RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_RESEARCH
)
- departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
+ departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING
/datum/design/board/microwave
name = "Microwave Board"
@@ -1247,3 +1247,13 @@
RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_SERVICE
)
departmental_flags = DEPARTMENT_BITFLAG_SERVICE
+
+/datum/design/board/big_manipulator
+ name = "Big Manipulator Board"
+ desc = "The circuit board for a big manipulator."
+ id = "big_manipulator"
+ build_path = /obj/item/circuitboard/machine/big_manipulator
+ category = list(
+ RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_ENGINEERING
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_SERVICE
diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm
index 96b3e60c63505..3139b365d0502 100644
--- a/code/modules/research/designs/mechfabricator_designs.dm
+++ b/code/modules/research/designs/mechfabricator_designs.dm
@@ -1578,6 +1578,34 @@
RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_JANITOR
)
+/datum/design/borg_upgrade_plunger
+ name = "Integrated Plunger"
+ id = "borg_upgrade_plunger"
+ build_type = MECHFAB
+ build_path = /obj/item/borg/upgrade/plunger
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT*1.125,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT*0.75,
+ )
+ construction_time = 4 SECONDS
+ category = list(
+ RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_JANITOR
+ )
+
+/datum/design/borg_upgrade_high_capacity_replacer
+ name = "High Capacity Light Replacer"
+ id = "borg_upgrade_high_capacity_replacer"
+ build_type = MECHFAB
+ build_path = /obj/item/borg/upgrade/high_capacity_light_replacer
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT*1.125,
+ /datum/material/glass = SHEET_MATERIAL_AMOUNT*0.75,
+ )
+ construction_time = 4 SECONDS
+ category = list(
+ RND_CATEGORY_MECHFAB_CYBORG_MODULES + RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_JANITOR
+ )
+
/datum/design/borg_upgrade_rolling_table
name = "Rolling Table Dock"
id = "borg_upgrade_rolling_table"
@@ -2727,6 +2755,17 @@
RND_CATEGORY_MODSUIT_MODULES + RND_SUBCATEGORY_MODSUIT_MODULES_ENGINEERING
)
+/datum/design/module/fishing_glove
+ name = "MOD Fishing Glove Module"
+ id = "mod_fishing"
+ materials = list(
+ /datum/material/titanium = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT,
+ /datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT,
+ )
+ build_path = /obj/item/mod/module/fishing_glove
+
/datum/design/posisphere
name = "Positronic Sphere"
desc = "The latest in Artificial Pesterance."
diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm
index 9aaa047d3a1c3..90b8acee031a9 100644
--- a/code/modules/research/designs/misc_designs.dm
+++ b/code/modules/research/designs/misc_designs.dm
@@ -986,6 +986,18 @@
)
departmental_flags = DEPARTMENT_BITFLAG_SERVICE | DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_SCIENCE
+/datum/design/fishing_gloves
+ name = "Athletic Fishing Gloves"
+ desc = "A pair of gloves to fish without a fishing rod and train your athletics with."
+ id = "fishing_gloves"
+ build_type = PROTOLATHE | AWAY_LATHE
+ materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/plastic = SHEET_MATERIAL_AMOUNT)
+ build_path = /obj/item/clothing/gloves/fishing
+ category = list(
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SERVICE
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_SERVICE | DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_SCIENCE
+
/datum/design/stabilized_hook
name = "Gyro-Stabilized Hook"
desc = "An advanced fishing hook that gives the user a tighter control on the fish when reeling in."
@@ -1000,7 +1012,7 @@
/datum/design/auto_reel
name = "Fishing Line Auto-Reel"
- desc = "An advanced line reel which can be used speed up both fishing and casually snagging other items in your direction."
+ desc = "An advanced line reel which can be used speed up fishing or casually snag other items in your direction."
id = "auto_reel"
build_type = PROTOLATHE | AWAY_LATHE
materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 4, /datum/material/gold = SMALL_MATERIAL_AMOUNT * 3, /datum/material/silver = SMALL_MATERIAL_AMOUNT * 3)
@@ -1022,6 +1034,18 @@
)
departmental_flags = DEPARTMENT_BITFLAG_SERVICE | DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_SCIENCE
+/datum/design/bluespace_fish_case
+ name = "Bluespace Fish Case"
+ desc = "An improved fish case to keep large fish in stasis in a compact little space."
+ id = "bluespace_fish_case"
+ build_type = PROTOLATHE | AWAY_LATHE
+ materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT, /datum/material/plastic = SMALL_MATERIAL_AMOUNT, /datum/material/bluespace = SMALL_MATERIAL_AMOUNT)
+ build_path = /obj/item/storage/fish_case/bluespace
+ category = list(
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SERVICE
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_SERVICE | DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_SCIENCE
+
// Coffeemaker Stuff
/datum/design/coffeepot
diff --git a/code/modules/research/designs/wiremod_designs.dm b/code/modules/research/designs/wiremod_designs.dm
index dbcd74165946a..e848356359dac 100644
--- a/code/modules/research/designs/wiremod_designs.dm
+++ b/code/modules/research/designs/wiremod_designs.dm
@@ -39,7 +39,7 @@
name = "Component ( NULL ENTRY )"
desc = "A component that goes into an integrated circuit."
build_type = COMPONENT_PRINTER
- materials = list(/datum/material/glass =HALF_SHEET_MATERIAL_AMOUNT)
+ materials = list(/datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
category = list(
RND_CATEGORY_CIRCUITRY + RND_SUBCATEGORY_CIRCUITRY_COMPONENTS
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index 0c28fcab2bf6e..ded27054695cc 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -166,7 +166,7 @@
return data
-/obj/machinery/rnd/experimentor/ui_act(action, list/params)
+/obj/machinery/rnd/experimentor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/research/ordnance/doppler_array.dm b/code/modules/research/ordnance/doppler_array.dm
index 5e44c2dc703e4..6b1be6769844d 100644
--- a/code/modules/research/ordnance/doppler_array.dm
+++ b/code/modules/research/ordnance/doppler_array.dm
@@ -290,7 +290,7 @@
data["records"] += list(record_data)
return data
-/obj/machinery/doppler_array/ui_act(action, list/params)
+/obj/machinery/doppler_array/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/research/ordnance/scipaper_partner.dm b/code/modules/research/ordnance/scipaper_partner.dm
index 7120c78cecde9..5bbe3e7d62746 100644
--- a/code/modules/research/ordnance/scipaper_partner.dm
+++ b/code/modules/research/ordnance/scipaper_partner.dm
@@ -1,14 +1,18 @@
/datum/scientific_partner/mining
name = "Mining Corps"
- flufftext = "A local group of miners are looking for ways to improve their mining output. They are interested in smaller scale explosives."
- accepted_experiments = list(/datum/experiment/ordnance/explosive/lowyieldbomb)
+ flufftext = "A local group of miners are looking for ways to improve their mining output. They are interested in smaller scale explosives and plasma research."
+ accepted_experiments = list(
+ /datum/experiment/ordnance/gaseous/plasma,
+ /datum/experiment/ordnance/explosive/lowyieldbomb,
+ /datum/experiment/ordnance/explosive/highyieldbomb,
+ )
multipliers = list(SCIPAPER_COOPERATION_INDEX = 0.75, SCIPAPER_FUNDING_INDEX = 0.75)
boostable_nodes = list(
- TECHWEB_NODE_BLUESPACE_THEORY = TECHWEB_TIER_3_POINTS,
- TECHWEB_NODE_NIGHT_VISION = TECHWEB_TIER_2_POINTS,
- TECHWEB_NODE_ANOMALY_RESEARCH = TECHWEB_TIER_2_POINTS,
- TECHWEB_NODE_MINING = TECHWEB_TIER_1_POINTS,
- TECHWEB_NODE_MINING_ADV = TECHWEB_TIER_2_POINTS,
+ TECHWEB_NODE_LOW_PRESSURE_EXCAVATION = TECHWEB_TIER_2_POINTS,
+ TECHWEB_NODE_PLASMA_MINING = TECHWEB_TIER_3_POINTS,
+ TECHWEB_NODE_MINING_ADV = TECHWEB_TIER_4_POINTS,
+ TECHWEB_NODE_NIGHT_VISION = TECHWEB_TIER_4_POINTS,
+ TECHWEB_NODE_BORG_ENGI = TECHWEB_TIER_3_POINTS,
)
/datum/scientific_partner/baron
@@ -17,23 +21,26 @@
multipliers = list(SCIPAPER_COOPERATION_INDEX = 0.25, SCIPAPER_FUNDING_INDEX = 2)
boostable_nodes = list(
TECHWEB_NODE_CONSOLES = TECHWEB_TIER_1_POINTS,
- TECHWEB_NODE_FUNDIMENTAL_SCI = TECHWEB_TIER_1_POINTS,
+ TECHWEB_NODE_GAMING = TECHWEB_TIER_2_POINTS,
+ TECHWEB_NODE_BITRUNNING = TECHWEB_TIER_3_POINTS,
+ TECHWEB_NODE_PROGRAMMED_SERVER = TECHWEB_TIER_3_POINTS,
)
/datum/scientific_partner/defense
name = "Defense Partnership"
- flufftext = "We can work directly for Nanotrasen's \[REDACTED\] division, potentially providing us access with advanced defensive gadgets."
+ flufftext = "We can work directly for Nanotrasen's \[REDACTED\] division, potentially providing us access with advanced offensive and defensive gadgets."
accepted_experiments = list(
+ /datum/experiment/ordnance/explosive/lowyieldbomb,
/datum/experiment/ordnance/explosive/highyieldbomb,
/datum/experiment/ordnance/explosive/pressurebomb,
/datum/experiment/ordnance/explosive/hydrogenbomb,
)
boostable_nodes = list(
- TECHWEB_NODE_RIOT_SUPRESSION = TECHWEB_TIER_3_POINTS,
- TECHWEB_NODE_SEC_EQUIP = TECHWEB_TIER_1_POINTS,
- TECHWEB_NODE_EXPLOSIVES = TECHWEB_TIER_2_POINTS,
- TECHWEB_NODE_ELECTRIC_WEAPONS = TECHWEB_TIER_2_POINTS,
- TECHWEB_NODE_BEAM_WEAPONS = TECHWEB_TIER_3_POINTS,
+ TECHWEB_NODE_RIOT_SUPRESSION = TECHWEB_TIER_2_POINTS,
+ TECHWEB_NODE_EXPLOSIVES = TECHWEB_TIER_3_POINTS,
+ TECHWEB_NODE_MECH_ENERGY_GUNS = TECHWEB_TIER_4_POINTS,
+ TECHWEB_NODE_MECH_FIREARMS = TECHWEB_TIER_5_POINTS,
+ TECHWEB_NODE_MECH_HEAVY_ARMS = TECHWEB_TIER_5_POINTS,
)
/datum/scientific_partner/medical
@@ -44,24 +51,27 @@
/datum/experiment/ordnance/gaseous/bz,
)
boostable_nodes = list(
- TECHWEB_NODE_CYBER_ORGANS = TECHWEB_TIER_1_POINTS,
- TECHWEB_NODE_CYBER_ORGANS_UPGRADED = TECHWEB_TIER_2_POINTS,
- TECHWEB_NODE_GENE_ENGINEERING = TECHWEB_TIER_1_POINTS,
- TECHWEB_NODE_PASSIVE_IMPLANTS = TECHWEB_TIER_1_POINTS,
- TECHWEB_NODE_BIO_SCAN = TECHWEB_TIER_1_POINTS,
- TECHWEB_NODE_CHEM_SYNTHESIS = TECHWEB_TIER_2_POINTS,
+ TECHWEB_NODE_CYBER_ORGANS = TECHWEB_TIER_2_POINTS,
+ TECHWEB_NODE_CYBER_ORGANS_UPGRADED = TECHWEB_TIER_3_POINTS,
+ TECHWEB_NODE_MEDBAY_EQUIP_ADV = TECHWEB_TIER_3_POINTS,
+ TECHWEB_NODE_CYTOLOGY = TECHWEB_TIER_3_POINTS,
+ TECHWEB_NODE_BORG_MEDICAL = TECHWEB_TIER_3_POINTS,
+ TECHWEB_NODE_COMBAT_IMPLANTS = TECHWEB_TIER_4_POINTS,
)
/datum/scientific_partner/physics
name = "NT Physics Quarterly"
flufftext = "A prestigious physics journal managed by Nanotrasen. The main journal for publishing cutting-edge physics research conducted by Nanotrasen, given that they aren't classified."
accepted_experiments = list(
+ /datum/experiment/ordnance/gaseous/bz,
+ /datum/experiment/ordnance/explosive/hydrogenbomb,
/datum/experiment/ordnance/gaseous/noblium,
/datum/experiment/ordnance/explosive/nobliumbomb,
)
boostable_nodes = list(
- TECHWEB_NODE_PARTS_UPG = TECHWEB_TIER_2_POINTS,
- TECHWEB_NODE_EXP_TOOLS = TECHWEB_TIER_4_POINTS,
- TECHWEB_NODE_PARTS_BLUESPACE = TECHWEB_TIER_3_POINTS,
- TECHWEB_NODE_PARTS_ADV = TECHWEB_TIER_1_POINTS,
+ TECHWEB_NODE_PARTS_ADV = TECHWEB_TIER_3_POINTS,
+ TECHWEB_NODE_BLUESPACE_TRAVEL = TECHWEB_TIER_3_POINTS,
+ TECHWEB_NODE_ANOMALY_RESEARCH = TECHWEB_TIER_3_POINTS,
+ TECHWEB_NODE_TELECOMS = TECHWEB_TIER_5_POINTS,
+ TECHWEB_NODE_MECH_EQUIP_BLUESPACE = TECHWEB_TIER_5_POINTS,
)
diff --git a/code/modules/research/ordnance/tank_compressor.dm b/code/modules/research/ordnance/tank_compressor.dm
index d0393d9e10374..89f38ee4a32e0 100644
--- a/code/modules/research/ordnance/tank_compressor.dm
+++ b/code/modules/research/ordnance/tank_compressor.dm
@@ -275,7 +275,7 @@
ui = new(user, src, "TankCompressor")
ui.open()
-/obj/machinery/atmospherics/components/binary/tank_compressor/ui_act(action, list/params)
+/obj/machinery/atmospherics/components/binary/tank_compressor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if (.)
return
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index 91cf89582d369..d4dde8732a0e9 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -319,7 +319,7 @@ Nothing else in the console has ID requirements.
"id_cache" = flat_id_cache,
)
-/obj/machinery/computer/rdconsole/ui_act(action, list/params)
+/obj/machinery/computer/rdconsole/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if (.)
return
diff --git a/code/modules/research/server_control.dm b/code/modules/research/server_control.dm
index 24327a731a64e..73596925a2d78 100644
--- a/code/modules/research/server_control.dm
+++ b/code/modules/research/server_control.dm
@@ -61,7 +61,7 @@
return data
-/obj/machinery/computer/rdservercontrol/ui_act(action, params)
+/obj/machinery/computer/rdservercontrol/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return TRUE
diff --git a/code/modules/research/techweb/nodes/atmos_nodes.dm b/code/modules/research/techweb/nodes/atmos_nodes.dm
index ef4fee5ed92a7..f1ec74b50f482 100644
--- a/code/modules/research/techweb/nodes/atmos_nodes.dm
+++ b/code/modules/research/techweb/nodes/atmos_nodes.dm
@@ -42,6 +42,12 @@
"pneumatic_seal",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS)
+ experiments_to_unlock = list(
+ /datum/experiment/ordnance/gaseous/plasma,
+ /datum/experiment/ordnance/gaseous/nitrous_oxide,
+ /datum/experiment/ordnance/gaseous/bz,
+ /datum/experiment/ordnance/gaseous/noblium,
+ )
/datum/techweb_node/plasma_control
id = TECHWEB_NODE_PLASMA_CONTROL
@@ -77,7 +83,6 @@
"crystallizer",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
- required_experiments = list(/datum/experiment/ordnance/gaseous/bz)
discount_experiments = list(/datum/experiment/ordnance/gaseous/nitrous_oxide = TECHWEB_TIER_3_POINTS)
/datum/techweb_node/exp_tools
@@ -99,7 +104,7 @@
"magboots",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_4_POINTS)
- discount_experiments = list(/datum/experiment/ordnance/gaseous/noblium = TECHWEB_TIER_4_POINTS)
+ discount_experiments = list(/datum/experiment/ordnance/gaseous/bz = TECHWEB_TIER_4_POINTS)
/datum/techweb_node/rcd_upgrade
id = TECHWEB_NODE_RCD_UPGRADE
@@ -116,3 +121,4 @@
"rpd_upgrade_unwrench",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_5_POINTS)
+ discount_experiments = list(/datum/experiment/ordnance/gaseous/noblium = TECHWEB_TIER_5_POINTS)
diff --git a/code/modules/research/techweb/nodes/biology_nodes.dm b/code/modules/research/techweb/nodes/biology_nodes.dm
index 3599dfb9fc5a1..7b553445a9c2a 100644
--- a/code/modules/research/techweb/nodes/biology_nodes.dm
+++ b/code/modules/research/techweb/nodes/biology_nodes.dm
@@ -44,7 +44,7 @@
"limbdesign_plasmaman",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
- required_experiments = list(/datum/experiment/scanning/cytology/slime)
+ discount_experiments = list(/datum/experiment/scanning/cytology/slime = TECHWEB_TIER_3_POINTS)
/datum/techweb_node/gene_engineering
id = TECHWEB_NODE_GENE_ENGINEERING
diff --git a/code/modules/research/techweb/nodes/cyborg_nodes.dm b/code/modules/research/techweb/nodes/cyborg_nodes.dm
index 5e0ad2f64e0e9..8a9d09807d627 100644
--- a/code/modules/research/techweb/nodes/cyborg_nodes.dm
+++ b/code/modules/research/techweb/nodes/cyborg_nodes.dm
@@ -11,6 +11,7 @@
"borg_l_leg",
"borg_r_arm",
"borg_r_leg",
+ "borg_suit",
"cybernetic_eyes",
"cybernetic_eyes_moth",
"cybernetic_ears",
@@ -32,7 +33,6 @@
"robocontrol",
"borgupload",
"cyborgrecharger",
- "borg_suit",
"mmi_posi",
"mmi",
"mmi_m",
@@ -98,6 +98,8 @@
"borg_upgrade_broomer",
"borg_upgrade_expand",
"borg_upgrade_prt",
+ "borg_upgrade_plunger",
+ "borg_upgrade_high_capacity_replacer",
"borg_upgrade_selfrepair",
"borg_upgrade_thrusters",
"borg_upgrade_trashofholding",
diff --git a/code/modules/research/techweb/nodes/engi_nodes.dm b/code/modules/research/techweb/nodes/engi_nodes.dm
index 0fe1b7bd75f33..949b880d1f23a 100644
--- a/code/modules/research/techweb/nodes/engi_nodes.dm
+++ b/code/modules/research/techweb/nodes/engi_nodes.dm
@@ -126,6 +126,7 @@
"firelock_board",
"trapdoor_electronics",
"blast",
+ "big_manipulator",
"tile_sprayer",
"airlock_painter",
"decal_painter",
diff --git a/code/modules/research/techweb/nodes/mech_nodes.dm b/code/modules/research/techweb/nodes/mech_nodes.dm
index d6b7171d55b37..b09957076d712 100644
--- a/code/modules/research/techweb/nodes/mech_nodes.dm
+++ b/code/modules/research/techweb/nodes/mech_nodes.dm
@@ -254,7 +254,7 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_5_POINTS)
/datum/techweb_node/mech_equip_bluespace
- id = TECHWEB_NODE_BLUESPACE
+ id = TECHWEB_NODE_MECH_EQUIP_BLUESPACE
display_name = "Bluespace Exosuit Equipment"
description = "An array of equipment empowered by bluespace, providing unmatched mobility and utility."
prereq_ids = list(TECHWEB_NODE_MECH_INFILTRATOR, TECHWEB_NODE_BLUESPACE_TRAVEL)
diff --git a/code/modules/research/techweb/nodes/medbay_nodes.dm b/code/modules/research/techweb/nodes/medbay_nodes.dm
index f5b122ccd287d..fababbc55e748 100644
--- a/code/modules/research/techweb/nodes/medbay_nodes.dm
+++ b/code/modules/research/techweb/nodes/medbay_nodes.dm
@@ -84,7 +84,7 @@
id = TECHWEB_NODE_CRYOSTASIS
display_name = "Cryostasis"
description = "The result of clown accidentally drinking a chemical, now repurposed for safely preserving crew members in suspended animation."
- prereq_ids = list(TECHWEB_NODE_FUSION)
+ prereq_ids = list(TECHWEB_NODE_MEDBAY_EQUIP_ADV, TECHWEB_NODE_FUSION)
design_ids = list(
"cryotube",
"mech_sleeper",
diff --git a/code/modules/research/techweb/nodes/service_nodes.dm b/code/modules/research/techweb/nodes/service_nodes.dm
index 591308947b23f..3735dc41b3b2c 100644
--- a/code/modules/research/techweb/nodes/service_nodes.dm
+++ b/code/modules/research/techweb/nodes/service_nodes.dm
@@ -165,9 +165,12 @@
prereq_ids = list(TECHWEB_NODE_FISHING_EQUIP)
design_ids = list(
"fishing_rod_tech",
+ "fishing_gloves",
+ "mod_fishing",
"stabilized_hook",
"auto_reel",
"fish_analyzer",
+ "bluespace_fish_case",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
required_experiments = list(/datum/experiment/scanning/fish)
diff --git a/code/modules/research/xenobiology/crossbreeding/_clothing.dm b/code/modules/research/xenobiology/crossbreeding/_clothing.dm
index 9bd9e2d881b1c..89baa18720d7b 100644
--- a/code/modules/research/xenobiology/crossbreeding/_clothing.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_clothing.dm
@@ -151,7 +151,7 @@ Slimecrossing Armor
var/hit_reflect_chance = 40
/obj/item/clothing/suit/armor/heavy/adamantine/IsReflect(def_zone)
- if(def_zone in list(BODY_ZONE_CHEST, BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_R_LEG, BODY_ZONE_L_LEG) && prob(hit_reflect_chance))
+ if((def_zone in list(BODY_ZONE_CHEST, BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_R_LEG, BODY_ZONE_L_LEG)) && prob(hit_reflect_chance))
return TRUE
else
return FALSE
diff --git a/code/modules/research/xenobiology/crossbreeding/_weapons.dm b/code/modules/research/xenobiology/crossbreeding/_weapons.dm
index c5136baafb149..152a90f9795eb 100644
--- a/code/modules/research/xenobiology/crossbreeding/_weapons.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_weapons.dm
@@ -66,6 +66,7 @@ Slimecrossing Weapons
attack_verb_simple = list("bash", "pound", "slam")
item_flags = SLOWS_WHILE_IN_HAND
breakable_by_damage = FALSE
+ shield_bash_sound = 'sound/effects/glassknock.ogg'
/datum/armor/shield_adamantineshield
melee = 50
diff --git a/code/modules/research/xenobiology/vatgrowing/petri_dish.dm b/code/modules/research/xenobiology/vatgrowing/petri_dish.dm
index 0187fa8eda359..df2fa619cc3d1 100644
--- a/code/modules/research/xenobiology/vatgrowing/petri_dish.dm
+++ b/code/modules/research/xenobiology/vatgrowing/petri_dish.dm
@@ -59,6 +59,7 @@
list(CELL_LINE_TABLE_COCKROACH, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 7),
list(CELL_LINE_TABLE_BLOBBERNAUT, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5)
)
+ name = "basic sample petri dish"
/obj/item/petri_dish/random/Initialize(mapload)
. = ..()
diff --git a/code/modules/security_levels/keycard_authentication.dm b/code/modules/security_levels/keycard_authentication.dm
index 69fc6f73289e1..adb62496d8bbb 100644
--- a/code/modules/security_levels/keycard_authentication.dm
+++ b/code/modules/security_levels/keycard_authentication.dm
@@ -60,7 +60,7 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new)
return UI_CLOSE
return ..()
-/obj/machinery/keycard_auth/ui_act(action, params)
+/obj/machinery/keycard_auth/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(. || waiting || !allowed(usr))
return
diff --git a/code/modules/shuttle/computer.dm b/code/modules/shuttle/computer.dm
index cf53fef368c1b..5ce62f8c04226 100644
--- a/code/modules/shuttle/computer.dm
+++ b/code/modules/shuttle/computer.dm
@@ -174,7 +174,7 @@
else
return SHUTTLE_CONSOLE_ERROR
-/obj/machinery/computer/shuttle/ui_act(action, params)
+/obj/machinery/computer/shuttle/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index 6740424cf801a..6586539b1d05f 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -755,12 +755,13 @@
name = "emergency space helmet"
icon_state = "syndicate-helm-orange"
inhand_icon_state = "syndicate-helm-orange"
+ slowdown = 1.5
/obj/item/clothing/suit/space/orange
name = "emergency space suit"
icon_state = "syndicate-orange"
inhand_icon_state = "syndicate-orange"
- slowdown = 3
+ slowdown = 1.5
/obj/item/pickaxe/emergency
name = "emergency disembarkation tool"
diff --git a/code/modules/spells/spell_types/pointed/finger_guns.dm b/code/modules/spells/spell_types/pointed/finger_guns.dm
index 24f51a0e90862..cf80489fc916a 100644
--- a/code/modules/spells/spell_types/pointed/finger_guns.dm
+++ b/code/modules/spells/spell_types/pointed/finger_guns.dm
@@ -33,7 +33,7 @@
return FALSE
var/mob/living/carbon/human/human_invoker = invoker
- if(human_invoker.incapacitated())
+ if(human_invoker.incapacitated)
if(feedback)
to_chat(human_invoker, span_warning("You can't properly point your fingers while incapacitated."))
return FALSE
diff --git a/code/modules/spells/spell_types/shapeshift/_shapeshift.dm b/code/modules/spells/spell_types/shapeshift/_shapeshift.dm
index 59c9ffdde3b0b..b7542d4077f3c 100644
--- a/code/modules/spells/spell_types/shapeshift/_shapeshift.dm
+++ b/code/modules/spells/spell_types/shapeshift/_shapeshift.dm
@@ -141,7 +141,7 @@
if(QDELETED(caster))
return FALSE
- return !caster.incapacitated()
+ return !caster.incapacitated
/// Actually does the shapeshift, for the caster.
/datum/action/cooldown/spell/shapeshift/proc/do_shapeshift(mob/living/caster)
diff --git a/code/modules/spells/spell_types/teleport/teleport.dm b/code/modules/spells/spell_types/teleport/teleport.dm
index d486157204283..57e88b9852025 100644
--- a/code/modules/spells/spell_types/teleport/teleport.dm
+++ b/code/modules/spells/spell_types/teleport/teleport.dm
@@ -48,5 +48,5 @@
return
var/mob/living/carbon/caster = cast_on
- if(caster.incapacitated() || !caster.is_holding(target))
+ if(caster.incapacitated || !caster.is_holding(target))
return . | SPELL_CANCEL_CAST
diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm
index e2feaa2bc26ed..683afe605c983 100644
--- a/code/modules/station_goals/bsa.dm
+++ b/code/modules/station_goals/bsa.dm
@@ -299,7 +299,7 @@ GLOBAL_VAR_INIT(bsa_unlock, FALSE)
data["target"] = get_target_name()
return data
-/obj/machinery/computer/bsa_control/ui_act(action, params)
+/obj/machinery/computer/bsa_control/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm
index 6c2661bbe2237..5a14c0e16b66d 100644
--- a/code/modules/station_goals/dna_vault.dm
+++ b/code/modules/station_goals/dna_vault.dm
@@ -164,7 +164,7 @@
data["choiceB"] = initial(mutation2.name)
return data
-/obj/machinery/dna_vault/ui_act(action, params)
+/obj/machinery/dna_vault/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/surgery/advanced/brainwashing.dm b/code/modules/surgery/advanced/brainwashing.dm
index 0e80f89b6dc60..21870ae57b8df 100644
--- a/code/modules/surgery/advanced/brainwashing.dm
+++ b/code/modules/surgery/advanced/brainwashing.dm
@@ -81,7 +81,7 @@
if(!target.mind)
to_chat(user, span_warning("[target] doesn't respond to the brainwashing, as if [target.p_they()] lacked a mind..."))
return FALSE
- if(HAS_TRAIT(target, TRAIT_MINDSHIELD))
+ if(HAS_MIND_TRAIT(target, TRAIT_UNCONVERTABLE))
to_chat(user, span_warning("You hear a faint buzzing from a device inside [target]'s brain, and the brainwashing is erased."))
return FALSE
display_results(
diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm
index 7a7809ef48cba..296f818e58744 100644
--- a/code/modules/surgery/bodyparts/_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/_bodyparts.dm
@@ -183,7 +183,7 @@
///Determines the accuracy bonus, armor penetration and knockdown probability.
var/unarmed_effectiveness = 10
- /// Traits that are given to the holder of the part. If you want an effect that changes this, don't add directly to this. Use the add_bodypart_trait() proc
+ /// Traits that are given to the holder of the part. This does not update automatically on life(), only when the organs are initially generated or inserted!
var/list/bodypart_traits = list()
/// The name of the trait source that the organ gives. Should not be altered during the events of gameplay, and will cause problems if it is.
var/bodypart_trait_source = BODYPART_TRAIT
diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm
index c656daeb18445..5579cb64d83d5 100644
--- a/code/modules/surgery/bodyparts/dismemberment.dm
+++ b/code/modules/surgery/bodyparts/dismemberment.dm
@@ -231,8 +231,6 @@
for(var/obj/item/head_item as anything in list(owner.glasses, owner.ears, owner.wear_mask, owner.head))
owner.dropItemToGround(head_item, force = TRUE)
- qdel(owner.GetComponent(/datum/component/creamed)) //clean creampie overlay flushed emoji
-
//Handle dental implants
for(var/datum/action/item_action/activate_pill/pill_action in owner.actions)
pill_action.Remove(owner)
diff --git a/code/modules/surgery/bodyparts/robot_bodyparts.dm b/code/modules/surgery/bodyparts/robot_bodyparts.dm
index 314f3396f0afe..738b3ce97ac3b 100644
--- a/code/modules/surgery/bodyparts/robot_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/robot_bodyparts.dm
@@ -124,8 +124,8 @@
if (severity == EMP_HEAVY)
knockdown_time *= 2
owner.Knockdown(knockdown_time)
- if(owner.incapacitated(IGNORE_RESTRAINTS|IGNORE_GRAB)) // So the message isn't duplicated. If they were stunned beforehand by something else, then the message not showing makes more sense anyways.
- return FALSE
+ if(INCAPACITATED_IGNORING(owner, INCAPABLE_RESTRAINTS|INCAPABLE_GRAB)) // So the message isn't duplicated. If they were stunned beforehand by something else, then the message not showing makes more sense anyways.
+ return
to_chat(owner, span_danger("As your [plaintext_zone] unexpectedly malfunctions, it causes you to fall to the ground!"))
return
@@ -173,8 +173,8 @@
if (severity == EMP_HEAVY)
knockdown_time *= 2
owner.Knockdown(knockdown_time)
- if(owner.incapacitated(IGNORE_RESTRAINTS|IGNORE_GRAB)) // So the message isn't duplicated. If they were stunned beforehand by something else, then the message not showing makes more sense anyways.
- return FALSE
+ if(INCAPACITATED_IGNORING(owner, INCAPABLE_RESTRAINTS|INCAPABLE_GRAB)) // So the message isn't duplicated. If they were stunned beforehand by something else, then the message not showing makes more sense anyways.
+ return
to_chat(owner, span_danger("As your [plaintext_zone] unexpectedly malfunctions, it causes you to fall to the ground!"))
return
diff --git a/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm
index 05645ed20df2e..d97b00c58af68 100644
--- a/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm
@@ -23,6 +23,7 @@
dmg_overlay_type = null
brute_modifier = 1.25 //ethereal are weak to brute damages
wing_types = NONE
+ bodypart_traits = list(TRAIT_NO_UNDERWEAR)
/obj/item/bodypart/chest/ethereal/update_limb(dropping_limb, is_creating)
. = ..()
diff --git a/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm
index f9a71a4e6d4dd..f8619943a81ed 100644
--- a/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm
@@ -254,12 +254,14 @@
should_draw_greyscale = FALSE
head_flags = HEAD_EYESPRITES|HEAD_EYEHOLES|HEAD_DEBRAIN
teeth_count = 0
+ bodypart_traits = list(TRAIT_ANTENNAE)
/obj/item/bodypart/chest/fly
limb_id = SPECIES_FLYPERSON
is_dimorphic = TRUE
should_draw_greyscale = FALSE
wing_types = list(/obj/item/organ/external/wings/functional/fly)
+ bodypart_traits = list(TRAIT_TACKLING_FRAIL_ATTACKER)
/obj/item/bodypart/arm/left/fly
limb_id = SPECIES_FLYPERSON
diff --git a/code/modules/surgery/bodyparts/species_parts/moth_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/moth_bodyparts.dm
index 323cef05b8c5d..b437129db35c3 100644
--- a/code/modules/surgery/bodyparts/species_parts/moth_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/species_parts/moth_bodyparts.dm
@@ -7,6 +7,7 @@
should_draw_greyscale = FALSE
head_flags = HEAD_LIPS|HEAD_EYESPRITES|HEAD_EYEHOLES|HEAD_DEBRAIN //what the fuck, moths have lips?
teeth_count = 0
+ bodypart_traits = list(TRAIT_ANTENNAE)
/obj/item/bodypart/chest/moth
icon = 'icons/mob/human/species/moth/bodyparts.dmi'
@@ -16,6 +17,7 @@
is_dimorphic = TRUE
should_draw_greyscale = FALSE
wing_types = list(/obj/item/organ/external/wings/functional/moth/megamoth, /obj/item/organ/external/wings/functional/moth/mothra)
+ bodypart_traits = list(TRAIT_TACKLING_WINGED_ATTACKER)
/obj/item/bodypart/chest/moth/get_butt_sprite()
return icon('icons/mob/butts.dmi', BUTT_SPRITE_FUZZY)
diff --git a/code/modules/surgery/organs/internal/liver/_liver.dm b/code/modules/surgery/organs/internal/liver/_liver.dm
index 3933a9efa5930..d71e368bdd0ff 100755
--- a/code/modules/surgery/organs/internal/liver/_liver.dm
+++ b/code/modules/surgery/organs/internal/liver/_liver.dm
@@ -1,7 +1,6 @@
#define LIVER_DEFAULT_TOX_TOLERANCE 3 //amount of toxins the liver can filter out
#define LIVER_DEFAULT_TOX_RESISTANCE 1 //lower values lower how harmful toxins are to the liver
#define LIVER_FAILURE_STAGE_SECONDS 60 //amount of seconds before liver failure reaches a new stage
-#define MAX_TOXIN_LIVER_DAMAGE 2 //the max damage the liver can receive per second (~1 min at max damage will destroy liver)
/obj/item/organ/internal/liver
name = "liver"
@@ -124,10 +123,6 @@
continue
ADD_TRAIT(replacement, readded_trait, JOB_TRAIT)
-#define HAS_SILENT_TOXIN 0 //don't provide a feedback message if this is the only toxin present
-#define HAS_NO_TOXIN 1
-#define HAS_PAINFUL_TOXIN 2
-
/obj/item/organ/internal/liver/on_life(seconds_per_tick, times_fired)
. = ..()
//If your liver is failing, then we use the liverless version of metabolize
@@ -136,34 +131,8 @@
owner.reagents.metabolize(owner, seconds_per_tick, times_fired, can_overdose = TRUE, liverless = TRUE)
return
- var/obj/belly = owner.get_organ_slot(ORGAN_SLOT_STOMACH)
- var/list/cached_reagents = owner.reagents?.reagent_list
- var/liver_damage = 0
- var/provide_pain_message = HAS_NO_TOXIN
-
- if(filterToxins && !HAS_TRAIT(owner, TRAIT_TOXINLOVER))
- for(var/datum/reagent/toxin/toxin in cached_reagents)
- if(toxin.affected_organ_flags && !(organ_flags & toxin.affected_organ_flags)) //this particular toxin does not affect this type of organ
- continue
- var/amount = toxin.volume
- if(belly)
- amount += belly.reagents.get_reagent_amount(toxin.type)
-
- // a 15u syringe is a nice baseline to scale lethality by
- liver_damage += ((amount/15) * toxin.toxpwr * toxin.liver_damage_multiplier) / liver_resistance
-
- if(provide_pain_message != HAS_PAINFUL_TOXIN)
- provide_pain_message = toxin.silent_toxin ? HAS_SILENT_TOXIN : HAS_PAINFUL_TOXIN
-
owner.reagents?.metabolize(owner, seconds_per_tick, times_fired, can_overdose = TRUE)
- if(liver_damage)
- apply_organ_damage(min(liver_damage * seconds_per_tick , MAX_TOXIN_LIVER_DAMAGE * seconds_per_tick))
-
- if(provide_pain_message && damage > 10 && SPT_PROB(damage/6, seconds_per_tick)) //the higher the damage the higher the probability
- to_chat(owner, span_warning("You feel a dull pain in your abdomen."))
-
-
/obj/item/organ/internal/liver/handle_failing_organs(seconds_per_tick)
if(HAS_TRAIT(owner, TRAIT_STABLELIVER) || HAS_TRAIT(owner, TRAIT_LIVERLESS_METABOLISM))
return
@@ -303,10 +272,6 @@
. = ..()
AddElement(/datum/element/dangerous_surgical_removal)
-#undef HAS_SILENT_TOXIN
-#undef HAS_NO_TOXIN
-#undef HAS_PAINFUL_TOXIN
#undef LIVER_DEFAULT_TOX_TOLERANCE
#undef LIVER_DEFAULT_TOX_RESISTANCE
#undef LIVER_FAILURE_STAGE_SECONDS
-#undef MAX_TOXIN_LIVER_DAMAGE
diff --git a/code/modules/surgery/organs/internal/stomach/_stomach.dm b/code/modules/surgery/organs/internal/stomach/_stomach.dm
index ba526aff2e0f7..4f1edd1542d69 100644
--- a/code/modules/surgery/organs/internal/stomach/_stomach.dm
+++ b/code/modules/surgery/organs/internal/stomach/_stomach.dm
@@ -217,6 +217,7 @@
disgusted.adjust_confusion(2.5 SECONDS)
disgusted.adjust_stutter(2 SECONDS)
disgusted.vomit(VOMIT_CATEGORY_KNOCKDOWN, distance = 0)
+ disgusted.adjust_disgust(-50)
disgusted.set_dizzy_if_lower(10 SECONDS)
if(disgust >= DISGUST_LEVEL_DISGUSTED)
if(SPT_PROB(13, seconds_per_tick))
diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm
index 2bd8f485887f8..c0f71b57ca235 100644
--- a/code/modules/surgery/tools.dm
+++ b/code/modules/surgery/tools.dm
@@ -644,7 +644,7 @@
for(var/key in whitelist)
.["whitelist"] += whitelist[key]
-/obj/item/blood_filter/ui_act(action, params)
+/obj/item/blood_filter/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/tgs/v5/__interop_version.dm b/code/modules/tgs/v5/__interop_version.dm
index f4806f7adb97c..29ea239ad84db 100644
--- a/code/modules/tgs/v5/__interop_version.dm
+++ b/code/modules/tgs/v5/__interop_version.dm
@@ -1 +1 @@
-"5.9.0"
+"5.10.0"
diff --git a/code/modules/tgs/v5/_defines.dm b/code/modules/tgs/v5/_defines.dm
index 92c7a8388a711..a47bfd78000bc 100644
--- a/code/modules/tgs/v5/_defines.dm
+++ b/code/modules/tgs/v5/_defines.dm
@@ -95,6 +95,7 @@
#define DMAPI5_TOPIC_PARAMETER_NEW_SERVER_VERSION "newServerVersion"
#define DMAPI5_TOPIC_PARAMETER_BROADCAST_MESSAGE "broadcastMessage"
+#define DMAPI5_TOPIC_RESPONSE_CLIENT_COUNT "clientCount"
#define DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE "commandResponse"
#define DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE_MESSAGE "commandResponseMessage"
#define DMAPI5_TOPIC_RESPONSE_CHAT_RESPONSES "chatResponses"
diff --git a/code/modules/tgs/v5/topic.dm b/code/modules/tgs/v5/topic.dm
index e1f2cb6385789..59e5e63e5cd42 100644
--- a/code/modules/tgs/v5/topic.dm
+++ b/code/modules/tgs/v5/topic.dm
@@ -149,7 +149,9 @@
if(DMAPI5_TOPIC_COMMAND_HEALTHCHECK)
if(event_handler && event_handler.receive_health_checks)
event_handler.HandleEvent(TGS_EVENT_HEALTH_CHECK)
- return TopicResponse()
+ var/list/health_check_response = TopicResponse()
+ health_check_response[DMAPI5_TOPIC_RESPONSE_CLIENT_COUNT] = TGS_CLIENT_COUNT
+ return health_check_response;
if(DMAPI5_TOPIC_COMMAND_WATCHDOG_REATTACH)
detached = FALSE
diff --git a/code/modules/tgs/v5/undefs.dm b/code/modules/tgs/v5/undefs.dm
index 237207fdfd056..acd19dfa6411c 100644
--- a/code/modules/tgs/v5/undefs.dm
+++ b/code/modules/tgs/v5/undefs.dm
@@ -18,7 +18,6 @@
#undef DMAPI5_PARAMETER_ACCESS_IDENTIFIER
#undef DMAPI5_PARAMETER_CUSTOM_COMMANDS
-#undef DMAPI5_PARAMETER_TOPIC_PORT
#undef DMAPI5_CHUNK
#undef DMAPI5_CHUNK_PAYLOAD
@@ -95,6 +94,7 @@
#undef DMAPI5_TOPIC_PARAMETER_NEW_SERVER_VERSION
#undef DMAPI5_TOPIC_PARAMETER_BROADCAST_MESSAGE
+#undef DMAPI5_TOPIC_RESPONSE_CLIENT_COUNT
#undef DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE
#undef DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE_MESSAGE
#undef DMAPI5_TOPIC_RESPONSE_CHAT_RESPONSES
diff --git a/code/modules/tgui/states.dm b/code/modules/tgui/states.dm
index dc3d543f14364..a29279457a04a 100644
--- a/code/modules/tgui/states.dm
+++ b/code/modules/tgui/states.dm
@@ -67,7 +67,7 @@
else if(stat)
return UI_DISABLED
// Update UIs if incapicitated but concious.
- else if(incapacitated())
+ else if(incapacitated)
return UI_UPDATE
return UI_INTERACTIVE
diff --git a/code/modules/tgui/states/not_incapacitated.dm b/code/modules/tgui/states/not_incapacitated.dm
index f7278c86de473..ab8cd5f6246fd 100644
--- a/code/modules/tgui/states/not_incapacitated.dm
+++ b/code/modules/tgui/states/not_incapacitated.dm
@@ -29,6 +29,6 @@ GLOBAL_DATUM_INIT(not_incapacitated_turf_state, /datum/ui_state/not_incapacitate
/datum/ui_state/not_incapacitated_state/can_use_topic(src_object, mob/user)
if(user.stat != CONSCIOUS)
return UI_CLOSE
- if(HAS_TRAIT(src, TRAIT_UI_BLOCKED) || user.incapacitated() || (turf_check && !isturf(user.loc)))
+ if(HAS_TRAIT(src, TRAIT_UI_BLOCKED) || user.incapacitated || (turf_check && !isturf(user.loc)))
return UI_DISABLED
return UI_INTERACTIVE
diff --git a/code/modules/tgui/states/reverse_contained.dm b/code/modules/tgui/states/reverse_contained.dm
deleted file mode 100644
index a6d1034a78919..0000000000000
--- a/code/modules/tgui/states/reverse_contained.dm
+++ /dev/null
@@ -1,18 +0,0 @@
-/*!
- * Not copyrighted, but magatsuchi made it.
- *
- */
-
-/**
- * tgui state: reverse_contained_state
- *
- *
- * Checks if src_object is inside of user.
- */
-
-GLOBAL_DATUM_INIT(reverse_contained_state, /datum/ui_state/reverse_contained_state, new)
-
-/datum/ui_state/reverse_contained_state/can_use_topic(atom/src_object, mob/user)
- if(!user.contains(src_object))
- return UI_CLOSE
- return user.shared_ui_interaction(src_object)
diff --git a/code/modules/tgui_input/alert.dm b/code/modules/tgui_input/alert.dm
index 4749ef278725e..0b12184ba7a88 100644
--- a/code/modules/tgui_input/alert.dm
+++ b/code/modules/tgui_input/alert.dm
@@ -120,7 +120,7 @@
data["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS))
return data
-/datum/tgui_alert/ui_act(action, list/params)
+/datum/tgui_alert/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if (.)
return
diff --git a/code/modules/tgui_input/checkboxes.dm b/code/modules/tgui_input/checkboxes.dm
index 53b264038dc20..9e548b9c13640 100644
--- a/code/modules/tgui_input/checkboxes.dm
+++ b/code/modules/tgui_input/checkboxes.dm
@@ -115,7 +115,7 @@
return data
-/datum/tgui_checkbox_input/ui_act(action, list/params)
+/datum/tgui_checkbox_input/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if (.)
return
diff --git a/code/modules/tgui_input/keycombo.dm b/code/modules/tgui_input/keycombo.dm
index 948dbaea234a8..7a9e8399a8cfb 100644
--- a/code/modules/tgui_input/keycombo.dm
+++ b/code/modules/tgui_input/keycombo.dm
@@ -8,7 +8,7 @@
* * user - The user to show the number input to.
* * message - The content of the number input, shown in the body of the TGUI window.
* * title - The title of the number input modal, shown on the top of the TGUI window.
- * * default - The default (or current) key, shown as a placeholder.
+ * * default - The default (or current) key, shown as a placeholder.
*/
/proc/tgui_input_keycombo(mob/user = usr, message, title = "Key Input", default = 0, timeout = 0, ui_state = GLOB.always_state)
if (!istype(user))
@@ -107,7 +107,7 @@
data["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS))
return data
-/datum/tgui_input_keycombo/ui_act(action, list/params)
+/datum/tgui_input_keycombo/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if (.)
return
diff --git a/code/modules/tgui_input/list.dm b/code/modules/tgui_input/list.dm
index 22c6d48edfc5a..fcee265e5a8b4 100644
--- a/code/modules/tgui_input/list.dm
+++ b/code/modules/tgui_input/list.dm
@@ -137,7 +137,7 @@
data["timeout"] = clamp((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS), 0, 1)
return data
-/datum/tgui_list_input/ui_act(action, list/params)
+/datum/tgui_list_input/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if (.)
return
diff --git a/code/modules/tgui_input/number.dm b/code/modules/tgui_input/number.dm
index 68998acb0331f..0266610b84c99 100644
--- a/code/modules/tgui_input/number.dm
+++ b/code/modules/tgui_input/number.dm
@@ -136,7 +136,7 @@
data["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS))
return data
-/datum/tgui_input_number/ui_act(action, list/params)
+/datum/tgui_input_number/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if (.)
return
diff --git a/code/modules/tgui_input/text.dm b/code/modules/tgui_input/text.dm
index 806696dcf4f44..ec94fbd6766ac 100644
--- a/code/modules/tgui_input/text.dm
+++ b/code/modules/tgui_input/text.dm
@@ -133,7 +133,7 @@
data["timeout"] = CLAMP01((timeout - (world.time - start_time) - 1 SECONDS) / (timeout - 1 SECONDS))
return data
-/datum/tgui_input_text/ui_act(action, list/params)
+/datum/tgui_input_text/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if (.)
return
diff --git a/code/modules/transport/elevator/elev_panel.dm b/code/modules/transport/elevator/elev_panel.dm
index 0b5e99bdbb059..659049a7448ca 100644
--- a/code/modules/transport/elevator/elev_panel.dm
+++ b/code/modules/transport/elevator/elev_panel.dm
@@ -299,7 +299,7 @@
return data
-/obj/machinery/elevator_control_panel/ui_act(action, list/params)
+/obj/machinery/elevator_control_panel/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/transport/tram/tram_controller.dm b/code/modules/transport/tram/tram_controller.dm
index 1323953de78f7..11b3bbcdec9e9 100644
--- a/code/modules/transport/tram/tram_controller.dm
+++ b/code/modules/transport/tram/tram_controller.dm
@@ -1096,7 +1096,7 @@
return data
-/obj/machinery/transport/tram_controller/ui_act(action, params)
+/obj/machinery/transport/tram_controller/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if (.)
return
diff --git a/code/modules/transport/tram/tram_controls.dm b/code/modules/transport/tram/tram_controls.dm
index 0bfce56aa5c96..308e58cf5f049 100644
--- a/code/modules/transport/tram/tram_controls.dm
+++ b/code/modules/transport/tram/tram_controls.dm
@@ -130,7 +130,7 @@
this_destination["id"] = destination.platform_code
. += list(this_destination)
-/obj/machinery/computer/tram_controls/ui_act(action, params)
+/obj/machinery/computer/tram_controls/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/transport/tram/tram_signals.dm b/code/modules/transport/tram/tram_signals.dm
index faf4a46e11e28..a5d309b8378b0 100644
--- a/code/modules/transport/tram/tram_signals.dm
+++ b/code/modules/transport/tram/tram_signals.dm
@@ -150,8 +150,8 @@
. += span_notice("The orange [EXAMINE_HINT("remote warning")] light is on.")
. += span_notice("The status display reads: Check track sensor.")
if(TRANSPORT_REMOTE_FAULT)
- . += span_notice("The blue [EXAMINE_HINT("remote fault")] light is on.")
- . += span_notice("The status display reads: Check tram controller.")
+ . += span_notice("The blue [EXAMINE_HINT("telecoms failure")] light is on.")
+ . += span_notice("The status display reads: Check telecommunications network.")
if(TRANSPORT_LOCAL_FAULT)
. += span_notice("The red [EXAMINE_HINT("local fault")] light is on.")
. += span_notice("The status display reads: Repair required.")
@@ -246,10 +246,10 @@
operating_status = TRANSPORT_REMOTE_FAULT
else
operating_status = TRANSPORT_SYSTEM_NORMAL
+ if(isnull(linked_sensor))
+ link_sensor()
+ wake_sensor()
- if(isnull(linked_sensor))
- link_sensor()
- wake_sensor()
update_operating()
/obj/machinery/transport/crossing_signal/on_set_machine_stat()
@@ -304,6 +304,8 @@
// degraded signal operating conditions of any type show blue
var/idle_aspect = operating_status == TRANSPORT_SYSTEM_NORMAL ? XING_STATE_GREEN : XING_STATE_MALF
var/datum/transport_controller/linear/tram/tram = transport_ref?.resolve()
+ if(tram.controller_status & COMM_ERROR)
+ idle_aspect = XING_STATE_MALF
// Check for stopped states. Will kill the process since tram starting up will restart process.
if(!tram || !tram.controller_operational || !tram.controller_active || !is_operational || !inbound || !outbound)
diff --git a/code/modules/transport/transport_module.dm b/code/modules/transport/transport_module.dm
index af8f4199438db..01a3493130501 100644
--- a/code/modules/transport/transport_module.dm
+++ b/code/modules/transport/transport_module.dm
@@ -612,7 +612,7 @@
if(!isliving(user))
return FALSE
// Gotta be awake and aware
- if(user.incapacitated())
+ if(user.incapacitated)
return FALSE
// Maintain the god given right to fight an elevator
if(user.combat_mode)
@@ -704,7 +704,7 @@
* * boolean, FALSE if the menu should be closed, TRUE if the menu is clear to stay opened.
*/
/obj/structure/transport/linear/proc/check_menu(mob/user, starting_loc)
- if(user.incapacitated() || !user.Adjacent(src) || starting_loc != src.loc)
+ if(user.incapacitated || !user.Adjacent(src) || starting_loc != src.loc)
return FALSE
return TRUE
diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm
index a42c25dc94ee1..95b7f4a4634d8 100644
--- a/code/modules/unit_tests/_unit_tests.dm
+++ b/code/modules/unit_tests/_unit_tests.dm
@@ -107,6 +107,7 @@
#include "breath.dm"
#include "burning.dm"
#include "cable_powernets.dm"
+#include "can_see.dm"
#include "card_mismatch.dm"
#include "cardboard_cutouts.dm"
#include "cargo_dep_order_locations.dm"
@@ -150,6 +151,7 @@
#include "gas_transfer.dm"
#include "get_turf_pixel.dm"
#include "geyser.dm"
+#include "gloves_and_shoes_armor.dm"
#include "greyscale_config.dm"
#include "hallucination_icons.dm"
#include "heretic_knowledge.dm"
diff --git a/code/modules/unit_tests/can_see.dm b/code/modules/unit_tests/can_see.dm
new file mode 100644
index 0000000000000..cb7f7bef047ee
--- /dev/null
+++ b/code/modules/unit_tests/can_see.dm
@@ -0,0 +1,7 @@
+/// Unit test to make sure can_see is working properly
+/datum/unit_test/can_see_test
+
+/datum/unit_test/can_see_test/Run()
+ var/mob/living/carbon/human/observer = allocate(/mob/living/carbon/human/consistent, run_loc_floor_bottom_left) //make sure they're both apart
+ var/mob/living/carbon/human/to_be_seen = allocate(/mob/living/carbon/human/consistent, run_loc_floor_top_right)
+ TEST_ASSERT(can_see(observer, to_be_seen, get_dist(observer, to_be_seen)), "can_see returned false despite dummies being able to see one another!")
diff --git a/code/modules/unit_tests/fish_unit_tests.dm b/code/modules/unit_tests/fish_unit_tests.dm
index 5cb582ca9694a..2fb2487f7810d 100644
--- a/code/modules/unit_tests/fish_unit_tests.dm
+++ b/code/modules/unit_tests/fish_unit_tests.dm
@@ -1,5 +1,21 @@
#define TRAIT_FISH_TESTING "made_you_read_this"
+///Ensures that all fish have an aquarium icon state and that sprite_width and sprite_height have been set.
+/datum/unit_test/fish_aquarium_icons
+
+/datum/unit_test/fish_aquarium_icons/Run()
+ for(var/obj/item/fish/fish as anything in subtypesof(/obj/item/fish))
+ if(ispath(fish, /obj/item/fish/testdummy)) //We don't care about unit test fish.
+ continue
+ var/init_icon = fish::dedicated_in_aquarium_icon
+ var/init_icon_state = fish::dedicated_in_aquarium_icon_state || "[fish::icon_state]_small"
+ if(!icon_exists(init_icon, init_icon_state))
+ TEST_FAIL("[fish] with doesn't have a \"[init_icon_state]\" aquarium icon state in [init_icon]. Please make one.")
+ if(!fish::sprite_width)
+ TEST_FAIL("[fish] doesn't have a set sprite_width.")
+ if(!fish::sprite_height)
+ TEST_FAIL("[fish] doesn't have a set sprite_height.")
+
///Checks that things associated with fish size and weight work correctly.
/datum/unit_test/fish_size_weight
@@ -76,10 +92,11 @@
incompatible_traits = list(/datum/fish_trait/dummy/two)
inheritability = 100
diff_traits_inheritability = 100
+ reagents_to_add = list(/datum/reagent = 10)
/datum/fish_trait/dummy/apply_to_fish(obj/item/fish/fish)
+ . = ..()
ADD_TRAIT(fish, TRAIT_FISH_TESTING, FISH_TRAIT_DATUM)
- fish.grind_results[/datum/reagent] = 10
/datum/fish_trait/dummy/two
incompatible_traits = list(/datum/fish_trait/dummy)
@@ -259,15 +276,17 @@
/datum/unit_test/explosive_fishing/Run()
var/datum/fish_source/source = GLOB.preset_fish_sources[/datum/fish_source/unit_test]
source.spawn_reward_from_explosion(run_loc_floor_bottom_left, 1)
- if(length(source.fish_table))
+ if(source.fish_counts[/obj/item/wrench])
TEST_FAIL("The unit test item wasn't removed/spawned from fish_table during 'spawn_reward_from_explosion'.")
/datum/fish_source/unit_test
fish_table = list(
/obj/item/wrench = 1,
+ /obj/item/screwdriver = INFINITY,
)
fish_counts = list(
/obj/item/wrench = 1,
+ /obj/item/screwdriver = 0,
)
#undef TRAIT_FISH_TESTING
diff --git a/code/modules/unit_tests/gloves_and_shoes_armor.dm b/code/modules/unit_tests/gloves_and_shoes_armor.dm
new file mode 100644
index 0000000000000..fc67b21537e0b
--- /dev/null
+++ b/code/modules/unit_tests/gloves_and_shoes_armor.dm
@@ -0,0 +1,25 @@
+/// Checks if any gloves or shoes that have non bio/fire/acid armor haven't been marked with ARMS or LEGS coverage respectively
+/datum/unit_test/gloves_and_shoes_armor
+
+/datum/unit_test/gloves_and_shoes_armor/Run()
+ for (var/obj/item/clothing/gloves/gloves as anything in subtypesof(/obj/item/clothing/gloves))
+ var/datum/armor/armor = gloves::armor_type
+ if (!armor)
+ continue
+
+ if (gloves::body_parts_covered != HANDS)
+ continue
+
+ if (armor::melee || armor::bomb || armor::energy || armor::laser || armor::bullet || armor::wound)
+ TEST_FAIL("[gloves] has non-bio/acid/fire armor but doesn't cover non-hand bodyparts.")
+
+ for (var/obj/item/clothing/shoes/shoes as anything in subtypesof(/obj/item/clothing/shoes))
+ var/datum/armor/armor = shoes::armor_type
+ if (!armor)
+ continue
+
+ if (shoes::body_parts_covered != FEET)
+ continue
+
+ if (armor::melee || armor::bomb || armor::energy || armor::laser || armor::bullet || armor::wound)
+ TEST_FAIL("[shoes] has non-bio/acid/fire armor but doesn't cover non-feet bodyparts.")
diff --git a/code/modules/unit_tests/mecha_damage.dm b/code/modules/unit_tests/mecha_damage.dm
index dc5f4ecae8a1d..9dd82dddc41ec 100644
--- a/code/modules/unit_tests/mecha_damage.dm
+++ b/code/modules/unit_tests/mecha_damage.dm
@@ -25,7 +25,8 @@
// Get a sample "melee" weapon.
// The energy axe is chosen here due to having a high base force, to make sure we get over the equipment DT.
var/obj/item/dummy_melee = allocate(/obj/item/melee/energy/axe)
- var/expected_melee_damage = round(dummy_melee.force * (1 - expected_melee_armor / 100) * dummy_melee.demolition_mod, DAMAGE_PRECISION)
+ dummy_melee.force = 150
+ var/expected_melee_damage = round(dummy_melee.force * (1 - expected_melee_armor / 100) * dummy_melee.demolition_mod * demo_mech.facing_modifiers[MECHA_FRONT_ARMOUR], DAMAGE_PRECISION)
// Get a sample laser weapon.
// The captain's laser gun here is chosen primarily because it deals more damage than normal lasers.
diff --git a/code/modules/unit_tests/outfit_sanity.dm b/code/modules/unit_tests/outfit_sanity.dm
index 36fc4570540f4..d0de12a7b204b 100644
--- a/code/modules/unit_tests/outfit_sanity.dm
+++ b/code/modules/unit_tests/outfit_sanity.dm
@@ -87,4 +87,13 @@
if (!H.equip_to_slot_or_del(new path(H), ITEM_SLOT_BACKPACK, TRUE, indirect_action = TRUE))
TEST_FAIL("[outfit.name]'s backpack_contents are invalid! Couldn't add [path] to backpack.")
+ if (outfit.belt_contents)
+ var/list/belt_contents = outfit.belt_contents?.Copy()
+ for (var/path in belt_contents)
+ var/number = belt_contents[path] || 1
+ for (var/_ in 1 to number)
+ if (!H.equip_to_slot_or_del(new path(H), ITEM_SLOT_BELTPACK, TRUE, indirect_action = TRUE))
+ TEST_FAIL("[outfit.name]'s belt_contents are invalid! Couldn't add [path] to backpack.")
+
+
#undef CHECK_OUTFIT_SLOT
diff --git a/code/modules/unit_tests/say.dm b/code/modules/unit_tests/say.dm
index 7536392e70cd4..a845b6ccf9886 100644
--- a/code/modules/unit_tests/say.dm
+++ b/code/modules/unit_tests/say.dm
@@ -237,9 +237,9 @@
// Normally speaking, if there isn't a functional telecomms array on the same z-level, then handheld radios
// have a short delay before sending the message. We use the centcom frequency to get around this.
speaker_radio.set_frequency(FREQ_CENTCOM)
- speaker_radio.independent = TRUE
+ speaker_radio.special_channels = RADIO_SPECIAL_CENTCOM
listener_radio.set_frequency(FREQ_CENTCOM)
- listener_radio.independent = TRUE
+ listener_radio.special_channels = RADIO_SPECIAL_CENTCOM
var/pangram_quote = "The quick brown fox jumps over the lazy dog"
diff --git a/code/modules/unit_tests/unit_test.dm b/code/modules/unit_tests/unit_test.dm
index ed2510b829434..84c0fa20a678b 100644
--- a/code/modules/unit_tests/unit_test.dm
+++ b/code/modules/unit_tests/unit_test.dm
@@ -112,6 +112,16 @@ GLOBAL_VAR_INIT(focused_tests, focused_tests())
allocated += instance
return instance
+/// Resets the air of our testing room to its default
+/datum/unit_test/proc/restore_atmos()
+ var/area/working_area = run_loc_floor_bottom_left.loc
+ var/list/turf/to_restore = working_area.get_turfs_from_all_zlevels()
+ for(var/turf/open/restore in to_restore)
+ var/datum/gas_mixture/GM = SSair.parse_gas_string(restore.initial_gas_mix, /datum/gas_mixture/turf)
+ restore.copy_air(GM)
+ restore.temperature = initial(restore.temperature)
+ restore.air_update_turf(update = FALSE, remove = FALSE)
+
/datum/unit_test/proc/test_screenshot(name, icon/icon)
if (!istype(icon))
TEST_FAIL("[icon] is not an icon.")
@@ -179,6 +189,7 @@ GLOBAL_VAR_INIT(focused_tests, focused_tests())
else
test.Run()
+ test.restore_atmos()
duration = REALTIMEOFDAY - duration
GLOB.current_test = null
diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
index 7e501217eb68c..0d347709536ee 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -172,6 +172,8 @@
ADD_TRAIT(created, TRAIT_CONTRABAND, INNATE_TRAIT)
for(var/obj/contained as anything in created.get_all_contents())
ADD_TRAIT(contained, TRAIT_CONTRABAND, INNATE_TRAIT)
+
+ if(isgun(created))
replace_pin(created)
else if(istype(created, /obj/item/storage/toolbox/guncase))
for(var/obj/item/gun/gun in created)
diff --git a/code/modules/uplink/uplink_items/badass.dm b/code/modules/uplink/uplink_items/badass.dm
index 08cf3affe0741..5c5e0390b5046 100644
--- a/code/modules/uplink/uplink_items/badass.dm
+++ b/code/modules/uplink/uplink_items/badass.dm
@@ -91,7 +91,7 @@
/datum/uplink_item/badass/stickers
name = "Syndicate Sticker Pack"
desc = "Contains 8 random stickers precisely engineered to resemble suspicious objects, which may or may not be useful for fooling crew."
- item = /obj/item/storage/box/syndie_kit/stickers
+ item = /obj/item/storage/box/stickers/syndie_kit
cost = 1
/datum/uplink_item/badass/demotivational_posters
diff --git a/code/modules/uplink/uplink_items/job.dm b/code/modules/uplink/uplink_items/job.dm
index b64e8a11706b4..be9d558687d8c 100644
--- a/code/modules/uplink/uplink_items/job.dm
+++ b/code/modules/uplink/uplink_items/job.dm
@@ -389,5 +389,6 @@
restricted_roles = list(JOB_MIME)
restricted = TRUE
refundable = FALSE
+ progression_minimum = 30 MINUTES
purchasable_from = parent_type::purchasable_from & ~UPLINK_SPY
diff --git a/code/modules/uplink/uplink_items/stealthy.dm b/code/modules/uplink/uplink_items/stealthy.dm
index e4c4de412fb44..6bd315498afa1 100644
--- a/code/modules/uplink/uplink_items/stealthy.dm
+++ b/code/modules/uplink/uplink_items/stealthy.dm
@@ -29,6 +29,12 @@
item = /obj/item/pen/edagger
cost = 2
+/datum/uplink_item/stealthy_weapons/slipstick
+ name = "Syndie Lipstick"
+ desc = "Stylish way to kiss to death, isn't it syndiekisser?"
+ item = /obj/item/lipstick/syndie
+ cost = 6
+
/datum/uplink_item/stealthy_weapons/traitor_chem_bottle
name = "Poison Kit"
desc = "An assortment of deadly chemicals packed into a compact box. Comes with a syringe for more precise application."
diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm
index d28b510328a98..846d6a6434b1e 100644
--- a/code/modules/vehicles/mecha/_mecha.dm
+++ b/code/modules/vehicles/mecha/_mecha.dm
@@ -586,7 +586,7 @@
/obj/vehicle/sealed/mecha/proc/process_occupants(seconds_per_tick)
for(var/mob/living/occupant as anything in occupants)
- if(!(mecha_flags & IS_ENCLOSED) && occupant?.incapacitated()) //no sides mean it's easy to just sorta fall out if you're incapacitated.
+ if(!(mecha_flags & IS_ENCLOSED) && occupant?.incapacitated) //no sides mean it's easy to just sorta fall out if you're incapacitated.
mob_exit(occupant, randomstep = TRUE) //bye bye
continue
if(cell && cell.maxcharge)
@@ -658,7 +658,7 @@
if(phasing)
balloon_alert(user, "not while [phasing]!")
return
- if(user.incapacitated())
+ if(user.incapacitated)
return
if(!get_charge())
return
diff --git a/code/modules/vehicles/mecha/combat/durand.dm b/code/modules/vehicles/mecha/combat/durand.dm
index c6fcae75bc98f..a466bc30d2245 100644
--- a/code/modules/vehicles/mecha/combat/durand.dm
+++ b/code/modules/vehicles/mecha/combat/durand.dm
@@ -50,7 +50,7 @@
/obj/vehicle/sealed/mecha/durand/process()
. = ..()
- if(defense_mode && !use_energy(100 KILO JOULES)) //Defence mode can only be on with a occupant so we check if one of them can toggle it and toggle
+ if(defense_mode && !use_energy(0.01 * STANDARD_CELL_CHARGE)) //Defence mode can only be on with a occupant so we check if one of them can toggle it and toggle
for(var/O in occupants)
var/mob/living/occupant = O
var/datum/action/action = LAZYACCESSASSOC(occupant_actions, occupant, /datum/action/vehicle/sealed/mecha/mech_defense_mode)
@@ -82,7 +82,6 @@
stack_trace("Durand triggered relay without a shield")
shield = new /obj/durand_shield(loc, src, layer)
shield.setDir(dir)
- SEND_SIGNAL(shield, COMSIG_MECHA_ACTION_TRIGGER, owner, signal_args)
//Redirects projectiles to the shield if defense_check decides they should be blocked and returns true.
/obj/vehicle/sealed/mecha/durand/proc/prehit(obj/projectile/source, list/signal_args)
@@ -144,6 +143,8 @@ Expects a turf. Returns true if the attack should be blocked, false if not.*/
button_icon_state = "mech_defense_mode_off"
/datum/action/vehicle/sealed/mecha/mech_defense_mode/Trigger(trigger_flags, forced_state = FALSE)
+ if(!owner || !chassis || !(owner in chassis.occupants))
+ return
SEND_SIGNAL(chassis, COMSIG_MECHA_ACTION_TRIGGER, owner, args) //Signal sent to the mech, to be handed to the shield. See durand.dm for more details
////////////////////////////
@@ -165,9 +166,9 @@ own integrity back to max. Shield is automatically dropped if we run out of powe
max_integrity = 10000
anchored = TRUE
light_system = OVERLAY_LIGHT
- light_range = MINIMUM_USEFUL_LIGHT_RANGE
- light_power = 2
- light_color = LIGHT_COLOR_ELECTRIC_CYAN
+ light_range = 2.8
+ light_power = 1
+ light_color = LIGHT_COLOR_FAINT_CYAN
light_on = FALSE
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF //The shield should not take damage from fire, lava, or acid; that's the mech's job.
///Our link back to the durand
@@ -181,7 +182,7 @@ own integrity back to max. Shield is automatically dropped if we run out of powe
src.layer = ABOVE_MOB_LAYER
SET_PLANE_IMPLICIT(src, plane)
setDir(dir)
- RegisterSignal(src, COMSIG_MECHA_ACTION_TRIGGER, PROC_REF(activate))
+ RegisterSignal(chassis, COMSIG_MECHA_ACTION_TRIGGER, PROC_REF(activate))
RegisterSignal(chassis, COMSIG_MOVABLE_UPDATE_GLIDE_SIZE, PROC_REF(shield_glide_size_update))
/obj/durand_shield/Destroy()
diff --git a/code/modules/vehicles/mecha/equipment/tools/radio.dm b/code/modules/vehicles/mecha/equipment/tools/radio.dm
index 33a113a8274f5..18740fc22b9bd 100644
--- a/code/modules/vehicles/mecha/equipment/tools/radio.dm
+++ b/code/modules/vehicles/mecha/equipment/tools/radio.dm
@@ -36,7 +36,7 @@
return TRUE
if("set_frequency")
var/new_frequency = text2num(params["new_frequency"])
- radio.set_frequency(sanitize_frequency(new_frequency, radio.freerange, radio.syndie))
+ radio.set_frequency(sanitize_frequency(new_frequency, radio.freerange, (radio.special_channels & RADIO_SPECIAL_SYNDIE)))
return TRUE
return FALSE
diff --git a/code/modules/vehicles/mecha/equipment/tools/work_tools.dm b/code/modules/vehicles/mecha/equipment/tools/work_tools.dm
index 34216db38d3cd..c19aede50d93b 100644
--- a/code/modules/vehicles/mecha/equipment/tools/work_tools.dm
+++ b/code/modules/vehicles/mecha/equipment/tools/work_tools.dm
@@ -55,7 +55,7 @@
if(istype(target, /obj/machinery/door/firedoor) || istype(target, /obj/machinery/door/airlock))
var/obj/machinery/door/target_door = target
playsound(chassis, clampsound, 50, FALSE, -6)
- target_door.try_to_crowbar(src, source)
+ target_door.try_to_crowbar(src, source, TRUE)
return ..()
if(isobj(target))
diff --git a/code/modules/vehicles/mecha/mech_bay.dm b/code/modules/vehicles/mecha/mech_bay.dm
index 5166b9c5fdfc5..c9f0aa20fa736 100644
--- a/code/modules/vehicles/mecha/mech_bay.dm
+++ b/code/modules/vehicles/mecha/mech_bay.dm
@@ -114,7 +114,7 @@
ui = new(user, src, "MechBayPowerConsole", name)
ui.open()
-/obj/machinery/computer/mech_bay_power_console/ui_act(action, params)
+/obj/machinery/computer/mech_bay_power_console/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/vehicles/mecha/mech_fabricator.dm b/code/modules/vehicles/mecha/mech_fabricator.dm
index b4c292202542e..b167f38141594 100644
--- a/code/modules/vehicles/mecha/mech_fabricator.dm
+++ b/code/modules/vehicles/mecha/mech_fabricator.dm
@@ -427,7 +427,7 @@
return data
-/obj/machinery/mecha_part_fabricator/ui_act(action, list/params)
+/obj/machinery/mecha_part_fabricator/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
diff --git a/code/modules/vehicles/mecha/mecha_control_console.dm b/code/modules/vehicles/mecha/mecha_control_console.dm
index 3b465994e9e02..d31bd5a5bd290 100644
--- a/code/modules/vehicles/mecha/mecha_control_console.dm
+++ b/code/modules/vehicles/mecha/mecha_control_console.dm
@@ -45,7 +45,7 @@
return data
-/obj/machinery/computer/mecha/ui_act(action, params)
+/obj/machinery/computer/mecha/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/vehicles/mecha/mecha_defense.dm b/code/modules/vehicles/mecha/mecha_defense.dm
index 912993d1ee640..1237c931b33a5 100644
--- a/code/modules/vehicles/mecha/mecha_defense.dm
+++ b/code/modules/vehicles/mecha/mecha_defense.dm
@@ -317,7 +317,7 @@
if(!attacking_item.force)
return
- var/damage_taken = take_damage(attacking_item.force * attacking_item.demolition_mod, attacking_item.damtype, MELEE, 1)
+ var/damage_taken = take_damage(attacking_item.force * attacking_item.demolition_mod, attacking_item.damtype, MELEE, 1, get_dir(src, user))
try_damage_component(damage_taken, user.zone_selected)
var/hit_verb = length(attacking_item.attack_verb_simple) ? "[pick(attacking_item.attack_verb_simple)]" : "hit"
diff --git a/code/modules/vehicles/mecha/mecha_mob_interaction.dm b/code/modules/vehicles/mecha/mecha_mob_interaction.dm
index 7a9141e80c1a7..a1e398f6f90cf 100644
--- a/code/modules/vehicles/mecha/mecha_mob_interaction.dm
+++ b/code/modules/vehicles/mecha/mecha_mob_interaction.dm
@@ -20,7 +20,7 @@
moved_inside(M)
/obj/vehicle/sealed/mecha/enter_checks(mob/M)
- if(M.incapacitated())
+ if(M.incapacitated)
return FALSE
if(atom_integrity <= 0)
to_chat(M, span_warning("You cannot get in the [src], it has been destroyed!"))
diff --git a/code/modules/vehicles/mecha/mecha_ui.dm b/code/modules/vehicles/mecha/mecha_ui.dm
index 1113a85381361..3c06c901e4e1f 100644
--- a/code/modules/vehicles/mecha/mecha_ui.dm
+++ b/code/modules/vehicles/mecha/mecha_ui.dm
@@ -121,26 +121,26 @@
))
if(ui_selected_module_index == module_index)
ui_selected_module_index = null
- continue
- var/obj/item/mecha_parts/mecha_equipment/module = islist(equipment) ? equipment[i] : equipment
- data += list(list(
- "slot" = category,
- "icon" = module.icon_state,
- "name" = module.name,
- "desc" = module.desc,
- "detachable" = module.detachable,
- "integrity" = (module.get_integrity()/module.max_integrity),
- "can_be_toggled" = module.can_be_toggled,
- "can_be_triggered" = module.can_be_triggered,
- "active" = module.active,
- "active_label" = module.active_label,
- "equip_cooldown" = module.equip_cooldown && DisplayTimeText(module.equip_cooldown),
- "energy_per_use" = module.energy_drain,
- "snowflake" = module.get_snowflake_data(),
- "ref" = REF(module),
- ))
- if(isnull(ui_selected_module_index))
- ui_selected_module_index = module_index
+ else
+ var/obj/item/mecha_parts/mecha_equipment/module = islist(equipment) ? equipment[i] : equipment
+ data += list(list(
+ "slot" = category,
+ "icon" = module.icon_state,
+ "name" = module.name,
+ "desc" = module.desc,
+ "detachable" = module.detachable,
+ "integrity" = (module.get_integrity()/module.max_integrity),
+ "can_be_toggled" = module.can_be_toggled,
+ "can_be_triggered" = module.can_be_triggered,
+ "active" = module.active,
+ "active_label" = module.active_label,
+ "equip_cooldown" = module.equip_cooldown && DisplayTimeText(module.equip_cooldown),
+ "energy_per_use" = module.energy_drain,
+ "snowflake" = module.get_snowflake_data(),
+ "ref" = REF(module),
+ ))
+ if(isnull(ui_selected_module_index))
+ ui_selected_module_index = module_index
module_index++
return data
diff --git a/code/modules/vehicles/mecha/working/clarke.dm b/code/modules/vehicles/mecha/working/clarke.dm
index 2ec0b4a473648..0acfa2749a5bd 100644
--- a/code/modules/vehicles/mecha/working/clarke.dm
+++ b/code/modules/vehicles/mecha/working/clarke.dm
@@ -77,22 +77,26 @@
/obj/item/mecha_parts/mecha_equipment/orebox_manager/get_snowflake_data()
var/list/contents = chassis.ore_box?.contents
var/list/contents_grouped = list()
- for(var/obj/item/stack/ore/item as anything in contents)
+ for(var/atom/movable/item as anything in contents)
+ var/amount = 1
+ if(isstack(item))
+ var/obj/item/stack/stack = item
+ amount = stack.amount
if(isnull(contents_grouped[item.icon_state]))
var/ore_data = list()
ore_data["name"] = item.name
ore_data["icon"] = item.icon_state
- ore_data["amount"] = item.amount
+ ore_data["amount"] = amount
contents_grouped[item.icon_state] = ore_data
else
- contents_grouped[item.icon_state]["amount"] += item.amount
+ contents_grouped[item.icon_state]["amount"] += amount
var/list/data = list(
"snowflake_id" = MECHA_SNOWFLAKE_ID_OREBOX_MANAGER,
"contents" = contents_grouped,
)
return data
-/obj/item/mecha_parts/mecha_equipment/orebox_manager/ui_act(action, list/params)
+/obj/item/mecha_parts/mecha_equipment/orebox_manager/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return TRUE
diff --git a/code/modules/vehicles/mecha/working/ripley.dm b/code/modules/vehicles/mecha/working/ripley.dm
index 754a6b820d721..f5c55f613ee10 100644
--- a/code/modules/vehicles/mecha/working/ripley.dm
+++ b/code/modules/vehicles/mecha/working/ripley.dm
@@ -338,7 +338,7 @@ GLOBAL_DATUM(cargo_ripley, /obj/vehicle/sealed/mecha/ripley/cargo)
))
return data
-/obj/item/mecha_parts/mecha_equipment/ejector/ui_act(action, list/params)
+/obj/item/mecha_parts/mecha_equipment/ejector/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return TRUE
@@ -382,7 +382,7 @@ GLOBAL_DATUM(cargo_ripley, /obj/vehicle/sealed/mecha/ripley/cargo)
to_chat(source, span_warning("You don't have the room to remove [cuffs]!"))
return COMSIG_MOB_BLOCK_CUFF_REMOVAL
-/obj/item/mecha_parts/mecha_equipment/ejector/seccage/ui_act(action, list/params)
+/obj/item/mecha_parts/mecha_equipment/ejector/seccage/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
if(action == "eject")
var/mob/passenger = locate(params["cargoref"]) in contents
if(!passenger)
diff --git a/code/modules/vehicles/scooter.dm b/code/modules/vehicles/scooter.dm
index 82146976ad1f8..25e8ed9740943 100644
--- a/code/modules/vehicles/scooter.dm
+++ b/code/modules/vehicles/scooter.dm
@@ -169,7 +169,7 @@
pick_up_board(skater)
/obj/vehicle/ridden/scooter/skateboard/proc/pick_up_board(mob/living/carbon/skater)
- if (skater.incapacitated() || !Adjacent(skater))
+ if (skater.incapacitated || !Adjacent(skater))
return
if(has_buckled_mobs())
to_chat(skater, span_warning("You can't lift this up when somebody's on it."))
diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm
index 2a27433bdee6d..9299c77347d8c 100644
--- a/code/modules/vending/_vending.dm
+++ b/code/modules/vending/_vending.dm
@@ -831,7 +831,7 @@ GLOBAL_LIST_EMPTY(vending_machines_to_restock)
* Args:
* * turf/target: The turf to fall onto. Cannot be null.
* * damage: The raw numerical damage to do by default.
- * * chance_to_crit: The percent chance of a critical hit occuring. Default: 0
+ * * chance_to_crit: The percent chance of a critical hit occurring. Default: 0
* * forced_crit_case: If given a value from crushing.dm, [target] and its contents will always be hit with that specific critical hit. Default: null
* * paralyze_time: The time, in deciseconds, a given mob/living will be paralyzed for if crushed.
* * crush_dir: The direction the crush is coming from. Default: dir of src to [target].
@@ -988,7 +988,7 @@ GLOBAL_LIST_EMPTY(vending_machines_to_restock)
var/list/weighted_crits = list()
weighted_crits[CRUSH_CRIT_SHATTER_LEGS] = 100
- weighted_crits[CRUSH_CRIT_PARAPALEGIC] = 80
+ weighted_crits[CRUSH_CRIT_PARAPLEGIC] = 80
weighted_crits[CRUSH_CRIT_HEADGIB] = 20
weighted_crits[CRUSH_CRIT_SQUISH_LIMB] = 100
@@ -1027,7 +1027,7 @@ GLOBAL_LIST_EMPTY(vending_machines_to_restock)
if(left_leg || right_leg)
carbon_target.visible_message(span_danger("[carbon_target]'s legs shatter with a sickening crunch!"), span_userdanger("Your legs shatter with a sickening crunch!"))
return TRUE
- if(CRUSH_CRIT_PARAPALEGIC) // paralyze this binch
+ if(CRUSH_CRIT_PARAPLEGIC) // paralyze this binch
// the new paraplegic gets like 4 lines of losing their legs so skip them
if (!iscarbon(atom_target))
return FALSE
@@ -1184,17 +1184,19 @@ GLOBAL_LIST_EMPTY(vending_machines_to_restock)
return TRUE
/obj/machinery/vending/interact(mob/user)
- if (!HAS_AI_ACCESS(user))
- if(seconds_electrified && !(machine_stat & NOPOWER))
- if(shock(user, 100))
- return
+ if (HAS_AI_ACCESS(user))
+ return ..()
- if(tilted && !user.buckled && !isAdminGhostAI(user))
- to_chat(user, span_notice("You begin righting [src]."))
- if(do_after(user, 5 SECONDS, target=src))
- untilt(user)
+ if(seconds_electrified && !(machine_stat & NOPOWER))
+ if(shock(user, 100))
return
+ if(tilted && !user.buckled)
+ to_chat(user, span_notice("You begin righting [src]."))
+ if(do_after(user, 5 SECONDS, target=src))
+ untilt(user)
+ return
+
return ..()
/obj/machinery/vending/attack_robot_secondary(mob/user, list/modifiers)
@@ -1317,7 +1319,7 @@ GLOBAL_LIST_EMPTY(vending_machines_to_restock)
.["extended_inventory"] = extended_inventory
-/obj/machinery/vending/ui_act(action, params)
+/obj/machinery/vending/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
@@ -1771,7 +1773,7 @@ GLOBAL_LIST_EMPTY(vending_machines_to_restock)
)
.["vending_machine_input"] += list(data)
-/obj/machinery/vending/custom/ui_act(action, params)
+/obj/machinery/vending/custom/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm
index 8b9f704569545..8211b05553d8b 100644
--- a/code/modules/vending/autodrobe.dm
+++ b/code/modules/vending/autodrobe.dm
@@ -195,13 +195,14 @@ GLOBAL_LIST_INIT(autodrobe_contraband_items, list(
/obj/item/clothing/head/costume/powdered_wig = 1,
/obj/item/clothing/head/costume/tv_head = 1,
/obj/item/clothing/mask/muzzle = 2,
- /obj/item/clothing/shoes/ducky_shoes = 1,
/obj/item/clothing/shoes/clown_shoes/meown_shoes = 1,
/obj/item/clothing/shoes/clown_shoes/moffers = 1,
+ /obj/item/clothing/shoes/ducky_shoes = 1,
/obj/item/clothing/suit/costume/judgerobe = 1,
/obj/item/clothing/head/costume/lobsterhat = 1,
/obj/item/clothing/under/costume/lobster = 1,
/obj/item/gun/magic/wand/nothing = 2,
+ /obj/item/skillchip/musical = 3,
/obj/item/storage/box/tape_wizard = 1,
))
diff --git a/code/modules/vending/cytopro.dm b/code/modules/vending/cytopro.dm
new file mode 100644
index 0000000000000..ce351be7769da
--- /dev/null
+++ b/code/modules/vending/cytopro.dm
@@ -0,0 +1,35 @@
+/obj/machinery/vending/cytopro
+ name = "\improper CytoPro"
+ desc = "For all your cytology needs!"
+ product_slogans = "Cloning? Don't be ridiculous.;Don't be uncultured, get some cells growing!;Who needs farms when we got vats?"
+ product_ads = "Grow your own little creatures!;Biology, at your fingertips!"
+ icon_state = "cytopro"
+ icon_deny = "cytopro-deny"
+ panel_type = "panel2"
+ light_mask = "cytopro-light-mask"
+ products = list(
+ /obj/item/storage/bag/xeno = 5,
+ /obj/item/reagent_containers/condiment/protein = 10,
+ /obj/item/storage/box/swab = 3,
+ /obj/item/storage/box/petridish = 3,
+ /obj/item/storage/box/monkeycubes = 3,
+ /obj/item/biopsy_tool = 3,
+ /obj/item/clothing/under/rank/rnd/scientist = 5,
+ /obj/item/clothing/suit/toggle/labcoat/science = 5,
+ /obj/item/clothing/suit/bio_suit/scientist = 3,
+ /obj/item/clothing/head/bio_hood/scientist = 3,
+ /obj/item/reagent_containers/dropper = 5,
+ /obj/item/reagent_containers/syringe = 5,
+ /obj/item/petri_dish/random = 6,
+ )
+ contraband = list(
+ /obj/item/knife/kitchen = 3,
+ )
+ refill_canister = /obj/item/vending_refill/cytopro
+ default_price = PAYCHECK_CREW * 1
+ extra_price = PAYCHECK_COMMAND * 0.5
+ payment_department = ACCOUNT_SCI
+
+/obj/item/vending_refill/cytopro
+ machine_name = "CytoPro"
+ icon_state = "refill_plant"
diff --git a/code/modules/vending/games.dm b/code/modules/vending/games.dm
index 33fefd08d2e79..d1a237eaf640f 100644
--- a/code/modules/vending/games.dm
+++ b/code/modules/vending/games.dm
@@ -58,6 +58,7 @@
/obj/item/skillchip/sabrage = 2,
/obj/item/skillchip/useless_adapter = 5,
/obj/item/skillchip/wine_taster = 2,
+ /obj/item/skillchip/big_pointer = 2,
),
),
list(
@@ -66,7 +67,7 @@
"products" = list(
/obj/item/camera = 3,
/obj/item/camera_film = 5,
- /obj/item/cardpack/resin = 20, //Both card packs have had their count raised to 20 from 10 until card persistance is implimented.
+ /obj/item/cardpack/resin = 20, //Both card packs have had their count raised to 20 from 10 until card persistence is implemented.
/obj/item/cardpack/series_one = 20,
/obj/item/dyespray = 3,
/obj/item/hourglass = 2,
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index 3b962490347a3..3d8a1f6cf60e2 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -331,7 +331,7 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
/obj/item/storage/backpack/satchel/explorer = 1,
/obj/item/storage/backpack/messenger/explorer = 1,
/obj/item/storage/bag/books = 1,
- /obj/item/radio/headset/headset_srv = 2,
+ /obj/item/radio/headset/headset_srvent = 2,
)
refill_canister = /obj/item/vending_refill/wardrobe/curator_wardrobe
payment_department = ACCOUNT_SRV
diff --git a/code/modules/wiremod/components/abstract/module.dm b/code/modules/wiremod/components/abstract/module.dm
index 4dd144b4c80e3..0622577016acc 100644
--- a/code/modules/wiremod/components/abstract/module.dm
+++ b/code/modules/wiremod/components/abstract/module.dm
@@ -237,7 +237,7 @@
#define WITHIN_RANGE(id, table) (id >= 1 && id <= length(table))
-/obj/item/circuit_component/module/ui_act(action, list/params)
+/obj/item/circuit_component/module/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/wiremod/components/action/pathfind.dm b/code/modules/wiremod/components/action/pathfind.dm
index 0de6d346db17f..6852905644775 100644
--- a/code/modules/wiremod/components/action/pathfind.dm
+++ b/code/modules/wiremod/components/action/pathfind.dm
@@ -24,7 +24,7 @@
// Cooldown to limit how frequently we can path to the same location.
var/same_path_cooldown = 5 SECONDS
- var/different_path_cooldown = 30 SECONDS
+ var/different_path_cooldown = 5 SECONDS
var/max_range = 60
diff --git a/code/modules/wiremod/components/admin/proccall.dm b/code/modules/wiremod/components/admin/proccall.dm
index b86e05e6c8a8b..594c0a6e7d1b6 100644
--- a/code/modules/wiremod/components/admin/proccall.dm
+++ b/code/modules/wiremod/components/admin/proccall.dm
@@ -114,7 +114,7 @@
arguments += add_input_port(data["name"], data["datatype"])
return ..()
-/obj/item/circuit_component/proccall/ui_act(action, list/params)
+/obj/item/circuit_component/proccall/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/wiremod/components/atom/health.dm b/code/modules/wiremod/components/atom/health.dm
index ee04030259e60..49798930d9768 100644
--- a/code/modules/wiremod/components/atom/health.dm
+++ b/code/modules/wiremod/components/atom/health.dm
@@ -43,7 +43,8 @@
var/mob/living/organism = input_port.value
var/turf/current_turf = get_location()
- if(!istype(organism) || get_dist(current_turf, organism) > max_range || current_turf.z != organism.z)
+ var/turf/target_location = get_turf(organism)
+ if(!istype(organism) || get_dist(current_turf, target_location) > max_range || current_turf.z != target_location.z)
brute.set_output(null)
burn.set_output(null)
toxin.set_output(null)
diff --git a/code/modules/wiremod/components/atom/health_state.dm b/code/modules/wiremod/components/atom/health_state.dm
index dc83a41fdfd8d..650311159415b 100644
--- a/code/modules/wiremod/components/atom/health_state.dm
+++ b/code/modules/wiremod/components/atom/health_state.dm
@@ -36,7 +36,8 @@
/obj/item/circuit_component/compare/health_state/do_comparisons()
var/mob/living/organism = input_port.value
var/turf/current_turf = get_location()
- if(!istype(organism) || current_turf.z != organism.z || get_dist(current_turf, organism) > max_range)
+ var/turf/target_location = get_turf(organism)
+ if(!istype(organism) || current_turf.z != target_location.z || get_dist(current_turf, target_location) > max_range)
return FALSE
var/current_option = state_option.value
diff --git a/code/modules/wiremod/components/bci/hud/target_intercept.dm b/code/modules/wiremod/components/bci/hud/target_intercept.dm
index bfdaec13122a0..2ee37e8ff4f3d 100644
--- a/code/modules/wiremod/components/bci/hud/target_intercept.dm
+++ b/code/modules/wiremod/components/bci/hud/target_intercept.dm
@@ -39,7 +39,7 @@
return
var/mob/living/owner = bci.owner
- if(!owner || !istype(owner) || !owner.client)
+ if(!owner || !istype(owner) || !owner.client || owner.stat >= SOFT_CRIT)
return
if(TIMER_COOLDOWN_RUNNING(parent.shell, COOLDOWN_CIRCUIT_TARGET_INTERCEPT))
diff --git a/code/modules/wiremod/components/bci/thought_listener.dm b/code/modules/wiremod/components/bci/thought_listener.dm
index ae6889e2da904..aa788b1a4be88 100644
--- a/code/modules/wiremod/components/bci/thought_listener.dm
+++ b/code/modules/wiremod/components/bci/thought_listener.dm
@@ -48,7 +48,7 @@
var/mob/living/owner = bci.owner
- if(!owner || !istype(owner) || !owner.client || (owner.stat >= UNCONSCIOUS))
+ if(!owner || !istype(owner) || !owner.client || (owner.stat >= SOFT_CRIT))
failure.set_output(COMPONENT_SIGNAL)
return
@@ -57,6 +57,8 @@
/obj/item/circuit_component/thought_listener/proc/thought_listen(mob/living/owner)
var/message = tgui_input_text(owner, input_desc.value ? input_desc.value : "", input_name.value ? input_name.value : "Thought Listener", "")
+ if(QDELETED(owner) || owner.stat >= SOFT_CRIT)
+ return
output.set_output(message)
trigger_output.set_output(COMPONENT_SIGNAL)
ready = TRUE
diff --git a/code/modules/wiremod/components/id/access_checker.dm b/code/modules/wiremod/components/id/access_checker.dm
index 038f4078ecb11..1644d12cba508 100644
--- a/code/modules/wiremod/components/id/access_checker.dm
+++ b/code/modules/wiremod/components/id/access_checker.dm
@@ -87,7 +87,7 @@
data["oneAccess"] = check_any.value
return data
-/obj/item/circuit_component/compare/access/ui_act(action, params)
+/obj/item/circuit_component/compare/access/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
diff --git a/code/modules/wiremod/core/component.dm b/code/modules/wiremod/core/component.dm
index ff0e64cd9a4dc..02e88e53c2381 100644
--- a/code/modules/wiremod/core/component.dm
+++ b/code/modules/wiremod/core/component.dm
@@ -14,6 +14,7 @@
inhand_icon_state = "electronic"
lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi'
+ custom_materials = list(/datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT)
/// The name of the component shown on the UI
var/display_name = "Generic"
diff --git a/code/modules/wiremod/core/component_printer.dm b/code/modules/wiremod/core/component_printer.dm
index 370a6cfea5244..cb51a0e8ab786 100644
--- a/code/modules/wiremod/core/component_printer.dm
+++ b/code/modules/wiremod/core/component_printer.dm
@@ -22,7 +22,7 @@
/obj/machinery/component_printer/Initialize(mapload)
. = ..()
- materials = AddComponent(/datum/component/remote_materials, mapload)
+ materials = AddComponent(/datum/component/remote_materials, mapload, whitelist_typecache = typecacheof(/obj/item/circuit_component))
/obj/machinery/component_printer/post_machine_initialize()
. = ..()
@@ -117,7 +117,7 @@
materials.use_materials(design.materials, efficiency_coeff, 1, "printed", "[design.name]")
return new design.build_path(drop_location())
-/obj/machinery/component_printer/ui_act(action, list/params)
+/obj/machinery/component_printer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if (.)
return
@@ -192,13 +192,22 @@
return data
/obj/machinery/component_printer/attackby(obj/item/weapon, mob/living/user, params)
- if(istype(weapon, /obj/item/integrated_circuit) && !user.combat_mode)
- var/obj/item/integrated_circuit/circuit = weapon
- circuit.linked_component_printer = WEAKREF(src)
- circuit.update_static_data_for_all_viewers()
- balloon_alert(user, "successfully linked to the integrated circuit")
- return
- return ..()
+ if (user.combat_mode)
+ return ..()
+
+ var/obj/item/integrated_circuit/circuit
+ if(istype(weapon, /obj/item/integrated_circuit))
+ circuit = weapon
+ else if (istype(weapon, /obj/item/circuit_component/module))
+ var/obj/item/circuit_component/module/module = weapon
+ circuit = module.internal_circuit
+ if (isnull(circuit))
+ return ..()
+
+ circuit.linked_component_printer = WEAKREF(src)
+ circuit.update_static_data_for_all_viewers()
+ balloon_alert(user, "successfully linked to the integrated circuit")
+
/obj/machinery/component_printer/crowbar_act(mob/living/user, obj/item/tool)
if(..())
@@ -267,7 +276,7 @@
get_asset_datum(/datum/asset/spritesheet/research_designs)
)
-/obj/machinery/debug_component_printer/ui_act(action, list/params)
+/obj/machinery/debug_component_printer/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if (.)
return
@@ -355,7 +364,7 @@
update_static_data_for_all_viewers()
-/obj/machinery/module_duplicator/ui_act(action, list/params)
+/obj/machinery/module_duplicator/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if (.)
return
diff --git a/code/modules/wiremod/core/integrated_circuit.dm b/code/modules/wiremod/core/integrated_circuit.dm
index f24c5dac6671e..db1fd8ac588c0 100644
--- a/code/modules/wiremod/core/integrated_circuit.dm
+++ b/code/modules/wiremod/core/integrated_circuit.dm
@@ -502,6 +502,9 @@ GLOBAL_LIST_EMPTY_TYPED(integrated_circuits, /obj/item/integrated_circuit)
remove_component(component)
if(component.loc == src)
usr.put_in_hands(component)
+ var/obj/machinery/component_printer/printer = linked_component_printer?.resolve()
+ if (!isnull(printer))
+ printer.attackby(component, usr)
. = TRUE
if("set_component_coordinates")
var/component_id = text2num(params["component_id"])
diff --git a/code/modules/wiremod/shell/controller.dm b/code/modules/wiremod/shell/controller.dm
index 126cc8894368f..ae0eb01b36763 100644
--- a/code/modules/wiremod/shell/controller.dm
+++ b/code/modules/wiremod/shell/controller.dm
@@ -53,7 +53,7 @@
/obj/item/circuit_component/controller/proc/handle_trigger(atom/source, user, port_name, datum/port/output/port_signal)
source.balloon_alert(user, "clicked [port_name] button")
- playsound(source, SFX_TERMINAL_TYPE, 25, FALSE)
+ playsound(source, SFX_KEYBOARD_CLICKS, 25, FALSE)
entity.set_output(user)
port_signal.set_output(COMPONENT_SIGNAL)
diff --git a/code/world.dm b/code/world.dm
index 7cc35e5529ad8..31437dda2f539 100644
--- a/code/world.dm
+++ b/code/world.dm
@@ -6,7 +6,7 @@
*
* Two possibilities exist: either we are alone in the Universe or we are not. Both are equally terrifying. ~ Arthur C. Clarke
*
- * The byond world object stores some basic byond level config, and has a few hub specific procs for managing hub visiblity
+ * The byond world object stores some basic byond level config, and has a few hub specific procs for managing hub visibility
*/
/world
mob = /mob/dead/new_player
diff --git a/config/config.txt b/config/config.txt
index d7cd6f5a33df9..192f90a001b7a 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -209,19 +209,19 @@ IPINTEL_REJECT_BAD
## Ban appeals URL - usually for a forum or wherever people should go to contact your admins.
# BANAPPEALS http://justanotherday.example.com
-## System command that invokes youtube-dl, used by Play Internet Sound.
-## You can install youtube-dl with
-## "pip install youtube-dl" if you have pip installed
-## from https://github.com/rg3/youtube-dl/releases
+## System command that invokes yt-dlp, used by Play Internet Sound.
+## You can install yt-dlp with
+## "pip install yt-dlp" if you have pip installed
+## from https://github.com/yt-dlp/yt-dlp/releases
## or your package manager
-## The default value assumes youtube-dl is in your system PATH
-# INVOKE_YOUTUBEDL youtube-dl
+## The default value assumes yt-dlp is in your system PATH
+# INVOKE_YOUTUBEDL yt-dlp
## Comment this out to disable users ability to use the request internet sounds to be played.
REQUEST_INTERNET_SOUND
## Request Internet Sound Allowed URL'S comma separated, urls here are the only sites allowed through Request Internet Sound, Add more to allow more, or remove to disallow.
-## The Defaults here are all supported by youtube-dl
+## The Defaults here are all supported by yt-dlp
## Ensure . and / are escaped with \
REQUEST_INTERNET_ALLOWED youtube\.com\/watch?v=,youtu\.be\/,soundcloud\.com\/,bandcamp\.com\/track\/
diff --git a/config/lavaruinblacklist.txt b/config/lavaruinblacklist.txt
index fe4cbc86e1ef4..aaa507374cb68 100644
--- a/config/lavaruinblacklist.txt
+++ b/config/lavaruinblacklist.txt
@@ -43,4 +43,4 @@
#_maps/RandomRuins/LavaRuins/lavaland_surface_ww_vault.dmm
#_maps/RandomRuins/LavaRuins/lavaland_surface_wwiioutpost.dmm
#_maps/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm
-
+#_maps/RandomRuins/Lavaruins/lavaland_surface_crashsite.dmm
diff --git a/dependencies.sh b/dependencies.sh
index d6600a5ff58b4..8319e5edd33d2 100644
--- a/dependencies.sh
+++ b/dependencies.sh
@@ -16,7 +16,7 @@ export NODE_VERSION_LTS=20.13.0
export NODE_VERSION_COMPAT=20.2.0
# SpacemanDMM git tag
-export SPACEMAN_DMM_VERSION=suite-1.8
+export SPACEMAN_DMM_VERSION=suite-1.9
# Python version for mapmerge and other tools
export PYTHON_VERSION=3.9.0
@@ -25,10 +25,10 @@ export PYTHON_VERSION=3.9.0
export DREAMLUAU_REPO="tgstation/dreamluau"
#dreamluau git tag
-export DREAMLUAU_VERSION=0.1.0
+export DREAMLUAU_VERSION=0.1.2
#hypnagogic repo
export CUTTER_REPO=spacestation13/hypnagogic
#hypnagogic git tag
-export CUTTER_VERSION=v3.1.0
+export CUTTER_VERSION=v4.0.0
diff --git a/dreamluau.dll b/dreamluau.dll
index 7d49f0742d8f8..cc2d56d2d1e40 100644
Binary files a/dreamluau.dll and b/dreamluau.dll differ
diff --git a/html/changelogs/AutoChangeLog-pr-86117.yml b/html/changelogs/AutoChangeLog-pr-86117.yml
new file mode 100644
index 0000000000000..67d1fa86818eb
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-86117.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "beams now take into account the pixel offsets of both origin and target more accurately.."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-86351.yml b/html/changelogs/AutoChangeLog-pr-86351.yml
new file mode 100644
index 0000000000000..09debea0e55a2
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-86351.yml
@@ -0,0 +1,4 @@
+author: "lbnesquik"
+delete-after: True
+changes:
+ - rscadd: "Add a capacity upgrade for janitorial cyborg light replacers"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-86494.yml b/html/changelogs/AutoChangeLog-pr-86494.yml
new file mode 100644
index 0000000000000..67bef920b9281
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-86494.yml
@@ -0,0 +1,4 @@
+author: "Rhials"
+delete-after: True
+changes:
+ - bugfix: "Modifies the mapping around the icebox cliffside, guaranteeing a bit more openness."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-86568.yml b/html/changelogs/AutoChangeLog-pr-86568.yml
new file mode 100644
index 0000000000000..e72dc3cc6ffd5
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-86568.yml
@@ -0,0 +1,4 @@
+author: "SmArtKar"
+delete-after: True
+changes:
+ - code_imp: "Fixed multiple minor logic issues with code found by OpenDream's new pragma"
\ No newline at end of file
diff --git a/html/changelogs/archive/2024-08.yml b/html/changelogs/archive/2024-08.yml
index 216751eaba1ee..e40667b93e971 100644
--- a/html/changelogs/archive/2024-08.yml
+++ b/html/changelogs/archive/2024-08.yml
@@ -213,3 +213,618 @@
2024-08-13:
Majkl-J:
- bugfix: Felinids no longer phase through diagonal gaps upon seeing a laser
+2024-08-15:
+ 00-Steven:
+ - bugfix: Fixed pipes/cables/disposals rendering above closed catwalks.
+ - bugfix: Fixed catwalks covering pipes generating illogical pipe caps when screwed.
+ - bugfix: Opened catwalks are no longer assumed to be above-floor for the sake of
+ generating pipe caps.
+ - bugfix: Fixes getting a "You are too far away!" interaction block on inventory
+ items when inside of another object. This includes accessing storage or using
+ your PDA from a closet, or as pAI using your digital messenger while inside
+ of your card.
+ Archemagus:
+ - bugfix: Strange zeros in paid off citations on sec records
+ - bugfix: Now invalidating citations works
+ - bugfix: You can change crimes description
+ - bugfix: Synths have 'armory access' for sec records logic
+ - qol: Paying off citation now automaticaly voiding it
+ - qol: Crime issuer can void the crime without armory access
+ - qol: In case of invalidation crime shows who voided it
+ Astrogem2:
+ - bugfix: Raw durathread bundles and sinew strands no longer make metal clang sounds.
+ Ben10Omintrix:
+ - bugfix: wolf AI will no longer get stuck
+ - bugfix: idle basic mobs will now plan behaviors rather than completely shut down
+ - bugfix: fixes monkey ai hitting u from a distance with unloaded guns
+ Bisar:
+ - qol: The preserved terrarium vault now has tier 4 hydroponics trays, making volume
+ based tray chemistry take less time.
+ - rscadd: The interns remembered to water the plants around the station; their foilage
+ is so thick that it totally hides the identity of anyone holding them!
+ DATA-xPUNGED:
+ - qol: Nanotrasen has fitted the Janitorial Emergency Response Team with equipment
+ better suited for the job.
+ Dmeto:
+ - bugfix: Wawastation Science is connected to distro,Floor Electrical Relay cable
+ fixed
+ - qol: Cargo Gorka suit slot now allows emergency/plasmaman internals.
+ FlufflesTheDog:
+ - bugfix: pre-upgraded soda dispensers are actually pre-upgraded again
+ GPeckman:
+ - bugfix: Hydraulic clamps (the mech tool) can force powered doors open again.
+ - balance: Abductors (the antag, not the species) can no longer be converted by
+ any antagonist.
+ Kocma-san:
+ - code_imp: "\u0441hanges for a fax located on the CC"
+ - qol: 'added centcom stamps to centcom
+
+ /:cl
+
+
+
+ '
+ MTandi:
+ - balance: 'TechWeb: NT Frontier partners now give full discounts for many high
+ tier nodes, corresponding to the partner theme, instead of partial discounts
+ for random nodes'
+ - qol: Atmos techs can download NT frontier and build compressor board in engi imprinter
+ - balance: Roboticists now always have ordnance access for the discount experiments
+ they need
+ - balance: 'TechWeb: BZ shell is now a discount experiment for experimental tools
+ instead of required exp for fusion'
+ - balance: 'TechWeb: Noblium shell is a discount experiment for RCD upgrades instead
+ of exp tools discount'
+ - balance: 'TechWeb: Vat-grown slime scan is a discount experiment instead of required
+ one'
+ - bugfix: 'TechWeb: Cryostasis node properly requires advanced medbay equipment
+ as it should'
+ Melbert:
+ - rscadd: 'Adds a copy of the famous 1995 musical "Space Station 13: The Musical"
+ to contraband of the autodrobe'
+ Paxilmaniac:
+ - rscadd: The new smartgun has replaced the unusable energy cannon in mystery boxes
+ ? Raccoff, aa07, ActionNinja, ArcaneMusic, Armhulen, Azlan, Ben10Omintrix, BigBimmer,
+ Capsandi, CapybaraExtravagante, Draco, Floyd, Iamgoofball, Imaginos16, Infrared,
+ Jacquerel, Justice12354, Kryson, KylerAce, LemonInTheDark, Meyhazah, Mothblocks,
+ MTandi, Ninjanomnom, oranges, Rohesie, Runi-c, san7890, Senefi, SimplyLogan, SomeAngryMiner,
+ SpaceSmithers, Tattle, Thunder12345, Time-Green, Twaticus, unit0016, Viro, Waltermeldon,
+ WatlerJe, ZephyrTFA with thanks to the Mojave Sun team!
+ : - rscadd: Resprites or offsets almost all "tall" objects in the game to match
+ a 3/4ths perspective
+ - rscadd: Bunch of rendering mumbo jumbo to make said 3/4ths perspective work
+ Rhials:
+ - bugfix: Centcom ERT hiring standards have been expanded to include plasmamen,
+ again.
+ Runi-c:
+ - bugfix: Wellcheers no longer does nothing half the time
+ ShadowLarkens:
+ - bugfix: Fixed action buttons relative to EAST,SOUTH, or CENTER being improperly
+ moved during view_audit_buttons()
+ SmArtKar:
+ - bugfix: Circuit health analyzer/state components now work on targets inside lockers
+ - image: Resprited all main assemblies
+ - bugfix: Ninjas can cloak again
+ - image: Durand shield got a glowup
+ - bugfix: Durand shield no longer instantly drains its battery
+ - bugfix: Mech UI no longer lies about the amount of power your mech has left
+ - bugfix: Fixed chanterelles runtiming upon being hollowed out with a spoon and
+ not spawning a hat
+ - bugfix: Ash drakes no longer get stuck in flight if their target changes Z levels
+ or is destroyed and doesn't spawn lavaland turfs after the lava arena attack
+ ends
+ - bugfix: Fixed shuttle loan paperwork being unstampable
+ - balance: Multiple gloves/shoes that had armor values but failed to apply them
+ got fixed
+ - bugfix: Soulscythe now deletes the soul mob when destroyed
+ - bugfix: Bubblegum can no longer bloodcrawl to other Z levels
+ - bugfix: Fixed portable chem mixer spamming you if not held while its UI is open
+ - bugfix: Fixed bileworms not having a deaggro range
+ - bugfix: Heretic sacrifice area no longer modifies global ambience lists
+ - bugfix: Fixed fish analyzers not being able to scan fish
+ - bugfix: Fixed DNA samplers not being able to interact with non-scannable objects
+ - bugfix: Fake aurora caelus event no longer permanently paints space green
+ - code_imp: Cult magic item paths are no longer strings
+ - bugfix: Fixed monk staffs not displaying a wielded sprite
+ - bugfix: Fixed nuke toggle, smite and machine upgrade admin verbs using incorrect
+ sorting
+ - admin: Updated nuke toggle, smite and machine upgrade admin verbs to use TGUI
+ - qol: Magicarps no longer fire their projectiles while out of combat mode
+ - bugfix: Chameleon gun counts as harmless and can be fired by pacifists
+ - qol: Integrated circuit modules now can be linked to component printers
+ - bugfix: You can no longer shove people into closets through directional glass
+ - bugfix: Slimes no longer can feed when they're inside of objects or attacking
+ a target that became invalid after they chose their dinner
+ - bugfix: Fixed Creatures not being able to use non-jaunt actions when seen
+ - bugfix: Void storm now updates mob health
+ - qol: Circuit components can now be recycles in circuit printers, and automatically
+ do so upon being removed if a circuit has a linked printer
+ - spellcheck: Recycling a single item no longer outputs a line with a rogue space
+ infront of it
+ Vekter:
+ - balance: Removes the research requirement from cyborg endoskeletons, meaning they
+ can be built at roundstart again.
+ Watermelon914:
+ - bugfix: Fixed activating specific BCI actions whilst unconsious
+ - balance: Space suits no longer provide all of the slowdown when wearing space
+ gear. Helmets now share the burden and you can now move faster when wearing
+ only a space suit. Helmets now provide a bit of slowdown when worn alone as
+ a result.
+ Xackii:
+ - bugfix: Firelocks can be opened with crowbar rigth-click in combat mode.
+ carlarctg:
+ - balance: Supermatter bioscrambler anomalies are now docile.
+ - balance: Reduced caltrop default paralyze timer from 6 to 2
+ flleeppyy:
+ - rscadd: the cyborg shaker in service borgs now have the ability to open the reaction
+ search menu
+ grungussuss:
+ - balance: bushes and other flora have had their HP reduced from 150 to 100. Trees
+ still have 150 HP
+ - balance: flora now has an X4 modifier to damage from burn sources
+ - balance: MODsuits now deploy 2 times faster
+ - balance: The infiltrator MODsuit now deploys 4 times faster
+ - sound: 'added rustle sounds for: toolbox, medkit, box'
+ - sound: 'added open sounds for: toolbox, box'
+ - code_imp: added support for giving container items rustle sounds
+ grungussuss and Beeblie:
+ - sound: internals breathing sound has received more variance and had its volume
+ reduced
+ hack-wrench:
+ - rscadd: add syndicate branded lipstick to uplink (6 TC), after applying lipstick
+ *kiss deals damage equal to energy gun
+ - bugfix: fix wallhit sound for projectile
+ imedial:
+ - bugfix: fixed nested radios with encryption keys giving free comms
+ itseasytosee:
+ - bugfix: illustrious ethereals now properly get the tenacious trait
+ - code_imp: more species features have been moved to their individual body parts.
+ lbnesquik:
+ - qol: Clarified what the Medical Cyborg Omnitool Upgrade does
+ - rscadd: Added a cyborg plunger for janitorial modules
+ loganuk:
+ - bugfix: AI Players can now operate the BRM (Boulder Retrival Matrix)
+ mc-oofert:
+ - bugfix: breaking certain terrain in deathmatch doesnt instantly breach to space
+ r3dj4ck0424:
+ - bugfix: In light of recent allegations of wizardry among the kitchen staff, our
+ cooks will now need bowls when crafting food that comes in bowls. This should
+ also stop said bowls from vanishing once the food is gone.
+ raffclar:
+ - bugfix: Various fixes to TGUI notepad
+ - bugfix: The first tab is now selected with ore redemption machines when opened
+ for the first time
+ tmyqlfpir:
+ - balance: Reduced pathfinding circuit component cooldown from 30 seconds to 5 seconds
+2024-08-16:
+ Absolucy:
+ - bugfix: Empty blood brother teams will now be cleaned up, instead of clogging
+ up the roundend report.
+ Ben10Omintrix:
+ - bugfix: fixes surgery table buckle offsets
+ - bugfix: fixes rcds accounting for player dir only before construction
+ - bugfix: fixes pickup animation not matching player offset
+ Bisar:
+ - bugfix: Potted plants no longer permanently mark you as one of their own.
+ DATA-xPUNGED:
+ - qol: Paraplegics can now opt into appearing on the shift without their legs.
+ Ghommie:
+ - image: Resprited more types of fillets, and moonfish eggs
+ - rscadd: Crabs and lobstrosities (as well as the lobster foam helmet and the fishing
+ hat) now pack a boatload of fish puns.
+ Jacquerel:
+ - bugfix: corrects offset of cobweb fluff object
+ - bugfix: Dimensional anomalies should once again create cool walls, not boring
+ grey ones
+ - bugfix: Mobs shown in ghost alerts shouldn't be offset out of the box
+ - image: Several midround dynamic alert icons should be more demonstrative of what
+ is spawning
+ Melbert:
+ - bugfix: Less floating things on Delta
+ - rscadd: Auto-generated digitigrade clothing sprites for most jumpsuits
+ Metekillot:
+ - bugfix: Raptors properly respect their own factions now.
+ Sadboysuss:
+ - qol: atmos meters can now be attached to layer 1 and 5
+ - sound: generic ship ambience volume has been reduced
+ Shadow-Quill:
+ - bugfix: You can no longer hear radio sounds if you're deaf.
+ SmArtKar:
+ - image: Mirrors have been successfully wallened
+ - bugfix: You can now move horizontally on tall stairs and they no longer have a
+ hole in them when facing south
+ - bugfix: Fixed improvised shield crafting recipe being overriden by moonflowers
+ - image: Floor lights no longer use outdated textures
+ - balance: Deja Vu perk now teleports you to where you were before the last teleport,
+ instead of where you arrived on the station
+ - bugfix: Deja Vu can no longer be used to return to the wizard ship
+ - bugfix: Blade heretic ascension now gives you floating blades once again
+ deathrobotpunch:
+ - rscadd: big pharma now supplies a single pack of experimental medication as an
+ easy to access (albeit expensive) cargo goodie!
+ - balance: price for the cargo crate with 2 pill bottles of experimental medication
+ has been increased to 600 to better reflect the goodie case price.
+ grungussuss:
+ - sound: some sheets that shouldn't be making metal sounds no longer make those
+ sounds
+ - sound: added new sounds for RCD, RPD and Plumbing Constructor.
+ tralezab:
+ - bugfix: bedsheets are laid on beds properly now
+2024-08-17:
+ Ghommie:
+ - rscadd: Added a treasure chest you can rarely fish from the ocean/beach, with
+ loot being a mix of fishing and piratey stuff.
+ - rscadd: You can revive fish with strange reagent now.
+ - rscadd: You can sell items on the blackmarket with the LTSRBT now.
+ - bugfix: Added some checks to prevent the swapper device and bluespace anomalies
+ from theorically being able to send things and people to nullspace.
+ Jacquerel:
+ - bugfix: Beepsky and Mice have more appropriately positioned shadows.
+ Majkl-J:
+ - bugfix: Trying to repair someone's undamaged limb with a welder or wires no longer
+ has you smacking them
+ Shroopy:
+ - bugfix: Added a light switch to the science hallway in Metastation
+ SmArtKar:
+ - rscadd: You can now lean on windows the same way you can lean on walls
+ - bugfix: You no longer stop leaning on walls after clicking on anything
+ - qol: Dumping things into microwave en-masse is done via RMB (drag'n'drop support
+ coming soon!)
+ - bugfix: RPEDs can now upgrade microwaves
+ - bugfix: Spies can finally steal microwaves (Use RMB!)
+ TheVekter:
+ - bugfix: Updated Metastation for Wallening
+ Time-Green:
+ - qol: The Voidwalker wisp void now loops you
+ unit0016:
+ - bugfix: Indestructible reinforced walls now mimic their destructible counterparts
+ as intended.
+ - bugfix: Every bitrunner domain's been patched up for the new perspective shift.
+ zxaber:
+ - image: Airlocks have a better sprite for indicating which directions (if any)
+ you can pass through without ID access.
+2024-08-18:
+ Ben10Omintrix:
+ - bugfix: fixes ai controllers incorrectly idling when changing z level
+ Ghommie:
+ - bugfix: lights placed on walls with the RLD now face the correct direction.
+ - bugfix: Fixes lobby buttons from station traits having no name and being unexaminable.
+ - bugfix: Fixed the shower water visually not coming out behind the showerhead.
+ Justice12354:
+ - bugfix: Fixes the rotation of Centcom's Airlocks
+ KingkumaArt:
+ - image: Resprited mech drills, plasma cutter, pka and cargo clamp.
+ LemonInTheDark:
+ - admin: Subsystem Overview now has the ability to track a rolling average of tick
+ by tick subsystem cpu usage.
+ Melbert:
+ - qol: Icebox now has a trapdoor from Medbay leading into the Morgue (for corpses,
+ of course)
+ - bugfix: Patch exploit allowing nigh-infinite heretic points
+ - qol: Xenos and digi lizards have claw footprints
+ - qol: Some wall mounts will now consistently layer over others (light switches
+ and cameras, notably, should always layer above other mounts like signs and
+ status displays)
+ MrBagHead:
+ - bugfix: Swapped East and West sprites for access buttons to correct previous misalignment.
+ - rscadd: Added South-facing sprite for access buttons.
+ SmArtKar:
+ - bugfix: Mechs' directional armor now actually works
+ - bugfix: Alien beds no longer pretend they can be deconstructed with a wrench
+ - qol: Wallmount balloons are now clickable
+ - admin: Stat change is now logged for living mobs
+ - bugfix: Fixed elephant graveyard active turfs
+ - bugfix: Fixed random lipstick texture, fake syndie lipstick no longer can randomly
+ spawn
+ Timberpoes:
+ - bugfix: Having the Overflow Role set to On will properly ensure you get that role
+ at a High priority as intended by the game code.
+ - bugfix: Job selection is now a little bit more random. Fixes an unintentional
+ bias in random job assignment that could lead to feast-or-famine for roles where
+ everyone is assigned one job and nobody is assigned another job.
+ YesterdaysPromise:
+ - image: adjusted security barriers to be in 3/4 perspective.
+ Zytolg:
+ - bugfix: Updates much of Birdshot for the Wallening
+ mc-oofert:
+ - rscadd: portable gravity unit, bought at cargo
+ necromanceranne:
+ - rscadd: Drunken fist fighting now has bonuses and penalties based on how intoxicated
+ you are. Controlled liquor intake could make you a better brawler. Though you
+ might vomit if you go too hard.
+ - rscadd: Bartenders are now Drunken Brawlers. If they're drunk at all (no matter
+ how drunk), they're stronger at fist fighting.
+ - rscadd: Reintroduces the deterministic stagger combo. The effects of the combo
+ are more varied, and based on attacker unarmed effectiveness and the defender's
+ armor. Read the PR for more details. It's complicated.
+ - qol: Unarmed effects that would utilize stamina values now use a split of half
+ brute, half burn to determine outcomes or for meeting thresholds. This affects;
+ punch accuracy, stagger combo thresholds and grab vulnerability thresholds.
+ thegrb93:
+ - bugfix: Air alarms stuck in warning state despite area completely fine
+2024-08-19:
+ ArcaneMusic:
+ - bugfix: Runtimestation's APC is now connected to the grid again.
+ - rscadd: White crayons (Renamed to Sticks of Chalk) may now be used on dead bodies
+ to draw a body outline onto the ground easily.
+ Bisar:
+ - bugfix: The Nanotrasen Emergency Religious Response Team has blessed the station;
+ heretic summon rituals now actually consume resources, fixing infinite summon
+ loops.
+ Ghommie:
+ - image: Ported and adapted several food sprites from Aurora, Bay and one instance
+ from Paradise -- Bacon, plant meat, slime meat, cutlets, crab meat, crab rangoon,
+ bechamel sauce, cheese curd, waffles, chips, shrimp chips, cheesie honkers,
+ space twinkie, jerky, peanuts bags, chocolate, boritos, syndicake, popcorn,
+ pesto, tomato sauce, pineapple slice, pineapple salsa, bran request cereals
+ and bronx bar have been resprited.
+ - rscdel: Waffles no longer magically conjure a "waffle tray" trash item when eaten.
+ - image: Shrunk the arrow shown when pointing at things to be less invasive.
+ - rscadd: Wearing an ID with the trim of a command/leader position gives you bigger
+ arrows (about the size of arrows before this PR) which may also be of different
+ colors.
+ - rscadd: Added a skillchip that does the same, but also makes the color of the
+ arrow totally customizable.
+ - bugfix: ERT engies and medics now come with the engineering and entrails-reader
+ skillchips respectively, like their station counterparts.
+ - bugfix: Fixed not facing atoms that you're pointing at.
+ - rscadd: Added a bluespace fish case to the advanced fishing node.
+ - balance: Fish cases will keep a fish from getting hungrier or ready to reproduce,
+ while also healing it up to 65% health.
+ - balance: Examining a fish with zero fishing skill whatsoever won't give a reading
+ on its size and weight. Conversely, examining one with the skill leveled two
+ times will give general information on if it's starving, sick, hungry, or dead.
+ - bugfix: paintings now drop canvas and frame when knocked off the wall.
+ Jacquerel:
+ - bugfix: Whatever the roaches were getting into which made them hover above the
+ ground seems to have worn off.
+ - bugfix: Carp, bat, parrot, and dragon corpses no longer float in the air.
+ Rhials:
+ - code_imp: Radios/encryption keys now use a single variable for "special" frequencies.
+ Please report if you experience any strangeness with accessing/being unable
+ to access the Centcom, Syndicate, or Cyborg radio.
+ SmArtKar:
+ - bugfix: Random spraypaint setting now properly paints large decals
+ - image: Added emissives to departamental signs
+ - image: Gas tanks got updated worn sprites
+ - bugfix: Examine balloons for wall-mounted buttons no longer inflate themselves
+ infinitely
+ - bugfix: Fixed active turfs on crashsite ruin
+ - bugfix: Captain's spare safe no longer turns invisible when opened
+ - bugfix: Fixed soapbox component sometimes runtiming roundstart
+ - bugfix: Fixed circuit drone pixel/shadow offsets
+ TwistedSilicon:
+ - bugfix: Clarkes will no longer become unable to dump ores upon picking a boulder
+ up. Mine away.
+ mc-oofert:
+ - balance: wheelchairs no longer double your movement cooldown if you moved diagonally
+ norsvenska:
+ - qol: The CentCom officer's beret has had its slowdown removed to be in line with
+ the winter coat.
+ r3dj4ck0424:
+ - rscadd: A new vendor of cytology equipment, the CytoPro, is now available in your
+ local science department!
+ san7890:
+ - bugfix: The area of the CentCom Z-Level dedicated to the Lobby Screen should look
+ far better now, with a solid black title screen should the lobby image not load
+ in/get deleted.
+ - qol: Reporting issues on the Github should now be a far more simpler experience.
+ Hitting the "Report Issue" button in the top-right of your BYOND Client Screen
+ will still autofill in the fields as expected.
+2024-08-20:
+ JohnFulpWillard:
+ - rscadd: Added Taunting, a faster and cooldowned version of the Spin emote.
+ - balance: Wizards blocking projectiles with Transparence and the bitrunner matrix
+ skillchip now have a visible effect of deflecting the projectile.
+ - balance: The bitrunner skillchip now uses taunt instead of flip.
+ - balance: The style meter now uses taunting instead of flips and spins.
+ - bugfix: Statues don't count as eyes to creatures.
+ - bugfix: Human AIs and Admin ghosts no longer get kicked off of machines that aren't
+ on cameranets.
+ SmArtKar:
+ - image: Utility belts got new tool overlay sprites
+ - spellcheck: CE's toolbelt is no longer capitalized or considered an improper noun
+ - balance: PACMANs now have significantly increased power output and take longer
+ to consume a single sheet
+ - balance: Inducers can now be recharged with plasma
+ - balance: Inducers ordered from cargo now start with upgraded megacells instead
+ of upgraded batteries
+ - balance: Vomiting from disgust now removes 50 of it from you.
+ Vekter:
+ - bugfix: Fixed further Wallening issues on Metastation, including Cargo's shuttle
+ door buttons and Xenobiology's access buttons.
+ - rscdel: Removed department directional signs from Metastation as they are currently
+ broken. They will return once they've been fixed.
+ Zytolg:
+ - bugfix: Continues to update Birdshot into a postwallening playable state
+ carlarctg:
+ - rscadd: Added three new DM maps - Ragnarok, Lattice Battles, Species Showdown.
+ mc-oofert:
+ - bugfix: spawning on a table or other elevated object does not offset you forever
+2024-08-21:
+ Ghommie:
+ - rscadd: Added twelve new fish types to the game. Some are cool, other are not,
+ some come with their own special traits and some are straight-up weapons.
+ - rscadd: Added more fishing spots to the game. Sand, ice, rivers, the cursed spring...
+ - balance: A few fish like salmon, swordfish and pufferfish (poisonous btw) now
+ give better quality fillets when butchered, which can improve the quality of
+ food that uses them even further.
+ - balance: Excessive fish weight will make the fish slowier to carry, while excessive
+ size may make it require two hands.
+ - balance: Adjusted size, weight and cooldowns of several fish, for the better.
+ Iamgoofball:
+ - balance: Air alarms are now usable by Station Engineers as well as Atmospherics
+ Technicians.
+ Rhials:
+ - bugfix: Adjusts some areas by the Icebox Cliffside Bench to generate a bit less
+ weirdly.
+ - sound: '"radio message received" audio now has a brief cooldown.'
+ - bugfix: Beepsky will now salute commissioned bots, instead of himself, when encountering
+ one.
+ SmArtKar:
+ - bugfix: Ragnarok deathmatch arena now has noteleport area
+ - bugfix: Replaced a locked cabinet that you cannot open in ninja den with an unlocked
+ one
+ - qol: Haunted 8ball now gives you a TGUI input with your question for ghosts instead
+ of telling them the last thing it heard.
+ - image: 8ball has received a resprite
+ - bugfix: Fixed examine balloons not being click transparent even while inactive
+ - image: Updated cryostasis beaker's sprite
+ grungussuss:
+ - sound: computers now make clicky clacky sounds
+2024-08-22:
+ Absolucy:
+ - qol: Clicking floor tiles now also closes curator/morgue doors, like with normal
+ airlocks.
+ - qol: Unarmed attacks with carp jaws now uses a bite effect rather than a punch
+ effect.
+ Ben10Omintrix:
+ - bugfix: fences will no longer appear pitch black and they will layer properly
+ Bisar:
+ - rscadd: Nanotrasen Intelligence has received reports of botanical experimentation
+ in a Syndicate base on lavaland. What fiendish flora are taking root in their
+ secret lair?
+ Ghommie:
+ - rscadd: Fishing toolboxes (and occasionally maintenance) now come with a paper
+ slip containing fishing-related tips.
+ - rscadd: Buckshot is back on the menu, on the blackmarket.
+ - balance: the integrity of firearms now counts toward projectile damage. A gun
+ that's on the very verge of breaking down will deal half as much damage.
+ Jacquerel:
+ - balance: Pacifist carp can now be spawned from the friendly gold core reaction,
+ and no longer appear from the hostile one.
+ - bugfix: The teeth of toothless carp will not occasionally reappear
+ - bugfix: Crabs will now run from attackers larger than them and attack things smaller
+ than them, as intended.
+ Redrover1760:
+ - balance: Changed max refined vortex cores from 1 to 3. Changed the Event Horizon
+ Anti-Existential Beam Rifle recipe to require 2 vortex cores.
+ Rhials:
+ - qol: Delivery/Bot pathing nodes have been added to the middle room of Runtime
+ station.
+ - sound: Windows blown out by a Voidwalker blade now have a cool sound that plays
+ as they reform.
+ - admin: You can now choose the humanoid species spawned by an ERT summon in the
+ summon menu.
+ SmArtKar:
+ - bugfix: Fixes kudzu being able to spawn on openspace turfs resulting in it getting
+ stuck
+ - bugfix: Radioactive nebula no longer runtimes on runtime station
+ - bugfix: Fixed delam counter going over objects
+ by Xackii, sprites by ArcaneMusic:
+ - rscadd: Added big manipulators.
+ lizelive:
+ - balance: reticence requires progression
+ r3dj4ck0424:
+ - balance: The CytoPro has had prices raised to slightly more reasonable levels.
+2024-08-23:
+ MMMiracles:
+ - bugfix: More various Tramstation-adjacent wallening fixes.
+ Majkl-J:
+ - bugfix: custom pies and cakes are craftable again
+ SmArtKar:
+ - image: Updated goliath cloak sprites
+ necromanceranne:
+ - rscadd: Punching mitts! Punch wildlife to death and scream the whole time. ADVENTURE!
+ - balance: Megafauna can be affected by martial arts.
+2024-08-24:
+ DaCoolBoss:
+ - bugfix: Aquarium decorations now contain plastic.
+ - spellcheck: Added item descriptions for aquarium decorations.
+ EnterTheJake:
+ - balance: Rusted Ritual now requries 10 sheets of Iron instead of Titanium.
+ Ghommie:
+ - rscadd: Added Athletic Fishing Gloves and Fishing Glove Module to the advanced
+ fishing tech node. Both can be used to fish without having to hold a fishing
+ rod. The athletic fishing gloves will also train your athletics skill.
+ LT3:
+ - spellcheck: Sneak a peek of Hilbert's Hotel, not a sneak peak
+ SmArtKar:
+ - bugfix: Marine helmets no longer change their sprite to security helmets when
+ their flashlight is toggled
+ - spellcheck: Hierophant no longer lies about obliterating someone
+ TheBoondock:
+ - qol: goliath arm can defuse gibonite by bumping or direct click
+2024-08-25:
+ DrDiasyl aka DrTuxedo:
+ - rscadd: Curator has received a new BROADCAST CAMERA which can broadcast the surroundings
+ LIVE on Entertainment Screens/ Alongside with some other Journalism related
+ gear in his Heroic Beacon
+ - sound: Entertainment screens now play muffled speech when hearing a message on
+ Entertainment frequency
+ Ghommie:
+ - rscadd: You can place papers, photos and cash bills (no holochips) inside bottles
+ and then toss them into the ocean (or fishing portal gen with relative settings)
+ with right-click, for others to fish them up on future rounds.
+ - bugfix: You can no longer pickup closets and crates wrapped in a package with
+ a fishing rod.
+ - bugfix: Fixed a few harddel issues with mob spawns that caused charred corpses
+ fished from lavaland to create an invisible blockade.
+ - bugfix: Fixed being able to fish up mobs that have fallen in totally different
+ z-levels with a rescue hook (i.e. from bitrunning domains to lavaland).
+ SmArtKar:
+ - bugfix: Removed all ways of teleportation from deathmatch and replaced all consoles
+ on a certain map with non-functional variants. Loadouts have been adjusted to
+ account for this.
+ - rscdel: Species Warfare no longer has atmospherics-related equipment on it.
+ YesterdaysPromise:
+ - rscadd: Added crates of the following varieties; Interdyne, Interdyne freezer,
+ Tiger Co-Op, S.E.L.F. MI13, A.R.C., Cybersun (4 colour variants), Waffle Corp,
+ Donk, Gorlex, Gorlex weapons, DeForest, Nakamure Engineeing, Robust Industries
+2024-08-26:
+ GPeckman:
+ - bugfix: The instagib, ragecage, mech madness, secu-ring, shooting range, and sniper
+ elite deathmatch maps are available again.
+ Ghommie:
+ - bugfix: Fixes the chainsaw evolution for goldfishes.
+ Majkl-J:
+ - rscadd: Achievement for eating 500 cigarettes
+ - balance: Cigarettes are now edible
+ - code_imp: Adds a variable to hide the food examine on the edible element
+ - bugfix: SSPolling no longer fills in the candidate list with empty entries to
+ guarantee it returns a list size of amount_to_pick
+ SmArtKar:
+ - spellcheck: Fixed a typo on snowdin shuttle transi(s)t consoles
+ grungussuss:
+ - sound: lead pipe has sound
+ vinylspiders:
+ - bugfix: wet hides and hairless hides no longer make metal clanging noises when
+ picked up/dropped
+2024-08-27:
+ Ben10Omintrix:
+ - bugfix: fixes blob spore and slime AI endlessly attacking the dead
+ Sakamoto4ka:
+ - rscadd: Added salt electrolysis reaction
+ SmArtKar:
+ - bugfix: Bioscrambler anomalies no longer affect inorganic species
+2024-08-28:
+ Melbert:
+ - bugfix: Juicing and grinding should break less
+ Vekter:
+ - bugfix: Fixed an issue causing Quartermaster office access to show in the wrong
+ area on Plexagon Access Management.
+ - bugfix: Fixed an inconsistency in the naming for QM Office access.
+ grungussuss:
+ - bugfix: after 4 years, computer sound loop now works properly
+2024-08-29:
+ FeudeyTF:
+ - rscadd: Added board for detective's evidences
+ Rhials:
+ - rscadd: Smokey remains have appeared in maintenance. Make sure to walk when near
+ them!
+ SmArtKar:
+ - bugfix: Stagger animation is no longer horrilbly jittery
+ Xackii:
+ - qol: revolver in roundstart holsters is on the last slot and not on first
+2024-08-30:
+ SmArtKar:
+ - bugfix: Projectiles no longer always play turf hit sound
+ - balance: Plexagon Crew Manifest is now a default PDA app for everyone, and is
+ free.
+ - balance: Plexagon Crew Manifest no longer provides Detomatix resistance, but security
+ records and status display control now do.
diff --git a/html/changelogs/archive/2024-09.yml b/html/changelogs/archive/2024-09.yml
new file mode 100644
index 0000000000000..34998e0e1c1ab
--- /dev/null
+++ b/html/changelogs/archive/2024-09.yml
@@ -0,0 +1,240 @@
+2024-09-04:
+ 00-Steven:
+ - balance: Fax machines with hacked input servos can now send chap slices and cookies.
+ Please accept them.
+ - bugfix: Buckling yourself to a bed or stasis bed will now make you actually use
+ the headrest/pillow and face up.
+ - qol: Multi-z disposal segments can actually be made with an RPD.
+ - image: Upwards multi-z disposal segments no longer have wonky sprites.
+ - bugfix: Big manipulator hands now move smoothly with the base when it's moved.
+ Absolucy:
+ - bugfix: You will now be ejected from any jaunt (i.e bloodcrawl or shadow walk)
+ if you lose consciousness somehow during the jaunt.
+ Artemchik542:
+ - bugfix: typo in CRUSH_CRIT_PARAPLEGIC
+ AyIong:
+ - qol: Stat Panel settings moved to personal tab
+ - bugfix: Stat Panel tabs no longer create horizontal scrollbar by default, but
+ you can return it into the settings
+ - bugfix: Hovering over a truncated statpanel button, doesn't blocks the button
+ below it anymore
+ FeudeyTF:
+ - bugfix: fixed detective board placing
+ Hardly:
+ - sound: Added sounds for conveyor belt switches
+ JohnFulpWillard:
+ - bugfix: Ice cream vats can be refilled with beakers again.
+ LT3:
+ - bugfix: You can now put Skub back in the Skub box, as intended
+ - bugfix: Ice Box lower floor maints is properly protected during radstorms
+ - bugfix: Fixed malfunctioning tram crossing signals sometimes staying green
+ Melbert:
+ - bugfix: Some spy items should spawn less broken
+ Redrover1760:
+ - bugfix: Fixed light overloads not draining significant amounts of energy.
+ - bugfix: Power sinks now drain APCs at a significant rate instead of glacially
+ slow.
+ - balance: Power sinks are adjusted to not explode within 30 seconds of the average
+ power output a station produces.
+ SmArtKar:
+ - image: Added new sprites for hellfire lasers
+ - bugfix: Cardborg costume no longer gets its appearance deleted when you drop a
+ second hat/suit you are holding in your hand
+ Watermelon914:
+ - bugfix: Fixed a bug that breaks signal handlers on an object if one of the signal
+ handlers doesn't return a number value.
+ Xackii:
+ - bugfix: fixed that screwdriwing radio headset in combat mode don't do anything.
+ alien3301:
+ - balance: When silicons use their radio they will not whisper out loud anymore
+ grungussuss:
+ - sound: being sacrificed by a heretic is now spookier
+ grungussuss and kayozz:
+ - sound: gravity generator has a new sound
+ vinylspiders:
+ - bugfix: due to a clerical error, all ballistic guns were shipping with built-in
+ silencers. this has been resolved-they will now make noise once again when fired.
+ - bugfix: fixes a crafting exploit that allowed you to get more resources back from
+ disassembling than you put into the recipe
+ - bugfix: fixed 'Enable Radio Noise' pref only being respected for deaf people
+2024-09-05:
+ Archimus12:
+ - bugfix: Makes the Cytology Vendor sell science bio suits instead of medical bio
+ suits.
+ - bugfix: Makes the Cytology Vendor sell science lab coats instead of normal lab
+ coats.
+ Astrogem2:
+ - spellcheck: fixed a few typos with energy shield descriptions.
+ Ben10Omintrix:
+ - bugfix: aquarium ui now displays props and fishes correctly
+ - refactor: able_to_run and incapacitated have been refactored to be event based
+ - bugfix: wooden fences will no longer appear pitch black in lower levels of icebox
+ - qol: gives aquariums a new easier to use UI
+ Bisar:
+ - code_imp: The (currently unused) TGUI checkbox components returns a BYOND friendly
+ list of the indexes of any choices now.
+ EnterTheJake:
+ - rscadd: A Syndicate Rebar Quiver has been added to the uplink
+ - qol: Left clicking with a rebar crossbow will now draw/undraw the string.
+ - balance: Rebar quivers are now a neck slot item.
+ - balance: ' Hydrogen bolts damage has been upped to 55 brute and can now pierce
+ through walls, they no longer have infinite piercing and can no longer embed
+ however.'
+ - code_imp: removed the TRAIT_ALWAYS_HIT_ZONE, replaced with 2 new variables.
+ - bugfix: fixes rebar crossbows having a higher capacity than intended if a bolt
+ had already been chambered.
+ FeudeyTF:
+ - bugfix: fixed an UI problems of evidence board
+ Ghommie:
+ - bugfix: Rum can be synthetized again.
+ JohnFulpWillard:
+ - qol: Smartfridges now lets you set how many pills you want to vend, rather than
+ popping out a second separate tgui window.
+ LT3:
+ - rscadd: Added Chief Engineer SEAL OF APPROVAL sticker
+ - code_imp: Stickers now come in sticker packs, not boxes
+ - code_imp: Stickers can now add examine text to whatever they're stuck on
+ Rhials:
+ - spellcheck: Anomaly suicides now use proper grammar.
+ - bugfix: Anomaly suicides work again.
+ Time-Green:
+ - qol: Unsettle (Voidwalker) doesn't go on cooldown if line of sight is broken
+ grungussuss:
+ - sound: fish now have new sounds
+ oranges:
+ - rscadd: ghosts can now jump, bhop your way to life
+ r3dj4ck0424:
+ - rscadd: The vendor of cytology equipment, the CytoPro, is once again available
+ in your local science department!
+2024-09-06:
+ Absolucy:
+ - refactor: Refactored some functions related to line-of-sight and reach to improve
+ performance.
+ Ghommie:
+ - bugfix: Syndie sleepers now drop the appropriate syndicate sleeper boards.
+ - bugfix: fixed a few minor nits with aquarium fish visuals.
+ - qol: You can kill germs by actually cooking the food (i.e. frying and grilling)
+ now, or by setting it on fire.
+ Hardly:
+ - sound: Plumbing Constructor and Rapid-Tiling-Device now has RCD's pick up and
+ UI sounds
+ - bugfix: Fixes ghosts being able to interact with the RCD, RPLD and RPDs
+ Jewelry-x:
+ - spellcheck: fixed a wrong extension in the RUNNING_A_SERVER.md
+ KazooBard:
+ - qol: All cans (soda cans etc) fit on utility belts now. Drink on the job!
+ LT3:
+ - image: 'The ''shit is fucked'' default turf no longer flashes
+
+ /:cl'
+ Majkl-J:
+ - bugfix: Embed updating now actually updates embeds
+ Melbert:
+ - refactor: Refactored heretic influences a tiny bit, now ghosts can see them! Report
+ any oddities.
+ OverwatchVoice:
+ - spellcheck: Changed description of Rebar crossbow.
+ - bugfix: Rebar crossbow description will no longer lie about it's missfire potential.
+ Rhials:
+ - bugfix: Runtime station has delivery beacons and navbeacons again.
+ Singul0:
+ - sound: adds sounds for energy shieldbashing
+ - code_imp: Shieldbashing feature is now consistent across all shield types
+ SmArtKar:
+ - bugfix: Changelings can no longer spawn undetectable spider eggs inside of vents
+ - bugfix: Acromegaly no longer makes you bonk your head on airlocks while you're
+ inside of objects
+ TwistedSilicon:
+ - bugfix: The Codex Cicatrix ritual now consumes the item in the case where a hide
+ was used instead of a corpse. No more free books.
+ Y0SH1M4S73R:
+ - admin: Dreamluau provides a more informative error message when trying to pass
+ references to qdeleted datums back to BYOND.
+ grungussuss:
+ - sound: some more items will vary in pitch when picking them up and placing them
+ down
+ jlsnow301:
+ - rscadd: 'Added two new bitrunning maps: Grasslands Hunt and Meta Central.'
+ - rscadd: Deer are now more complex animals, granting them enhanced ability to run
+ amok and chew your favorite plants.
+ - balance: Reduced the cost of most BR vendor items.
+ - bugfix: Fixes an issue where modular virtual domains spawned less mobs than intended.
+ - bugfix: These modular spawns are now valid mutation targets to become an antagonist.
+ r3dj4ck0424:
+ - spellcheck: made the grammar on the brimdemon horn crusher trophy nicer
+ vinylspiders:
+ - bugfix: fixed a bug that could sometimes cause jump boots users to retain the
+ floating trait indefinitely when using the ability
+2024-09-07:
+ Ben10Omintrix:
+ - bugfix: fixes basic mobs not losing their aggroed appearance after death
+ Ghommie:
+ - rscadd: Added fishing lures to the game. They don't get used up like baits and
+ let you catch specific kinds of fish, though they need to be spun every few
+ seconds. The whole set can be ordered from cargo for 450 credits.
+ - balance: The magnet hook now removes dud chances.
+ - rscadd: 'Added five new fish types: perch, two types of pike, monkfish, plaice
+ and squid. Squids have a fairly special ink production trait, which lets you
+ use them (unless dead) to ink people face at close range, and can be butchered
+ for an ink sac, which can either be processed into canned squid ink, or thrown
+ at someone.'
+ - bugfix: Refactored throwing a little. Some items (specifically components/elements)
+ won't be triggered when caught. no more plates shattering despite being caught
+ for example.
+ - rscadd: Goldfish, lavaloops, needlefish and armorfish can now be used as baits.
+ MrStonedOne:
+ - bugfix: Fixed the taskbar/menu bar icon showing the virgin orange byond icon instead
+ of the chad blue ss13 icon.
+ Rhials:
+ - rscadd: Code-Violet Medical Support ERT teams have been rolled out for deployment
+ to Space Station 13 and related Nanotrasen Installations.
+ Singul0:
+ - bugfix: Fixes makarov-stechkin mix up on forgotten ship virtual domain.
+ Xackii:
+ - qol: You don't need two hands to stream with broadcast camera.
+2024-09-08:
+ EnterTheJake:
+ - balance: Syndicate quiver is now small sized instead of Bulky.
+ FeudeyTF:
+ - bugfix: fixed removing last case
+ SmArtKar:
+ - bugfix: Mouthhole module can no longer be installed on MODsuits that don't cover
+ the mouth
+ - image: Civilian MODsuit got a resprite
+ grungussuss:
+ - sound: fish sounds are louder
+2024-09-09:
+ Ben10Omintrix:
+ - bugfix: basic mobs will now act hostile again
+ Ghommie:
+ - spellcheck: fixed a few wording and markdown issues on the instructions paper
+ for fishing lures.
+ Jackraxxus:
+ - bugfix: You can deploy MODsuit parts individually again.
+ Kylerace:
+ - bugfix: some bot paths will show up to users with diagnostic huds again
+ Melbert:
+ - bugfix: '[Icebox] Fixed one set of stairs'
+ Rhials:
+ - balance: Hallucinatory anomalies now have a wider range, and will spawn hallucinatory
+ decoys of itself to mislead you.
+ Sealed101:
+ - bugfix: fixed borg exoskeletons not dropping when a borg is manually deconstructed
+ - bugfix: borg upgrade modules are now dropped when a borg is deconstructed
+ SmArtKar:
+ - bugfix: Fixed prosthetic quirk dropping organs underneath you when spawning
+ - bugfix: EMPing turrets temporarily disables them once again
+ Thunder12345:
+ - bugfix: Freed up a trapped bookshelf in Birdshot's library
+ TwistedSilicon:
+ - bugfix: Mech equipment is no longer broken in the UI for specific conditions.
+ grungussuss:
+ - sound: changed sounds for stun baton, stun prod, contractor baton and telescopic
+ baton
+ - code_imp: made it easier to modify turning on and turning off for batons
+ - sound: gloves have equip, drop and pickup sounds.
+ vinylspiders:
+ - bugfix: certain text input fields in the character setup menu will now update
+ properly when swapping character slots
+ - bugfix: fixed a race condition that was causing carpotoxin to cause liver damage
+ to felinids despite being immune
diff --git a/html/statbrowser.css b/html/statbrowser.css
index cd1d63bf7c060..d8c0f92b626f4 100644
--- a/html/statbrowser.css
+++ b/html/statbrowser.css
@@ -16,7 +16,7 @@ a:hover {
}
h3 {
- margin: 0 -0.5em 0.25em;
+ margin: 0 -0.5em 0.5em;
padding: 1em 0.66em 0.5em;
border-bottom: 0.1667em solid;
}
@@ -41,6 +41,27 @@ img {
background-color: #ffffff;
}
+.menu-wrap {
+ flex-wrap: wrap-reverse;
+}
+
+#menu.tabs-classic {
+ padding: 0.15em;
+}
+
+#menu.tabs-classic .button {
+ min-width: 2em;
+ margin: 0.1em;
+ padding: 0.25em 0.4em;
+ border: 0;
+ border-radius: 0.25em;
+}
+
+#menu.tabs-classic .button.active {
+ background-color: #0668b8;
+ color: white;
+}
+
.button {
display: inline-table;
cursor: pointer;
@@ -62,6 +83,7 @@ img {
}
.button.active {
+ cursor: default;
background-color: #dfdfdf;
color: black;
border-bottom-color: #000000;
@@ -80,7 +102,7 @@ img {
}
.grid-container {
- margin: 0;
+ margin: -0.25em;
}
.grid-item {
@@ -89,13 +111,14 @@ img {
user-select: none;
-ms-user-select: none; /* Remove after Byond 516 */
width: 100%;
- box-sizing: border-box;
+ max-height: 1.85em;
text-decoration: none;
background-color: transparent;
color: black;
}
-.grid-item:hover {
+.grid-item:hover,
+.grid-item:active {
color: #003399;
z-index: 1;
}
@@ -104,21 +127,20 @@ img {
display: inline-block;
overflow: hidden;
text-overflow: ellipsis;
- box-sizing: border-box;
white-space: nowrap;
+ pointer-events: none;
width: 100%;
padding: 0.33em 0.5em;
border-radius: 0.25em;
}
-.grid-item-text:hover {
- position: absolute;
- top: -1.33em;
+.grid-item:hover .grid-item-text {
+ overflow: visible;
white-space: normal;
background-color: #ececec;
}
-.grid-item-text:active {
+.grid-item:active .grid-item-text {
background-color: #dfdfdf;
}
@@ -173,7 +195,8 @@ body.dark {
}
.dark a:hover,
-.dark .grid-item:hover {
+.dark .grid-item:hover,
+.dark .grid-item:active {
color: #80bfff;
}
@@ -181,6 +204,10 @@ body.dark {
background-color: #131313;
}
+.dark #menu.tabs-classic .button.active {
+ background-color: #20b142;
+}
+
.dark .button {
color: rgba(255, 255, 255, 0.5);
}
@@ -203,10 +230,10 @@ body.dark {
color: #b2c4dd;
}
-.dark .grid-item-text:hover {
+.dark .grid-item:hover .grid-item-text {
background-color: #252525;
}
-.dark .grid-item-text:active {
+.dark .grid-item:active .grid-item-text {
background-color: #313131;
}
diff --git a/html/statbrowser.js b/html/statbrowser.js
index f6c188c6edd61..3fe115943a702 100644
--- a/html/statbrowser.js
+++ b/html/statbrowser.js
@@ -716,6 +716,19 @@ function set_font_size(size) {
document.body.style.setProperty('font-size', size);
}
+function set_tabs_style(style) {
+ if (style == "default") {
+ menu.classList.add('menu-wrap');
+ menu.classList.remove('tabs-classic');
+ } else if (style == "classic") {
+ menu.classList.add('menu-wrap');
+ menu.classList.add('tabs-classic');
+ } else if (style == "scrollable") {
+ menu.classList.remove('menu-wrap');
+ menu.classList.remove('tabs-classic');
+ }
+}
+
function set_style_sheet(sheet) {
if (document.getElementById("goonStyle")) {
var currentSheet = document.getElementById("goonStyle");
diff --git a/icons/effects/beam.dmi b/icons/effects/beam.dmi
index ae668b0495a56..85d450e03bdd6 100644
Binary files a/icons/effects/beam.dmi and b/icons/effects/beam.dmi differ
diff --git a/icons/effects/random_spawners.dmi b/icons/effects/random_spawners.dmi
index 4e5608330030b..d6e06fb140d04 100644
Binary files a/icons/effects/random_spawners.dmi and b/icons/effects/random_spawners.dmi differ
diff --git a/icons/hud/fishing_hud.dmi b/icons/hud/fishing_hud.dmi
index f18ed7c6cfca9..f9d2d2ff9c457 100644
Binary files a/icons/hud/fishing_hud.dmi and b/icons/hud/fishing_hud.dmi differ
diff --git a/icons/hud/screen_alert.dmi b/icons/hud/screen_alert.dmi
index dda7d6cc635af..10d0b741f0b7c 100644
Binary files a/icons/hud/screen_alert.dmi and b/icons/hud/screen_alert.dmi differ
diff --git a/icons/hud/screen_gen.dmi b/icons/hud/screen_gen.dmi
index 9792124d1b68c..86383abbef1e2 100644
Binary files a/icons/hud/screen_gen.dmi and b/icons/hud/screen_gen.dmi differ
diff --git a/icons/mob/actions/actions_items.dmi b/icons/mob/actions/actions_items.dmi
index 7aaeb9b36d281..3887804e55ddc 100644
Binary files a/icons/mob/actions/actions_items.dmi and b/icons/mob/actions/actions_items.dmi differ
diff --git a/icons/mob/clothing/accessories.dmi b/icons/mob/clothing/accessories.dmi
index 57670005b9240..0e09772a79f50 100644
Binary files a/icons/mob/clothing/accessories.dmi and b/icons/mob/clothing/accessories.dmi differ
diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi
index a96beb1cfa936..5bcaa41f5ed58 100644
Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ
diff --git a/icons/mob/clothing/belt.dmi b/icons/mob/clothing/belt.dmi
index 724a29de21b0f..4a6cc7ac5c9dd 100644
Binary files a/icons/mob/clothing/belt.dmi and b/icons/mob/clothing/belt.dmi differ
diff --git a/icons/mob/clothing/belt_mirror.dmi b/icons/mob/clothing/belt_mirror.dmi
index 0507a0301944e..7410e2db20b37 100644
Binary files a/icons/mob/clothing/belt_mirror.dmi and b/icons/mob/clothing/belt_mirror.dmi differ
diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi
index b62b6a0a8ee58..78a07c08e6ede 100644
Binary files a/icons/mob/clothing/hands.dmi and b/icons/mob/clothing/hands.dmi differ
diff --git a/icons/mob/clothing/head/hats.dmi b/icons/mob/clothing/head/hats.dmi
index 5e76ab78608f2..1ff429b68b101 100644
Binary files a/icons/mob/clothing/head/hats.dmi and b/icons/mob/clothing/head/hats.dmi differ
diff --git a/icons/mob/clothing/head/helmet.dmi b/icons/mob/clothing/head/helmet.dmi
index 579f4c53f0f97..db48dda1fd61c 100644
Binary files a/icons/mob/clothing/head/helmet.dmi and b/icons/mob/clothing/head/helmet.dmi differ
diff --git a/icons/mob/clothing/modsuit/mod_clothing.dmi b/icons/mob/clothing/modsuit/mod_clothing.dmi
index cb2a472c32ed6..aa9b6feca11af 100644
Binary files a/icons/mob/clothing/modsuit/mod_clothing.dmi and b/icons/mob/clothing/modsuit/mod_clothing.dmi differ
diff --git a/icons/mob/clothing/modsuit/mod_modules.dmi b/icons/mob/clothing/modsuit/mod_modules.dmi
index 4f2dc9740d1f7..5c433defa0755 100644
Binary files a/icons/mob/clothing/modsuit/mod_modules.dmi and b/icons/mob/clothing/modsuit/mod_modules.dmi differ
diff --git a/icons/mob/clothing/neck.dmi b/icons/mob/clothing/neck.dmi
index 3467f752ac3a5..bd57cb6eee916 100644
Binary files a/icons/mob/clothing/neck.dmi and b/icons/mob/clothing/neck.dmi differ
diff --git a/icons/mob/clothing/suits/armor.dmi b/icons/mob/clothing/suits/armor.dmi
index ea80204c2cdcc..426a760e7700c 100644
Binary files a/icons/mob/clothing/suits/armor.dmi and b/icons/mob/clothing/suits/armor.dmi differ
diff --git a/icons/mob/clothing/suits/utility.dmi b/icons/mob/clothing/suits/utility.dmi
index 0ef867a2866b8..c8e85bf9a45c7 100644
Binary files a/icons/mob/clothing/suits/utility.dmi and b/icons/mob/clothing/suits/utility.dmi differ
diff --git a/icons/mob/effects/blocking.dmi b/icons/mob/effects/blocking.dmi
new file mode 100644
index 0000000000000..03872fa0fe36d
Binary files /dev/null and b/icons/mob/effects/blocking.dmi differ
diff --git a/icons/mob/effects/durand_shield.dmi b/icons/mob/effects/durand_shield.dmi
index 0600e352b316e..8f9016ed74be6 100644
Binary files a/icons/mob/effects/durand_shield.dmi and b/icons/mob/effects/durand_shield.dmi differ
diff --git a/icons/mob/effects/creampie.dmi b/icons/mob/effects/face_decal.dmi
similarity index 100%
rename from icons/mob/effects/creampie.dmi
rename to icons/mob/effects/face_decal.dmi
diff --git a/icons/mob/human/human_face.dmi b/icons/mob/human/human_face.dmi
index 886094ec49573..5b3b141c7edb0 100644
Binary files a/icons/mob/human/human_face.dmi and b/icons/mob/human/human_face.dmi differ
diff --git a/icons/mob/human/species/misc/bodypart_overlay_simple.dmi b/icons/mob/human/species/misc/bodypart_overlay_simple.dmi
index 8df76eb63147b..dbaaeec55cd24 100644
Binary files a/icons/mob/human/species/misc/bodypart_overlay_simple.dmi and b/icons/mob/human/species/misc/bodypart_overlay_simple.dmi differ
diff --git a/icons/mob/inhands/clothing/gloves_lefthand.dmi b/icons/mob/inhands/clothing/gloves_lefthand.dmi
index 4d191e42939b7..13b91d3108f46 100644
Binary files a/icons/mob/inhands/clothing/gloves_lefthand.dmi and b/icons/mob/inhands/clothing/gloves_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing/gloves_righthand.dmi b/icons/mob/inhands/clothing/gloves_righthand.dmi
index f8ce306cc9850..f7325d02e7a63 100644
Binary files a/icons/mob/inhands/clothing/gloves_righthand.dmi and b/icons/mob/inhands/clothing/gloves_righthand.dmi differ
diff --git a/icons/mob/inhands/fish_lefthand.dmi b/icons/mob/inhands/fish_lefthand.dmi
index f5aeef6202713..bd712791b92da 100644
Binary files a/icons/mob/inhands/fish_lefthand.dmi and b/icons/mob/inhands/fish_lefthand.dmi differ
diff --git a/icons/mob/inhands/fish_righthand.dmi b/icons/mob/inhands/fish_righthand.dmi
index d9c23c3d1b19e..09e97a3196913 100644
Binary files a/icons/mob/inhands/fish_righthand.dmi and b/icons/mob/inhands/fish_righthand.dmi differ
diff --git a/icons/mob/inhands/items/devices_lefthand.dmi b/icons/mob/inhands/items/devices_lefthand.dmi
index 48c47f872df3c..334d962e4057d 100644
Binary files a/icons/mob/inhands/items/devices_lefthand.dmi and b/icons/mob/inhands/items/devices_lefthand.dmi differ
diff --git a/icons/mob/inhands/items/devices_righthand.dmi b/icons/mob/inhands/items/devices_righthand.dmi
index f8f19a8709b15..d26bf452aa5ec 100644
Binary files a/icons/mob/inhands/items/devices_righthand.dmi and b/icons/mob/inhands/items/devices_righthand.dmi differ
diff --git a/icons/mob/simple/carp.dmi b/icons/mob/simple/carp.dmi
index 1be59c43ecb6e..e33b9c7ada810 100644
Binary files a/icons/mob/simple/carp.dmi and b/icons/mob/simple/carp.dmi differ
diff --git a/icons/obj/aquarium/fish.dmi b/icons/obj/aquarium/fish.dmi
index 638c8300f304a..e3b41f4cf906d 100644
Binary files a/icons/obj/aquarium/fish.dmi and b/icons/obj/aquarium/fish.dmi differ
diff --git a/icons/obj/aquarium/wide.dmi b/icons/obj/aquarium/wide.dmi
index 7c5f941a1db37..5334fcf1808c8 100644
Binary files a/icons/obj/aquarium/wide.dmi and b/icons/obj/aquarium/wide.dmi differ
diff --git a/icons/obj/clothing/accessories.dmi b/icons/obj/clothing/accessories.dmi
index 0253485cec327..578aebd0c65a1 100644
Binary files a/icons/obj/clothing/accessories.dmi and b/icons/obj/clothing/accessories.dmi differ
diff --git a/icons/obj/clothing/belt_overlays.dmi b/icons/obj/clothing/belt_overlays.dmi
index 7a215dcb9b1cc..0692033a5361b 100644
Binary files a/icons/obj/clothing/belt_overlays.dmi and b/icons/obj/clothing/belt_overlays.dmi differ
diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi
index 4739498c16426..b2b3d333bb44f 100644
Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ
diff --git a/icons/obj/clothing/head/hats.dmi b/icons/obj/clothing/head/hats.dmi
index da4a30e996740..2ce0eebb2ad22 100644
Binary files a/icons/obj/clothing/head/hats.dmi and b/icons/obj/clothing/head/hats.dmi differ
diff --git a/icons/obj/clothing/head/helmet.dmi b/icons/obj/clothing/head/helmet.dmi
index cc54b2bf92934..621afe57ddce4 100644
Binary files a/icons/obj/clothing/head/helmet.dmi and b/icons/obj/clothing/head/helmet.dmi differ
diff --git a/icons/obj/clothing/headsets.dmi b/icons/obj/clothing/headsets.dmi
index b977487e2c6ce..57e67e5761a0c 100644
Binary files a/icons/obj/clothing/headsets.dmi and b/icons/obj/clothing/headsets.dmi differ
diff --git a/icons/obj/clothing/modsuit/mod_clothing.dmi b/icons/obj/clothing/modsuit/mod_clothing.dmi
index 6ab49417aa52f..160606c790afa 100644
Binary files a/icons/obj/clothing/modsuit/mod_clothing.dmi and b/icons/obj/clothing/modsuit/mod_clothing.dmi differ
diff --git a/icons/obj/clothing/modsuit/mod_modules.dmi b/icons/obj/clothing/modsuit/mod_modules.dmi
index 36d95aa61fdbb..5cab83c56d5b2 100644
Binary files a/icons/obj/clothing/modsuit/mod_modules.dmi and b/icons/obj/clothing/modsuit/mod_modules.dmi differ
diff --git a/icons/obj/clothing/suits/armor.dmi b/icons/obj/clothing/suits/armor.dmi
index b1763f5453ffe..b2c9a1aa8b430 100644
Binary files a/icons/obj/clothing/suits/armor.dmi and b/icons/obj/clothing/suits/armor.dmi differ
diff --git a/icons/obj/clothing/suits/utility.dmi b/icons/obj/clothing/suits/utility.dmi
index 25fb8fd502a35..f8e3c4ce46897 100644
Binary files a/icons/obj/clothing/suits/utility.dmi and b/icons/obj/clothing/suits/utility.dmi differ
diff --git a/icons/obj/cosmetic.dmi b/icons/obj/cosmetic.dmi
index b04bde541ad6c..e9f831fbc9690 100644
Binary files a/icons/obj/cosmetic.dmi and b/icons/obj/cosmetic.dmi differ
diff --git a/icons/obj/devices/mecha_equipment.dmi b/icons/obj/devices/mecha_equipment.dmi
index 90f0ce8c736cf..ebfa5438ae911 100644
Binary files a/icons/obj/devices/mecha_equipment.dmi and b/icons/obj/devices/mecha_equipment.dmi differ
diff --git a/icons/obj/devices/new_assemblies.dmi b/icons/obj/devices/new_assemblies.dmi
index 1de208a7736ce..7bf96e5ba92e3 100644
Binary files a/icons/obj/devices/new_assemblies.dmi and b/icons/obj/devices/new_assemblies.dmi differ
diff --git a/icons/obj/devices/voice.dmi b/icons/obj/devices/voice.dmi
index 1e875d9323038..4188d7867eebd 100644
Binary files a/icons/obj/devices/voice.dmi and b/icons/obj/devices/voice.dmi differ
diff --git a/icons/obj/drinks/bottles.dmi b/icons/obj/drinks/bottles.dmi
index 205a67c84e20d..2bdacf0426506 100644
Binary files a/icons/obj/drinks/bottles.dmi and b/icons/obj/drinks/bottles.dmi differ
diff --git a/icons/obj/fishing.dmi b/icons/obj/fishing.dmi
index 92d1cf9a12231..2344d2b8ed9e6 100644
Binary files a/icons/obj/fishing.dmi and b/icons/obj/fishing.dmi differ
diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi
index 9ad8d3235e1f0..7b6afcc37ffbe 100644
Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ
diff --git a/icons/obj/food/lizard.dmi b/icons/obj/food/lizard.dmi
index 15bed265e2f41..29b35cd8a96c5 100644
Binary files a/icons/obj/food/lizard.dmi and b/icons/obj/food/lizard.dmi differ
diff --git a/icons/obj/food/martian.dmi b/icons/obj/food/martian.dmi
index 79efcd1813d58..829cf421cfb51 100644
Binary files a/icons/obj/food/martian.dmi and b/icons/obj/food/martian.dmi differ
diff --git a/icons/obj/food/meat.dmi b/icons/obj/food/meat.dmi
index bf0b1df4f4cd2..ca3007749e7e6 100644
Binary files a/icons/obj/food/meat.dmi and b/icons/obj/food/meat.dmi differ
diff --git a/icons/obj/food/mexican.dmi b/icons/obj/food/mexican.dmi
index ba02c15a0b577..772d6b2e3fc74 100644
Binary files a/icons/obj/food/mexican.dmi and b/icons/obj/food/mexican.dmi differ
diff --git a/icons/obj/food/piecake.dmi b/icons/obj/food/piecake.dmi
index e6c0a71022d50..1097c9d2acd3b 100644
Binary files a/icons/obj/food/piecake.dmi and b/icons/obj/food/piecake.dmi differ
diff --git a/icons/obj/food/spaghetti.dmi b/icons/obj/food/spaghetti.dmi
index 1c97a45e7b788..0d5e473e9b4b6 100644
Binary files a/icons/obj/food/spaghetti.dmi and b/icons/obj/food/spaghetti.dmi differ
diff --git a/icons/obj/machines/big_manipulator.dmi b/icons/obj/machines/big_manipulator.dmi
new file mode 100644
index 0000000000000..b6e878e189842
Binary files /dev/null and b/icons/obj/machines/big_manipulator.dmi differ
diff --git a/icons/obj/machines/big_manipulator_parts/big_manipulator_core.dmi b/icons/obj/machines/big_manipulator_parts/big_manipulator_core.dmi
new file mode 100644
index 0000000000000..614b4d51cbbf9
Binary files /dev/null and b/icons/obj/machines/big_manipulator_parts/big_manipulator_core.dmi differ
diff --git a/icons/obj/machines/big_manipulator_parts/big_manipulator_hand.dmi b/icons/obj/machines/big_manipulator_parts/big_manipulator_hand.dmi
new file mode 100644
index 0000000000000..e165441e8052e
Binary files /dev/null and b/icons/obj/machines/big_manipulator_parts/big_manipulator_hand.dmi differ
diff --git a/icons/obj/machines/gravity_generator.dmi b/icons/obj/machines/gravity_generator.dmi
index 69395034dc840..18ad0ca0c20af 100644
Binary files a/icons/obj/machines/gravity_generator.dmi and b/icons/obj/machines/gravity_generator.dmi differ
diff --git a/icons/obj/machines/ltsrbt.dmi b/icons/obj/machines/ltsrbt.dmi
new file mode 100644
index 0000000000000..cdb7e06cbb3df
Binary files /dev/null and b/icons/obj/machines/ltsrbt.dmi differ
diff --git a/icons/obj/machines/telecomms.dmi b/icons/obj/machines/telecomms.dmi
index f1380268c29cf..1d27e0b10b2d6 100644
Binary files a/icons/obj/machines/telecomms.dmi and b/icons/obj/machines/telecomms.dmi differ
diff --git a/icons/obj/machines/vending.dmi b/icons/obj/machines/vending.dmi
index b9a9ba9568291..319771e4e7fb5 100644
Binary files a/icons/obj/machines/vending.dmi and b/icons/obj/machines/vending.dmi differ
diff --git a/icons/obj/medical/chemical.dmi b/icons/obj/medical/chemical.dmi
index 84dfd01d2d455..e362c5126e193 100644
Binary files a/icons/obj/medical/chemical.dmi and b/icons/obj/medical/chemical.dmi differ
diff --git a/icons/obj/pipes_n_cables/disposal.dmi b/icons/obj/pipes_n_cables/disposal.dmi
index 41207b7a7cd6f..a65413d3d007c 100644
Binary files a/icons/obj/pipes_n_cables/disposal.dmi and b/icons/obj/pipes_n_cables/disposal.dmi differ
diff --git a/icons/obj/service/broadcast.dmi b/icons/obj/service/broadcast.dmi
new file mode 100644
index 0000000000000..e82023791f3d6
Binary files /dev/null and b/icons/obj/service/broadcast.dmi differ
diff --git a/icons/obj/service/janitor.dmi b/icons/obj/service/janitor.dmi
index 0e30180832345..9f28c6bbe046e 100644
Binary files a/icons/obj/service/janitor.dmi and b/icons/obj/service/janitor.dmi differ
diff --git a/icons/obj/service/library.dmi b/icons/obj/service/library.dmi
index f9273a55e5530..5c393ae3c8622 100644
Binary files a/icons/obj/service/library.dmi and b/icons/obj/service/library.dmi differ
diff --git a/icons/obj/smooth_structures/grav_field.dmi b/icons/obj/smooth_structures/grav_field.dmi
new file mode 100644
index 0000000000000..4f51707938e9c
Binary files /dev/null and b/icons/obj/smooth_structures/grav_field.dmi differ
diff --git a/icons/obj/smooth_structures/grav_field.png b/icons/obj/smooth_structures/grav_field.png
new file mode 100644
index 0000000000000..5177e57724049
Binary files /dev/null and b/icons/obj/smooth_structures/grav_field.png differ
diff --git a/icons/obj/smooth_structures/grav_field.png.toml b/icons/obj/smooth_structures/grav_field.png.toml
new file mode 100644
index 0000000000000..49f4000c213db
--- /dev/null
+++ b/icons/obj/smooth_structures/grav_field.png.toml
@@ -0,0 +1,5 @@
+output_name = "grav_field"
+template = "bitmask/diagonal_32x32.toml"
+
+[animation]
+delays = [1, 1, 1]
diff --git a/icons/obj/smooth_structures/grav_field_emissive.dmi b/icons/obj/smooth_structures/grav_field_emissive.dmi
new file mode 100644
index 0000000000000..a2db63f082a5b
Binary files /dev/null and b/icons/obj/smooth_structures/grav_field_emissive.dmi differ
diff --git a/icons/obj/smooth_structures/grav_field_emissive.png b/icons/obj/smooth_structures/grav_field_emissive.png
new file mode 100644
index 0000000000000..d3746ac5b63ac
Binary files /dev/null and b/icons/obj/smooth_structures/grav_field_emissive.png differ
diff --git a/icons/obj/smooth_structures/grav_field_emissive.png.toml b/icons/obj/smooth_structures/grav_field_emissive.png.toml
new file mode 100644
index 0000000000000..ba6a7f73aaf7b
--- /dev/null
+++ b/icons/obj/smooth_structures/grav_field_emissive.png.toml
@@ -0,0 +1,5 @@
+output_name = "grav_field_emissive"
+template = "bitmask/diagonal_32x32.toml"
+
+[animation]
+delays = [1, 1, 1]
diff --git a/icons/obj/storage/box.dmi b/icons/obj/storage/box.dmi
index 01588bd050f74..747fb5462c7df 100644
Binary files a/icons/obj/storage/box.dmi and b/icons/obj/storage/box.dmi differ
diff --git a/icons/obj/storage/case.dmi b/icons/obj/storage/case.dmi
index a29fd3a6f37c0..94b7251f93f46 100644
Binary files a/icons/obj/storage/case.dmi and b/icons/obj/storage/case.dmi differ
diff --git a/icons/obj/storage/crates.dmi b/icons/obj/storage/crates.dmi
index 46c61f8299767..a5a26c285a7d6 100644
Binary files a/icons/obj/storage/crates.dmi and b/icons/obj/storage/crates.dmi differ
diff --git a/icons/obj/toys/stickers.dmi b/icons/obj/toys/stickers.dmi
index 37780f5fd6cfe..80c0e138e38f9 100644
Binary files a/icons/obj/toys/stickers.dmi and b/icons/obj/toys/stickers.dmi differ
diff --git a/icons/obj/toys/toy.dmi b/icons/obj/toys/toy.dmi
index 8d77fd0c757a1..bc6f2f75424c3 100644
Binary files a/icons/obj/toys/toy.dmi and b/icons/obj/toys/toy.dmi differ
diff --git a/icons/obj/vending_restock.dmi b/icons/obj/vending_restock.dmi
index 836aebca7ae2d..ca8e40349c406 100644
Binary files a/icons/obj/vending_restock.dmi and b/icons/obj/vending_restock.dmi differ
diff --git a/icons/obj/weapons/bows/quivers.dmi b/icons/obj/weapons/bows/quivers.dmi
index 615f96ee6af6d..86e6ffd2b925a 100644
Binary files a/icons/obj/weapons/bows/quivers.dmi and b/icons/obj/weapons/bows/quivers.dmi differ
diff --git a/icons/obj/weapons/cannons.dmi b/icons/obj/weapons/cannons.dmi
index f0e37c5310ac6..b9735ba0aef9f 100644
Binary files a/icons/obj/weapons/cannons.dmi and b/icons/obj/weapons/cannons.dmi differ
diff --git a/icons/obj/weapons/grenade.dmi b/icons/obj/weapons/grenade.dmi
index b3fb018bafa07..c65f6d0e9fb80 100644
Binary files a/icons/obj/weapons/grenade.dmi and b/icons/obj/weapons/grenade.dmi differ
diff --git a/icons/obj/weapons/guns/ammo.dmi b/icons/obj/weapons/guns/ammo.dmi
index 4cd031af7ee8b..971bdaf4d2041 100644
Binary files a/icons/obj/weapons/guns/ammo.dmi and b/icons/obj/weapons/guns/ammo.dmi differ
diff --git a/icons/obj/weapons/guns/ballistic.dmi b/icons/obj/weapons/guns/ballistic.dmi
index 824d8b7c0a073..4ebb17baec329 100644
Binary files a/icons/obj/weapons/guns/ballistic.dmi and b/icons/obj/weapons/guns/ballistic.dmi differ
diff --git a/icons/obj/weapons/guns/projectiles.dmi b/icons/obj/weapons/guns/projectiles.dmi
index a6cf89e9b910f..cbf79a92b538f 100644
Binary files a/icons/obj/weapons/guns/projectiles.dmi and b/icons/obj/weapons/guns/projectiles.dmi differ
diff --git a/icons/turf/debug.dmi b/icons/turf/debug.dmi
index debc965d0ecd8..848187dd9f03f 100644
Binary files a/icons/turf/debug.dmi and b/icons/turf/debug.dmi differ
diff --git a/icons/turf/overlays.dmi b/icons/turf/overlays.dmi
index c9decbc5a3af3..2b78f1ae40b41 100644
Binary files a/icons/turf/overlays.dmi and b/icons/turf/overlays.dmi differ
diff --git a/icons/ui/achievements/achievements.dmi b/icons/ui/achievements/achievements.dmi
index 143d0dc0a03ae..740759467e0cc 100644
Binary files a/icons/ui/achievements/achievements.dmi and b/icons/ui/achievements/achievements.dmi differ
diff --git a/interface/interface.dm b/interface/interface.dm
index a32bb758a204f..c90abd9583c45 100644
--- a/interface/interface.dm
+++ b/interface/interface.dm
@@ -58,45 +58,45 @@
set desc = "Report an issue"
set hidden = TRUE
var/githuburl = CONFIG_GET(string/githuburl)
- if(githuburl)
- var/message = "This will open the Github issue reporter in your browser. Are you sure?"
- if(GLOB.revdata.testmerge.len)
- message += " The following experimental changes are active and are probably the cause of any new or sudden issues you may experience. If possible, please try to find a specific thread for your issue instead of posting to the general issue tracker: "
- message += GLOB.revdata.GetTestMergeInfo(FALSE)
- // We still use tgalert here because some people were concerned that if someone wanted to report that tgui wasn't working
- // then the report issue button being tgui-based would be problematic.
- if(tgalert(src, message, "Report Issue","Yes","No")!="Yes")
- return
+ if(!githuburl)
+ to_chat(src, span_danger("The Github URL is not set in the server configuration."))
+ return
- // Keep a static version of the template to avoid reading file
- var/static/issue_template = file2text(".github/ISSUE_TEMPLATE/bug_report.md")
+ var/testmerge_data = GLOB.revdata.testmerge
+ var/has_testmerge_data = (length(testmerge_data) != 0)
- // Get a local copy of the template for modification
- var/local_template = issue_template
+ var/message = "This will open the Github issue reporter in your browser. Are you sure?"
+ if(has_testmerge_data)
+ message += " The following experimental changes are active and are probably the cause of any new or sudden issues you may experience. If possible, please try to find a specific thread for your issue instead of posting to the general issue tracker: "
+ message += GLOB.revdata.GetTestMergeInfo(FALSE)
- // Remove comment header
- var/content_start = findtext(local_template, "<")
- if(content_start)
- local_template = copytext(local_template, content_start)
+ // We still use tgalert here because some people were concerned that if someone wanted to report that tgui wasn't working
+ // then the report issue button being tgui-based would be problematic.
+ if(tgalert(src, message, "Report Issue","Yes","No") != "Yes")
+ return
- // Insert round
- if(GLOB.round_id)
- local_template = replacetext(local_template, "## Round ID:\n", "## Round ID:\n[GLOB.round_id]")
+ var/base_link = githuburl + "/issues/new?template=bug_report_form.yml"
+ var/list/concatable = list(base_link)
- // Insert testmerges
- if(GLOB.revdata.testmerge.len)
- var/list/all_tms = list()
- for(var/entry in GLOB.revdata.testmerge)
- var/datum/tgs_revision_information/test_merge/tm = entry
- all_tms += "- \[[tm.title]\]([githuburl]/pull/[tm.number])"
- var/all_tms_joined = all_tms.Join("\n") // for some reason this can't go in the []
- local_template = replacetext(local_template, "## Testmerges:\n", "## Testmerges:\n[all_tms_joined]")
+ var/client_version = "[byond_version].[byond_build]"
+ concatable += ("&reporting-version=" + client_version)
+
+ // the way it works is that we use the ID's that are baked into the template YML and replace them with values that we can collect in game.
+ if(GLOB.round_id)
+ concatable += ("&round-id=" + GLOB.round_id)
+
+ // Insert testmerges
+ if(has_testmerge_data)
+ var/list/all_tms = list()
+ for(var/entry in testmerge_data)
+ var/datum/tgs_revision_information/test_merge/tm = entry
+ all_tms += "- \[[tm.title]\]([githuburl]/pull/[tm.number])"
+ var/all_tms_joined = jointext(all_tms, "%0A") // %0A is a newline for URL encoding because i don't trust \n to not break
+
+ concatable += ("&test-merges=" + all_tms_joined)
+
+ DIRECT_OUTPUT(src, link(jointext(concatable, "")))
- var/url_params = "Reporting client version: [byond_version].[byond_build]\n\n[local_template]"
- DIRECT_OUTPUT(src, link("[githuburl]/issues/new?body=[url_encode(url_params)]"))
- else
- to_chat(src, span_danger("The Github URL is not set in the server configuration."))
- return
/client/verb/changelog()
set name = "Changelog"
diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm
index 1ee06ed48550d..e0e1181f93c98 100644
--- a/interface/stylesheet.dm
+++ b/interface/stylesheet.dm
@@ -51,6 +51,7 @@ em {font-style: normal; font-weight: bold;}
.syndradio {color: #6d3f40;}
.centcomradio {color: #686868;}
.aiprivradio {color: #ff00ff;}
+.enteradio {color: #00ff99;}
.redteamradio {color: #ff0000;}
.blueteamradio {color: #0000ff;}
.greenteamradio {color: #00ff00;}
diff --git a/lua/SS13_base.lua b/lua/SS13_base.lua
index 2b0645172ea1c..23f464bf328ab 100644
--- a/lua/SS13_base.lua
+++ b/lua/SS13_base.lua
@@ -56,7 +56,10 @@ end
local function signal_handler(data, ...)
local output = 0
for func, _ in data.functions do
- output = bit32.bor(output, func(...))
+ local result = func(...)
+ if type(result) == "number" then
+ output = bit32.bor(output, math.floor(result))
+ end
end
return output
end
diff --git a/modular_doppler/cryosleep/code/ai.dm b/modular_doppler/cryosleep/code/ai.dm
index 5397311dc2f89..272998265b802 100644
--- a/modular_doppler/cryosleep/code/ai.dm
+++ b/modular_doppler/cryosleep/code/ai.dm
@@ -3,7 +3,7 @@
set desc = "Puts the current AI personality into cryogenic stasis, freeing the space for another."
set category = "AI Commands"
- if(incapacitated())
+ if(incapacitated)
return
switch(alert("Would you like to enter cryo? This will ghost you. Remember to AHELP before cryoing out of important roles, even with no admins online.",,"Yes.","No."))
if("Yes.")
diff --git a/sound/ambience/antag/heretic/attribution.txt b/sound/ambience/antag/heretic/attribution.txt
new file mode 100644
index 0000000000000..8744b2497f5bd
--- /dev/null
+++ b/sound/ambience/antag/heretic/attribution.txt
@@ -0,0 +1 @@
+heretic_sacrifice.ogg - made by sadboysusss, License: CC-by-SA
\ No newline at end of file
diff --git a/sound/ambience/antag/heretic/heretic_sacrifice.ogg b/sound/ambience/antag/heretic/heretic_sacrifice.ogg
new file mode 100644
index 0000000000000..5a8efb6508356
Binary files /dev/null and b/sound/ambience/antag/heretic/heretic_sacrifice.ogg differ
diff --git a/sound/ambience/shipambience.ogg b/sound/ambience/shipambience.ogg
index 51e090b02c81c..68a9182fa6672 100644
Binary files a/sound/ambience/shipambience.ogg and b/sound/ambience/shipambience.ogg differ
diff --git a/sound/attributions.txt b/sound/attributions.txt
index 123fde0794c19..3a2468205d027 100644
--- a/sound/attributions.txt
+++ b/sound/attributions.txt
@@ -209,3 +209,7 @@ beaker_pickup.ogg was made by lowering pitch:
Bottle Tap.wav by alex_alexalex -- https://freesound.org/s/395492/ -- License: Attribution NonCommercial 3.0
beaker_place.ogg was made by cutting and lowering pitch:
place glass object.wav by milpower -- https://freesound.org/s/353105/ -- License: Creative Commons 0
+
+glass_reverse.ogg is adapted from a combination of:
+https://freesound.org/people/C_Rogers/sounds/203368/ -- glass-shattering-hit_01.ogg by C_Rogers on freesound.org (CC0)
+https://freesound.org/people/Czarcazas/sounds/330800/ -- Audio reversal/fading of Shattering Glass (Small) by Czarcazas -- https://freesound.org/s/330800/ -- License: Attribution 3.0
\ No newline at end of file
diff --git a/sound/creatures/fish/attritbution.txt b/sound/creatures/fish/attritbution.txt
new file mode 100644
index 0000000000000..2b3d80f408e20
--- /dev/null
+++ b/sound/creatures/fish/attritbution.txt
@@ -0,0 +1,7 @@
+{
+fish_drop1.ogg - fish slap ground or snow writhing wet.wav by kyles -- https://freesound.org/s/450830/ -- License: Creative Commons 0
+fish_pickup1.ogg - fish slap ground or snow writhing wet.wav by kyles -- https://freesound.org/s/450830/ -- License: Creative Commons 0
+fish_pickup2.ogg - fish slap ground or snow writhing wet.wav by kyles -- https://freesound.org/s/450830/ -- License: Creative Commons 0
+fish_slap1.ogg - Slap - Cartoony by AdminMP -- https://freesound.org/s/383201/ -- License: Creative Commons 0
+fish_slap2.ogg - Major punch by janbezouska -- https://freesound.org/s/399183/ -- License: Creative Commons 0
+} - edited by sadboysuss
diff --git a/sound/creatures/fish/fish_drop1.ogg b/sound/creatures/fish/fish_drop1.ogg
new file mode 100644
index 0000000000000..3c658a197688c
Binary files /dev/null and b/sound/creatures/fish/fish_drop1.ogg differ
diff --git a/sound/creatures/fish/fish_pickup1.ogg b/sound/creatures/fish/fish_pickup1.ogg
new file mode 100644
index 0000000000000..7f1fe68080b10
Binary files /dev/null and b/sound/creatures/fish/fish_pickup1.ogg differ
diff --git a/sound/creatures/fish/fish_pickup2.ogg b/sound/creatures/fish/fish_pickup2.ogg
new file mode 100644
index 0000000000000..70d240bad667e
Binary files /dev/null and b/sound/creatures/fish/fish_pickup2.ogg differ
diff --git a/sound/creatures/fish/fish_slap1.ogg b/sound/creatures/fish/fish_slap1.ogg
new file mode 100644
index 0000000000000..984e1cf10883a
Binary files /dev/null and b/sound/creatures/fish/fish_slap1.ogg differ
diff --git a/sound/creatures/fish/fish_slap2.ogg b/sound/creatures/fish/fish_slap2.ogg
new file mode 100644
index 0000000000000..581cf17e6885f
Binary files /dev/null and b/sound/creatures/fish/fish_slap2.ogg differ
diff --git a/sound/effects/energyshieldbash.ogg b/sound/effects/energyshieldbash.ogg
new file mode 100644
index 0000000000000..c8d5bee557222
Binary files /dev/null and b/sound/effects/energyshieldbash.ogg differ
diff --git a/sound/effects/glass_reverse.ogg b/sound/effects/glass_reverse.ogg
new file mode 100644
index 0000000000000..af1492d9b86b4
Binary files /dev/null and b/sound/effects/glass_reverse.ogg differ
diff --git a/sound/effects/muffspeech/muffspeech1.ogg b/sound/effects/muffspeech/muffspeech1.ogg
new file mode 100644
index 0000000000000..b8b2f5f40b19d
Binary files /dev/null and b/sound/effects/muffspeech/muffspeech1.ogg differ
diff --git a/sound/effects/muffspeech/muffspeech2.ogg b/sound/effects/muffspeech/muffspeech2.ogg
new file mode 100644
index 0000000000000..9ffecadf61e06
Binary files /dev/null and b/sound/effects/muffspeech/muffspeech2.ogg differ
diff --git a/sound/effects/muffspeech/muffspeech3.ogg b/sound/effects/muffspeech/muffspeech3.ogg
new file mode 100644
index 0000000000000..dff0e567daccc
Binary files /dev/null and b/sound/effects/muffspeech/muffspeech3.ogg differ
diff --git a/sound/effects/muffspeech/muffspeech4.ogg b/sound/effects/muffspeech/muffspeech4.ogg
new file mode 100644
index 0000000000000..4e46c7a707acc
Binary files /dev/null and b/sound/effects/muffspeech/muffspeech4.ogg differ
diff --git a/sound/effects/muffspeech/muffspeech5.ogg b/sound/effects/muffspeech/muffspeech5.ogg
new file mode 100644
index 0000000000000..ff1c9948c5621
Binary files /dev/null and b/sound/effects/muffspeech/muffspeech5.ogg differ
diff --git a/sound/effects/muffspeech/muffspeech6.ogg b/sound/effects/muffspeech/muffspeech6.ogg
new file mode 100644
index 0000000000000..13b70731ac3e0
Binary files /dev/null and b/sound/effects/muffspeech/muffspeech6.ogg differ
diff --git a/sound/effects/muffspeech/muffspeech7.ogg b/sound/effects/muffspeech/muffspeech7.ogg
new file mode 100644
index 0000000000000..ea566e6ef5872
Binary files /dev/null and b/sound/effects/muffspeech/muffspeech7.ogg differ
diff --git a/sound/effects/muffspeech/muffspeech8.ogg b/sound/effects/muffspeech/muffspeech8.ogg
new file mode 100644
index 0000000000000..ad51432d2da54
Binary files /dev/null and b/sound/effects/muffspeech/muffspeech8.ogg differ
diff --git a/sound/effects/muffspeech/muffspeech9.ogg b/sound/effects/muffspeech/muffspeech9.ogg
new file mode 100644
index 0000000000000..5d1be3b745f3e
Binary files /dev/null and b/sound/effects/muffspeech/muffspeech9.ogg differ
diff --git a/sound/items/attributions.txt b/sound/items/attributions.txt
index 9ad1a09d8cb41..a9fa969808060 100644
--- a/sound/items/attributions.txt
+++ b/sound/items/attributions.txt
@@ -31,8 +31,6 @@ handcuffs_drop.ogg - handcuffs.ogg by kimuracarter -- https://freesound.org/s/52
handcuffs_pick_up.ogg - handcuffs.ogg by kimuracarter -- https://freesound.org/s/528749/ -- License: Attribution 3.0
plastic_shield_drop.ogg - made by sadboysuss -- License: CC-by-SA
plastic_shield_pick_up.ogg - made by sadboysuss -- License: CC-by-SA
-stun_baton_drop.ogg - Fn P90 Submachine Gun 5.7Mm. Mechan; Empty Mag Inserted Into And Pulled Out Slow And Various 02 by PNMCarrieRailfan -- https://freesound.org/s/682041/ -- License: Attribution NonCommercial 4.0
-stun_baton_pick_up.ogg - Fn P90 Submachine Gun 5.7Mm. Mechan; Empty Mag Inserted Into And Pulled Out Slow And Various 02 by PNMCarrieRailfan -- https://freesound.org/s/682041/ -- License: Attribution NonCommercial 4.0
pepper_spray_drop.ogg - Spray Paint Shake Slow Five.wav by cbakos -- https://freesound.org/s/200376/ -- License: Creative Commons 0
pepper_spray_pick_up.ogg - Spray Paint Shake Slow Five.wav by cbakos -- https://freesound.org/s/200376/ -- License: Creative Commons 0
grenade_drop.ogg - made by sadboysuss -- License: CC-by-SA
@@ -56,3 +54,21 @@ gas_tank_drop.ogg
gas_tank_pick_up.ogg
} - https://freesound.org/people/Globofonia/sounds/698346/ , License CC0
edited by grungussuss
+
+{
+cardboad_box_open.ogg - made by sadboysuss
+cardboad_box_rustle.ogg - made by sadboysuss
+toolbox_open.ogg - made by sadboysuss
+toolbox_rustle.ogg - made by sadboysuss
+medkit_rustle.ogg - made by sadboysuss
+} - license: CC-by-SA
+
+{
+glove_pick_up.ogg - made by sadboysuss
+glove_drop.ogg - made by sadboysuss
+} - license: CC-by-SA
+glove_equip.ogg - LETHRCreak_Leather Belt Short Creak 01_PF_365 DAYS OF SOUND by itmightgetloud -- https://freesound.org/s/751281/ -- License: Creative Commons 0
+
+lead_pipe_hit.ogg - jixaw-metal-pipe-falling-sound.mp3 by thenotcheeseman -- https://freesound.org/s/679206/ -- License: Creative Commons 0
+lead_pipe_drop.ogg - jixaw-metal-pipe-falling-sound.mp3 by thenotcheeseman -- https://freesound.org/s/679206/ -- License: Creative Commons 0
+lead_pipe_pickup.ogg - Metal pipe hitting the ground.flac by CGEffex -- https://freesound.org/s/93962/ -- License: Attribution 4.0
diff --git a/sound/items/baton/attribution.txt b/sound/items/baton/attribution.txt
new file mode 100644
index 0000000000000..b580347bf6100
--- /dev/null
+++ b/sound/items/baton/attribution.txt
@@ -0,0 +1,12 @@
+stun_baton_inactive_drop.ogg - Fn P90 Submachine Gun 5.7Mm. Mechan; Empty Mag Inserted Into And Pulled Out Slow And Various 02 by PNMCarrieRailfan -- https://freesound.org/s/682041/ -- License: Attribution NonCommercial 4.0
+stun_baton_inactive_pickup.ogg - Fn P90 Submachine Gun 5.7Mm. Mechan; Empty Mag Inserted Into And Pulled Out Slow And Various 02 by PNMCarrieRailfan -- https://freesound.org/s/682041/ -- License: Attribution NonCommercial 4.0
+{
+telescopic_baton_folded_drop.ogg
+telescopic_baton_folded_pickup.ogg
+telescopic_baton_unfolded_drop.ogg
+telescopic_baton_unfolded_pickup.ogg
+} - made by sadboysuss, license: CC-BY-SA
+contractor_baton_unfolded_drop.ogg is spliced with Taser by JavierZumer -- https://freesound.org/s/257236/ -- License: Attribution 4.0
+contractor_baton_unfolded_pickup.ogg is spliced with Taser by JavierZumer -- https://freesound.org/s/257236/ -- License: Attribution 4.0
+stun_baton_active_drop.ogg is stun_baton_inactive_drop.ogg spliced with Taser by JavierZumer -- https://freesound.org/s/257236/ -- License: Attribution 4.0
+stun_baton_active_pickup.ogg is stun_baton_inactive_pickup.ogg spliced with Taser by JavierZumer -- https://freesound.org/s/257236/ -- License: Attribution 4.0
diff --git a/sound/items/baton/contractor_baton_unfolded_drop.ogg b/sound/items/baton/contractor_baton_unfolded_drop.ogg
new file mode 100644
index 0000000000000..acebcd9d053c0
Binary files /dev/null and b/sound/items/baton/contractor_baton_unfolded_drop.ogg differ
diff --git a/sound/items/baton/contractor_baton_unfolded_pickup.ogg b/sound/items/baton/contractor_baton_unfolded_pickup.ogg
new file mode 100644
index 0000000000000..59ebc61163850
Binary files /dev/null and b/sound/items/baton/contractor_baton_unfolded_pickup.ogg differ
diff --git a/sound/items/baton/stun_baton_active_drop.ogg b/sound/items/baton/stun_baton_active_drop.ogg
new file mode 100644
index 0000000000000..a5e7cc8474948
Binary files /dev/null and b/sound/items/baton/stun_baton_active_drop.ogg differ
diff --git a/sound/items/baton/stun_baton_active_pickup.ogg b/sound/items/baton/stun_baton_active_pickup.ogg
new file mode 100644
index 0000000000000..3f4908c094556
Binary files /dev/null and b/sound/items/baton/stun_baton_active_pickup.ogg differ
diff --git a/sound/items/stun_baton_drop.ogg b/sound/items/baton/stun_baton_inactive_drop.ogg
similarity index 100%
rename from sound/items/stun_baton_drop.ogg
rename to sound/items/baton/stun_baton_inactive_drop.ogg
diff --git a/sound/items/stun_baton_pick_up.ogg b/sound/items/baton/stun_baton_inactive_pickup.ogg
similarity index 100%
rename from sound/items/stun_baton_pick_up.ogg
rename to sound/items/baton/stun_baton_inactive_pickup.ogg
diff --git a/sound/items/baton/telescopic_baton_folded_drop.ogg b/sound/items/baton/telescopic_baton_folded_drop.ogg
new file mode 100644
index 0000000000000..e61d11d0540ed
Binary files /dev/null and b/sound/items/baton/telescopic_baton_folded_drop.ogg differ
diff --git a/sound/items/baton/telescopic_baton_folded_pickup.ogg b/sound/items/baton/telescopic_baton_folded_pickup.ogg
new file mode 100644
index 0000000000000..b0f126a76d683
Binary files /dev/null and b/sound/items/baton/telescopic_baton_folded_pickup.ogg differ
diff --git a/sound/items/baton/telescopic_baton_unfolded_drop.ogg b/sound/items/baton/telescopic_baton_unfolded_drop.ogg
new file mode 100644
index 0000000000000..dc6a11a90aef2
Binary files /dev/null and b/sound/items/baton/telescopic_baton_unfolded_drop.ogg differ
diff --git a/sound/items/baton/telescopic_baton_unfolded_pickup.ogg b/sound/items/baton/telescopic_baton_unfolded_pickup.ogg
new file mode 100644
index 0000000000000..2a7eb3d27882b
Binary files /dev/null and b/sound/items/baton/telescopic_baton_unfolded_pickup.ogg differ
diff --git a/sound/items/cardboard_box_open.ogg b/sound/items/cardboard_box_open.ogg
new file mode 100644
index 0000000000000..1ad890d159a59
Binary files /dev/null and b/sound/items/cardboard_box_open.ogg differ
diff --git a/sound/items/cardboard_box_rustle.ogg b/sound/items/cardboard_box_rustle.ogg
new file mode 100644
index 0000000000000..01dcc5567b721
Binary files /dev/null and b/sound/items/cardboard_box_rustle.ogg differ
diff --git a/sound/items/equip/glove_equip.ogg b/sound/items/equip/glove_equip.ogg
new file mode 100644
index 0000000000000..33ab18a5e6e6a
Binary files /dev/null and b/sound/items/equip/glove_equip.ogg differ
diff --git a/sound/items/handling/attribution.txt b/sound/items/handling/attribution.txt
new file mode 100644
index 0000000000000..c1a72a40c3c91
--- /dev/null
+++ b/sound/items/handling/attribution.txt
@@ -0,0 +1,7 @@
+{
+rcd_drop.ogg - made by sadboysuss - license: CC-by-SA
+rcd_pickup.ogg - made by sadboysuss - license: CC-by-SA
+rpd_drop.ogg - made by sadboysuss - license: CC-by-SA
+rpd_pickup.ogg - made by sadboysuss - license: CC-by-SA
+tool_switch.ogg - made by sadboysuss - license: CC-by-SA
+} - edited by sadboysuss
\ No newline at end of file
diff --git a/sound/items/handling/glove_drop.ogg b/sound/items/handling/glove_drop.ogg
new file mode 100644
index 0000000000000..bfd490e94a8ae
Binary files /dev/null and b/sound/items/handling/glove_drop.ogg differ
diff --git a/sound/items/handling/glove_pick_up.ogg b/sound/items/handling/glove_pick_up.ogg
new file mode 100644
index 0000000000000..1fd7de9e6b968
Binary files /dev/null and b/sound/items/handling/glove_pick_up.ogg differ
diff --git a/sound/items/handling/rcd_drop.ogg b/sound/items/handling/rcd_drop.ogg
new file mode 100644
index 0000000000000..276a014ae3123
Binary files /dev/null and b/sound/items/handling/rcd_drop.ogg differ
diff --git a/sound/items/handling/rcd_pickup.ogg b/sound/items/handling/rcd_pickup.ogg
new file mode 100644
index 0000000000000..bc7d103800bfa
Binary files /dev/null and b/sound/items/handling/rcd_pickup.ogg differ
diff --git a/sound/items/handling/rpd_drop.ogg b/sound/items/handling/rpd_drop.ogg
new file mode 100644
index 0000000000000..8591719c918ea
Binary files /dev/null and b/sound/items/handling/rpd_drop.ogg differ
diff --git a/sound/items/handling/rpd_pickup.ogg b/sound/items/handling/rpd_pickup.ogg
new file mode 100644
index 0000000000000..ef6bf685d0073
Binary files /dev/null and b/sound/items/handling/rpd_pickup.ogg differ
diff --git a/sound/items/handling/tool_switch.ogg b/sound/items/handling/tool_switch.ogg
new file mode 100644
index 0000000000000..b0cacda41623c
Binary files /dev/null and b/sound/items/handling/tool_switch.ogg differ
diff --git a/sound/items/lead_pipe_drop.ogg b/sound/items/lead_pipe_drop.ogg
new file mode 100644
index 0000000000000..144d24ca94c7a
Binary files /dev/null and b/sound/items/lead_pipe_drop.ogg differ
diff --git a/sound/items/lead_pipe_hit.ogg b/sound/items/lead_pipe_hit.ogg
new file mode 100644
index 0000000000000..51b4dbf60b146
Binary files /dev/null and b/sound/items/lead_pipe_hit.ogg differ
diff --git a/sound/items/lead_pipe_pickup.ogg b/sound/items/lead_pipe_pickup.ogg
new file mode 100644
index 0000000000000..559138d66a53f
Binary files /dev/null and b/sound/items/lead_pipe_pickup.ogg differ
diff --git a/sound/items/medkit_drop.ogg b/sound/items/medkit_drop.ogg
index 227d4a8beb220..3acf1db1abc50 100644
Binary files a/sound/items/medkit_drop.ogg and b/sound/items/medkit_drop.ogg differ
diff --git a/sound/items/medkit_pick_up.ogg b/sound/items/medkit_pick_up.ogg
index e13c6848e44df..90de3a19616ef 100644
Binary files a/sound/items/medkit_pick_up.ogg and b/sound/items/medkit_pick_up.ogg differ
diff --git a/sound/items/medkit_rustle.ogg b/sound/items/medkit_rustle.ogg
new file mode 100644
index 0000000000000..55ebc82b911d5
Binary files /dev/null and b/sound/items/medkit_rustle.ogg differ
diff --git a/sound/items/toolbox_open.ogg b/sound/items/toolbox_open.ogg
new file mode 100644
index 0000000000000..9dea5428d048a
Binary files /dev/null and b/sound/items/toolbox_open.ogg differ
diff --git a/sound/items/toolbox_rustle.ogg b/sound/items/toolbox_rustle.ogg
new file mode 100644
index 0000000000000..939d003b18f5b
Binary files /dev/null and b/sound/items/toolbox_rustle.ogg differ
diff --git a/sound/machines/computer/attribution.txt b/sound/machines/computer/attribution.txt
new file mode 100644
index 0000000000000..ab10c922afb69
--- /dev/null
+++ b/sound/machines/computer/attribution.txt
@@ -0,0 +1,7 @@
+computer_clicks_1.ogg - made by sadboysuss, license: CC-by-SA
+computer_clicks_2.ogg - made by sadboysuss, license: CC-by-SA
+computer_clicks_3.ogg - made by sadboysuss, license: CC-by-SA
+computer_clicks_4.ogg - made by sadboysuss, license: CC-by-SA
+computer_clicks_5.ogg - made by sadboysuss, license: CC-by-SA
+computer_clicks_6.ogg - made by sadboysuss, license: CC-by-SA
+computer_clicks_7.ogg - made by sadboysuss, license: CC-by-SA
\ No newline at end of file
diff --git a/sound/machines/computer/keyboard_clicks_1.ogg b/sound/machines/computer/keyboard_clicks_1.ogg
new file mode 100644
index 0000000000000..b33c6fd56a338
Binary files /dev/null and b/sound/machines/computer/keyboard_clicks_1.ogg differ
diff --git a/sound/machines/computer/keyboard_clicks_2.ogg b/sound/machines/computer/keyboard_clicks_2.ogg
new file mode 100644
index 0000000000000..64d810753c3cb
Binary files /dev/null and b/sound/machines/computer/keyboard_clicks_2.ogg differ
diff --git a/sound/machines/computer/keyboard_clicks_3.ogg b/sound/machines/computer/keyboard_clicks_3.ogg
new file mode 100644
index 0000000000000..0e1bb3696f103
Binary files /dev/null and b/sound/machines/computer/keyboard_clicks_3.ogg differ
diff --git a/sound/machines/computer/keyboard_clicks_4.ogg b/sound/machines/computer/keyboard_clicks_4.ogg
new file mode 100644
index 0000000000000..b700393a9c38e
Binary files /dev/null and b/sound/machines/computer/keyboard_clicks_4.ogg differ
diff --git a/sound/machines/computer/keyboard_clicks_5.ogg b/sound/machines/computer/keyboard_clicks_5.ogg
new file mode 100644
index 0000000000000..d54b211da0217
Binary files /dev/null and b/sound/machines/computer/keyboard_clicks_5.ogg differ
diff --git a/sound/machines/computer/keyboard_clicks_6.ogg b/sound/machines/computer/keyboard_clicks_6.ogg
new file mode 100644
index 0000000000000..84ff3bb7f8003
Binary files /dev/null and b/sound/machines/computer/keyboard_clicks_6.ogg differ
diff --git a/sound/machines/computer/keyboard_clicks_7.ogg b/sound/machines/computer/keyboard_clicks_7.ogg
new file mode 100644
index 0000000000000..39204e360c9f7
Binary files /dev/null and b/sound/machines/computer/keyboard_clicks_7.ogg differ
diff --git a/sound/machines/gravgen/attribution.txt b/sound/machines/gravgen/attribution.txt
new file mode 100644
index 0000000000000..f4aeab2c4902a
--- /dev/null
+++ b/sound/machines/gravgen/attribution.txt
@@ -0,0 +1,6 @@
+{
+grav_gen_start.ogg
+grav_gen_mid1.ogg
+grav_gen_mid2.ogg - + Explosion 7b by LiamG_SFX -- https://freesound.org/s/322492/ -- License: Attribution NonCommercial 4.0
+grav_gen_end.ogg
+} made by sadboysuss by editing a sound made by kayozz , license: CC-by-SA
\ No newline at end of file
diff --git a/sound/machines/gravgen/grav_gen_end.ogg b/sound/machines/gravgen/grav_gen_end.ogg
new file mode 100644
index 0000000000000..a63305708d030
Binary files /dev/null and b/sound/machines/gravgen/grav_gen_end.ogg differ
diff --git a/sound/machines/gravgen/grav_gen_mid1.ogg b/sound/machines/gravgen/grav_gen_mid1.ogg
new file mode 100644
index 0000000000000..e6e38c11d467b
Binary files /dev/null and b/sound/machines/gravgen/grav_gen_mid1.ogg differ
diff --git a/sound/machines/gravgen/grav_gen_mid2.ogg b/sound/machines/gravgen/grav_gen_mid2.ogg
new file mode 100644
index 0000000000000..cf112de1885b4
Binary files /dev/null and b/sound/machines/gravgen/grav_gen_mid2.ogg differ
diff --git a/sound/machines/gravgen/grav_gen_start.ogg b/sound/machines/gravgen/grav_gen_start.ogg
new file mode 100644
index 0000000000000..4a734e5517020
Binary files /dev/null and b/sound/machines/gravgen/grav_gen_start.ogg differ
diff --git a/sound/machines/gravgen/gravgen_mid1.ogg b/sound/machines/gravgen/gravgen_mid1.ogg
deleted file mode 100644
index de2744194bdc6..0000000000000
Binary files a/sound/machines/gravgen/gravgen_mid1.ogg and /dev/null differ
diff --git a/sound/machines/gravgen/gravgen_mid2.ogg b/sound/machines/gravgen/gravgen_mid2.ogg
deleted file mode 100644
index 7b09d566e91eb..0000000000000
Binary files a/sound/machines/gravgen/gravgen_mid2.ogg and /dev/null differ
diff --git a/sound/machines/gravgen/gravgen_mid3.ogg b/sound/machines/gravgen/gravgen_mid3.ogg
deleted file mode 100644
index 6e133b5fcfe60..0000000000000
Binary files a/sound/machines/gravgen/gravgen_mid3.ogg and /dev/null differ
diff --git a/sound/machines/gravgen/gravgen_mid4.ogg b/sound/machines/gravgen/gravgen_mid4.ogg
deleted file mode 100644
index 4f08f5e6d2273..0000000000000
Binary files a/sound/machines/gravgen/gravgen_mid4.ogg and /dev/null differ
diff --git a/sound/machines/lever_start.ogg b/sound/machines/lever_start.ogg
new file mode 100644
index 0000000000000..4160f39026ac0
Binary files /dev/null and b/sound/machines/lever_start.ogg differ
diff --git a/sound/machines/lever_stop.ogg b/sound/machines/lever_stop.ogg
new file mode 100644
index 0000000000000..22f8875019dd4
Binary files /dev/null and b/sound/machines/lever_stop.ogg differ
diff --git a/sound/machines/license.txt b/sound/machines/license.txt
index 6a54969a19170..0d7de5a5dfa3d 100644
--- a/sound/machines/license.txt
+++ b/sound/machines/license.txt
@@ -7,4 +7,8 @@ coffeemaker_brew.ogg originally made by Adriana Lopez (Acekat13X31), edited to r
This is licensed under CC-BY 4.0, found at https://creativecommons.org/licenses/by/4.0/
shutter.ogg adapted from Joseph Sardin on BigSoundBank
-https://bigsoundbank.com/detail-2475-manual-roller-shutter-closing-out-2.html
\ No newline at end of file
+https://bigsoundbank.com/detail-2475-manual-roller-shutter-closing-out-2.html
+
+lever_start.ogg and lever_stop.ogg are made by A_Kuha on FreeSound
+https://freesound.org/people/A_Kuha/sounds/676412
+This is licensed under CC-0, found at https://creativecommons.org/publicdomain/zero/1.0/
diff --git a/sound/voice/breathing.ogg b/sound/voice/breathing.ogg
deleted file mode 100644
index f940a1b211a6b..0000000000000
Binary files a/sound/voice/breathing.ogg and /dev/null differ
diff --git a/sound/voice/breathing/attribution.txt b/sound/voice/breathing/attribution.txt
new file mode 100644
index 0000000000000..20f8ef5df6d1e
--- /dev/null
+++ b/sound/voice/breathing/attribution.txt
@@ -0,0 +1,10 @@
+{
+internals_breathing1.ogg
+internals_breathing2.ogg
+internals_breathing3.ogg
+internals_breathing4.ogg
+internals_breathing5.ogg
+internals_breathing6.ogg
+internals_breathing7.ogg
+internals_breathing8.ogg
+} - foley by sadboysuss, edited by Beeblie , license: CC-by-SA
\ No newline at end of file
diff --git a/sound/voice/breathing/internals_breathing1.ogg b/sound/voice/breathing/internals_breathing1.ogg
new file mode 100644
index 0000000000000..e4f1d564ad697
Binary files /dev/null and b/sound/voice/breathing/internals_breathing1.ogg differ
diff --git a/sound/voice/breathing/internals_breathing2.ogg b/sound/voice/breathing/internals_breathing2.ogg
new file mode 100644
index 0000000000000..7b09c04cc62b5
Binary files /dev/null and b/sound/voice/breathing/internals_breathing2.ogg differ
diff --git a/sound/voice/breathing/internals_breathing3.ogg b/sound/voice/breathing/internals_breathing3.ogg
new file mode 100644
index 0000000000000..0ea34b9024b67
Binary files /dev/null and b/sound/voice/breathing/internals_breathing3.ogg differ
diff --git a/sound/voice/breathing/internals_breathing4.ogg b/sound/voice/breathing/internals_breathing4.ogg
new file mode 100644
index 0000000000000..30718fab3070e
Binary files /dev/null and b/sound/voice/breathing/internals_breathing4.ogg differ
diff --git a/sound/voice/breathing/internals_breathing5.ogg b/sound/voice/breathing/internals_breathing5.ogg
new file mode 100644
index 0000000000000..c78354481955e
Binary files /dev/null and b/sound/voice/breathing/internals_breathing5.ogg differ
diff --git a/sound/voice/breathing/internals_breathing6.ogg b/sound/voice/breathing/internals_breathing6.ogg
new file mode 100644
index 0000000000000..f415845902d98
Binary files /dev/null and b/sound/voice/breathing/internals_breathing6.ogg differ
diff --git a/sound/voice/breathing/internals_breathing7.ogg b/sound/voice/breathing/internals_breathing7.ogg
new file mode 100644
index 0000000000000..946c34d45f307
Binary files /dev/null and b/sound/voice/breathing/internals_breathing7.ogg differ
diff --git a/sound/voice/breathing/internals_breathing8.ogg b/sound/voice/breathing/internals_breathing8.ogg
new file mode 100644
index 0000000000000..36f4925612542
Binary files /dev/null and b/sound/voice/breathing/internals_breathing8.ogg differ
diff --git a/strings/crustacean_replacement.json b/strings/crustacean_replacement.json
new file mode 100644
index 0000000000000..9c1ebabcbc074
--- /dev/null
+++ b/strings/crustacean_replacement.json
@@ -0,0 +1,160 @@
+{
+
+ "crustacean": {
+ "simp": "shrimp",
+ "problem": "prawnblem",
+ "proba": "prawnba",
+ "prob": "prawn",
+ "pawn": "prawn",
+ "cool": "tenta-cool",
+ "bat": "bait",
+ "fuck": "shuck",
+ "brilliant": "gilliant",
+ "totally": "turtally",
+ "confu" : "conchfu",
+ "kungfu": "conchfu",
+ "kung fu": "conch fu",
+ " mull": " mullet",
+ "believe": "bereef",
+ "believ": "bereef",
+ "rage": "rayge",
+ "kid": "squid",
+ "mark": "shark",
+ "tray": "cray",
+ "cry": "cray",
+ "pray": "cray",
+ "comp": "clam",
+ "calm": "clam",
+ "calam": "clam",
+ "ambulance": "clambulance",
+ "bike": "pike",
+ "suspicious": "fishy",
+ " sus ": " fishy ",
+ "sussy": "sushi",
+ "tune": "tuna",
+ "opportunity": "opportunaty",
+ "got ": "cod ",
+ "god": "cod",
+ "caught": "cod",
+ "grapple": "crapple",
+ "grabb": "crappl",
+ " rue": " roe",
+ "grab": "crapple",
+ "self": "shellf",
+ "cell": "shell",
+ "come": "chum",
+ "plank ": "plankton ",
+ "meant": "manta",
+ "skill": "krill",
+ "chill": "krill",
+ "core": "coral",
+ "hell of it": "halibut",
+ "hell": "eel",
+ "whole": "whale",
+ "muscle": "mussel",
+ "cracking" : "kraken",
+ "crackin": "kraken",
+ "opinion": "octopinion",
+ "utter": "otter",
+ "neme": "nemo",
+ "real": "reel",
+ "orc ": "orca ",
+ "ork ": "orca ",
+ "macaroni": "mackarel",
+ "usurer": "loan shark",
+ "chewy": "spongey",
+ "hamburger": "crabby patty",
+ "burger": "patty",
+ "crust": "krust",
+ "offic": "ofish",
+ "outer space": "trouter space",
+ "deepspace": "trouter space",
+ "deep space": "trouter space",
+ "surgeon": "sturgeon",
+ "purpose": "porpoise",
+ "bastard": "basstard",
+ "ballock": "pollock",
+ "fist": "fish",
+ "place": "plaice",
+ "definitively" : "dolphinitely",
+ "enemy": "anemony",
+ "enemies": "anemones",
+ " mob": " lob",
+ "bitch": "beach",
+ " min ": "minnow",
+ "lemme know": "lemminnow",
+ "let me know": "let minnow",
+ "admin": "adminnow",
+ "better": "betta",
+ " ass ": " wrasse ",
+ "asshole" : "wrassehole",
+ "bond" : "pond",
+ "inc": "ink",
+ "anything": "anyfin",
+ "something": "somefin",
+ "anythin": "anyfin",
+ "somethin": "somefin",
+ "someone": "salmon",
+ "coy": "koi",
+ "earring": "herring",
+ "hearin": "herrin",
+ "celebrat": "shellebrat",
+ "santa": "sandy",
+ "claus": "claws",
+ "boss": "bass",
+ "doofus": "doofish",
+ "could": "cod",
+ "what are": "water",
+ "what're": "water",
+ "whatre": "wa'er",
+ "other": "otter",
+ "lots": "lobst",
+ "fumble": "flounder",
+ "serious": "searious",
+ "show": "shoal",
+ "miracle": "mackerel",
+ "trait": "trout",
+ "syndicate": "sea world",
+ "syndies": "fishermen",
+ "syndie": "fisherman",
+ "syndi": "fisherman",
+ "spy": "marine biologist",
+ "above": "upstream",
+ "below": "downstream",
+ "heretic": "herringtic",
+ "cult": "shoalt",
+ "nar'si": "carp'si",
+ "narsi": "carpsi",
+ "blob": "blobfish",
+ "dumbass": "dum bass",
+ "outdone": "troutdone",
+ "quintessen": "squiddessen",
+ "clos": "claws",
+ "absol": "crabsol",
+ "crap": [
+ "carp",
+ "crab"
+ ],
+ "kill": [
+ "krill",
+ "gill"
+ ],
+ "fanta": [
+ "manta",
+ "finta"
+ ],
+ "billion": [
+ "bill-ion",
+ "krillion"
+ ],
+ "click": [
+ "click",
+ "clack"
+ ],
+ "snap": [
+ "snip",
+ "snap"
+ ]
+ }
+
+}
diff --git a/strings/fishing_tips.txt b/strings/fishing_tips.txt
new file mode 100644
index 0000000000000..eda70bb425286
--- /dev/null
+++ b/strings/fishing_tips.txt
@@ -0,0 +1,44 @@
+Did you know? The Freshness jar of natural baits actually contains kronkaine.
+Legends say The Dude once lost his wallet inside a toilet.
+Legends say a famous pirate once lost his precious coffer by the Beach.
+You could buy fish dirt cheap from the black market, but you probably won't get anything actually fresh.
+Rescue hooks can be used to snag in other people. Good for getting husks out of plasma rivers.
+Pufferfish are known for the slow yet lethal poison they store inside their liver.
+Magnet hooks are great to fish anything that's NOT a fish.
+You can perform scanning experiments with an experi-scanner and some fish. They'll give sci some extra techweb points and get you more modules for the fishing portal generator.
+Fish scanning experiments can be automatically performed with an advanced fishing rod. However to print one you need to have at least completed the first one.
+Advanced fishing rods come pre-equipped with a unexhaustible bait that ignores bait preferences of each fish, letting you catch'em all.
+Don't expect to be able to catch a lot of fish without a bait.
+Some fish (mostly predators) are strictly carnivorous and will ignore baits not made of meat or seafood, a few are picky eaters and will only go after the best of baits, while another smaller few are more or less strictly herbivore.
+You can fish at the holodeck beach, if you don't mind the fish being quite fake.
+You may find worms by digging through sand, ash and snow.
+You can revive fish by using a Lazarus Injector on them. However, using Strange Reagent would be a smarter option here.
+You can feed fish outside of an aquarium by tapping them with a can of fish feed.
+More fishing rods and fish cases can be printed at the autolathe.
+Seeking alternative ways to catch fish without bothering to do it yourself? Explosives can be thrown at fishing spots to get several (dead) fishes in a pinch.
+You can raise lobstrosities from chasm chrabs. However, lobstrosities can only be tamed with spare limbs or lavaloop fish while still young.
+Lavaloop fish make for dangerous yet somewhat effective throwing weapons against big fauna.
+The fishing portal generator has different modules, all of which can be unlocked by completing fish scanning experiments... except for the Syndicate one...
+A fish's traits influence how you can catch them. Carnivore fish will ignore dough balls, and herbivore fish ignore anything that's not from botany.
+Telescopic fishing rods can be bought from cargo.
+Once grown from chrabs and tamed, lobstrosities can be heeded to fish on fishing spots for you.
+Aquariums can be upgraded to bioelectricity generators can a specific kit. From there, you can add electric-generating fish like the anxious zip zap to generate power.
+Getting better at fishing will net you some small additional advantages, such as receiving more information when examining a fish or a fishing spot.
+The size and weight of a fish can influence the amount of reagents and fillets you can harvest from them, their force as a weapon and how easy it is to store them in containers.
+While most fish make for shoddy weapons, a few, like the swordfish and the chainsawfish, can be quite powerful. In general, the bigger they are, the more forceful they get.
+Fish can be sold to cargo. While most don't sell for very much, the biggest ones can be sold for a considerable bounty.
+The meat of fish like swordfish, salmon and pufferfish (weren't they poisonous) makes for an excellent ingredient that boosts the quality of the end product.
+Stingrays are known for their stinger, which they use to deliver venom to hostiles.
+Some species of fish can be bred into new species under the right conditions.
+Most fish don't survive outside water, so get them somewhere safe like an aquarium or a fish case, or even a toilet or a moisture trap!
+No matter how you look at it, most people won't care about fishing. Don't let that stop you. They're just jealous.
+To fish on ice you have to puncture the ice layer with a pick or shovel first.
+Depending on the kind of fish inside it and whether they're alive or dead, an aquarium can improve the beauty of the room or worsen it.
+Almost all fish can be ground in an All-in-one-Grinder. Don't think too hard about how you're fitting a giant fish into a blender. Nanotrasen technology is weird like that.
+The sludgefish from the toilets can be used as a steady supply of cheap fish and fillets due to its self-reproducing behaviour. However it's quite fragile.
+In a jiffy, you can scoop tadpoles from ponds with your bare hands, place them inside aquariums and quickly raise them into frogs.
+The legendary fishing hat isn't just cosmetic. Space carps (as well as young lobstrosities and frogs) do truly fear those who wear it.
+Have you ever heard a lobster or crab talk? Well, neither have I, but they say they're quite the fishy punsters.
+You can get an experiscanner from science to perform fish scanning experiments, which can unlock more modules for the fishing portal, as well as fishing technology nodes (better equipment) for research.
+If you have enough credits, you can buy a set of fishing lures from cargo. Each lure allows you to catch different species of fish and won't get consumed, however they need to be spun at intervals to work.
+This may sound silly, but squids and their ink sacs can be used as weapons to temporarily blind people.
\ No newline at end of file
diff --git a/tgstation.dme b/tgstation.dme
index 247b74c759aaf..aa7b0d9b190f9 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -544,6 +544,7 @@
#include "code\_globalvars\time_vars.dm"
#include "code\_globalvars\lists\achievements.dm"
#include "code\_globalvars\lists\ambience.dm"
+#include "code\_globalvars\lists\basic_ai.dm"
#include "code\_globalvars\lists\canisters.dm"
#include "code\_globalvars\lists\cargo.dm"
#include "code\_globalvars\lists\client.dm"
@@ -643,6 +644,7 @@
#include "code\controllers\subsystem\addiction.dm"
#include "code\controllers\subsystem\admin_verbs.dm"
#include "code\controllers\subsystem\ai_controllers.dm"
+#include "code\controllers\subsystem\ai_idle_controllers.dm"
#include "code\controllers\subsystem\air.dm"
#include "code\controllers\subsystem\ambience.dm"
#include "code\controllers\subsystem\area_contents.dm"
@@ -754,6 +756,7 @@
#include "code\controllers\subsystem\persistence\counter_tram_hits.dm"
#include "code\controllers\subsystem\persistence\custom_outfits.dm"
#include "code\controllers\subsystem\persistence\engravings.dm"
+#include "code\controllers\subsystem\persistence\message_bottles.dm"
#include "code\controllers\subsystem\persistence\photo_albums.dm"
#include "code\controllers\subsystem\persistence\piggy_banks.dm"
#include "code\controllers\subsystem\persistence\recipes.dm"
@@ -763,6 +766,7 @@
#include "code\controllers\subsystem\processing\acid.dm"
#include "code\controllers\subsystem\processing\ai_basic_avoidance.dm"
#include "code\controllers\subsystem\processing\ai_behaviors.dm"
+#include "code\controllers\subsystem\processing\ai_idle_behaviors.dm"
#include "code\controllers\subsystem\processing\antag_hud.dm"
#include "code\controllers\subsystem\processing\aura.dm"
#include "code\controllers\subsystem\processing\clock_component.dm"
@@ -861,6 +865,7 @@
#include "code\datums\actions\items\cult_dagger.dm"
#include "code\datums\actions\items\hands_free.dm"
#include "code\datums\actions\items\organ_action.dm"
+#include "code\datums\actions\items\reload_rebar.dm"
#include "code\datums\actions\items\set_internals.dm"
#include "code\datums\actions\items\stealth_box.dm"
#include "code\datums\actions\items\summon_stickmen.dm"
@@ -907,6 +912,7 @@
#include "code\datums\ai\basic_mobs\basic_ai_behaviors\basic_attacking.dm"
#include "code\datums\ai\basic_mobs\basic_ai_behaviors\befriend_target.dm"
#include "code\datums\ai\basic_mobs\basic_ai_behaviors\climb_tree.dm"
+#include "code\datums\ai\basic_mobs\basic_ai_behaviors\emote_with_target.dm"
#include "code\datums\ai\basic_mobs\basic_ai_behaviors\find_parent.dm"
#include "code\datums\ai\basic_mobs\basic_ai_behaviors\nearest_targeting.dm"
#include "code\datums\ai\basic_mobs\basic_ai_behaviors\pick_up_item.dm"
@@ -1092,7 +1098,6 @@
#include "code\datums\components\cracked.dm"
#include "code\datums\components\crank_recharge.dm"
#include "code\datums\components\crate_carrier.dm"
-#include "code\datums\components\creamed.dm"
#include "code\datums\components\cuff_n_stun.dm"
#include "code\datums\components\cult_ritual_item.dm"
#include "code\datums\components\curse_of_hunger.dm"
@@ -1119,6 +1124,7 @@
#include "code\datums\components\evolutionary_leap.dm"
#include "code\datums\components\explodable.dm"
#include "code\datums\components\explode_on_attack.dm"
+#include "code\datums\components\face_decal.dm"
#include "code\datums\components\faction_granter.dm"
#include "code\datums\components\fertile_egg.dm"
#include "code\datums\components\fish_growth.dm"
@@ -1247,6 +1253,7 @@
#include "code\datums\components\spin2win.dm"
#include "code\datums\components\spinny.dm"
#include "code\datums\components\spirit_holding.dm"
+#include "code\datums\components\splat.dm"
#include "code\datums\components\splattercasting.dm"
#include "code\datums\components\squashable.dm"
#include "code\datums\components\squeak.dm"
@@ -1429,6 +1436,7 @@
#include "code\datums\elements\beauty.dm"
#include "code\datums\elements\bed_tucking.dm"
#include "code\datums\elements\befriend_petting.dm"
+#include "code\datums\elements\block_turf_fingerprints.dm"
#include "code\datums\elements\blocks_explosives.dm"
#include "code\datums\elements\body_temp_sensitive.dm"
#include "code\datums\elements\bombable_turf.dm"
@@ -1479,6 +1487,7 @@
#include "code\datums\elements\eyestab.dm"
#include "code\datums\elements\falling_hazard.dm"
#include "code\datums\elements\firestacker.dm"
+#include "code\datums\elements\fish_safe_storage.dm"
#include "code\datums\elements\floorloving.dm"
#include "code\datums\elements\footstep.dm"
#include "code\datums\elements\footstep_override.dm"
@@ -1539,6 +1548,7 @@
#include "code\datums\elements\proficient_miner.dm"
#include "code\datums\elements\projectile_drop.dm"
#include "code\datums\elements\projectile_shield.dm"
+#include "code\datums\elements\quality_food_ingredient.dm"
#include "code\datums\elements\radiation_protected_clothing.dm"
#include "code\datums\elements\radioactive.dm"
#include "code\datums\elements\ranged_armour.dm"
@@ -1858,7 +1868,6 @@
#include "code\datums\status_effects\agent_pinpointer.dm"
#include "code\datums\status_effects\buffs.dm"
#include "code\datums\status_effects\drug_effects.dm"
-#include "code\datums\status_effects\food_effects.dm"
#include "code\datums\status_effects\gas.dm"
#include "code\datums\status_effects\grouped_effect.dm"
#include "code\datums\status_effects\limited_effect.dm"
@@ -1873,9 +1882,11 @@
#include "code\datums\status_effects\buffs\bioware\cortex.dm"
#include "code\datums\status_effects\buffs\bioware\ligaments.dm"
#include "code\datums\status_effects\buffs\bioware\nerves.dm"
+#include "code\datums\status_effects\buffs\food\_food_effect.dm"
#include "code\datums\status_effects\buffs\food\chilling.dm"
-#include "code\datums\status_effects\buffs\food\food_traits.dm"
+#include "code\datums\status_effects\buffs\food\grant_trait.dm"
#include "code\datums\status_effects\buffs\food\haste.dm"
+#include "code\datums\status_effects\buffs\food\speech.dm"
#include "code\datums\status_effects\debuffs\blindness.dm"
#include "code\datums\status_effects\debuffs\choke.dm"
#include "code\datums\status_effects\debuffs\confusion.dm"
@@ -2033,6 +2044,7 @@
#include "code\game\machinery\autolathe.dm"
#include "code\game\machinery\bank_machine.dm"
#include "code\game\machinery\barsigns.dm"
+#include "code\game\machinery\big_manipulator.dm"
#include "code\game\machinery\botlaunchpad.dm"
#include "code\game\machinery\buttons.dm"
#include "code\game\machinery\cell_charger.dm"
@@ -2073,6 +2085,7 @@
#include "code\game\machinery\nebula_shielding.dm"
#include "code\game\machinery\PDApainter.dm"
#include "code\game\machinery\photobooth.dm"
+#include "code\game\machinery\portagrav.dm"
#include "code\game\machinery\prisongate.dm"
#include "code\game\machinery\prisonlabor.dm"
#include "code\game\machinery\quantum_pad.dm"
@@ -2275,6 +2288,7 @@
#include "code\game\objects\effects\landmarks\atmospherics_sanity_landmarks.dm"
#include "code\game\objects\effects\particles\acid.dm"
#include "code\game\objects\effects\particles\fire.dm"
+#include "code\game\objects\effects\particles\gravity.dm"
#include "code\game\objects\effects\particles\misc.dm"
#include "code\game\objects\effects\particles\note_particles.dm"
#include "code\game\objects\effects\particles\slime.dm"
@@ -2286,6 +2300,7 @@
#include "code\game\objects\effects\spawners\bombspawner.dm"
#include "code\game\objects\effects\spawners\costume.dm"
#include "code\game\objects\effects\spawners\gibspawner.dm"
+#include "code\game\objects\effects\spawners\message_in_a_bottle.dm"
#include "code\game\objects\effects\spawners\structure.dm"
#include "code\game\objects\effects\spawners\xeno_egg_delivery.dm"
#include "code\game\objects\effects\spawners\random\ai_module.dm"
@@ -2438,6 +2453,7 @@
#include "code\game\objects\items\devices\anomaly_releaser.dm"
#include "code\game\objects\items\devices\battle_royale.dm"
#include "code\game\objects\items\devices\beacon.dm"
+#include "code\game\objects\items\devices\broadcast_camera.dm"
#include "code\game\objects\items\devices\chameleonproj.dm"
#include "code\game\objects\items\devices\destabilizing_crystal.dm"
#include "code\game\objects\items\devices\desynchronizer.dm"
@@ -2679,6 +2695,7 @@
#include "code\game\objects\structures\curtains.dm"
#include "code\game\objects\structures\deployable_turret.dm"
#include "code\game\objects\structures\destructible_structures.dm"
+#include "code\game\objects\structures\detectiveboard.dm"
#include "code\game\objects\structures\displaycase.dm"
#include "code\game\objects\structures\divine.dm"
#include "code\game\objects\structures\door_assembly.dm"
@@ -3530,6 +3547,7 @@
#include "code\modules\awaymissions\signpost.dm"
#include "code\modules\awaymissions\super_secret_room.dm"
#include "code\modules\awaymissions\zlevel.dm"
+#include "code\modules\awaymissions\mission_code\Beach.dm"
#include "code\modules\awaymissions\mission_code\Cabin.dm"
#include "code\modules\awaymissions\mission_code\caves.dm"
#include "code\modules\awaymissions\mission_code\centcomAway.dm"
@@ -3610,8 +3628,10 @@
#include "code\modules\bitrunning\virtual_domain\domains\colossus.dm"
#include "code\modules\bitrunning\virtual_domain\domains\fredingtonfastingbear.dm"
#include "code\modules\bitrunning\virtual_domain\domains\gondola_asteroid.dm"
+#include "code\modules\bitrunning\virtual_domain\domains\grassland_hunt.dm"
#include "code\modules\bitrunning\virtual_domain\domains\hierophant.dm"
#include "code\modules\bitrunning\virtual_domain\domains\island_brawl.dm"
+#include "code\modules\bitrunning\virtual_domain\domains\meta_central.dm"
#include "code\modules\bitrunning\virtual_domain\domains\pipedream.dm"
#include "code\modules\bitrunning\virtual_domain\domains\pirates.dm"
#include "code\modules\bitrunning\virtual_domain\domains\psyker_shuffle.dm"
@@ -3712,6 +3732,7 @@
#include "code\modules\cargo\markets\market_items\clothing.dm"
#include "code\modules\cargo\markets\market_items\consumables.dm"
#include "code\modules\cargo\markets\market_items\hostages.dm"
+#include "code\modules\cargo\markets\market_items\local_goods.dm"
#include "code\modules\cargo\markets\market_items\misc.dm"
#include "code\modules\cargo\markets\market_items\stolen_goods.dm"
#include "code\modules\cargo\markets\market_items\tools.dm"
@@ -3775,6 +3796,7 @@
#include "code\modules\client\preferences\operative_species.dm"
#include "code\modules\client\preferences\paint_color.dm"
#include "code\modules\client\preferences\parallax.dm"
+#include "code\modules\client\preferences\paraplegic.dm"
#include "code\modules\client\preferences\pda.dm"
#include "code\modules\client\preferences\persistent_scars.dm"
#include "code\modules\client\preferences\phobia.dm"
@@ -3855,6 +3877,7 @@
#include "code\modules\clothing\gloves\costume.dm"
#include "code\modules\clothing\gloves\insulated.dm"
#include "code\modules\clothing\gloves\plasmaman.dm"
+#include "code\modules\clothing\gloves\punch_mitts.dm"
#include "code\modules\clothing\gloves\special.dm"
#include "code\modules\clothing\gloves\tacklers.dm"
#include "code\modules\clothing\head\_head.dm"
@@ -4150,6 +4173,7 @@
#include "code\modules\fishing\admin.dm"
#include "code\modules\fishing\bait.dm"
#include "code\modules\fishing\fish_catalog.dm"
+#include "code\modules\fishing\fish_movement.dm"
#include "code\modules\fishing\fishing_equipment.dm"
#include "code\modules\fishing\fishing_minigame.dm"
#include "code\modules\fishing\fishing_portal_machine.dm"
@@ -4162,7 +4186,16 @@
#include "code\modules\fishing\fish\chasm_detritus.dm"
#include "code\modules\fishing\fish\fish_evolution.dm"
#include "code\modules\fishing\fish\fish_traits.dm"
-#include "code\modules\fishing\fish\fish_types.dm"
+#include "code\modules\fishing\fish\types\air_space.dm"
+#include "code\modules\fishing\fish\types\anadromous.dm"
+#include "code\modules\fishing\fish\types\freshwater.dm"
+#include "code\modules\fishing\fish\types\holographic.dm"
+#include "code\modules\fishing\fish\types\mining.dm"
+#include "code\modules\fishing\fish\types\ruins.dm"
+#include "code\modules\fishing\fish\types\saltwater.dm"
+#include "code\modules\fishing\fish\types\station.dm"
+#include "code\modules\fishing\fish\types\syndicate.dm"
+#include "code\modules\fishing\fish\types\tiziran.dm"
#include "code\modules\fishing\sources\_fish_source.dm"
#include "code\modules\fishing\sources\source_types.dm"
#include "code\modules\flufftext\Dreaming.dm"
@@ -4474,7 +4507,8 @@
#include "code\modules\library\random_books.dm"
#include "code\modules\library\skill_learning\skill_station.dm"
#include "code\modules\library\skill_learning\skillchip.dm"
-#include "code\modules\library\skill_learning\generic_skillchips\matrix_flip.dm"
+#include "code\modules\library\skill_learning\generic_skillchips\matrix_taunt.dm"
+#include "code\modules\library\skill_learning\generic_skillchips\point.dm"
#include "code\modules\library\skill_learning\generic_skillchips\rod_suplex.dm"
#include "code\modules\library\skill_learning\job_skillchips\_job.dm"
#include "code\modules\library\skill_learning\job_skillchips\chef.dm"
@@ -4729,6 +4763,7 @@
#include "code\modules\mob\living\basic\basic_defense.dm"
#include "code\modules\mob\living\basic\festivus_pole.dm"
#include "code\modules\mob\living\basic\health_adjustment.dm"
+#include "code\modules\mob\living\basic\revolutionary.dm"
#include "code\modules\mob\living\basic\tree.dm"
#include "code\modules\mob\living\basic\alien\_alien.dm"
#include "code\modules\mob\living\basic\alien\alien_ai.dm"
@@ -4779,7 +4814,6 @@
#include "code\modules\mob\living\basic\drone\inventory.dm"
#include "code\modules\mob\living\basic\drone\verbs.dm"
#include "code\modules\mob\living\basic\drone\visuals_icons.dm"
-#include "code\modules\mob\living\basic\farm_animals\deer.dm"
#include "code\modules\mob\living\basic\farm_animals\pig.dm"
#include "code\modules\mob\living\basic\farm_animals\pony.dm"
#include "code\modules\mob\living\basic\farm_animals\rabbit.dm"
@@ -4793,6 +4827,8 @@
#include "code\modules\mob\living\basic\farm_animals\cow\cow_ai.dm"
#include "code\modules\mob\living\basic\farm_animals\cow\cow_moonicorn.dm"
#include "code\modules\mob\living\basic\farm_animals\cow\cow_wisdom.dm"
+#include "code\modules\mob\living\basic\farm_animals\deer\deer.dm"
+#include "code\modules\mob\living\basic\farm_animals\deer\deer_ai.dm"
#include "code\modules\mob\living\basic\farm_animals\goat\_goat.dm"
#include "code\modules\mob\living\basic\farm_animals\goat\goat_ai.dm"
#include "code\modules\mob\living\basic\farm_animals\goat\goat_subtypes.dm"
@@ -6071,7 +6107,6 @@
#include "code\modules\tgui\states\notcontained.dm"
#include "code\modules\tgui\states\observer.dm"
#include "code\modules\tgui\states\physical.dm"
-#include "code\modules\tgui\states\reverse_contained.dm"
#include "code\modules\tgui\states\self.dm"
#include "code\modules\tgui\states\zlevel.dm"
#include "code\modules\tgui_input\alert.dm"
@@ -6197,6 +6232,7 @@
#include "code\modules\vending\clothesmate.dm"
#include "code\modules\vending\coffee.dm"
#include "code\modules\vending\cola.dm"
+#include "code\modules\vending\cytopro.dm"
#include "code\modules\vending\donk.dm"
#include "code\modules\vending\drinnerware.dm"
#include "code\modules\vending\engineering.dm"
diff --git a/tgui/docs/tutorial-and-examples.md b/tgui/docs/tutorial-and-examples.md
index 2e02f0e491acd..1b5ecab8968f9 100644
--- a/tgui/docs/tutorial-and-examples.md
+++ b/tgui/docs/tutorial-and-examples.md
@@ -75,7 +75,7 @@ Finally, the `ui_act` proc is called by the interface whenever the user used an
input. The input's `action` and `params` are passed to the proc.
```dm
-/obj/machinery/my_machine/ui_act(action, params)
+/obj/machinery/my_machine/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(.)
return
@@ -311,7 +311,7 @@ upon code review):
data["var"] = var
return data
-/obj/copypasta/ui_act(action, params)
+/obj/copypasta/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
if(..())
return
switch(action)
diff --git a/tgui/packages/tgui-panel/chat/constants.ts b/tgui/packages/tgui-panel/chat/constants.ts
index 2efc1d0a3ec06..57ad525a9a9aa 100644
--- a/tgui/packages/tgui-panel/chat/constants.ts
+++ b/tgui/packages/tgui-panel/chat/constants.ts
@@ -60,7 +60,7 @@ export const MESSAGE_TYPES = [
name: 'Radio',
description: 'All departments of radio messages',
selector:
- '.alert, .minorannounce, .syndradio, .centcomradio, .aiprivradio, .comradio, .secradio, .gangradio, .engradio, .medradio, .sciradio, .suppradio, .servradio, .radio, .deptradio, .binarysay, .newscaster, .resonate, .abductor, .alien, .changeling',
+ '.alert, .minorannounce, .syndradio, .centcomradio, .aiprivradio, .enteradio, .comradio, .secradio, .gangradio, .engradio, .medradio, .sciradio, .suppradio, .servradio, .radio, .deptradio, .binarysay, .newscaster, .resonate, .abductor, .alien, .changeling',
},
{
type: MESSAGE_TYPE_INFO,
diff --git a/tgui/packages/tgui-panel/settings/SettingsGeneral.tsx b/tgui/packages/tgui-panel/settings/SettingsGeneral.tsx
index 3599f24e70703..f1f10ba74ae21 100644
--- a/tgui/packages/tgui-panel/settings/SettingsGeneral.tsx
+++ b/tgui/packages/tgui-panel/settings/SettingsGeneral.tsx
@@ -20,11 +20,10 @@ import { FONTS } from './constants';
import { selectSettings } from './selectors';
export function SettingsGeneral(props) {
- const { theme, fontFamily, fontSize, lineHeight, statLinked, statFontSize } =
+ const { theme, fontFamily, fontSize, lineHeight } =
useSelector(selectSettings);
const dispatch = useDispatch();
const [freeFont, setFreeFont] = useState(false);
- const [statFont, setStatFont] = useState(false);
return (
@@ -119,46 +118,14 @@ export function SettingsGeneral(props) {
stepPixelSize={20}
minValue={8}
maxValue={32}
- value={statFont ? statFontSize : fontSize}
+ value={fontSize}
unit="px"
format={(value) => toFixed(value)}
onChange={(e, value) =>
- dispatch(
- updateSettings({
- [statFont ? 'statFontSize' : 'fontSize']: value,
- }),
- )
+ dispatch(updateSettings({ fontSize: value }))
}
/>
-
-
-
- {!!statFont && (
-
-
- )}
diff --git a/tgui/packages/tgui-panel/settings/SettingsPanel.tsx b/tgui/packages/tgui-panel/settings/SettingsPanel.tsx
index abb0ef86f6335..b813e272ce2f9 100644
--- a/tgui/packages/tgui-panel/settings/SettingsPanel.tsx
+++ b/tgui/packages/tgui-panel/settings/SettingsPanel.tsx
@@ -12,6 +12,7 @@ import { changeSettingsTab } from './actions';
import { SETTINGS_TABS } from './constants';
import { selectActiveTab } from './selectors';
import { SettingsGeneral } from './SettingsGeneral';
+import { SettingsStatPanel } from './SettingsStatPanel';
import { TextHighlightSettings } from './TextHighlight';
export function SettingsPanel(props) {
@@ -45,6 +46,7 @@ export function SettingsPanel(props) {
{activeTab === 'general' && }
{activeTab === 'chatPage' && }
{activeTab === 'textHighlight' && }
+ {activeTab === 'statPanel' && }
);
diff --git a/tgui/packages/tgui-panel/settings/SettingsStatPanel.tsx b/tgui/packages/tgui-panel/settings/SettingsStatPanel.tsx
new file mode 100644
index 0000000000000..68ca14131c0e7
--- /dev/null
+++ b/tgui/packages/tgui-panel/settings/SettingsStatPanel.tsx
@@ -0,0 +1,84 @@
+import { toFixed } from 'common/math';
+import { capitalize } from 'common/string';
+import { useDispatch, useSelector } from 'tgui/backend';
+import {
+ Button,
+ LabeledList,
+ NoticeBox,
+ Section,
+ Slider,
+ Stack,
+} from 'tgui/components';
+
+import { updateSettings } from './actions';
+import { selectSettings } from './selectors';
+
+const TabsViews = ['default', 'classic', 'scrollable'];
+const LinkedToChat = () => (
+ Unlink Stat Panel from chat!
+);
+
+export function SettingsStatPanel(props) {
+ const { statLinked, statFontSize, statTabsStyle } =
+ useSelector(selectSettings);
+ const dispatch = useDispatch();
+
+ return (
+
+
+
+
+
+ {TabsViews.map((view) => (
+
+ ))}
+
+
+
+ {statLinked ? (
+
+ ) : (
+ toFixed(value)}
+ onChange={(e, value) =>
+ dispatch(updateSettings({ statFontSize: value }))
+ }
+ />
+ )}
+
+
+
+
+
+
+
+
+
+
+ );
+}
diff --git a/tgui/packages/tgui-panel/settings/constants.ts b/tgui/packages/tgui-panel/settings/constants.ts
index 86ac41a23ebc9..d98be914e9533 100644
--- a/tgui/packages/tgui-panel/settings/constants.ts
+++ b/tgui/packages/tgui-panel/settings/constants.ts
@@ -18,6 +18,10 @@ export const SETTINGS_TABS = [
id: 'chatPage',
name: 'Chat Tabs',
},
+ {
+ id: 'statPanel',
+ name: 'Stat Panel',
+ },
];
export const FONTS_DISABLED = 'Default';
diff --git a/tgui/packages/tgui-panel/settings/middleware.ts b/tgui/packages/tgui-panel/settings/middleware.ts
index b867d36de0d86..078b9a7874fa2 100644
--- a/tgui/packages/tgui-panel/settings/middleware.ts
+++ b/tgui/packages/tgui-panel/settings/middleware.ts
@@ -17,7 +17,8 @@ import {
import { FONTS_DISABLED } from './constants';
import { selectSettings } from './selectors';
-let setStatFontTimer: NodeJS.Timeout;
+let statFontTimer: NodeJS.Timeout;
+let statTabsTimer: NodeJS.Timeout;
let overrideRule: HTMLStyleElement;
let overrideFontFamily: string | undefined;
let overrideFontSize: string;
@@ -53,11 +54,11 @@ function setGlobalFontSize(
overrideFontSize = `${fontSize}px`;
// Used solution from theme.ts
- clearInterval(setStatFontTimer);
+ clearInterval(statFontTimer);
Byond.command(
`.output statbrowser:set_font_size ${statLinked ? fontSize : statFontSize}px`,
);
- setStatFontTimer = setTimeout(() => {
+ statFontTimer = setTimeout(() => {
Byond.command(
`.output statbrowser:set_font_size ${statLinked ? fontSize : statFontSize}px`,
);
@@ -68,6 +69,14 @@ function setGlobalFontFamily(fontFamily: string) {
overrideFontFamily = fontFamily === FONTS_DISABLED ? undefined : fontFamily;
}
+function setStatTabsStyle(style: string) {
+ clearInterval(statTabsTimer);
+ Byond.command(`.output statbrowser:set_tabs_style ${style}`);
+ statTabsTimer = setTimeout(() => {
+ Byond.command(`.output statbrowser:set_tabs_style ${style}`);
+ }, 1500);
+}
+
export function settingsMiddleware(store) {
let initialized = false;
@@ -101,6 +110,9 @@ export function settingsMiddleware(store) {
const settings = selectSettings(store.getState());
+ // Update stat panel settings
+ setStatTabsStyle(settings.statTabsStyle);
+
// Update global UI font size
setGlobalFontSize(
settings.fontSize,
diff --git a/tgui/packages/tgui-panel/settings/reducer.ts b/tgui/packages/tgui-panel/settings/reducer.ts
index 33df1a745f660..5f6033a14a81f 100644
--- a/tgui/packages/tgui-panel/settings/reducer.ts
+++ b/tgui/packages/tgui-panel/settings/reducer.ts
@@ -40,6 +40,7 @@ const initialState = {
},
statLinked: true,
statFontSize: 12,
+ statTabsStyle: 'default',
} as const;
export function settingsReducer(
diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
index 2ce4afbafd1db..efd8b7df9e642 100644
--- a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
+++ b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
@@ -373,6 +373,10 @@ em {
color: #d65d95;
}
+.enteradio {
+ color: #00ff99;
+}
+
.redteamradio {
color: #ff4444 !important;
}
diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
index b73bfef990d9d..bb0673869a0cb 100644
--- a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
+++ b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
@@ -390,6 +390,10 @@ em {
color: #ff00ff;
}
+.enteradio {
+ color: #00d680;
+}
+
.redteamradio {
color: #ff0000 !important;
}
diff --git a/tgui/packages/tgui-say/constants.ts b/tgui/packages/tgui-say/constants.ts
index 0c3d7943c2676..fba5562ccb201 100644
--- a/tgui/packages/tgui-say/constants.ts
+++ b/tgui/packages/tgui-say/constants.ts
@@ -25,6 +25,7 @@ export const RADIO_PREFIXES = {
':m ': 'Med',
':n ': 'Sci',
':o ': 'AI',
+ ':p ': 'Ent',
':s ': 'Sec',
':t ': 'Synd',
':u ': 'Supp',
diff --git a/tgui/packages/tgui-say/styles/colors.scss b/tgui/packages/tgui-say/styles/colors.scss
index ded5ffeeb9729..a6b492247187b 100644
--- a/tgui/packages/tgui-say/styles/colors.scss
+++ b/tgui/packages/tgui-say/styles/colors.scss
@@ -18,6 +18,7 @@ $_channel_map: (
'Me': #5975da,
'Med': #57b8f0,
'OOC': #cca300,
+ 'Ent': #00ff99,
'Radio': #1ecc43,
'Say': #a4bad6,
'Sci': #c68cfa,
diff --git a/tgui/packages/tgui/components/Input.tsx b/tgui/packages/tgui/components/Input.tsx
index 9bc48aa809406..0e6ed7e258810 100644
--- a/tgui/packages/tgui/components/Input.tsx
+++ b/tgui/packages/tgui/components/Input.tsx
@@ -59,6 +59,8 @@ type OptionalProps = Partial<{
placeholder: string;
/** Clears the input value on enter */
selfClear: boolean;
+ /** Auto-updates the input value on props change */
+ updateOnPropsChange: boolean;
/** The state variable of the input. */
value: string | number;
}>;
@@ -96,6 +98,7 @@ export function Input(props: Props) {
placeholder,
selfClear,
value,
+ updateOnPropsChange,
...rest
} = props;
@@ -155,6 +158,19 @@ export function Input(props: Props) {
}, 1);
}, []);
+ if (updateOnPropsChange) {
+ /** Updates the initial value on props change */
+ useEffect(() => {
+ const input = inputRef.current;
+ if (!input) return;
+
+ const newValue = toInputValue(value);
+ if (input.value === newValue) return;
+
+ input.value = newValue;
+ }, [value]);
+ }
+
return (
{
const { act, data } = useBackend();
- const {
- temperature,
- fluid_type,
- minTemperature,
- maxTemperature,
- fluidTypes,
- contents,
- allow_breeding,
- feeding_interval,
- } = data;
+ const { fishData } = data;
return (
-
+
-
-
-
-
- act('temperature', {
- temperature: value,
- })
- }
- />
-
-
-
- {fluidTypes.map((f) => (
-
-
- ))}
-
-
-
+
+
+
+
+
+
+
+
+
+ {fishData.map((fish) => (
+
+
+
+ ))}
+
+
+
+
+
+
+
+
+
+
+
+ );
+};
+
+const FishInfo = (props) => {
+ const { act, data } = useBackend();
+ const { fish } = props;
+
+ return (
+
+
+
+
+
+
+
+
+
+ {fish.fish_name.toUpperCase()}
+
+ 0 ? -4 : 1}>
+ {(fish.fish_health > 0 && (
+
+ )) || }
+
+
+
+
+
-
- {contents.map((movable) => (
+
+
+
+
+
+
+
+
+
+ {
+ act('rename_fish', {
+ fish_reference: fish.fish_ref,
+ chosen_name: value,
+ });
+ }}
+ style={{
+ padding: '3px',
+ borderRadius: '1em',
+ background: '#151326',
+ }}
+ >
+
+
+
+
+ Rename
+
+
+
+
+
+
+ );
+};
+
+const PropTypes = (props) => {
+ const { act, data } = useBackend();
+ const { propData } = data;
+
+ return (
+
+
+ {propData.map((prop) => (
+
+
+
+ ))}
+
+
+ );
+};
+
+const CalculateHappiness = (props) => {
+ const { data } = useBackend();
+ const { heartIcon } = data;
+ const { happiness } = props;
+
+ return (
+
+ {Array.from({ length: 5 }, (_, index) => (
+ = index ? 'full_heart' : 'empty_heart'}
+ height="48px"
+ width="48px"
+ />
+ ))}
+
+ );
+};
+
+const Settings = (props) => {
+ const { act, data } = useBackend();
+ const {
+ temperature,
+ minTemperature,
+ maxTemperature,
+ fluidTypes,
+ fluidType,
+ allowBreeding,
+ feedingInterval,
+ } = data;
+
+ return (
+
+
+
+
+ act('temperature', {
+ temperature: value,
+ })
+ }
+ />
-
-
+
+
+
+
+ {fluidTypes.map((f) => (
+
+
+
+ ))}
+
+
+
+
+
+
+
+
+
+
+
+ act('feeding_interval', {
+ feeding_interval: value,
+ })
+ }
+ />
+
+
+
+
+
+
);
};
+function dissectName(input: string): string {
+ return input.split(' ')[0].slice(0, 18);
+}
diff --git a/tgui/packages/tgui/interfaces/BigManipulator.tsx b/tgui/packages/tgui/interfaces/BigManipulator.tsx
new file mode 100644
index 0000000000000..6a5501b566472
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/BigManipulator.tsx
@@ -0,0 +1,30 @@
+import { BooleanLike } from 'common/react';
+
+import { useBackend } from '../backend';
+import { Button, Section, Stack } from '../components';
+import { Window } from '../layouts';
+
+type ManipulatorData = {
+ active: BooleanLike;
+};
+
+export const BigManipulator = (props) => {
+ const { data, act } = useBackend();
+ const { active } = data;
+ return (
+
+
+
+
+
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/BlackMarketUplink.tsx b/tgui/packages/tgui/interfaces/BlackMarketUplink.tsx
index 51d397d500cd8..9dea92bedbeba 100644
--- a/tgui/packages/tgui/interfaces/BlackMarketUplink.tsx
+++ b/tgui/packages/tgui/interfaces/BlackMarketUplink.tsx
@@ -2,6 +2,7 @@ import {
AnimatedNumber,
Box,
Button,
+ Image,
Modal,
Section,
Stack,
@@ -36,6 +37,7 @@ type Item = {
desc: string;
amount: number;
cost: number;
+ html_icon: string;
};
type DeliveryMethod = {
@@ -106,8 +108,22 @@ export const BlackMarketUplink = (props) => {
{items.map((item) => (
-
- {item.name}
+
+
+ {!!item.html_icon && (
+
+
+
+ )}
+
+ {item.name}
+
+
{item.amount ? item.amount + ' in stock' : 'Out of stock'}
diff --git a/tgui/packages/tgui/interfaces/BorgShaker.tsx b/tgui/packages/tgui/interfaces/BorgShaker.tsx
index b16a68a39181c..bfcd716cb2bc9 100644
--- a/tgui/packages/tgui/interfaces/BorgShaker.tsx
+++ b/tgui/packages/tgui/interfaces/BorgShaker.tsx
@@ -9,6 +9,8 @@ type BorgShakerContext = {
sodas: Reagent[];
alcohols: Reagent[];
selectedReagent: string;
+ reagentSearchContainer: ContainerPreference;
+ apparatusHasItem: boolean;
};
type Reagent = {
@@ -17,8 +19,13 @@ type Reagent = {
description: string;
};
+enum ContainerPreference {
+ BeverageApparatus = 'beverage_apparatus',
+ InternalBeaker = 'internal_beaker',
+}
+
export const BorgShaker = (props) => {
- const { data } = useBackend();
+ const { act, data } = useBackend();
const { theme, minVolume, sodas, alcohols, selectedReagent } = data;
const dynamicHeight =
@@ -29,7 +36,58 @@ export const BorgShaker = (props) => {
return (
-
+
+
-
+
diff --git a/tgui/packages/tgui/interfaces/ControllerOverview/OverviewSection.tsx b/tgui/packages/tgui/interfaces/ControllerOverview/OverviewSection.tsx
index 919c19631f6fc..ffcaefefbeefa 100644
--- a/tgui/packages/tgui/interfaces/ControllerOverview/OverviewSection.tsx
+++ b/tgui/packages/tgui/interfaces/ControllerOverview/OverviewSection.tsx
@@ -4,12 +4,18 @@ import { ControllerData } from './types';
export function OverviewSection(props) {
const { act, data } = useBackend();
- const { fast_update, map_cpu, subsystems = [], world_time } = data;
+ const {
+ fast_update,
+ rolling_length,
+ map_cpu,
+ subsystems = [],
+ world_time,
+ } = data;
- let overallUsage = 0;
+ let avgUsage = 0;
let overallOverrun = 0;
for (let i = 0; i < subsystems.length; i++) {
- overallUsage += subsystems[i].tick_usage;
+ avgUsage += subsystems[i].usage_per_tick;
overallOverrun += subsystems[i].tick_overrun;
}
@@ -18,16 +24,28 @@ export function OverviewSection(props) {
fill
title="Master Overview"
buttons={
-
+ <>
+
+ {
+ act('set_rolling_length', {
+ rolling_length: value,
+ });
+ }}
+ >
+ Average: {rolling_length / 10} Second(s)
+
+
}
>
@@ -43,11 +61,11 @@ export function OverviewSection(props) {
-
- {(overallUsage * 0.01).toFixed(2)}%
+
+ {avgUsage.toFixed(2)}%
- {(overallOverrun * 0.01).toFixed(2)}%
+ {overallOverrun.toFixed(2)}%
diff --git a/tgui/packages/tgui/interfaces/ControllerOverview/SubsystemDialog.tsx b/tgui/packages/tgui/interfaces/ControllerOverview/SubsystemDialog.tsx
index 21acd2dca1d95..cddfbd5f72ad0 100644
--- a/tgui/packages/tgui/interfaces/ControllerOverview/SubsystemDialog.tsx
+++ b/tgui/packages/tgui/interfaces/ControllerOverview/SubsystemDialog.tsx
@@ -24,6 +24,7 @@ export function SubsystemDialog(props: Props) {
next_fire,
tick_overrun,
tick_usage,
+ usage_per_tick,
} = subsystem;
return (
@@ -42,12 +43,17 @@ export function SubsystemDialog(props: Props) {
{init_order}{last_fire}{next_fire}
- {cost_ms}ms
+
+ {cost_ms.toFixed(2)}ms
+
- {(tick_usage * 0.01).toFixed(2)}%
+ {tick_usage.toFixed(2)}%
+
+
+ {usage_per_tick.toFixed(2)}%
- {(tick_overrun * 0.01).toFixed(2)}%
+ {tick_overrun.toFixed(2)}%
{initialization_failure_message && (
diff --git a/tgui/packages/tgui/interfaces/ControllerOverview/SubsystemRow.tsx b/tgui/packages/tgui/interfaces/ControllerOverview/SubsystemRow.tsx
index 0a0bef6a9e6ec..7231c0b247b7d 100644
--- a/tgui/packages/tgui/interfaces/ControllerOverview/SubsystemRow.tsx
+++ b/tgui/packages/tgui/interfaces/ControllerOverview/SubsystemRow.tsx
@@ -49,13 +49,13 @@ export function SubsystemRow(props: Props) {
let rangeDisplay = {};
if (showBars) {
if (sortType === SortType.Cost) {
- valueDisplay = value.toFixed(0) + 'ms';
+ valueDisplay = value.toFixed(2) + 'ms';
rangeDisplay = {
average: [75, 124.99],
bad: [125, Infinity],
};
} else {
- valueDisplay = (value * 0.01).toFixed(2) + '%';
+ valueDisplay = value.toFixed(2) + '%';
rangeDisplay = {
average: [10, 24.99],
bad: [25, Infinity],
diff --git a/tgui/packages/tgui/interfaces/ControllerOverview/contants.ts b/tgui/packages/tgui/interfaces/ControllerOverview/contants.ts
index fdd28bfd36b0a..62953cc7dd0bc 100644
--- a/tgui/packages/tgui/interfaces/ControllerOverview/contants.ts
+++ b/tgui/packages/tgui/interfaces/ControllerOverview/contants.ts
@@ -35,6 +35,11 @@ export const SORTING_TYPES: readonly SortType[] = [
propName: 'tick_usage',
inDeciseconds: true,
},
+ {
+ label: 'Avg Usage Per Tick',
+ propName: 'usage_per_tick',
+ inDeciseconds: true,
+ },
{
label: 'Tick Overrun',
propName: 'tick_overrun',
diff --git a/tgui/packages/tgui/interfaces/ControllerOverview/types.ts b/tgui/packages/tgui/interfaces/ControllerOverview/types.ts
index 604989b1f75c5..748328ca9662a 100644
--- a/tgui/packages/tgui/interfaces/ControllerOverview/types.ts
+++ b/tgui/packages/tgui/interfaces/ControllerOverview/types.ts
@@ -13,11 +13,13 @@ export type SubsystemData = {
ref: string;
tick_overrun: number;
tick_usage: number;
+ usage_per_tick: number;
};
export type ControllerData = {
world_time: number;
fast_update: BooleanLike;
+ rolling_length: number;
map_cpu: number;
subsystems: SubsystemData[];
};
diff --git a/tgui/packages/tgui/interfaces/DetectiveBoard/BoardTabs.tsx b/tgui/packages/tgui/interfaces/DetectiveBoard/BoardTabs.tsx
new file mode 100644
index 0000000000000..4300cfade9895
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/DetectiveBoard/BoardTabs.tsx
@@ -0,0 +1,63 @@
+import { classes } from '../../../common/react';
+import { useBackend } from '../../backend';
+import { Box, Button } from '../../components';
+import { DataCase } from './DataTypes';
+
+type BoardTabsData = {
+ cases: DataCase[];
+ current_case: number;
+};
+
+const BoardTab = (props) => {
+ const { color, selected, onClick = () => {}, children } = props;
+ return (
+
+ {children}
+
+ );
+};
+
+export const BoardTabs = (props) => {
+ const { act, data } = useBackend();
+ const { cases, current_case } = data;
+ return (
+
+ {cases?.map((item, index) => (
+ act('set_case', { case: index + 1 })}
+ >
+ {item.name}
+ {current_case - 1 === index && (
+ <>
+
+ ))}
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/DetectiveBoard/DataTypes.tsx b/tgui/packages/tgui/interfaces/DetectiveBoard/DataTypes.tsx
new file mode 100644
index 0000000000000..712243efffda6
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/DetectiveBoard/DataTypes.tsx
@@ -0,0 +1,21 @@
+import { Connection } from '../common/Connections';
+
+export type DataCase = {
+ ref: string;
+ name: string;
+ color: string;
+ evidences: DataEvidence[];
+ connections: Connection[];
+};
+
+export type DataEvidence = {
+ ref: string;
+ name: string;
+ description: string;
+ type: string;
+ x: number;
+ y: number;
+ photo_url: string;
+ text: string;
+ connections: string[];
+};
diff --git a/tgui/packages/tgui/interfaces/DetectiveBoard/Evidence.tsx b/tgui/packages/tgui/interfaces/DetectiveBoard/Evidence.tsx
new file mode 100644
index 0000000000000..05c448bb7894d
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/DetectiveBoard/Evidence.tsx
@@ -0,0 +1,181 @@
+import { useEffect, useState } from 'react';
+
+import { Box, Button, Flex, Stack } from '../../components';
+import { DataEvidence } from './DataTypes';
+import { Pin } from './Pin';
+
+type EvidenceProps = {
+ case_ref: string;
+ evidence: DataEvidence;
+ act: Function;
+ onPinStartConnecting: Function;
+ onPinConnected: Function;
+ onPinMouseUp: Function;
+ onEvidenceRemoved: Function;
+ onStartMoving: Function;
+ onStopMoving: Function;
+ onMoving: Function;
+};
+
+type Position = {
+ x: number;
+ y: number;
+};
+
+export function Evidence(props: EvidenceProps) {
+ const { evidence, case_ref, act } = props;
+
+ const [dragging, setDragging] = useState(false);
+
+ const [canDrag, setCanDrag] = useState(true);
+
+ const [dragPosition, setDragPosition] = useState({
+ x: evidence.x,
+ y: evidence.y,
+ });
+
+ const [lastMousePosition, setLastMousePosition] = useState(
+ null,
+ );
+
+ function handleMouseDown(args) {
+ if (canDrag) {
+ setDragging(true);
+ props.onStartMoving(evidence);
+ setLastMousePosition({ x: args.screenX, y: args.screenY });
+ }
+ }
+
+ useEffect(() => {
+ if (!dragging) {
+ return;
+ }
+
+ const handleMouseUp = (args: MouseEvent) => {
+ if (canDrag && dragPosition && dragging && lastMousePosition) {
+ act('set_evidence_cords', {
+ evidence_ref: evidence.ref,
+ case_ref: case_ref,
+ rel_x: dragPosition.x - (lastMousePosition.x - args.screenX),
+ rel_y: dragPosition.y - (lastMousePosition.y - args.screenY),
+ });
+ props.onStopMoving({
+ ...evidence,
+ y: dragPosition.y - (lastMousePosition.y - args.screenY),
+ x: dragPosition.x - (lastMousePosition.x - args.screenX),
+ });
+ }
+ setDragging(false);
+ setLastMousePosition(null);
+ };
+ window.addEventListener('mouseup', handleMouseUp);
+ return () => {
+ window.removeEventListener('mouseup', handleMouseUp);
+ };
+ }, [dragging]);
+
+ function getPinPositionByPosition(evidence: Position) {
+ return { x: evidence.x + 15, y: evidence.y + 45 };
+ }
+ useEffect(() => {
+ if (!dragging) {
+ return;
+ }
+
+ const onMouseMove = (args: MouseEvent) => {
+ if (canDrag) {
+ if (lastMousePosition) {
+ setDragPosition({
+ x: dragPosition.x - (lastMousePosition.x - args.screenX),
+ y: dragPosition.y - (lastMousePosition.y - args.screenY),
+ });
+ props.onMoving(evidence, {
+ x: dragPosition.x - (lastMousePosition.x - args.screenX),
+ y: dragPosition.y - (lastMousePosition.y - args.screenY),
+ });
+ }
+
+ setLastMousePosition({ x: args.screenX, y: args.screenY });
+ }
+ };
+
+ window.addEventListener('mousemove', onMouseMove);
+ return () => {
+ window.removeEventListener('mousemove', onMouseMove);
+ };
+ }, [evidence.x, evidence.y, dragging]);
+
+ return (
+
+
+
+
+
+
+ {
+ setCanDrag(false);
+ props.onPinStartConnecting(evidence, mousePos);
+ }}
+ onConnected={(evidence: DataEvidence) => {
+ setCanDrag(true);
+ props.onPinConnected(evidence);
+ }}
+ onMouseUp={(evidence: DataEvidence, args) => {
+ setCanDrag(true);
+ props.onPinMouseUp(evidence, args);
+ }}
+ />
+
+
+
+ {evidence.name}
+
+
+
+
+
+
+ act('look_evidence', {
+ case_ref: case_ref,
+ evidence_ref: evidence.ref,
+ })
+ }
+ >
+ {evidence.type === 'photo' ? (
+
+ ) : (
+ // eslint-disable-next-line react/no-danger
+
+ )}
+
+
+ {evidence.description}
+
+
+
+
+ );
+}
diff --git a/tgui/packages/tgui/interfaces/DetectiveBoard/Pin.tsx b/tgui/packages/tgui/interfaces/DetectiveBoard/Pin.tsx
new file mode 100644
index 0000000000000..42f907c2af01d
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/DetectiveBoard/Pin.tsx
@@ -0,0 +1,59 @@
+import { useEffect, useState } from 'react';
+
+import { Box, Stack } from '../../components';
+import { DataEvidence } from './DataTypes';
+
+type PinProps = {
+ evidence: DataEvidence;
+ onStartConnecting: Function;
+ onConnected: Function;
+ onMouseUp: Function;
+};
+
+export function Pin(props: PinProps) {
+ const { evidence, onStartConnecting, onConnected, onMouseUp } = props;
+ const [creatingRope, setCreatingRope] = useState(false);
+
+ function handleMouseDown(args) {
+ setCreatingRope(true);
+ onStartConnecting(evidence, {
+ x: args.clientX,
+ y: args.clientY,
+ });
+ }
+
+ useEffect(() => {
+ if (!creatingRope) {
+ return;
+ }
+ const handleMouseUp = (args: MouseEvent) => {
+ if (creatingRope) {
+ setCreatingRope(false);
+ onConnected(evidence, {
+ evidence_ref: 'not used',
+ position: {
+ x: args.clientX,
+ y: args.clientY,
+ },
+ });
+ }
+ };
+ window.addEventListener('mouseup', handleMouseUp);
+ return () => {
+ window.removeEventListener('mouseup', handleMouseUp);
+ };
+ }, [creatingRope]);
+
+ return (
+
+
+ onMouseUp(evidence, args)}
+ />
+
+
+ );
+}
diff --git a/tgui/packages/tgui/interfaces/DetectiveBoard/index.tsx b/tgui/packages/tgui/interfaces/DetectiveBoard/index.tsx
new file mode 100644
index 0000000000000..a1438d8dc7bd3
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/DetectiveBoard/index.tsx
@@ -0,0 +1,355 @@
+import { useEffect, useState } from 'react';
+
+import { useBackend } from '../../backend';
+import { Box, Button, Icon, Stack } from '../../components';
+import { Window } from '../../layouts';
+import { Connection, Connections, Position } from '../common/Connections';
+import { BoardTabs } from './BoardTabs';
+import { DataCase, DataEvidence } from './DataTypes';
+import { Evidence } from './Evidence';
+
+type Data = {
+ cases: DataCase[];
+ current_case: number;
+};
+
+type TypedConnection = {
+ type: string;
+ connection: Connection;
+};
+
+const PIN_Y_OFFSET = 15;
+
+const PIN_CONNECTING_Y_OFFSET = -60;
+
+export function DetectiveBoard(props) {
+ const { act, data } = useBackend();
+
+ const { cases, current_case } = data;
+
+ const [connectingEvidence, setConnectingEvidence] =
+ useState(null);
+
+ const [movingEvidenceConnections, setMovingEvidenceConnections] = useState<
+ TypedConnection[] | null
+ >(null);
+
+ const [connection, setConnection] = useState(null);
+
+ const [connections, setConnections] = useState(
+ current_case - 1 < cases.length ? cases[current_case - 1].connections : [],
+ );
+
+ function handlePinStartConnecting(
+ evidence: DataEvidence,
+ mousePos: Position,
+ ) {
+ setConnectingEvidence(evidence);
+ setConnection({
+ color: 'red',
+ from: getPinPosition(evidence),
+ to: { x: mousePos.x, y: mousePos.y + PIN_CONNECTING_Y_OFFSET },
+ });
+ }
+
+ function getPinPositionByPosition(evidence: Position) {
+ return { x: evidence.x + 15, y: evidence.y + PIN_Y_OFFSET };
+ }
+
+ function getPinPosition(evidence: DataEvidence) {
+ return getPinPositionByPosition({ x: evidence.x, y: evidence.y });
+ }
+
+ function handlePinConnected(evidence: DataEvidence) {
+ setConnection(null);
+ setConnectingEvidence(null);
+ }
+
+ function handleEvidenceRemoved(evidence: DataEvidence) {
+ let pinPosition = getPinPosition(evidence);
+ let new_connections: Connection[] = [];
+ for (let old_connection of connections) {
+ if (
+ (old_connection.to.x === pinPosition.x &&
+ old_connection.to.y === pinPosition.y) ||
+ (old_connection.from.x === pinPosition.x &&
+ old_connection.from.y === pinPosition.y)
+ ) {
+ continue;
+ }
+ new_connections.push(old_connection);
+ }
+ setConnections(new_connections);
+ if (movingEvidenceConnections) {
+ let new_mov_connections: TypedConnection[] = [];
+ for (let old_connection of movingEvidenceConnections) {
+ if (
+ (old_connection.connection.to.x === pinPosition.x &&
+ old_connection.connection.to.y === pinPosition.y) ||
+ (old_connection.connection.from.x === pinPosition.x &&
+ old_connection.connection.from.y === pinPosition.y)
+ ) {
+ continue;
+ }
+ new_mov_connections.push(old_connection);
+ }
+ setMovingEvidenceConnections(new_mov_connections);
+ }
+ }
+
+ useEffect(() => {
+ if (!connectingEvidence) {
+ return () => {
+ window.removeEventListener('mousemove', handleMouseMove);
+ window.removeEventListener('mouseup', handleMouseUp);
+ };
+ }
+
+ function handleMouseMove(args: MouseEvent) {
+ if (connectingEvidence) {
+ setConnection({
+ color: 'red',
+ from: getPinPosition(connectingEvidence),
+ to: { x: args.clientX, y: args.clientY - 60 },
+ });
+ }
+ }
+
+ window.addEventListener('mousemove', handleMouseMove);
+ window.addEventListener('mouseup', handleMouseUp);
+ return () => {
+ window.removeEventListener('mousemove', handleMouseMove);
+ window.removeEventListener('mouseup', handleMouseUp);
+ };
+ }, [connectingEvidence]);
+
+ useEffect(() => {
+ setConnections(
+ current_case - 1 < cases.length
+ ? cases[current_case - 1].connections
+ : [],
+ );
+ }, [current_case]);
+
+ function handleMouseUp(args: MouseEvent) {
+ if (movingEvidenceConnections && connectingEvidence) {
+ let new_connections: Connection[] = [];
+ for (let con of movingEvidenceConnections) {
+ if (con.type === 'from') {
+ new_connections.push({
+ color: con.connection.color,
+ from: getPinPosition(connectingEvidence),
+ to: con.connection.to,
+ });
+ } else {
+ new_connections.push({
+ color: con.connection.color,
+ from: con.connection.from,
+ to: getPinPosition(connectingEvidence),
+ });
+ }
+ }
+ setConnections([...connections, ...new_connections]);
+ setMovingEvidenceConnections(null);
+ }
+ }
+
+ function handleMouseUpOnPin(evidence: DataEvidence, args) {
+ if (
+ connectingEvidence &&
+ connectingEvidence.ref !== evidence.ref &&
+ !connectingEvidence.connections.includes(evidence.ref) &&
+ !evidence.connections.includes(connectingEvidence.ref)
+ ) {
+ let new_connections: Connection[] = [];
+ if (movingEvidenceConnections) {
+ for (let con of movingEvidenceConnections) {
+ if (con.type === 'from') {
+ new_connections.push({
+ color: con.connection.color,
+ from: getPinPosition(connectingEvidence),
+ to: con.connection.to,
+ });
+ } else {
+ new_connections.push({
+ color: con.connection.color,
+ from: con.connection.from,
+ to: getPinPosition(connectingEvidence),
+ });
+ }
+ }
+ }
+ setConnections([
+ ...connections,
+ ...new_connections,
+ {
+ color: 'red',
+ from: getPinPosition(connectingEvidence),
+ to: getPinPosition(evidence),
+ },
+ ]);
+ act('add_connection', {
+ from_ref: connectingEvidence.ref,
+ to_ref: evidence.ref,
+ });
+ setConnection(null);
+ setConnectingEvidence(null);
+ setMovingEvidenceConnections(null);
+ }
+ }
+
+ function handleEvidenceStartMoving(evidence: DataEvidence) {
+ let moving_connections: TypedConnection[] = [];
+ let pinPosition = getPinPosition(evidence);
+ let new_connections: Connection[] = [];
+ for (let con of connections) {
+ if (con.from.x === pinPosition.x && con.from.y === pinPosition.y) {
+ moving_connections.push({ type: 'from', connection: con });
+ } else if (con.to.x === pinPosition.x && con.to.y === pinPosition.y) {
+ moving_connections.push({ type: 'to', connection: con });
+ } else {
+ new_connections.push(con);
+ }
+ }
+ setMovingEvidenceConnections(moving_connections);
+ setConnections(new_connections);
+ }
+
+ function handleEvidenceMoving(evidence: DataEvidence, position: Position) {
+ if (movingEvidenceConnections) {
+ let new_connections: TypedConnection[] = [];
+ for (let con of movingEvidenceConnections) {
+ if (con.type === 'from') {
+ new_connections.push({
+ type: con.type,
+ connection: {
+ color: con.connection.color,
+ from: getPinPositionByPosition({ x: position.x, y: position.y }),
+ to: con.connection.to,
+ },
+ });
+ } else {
+ new_connections.push({
+ type: con.type,
+ connection: {
+ color: con.connection.color,
+ from: con.connection.from,
+ to: getPinPositionByPosition({ x: position.x, y: position.y }),
+ },
+ });
+ }
+ }
+ setMovingEvidenceConnections(new_connections);
+ }
+ }
+
+ function handleEvidenceStopMoving(evidence: DataEvidence) {
+ if (movingEvidenceConnections) {
+ let new_connections: Connection[] = [];
+ for (let con of movingEvidenceConnections) {
+ if (con.type === 'from') {
+ new_connections.push({
+ color: con.connection.color,
+ from: getPinPosition(evidence),
+ to: con.connection.to,
+ });
+ } else {
+ new_connections.push({
+ color: con.connection.color,
+ from: con.connection.from,
+ to: getPinPosition(evidence),
+ });
+ }
+ }
+ setConnections([...connections, ...new_connections]);
+ setMovingEvidenceConnections(null);
+ }
+ }
+
+ function retrieveConnections(typedConnections: TypedConnection[]) {
+ let result: Connection[] = [];
+ for (let con of typedConnections) {
+ result.push(con.connection);
+ }
+ return result;
+ }
+
+ return (
+
+
+ {cases.length > 0 ? (
+ <>
+
+
+ {cases?.map(
+ (item, i) =>
+ current_case - 1 === i && (
+
+ {movingEvidenceConnections && (
+
+ )}
+ {connection && (
+
+ )}
+
+ {item?.evidences?.map((evidence, index) => (
+
+ ))}
+
+ ),
+ )}
+
+ ) : (
+
+
+
+
+
+
+
+
+
+ You have no cases! Create the first one
+
+
+
+
+
+
+
+ )}
+
+
+ );
+}
diff --git a/tgui/packages/tgui/interfaces/LTSRBT.tsx b/tgui/packages/tgui/interfaces/LTSRBT.tsx
new file mode 100644
index 0000000000000..d8c399d2705a8
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/LTSRBT.tsx
@@ -0,0 +1,94 @@
+import { useBackend } from '../backend';
+import {
+ Button,
+ Image,
+ Input,
+ NumberInput,
+ Section,
+ Stack,
+ TextArea,
+} from '../components';
+import { Window } from '../layouts';
+
+type Data = {
+ name: string;
+ price: number;
+ min_price: number;
+ max_price: number;
+ loaded_icon: string;
+ desc: string;
+};
+
+export const LTSRBT = (props) => {
+ const { act, data } = useBackend();
+ const { name, price, min_price, max_price, loaded_icon, desc } = data;
+
+ return (
+
+
+
+
+
+ act('change_name', {
+ value: value,
+ })
+ }
+ />
+
+ act('change_price', {
+ value: value,
+ })
+ }
+ />
+
+
+ {!!loaded_icon && (
+
+
+
+
+
+ )}
+
+
+