-
- Why would you want to grow humans? Well, I'm expecting most readers to be in the slave trade, but a few might actually
- want to revive fallen comrades. Growing pod people is actually quite simple:
-
-
-
Find a dead person who is in need of revival.
-
Take a blood sample with a syringe (samples of their blood taken BEFORE they died will also work).
-
Inject a packet of replica pod seeds (which can be acquired by either mutating cabbages into replica pods (and then harvesting said replica pods) or by purchasing them from certain corporate entities) with the blood sample.
-
It is imperative to understand that injecting the replica pod plant with blood AFTER it has been planted WILL NOT WORK; you have to inject the SEED PACKET, NOT the TRAY.
-
Plant the seeds.
-
Tend to the replica pod's water and nutrition levels until it is time to harvest the podcloned humanoid.
-
Note that if the corpse's mind (or spirit, or soul, or whatever the hell your local chaplain calls it) is already in a new body or has left this plane of existence entirely, you will just receive seed packets upon harvesting the replica pod plant, not a podperson.
-
-
- It really is that easy! Good luck!
-
-
-
- "}
+ starting_content = "\
+
Growing Humans
\
+ \
+ Why would you want to grow humans? Well, I'm expecting most readers to be in the slave trade, but a few might actually\
+ want to revive fallen comrades. Growing pod people is actually quite simple:\
+
\
+
\
+
Find a dead person who is in need of revival.
\
+
Take a blood sample with a syringe (samples of their blood taken BEFORE they died will also work).
\
+
Inject a packet of replica pod seeds (which can be acquired by either mutating cabbages into replica pods (and then harvesting said replica pods) or by purchasing them from certain corporate entities) with the blood sample.
\
+
It is imperative to understand that injecting the replica pod plant with blood AFTER it has been planted WILL NOT WORK; you have to inject the SEED PACKET, NOT the TRAY.
\
+
Plant the seeds.
\
+
Tend to the replica pod's water and nutrition levels until it is time to harvest the podcloned humanoid.
\
+
Note that if the corpse's mind (or spirit, or soul, or whatever the hell your local chaplain calls it) is already in a new body or has left this plane of existence entirely, you will just receive seed packets upon harvesting the replica pod plant, not a podperson.
\
+ \
+ It really is that easy! Good luck!\
+ \
+ "
/obj/item/book/manual/ripley_build_and_repair
name = "APLU \"Ripley\" Construction and Operation Manual"
icon_state ="book"
starting_author = "Weyland-Yutani Corp"
starting_title = "APLU \"Ripley\" Construction and Operation Manual"
- starting_content = {"
-
-
-
-
-
-
- Weyland-Yutani - Building Better Worlds
-
Autonomous Power Loader Unit \"Ripley\"
-
-
Specifications:
-
-
Class: Autonomous Power Loader
-
Scope: Logistics and Construction
-
Weight: 820kg (without operator and with empty cargo compartment)
-
Height: 2.5m
-
Width: 1.8m
-
Top speed: 5km/hour
-
Operation in vacuum/hostile environment: Possible
-
Airtank Volume: 500liters
-
Devices:
-
-
Hydraulic Clamp
-
High-speed Drill
-
-
-
Propulsion Device: Power cell powered electro-hydraulic system.
-
Power cell capacity: Varies.
-
-
-
Construction:
-
-
Connect all exosuit parts to the chassis frame
-
Connect all hydraulic fittings and tighten them up with a wrench
-
Adjust the servohydraulics with a screwdriver
-
Wire the chassis. (Cable is not included.)
-
Use the wirecutters to remove the excess cable if needed.
-
Install the central control module (Not included. Use supplied datadisk to create one).
-
Secure the mainboard with a screwdriver.
-
Install the peripherals control module (Not included. Use supplied datadisk to create one).
-
Secure the peripherals control module with a screwdriver
-
Install the internal armor plating (Not included due to Nanotrasen regulations. Can be made using 5 iron sheets.)
-
Secure the internal armor plating with a wrench
-
Weld the internal armor plating to the chassis
-
Install the external reinforced armor plating (Not included due to Nanotrasen regulations. Can be made using 5 reinforced iron sheets.)
-
Secure the external reinforced armor plating with a wrench
-
Weld the external reinforced armor plating to the chassis
-
-
-
-
-
Operation
- Please consult the Nanotrasen compendium "Robotics for Dummies".
- "}
+ starting_content = "\
+
\
+ Weyland-Yutani - Building Better Worlds\
+
Autonomous Power Loader Unit \"Ripley\"
\
+
\
+
Specifications:
\
+
\
+
Class: Autonomous Power Loader
\
+
Scope: Logistics and Construction
\
+
Weight: 820kg (without operator and with empty cargo compartment)
\
+
Height: 2.5m
\
+
Width: 1.8m
\
+
Top speed: 5km/hour
\
+
Operation in vacuum/hostile environment: Possible\
+
Airtank Volume: 500liters
\
+
Devices:\
+
\
+
Hydraulic Clamp
\
+
High-speed Drill
\
+
\
+
\
+
Propulsion Device: Power cell powered electro-hydraulic system.
\
+
Power cell capacity: Varies.
\
+
\
+ \
+
Construction:
\
+ \
+
Connect all exosuit parts to the chassis frame
\
+
Connect all hydraulic fittings and tighten them up with a wrench
\
+
Adjust the servohydraulics with a screwdriver
\
+
Wire the chassis. (Cable is not included.)
\
+
Use the wirecutters to remove the excess cable if needed.
\
+
Install the central control module (Not included. Use supplied datadisk to create one).
\
+
Secure the mainboard with a screwdriver.
\
+
Install the peripherals control module (Not included. Use supplied datadisk to create one).
\
+
Secure the peripherals control module with a screwdriver
\
+
Install the internal armor plating (Not included due to Nanotrasen regulations. Can be made using 5 iron sheets.)
\
+
Secure the internal armor plating with a wrench
\
+
Weld the internal armor plating to the chassis
\
+
Install the external reinforced armor plating (Not included due to Nanotrasen regulations. Can be made using 5 reinforced iron sheets.)
\
+
Secure the external reinforced armor plating with a wrench
\
+
Weld the external reinforced armor plating to the chassis
- Here is a guide on basic food recipes and also how to not poison your customers accidentally.
-
-
-
Basic ingredients preparation:
-
- Dough: 10u water + 15u flour for simple dough.
- 6u egg yolk + 12 egg white + 15u flour + 5u sugar for cake batter.
- Doughs can be transformed by using a knife and rolling pin.
- All doughs can be microwaved.
- Bowl: Add water to it for soup preparation.
- Meat: Microwave it, process it, slice it into microwavable cutlets with your knife, or use it raw.
- Cheese: Add 5u universal enzyme (catalyst) to milk and soy milk to prepare cheese (sliceable) and tofu.
- Rice: Mix 10u rice with 10u water in a bowl then microwave it.
-
-
Custom food:
- Add ingredients to a base item to prepare a custom meal.
- The bases are:
- - bun (burger)
- - breadslices(sandwich)
- - plain bread
- - plain pie
- - vanilla cake
- - empty bowl (salad)
- - bowl with 10u water (soup)
- - boiled spaghetti
- - pizza bread
- - metal rod (kebab)
-
-
Table Craft:
- Put ingredients on table, then click and drag the table onto yourself to see what recipes you can prepare.
-
-
Microwave:
- Use it to cook or boil food ingredients (meats, doughs, egg, spaghetti, donkpocket, etc...).
- It can cook multiple items at once.
-
-
Processor:
- Use it to process certain ingredients (meat into meatballs, doughslice into spaghetti, potato into fries,etc...)
-
-
Gibber:
- Stuff an animal in it to grind it into meat.
-
-
Meat spike:
- Stick an animal on it then begin collecting its meat.
-
-
-
Example recipes:
- Vanilla Cake: Microwave cake batter.
- Burger: 1 bun + 1 meat steak
- Bread: Microwave dough.
- Waffles: 2 pastry base
- Popcorn: Microwave corn.
- Meat Steak: Microwave meat.
- Meat Pie: 1 plain pie + 1u black pepper + 1u salt + 2 meat cutlets
- Boiled Spagetti: Microwave spaghetti.
- Donuts: 1u sugar + 1 pastry base
- Fries: Process potato.
-
-
Sharing your food:
- You can put your meals on your kitchen counter or load them in the snack vending machines.
-
-
- "}
+ starting_content = "\
+ \
+
Food for Dummies
\
+ Here is a guide on basic food recipes and also how to not poison your customers accidentally.\
+ \
+ \
+
Basic ingredients preparation:
\
+ \
+ Dough: 10u water + 15u flour for simple dough. \
+ 6u egg yolk + 12 egg white + 15u flour + 5u sugar for cake batter. \
+ Doughs can be transformed by using a knife and rolling pin. \
+ All doughs can be baked. \
+ Bowl: Add recipe ingredients and liquid to make soups. \
+ Meat: Grill it, process it, slice it into grillable cutlets with your knife, or use it raw. \
+ Cheese: Add 5u universal enzyme (catalyst) to milk and soy milk to prepare cheese (sliceable) and tofu. \
+ Rice: Mix 10u rice with 10u water then microwave it.\
+ \
+
Custom food:
\
+ Add ingredients to a base item to prepare a custom meal. \
+ The bases are: \
+ - bun (burger) \
+ - breadslices(sandwich) \
+ - plain bread \
+ - vanilla cake \
+ - empty bowl (salad) \
+ - bowl with liquid (soup) \
+ - boiled spaghetti \
+ - pizza bread \
+ - iron rod (kebab) \
+ - plain pie \
+ - seaweed sheet(sushi) \
+ \
+
Cooking menu:
\
+ Open the crafting menu and click the cooking tab to see the list of cookable food.\
+ \
+
Microwave:
\
+ Use it to cook or boil food ingredients (egg, spaghetti, donkpocket, etc...).\
+ It can cook multiple items at once.\
+ \
+
Processor:
\
+ Use it to process certain ingredients (meat into meatballs, doughslice into spaghetti, etc...)\
+ \
+
Gibber:
\
+ Stuff an animal in it to grind it into meat.\
+ \
+
Meat spike:
\
+ Stick an animal on it then begin collecting its meat.\
+ \
+ \
+
Example recipes:
\
+ Vanilla Cake: Bake cake base. \
+ Burger: 1 bun + 1 patty \
+ Bread: Bake dough. \
+ Waffles: 2 pastry base \
+ Popcorn: Microwave corn. \
+ Meat Steak: Grill meat. \
+ Meat Pie: 1 plain pie + 1u black pepper + 1u salt + 1 meat steak \
+ Boiled Spagetti: Microwave spaghetti. \
+ Donuts: 1u sugar + 1 pastry base \
+ Fries: Cut and process potato.\
+ \
+
Sharing your food:
\
+ You can put your meals on your kitchen counter or load them in the snack vending machines.\
+ "
/obj/item/book/manual/nuclear
name = "Fission Mailed: Nuclear Sabotage 101"
icon_state ="bookNuclear"
starting_author = "Syndicate"
starting_title = "Fission Mailed: Nuclear Sabotage 101"
- starting_content = {"
-
-
-
-
- Nuclear Explosives 101:
- Hello and thank you for choosing the Syndicate for your nuclear information needs.
- Today's crash course will deal with the operation of a Fusion Class Nanotrasen made Nuclear Device.
- First and foremost, DO NOT TOUCH ANYTHING UNTIL THE BOMB IS IN PLACE.
- Pressing any button on the compacted bomb will cause it to extend and bolt itself into place.
- If this is done to unbolt it one must completely log in which at this time may not be possible.
- To make the nuclear device functional:
-
Place the nuclear device in the designated detonation zone.
-
Extend and anchor the nuclear device from its interface.
-
Insert the nuclear authorisation disk into slot.
-
Type numeric authorisation code into the keypad. This should have been provided. Note: If you make a mistake press R to reset the device.
-
Press the E button to log onto the device.
- You now have activated the device. To deactivate the buttons at anytime for example when you've already prepped the bomb for detonation remove the auth disk OR press the R on the keypad.
- Now the bomb CAN ONLY be detonated using the timer. Manual detonation is not an option.
- Note: Nanotrasen is a pain in the neck.
- Toggle off the SAFETY.
- Note: You wouldn't believe how many Syndicate Operatives with doctorates have forgotten this step.
- So use the - - and + + to set a det time between 5 seconds and 10 minutes.
- Then press the timer toggle button to start the countdown.
- Now remove the auth. disk so that the buttons deactivate.
- Note: THE BOMB IS STILL SET AND WILL DETONATE
- Now before you remove the disk if you need to move the bomb you can:
- Toggle off the anchor, move it, and re-anchor.
- Good luck. Remember the order:
- Disk, Code, Safety, Timer, Disk, RUN!
- Intelligence Analysts believe that normal Nanotrasen procedure is for the Captain to secure the nuclear authorisation disk.
- Good luck!
-
- "}
+ starting_content = "\
+ Nuclear Explosives 101: \
+ Hello and thank you for choosing the Syndicate for your nuclear information needs. \
+ Today's crash course will deal with the operation of a Fusion Class Nanotrasen made Nuclear Device. \
+ First and foremost, DO NOT TOUCH ANYTHING UNTIL THE BOMB IS IN PLACE. \
+ Pressing any button on the compacted bomb will cause it to extend and bolt itself into place. \
+ If this is done to unbolt it one must completely log in which at this time may not be possible. \
+ To make the nuclear device functional: \
+
Place the nuclear device in the designated detonation zone.
\
+
Extend and anchor the nuclear device from its interface.
\
+
Insert the nuclear authorisation disk into slot.
\
+
Type numeric authorisation code into the keypad. This should have been provided. Note: If you make a mistake press R to reset the device.\
+
Press the E button to log onto the device.
\
+ You now have activated the device. To deactivate the buttons at anytime for example when you've already prepped the bomb for detonation remove the auth disk OR press the R on the keypad. \
+ Now the bomb CAN ONLY be detonated using the timer. Manual detonation is not an option. \
+ Note: Nanotrasen is a pain in the neck. \
+ Toggle off the SAFETY. \
+ Note: You wouldn't believe how many Syndicate Operatives with doctorates have forgotten this step. \
+ So use the - - and + + to set a det time between 5 seconds and 10 minutes. \
+ Then press the timer toggle button to start the countdown. \
+ Now remove the auth. disk so that the buttons deactivate. \
+ Note: THE BOMB IS STILL SET AND WILL DETONATE \
+ Now before you remove the disk if you need to move the bomb you can: \
+ Toggle off the anchor, move it, and re-anchor.
\
+ Good luck. Remember the order: \
+ Disk, Code, Safety, Timer, Disk, RUN! \
+ Intelligence Analysts believe that normal Nanotrasen procedure is for the Captain to secure the nuclear authorisation disk. \
+ Good luck!\
+ "
diff --git a/code/game/objects/items/robot/items/tools.dm b/code/game/objects/items/robot/items/tools.dm
index 8351fa1c2a1..b25253dba23 100644
--- a/code/game/objects/items/robot/items/tools.dm
+++ b/code/game/objects/items/robot/items/tools.dm
@@ -30,7 +30,7 @@
/// The owner of the dampener
var/mob/living/silicon/robot/host = null
/// The field
- var/datum/proximity_monitor/advanced/projectile_dampener/peaceborg/dampening_field
+ var/datum/proximity_monitor/advanced/bubble/projectile_dampener/peaceborg/dampening_field
/// Energy cost per tracked projectile damage amount per second
var/projectile_damage_tick_ecost_coefficient = 10
/// Energy cost per tracked projectile per second
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index d33c2f837ac..fad6549cf4a 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -1001,26 +1001,6 @@ GLOBAL_LIST_INIT(pizza_sheet_recipes, list(
/obj/item/stack/sheet/pizza/five
amount = 5
-/obj/item/stack/sheet/sandblock
- name = "blocks of sand"
- desc = "You're too old to be playing with sandcastles. Now you build... sandstations."
- singular_name = "sand block"
- icon_state = "sheet-sandstone"
- mats_per_unit = list(/datum/material/sand = SHEET_MATERIAL_AMOUNT)
- merge_type = /obj/item/stack/sheet/sandblock
- material_type = /datum/material/sand
- material_modifier = 1
- drop_sound = SFX_STONE_DROP
- pickup_sound = SFX_STONE_PICKUP
-
-/obj/item/stack/sheet/sandblock/fifty
- amount = 50
-/obj/item/stack/sheet/sandblock/twenty
- amount = 20
-/obj/item/stack/sheet/sandblock/five
- amount = 5
-
-
/obj/item/stack/sheet/hauntium
name = "haunted sheets"
desc = "These sheets seem cursed."
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 1394ccf94b8..5f024dc75a4 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -54,9 +54,11 @@
preload = TRUE
/obj/item/storage/belt/utility/chief/full/PopulateContents()
- SSwardrobe.provide_type(/obj/item/screwdriver/power, src)
- SSwardrobe.provide_type(/obj/item/crowbar/power, src)
- SSwardrobe.provide_type(/obj/item/weldingtool/experimental, src)
+ SSwardrobe.provide_type(/obj/item/screwdriver, src)
+ SSwardrobe.provide_type(/obj/item/wrench, src)
+ SSwardrobe.provide_type(/obj/item/weldingtool, src)
+ SSwardrobe.provide_type(/obj/item/crowbar, src)
+ SSwardrobe.provide_type(/obj/item/wirecutters, src)
SSwardrobe.provide_type(/obj/item/multitool, src)
SSwardrobe.provide_type(/obj/item/stack/cable_coil, src)
SSwardrobe.provide_type(/obj/item/extinguisher/mini, src)
@@ -65,9 +67,11 @@
/obj/item/storage/belt/utility/chief/full/get_types_to_preload()
var/list/to_preload = list() //Yes this is a pain. Yes this is the point
- to_preload += /obj/item/screwdriver/power
- to_preload += /obj/item/crowbar/power
- to_preload += /obj/item/weldingtool/electric // SKYRAT EDIT - Electric welder
+ to_preload += /obj/item/screwdriver
+ to_preload += /obj/item/wrench
+ to_preload += /obj/item/weldingtool
+ to_preload += /obj/item/crowbar
+ to_preload += /obj/item/wirecutters
to_preload += /obj/item/multitool
to_preload += /obj/item/stack/cable_coil
to_preload += /obj/item/extinguisher/mini
diff --git a/code/game/objects/items/storage/boxes/flat_boxes.dm b/code/game/objects/items/storage/boxes/flat_boxes.dm
index 7320140d4c0..3ffb818f91a 100644
--- a/code/game/objects/items/storage/boxes/flat_boxes.dm
+++ b/code/game/objects/items/storage/boxes/flat_boxes.dm
@@ -20,3 +20,13 @@
flat_box.pixel_y = pixel_y
qdel(src)
+
+/obj/item/storage/box/flat/fentanylpatches
+ name = "discrete box"
+ desc = "A small box containing a set of unmarked transdermal patches."
+ icon_state = "flat"
+
+/obj/item/storage/box/flat/fentanylpatches/Initialize(mapload)
+ . = ..()
+ for(var/i = 1 to 3)
+ new /obj/item/reagent_containers/applicator/patch/fent(src)
diff --git a/code/game/objects/items/storage/boxes/misc.dm b/code/game/objects/items/storage/boxes/misc.dm
index bc9305f72bf..41c958b1398 100644
--- a/code/game/objects/items/storage/boxes/misc.dm
+++ b/code/game/objects/items/storage/boxes/misc.dm
@@ -56,3 +56,39 @@
new /obj/item/mecha_parts/mecha_tracking(src)
new /obj/item/mecha_parts/mecha_tracking(src)
new /obj/item/mecha_parts/mecha_tracking(src)
+
+/obj/item/storage/box/methdealer
+ name = "box"
+ desc = "A brown box."
+ icon_state = "blank_package"
+
+/obj/item/storage/box/methdealer/PopulateContents()
+ var/static/list/items_inside = list(
+ /obj/item/food/drug/meth_crystal = 4,
+ /obj/item/cigarette/pipe/crackpipe = 2,
+ )
+ generate_items_inside(items_inside, src)
+
+/obj/item/storage/box/opiumdealer
+ name = "box"
+ desc = "A brown box."
+ icon_state = "blank_package"
+
+/obj/item/storage/box/opiumdealer/PopulateContents()
+ var/static/list/items_inside = list(
+ /obj/item/food/drug/opium = 4,
+ /obj/item/cigarette/pipe/cobpipe = 2,
+ )
+ generate_items_inside(items_inside, src)
+
+/obj/item/storage/box/kronkdealer
+ name = "box"
+ desc = "A brown box."
+ icon_state = "blank_package"
+
+/obj/item/storage/box/kronkdealer/PopulateContents()
+ var/static/list/items_inside = list(
+ /obj/item/food/drug/moon_rock = 4,
+ /obj/item/cigarette/pipe/crackpipe = 2,
+ )
+ generate_items_inside(items_inside, src)
diff --git a/code/game/objects/items/storage/lockbox.dm b/code/game/objects/items/storage/lockbox.dm
index a7fa7552ad5..69b46013a3a 100644
--- a/code/game/objects/items/storage/lockbox.dm
+++ b/code/game/objects/items/storage/lockbox.dm
@@ -27,7 +27,7 @@
/obj/item/storage/lockbox/add_context(atom/source, list/context, obj/item/held_item, mob/user)
if(!held_item)
return NONE
- if(src.broken)
+ if(broken)
return NONE
if(!held_item.GetID())
return NONE
diff --git a/code/game/objects/items/syndie_spraycan.dm b/code/game/objects/items/syndie_spraycan.dm
index 427cc87b657..13ae3097ebf 100644
--- a/code/game/objects/items/syndie_spraycan.dm
+++ b/code/game/objects/items/syndie_spraycan.dm
@@ -85,7 +85,7 @@
if(HAS_TRAIT(user, TRAIT_TAGGER))
wait_time *= 0.5
- if(!do_after(user, wait_time, target, hidden = TRUE))
+ if(!do_after(user, wait_time, target, hidden = TRUE, extra_checks = CALLBACK(src, PROC_REF(adjacency_check), user, target)))
user.balloon_alert(user, "interrupted!")
drawing_rune = FALSE
return FALSE
@@ -146,6 +146,13 @@
suicider.AddComponent(/datum/component/face_decal, "spray", EXTERNAL_ADJACENT, paint_color)
return OXYLOSS
+///Checks if the user is still adjacent to the target (used for do_after extra_checks)
+/obj/item/traitor_spraycan/proc/adjacency_check(mob/user, atom/target)
+ if(!user.Adjacent(target))
+ user.balloon_alert(user, "moved too far away!")
+ return FALSE
+ return TRUE
+
/obj/effect/decal/cleanable/traitor_rune
name = "syndicate graffiti"
desc = "It looks like it's going to be... the Syndicate logo?"
diff --git a/code/game/objects/structures/shower.dm b/code/game/objects/structures/shower.dm
index 65c89e96b47..f0869fb9a37 100644
--- a/code/game/objects/structures/shower.dm
+++ b/code/game/objects/structures/shower.dm
@@ -138,10 +138,13 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/shower, (-16))
/obj/machinery/shower/plunger_act(obj/item/plunger/attacking_plunger, mob/living/user, reinforced)
user.balloon_alert_to_viewers("furiously plunging...", "plunging shower...")
- if(do_after(user, 3 SECONDS, target = src))
- user.balloon_alert_to_viewers("finished plunging")
- reagents.expose(get_turf(src), TOUCH) //splash on the floor
- reagents.clear_reagents()
+ if(!do_after(user, 3 SECONDS, target = src))
+ return TRUE
+ user.balloon_alert_to_viewers("finished plunging")
+ reagents.expose(get_turf(src), TOUCH) //splash on the floor
+ reagents.clear_reagents()
+ begin_processing()
+ return TRUE
/obj/machinery/shower/attackby(obj/item/tool, mob/user, list/modifiers, list/attack_modifiers)
if(istype(tool, /obj/item/stock_parts/water_recycler))
diff --git a/code/game/objects/structures/water_structures/sink.dm b/code/game/objects/structures/water_structures/sink.dm
index fdaa20af104..7922f332653 100644
--- a/code/game/objects/structures/water_structures/sink.dm
+++ b/code/game/objects/structures/water_structures/sink.dm
@@ -159,13 +159,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sink, (-14))
O.play_tool_sound(src)
has_water_reclaimer = FALSE
new/obj/item/stock_parts/water_recycler(get_turf(loc))
- to_chat(user, span_notice("You remove the water reclaimer from [src]"))
- return
-
- if(istype(O, /obj/item/stack/ore/glass))
- new /obj/item/stack/sheet/sandblock(loc)
- to_chat(user, span_notice("You wet the sand in the sink and form it into a block."))
- O.use(1)
+ to_chat(user, span_notice("You remove the water reclaimer from [src]."))
return
if(istype(O, /obj/item/stock_parts/water_recycler))
diff --git a/code/game/objects/structures/water_structures/toilet.dm b/code/game/objects/structures/water_structures/toilet.dm
index c2f1ecb848f..7738a0f6473 100644
--- a/code/game/objects/structures/water_structures/toilet.dm
+++ b/code/game/objects/structures/water_structures/toilet.dm
@@ -7,45 +7,71 @@
density = FALSE
anchored = TRUE
- ///Boolean if whether the toilet is currently flushing.
+ /// Boolean if whether the toilet is currently flushing.
var/flushing = FALSE
- ///Boolean if the toilet seat is up.
+ /// Boolean if the toilet seat is up.
var/cover_open = FALSE
- ///Boolean if the cistern is up, allowing items to be put in/out.
+ /// Boolean if the cistern is up, allowing items to be put in/out.
var/cistern_open = FALSE
- ///The combined weight of all items in the cistern put together.
+ /// The combined weight of all items in the cistern put together.
var/w_items = 0
- ///Reference to the mob being given a swirlie.
+ /// Reference to the mob being given a swirlie.
var/mob/living/swirlie
- ///The type of material used to build the toilet.
+ /// The type of material used to build the toilet.
var/buildstacktype = /obj/item/stack/sheet/iron
- ///How much of the buildstacktype is needed to construct the toilet.
+ /// How much of the buildstacktype is needed to construct the toilet.
var/buildstackamount = 1
- ///Lazylist of items in the cistern.
+ /// Lazylist of items in the cistern.
var/list/cistern_items
- ///Lazylist of fish in the toilet, not to be mixed with the items in the cistern. Max of 3
+ /// Lazylist of fish in the toilet, not to be mixed with the items in the cistern. Max of 3
var/list/fishes
+ /// Does the toilet have a water recycler to recollect its water supply?
+ var/has_water_reclaimer = TRUE
+ /// Units of water to reclaim per second
+ var/reclaim_rate = 0.5
+ /// What reagent does the toilet flush with
+ var/reagent_id = /datum/reagent/water
+ /// How much reagent can the cistern contain
+ var/reagent_capacity = 200
+ /// Item stuck in the basin of the toilet
+ var/obj/item/stuck_item = null
-/obj/structure/toilet/Initialize(mapload)
+/obj/structure/toilet/Initialize(mapload, has_water_reclaimer = null)
. = ..()
cover_open = round(rand(0, 1))
+ if(!isnull(has_water_reclaimer))
+ src.has_water_reclaimer = has_water_reclaimer
update_appearance(UPDATE_ICON)
if(mapload && SSmapping.level_trait(z, ZTRAIT_STATION))
AddComponent(/datum/component/fishing_spot, GLOB.preset_fish_sources[/datum/fish_source/toilet])
AddElement(/datum/element/fish_safe_storage)
register_context()
+ create_reagents(reagent_capacity)
+ if(src.has_water_reclaimer)
+ reagents.add_reagent(reagent_id, reagent_capacity)
+ AddComponent(/datum/component/plumbing/simple_demand, extend_pipe_to_edge = TRUE)
/obj/structure/toilet/add_context(atom/source, list/context, obj/item/held_item, mob/user)
. = ..()
if(user.pulling && isliving(user.pulling))
context[SCREENTIP_CONTEXT_LMB] = "Give Swirlie"
- else if(cover_open && istype(held_item, /obj/item/fish))
- context[SCREENTIP_CONTEXT_LMB] = "Insert Fish"
- else if(cover_open && LAZYLEN(fishes))
- context[SCREENTIP_CONTEXT_LMB] = "Grab Fish"
+ if(cover_open)
+ if(isnull(held_item))
+ if(LAZYLEN(fishes))
+ context[SCREENTIP_CONTEXT_LMB] = "Grab Fish"
+ else if(istype(held_item, /obj/item/fish))
+ context[SCREENTIP_CONTEXT_LMB] = "Insert Fish"
+ else if(istype(held_item, /obj/item/plunger))
+ context[SCREENTIP_CONTEXT_LMB] = "Unclog"
+ else if(held_item.w_class <= WEIGHT_CLASS_SMALL)
+ context[SCREENTIP_CONTEXT_LMB] = "Insert Item"
else if(cistern_open)
if(isnull(held_item))
context[SCREENTIP_CONTEXT_LMB] = "Check Cistern"
+ else if(held_item.tool_behaviour == TOOL_SCREWDRIVER && has_water_reclaimer)
+ context[SCREENTIP_CONTEXT_LMB] = "Remove Reclaimer"
+ else if(istype(held_item, /obj/item/stock_parts/water_recycler) && !has_water_reclaimer)
+ context[SCREENTIP_CONTEXT_LMB] = "Install Reclaimer"
else
context[SCREENTIP_CONTEXT_LMB] = "Insert Item"
context[SCREENTIP_CONTEXT_RMB] = "Flush"
@@ -54,8 +80,14 @@
/obj/structure/toilet/examine(mob/user)
. = ..()
- if(cover_open && LAZYLEN(fishes))
- . += span_notice("You can see fish in the toilet, you can probably take one out.")
+ if(cover_open)
+ if(LAZYLEN(fishes))
+ . += span_notice("You can see fish in the toilet, you can probably take one out.")
+ if(stuck_item)
+ . += span_notice("There seems to be something small in [src]'s bowl...")
+ if(cistern_open && has_water_reclaimer)
+ . += span_notice("A water recycler is installed. Its attached by a pair of screws.")
+ . += span_notice("Its display states: [reagents.total_volume]/[reagents.maximum_volume] liquids remaining.")
/obj/structure/toilet/examine_more(mob/user)
. = ..()
@@ -66,6 +98,7 @@
. = ..()
QDEL_LAZYLIST(fishes)
QDEL_LAZYLIST(cistern_items)
+ QDEL_NULL(stuck_item)
/obj/structure/toilet/Exited(atom/movable/gone, direction)
. = ..()
@@ -101,12 +134,18 @@
if(swirlie)
return
if(cover_open)
+ if(!reagents.total_volume)
+ to_chat(user, span_notice("\The [src] is dry!"))
+ return
grabbed_mob.visible_message(span_danger("[user] starts to give [grabbed_mob] a swirlie!"), span_userdanger("[user] starts to give you a swirlie..."))
swirlie = grabbed_mob
var/was_alive = (swirlie.stat != DEAD)
if(!do_after(user, 3 SECONDS, target = src, timed_action_flags = IGNORE_HELD_ITEM))
swirlie = null
return
+ if(!reagents.total_volume)
+ to_chat(user, span_notice("\The [src] is dry!"))
+ return
grabbed_mob.visible_message(span_danger("[user] gives [grabbed_mob] a swirlie!"), span_userdanger("[user] gives you a swirlie!"), span_hear("You hear a toilet flushing."))
if(iscarbon(grabbed_mob))
var/mob/living/carbon/carbon_grabbed = grabbed_mob
@@ -158,7 +197,25 @@
. = ..()
if(flushing)
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+
+ if(reagents.total_volume <= 50)
+ to_chat(user, span_notice("You press the flush lever, but nothing happens."))
+ return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+
flushing = TRUE
+ var/something_stuck = !isnull(stuck_item)
+ if(!something_stuck && LAZYLEN(fishes))
+ for(var/obj/item/fish/fish as anything in fishes)
+ if(fish.w_class >= WEIGHT_CLASS_NORMAL)
+ something_stuck = TRUE
+ break
+
+ if(something_stuck)
+ reagents.create_foam(/datum/effect_system/fluid_spread/foam, 10, notification = span_danger("[src] overflows, spilling its cistern's contents everywhere!"), log = TRUE)
+ else
+ reagents.remove_all(50)
+
+ begin_reclamation()
playsound(src, 'sound/machines/toilet_flush.ogg', cover_open ? 40 : 20, TRUE)
if(cover_open && (dir & SOUTH))
update_appearance(UPDATE_OVERLAYS)
@@ -183,50 +240,97 @@
else
for(var/datum/material/M as anything in custom_materials)
new M.sheet_type(loc, FLOOR(custom_materials[M] / SHEET_MATERIAL_AMOUNT, 1))
+ if(has_water_reclaimer)
+ new /obj/item/stock_parts/water_recycler(drop_location())
+ if(stuck_item)
+ stuck_item.forceMove(drop_location())
+
+/obj/structure/toilet/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+ if(user.combat_mode)
+ return NONE
-/obj/structure/toilet/attackby(obj/item/attacking_item, mob/living/user, list/modifiers, list/attack_modifiers)
add_fingerprint(user)
- if(cover_open && istype(attacking_item, /obj/item/fish))
+ if(cover_open && istype(tool, /obj/item/fish))
if(fishes >= 3)
to_chat(user, span_warning("There's too many fishes, flush them down first."))
- return
- if(!user.transferItemToLoc(attacking_item, src))
- to_chat(user, span_warning("\The [attacking_item] is stuck to your hand!"))
- return
- var/obj/item/fish/the_fish = attacking_item
+ return ITEM_INTERACT_BLOCKING
+ if(!user.transferItemToLoc(tool, src))
+ to_chat(user, span_warning("\The [tool] is stuck to your hand!"))
+ return ITEM_INTERACT_BLOCKING
+ var/obj/item/fish/the_fish = tool
if(the_fish.status == FISH_DEAD)
- to_chat(user, span_warning("You place [attacking_item] into [src], may it rest in peace."))
+ to_chat(user, span_warning("You place [tool] into [src], may it rest in peace."))
else
- to_chat(user, span_notice("You place [attacking_item] into [src], hopefully no one will miss it!"))
- LAZYADD(fishes, attacking_item)
- return
+ to_chat(user, span_notice("You place [tool] into [src], hopefully no one will miss it!"))
+ LAZYADD(fishes, tool)
+ return ITEM_INTERACT_SUCCESS
- if(cistern_open && !user.combat_mode)
- if(attacking_item.w_class > WEIGHT_CLASS_NORMAL)
- to_chat(user, span_warning("[attacking_item] does not fit!"))
- return
- if(w_items + attacking_item.w_class > WEIGHT_CLASS_HUGE)
+ if(cistern_open)
+ if(istype(tool, /obj/item/stock_parts/water_recycler))
+ if(has_water_reclaimer)
+ to_chat(user, span_warning("[src] already has a water recycler installed."))
+ return ITEM_INTERACT_BLOCKING
+
+ playsound(src, 'sound/machines/click.ogg', 20, TRUE)
+ qdel(tool)
+ has_water_reclaimer = TRUE
+ begin_reclamation()
+ return ITEM_INTERACT_SUCCESS
+
+ if(tool.w_class > WEIGHT_CLASS_NORMAL)
+ to_chat(user, span_warning("[tool] does not fit!"))
+ return ITEM_INTERACT_BLOCKING
+ if(w_items + tool.w_class > WEIGHT_CLASS_HUGE)
to_chat(user, span_warning("The cistern is full!"))
- return
- if(!user.transferItemToLoc(attacking_item, src))
- to_chat(user, span_warning("\The [attacking_item] is stuck to your hand, you cannot put it in the cistern!"))
- return
- LAZYADD(cistern_items, attacking_item)
- w_items += attacking_item.w_class
- to_chat(user, span_notice("You carefully place [attacking_item] into the cistern."))
- return
+ return ITEM_INTERACT_BLOCKING
+ if(!user.transferItemToLoc(tool, src))
+ to_chat(user, span_warning("\The [tool] is stuck to your hand, you cannot put it in the cistern!"))
+ return ITEM_INTERACT_BLOCKING
+ LAZYADD(cistern_items, tool)
+ w_items += tool.w_class
+ to_chat(user, span_notice("You carefully place [tool] into the cistern."))
+ return ITEM_INTERACT_SUCCESS
- if(is_reagent_container(attacking_item) && !user.combat_mode)
- if (!cover_open)
- return
- if(istype(attacking_item, /obj/item/food/monkeycube))
- var/obj/item/food/monkeycube/cube = attacking_item
- cube.Expand()
- return
- var/obj/item/reagent_containers/RG = attacking_item
- RG.reagents.add_reagent(/datum/reagent/water, min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this))
- to_chat(user, span_notice("You fill [RG] from [src]. Gross."))
- return ..()
+ if(!cover_open)
+ return NONE
+
+ if(!is_reagent_container(tool))
+ if(tool.w_class > WEIGHT_CLASS_SMALL)
+ return NONE
+
+ if(stuck_item)
+ to_chat(user, span_warning("There's already something blocking [src]'s drain pipe!"))
+ return ITEM_INTERACT_BLOCKING
+
+ if(!user.transferItemToLoc(tool, src))
+ to_chat(user, span_warning("\The [tool] is stuck to your hand!"))
+ return ITEM_INTERACT_BLOCKING
+
+ stuck_item = tool
+ to_chat(user, span_notice("You drop [tool] into [src]'s bowl."))
+ return ITEM_INTERACT_SUCCESS
+
+ if(reagents.total_volume <= 0)
+ to_chat(user, span_notice("\The [src] is dry."))
+ return ITEM_INTERACT_BLOCKING
+
+ if(istype(tool, /obj/item/food/monkeycube))
+ var/obj/item/food/monkeycube/cube = tool
+ cube.Expand()
+ return ITEM_INTERACT_SUCCESS
+
+ var/obj/item/reagent_containers/container = tool
+ if(!container.is_refillable())
+ return NONE
+
+ if(container.reagents.holder_full())
+ to_chat(user, span_notice("\The [container] is full."))
+ return ITEM_INTERACT_BLOCKING
+
+ reagents.trans_to(container, container.amount_per_transfer_from_this, transferred_by = user)
+ begin_reclamation()
+ to_chat(user, span_notice("You fill [container] from [src]. Gross."))
+ return ITEM_INTERACT_SUCCESS
/obj/structure/toilet/crowbar_act(mob/living/user, obj/item/tool)
to_chat(user, span_notice("You start to [cistern_open ? "replace the lid on" : "lift the lid off"] the cistern..."))
@@ -240,11 +344,39 @@
update_appearance(UPDATE_ICON_STATE)
return ITEM_INTERACT_SUCCESS
+/obj/structure/toilet/screwdriver_act(mob/living/user, obj/item/tool)
+ if(!cistern_open)
+ to_chat(user, span_warning("You need to open [src]'s cistern first!"))
+ return ITEM_INTERACT_BLOCKING
+
+ if(!has_water_reclaimer)
+ to_chat(user, span_warning("\the [src] doesn't have a water reclaimer installed."))
+ return ITEM_INTERACT_BLOCKING
+
+ tool.play_tool_sound(src)
+ has_water_reclaimer = FALSE
+ new /obj/item/stock_parts/water_recycler(drop_location())
+ to_chat(user, span_notice("You remove the water reclaimer from \the [src]."))
+ return ITEM_INTERACT_SUCCESS
+
/obj/structure/toilet/wrench_act(mob/living/user, obj/item/tool)
tool.play_tool_sound(src)
deconstruct()
return ITEM_INTERACT_SUCCESS
+/obj/structure/toilet/plunger_act(obj/item/plunger/attacking_plunger, mob/living/user, reinforced)
+ user.balloon_alert_to_viewers("furiously plunging...")
+ if(!do_after(user, 3 SECONDS, target = src))
+ return TRUE
+ user.balloon_alert_to_viewers("finished plunging")
+ reagents.expose(get_turf(src), TOUCH) //splash on the floor
+ reagents.clear_reagents()
+ begin_reclamation()
+ if(stuck_item)
+ stuck_item.forceMove(drop_location())
+ stuck_item = null
+ return TRUE
+
///Ends the flushing animation and updates overlays if necessary
/obj/structure/toilet/proc/end_flushing()
flushing = FALSE
@@ -252,9 +384,19 @@
update_appearance(UPDATE_OVERLAYS)
QDEL_LAZYLIST(fishes)
+/obj/structure/toilet/proc/begin_reclamation()
+ START_PROCESSING(SSplumbing, src)
+
+/obj/structure/toilet/process(seconds_per_tick)
+ // Water reclamation complete?
+ if(!has_water_reclaimer || reagents.total_volume >= reagents.maximum_volume)
+ return PROCESS_KILL
+ reagents.add_reagent(reagent_id, reclaim_rate * seconds_per_tick)
+
/obj/structure/toilet/greyscale
material_flags = MATERIAL_EFFECTS | MATERIAL_ADD_PREFIX | MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS
buildstacktype = null
+ has_water_reclaimer = FALSE
/obj/structure/toilet/secret
var/secret_type = null
diff --git a/code/game/objects/structures/water_structures/water_source.dm b/code/game/objects/structures/water_structures/water_source.dm
index 0f2f771612d..fc5411991fc 100644
--- a/code/game/objects/structures/water_structures/water_source.dm
+++ b/code/game/objects/structures/water_structures/water_source.dm
@@ -94,12 +94,6 @@
playsound(loc, 'sound/effects/slosh.ogg', 25, TRUE)
return
- if(istype(attacking_item, /obj/item/stack/ore/glass))
- new /obj/item/stack/sheet/sandblock(loc)
- to_chat(user, span_notice("You wet the sand and form it into a block."))
- attacking_item.use(1)
- return
-
if(!user.combat_mode || (attacking_item.item_flags & NOBLUDGEON))
to_chat(user, span_notice("You start washing [attacking_item]..."))
busy = TRUE
diff --git a/code/game/turfs/open/_open.dm b/code/game/turfs/open/_open.dm
index 558a89442c6..fdc59759bb8 100644
--- a/code/game/turfs/open/_open.dm
+++ b/code/game/turfs/open/_open.dm
@@ -137,6 +137,9 @@
if(!destination_z || !destination_x || !destination_y || arrived.pulledby || arrived.currently_z_moving)
return
+ if(SSatoms.initialized == INITIALIZATION_INNEW_MAPLOAD) // we don't want to be transitioning atoms to another z-level while we are still in mapload
+ return
+
var/tx = destination_x
var/ty = destination_y
var/turf/DT = locate(tx, ty, destination_z)
@@ -413,7 +416,7 @@
for(var/mob/living/basic/slime/M in src)
M.apply_water()
- wash(CLEAN_WASH, TRUE)
+ wash(CLEAN_WASH | CLEAN_RAD, TRUE)
return TRUE
/turf/open/handle_slip(mob/living/slipper, knockdown_amount, obj/slippable, lube, paralyze_amount, daze_amount, force_drop)
diff --git a/code/game/turfs/open/floor/plating.dm b/code/game/turfs/open/floor/plating.dm
index 83781b92cbc..8aa5c2ed393 100644
--- a/code/game/turfs/open/floor/plating.dm
+++ b/code/game/turfs/open/floor/plating.dm
@@ -156,19 +156,22 @@
/turf/open/floor/plating/foam/break_tile()
return //jetfuel can't break steel foam...
-/turf/open/floor/plating/foam/attackby(obj/item/attacking_item, mob/user, list/modifiers)
- if(ismetaltile(attacking_item))
- var/obj/item/stack/tile/tiles = attacking_item
- if(!tiles.use(1))
- return
- var/obj/lattice = locate(/obj/structure/lattice) in src
- if(lattice)
- qdel(lattice)
- to_chat(user, span_notice("You reinforce the foamed plating with tiling."))
- playsound(src, 'sound/items/weapons/Genhit.ogg', 50, TRUE)
- ChangeTurf(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
- return
+/turf/open/floor/plating/foam/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+ if(!ismetaltile(tool))
+ return NONE
+ var/obj/item/stack/tile/tiles = tool
+ if(!tiles.use(1))
+ return ITEM_INTERACT_BLOCKING
+ var/obj/lattice = locate(/obj/structure/lattice) in src
+ if(lattice)
+ qdel(lattice)
+ to_chat(user, span_notice("You reinforce the foamed plating with tiling."))
+ playsound(src, 'sound/items/weapons/Genhit.ogg', 50, TRUE)
+ ChangeTurf(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
+ return ITEM_INTERACT_SUCCESS
+
+/turf/open/floor/plating/foam/attackby(obj/item/attacking_item, mob/user, list/modifiers)
playsound(src, 'sound/items/weapons/tap.ogg', 100, TRUE) //The attack sound is muffled by the foam itself
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(src)
diff --git a/code/modules/admin/verbs/map_export.dm b/code/modules/admin/verbs/map_export.dm
index 0546eb3723c..398f85170fe 100644
--- a/code/modules/admin/verbs/map_export.dm
+++ b/code/modules/admin/verbs/map_export.dm
@@ -177,7 +177,7 @@ GLOBAL_LIST_INIT(save_file_chars, list(
if(istext(value))
//Prevent symbols from being because otherwise you can name something
// [";},/obj/item/gun/energy/laser/instakill{name="da epic gun] and spawn yourself an instakill gun.
- return "\"[hashtag_newlines_and_tabs("[value]", list("{"="", "}"="", "\""="", ";"="", ","=""))]\""
+ return "\"[hashtag_newlines_and_tabs("[value]", list("{"="", "}"="", "\""="", ","=""))]\""
if(isnum(value) || ispath(value))
return "[value]"
if(islist(value))
diff --git a/code/modules/antagonists/abductor/equipment/gear/abductor_items.dm b/code/modules/antagonists/abductor/equipment/gear/abductor_items.dm
index 90d2d5a9053..b056ecbef30 100644
--- a/code/modules/antagonists/abductor/equipment/gear/abductor_items.dm
+++ b/code/modules/antagonists/abductor/equipment/gear/abductor_items.dm
@@ -445,7 +445,6 @@ Return to step 11 of normal process."}
if(do_after(user, time_to_cuff, carbon_victim) && carbon_victim.canBeHandcuffed())
if(!carbon_victim.handcuffed)
carbon_victim.set_handcuffed(new /obj/item/restraints/handcuffs/energy/used(carbon_victim))
- carbon_victim.update_handcuffed()
to_chat(user, span_notice("You restrain [carbon_victim]."))
log_combat(user, carbon_victim, "handcuffed")
else
diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm
index 42746759a69..9a77b25a6ec 100644
--- a/code/modules/antagonists/cult/blood_magic.dm
+++ b/code/modules/antagonists/cult/blood_magic.dm
@@ -582,7 +582,6 @@
if(do_after(user, 3 SECONDS, C))
if(!C.handcuffed)
C.set_handcuffed(new /obj/item/restraints/handcuffs/energy/cult/used(C))
- C.update_handcuffed()
C.adjust_silence(10 SECONDS)
to_chat(user, span_notice("You shackle [C]."))
log_combat(user, C, "shackled")
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 7b00bdbb80f..82ea0bbe6d1 100644
--- a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm
+++ b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm
@@ -350,13 +350,7 @@
//BUBBERSTATION EDIT END
sac_target.visible_message(span_danger("[sac_target] begins to shudder violenty as dark tendrils begin to drag them into thin air!"))
sac_target.set_handcuffed(new /obj/item/restraints/handcuffs/energy/cult(sac_target))
- sac_target.update_handcuffed()
-
- if(sac_target.legcuffed)
- sac_target.legcuffed.forceMove(sac_target.drop_location())
- sac_target.legcuffed.dropped(sac_target)
- sac_target.legcuffed = null
- sac_target.update_worn_legcuffs()
+ sac_target.dropItemToGround(sac_target.legcuffed, TRUE)
sac_target.adjustOrganLoss(ORGAN_SLOT_BRAIN, 85, 150)
sac_target.do_jitter_animation()
diff --git a/code/modules/atmospherics/gasmixtures/gas_types.dm b/code/modules/atmospherics/gasmixtures/gas_types.dm
index c040e30db3f..ae81c16def1 100644
--- a/code/modules/atmospherics/gasmixtures/gas_types.dm
+++ b/code/modules/atmospherics/gasmixtures/gas_types.dm
@@ -121,7 +121,7 @@
rarity = 500
purchaseable = TRUE
base_value = 0.5
- desc = "Water, in gas form. Makes things slippery."
+ desc = "Water, in gas form. Makes floors slippery and washes items on them."
primary_color = "#b0c4de"
/datum/gas/hypernoblium
diff --git a/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm b/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm
index 01584a79c98..555b02256ea 100644
--- a/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm
+++ b/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm
@@ -718,7 +718,11 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 27)
///Used for air alarm link helper, which connects air alarm to a sensor with corresponding chamber_id
/obj/machinery/airalarm/proc/setup_chamber_link()
- var/obj/machinery/air_sensor/sensor = GLOB.objects_by_id_tag[GLOB.map_loaded_sensors[air_sensor_chamber_id]]
+ var/obj/machinery/air_sensor/sensor = null
+ for(var/obj/machinery/air_sensor/target as anything in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/air_sensor))
+ if(target.z == z && target.chamber_id == air_sensor_chamber_id)
+ sensor = target
+ break
if(isnull(sensor))
log_mapping("[src] at [AREACOORD(src)] tried to connect to a sensor, but no sensor with chamber_id:[air_sensor_chamber_id] found!")
return
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
index a6029e21109..b5d53035365 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
@@ -32,9 +32,6 @@
// ATMOS_INTERNAL_BOUND: Do not pass internal_pressure_bound
// NO_BOUND: Do not pass either
- /// id of air sensor its connected to
- var/chamber_id
-
///area this vent is assigned to
var/area/assigned_area
diff --git a/code/modules/cards/cards.dm b/code/modules/cards/cards.dm
index 3a18b36f86d..fbfa2a39658 100644
--- a/code/modules/cards/cards.dm
+++ b/code/modules/cards/cards.dm
@@ -102,7 +102,10 @@
card_atoms += card
if(istype(card_item, /obj/item/toy/cards/cardhand))
- qdel(card_item)
+ var/obj/item/toy/cards/cardhand/recycled_cardhand = card_item
+ recycled_cardhand.card_atoms -= cards_to_add
+ if (!length(recycled_cardhand.fetch_card_atoms()))
+ qdel(card_item)
update_appearance()
return cards_to_add
diff --git a/code/modules/cargo/markets/market_items/consumables.dm b/code/modules/cargo/markets/market_items/consumables.dm
index a8c7c72cd45..e06a9fc0fdb 100644
--- a/code/modules/cargo/markets/market_items/consumables.dm
+++ b/code/modules/cargo/markets/market_items/consumables.dm
@@ -74,3 +74,69 @@
price_min = CARGO_CRATE_VALUE * 0.25
price_max = CARGO_CRATE_VALUE * 0.75
availability_prob = 90
+
+/datum/market_item/consumable/methshipment
+ name = "Wholesale Methaphemtamine Shipment"
+ desc = "Dealer quantity! Don't get high on your own supply. Or do. You already bought it."
+ item = /obj/item/storage/box/methdealer
+
+ stock_min = 1
+ stock_max = 3
+ price_min = CARGO_CRATE_VALUE * 0.5
+ price_max = CARGO_CRATE_VALUE * 1.5
+ availability_prob = 25
+
+/datum/market_item/consumable/opiumshipment
+ name = "Wholesale Opium Shipment"
+ desc = "Are your coworkers stressed? We've got vice in bulk."
+ item = /obj/item/storage/box/opiumdealer
+
+ stock_min = 1
+ stock_max = 3
+ price_min = CARGO_CRATE_VALUE * 0.5
+ price_max = CARGO_CRATE_VALUE * 1.2
+ availability_prob = 35
+
+/datum/market_item/consumable/kronkshipment
+ name = "Wholesale Kronkaine Shipment"
+ desc = "Warning! Security might actually care about this one!"
+ item = /obj/item/storage/box/kronkdealer
+
+ stock_min = 1
+ stock_max = 3
+ price_min = CARGO_CRATE_VALUE * 1
+ price_max = CARGO_CRATE_VALUE * 2
+ availability_prob = 15
+
+/datum/market_item/consumable/methaphetamine
+ name = "Crystal Meth"
+ desc = "A big rock, for when you just need a hit."
+ item = /obj/item/food/drug/meth_crystal
+
+ stock_min = 1
+ stock_max = 5
+ price_min = CARGO_CRATE_VALUE * 0.4
+ price_max = CARGO_CRATE_VALUE * 0.5
+ availability_prob = 35
+
+/datum/market_item/consumable/heroin
+ name = "Heroin"
+ desc = "Chase the dragon."
+ item = /obj/item/food/drug/opium
+
+ stock_min = 1
+ stock_max = 5
+ price_min = CARGO_CRATE_VALUE * 0.35
+ price_max = CARGO_CRATE_VALUE * 0.5
+ availability_prob = 45
+
+/datum/market_item/consumable/kronkaine
+ name = "Kronkaine"
+ desc = "An 8⁸ ball, this is hardly ever on the market!"
+ item = /obj/item/food/drug/moon_rock
+
+ stock_min = 1
+ stock_max = 2
+ price_min = CARGO_CRATE_VALUE * 0.5
+ price_max = CARGO_CRATE_VALUE * 1
+ availability_prob = 15
diff --git a/code/modules/cargo/packs/imports.dm b/code/modules/cargo/packs/imports.dm
index eaccc5748b7..111288a28f6 100644
--- a/code/modules/cargo/packs/imports.dm
+++ b/code/modules/cargo/packs/imports.dm
@@ -99,7 +99,7 @@
desc = "I'm not sure why you bothered to buy this...and why does it cost so much?"
cost = CARGO_CRATE_VALUE * 5
contains = list(
- /obj/effect/spawner/random/maintenance/three,
+ /obj/effect/spawner/random/maintenance/dumpster,
/obj/effect/spawner/random/trash/garbage = 5,
)
crate_name = "putrid dumpster"
diff --git a/code/modules/clothing/chameleon/_chameleon_action.dm b/code/modules/clothing/chameleon/_chameleon_action.dm
index d0fdf826991..4befe80fbe8 100644
--- a/code/modules/clothing/chameleon/_chameleon_action.dm
+++ b/code/modules/clothing/chameleon/_chameleon_action.dm
@@ -120,6 +120,7 @@
if(ismob(chameleon_item.loc))
var/mob/wearer = chameleon_item.loc
wearer.update_clothing(chameleon_item.slot_flags | ITEM_SLOT_HANDS)
+ wearer.refresh_obscured()
/datum/action/item_action/chameleon/change/proc/update_item(obj/item/picked_item)
PROTECTED_PROC(TRUE) // Call update_look, not this!
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 53bbcbe6377..f388cea8805 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -563,12 +563,12 @@ BLIND // can't see anything
if(user.is_holding(src))
user.update_held_items()
return TRUE
- if(up)
- user.update_obscured_slots(visor_flags_inv)
user.update_clothing(slot_flags)
if(!iscarbon(user))
return TRUE
var/mob/living/carbon/carbon_user = user
+ if(up)
+ carbon_user.refresh_obscured()
if(visor_vars_to_toggle & VISOR_TINT)
carbon_user.update_tint()
if((visor_flags & (MASKINTERNALS|HEADINTERNALS)) && carbon_user.invalid_internals())
diff --git a/code/modules/clothing/head/animalears.dm b/code/modules/clothing/head/animalears.dm
index 77ed57a9083..bcb5ffb63ed 100644
--- a/code/modules/clothing/head/animalears.dm
+++ b/code/modules/clothing/head/animalears.dm
@@ -10,7 +10,7 @@
if(ishuman(user) && (slot & ITEM_SLOT_HEAD))
update_icon(ALL, user)
user.update_worn_head() //Color might have been changed by update_appearance.
- ..()
+ return ..()
/obj/item/clothing/head/costume/kitty/update_icon(updates=ALL, mob/living/carbon/human/user)
. = ..()
diff --git a/code/modules/clothing/masks/animal_masks.dm b/code/modules/clothing/masks/animal_masks.dm
index fd900810e67..d3482a2c39e 100644
--- a/code/modules/clothing/masks/animal_masks.dm
+++ b/code/modules/clothing/masks/animal_masks.dm
@@ -91,6 +91,7 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list(
RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(handle_speech))
to_chat(M, span_userdanger("[src] was cursed!"))
M.update_worn_mask()
+ M.refresh_obscured()
/obj/item/clothing/mask/animal/proc/clear_curse()
REMOVE_TRAIT(src, TRAIT_NODROP, CURSED_MASK_TRAIT)
diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm
index 2054b751b64..7cfdbfeb8d0 100644
--- a/code/modules/clothing/neck/_neck.dm
+++ b/code/modules/clothing/neck/_neck.dm
@@ -248,7 +248,7 @@
var/heart_strength
var/pulse_pressure
-
+ var/having_heart_attack = carbon_patient.has_status_effect(/datum/status_effect/heart_attack)
var/heart_noises = TRUE
var/obj/item/organ/heart/heart = carbon_patient.get_organ_slot(ORGAN_SLOT_HEART)
@@ -292,6 +292,8 @@
if(isnull(heart) || !heart.is_beating() || carbon_patient.stat == DEAD)
render_list += "You don't hear a heartbeat!\n"//they're dead or their heart isn't beating
heart_noises = FALSE
+ else if(having_heart_attack)
+ render_list += "You hear a rapid, irregular heartbeat.\n"
else if(heart.damage > 10 || carbon_patient.blood_volume <= BLOOD_VOLUME_OKAY)
render_list += "You hear a weak heartbeat.\n"//their heart is damaged, or they have critical blood
else
@@ -304,28 +306,25 @@
user.visible_message(span_notice("[user] presses their hands against [carbon_patient]'s abdomen."), ignored_mobs = user)
//assess abdominal organs
- if(body_part == BODY_ZONE_PRECISE_GROIN)
- var/appendix_okay = TRUE
- var/liver_okay = TRUE
- if(!liver)//sanity check, ensure the patient actually has a liver
- render_list += "You can't feel anything where [target.p_their()] liver would be.\n"
+ var/appendix_okay = TRUE
+ var/liver_okay = TRUE
+ if(!liver)//sanity check, ensure the patient actually has a liver
+ render_list += "You can't feel anything where [target.p_their()] liver would be.\n"
+ liver_okay = FALSE
+ else
+ if(liver.damage > 10)
+ render_list += "[target.p_Their()] liver feels firm.\n"//their liver is damaged
liver_okay = FALSE
- else
- if(liver.damage > 10)
- render_list += "[target.p_Their()] liver feels firm.\n"//their liver is damaged
- liver_okay = FALSE
-
- if(!appendix)//sanity check, ensure the patient actually has an appendix
- render_list += "You can't feel anything where [target.p_their()] appendix would be.\n"
+ if(!appendix)//sanity check, ensure the patient actually has an appendix
+ render_list += "You can't feel anything where [target.p_their()] appendix would be.\n"
+ appendix_okay = FALSE
+ else
+ if(appendix.damage > 10 && carbon_patient.stat == CONSCIOUS)
+ render_list += "[target] screams when you lift your hand from [target.p_their()] appendix!\n"//scream if their appendix is damaged and they're awake
+ target.emote("scream")
appendix_okay = FALSE
- else
- if(appendix.damage > 10 && carbon_patient.stat == CONSCIOUS)
- render_list += "[target] screams when you lift your hand from [target.p_their()] appendix!\n"//scream if their appendix is damaged and they're awake
- target.emote("scream")
- appendix_okay = FALSE
-
- if(liver_okay && appendix_okay)//if they have all their organs and have no detectable damage
- render_list += "You don't find anything abnormal.\n"//they're okay :D
+ if(liver_okay && appendix_okay)//if they have all their organs and have no detectable damage
+ render_list += "You don't find anything abnormal.\n"//they're okay :D
if(BODY_ZONE_PRECISE_EYES)
balloon_alert(user, "can't do that!")
@@ -347,12 +346,14 @@
if(isnull(heart) || !heart.is_beating() || carbon_patient.blood_volume <= BLOOD_VOLUME_OKAY || carbon_patient.stat == DEAD)
render_list += "You can't find a pulse!\n"//they're dead, their heart isn't beating, or they have critical blood
else
- if(heart.damage > 10)
- heart_strength = span_danger("irregular")//their heart is damaged
+ if(having_heart_attack)
+ heart_strength = span_danger("irregular")
+ else if(heart.damage > 10)
+ heart_strength = span_danger("weak")//their heart is damaged
else
heart_strength = span_notice("regular")//they're okay :D
- if(carbon_patient.blood_volume <= BLOOD_VOLUME_SAFE && carbon_patient.blood_volume > BLOOD_VOLUME_OKAY)
+ if((carbon_patient.blood_volume <= BLOOD_VOLUME_SAFE && carbon_patient.blood_volume > BLOOD_VOLUME_OKAY) || having_heart_attack)
pulse_pressure = span_danger("thready")//low blood
else
pulse_pressure = span_notice("strong")//they're okay :D
diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm
index 91fd7df3afb..52216c269d2 100644
--- a/code/modules/clothing/shoes/_shoes.dm
+++ b/code/modules/clothing/shoes/_shoes.dm
@@ -77,7 +77,7 @@
. += "The [fastening_type] are all knotted together."
/obj/item/clothing/shoes/visual_equipped(mob/user, slot)
- ..()
+ . = ..()
if(offset && (slot_flags & slot))
user.pixel_z += offset
worn_y_dimension -= (offset * 2)
diff --git a/code/modules/experisci/experiment/physical_experiments.dm b/code/modules/experisci/experiment/physical_experiments.dm
index 60303814e44..11075d1c75e 100644
--- a/code/modules/experisci/experiment/physical_experiments.dm
+++ b/code/modules/experisci/experiment/physical_experiments.dm
@@ -43,12 +43,12 @@
linked_experiment_handler.announce_message("Incorrect object for experiment.")
return FALSE
- RegisterSignal(currently_scanned_atom, COMSIG_ARCADE_PRIZEVEND, PROC_REF(win_arcade))
+ RegisterSignal(currently_scanned_atom, COMSIG_ARCADE_VICTORY, PROC_REF(win_arcade))
linked_experiment_handler.announce_message("Experiment ready to start.")
return TRUE
/datum/experiment/physical/arcade_winner/unregister_events()
- UnregisterSignal(currently_scanned_atom, COMSIG_ARCADE_PRIZEVEND)
+ UnregisterSignal(currently_scanned_atom, COMSIG_ARCADE_VICTORY)
/datum/experiment/physical/arcade_winner/check_progress()
. += EXPERIMENT_PROG_BOOL("Win an arcade game at a tracked arcade cabinet.", is_complete())
diff --git a/code/modules/fishing/fish/types/rift.dm b/code/modules/fishing/fish/types/rift.dm
index eb72c82ac44..ba6a0142ed4 100644
--- a/code/modules/fishing/fish/types/rift.dm
+++ b/code/modules/fishing/fish/types/rift.dm
@@ -722,12 +722,7 @@
icon_state = "babbearfish"
/datum/bodypart_overlay/simple/babbearfish/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner)
- var/mob/living/carbon/human/human = bodypart_owner.owner
- if(!istype(human))
- return TRUE
- if((human.head?.flags_inv & HIDEEARS) || (human.wear_mask?.flags_inv & HIDEEARS))
- return FALSE
- return TRUE
+ return !(bodypart_owner.owner?.obscured_slots & HIDEEARS)
/obj/item/organ/ears/babbelfish/Initialize(mapload)
. = ..()
diff --git a/code/modules/fishing/sources/subtypes/surgery.dm b/code/modules/fishing/sources/subtypes/surgery.dm
index 3beaa1d2fd9..0ee2b06d856 100644
--- a/code/modules/fishing/sources/subtypes/surgery.dm
+++ b/code/modules/fishing/sources/subtypes/surgery.dm
@@ -12,9 +12,13 @@
wait_time_range = list(6 SECONDS, 12 SECONDS)
/datum/fish_source/surgery/spawn_reward(reward_path, atom/spawn_location, atom/fishing_spot, obj/item/fishing_rod/used_rod)
+ if(reward_path != FISHING_RANDOM_ORGAN)
+ return ..()
+
if(istype(fishing_spot, /obj/machinery/fishing_portal_generator))
var/obj/machinery/fishing_portal_generator/portal = fishing_spot
fishing_spot = portal.current_linked_atom
+
if(!iscarbon(fishing_spot))
var/random_type = pick(subtypesof(/obj/item/organ) - GLOB.prototype_organs)
return new random_type(spawn_location)
diff --git a/code/modules/food_and_drinks/machinery/coffeemaker.dm b/code/modules/food_and_drinks/machinery/coffeemaker.dm
index bec5801646e..d2933e0f901 100644
--- a/code/modules/food_and_drinks/machinery/coffeemaker.dm
+++ b/code/modules/food_and_drinks/machinery/coffeemaker.dm
@@ -160,11 +160,22 @@
/obj/machinery/coffeemaker/proc/replace_pot(mob/living/user, obj/item/reagent_containers/cup/coffeepot/new_coffeepot)
if(!user)
return FALSE
- if(coffeepot)
+
+ // If we're trying to eject/remove the current pot
+ if(!new_coffeepot)
+ if(!coffeepot)
+ balloon_alert(user, "no coffeepot to remove!")
+ return FALSE
try_put_in_hand(coffeepot, user)
- if(new_coffeepot)
+ balloon_alert(user, "coffeepot returned")
+ coffeepot = null
+ else
+ // If we're replacing with a new pot
+ if(coffeepot)
+ try_put_in_hand(coffeepot, user)
coffeepot = new_coffeepot
- balloon_alert(user, "replaced pot")
+ balloon_alert(user, "coffeepot inserted")
+
update_appearance(UPDATE_OVERLAYS)
return TRUE
@@ -183,90 +194,92 @@
default_unfasten_wrench(user, tool)
return ITEM_INTERACT_SUCCESS
-/obj/machinery/coffeemaker/attackby(obj/item/attack_item, mob/living/user, list/modifiers, list/attack_modifiers)
+/obj/machinery/coffeemaker/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
//You can only screw open empty grinder
- if(!coffeepot && default_deconstruction_screwdriver(user, icon_state, icon_state, attack_item))
- return FALSE
+ if(!coffeepot && default_deconstruction_screwdriver(user, icon_state, icon_state, tool))
+ return ITEM_INTERACT_SUCCESS
- if(default_deconstruction_crowbar(attack_item))
- return
+ if(default_deconstruction_crowbar(tool))
+ return ITEM_INTERACT_SUCCESS
if(panel_open) //Can't insert objects when its screwed open
- return TRUE
+ return ITEM_INTERACT_BLOCKING
- if (istype(attack_item, /obj/item/reagent_containers/cup/coffeepot) && !(attack_item.item_flags & ABSTRACT) && attack_item.is_open_container())
- var/obj/item/reagent_containers/cup/coffeepot/new_pot = attack_item
- . = TRUE //no afterattack
+ if (istype(tool, /obj/item/reagent_containers/cup/coffeepot) && !(tool.item_flags & ABSTRACT) && tool.is_open_container())
+ var/obj/item/reagent_containers/cup/coffeepot/new_pot = tool
+ . = ITEM_INTERACT_SUCCESS //no afterattack
if(!user.transferItemToLoc(new_pot, src))
- return TRUE
+ return ITEM_INTERACT_BLOCKING
replace_pot(user, new_pot)
update_appearance(UPDATE_OVERLAYS)
- return TRUE //no afterattack
+ return ITEM_INTERACT_SUCCESS //no afterattack
- if (istype(attack_item, /obj/item/reagent_containers/cup/glass/coffee_cup) && !(attack_item.item_flags & ABSTRACT) && attack_item.is_open_container())
- var/obj/item/reagent_containers/cup/glass/coffee_cup/new_cup = attack_item
+ if (istype(tool, /obj/item/reagent_containers/cup/glass/coffee_cup) && !(tool.item_flags & ABSTRACT) && tool.is_open_container())
+ var/obj/item/reagent_containers/cup/glass/coffee_cup/new_cup = tool
if(new_cup.reagents.total_volume > 0)
balloon_alert(user, "the cup must be empty!")
- return
+ return ITEM_INTERACT_BLOCKING
if(coffee_cups >= max_coffee_cups)
balloon_alert(user, "the cup holder is full!")
- return
- if(!user.transferItemToLoc(attack_item, src))
- return
+ return ITEM_INTERACT_BLOCKING
+ if(!user.transferItemToLoc(tool, src))
+ return ITEM_INTERACT_BLOCKING
coffee_cups++
update_appearance(UPDATE_OVERLAYS)
- return TRUE //no afterattack
+ return ITEM_INTERACT_SUCCESS //no afterattack
- if (istype(attack_item, /obj/item/reagent_containers/condiment/pack/sugar))
- var/obj/item/reagent_containers/condiment/pack/sugar/new_pack = attack_item
+ if (istype(tool, /obj/item/reagent_containers/condiment/pack/sugar))
+ var/obj/item/reagent_containers/condiment/pack/sugar/new_pack = tool
if(new_pack.reagents.total_volume < new_pack.reagents.maximum_volume)
balloon_alert(user, "the pack must be full!")
- return
+ return ITEM_INTERACT_BLOCKING
if(sugar_packs >= max_sugar_packs)
balloon_alert(user, "the sugar compartment is full!")
- return
- if(!user.transferItemToLoc(attack_item, src))
- return
+ return ITEM_INTERACT_BLOCKING
+ if(!user.transferItemToLoc(tool, src))
+ return ITEM_INTERACT_BLOCKING
sugar_packs++
update_appearance(UPDATE_OVERLAYS)
- return TRUE //no afterattack
+ return ITEM_INTERACT_SUCCESS //no afterattack
- if (istype(attack_item, /obj/item/reagent_containers/condiment/creamer))
- var/obj/item/reagent_containers/condiment/creamer/new_pack = attack_item
+ if (istype(tool, /obj/item/reagent_containers/condiment/creamer))
+ var/obj/item/reagent_containers/condiment/creamer/new_pack = tool
if(new_pack.reagents.total_volume < new_pack.reagents.maximum_volume)
balloon_alert(user, "the pack must be full!")
- return
+ return ITEM_INTERACT_BLOCKING
if(creamer_packs >= max_creamer_packs)
balloon_alert(user, "the creamer compartment is full!")
- return
- if(!user.transferItemToLoc(attack_item, src))
- return
+ return ITEM_INTERACT_BLOCKING
+ if(!user.transferItemToLoc(tool, src))
+ return ITEM_INTERACT_BLOCKING
creamer_packs++
update_appearance(UPDATE_OVERLAYS)
- return TRUE //no afterattack
+ return ITEM_INTERACT_SUCCESS //no afterattack
- if (istype(attack_item, /obj/item/reagent_containers/condiment/pack/astrotame))
- var/obj/item/reagent_containers/condiment/pack/astrotame/new_pack = attack_item
+ if (istype(tool, /obj/item/reagent_containers/condiment/pack/astrotame))
+ var/obj/item/reagent_containers/condiment/pack/astrotame/new_pack = tool
if(new_pack.reagents.total_volume < new_pack.reagents.maximum_volume)
balloon_alert(user, "the pack must be full!")
- return
+ return ITEM_INTERACT_BLOCKING
else if(sweetener_packs >= max_sweetener_packs)
balloon_alert(user, "the sweetener compartment is full!")
- return
- else if(!user.transferItemToLoc(attack_item, src))
- return
+ return ITEM_INTERACT_BLOCKING
+ else if(!user.transferItemToLoc(tool, src))
+ return ITEM_INTERACT_BLOCKING
sweetener_packs++
update_appearance(UPDATE_OVERLAYS)
- return TRUE //no afterattack
+ return ITEM_INTERACT_SUCCESS //no afterattack
- if (istype(attack_item, /obj/item/coffee_cartridge) && !(attack_item.item_flags & ABSTRACT))
- var/obj/item/coffee_cartridge/new_cartridge = attack_item
+ if (istype(tool, /obj/item/coffee_cartridge) && !(tool.item_flags & ABSTRACT))
+ var/obj/item/coffee_cartridge/new_cartridge = tool
if(!user.transferItemToLoc(new_cartridge, src))
- return
+ return ITEM_INTERACT_BLOCKING
replace_cartridge(user, new_cartridge)
balloon_alert(user, "added cartridge")
update_appearance(UPDATE_OVERLAYS)
- return TRUE //no afterattack
+ return ITEM_INTERACT_SUCCESS //no afterattack
+
+ return NONE // Allow normal attack processing if no special interaction occurred
/obj/machinery/coffeemaker/proc/try_brew()
if(!cartridge)
@@ -582,101 +595,102 @@
return FALSE
return TRUE
-/obj/machinery/coffeemaker/impressa/attackby(obj/item/attack_item, mob/living/user, list/modifiers, list/attack_modifiers)
+/obj/machinery/coffeemaker/impressa/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
//You can only screw open empty grinder
- if(!coffeepot && default_deconstruction_screwdriver(user, icon_state, icon_state, attack_item))
- return
+ if(!coffeepot && default_deconstruction_screwdriver(user, icon_state, icon_state, tool))
+ return ITEM_INTERACT_SUCCESS
- if(default_deconstruction_crowbar(attack_item))
- return
+ if(default_deconstruction_crowbar(tool))
+ return ITEM_INTERACT_SUCCESS
if(panel_open) //Can't insert objects when its screwed open
- return TRUE
+ return ITEM_INTERACT_BLOCKING
- if (istype(attack_item, /obj/item/reagent_containers/cup/coffeepot) && !(attack_item.item_flags & ABSTRACT) && attack_item.is_open_container())
- var/obj/item/reagent_containers/cup/coffeepot/new_pot = attack_item
+ if (istype(tool, /obj/item/reagent_containers/cup/coffeepot) && !(tool.item_flags & ABSTRACT) && tool.is_open_container())
+ var/obj/item/reagent_containers/cup/coffeepot/new_pot = tool
if(!user.transferItemToLoc(new_pot, src))
- return TRUE
+ return ITEM_INTERACT_BLOCKING
replace_pot(user, new_pot)
update_appearance(UPDATE_OVERLAYS)
- return TRUE //no afterattack
+ return ITEM_INTERACT_SUCCESS //no afterattack
- if (istype(attack_item, /obj/item/reagent_containers/cup/glass/coffee) && !(attack_item.item_flags & ABSTRACT) && attack_item.is_open_container())
- var/obj/item/reagent_containers/cup/glass/coffee/new_cup = attack_item //different type of cup
+ if (istype(tool, /obj/item/reagent_containers/cup/glass/coffee) && !(tool.item_flags & ABSTRACT) && tool.is_open_container())
+ var/obj/item/reagent_containers/cup/glass/coffee/new_cup = tool //different type of cup
if(new_cup.reagents.total_volume > 0 )
balloon_alert(user, "the cup must be empty!")
- return
+ return ITEM_INTERACT_BLOCKING
if(coffee_cups >= max_coffee_cups)
balloon_alert(user, "the cup holder is full!")
- return
- if(!user.transferItemToLoc(attack_item, src))
- return
+ return ITEM_INTERACT_BLOCKING
+ if(!user.transferItemToLoc(tool, src))
+ return ITEM_INTERACT_BLOCKING
coffee_cups++
update_appearance(UPDATE_OVERLAYS)
- return TRUE //no afterattack
+ return ITEM_INTERACT_SUCCESS //no afterattack
- if (istype(attack_item, /obj/item/reagent_containers/condiment/pack/sugar))
- var/obj/item/reagent_containers/condiment/pack/sugar/new_pack = attack_item
+ if (istype(tool, /obj/item/reagent_containers/condiment/pack/sugar))
+ var/obj/item/reagent_containers/condiment/pack/sugar/new_pack = tool
if(new_pack.reagents.total_volume < new_pack.reagents.maximum_volume)
balloon_alert(user, "the pack must be full!")
- return
+ return ITEM_INTERACT_BLOCKING
if(sugar_packs >= max_sugar_packs)
balloon_alert(user, "the sugar compartment is full!")
- return
- if(!user.transferItemToLoc(attack_item, src))
- return
+ return ITEM_INTERACT_BLOCKING
+ if(!user.transferItemToLoc(tool, src))
+ return ITEM_INTERACT_BLOCKING
sugar_packs++
update_appearance(UPDATE_OVERLAYS)
- return TRUE //no afterattack
+ return ITEM_INTERACT_SUCCESS //no afterattack
- if (istype(attack_item, /obj/item/reagent_containers/condiment/creamer))
- var/obj/item/reagent_containers/condiment/creamer/new_pack = attack_item
+ if (istype(tool, /obj/item/reagent_containers/condiment/creamer))
+ var/obj/item/reagent_containers/condiment/creamer/new_pack = tool
if(new_pack.reagents.total_volume < new_pack.reagents.maximum_volume)
balloon_alert(user, "the pack must be full!")
- return
+ return ITEM_INTERACT_BLOCKING
if(creamer_packs >= max_creamer_packs)
balloon_alert(user, "the creamer compartment is full!")
- return
- if(!user.transferItemToLoc(attack_item, src))
- return
+ return ITEM_INTERACT_BLOCKING
+ if(!user.transferItemToLoc(tool, src))
+ return ITEM_INTERACT_BLOCKING
creamer_packs++
update_appearance(UPDATE_OVERLAYS)
- return TRUE //no afterattack
+ return ITEM_INTERACT_SUCCESS //no afterattack
- if (istype(attack_item, /obj/item/reagent_containers/condiment/pack/astrotame))
- var/obj/item/reagent_containers/condiment/pack/astrotame/new_pack = attack_item
+ if (istype(tool, /obj/item/reagent_containers/condiment/pack/astrotame))
+ var/obj/item/reagent_containers/condiment/pack/astrotame/new_pack = tool
if(new_pack.reagents.total_volume < new_pack.reagents.maximum_volume)
balloon_alert(user, "the pack must be full!")
- return
+ return ITEM_INTERACT_BLOCKING
if(sweetener_packs >= max_sweetener_packs)
balloon_alert(user, "the sweetener compartment is full!")
- return
- if(!user.transferItemToLoc(attack_item, src))
- return
+ return ITEM_INTERACT_BLOCKING
+ if(!user.transferItemToLoc(tool, src))
+ return ITEM_INTERACT_BLOCKING
sweetener_packs++
update_appearance(UPDATE_OVERLAYS)
- return TRUE //no afterattack
+ return ITEM_INTERACT_SUCCESS //no afterattack
- if (istype(attack_item, /obj/item/food/grown/coffee) && !(attack_item.item_flags & ABSTRACT))
+ if (istype(tool, /obj/item/food/grown/coffee) && !(tool.item_flags & ABSTRACT))
if(coffee_amount >= BEAN_CAPACITY)
balloon_alert(user, "the coffee container is full!")
- return
- if(!HAS_TRAIT(attack_item, TRAIT_DRIED))
+ return ITEM_INTERACT_BLOCKING
+ if(!HAS_TRAIT(tool, TRAIT_DRIED))
balloon_alert(user, "coffee beans must be dry!")
- return
- var/obj/item/food/grown/coffee/new_coffee = attack_item
+ return ITEM_INTERACT_BLOCKING
+ var/obj/item/food/grown/coffee/new_coffee = tool
if(!user.transferItemToLoc(new_coffee, src))
- return
+ return ITEM_INTERACT_BLOCKING
coffee += new_coffee
coffee_amount++
balloon_alert(user, "added coffee")
+ update_appearance(UPDATE_OVERLAYS)
+ return ITEM_INTERACT_SUCCESS //no afterattack
-
- if (istype(attack_item, /obj/item/storage/box/coffeepack))
+ if (istype(tool, /obj/item/storage/box/coffeepack))
if(coffee_amount >= BEAN_CAPACITY)
balloon_alert(user, "the coffee container is full!")
- return
- var/obj/item/storage/box/coffeepack/new_coffee_pack = attack_item
+ return ITEM_INTERACT_BLOCKING
+ var/obj/item/storage/box/coffeepack/new_coffee_pack = tool
for(var/obj/item/food/grown/coffee/new_coffee in new_coffee_pack.contents)
if(HAS_TRAIT(new_coffee, TRAIT_DRIED)) //the coffee beans inside must be dry
if(coffee_amount < BEAN_CAPACITY)
@@ -687,15 +701,16 @@
balloon_alert(user, "added coffee")
update_appearance(UPDATE_OVERLAYS)
else
- return
+ return ITEM_INTERACT_BLOCKING
else
- return
+ return ITEM_INTERACT_BLOCKING
else
balloon_alert(user, "non-dried beans inside of coffee pack!")
- return
+ return ITEM_INTERACT_BLOCKING
+ update_appearance(UPDATE_OVERLAYS)
+ return ITEM_INTERACT_SUCCESS //no afterattack
- update_appearance(UPDATE_OVERLAYS)
- return TRUE //no afterattack
+ return NONE // Allow normal attack processing if no special interaction occurred
/obj/machinery/coffeemaker/impressa/take_cup(mob/user)
if(!coffee_cups) //shouldn't happen, but we all know how stuff manages to break
diff --git a/code/modules/food_and_drinks/machinery/griddle.dm b/code/modules/food_and_drinks/machinery/griddle.dm
index f5ff1c140e8..5d0beed7ee0 100644
--- a/code/modules/food_and_drinks/machinery/griddle.dm
+++ b/code/modules/food_and_drinks/machinery/griddle.dm
@@ -57,11 +57,6 @@
visible_message(span_notice("[exposing_reagent] begins to cook on [src]."))
return NONE
-/obj/machinery/griddle/crowbar_act(mob/living/user, obj/item/I)
- . = ..()
- return default_deconstruction_crowbar(I, ignore_panel = TRUE)
-
-
/obj/machinery/griddle/attackby(obj/item/I, mob/user, list/modifiers, list/attack_modifiers)
if(griddled_objects.len >= max_items)
diff --git a/code/modules/food_and_drinks/machinery/oven.dm b/code/modules/food_and_drinks/machinery/oven.dm
index 7b4ccb76280..a0d0ebad417 100644
--- a/code/modules/food_and_drinks/machinery/oven.dm
+++ b/code/modules/food_and_drinks/machinery/oven.dm
@@ -270,6 +270,9 @@
return ITEM_INTERACT_SUCCESS
/obj/item/plate/oven_tray/item_interaction(mob/living/user, obj/item/item, list/modifiers)
+ . = ..()
+ if(. & ITEM_INTERACT_ANY_BLOCKER)
+ return .
if(isnull(item.atom_storage))
return NONE
diff --git a/code/modules/food_and_drinks/plate.dm b/code/modules/food_and_drinks/plate.dm
index 243d4f0ef14..600313c8383 100644
--- a/code/modules/food_and_drinks/plate.dm
+++ b/code/modules/food_and_drinks/plate.dm
@@ -24,26 +24,26 @@
if(fragile)
AddElement(/datum/element/can_shatter)
-/obj/item/plate/attackby(obj/item/I, mob/user, list/modifiers, list/attack_modifiers)
- if(!IS_EDIBLE(I))
+/obj/item/plate/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+ if(!IS_EDIBLE(tool))
balloon_alert(user, "not food!")
- return
- if(I.w_class > biggest_w_class)
+ return ITEM_INTERACT_BLOCKING
+ if(tool.w_class > biggest_w_class)
balloon_alert(user, "too big!")
- return
+ return ITEM_INTERACT_BLOCKING
if(contents.len >= max_items)
balloon_alert(user, "can't fit!")
- return
+ return ITEM_INTERACT_BLOCKING
//Center the icon where the user clicked.
if(!LAZYACCESS(modifiers, ICON_X) || !LAZYACCESS(modifiers, ICON_Y))
- return
- if(user.transferItemToLoc(I, src, silent = FALSE))
- I.pixel_x = clamp(text2num(LAZYACCESS(modifiers, ICON_X)) - 16, -max_x_offset, max_x_offset)
- I.pixel_y = min(text2num(LAZYACCESS(modifiers, ICON_Y)) + placement_offset, max_height_offset)
- to_chat(user, span_notice("You place [I] on [src]."))
- AddToPlate(I, user)
- else
- return ..()
+ return ITEM_INTERACT_BLOCKING
+ if(!user.transferItemToLoc(tool, src, silent = FALSE))
+ return ITEM_INTERACT_BLOCKING
+ tool.pixel_x = clamp(text2num(LAZYACCESS(modifiers, ICON_X)) - 16, -max_x_offset, max_x_offset)
+ tool.pixel_y = min(text2num(LAZYACCESS(modifiers, ICON_Y)) + placement_offset, max_height_offset)
+ to_chat(user, span_notice("You place [tool] on [src]."))
+ AddToPlate(tool, user)
+ return ITEM_INTERACT_SUCCESS
/obj/item/plate/pre_attack(atom/target, mob/living/user, list/modifiers, list/attack_modifiers)
if(!iscarbon(target))
diff --git a/code/modules/forensics/forensics_helpers.dm b/code/modules/forensics/forensics_helpers.dm
index 46c0bfa3a9d..5b32ee43418 100644
--- a/code/modules/forensics/forensics_helpers.dm
+++ b/code/modules/forensics/forensics_helpers.dm
@@ -200,7 +200,7 @@
var/dirty_hands = !!(target_flags & (ITEM_SLOT_GLOVES|ITEM_SLOT_HANDS))
var/dirty_feet = !!(target_flags & ITEM_SLOT_FEET)
- var/slots_to_bloody = target_flags & ~check_covered_slots()
+ var/slots_to_bloody = target_flags & ~hidden_slots_to_inventory_slots(covered_slots)
var/list/all_worn = get_equipped_items()
for(var/obj/item/thing as anything in all_worn)
if(thing.slot_flags & slots_to_bloody)
diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm
index 40a84d9c8ff..d15e9664854 100644
--- a/code/modules/hydroponics/grown/flowers.dm
+++ b/code/modules/hydroponics/grown/flowers.dm
@@ -19,6 +19,19 @@
mutatelist = list(/obj/item/seeds/poppy/geranium, /obj/item/seeds/poppy/lily)
reagents_add = list(/datum/reagent/medicine/c2/libital = 0.2, /datum/reagent/consumable/nutriment = 0.05)
+/obj/item/seeds/poppy/interact_with_atom(obj/item/I, mob/user, obj/machinery/hydroponics/tray)
+ if(I.sharpness && !src.extracted && tray.age >= 10 && tray.age <= 19)
+ src.extracted = TRUE
+ var/seed_yield = tray.myseed?.potency
+ new /obj/item/food/drug/opium/raw(get_turf(src), seed_yield)
+ playsound(src, 'sound/effects/bubbles/bubbles.ogg', 30, TRUE)
+ playsound(loc, 'sound/items/weapons/bladeslice.ogg', 30, TRUE)
+ user.visible_message(
+ span_notice("You carefully slice the poppy's pod, collecting the fragrant, alluring sap.")
+ )
+ return ITEM_INTERACT_SUCCESS
+ return NONE
+
/obj/item/food/grown/poppy
seed = /obj/item/seeds/poppy
name = "poppy"
diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm
index ffa6f596711..3f2d31bca35 100644
--- a/code/modules/hydroponics/hydroponics.dm
+++ b/code/modules/hydroponics/hydroponics.dm
@@ -938,6 +938,12 @@
to_chat(user, span_warning("This plot is completely devoid of weeds! It doesn't need uprooting."))
return
+ else if(O.sharpness) // Allows for the extraction (for opium or sap) interaction if a seed has it.
+ if(myseed && !myseed.extracted)
+ myseed.interact_with_atom(O, user, src)
+ else
+ return ..()
+
else if(istype(O, /obj/item/secateurs))
if(!myseed)
to_chat(user, span_notice("This plot is empty."))
diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm
index d5398035711..d0360769cee 100644
--- a/code/modules/hydroponics/seeds.dm
+++ b/code/modules/hydroponics/seeds.dm
@@ -63,6 +63,8 @@
var/graft_gene
///Determines if the plant should be allowed to mutate early at 30+ instability.
var/seed_flags = MUTATE_EARLY
+ ///Determines if the plant has been sliced with a sharp tool to extract substances like saps.
+ var/extracted = 0
/obj/item/seeds/Initialize(mapload, nogenes = FALSE)
. = ..()
diff --git a/code/modules/jobs/job_types/chief_engineer.dm b/code/modules/jobs/job_types/chief_engineer.dm
index 4ba145c7428..4cff930e11d 100644
--- a/code/modules/jobs/job_types/chief_engineer.dm
+++ b/code/modules/jobs/job_types/chief_engineer.dm
@@ -69,6 +69,8 @@
backpack_contents = list(
/obj/item/melee/baton/telescopic/silver = 1,
// /obj/item/construction/rcd/ce = 1, // BUBBER EDIT -> MOVED TO LOCKER
+ /obj/item/extinguisher/mini = 1,
+ /obj/item/analyzer = 1,
)
belt = /obj/item/storage/belt/utility/chief/full
ears = /obj/item/radio/headset/heads/ce
diff --git a/code/modules/mapping/reader.dm b/code/modules/mapping/reader.dm
index 1efcf71676e..e5a323d0725 100644
--- a/code/modules/mapping/reader.dm
+++ b/code/modules/mapping/reader.dm
@@ -1008,27 +1008,61 @@ GLOBAL_LIST_EMPTY(map_model_default)
var/old_position = 1
while(position != 0)
// find next delimiter that is not within "..."
- position = find_next_delimiter_position(text,old_position,delimiter)
+ position = find_next_delimiter_position(text, old_position, delimiter)
// check if this is a simple variable (as in list(var1, var2)) or an associative one (as in list(var1="foo",var2=7))
- var/equal_position = findtext(text,"=",old_position, position)
- var/trim_left = trim(copytext(text,old_position,(equal_position ? equal_position : position)))
- var/left_constant = parse_constant(trim_left)
- if(position)
- old_position = position + length(text[position])
- if(!left_constant) // damn newlines man. Exists to provide behavior consistency with the above loop. not a major cost becuase this path is cold
+ var/equal_position = find_next_delimiter_position(text, old_position, "=")
+ var/trim_left = trim(copytext(text, old_position, (equal_position ? equal_position : position)))
+ if(!trim_left) // damn newlines man. Exists to provide behavior consistency with the above loop. not a major cost becuase this path is cold
+ if(position)
+ old_position = position + length(text[position])
continue
- if(equal_position && !isnum(left_constant))
+ var/is_simple = TRUE //linear list
+ var/trim_right = trim_left //simple var
+ if(equal_position)
// Associative var, so do the association.
// Note that numbers cannot be keys - the RHS is dropped if so.
- var/trim_right = trim(copytext(text, equal_position + length(text[equal_position]), position))
- var/right_constant = parse_constant(trim_right)
- .[left_constant] = right_constant
- else // simple var
+ trim_right = trim(copytext(text, equal_position + length(text[equal_position]), position))
+ is_simple = FALSE
+
+ //right value is a list and since we used the delimiter , this text would be incomplete so we need to parse the full string
+ if(copytext(trim_right, 1, 6) == "list(")
+ var/start_index = is_simple ? old_position : equal_position + length(text[equal_position])
+ var/opening_count = 0
+ var/closing_count = 0
+ var/index = start_index
+ var/begin = FALSE
+ while(!begin || (opening_count != closing_count))
+ var/char = text[index]
+ if(char == "(")
+ opening_count += 1
+ begin = TRUE
+ else if(char == ")")
+ closing_count += 1
+ index += length(char)
+ trim_right = trim(copytext(text, start_index, index))
+ if(is_simple)
+ trim_left = trim_right
+ if(index >= length(text)) //stops a wasteful iteration when we reach the end
+ position = 0
+ else
+ old_position = index + length(text[index]) //this moves our pointer past , to the next element
+ else if(position)
+ old_position = position + length(text[position])
+
+ //assign value
+ var/left_constant = parse_constant(trim_left)
+ if(is_simple)
. += list(left_constant)
+ else
+ .[left_constant] = parse_constant(trim_right)
/datum/parsed_map/proc/parse_constant(text)
+ // empty text
+ if(!text)
+ return ""
+
// number
var/num = text2num(text)
if(isnum(num))
diff --git a/code/modules/mining/fulton.dm b/code/modules/mining/fulton.dm
index d05370b273f..8738752af33 100644
--- a/code/modules/mining/fulton.dm
+++ b/code/modules/mining/fulton.dm
@@ -62,31 +62,30 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
if(thing.anchored)
return NONE
- . = ITEM_INTERACT_BLOCKING
var/obj/structure/extraction_point/beacon = beacon_ref?.resolve()
if(isnull(beacon))
balloon_alert(user, "not linked!")
beacon_ref = null
- return .
+ return ITEM_INTERACT_BLOCKING
var/area/area = get_area(thing)
if(!can_use_indoors)
if(!area.outdoors)
balloon_alert(user, "not outdoors!")
- return .
+ return ITEM_INTERACT_BLOCKING
if(area.area_flags & NOTELEPORT)
balloon_alert(user, "unable to activate!")
- return
+ return ITEM_INTERACT_BLOCKING
var/area/target_area = get_area(beacon)
if(area != target_area && ((area.area_flags & LOCAL_TELEPORT) || (target_area.area_flags & LOCAL_TELEPORT)))
balloon_alert(user, "unable to activate!")
- return
+ return ITEM_INTERACT_BLOCKING
if(!safe_for_living_creatures && check_for_living_mobs(thing))
to_chat(user, span_warning("[src] is not safe for use with living creatures, they wouldn't survive the trip back!"))
balloon_alert(user, "not safe!")
- return .
+ return ITEM_INTERACT_BLOCKING
if(thing.move_resist > max_force_fulton)
balloon_alert(user, "too heavy!")
- return .
+ return ITEM_INTERACT_BLOCKING
balloon_alert_to_viewers("attaching...")
playsound(thing, 'sound/items/zip/zip.ogg', vol = 50, vary = TRUE)
if(isliving(thing))
@@ -95,7 +94,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
to_chat(thing, span_userdanger("You are being extracted! Stand still to proceed."))
if(!do_after(user, 5 SECONDS, target = thing))
- return .
+ return ITEM_INTERACT_BLOCKING
balloon_alert_to_viewers("extracting!")
if(loc == user && ishuman(user))
diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm
index c6b9d1a0484..1c0c7315150 100644
--- a/code/modules/mining/machine_redemption.dm
+++ b/code/modules/mining/machine_redemption.dm
@@ -170,13 +170,13 @@
//smelting the ore
for(var/obj/item/stack/ore/gathered_ore as anything in ore_list)
- if(isnull(gathered_ore.refined_type))
+ var/obj/item/smelted_ore = gathered_ore.on_orm_collection(src)
+ if(isnull(smelted_ore))
continue
- if(materials.insert_item(gathered_ore, ore_multiplier) <= 0)
- unload_mineral(gathered_ore) //if rejected unload
+ if(materials.insert_item(smelted_ore, ore_multiplier) <= 0)
+ unload_mineral(smelted_ore) //if rejected unload
- SEND_SIGNAL(src, COMSIG_ORM_COLLECTED_ORE)
if(!console_notify_timer)
// gives 5 seconds for a load of ores to be sucked up by the ORM before it sends out request console notifications. This should be enough time for most deposits that people make
diff --git a/code/modules/mining/machine_silo.dm b/code/modules/mining/machine_silo.dm
index 743f3eec6f7..82b87421d29 100644
--- a/code/modules/mining/machine_silo.dm
+++ b/code/modules/mining/machine_silo.dm
@@ -33,8 +33,8 @@
interaction_flags_machine = INTERACT_MACHINE_WIRES_IF_OPEN|INTERACT_MACHINE_ALLOW_SILICON|INTERACT_MACHINE_OPEN_SILICON
processing_flags = NONE
- /// By default, an ore silo requires you to be wearing an ID to pull materials from it.
- var/ID_required = TRUE
+ /// Only the station loaded ore silo starts out with ID restrictions, else its optional
+ var/ID_required = FALSE
/// List of all connected components that are on hold from accessing materials.
var/list/holds = list()
/// List of all components that are sharing ores with this silo.
@@ -52,6 +52,7 @@
RADIO_CHANNEL_SUPPLY = NONE,
RADIO_CHANNEL_SECURITY = NONE,
)
+ ///List of announcement messages for silo restrictions
var/static/alist/announcement_messages = alist(
BAN_ATTEMPT_FAILURE_NO_ACCESS = "ACCESS ENFORCEMENT FAILURE: $SILO_USER_NAME lacks supply command authority.",
BAN_ATTEMPT_FAILURE_CHALLENGING_DA_CHIEF = "ACCESS ENFORCEMENT FAILURE: $SILO_USER_NAME attempting subversion of supply command authority.",
@@ -69,6 +70,7 @@
/obj/machinery/ore_silo/Initialize(mapload)
. = ..()
+
materials = AddComponent( \
/datum/component/material_container, \
SSmaterials.materials_by_category[MAT_CATEGORY_SILO], \
@@ -80,12 +82,28 @@
), \
allowed_items = /obj/item/stack \
)
+
if (!GLOB.ore_silo_default && mapload && is_station_level(z))
GLOB.ore_silo_default = src
+ ID_required = TRUE
+
register_context()
setup_radio()
configure_default_announcements_policy()
+/obj/machinery/ore_silo/Destroy()
+ if (GLOB.ore_silo_default == src)
+ GLOB.ore_silo_default = null
+
+ for(var/datum/component/remote_materials/mats as anything in ore_connected_machines)
+ mats.disconnect()
+
+ ore_connected_machines = null
+ materials = null
+ QDEL_NULL(radio)
+
+ return ..()
+
/obj/machinery/ore_silo/emag_act(mob/living/user)
if(obj_flags & EMAGGED)
return FALSE
@@ -104,19 +122,6 @@
radio.keyslot.channels[RADIO_CHANNEL_SECURITY] = TRUE
radio.recalculateChannels()
-/obj/machinery/ore_silo/Destroy()
- if (GLOB.ore_silo_default == src)
- GLOB.ore_silo_default = null
-
- for(var/datum/component/remote_materials/mats as anything in ore_connected_machines)
- mats.disconnect()
-
- ore_connected_machines = null
- materials = null
- QDEL_NULL(radio)
-
- return ..()
-
/obj/machinery/ore_silo/examine(mob/user)
. = ..()
. += span_notice("It can be linked to techfabs, circuit printers and protolathes with a multitool.")
@@ -330,11 +335,12 @@
if("toggle_ban")
var/list/banned_user_data = params["user_data"]
- attempt_ban_toggle(usr, banned_user_data)
+ attempt_ban_toggle(ui.user, banned_user_data)
return TRUE
if("toggle_restrict")
- attempt_toggle_restrict(usr)
+ attempt_toggle_restrict(ui.user)
+ return TRUE
/**
* Called from the ore silo's UI, when someone attempts to (un)ban a user from using the ore silo.
* The person doing the banning should have at least QM access. Unless this is emagged. Not modifiable by silicons unless emagged.
@@ -558,6 +564,7 @@
var/amount
///List of individual materials used in the action
var/list/materials
+ ///User data of the player doing material operations
var/alist/user_data
/datum/ore_silo_log/New(obj/machinery/M, _action, _amount, _noun, list/mats=list(), alist/user_data)
diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm
index 599f446017d..0e852e6e374 100644
--- a/code/modules/mining/ores_coins.dm
+++ b/code/modules/mining/ores_coins.dm
@@ -43,6 +43,16 @@
if(stack_overlays)
. += stack_overlays
+/**
+ * Called when the ore is collected by an ore redemption machine. returns the ore itself.
+ * Normally, ores without a refined type aren't collected by the orm.
+ * It can also be overriden for more specific behavior (for example, sand is smelted into glass beforehand because of different mats).
+ */
+/obj/item/stack/ore/proc/on_orm_collection()
+ if(isnull(refined_type))
+ return null
+ return src
+
/obj/item/stack/ore/welder_act(mob/living/user, obj/item/I)
..()
if(!refined_type)
@@ -98,7 +108,7 @@
icon_state = "glass"
singular_name = "sand pile"
points = 1
- mats_per_unit = list(/datum/material/glass=SHEET_MATERIAL_AMOUNT)
+ mats_per_unit = list(/datum/material/sand = SHEET_MATERIAL_AMOUNT)
refined_type = /obj/item/stack/sheet/glass
w_class = WEIGHT_CLASS_TINY
mine_experience = 0 //its sand
@@ -114,6 +124,11 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
. = ..()
AddComponent(/datum/component/storm_hating)
+/obj/item/stack/ore/glass/on_orm_collection() //we need to smelt the glass beforehand because the silo and orm don't accept sand mats
+ var/obj/item/stack/sheet/glass = new refined_type(drop_location(), amount)
+ qdel(src)
+ return glass
+
/obj/item/stack/ore/glass/get_main_recipes()
. = ..()
. += GLOB.sand_recipes
@@ -138,6 +153,9 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
return FALSE
+/obj/item/stack/ore/glass/thirty
+ amount = 30
+
/obj/item/stack/ore/glass/basalt
name = "volcanic ash"
icon_state = "volcanic_sand"
diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm
index 97f59437f8f..94dfa1ce0eb 100644
--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -295,10 +295,7 @@
location = turf
break
- I.forceMove(location)
- I.layer = initial(I.layer)
- SET_PLANE_EXPLICIT(I, initial(I.plane), location)
- I.dropped(src)
+ transferItemToLoc(I, location, force = TRUE, silent = TRUE, animated = !ignore_animation)
return FALSE
/// Returns true if a mob is holding something
@@ -424,13 +421,10 @@
if(!item_dropping)
return FALSE
- if(client)
- client.screen -= item_dropping
+ client?.screen -= item_dropping
- if(observers?.len)
- for(var/mob/dead/observe as anything in observers)
- if(observe.client)
- observe.client.screen -= item_dropping
+ for(var/mob/dead/observe as anything in observers)
+ observe.client?.screen -= item_dropping
item_dropping.layer = initial(item_dropping.layer)
SET_PLANE_EXPLICIT(item_dropping, initial(item_dropping.plane), newloc)
@@ -441,7 +435,7 @@
else
item_dropping.forceMove(newloc)
- item_dropping.dropped(src, silent)
+ has_unequipped(item_dropping, silent)
SEND_SIGNAL(item_dropping, COMSIG_ITEM_POST_UNEQUIP, force, newloc, no_move, invdrop, silent)
SEND_SIGNAL(src, COMSIG_MOB_UNEQUIPPED_ITEM, item_dropping, force, newloc, no_move, invdrop, silent)
return TRUE
@@ -521,8 +515,15 @@
/// This proc is called after an item has been successfully handled and equipped to a slot.
/mob/proc/has_equipped(obj/item/item, slot, initial = FALSE)
+ SHOULD_CALL_PARENT(TRUE)
return item.on_equipped(src, slot, initial)
+/// This proc is called after an item has been removed from a mob but before it has been officially deslotted.
+/mob/proc/has_unequipped(obj/item/item, silent = FALSE)
+ SHOULD_CALL_PARENT(TRUE)
+ item.dropped(src, silent)
+ return TRUE
+
/**
* Equip an item to the slot or delete
*
diff --git a/code/modules/mob/living/basic/cytology/vatbeast.dm b/code/modules/mob/living/basic/cytology/vatbeast.dm
index 0075061cda1..d9d1c364802 100644
--- a/code/modules/mob/living/basic/cytology/vatbeast.dm
+++ b/code/modules/mob/living/basic/cytology/vatbeast.dm
@@ -15,6 +15,7 @@
damage_coeff = list(BRUTE = 0.7, BURN = 0.7, TOX = 1, STAMINA = 1, OXY = 1)
melee_damage_lower = 25
melee_damage_upper = 25
+ melee_attack_cooldown = CLICK_CD_MELEE
obj_damage = 40
unsuitable_atmos_damage = 0
attack_sound = 'sound/items/weapons/punch3.ogg'
diff --git a/code/modules/mob/living/basic/drone/visuals_icons.dm b/code/modules/mob/living/basic/drone/visuals_icons.dm
index fb89e82c8a1..59952d8d249 100644
--- a/code/modules/mob/living/basic/drone/visuals_icons.dm
+++ b/code/modules/mob/living/basic/drone/visuals_icons.dm
@@ -27,7 +27,7 @@
client.screen += internal_storage
-/mob/living/basic/drone/update_worn_head(update_obscured = TRUE)
+/mob/living/basic/drone/update_worn_head()
remove_overlay(DRONE_HEAD_LAYER)
if(head)
@@ -44,7 +44,7 @@
apply_overlay(DRONE_HEAD_LAYER)
-/mob/living/basic/drone/update_worn_mask(update_obscured = TRUE)
+/mob/living/basic/drone/update_worn_mask()
update_worn_head()
/mob/living/basic/drone/regenerate_icons()
diff --git a/code/modules/mob/living/basic/jungle/mega_arachnid/mega_arachnid.dm b/code/modules/mob/living/basic/jungle/mega_arachnid/mega_arachnid.dm
index bfbd222f89c..72c55a8eca3 100644
--- a/code/modules/mob/living/basic/jungle/mega_arachnid/mega_arachnid.dm
+++ b/code/modules/mob/living/basic/jungle/mega_arachnid/mega_arachnid.dm
@@ -10,6 +10,7 @@
mob_biotypes = MOB_ORGANIC|MOB_BUG
melee_damage_lower = 30
melee_damage_upper = 30
+ melee_attack_cooldown = CLICK_CD_MELEE
maxHealth = 300
health = 300
diff --git a/code/modules/mob/living/basic/space_fauna/bear/_bear.dm b/code/modules/mob/living/basic/space_fauna/bear/_bear.dm
index a85f4cab814..32738c05434 100644
--- a/code/modules/mob/living/basic/space_fauna/bear/_bear.dm
+++ b/code/modules/mob/living/basic/space_fauna/bear/_bear.dm
@@ -127,6 +127,7 @@
obj_damage = 11
melee_damage_lower = 0
melee_damage_upper = 0
+ melee_attack_cooldown = CLICK_CD_MELEE
sharpness = NONE //it's made of butter
armour_penetration = 0
response_harm_continuous = "takes a bite out of"
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 7506a552aed..7786c20e67c 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -220,32 +220,10 @@
/mob/living/carbon/proc/uncuff()
if (handcuffed)
- var/obj/item/W = handcuffed
- set_handcuffed(null)
- if (buckled?.buckle_requires_restraints)
- buckled.unbuckle_mob(src)
- update_handcuffed()
- if (client)
- client.screen -= W
- if (W)
- W.forceMove(drop_location())
- W.dropped(src)
- if (W)
- W.layer = initial(W.layer)
- SET_PLANE_EXPLICIT(W, initial(W.plane), src)
+ dropItemToGround(handcuffed, TRUE)
changeNext_move(0)
if (legcuffed)
- var/obj/item/W = legcuffed
- legcuffed = null
- update_worn_legcuffs()
- if (client)
- client.screen -= W
- if (W)
- W.forceMove(drop_location())
- W.dropped(src)
- if (W)
- W.layer = initial(W.layer)
- SET_PLANE_EXPLICIT(W, initial(W.plane), src)
+ dropItemToGround(legcuffed, TRUE)
changeNext_move(0)
/mob/living/carbon/proc/clear_cuffs(obj/item/I, cuff_break)
@@ -263,18 +241,10 @@
else
if(I == handcuffed)
- handcuffed.forceMove(drop_location())
- set_handcuffed(null)
- I.dropped(src)
- if(buckled?.buckle_requires_restraints)
- buckled.unbuckle_mob(src)
- update_handcuffed()
+ dropItemToGround(I, TRUE)
return TRUE
if(I == legcuffed)
- legcuffed.forceMove(drop_location())
- legcuffed = null
- I.dropped(src)
- update_worn_legcuffs()
+ dropItemToGround(I, TRUE)
return TRUE
/mob/living/carbon/proc/accident(obj/item/I)
@@ -841,8 +811,6 @@
if(heal_flags & HEAL_RESTRAINTS)
QDEL_NULL(handcuffed)
QDEL_NULL(legcuffed)
- set_handcuffed(null)
- update_handcuffed()
return ..()
@@ -1141,7 +1109,7 @@
. |= held_thing.wash(clean_types)
// Check and wash stuff that isn't covered
- var/covered = check_covered_slots()
+ var/covered = hidden_slots_to_inventory_slots(covered_slots)
for(var/obj/item/worn as anything in get_equipped_items())
var/slot = get_slot_by_item(worn)
// Don't wash glasses if something other than them is covering our eyes
@@ -1203,9 +1171,6 @@
scaries.fake = TRUE
QDEL_NULL(phantom_wound)
-/mob/living/carbon/is_face_visible()
- return !(wear_mask?.flags_inv & HIDEFACE) && !(head?.flags_inv & HIDEFACE)
-
/// Returns whether or not the carbon should be able to be shocked
/mob/living/carbon/proc/should_electrocute(power_source)
if (ismecha(loc))
@@ -1249,7 +1214,7 @@
REMOVE_TRAIT(src, TRAIT_RESTRAINED, HANDCUFFED_TRAIT)
else if(handcuffed)
ADD_TRAIT(src, TRAIT_RESTRAINED, HANDCUFFED_TRAIT)
-
+ update_handcuffed()
/mob/living/carbon/on_lying_down(new_lying_angle)
. = ..()
diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm
index 0349f56db5f..a461273d345 100644
--- a/code/modules/mob/living/carbon/carbon_defines.dm
+++ b/code/modules/mob/living/carbon/carbon_defines.dm
@@ -126,4 +126,9 @@
COOLDOWN_DECLARE(bleeding_message_cd)
+ /// Obscured hide flags (hideflags that can't be seen AND can't be interacted with)
+ var/obscured_slots = NONE
+ /// Covered hide flags (hideflags that can be seen, BUT can't be interacted with)
+ var/covered_slots = NONE
+
var/next_smell = 0 //SKYRAT EDIT ADDITION /// Cooldown for the next smell
diff --git a/code/modules/mob/living/carbon/carbon_update_icons.dm b/code/modules/mob/living/carbon/carbon_update_icons.dm
index 3debfe68299..f2258a18e31 100644
--- a/code/modules/mob/living/carbon/carbon_update_icons.dm
+++ b/code/modules/mob/living/carbon/carbon_update_icons.dm
@@ -1,7 +1,3 @@
-/mob/living/carbon/update_obscured_slots(obscured_flags)
- ..()
- update_body()
-
/// Updates features and clothing attached to a specific limb with limb-specific offsets
/mob/living/carbon/proc/update_features(feature_key)
switch(feature_key)
@@ -340,7 +336,7 @@
//SKYRAT EDIT REMOVAL BEGIN - CUSTOMIZATION (moved to modular)
/*
-/mob/living/carbon/update_worn_mask(update_obscured = TRUE)
+/mob/living/carbon/update_worn_mask()
remove_overlay(FACEMASK_LAYER)
if(!get_bodypart(BODY_ZONE_HEAD)) //Decapitated
@@ -351,15 +347,13 @@
inv.update_appearance()
if(wear_mask)
- if(update_obscured)
- update_obscured_slots(wear_mask.flags_inv)
- if(!(check_obscured_slots() & ITEM_SLOT_MASK))
+ if(!(obscured_slots & HIDEMASK))
overlays_standing[FACEMASK_LAYER] = wear_mask.build_worn_icon(default_layer = FACEMASK_LAYER, default_icon_file = 'icons/mob/clothing/mask.dmi')
update_hud_wear_mask(wear_mask)
apply_overlay(FACEMASK_LAYER)
-/mob/living/carbon/update_worn_neck(update_obscured = TRUE)
+/mob/living/carbon/update_worn_neck()
remove_overlay(NECK_LAYER)
if(client && hud_used?.inv_slots[TOBITSHIFT(ITEM_SLOT_NECK) + 1])
@@ -367,9 +361,7 @@
inv.update_appearance()
if(wear_neck)
- if(update_obscured)
- update_obscured_slots(wear_neck.flags_inv)
- if(!(check_obscured_slots() & ITEM_SLOT_NECK))
+ if(!(obscured_slots & HIDENECK))
overlays_standing[NECK_LAYER] = wear_neck.build_worn_icon(default_layer = NECK_LAYER, default_icon_file = 'icons/mob/clothing/neck.dmi')
update_hud_neck(wear_neck)
@@ -379,7 +371,7 @@
//SKYRAT EDIT REMOVAL BEGIN - TESHARI CLOTHES (moved to modular)
/*
-/mob/living/carbon/update_worn_back(update_obscured = TRUE)
+/mob/living/carbon/update_worn_back()
remove_overlay(BACK_LAYER)
if(client && hud_used?.inv_slots[TOBITSHIFT(ITEM_SLOT_BACK) + 1])
@@ -387,8 +379,6 @@
inv.update_appearance()
if(back)
- if(update_obscured)
- update_obscured_slots(back.flags_inv)
overlays_standing[BACK_LAYER] = back.build_worn_icon(default_layer = BACK_LAYER, default_icon_file = 'icons/mob/clothing/back.dmi')
update_hud_back(back)
@@ -396,12 +386,10 @@
*/
//SKYRAT EDIT REMOVAL END
-/mob/living/carbon/update_worn_legcuffs(update_obscured = TRUE)
+/mob/living/carbon/update_worn_legcuffs()
remove_overlay(LEGCUFF_LAYER)
clear_alert("legcuffed")
if(legcuffed)
- if(update_obscured)
- update_obscured_slots(legcuffed.flags_inv)
overlays_standing[LEGCUFF_LAYER] = mutable_appearance('icons/mob/simple/mob.dmi', "legcuff1", -LEGCUFF_LAYER)
apply_overlay(LEGCUFF_LAYER)
throw_alert("legcuffed", /atom/movable/screen/alert/restrained/legcuffed, new_master = src.legcuffed)
@@ -409,7 +397,7 @@
//SKYRAT EDIT REMOVAL BEGIN - CUSTOMIZATION (moved to modular)
/*
-/mob/living/carbon/update_worn_head(update_obscured = TRUE)
+/mob/living/carbon/update_worn_head()
remove_overlay(HEAD_LAYER)
if(!get_bodypart(BODY_ZONE_HEAD)) //Decapitated
@@ -420,9 +408,7 @@
inv.update_appearance()
if(head)
- if(update_obscured)
- update_obscured_slots(head.flags_inv)
- if(!(check_obscured_slots() & ITEM_SLOT_HEAD))
+ if(!(obscured_slots & HIDEHEADGEAR))
overlays_standing[HEAD_LAYER] = head.build_worn_icon(default_layer = HEAD_LAYER, default_icon_file = 'icons/mob/clothing/head/default.dmi')
update_hud_head(head)
@@ -431,11 +417,9 @@
//SKYRAT EDIT REMOVAL END
-/mob/living/carbon/update_worn_handcuffs(update_obscured = TRUE)
+/mob/living/carbon/update_worn_handcuffs()
remove_overlay(HANDCUFF_LAYER)
if(handcuffed && !(handcuffed.item_flags & ABSTRACT)) //SKYRAT EDIT - ADDED !(handcuffed.item_flags & ABSTRACT)
- if(update_obscured)
- update_obscured_slots(handcuffed.flags_inv)
var/mutable_appearance/handcuff_overlay = mutable_appearance('icons/mob/simple/mob.dmi', "handcuff1", -HANDCUFF_LAYER)
if(handcuffed.blocks_emissive != EMISSIVE_BLOCK_NONE)
handcuff_overlay.overlays += emissive_blocker(handcuff_overlay.icon, handcuff_overlay.icon_state, src, alpha = handcuff_overlay.alpha)
diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm
index 85ce343f3d3..376ab2f354e 100644
--- a/code/modules/mob/living/carbon/examine.dm
+++ b/code/modules/mob/living/carbon/examine.dm
@@ -419,15 +419,14 @@
/// Coolects examine information about the mob's clothing and equipment
/mob/living/carbon/proc/get_clothing_examine_info(mob/living/user)
. = list()
- var/obscured = check_obscured_slots()
var/t_He = p_They()
var/t_His = p_Their()
var/t_his = p_their()
var/t_has = p_have()
var/t_is = p_are()
//head
- if(head && !(obscured & ITEM_SLOT_HEAD) && !HAS_TRAIT(head, TRAIT_EXAMINE_SKIP))
- . += "[t_He] [t_is] wearing [head.examine_title_worn(user)] on [t_his] head."
+ if(head && !(obscured_slots & HIDEHEADGEAR) && !HAS_TRAIT(head, TRAIT_EXAMINE_SKIP))
+ . += "[t_He] [t_is] wearing [head.examine_title(user)] on [t_his] head."
//back
if(back && !HAS_TRAIT(back, TRAIT_EXAMINE_SKIP))
. += "[t_He] [t_has] [back.examine_title_worn(user)] on [t_his] back."
@@ -442,7 +441,7 @@
var/obj/item/corresponding_item = get_item_for_held_index(part.held_index) || part
. += "[t_He] [t_has] a [corresponding_item.examine_title_worn(user)] in place of [t_his] [initial(part.plaintext_zone)]." // BUBBER EDIT CHANGE - ORIGINAL: . += "[t_He] [t_has] a [corresponding_item.examine_title(user)] in place of [t_his] [initial(part.plaintext_zone)]."
//gloves
- if(gloves && !(obscured & ITEM_SLOT_GLOVES) && !HAS_TRAIT(gloves, TRAIT_EXAMINE_SKIP))
+ if(gloves && !(obscured_slots & HIDEGLOVES) && !HAS_TRAIT(gloves, TRAIT_EXAMINE_SKIP))
. += "[t_He] [t_has] [gloves.examine_title(user)] on [t_his] hands."
else if(GET_ATOM_BLOOD_DECAL_LENGTH(src) && num_hands)
var/list/blood_stains = GET_ATOM_BLOOD_DECALS(src)
@@ -456,15 +455,15 @@
var/cables_or_cuffs = istype(handcuffed, /obj/item/restraints/handcuffs/cable) ? "restrained with cable" : "handcuffed"
. += span_warning("[t_He] [t_is] [icon2html(handcuffed, user)] [cables_or_cuffs]!")
//shoes
- if(shoes && !(obscured & ITEM_SLOT_FEET) && !HAS_TRAIT(shoes, TRAIT_EXAMINE_SKIP))
- . += "[t_He] [t_is] wearing [shoes.examine_title_worn(user)] on [t_his] feet."
+ if(shoes && !(obscured_slots & HIDESHOES) && !HAS_TRAIT(shoes, TRAIT_EXAMINE_SKIP))
+ . += "[t_He] [t_is] wearing [shoes.examine_title(user)] on [t_his] feet."
//mask
- if(wear_mask && !(obscured & ITEM_SLOT_MASK) && !HAS_TRAIT(wear_mask, TRAIT_EXAMINE_SKIP))
- . += "[t_He] [t_has] [wear_mask.examine_title_worn(user)] on [t_his] face."
- if(wear_neck && !(obscured & ITEM_SLOT_NECK) && !HAS_TRAIT(wear_neck, TRAIT_EXAMINE_SKIP))
- . += "[t_He] [t_is] wearing [wear_neck.examine_title_worn(user)] around [t_his] neck."
+ if(wear_mask && !(obscured_slots & HIDEMASK) && !HAS_TRAIT(wear_mask, TRAIT_EXAMINE_SKIP))
+ . += "[t_He] [t_has] [wear_mask.examine_title(user)] on [t_his] face."
+ if(wear_neck && !(obscured_slots & HIDENECK) && !HAS_TRAIT(wear_neck, TRAIT_EXAMINE_SKIP))
+ . += "[t_He] [t_is] wearing [wear_neck.examine_title(user)] around [t_his] neck."
//eyes
- if(!(obscured & ITEM_SLOT_EYES) )
+ if(!(obscured_slots & HIDEEYES))
if(glasses && !HAS_TRAIT(glasses, TRAIT_EXAMINE_SKIP))
. += "[t_He] [t_has] [glasses.examine_title_worn(user)] covering [t_his] eyes."
else if(HAS_TRAIT(src, TRAIT_UNNATURAL_RED_GLOWY_EYES))
@@ -472,15 +471,13 @@
else if(HAS_TRAIT(src, TRAIT_BLOODSHOT_EYES))
. += span_warning("[t_His] eyes are bloodshot!")
//ears
- if(ears && !(obscured & ITEM_SLOT_EARS) && !HAS_TRAIT(ears, TRAIT_EXAMINE_SKIP))
- . += "[t_He] [t_has] [ears.examine_title_worn(user)] on [t_his] ears."
-// BUBBER EDIT END
+ if(ears && !(obscured_slots & HIDEEARS) && !HAS_TRAIT(ears, TRAIT_EXAMINE_SKIP))
+ . += "[t_He] [t_has] [ears.examine_title(user)] on [t_his] ears."
// Yes there's a lot of copypasta here, we can improve this later when carbons are less dumb in general
// BUBBER EDIT BEGIN - replaced examine_title with examine_title_worn across whole proc
/mob/living/carbon/human/get_clothing_examine_info(mob/living/user)
. = list()
- var/obscured = check_obscured_slots()
var/t_He = p_They()
var/t_His = p_Their()
var/t_his = p_their()
@@ -488,7 +485,7 @@
var/t_is = p_are()
//uniform
- if(w_uniform && !(obscured & ITEM_SLOT_ICLOTHING) && !HAS_TRAIT(w_uniform, TRAIT_EXAMINE_SKIP))
+ if(w_uniform && !(obscured_slots & HIDEJUMPSUIT) && !HAS_TRAIT(w_uniform, TRAIT_EXAMINE_SKIP))
//accessory
var/accessory_message = ""
if(istype(w_uniform, /obj/item/clothing/under))
@@ -499,16 +496,16 @@
. += "[t_He] [t_is] wearing [w_uniform.examine_title_worn(user)][accessory_message]."
//head
- if(head && !(obscured & ITEM_SLOT_HEAD) && !HAS_TRAIT(head, TRAIT_EXAMINE_SKIP))
- . += "[t_He] [t_is] wearing [head.examine_title_worn(user)] on [t_his] head."
+ if(head && !(obscured_slots & HIDEHEADGEAR) && !HAS_TRAIT(head, TRAIT_EXAMINE_SKIP))
+ . += "[t_He] [t_is] wearing [head.examine_title(user)] on [t_his] head."
//mask
- if(wear_mask && !(obscured & ITEM_SLOT_MASK) && !HAS_TRAIT(wear_mask, TRAIT_EXAMINE_SKIP))
- . += "[t_He] [t_has] [wear_mask.examine_title_worn(user)] on [t_his] face."
+ if(wear_mask && !(obscured_slots & HIDEMASK) && !HAS_TRAIT(wear_mask, TRAIT_EXAMINE_SKIP))
+ . += "[t_He] [t_has] [wear_mask.examine_title(user)] on [t_his] face."
//neck
- if(wear_neck && !(obscured & ITEM_SLOT_NECK) && !HAS_TRAIT(wear_neck, TRAIT_EXAMINE_SKIP))
- . += "[t_He] [t_is] wearing [wear_neck.examine_title_worn(user)] around [t_his] neck."
+ if(wear_neck && !(obscured_slots & HIDENECK) && !HAS_TRAIT(wear_neck, TRAIT_EXAMINE_SKIP))
+ . += "[t_He] [t_is] wearing [wear_neck.examine_title(user)] around [t_his] neck."
//eyes
- if(!(obscured & ITEM_SLOT_EYES) )
+ if(!(obscured_slots & HIDEEYES))
if(glasses && !HAS_TRAIT(glasses, TRAIT_EXAMINE_SKIP))
. += "[t_He] [t_has] [glasses.examine_title_worn(user)] covering [t_his] eyes."
else if(HAS_TRAIT(src, TRAIT_UNNATURAL_RED_GLOWY_EYES))
@@ -516,14 +513,14 @@
else if(HAS_TRAIT(src, TRAIT_BLOODSHOT_EYES))
. += span_warning("[t_His] eyes are bloodshot!")
//ears
- if(ears && !(obscured & ITEM_SLOT_EARS) && !HAS_TRAIT(ears, TRAIT_EXAMINE_SKIP))
- . += "[t_He] [t_has] [ears.examine_title_worn(user)] on [t_his] ears."
+ if(ears && !(obscured_slots & HIDEEARS) && !HAS_TRAIT(ears, TRAIT_EXAMINE_SKIP))
+ . += "[t_He] [t_has] [ears.examine_title(user)] on [t_his] ears."
//suit/armor
if(wear_suit && !HAS_TRAIT(wear_suit, TRAIT_EXAMINE_SKIP))
. += "[t_He] [t_is] wearing [wear_suit.examine_title_worn(user)]."
//suit/armor storage
- if(s_store && !(obscured & ITEM_SLOT_SUITSTORE) && !HAS_TRAIT(s_store, TRAIT_EXAMINE_SKIP))
- . += "[t_He] [t_is] carrying [s_store.examine_title_worn(user)] on [t_his] [wear_suit.name]."
+ if(s_store && !(obscured_slots & HIDESUITSTORAGE) && !HAS_TRAIT(s_store, TRAIT_EXAMINE_SKIP))
+ . += "[t_He] [t_is] carrying [s_store.examine_title(user)] on [t_his] [wear_suit.name]."
//back
if(back && !HAS_TRAIT(back, TRAIT_EXAMINE_SKIP))
. += "[t_He] [t_has] [back.examine_title_worn(user)] on [t_his] back."
@@ -547,7 +544,7 @@
var/obj/item/corresponding_item = get_item_for_held_index(part.held_index) || part
. += "[t_He] [t_has] [corresponding_item.examine_title_worn(user)] in place of [t_his] [initial(part.plaintext_zone)]." // BUBBER EDIT CHANGE - ORIGINAL: . += "[t_He] [t_has] [corresponding_item.examine_title(user)] in place of [t_his] [initial(part.plaintext_zone)]."
//gloves
- if(gloves && !(obscured & ITEM_SLOT_GLOVES) && !HAS_TRAIT(gloves, TRAIT_EXAMINE_SKIP))
+ if(gloves && !(obscured_slots & HIDEGLOVES) && !HAS_TRAIT(gloves, TRAIT_EXAMINE_SKIP))
. += "[t_He] [t_has] [gloves.examine_title(user)] on [t_his] hands."
else if(GET_ATOM_BLOOD_DECAL_LENGTH(src) || blood_in_hands)
if(num_hands)
@@ -557,11 +554,11 @@
var/cables_or_cuffs = istype(handcuffed, /obj/item/restraints/handcuffs/cable) ? "restrained with cable" : "handcuffed"
. += span_warning("[t_He] [t_is] [icon2html(handcuffed, user)] [cables_or_cuffs]!")
//belt
- if(belt && !(obscured & ITEM_SLOT_BELT) && !HAS_TRAIT(belt, TRAIT_EXAMINE_SKIP))
- . += "[t_He] [t_has] [belt.examine_title_worn(user)] about [t_his] waist."
+ if(belt && !(obscured_slots & HIDEBELT) && !HAS_TRAIT(belt, TRAIT_EXAMINE_SKIP))
+ . += "[t_He] [t_has] [belt.examine_title(user)] about [t_his] waist."
//shoes
- if(shoes && !(obscured & ITEM_SLOT_FEET) && !HAS_TRAIT(shoes, TRAIT_EXAMINE_SKIP))
- . += "[t_He] [t_is] wearing [shoes.examine_title_worn(user)] on [t_his] feet."
+ if(shoes && !(obscured_slots & HIDESHOES) && !HAS_TRAIT(shoes, TRAIT_EXAMINE_SKIP))
+ . += "[t_He] [t_is] wearing [shoes.examine_title(user)] on [t_his] feet."
// BUBBER EDIT END
/// Collects info displayed about any HUDs the user has when examining src
@@ -641,7 +638,7 @@
/mob/living/carbon/human/examine_more(mob/user)
. = ..()
- if(istype(w_uniform, /obj/item/clothing/under) && !(check_obscured_slots() & ITEM_SLOT_ICLOTHING) && !HAS_TRAIT(w_uniform, TRAIT_EXAMINE_SKIP))
+ if(istype(w_uniform, /obj/item/clothing/under) && !(obscured_slots & HIDEJUMPSUIT) && !HAS_TRAIT(w_uniform, TRAIT_EXAMINE_SKIP))
var/obj/item/clothing/under/undershirt = w_uniform
if(undershirt.has_sensor == BROKEN_SENSORS)
. += list(span_notice("\The [undershirt]'s medical sensors are sparking."))
@@ -679,7 +676,7 @@
/// Reports how old the mob appears to be
/mob/living/carbon/human/proc/get_age_text()
- if((wear_mask?.flags_inv & HIDEFACE) || (head?.flags_inv & HIDEFACE))
+ if(obscured_slots & HIDEFACE)
return
var/age_text
diff --git a/code/modules/mob/living/carbon/human/dummy.dm b/code/modules/mob/living/carbon/human/dummy.dm
index e36094e3f68..2623385d21c 100644
--- a/code/modules/mob/living/carbon/human/dummy.dm
+++ b/code/modules/mob/living/carbon/human/dummy.dm
@@ -72,8 +72,13 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)
qdel(delete)
/mob/living/carbon/human/dummy/has_equipped(obj/item/item, slot, initial = FALSE)
+ SHOULD_CALL_PARENT(FALSE) // assuming direct control
item.item_flags |= IN_INVENTORY
- return item.visual_equipped(src, slot, initial)
+ if(!item.visual_equipped(src, slot, initial))
+ return FALSE
+
+ add_item_coverage(item)
+ return TRUE
/mob/living/carbon/human/dummy/proc/wipe_state()
delete_equipment()
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index eb16f3f863e..0b50ffa52c9 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -637,7 +637,7 @@
* Returns false if we couldn't wash our hands due to them being obscured, otherwise true
*/
/mob/living/carbon/human/proc/wash_hands(clean_types)
- if(check_covered_slots() & ITEM_SLOT_GLOVES)
+ if(covered_slots & HIDEGLOVES)
return FALSE
if(gloves)
@@ -660,7 +660,7 @@
if(glasses && !is_eyes_covered(ITEM_SLOT_MASK|ITEM_SLOT_HEAD) && glasses.wash(clean_types))
. = TRUE
- if(wear_mask && !(check_covered_slots() & ITEM_SLOT_MASK) && wear_mask.wash(clean_types))
+ if(wear_mask && !(covered_slots & HIDEMASK) && wear_mask.wash(clean_types))
. = TRUE
/**
@@ -672,7 +672,7 @@
. |= COMPONENT_CLEANED
// Wash hands if exposed
- if(!gloves && (clean_types & CLEAN_TYPE_BLOOD) && blood_in_hands > 0 && !(check_covered_slots() & ITEM_SLOT_GLOVES))
+ if(!gloves && (clean_types & CLEAN_TYPE_BLOOD) && blood_in_hands > 0 && !(covered_slots & HIDEGLOVES))
blood_in_hands = 0
update_worn_gloves()
. |= COMPONENT_CLEANED
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 3b469cf4ab3..1774312ed4d 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -397,7 +397,7 @@
if (!(flags & SHOCK_NO_HUMAN_ANIM))
electrocution_animation(4 SECONDS)
-/mob/living/carbon/human/acid_act(acidpwr, acid_volume, bodyzone_hit) //todo: update this to utilize check_obscured_slots() //and make sure it's check_obscured_slots(TRUE) to stop aciding through visors etc
+/mob/living/carbon/human/acid_act(acidpwr, acid_volume, bodyzone_hit) //todo: update this to utilize obscured_slots //and make sure it's check_obscured_slots(TRUE) to stop aciding through visors etc
var/list/damaged = list()
var/list/inventory_items_to_kill = list()
var/acidity = acidpwr * min(acid_volume*0.005, 0.1)
@@ -682,29 +682,28 @@
/mob/living/carbon/human/proc/burn_clothing(seconds_per_tick, stacks)
var/list/burning_items = list()
- var/covered = check_covered_slots()
//HEAD//
- if(glasses && !(covered & ITEM_SLOT_EYES))
+ if(glasses && !(covered_slots & HIDEEYES))
burning_items += glasses
- if(wear_mask && !(covered & ITEM_SLOT_MASK))
+ if(wear_mask && !(covered_slots & HIDEMASK))
burning_items += wear_mask
- if(wear_neck && !(covered & ITEM_SLOT_NECK))
+ if(wear_neck && !(covered_slots & HIDENECK))
burning_items += wear_neck
- if(ears && !(covered & ITEM_SLOT_EARS))
+ if(ears && !(covered_slots & HIDEEARS))
burning_items += ears
if(head)
burning_items += head
//CHEST//
- if(w_uniform && !(covered & ITEM_SLOT_ICLOTHING))
+ if(w_uniform && !(covered_slots & HIDEJUMPSUIT))
burning_items += w_uniform
if(wear_suit)
burning_items += wear_suit
//ARMS & HANDS//
var/obj/item/clothing/arm_clothes = null
- if(gloves && !(covered & ITEM_SLOT_GLOVES))
+ if(gloves && !(covered_slots & HIDEGLOVES))
arm_clothes = gloves
else if(wear_suit && ((wear_suit.body_parts_covered & HANDS) || (wear_suit.body_parts_covered & ARMS)))
arm_clothes = wear_suit
@@ -715,7 +714,7 @@
//LEGS & FEET//
var/obj/item/clothing/leg_clothes = null
- if(shoes && !(covered & ITEM_SLOT_FEET))
+ if(shoes && !(covered_slots & HIDESHOES))
leg_clothes = shoes
else if(wear_suit && ((wear_suit.body_parts_covered & FEET) || (wear_suit.body_parts_covered & LEGS)))
leg_clothes = wear_suit
diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm
index ba81ce369dd..8be20a72be9 100644
--- a/code/modules/mob/living/carbon/human/human_helpers.dm
+++ b/code/modules/mob/living/carbon/human/human_helpers.dm
@@ -80,9 +80,7 @@
/mob/living/carbon/human/get_face_name(if_no_face = "Unknown")
if(HAS_TRAIT(src, TRAIT_UNKNOWN))
return if_no_face //We're Unknown, no face information for you
- for(var/obj/item/worn_item in get_equipped_items())
- if(!(worn_item.flags_inv & HIDEFACE))
- continue
+ if(obscured_slots & HIDEFACE)
return if_no_face
var/obj/item/bodypart/head = get_bodypart(BODY_ZONE_HEAD)
if(isnull(head) || (HAS_TRAIT(src, TRAIT_DISFIGURED)) || (head.brutestate + head.burnstate) > 2 || !real_name || HAS_TRAIT(src, TRAIT_INVISIBLE_MAN)) //disfigured. use id-name if possible
diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm
index 54bc60c8b98..db29d713a66 100644
--- a/code/modules/mob/living/carbon/human/human_update_icons.dm
+++ b/code/modules/mob/living/carbon/human/human_update_icons.dm
@@ -70,18 +70,10 @@ There are several things that need to be remembered:
//damage overlays
update_damage_overlays()
-/mob/living/carbon/human/update_obscured_slots(obscured_flags)
- ..()
- sec_hud_set_security_status()
- // SKYRAT EDIT ADDITION START - ERP Overlays
- if(obscured_flags & HIDESEXTOY)
- update_inv_lewd()
- // SKYRAT EDIT ADDITION END
-
/* --------------------------------------- */
//vvvvvv UPDATE_INV PROCS vvvvvv
-/mob/living/carbon/human/update_worn_undersuit(update_obscured = TRUE)
+/mob/living/carbon/human/update_worn_undersuit()
remove_overlay(UNIFORM_LAYER)
if(client && hud_used)
@@ -92,10 +84,7 @@ There are several things that need to be remembered:
var/obj/item/clothing/under/uniform = w_uniform
update_hud_uniform(uniform)
- if(update_obscured)
- update_obscured_slots(uniform.flags_inv)
-
- if(HAS_TRAIT(uniform, TRAIT_NO_WORN_ICON) || (check_obscured_slots() & ITEM_SLOT_ICLOTHING))
+ if(HAS_TRAIT(uniform, TRAIT_NO_WORN_ICON) || (obscured_slots & HIDEJUMPSUIT))
return
var/target_overlay = uniform.icon_state
@@ -162,7 +151,7 @@ There are several things that need to be remembered:
apply_overlay(UNIFORM_LAYER)
check_body_shape(BODYSHAPE_DIGITIGRADE, ITEM_SLOT_ICLOTHING)
-/mob/living/carbon/human/update_worn_id(update_obscured = TRUE)
+/mob/living/carbon/human/update_worn_id()
remove_overlay(ID_LAYER)
if(client && hud_used)
@@ -175,9 +164,6 @@ There are several things that need to be remembered:
var/obj/item/worn_item = wear_id
update_hud_id(worn_item)
- if(update_obscured)
- update_obscured_slots(worn_item.flags_inv)
-
if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON))
return
@@ -195,7 +181,7 @@ There are several things that need to be remembered:
apply_overlay(ID_LAYER)
-/mob/living/carbon/human/update_worn_gloves(update_obscured = TRUE)
+/mob/living/carbon/human/update_worn_gloves()
remove_overlay(GLOVES_LAYER)
if(client && hud_used && hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_GLOVES) + 1])
@@ -224,10 +210,7 @@ There are several things that need to be remembered:
var/obj/item/worn_item = gloves
update_hud_gloves(worn_item)
- if(update_obscured)
- update_obscured_slots(worn_item.flags_inv)
-
- if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (check_obscured_slots() & ITEM_SLOT_GLOVES))
+ if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (obscured_slots & HIDEGLOVES))
return
var/icon_file = 'icons/mob/clothing/hands.dmi'
@@ -268,7 +251,7 @@ There are several things that need to be remembered:
overlays_standing[GLOVES_LAYER] = gloves_overlay
apply_overlay(GLOVES_LAYER)
-/mob/living/carbon/human/update_worn_glasses(update_obscured = TRUE)
+/mob/living/carbon/human/update_worn_glasses()
remove_overlay(GLASSES_LAYER)
var/obj/item/bodypart/head/my_head = get_bodypart(BODY_ZONE_HEAD)
@@ -283,10 +266,7 @@ There are several things that need to be remembered:
var/obj/item/worn_item = glasses
update_hud_glasses(worn_item)
- if(update_obscured)
- update_obscured_slots(worn_item.flags_inv)
-
- if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (check_obscured_slots() & ITEM_SLOT_EYES))
+ if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (obscured_slots & HIDEEYES))
return
var/icon_file = 'icons/mob/clothing/eyes.dmi'
@@ -309,7 +289,8 @@ There are several things that need to be remembered:
overlays_standing[GLASSES_LAYER] = glasses_overlay
apply_overlay(GLASSES_LAYER)
-/mob/living/carbon/human/update_worn_ears(update_obscured = TRUE)
+
+/mob/living/carbon/human/update_worn_ears()
remove_overlay(EARS_LAYER)
var/obj/item/bodypart/head/my_head = get_bodypart(BODY_ZONE_HEAD)
@@ -324,10 +305,7 @@ There are several things that need to be remembered:
var/obj/item/worn_item = ears
update_hud_ears(worn_item)
- if(update_obscured)
- update_obscured_slots(worn_item.flags_inv)
-
- if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (check_obscured_slots() & ITEM_SLOT_EARS))
+ if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (obscured_slots & HIDEEARS))
return
var/icon_file = 'icons/mob/clothing/ears.dmi'
@@ -350,7 +328,7 @@ There are several things that need to be remembered:
overlays_standing[EARS_LAYER] = ears_overlay
apply_overlay(EARS_LAYER)
-/mob/living/carbon/human/update_worn_neck(update_obscured = TRUE)
+/mob/living/carbon/human/update_worn_neck()
remove_overlay(NECK_LAYER)
if(client && hud_used && hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_NECK) + 1])
@@ -361,10 +339,7 @@ There are several things that need to be remembered:
var/obj/item/worn_item = wear_neck
update_hud_neck(wear_neck)
- if(update_obscured)
- update_obscured_slots(worn_item.flags_inv)
-
- if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (check_obscured_slots() & ITEM_SLOT_NECK))
+ if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (obscured_slots & HIDENECK))
return
var/icon_file = 'icons/mob/clothing/neck.dmi'
@@ -395,7 +370,7 @@ There are several things that need to be remembered:
apply_overlay(NECK_LAYER)
-/mob/living/carbon/human/update_worn_shoes(update_obscured = TRUE)
+/mob/living/carbon/human/update_worn_shoes()
remove_overlay(SHOES_LAYER)
if(num_legs < 2)
@@ -409,10 +384,7 @@ There are several things that need to be remembered:
var/obj/item/worn_item = shoes
update_hud_shoes(worn_item)
- if(update_obscured)
- update_obscured_slots(worn_item.flags_inv)
-
- if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (check_obscured_slots() & ITEM_SLOT_FEET))
+ if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (obscured_slots & HIDESHOES))
return
var/icon_file = DEFAULT_SHOES_FILE
@@ -454,7 +426,7 @@ There are several things that need to be remembered:
apply_overlay(SHOES_LAYER)
check_body_shape(BODYSHAPE_DIGITIGRADE, ITEM_SLOT_FEET)
-/mob/living/carbon/human/update_suit_storage(update_obscured = TRUE)
+/mob/living/carbon/human/update_suit_storage()
remove_overlay(SUIT_STORE_LAYER)
if(client && hud_used)
@@ -465,10 +437,7 @@ There are several things that need to be remembered:
var/obj/item/worn_item = s_store
update_hud_s_store(worn_item)
- if(update_obscured)
- update_obscured_slots(worn_item.flags_inv)
-
- if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (check_obscured_slots() & ITEM_SLOT_SUITSTORE))
+ if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (obscured_slots & HIDESUITSTORAGE))
return
var/mutable_appearance/s_store_overlay = worn_item.build_worn_icon(default_layer = SUIT_STORE_LAYER, default_icon_file = 'icons/mob/clothing/belt_mirror.dmi')
@@ -477,7 +446,7 @@ There are several things that need to be remembered:
overlays_standing[SUIT_STORE_LAYER] = s_store_overlay
apply_overlay(SUIT_STORE_LAYER)
-/mob/living/carbon/human/update_worn_head(update_obscured = TRUE)
+/mob/living/carbon/human/update_worn_head()
remove_overlay(HEAD_LAYER)
if(client && hud_used && hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_HEAD) + 1])
var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_HEAD) + 1]
@@ -487,10 +456,7 @@ There are several things that need to be remembered:
var/obj/item/worn_item = head
update_hud_head(worn_item)
- if(update_obscured)
- update_obscured_slots(worn_item.flags_inv)
-
- if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (check_obscured_slots() & ITEM_SLOT_HEAD))
+ if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (obscured_slots & HIDEHEADGEAR))
return
var/icon_file = 'icons/mob/clothing/head/default.dmi'
@@ -521,7 +487,7 @@ There are several things that need to be remembered:
apply_overlay(HEAD_LAYER)
check_body_shape(BODYSHAPE_SNOUTED, ITEM_SLOT_HEAD)
-/mob/living/carbon/human/update_worn_belt(update_obscured = TRUE)
+/mob/living/carbon/human/update_worn_belt()
remove_overlay(BELT_LAYER)
if(client && hud_used)
@@ -532,10 +498,7 @@ There are several things that need to be remembered:
var/obj/item/worn_item = belt
update_hud_belt(worn_item)
- if(update_obscured)
- update_obscured_slots(worn_item.flags_inv)
-
- if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (check_obscured_slots() & ITEM_SLOT_BELT))
+ if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (obscured_slots & HIDEBELT))
return
var/icon_file = 'icons/mob/clothing/belt.dmi'
@@ -560,7 +523,7 @@ There are several things that need to be remembered:
apply_overlay(BELT_LAYER)
-/mob/living/carbon/human/update_worn_oversuit(update_obscured = TRUE)
+/mob/living/carbon/human/update_worn_oversuit()
remove_overlay(SUIT_LAYER)
if(client && hud_used)
@@ -571,9 +534,6 @@ There are several things that need to be remembered:
var/obj/item/worn_item = wear_suit
update_hud_wear_suit(worn_item)
- if(update_obscured)
- update_obscured_slots(worn_item.flags_inv)
-
if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON))
return
@@ -634,7 +594,7 @@ There are several things that need to be remembered:
client.screen += r_store
update_observer_view(r_store)
-/mob/living/carbon/human/update_worn_mask(update_obscured = TRUE)
+/mob/living/carbon/human/update_worn_mask()
remove_overlay(FACEMASK_LAYER)
var/obj/item/bodypart/head/my_head = get_bodypart(BODY_ZONE_HEAD)
@@ -649,10 +609,7 @@ There are several things that need to be remembered:
var/obj/item/worn_item = wear_mask
update_hud_wear_mask(worn_item)
- if(update_obscured)
- update_obscured_slots(worn_item.flags_inv)
-
- if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (check_obscured_slots() & ITEM_SLOT_MASK))
+ if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON) || (obscured_slots & HIDEMASK))
return
var/icon_file = 'icons/mob/clothing/mask.dmi'
@@ -682,7 +639,7 @@ There are several things that need to be remembered:
apply_overlay(FACEMASK_LAYER)
check_body_shape(BODYSHAPE_SNOUTED, ITEM_SLOT_MASK)
-/mob/living/carbon/human/update_worn_back(update_obscured = TRUE)
+/mob/living/carbon/human/update_worn_back()
remove_overlay(BACK_LAYER)
if(client && hud_used && hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_BACK) + 1])
@@ -694,9 +651,6 @@ There are several things that need to be remembered:
var/mutable_appearance/back_overlay
update_hud_back(worn_item)
- if(update_obscured)
- update_obscured_slots(worn_item.flags_inv)
-
if(HAS_TRAIT(worn_item, TRAIT_NO_WORN_ICON))
return
diff --git a/code/modules/mob/living/carbon/human/init_signals.dm b/code/modules/mob/living/carbon/human/init_signals.dm
index 4bea0e925ea..06016b7a07c 100644
--- a/code/modules/mob/living/carbon/human/init_signals.dm
+++ b/code/modules/mob/living/carbon/human/init_signals.dm
@@ -13,15 +13,9 @@
RegisterSignal(src, COMSIG_COMPONENT_CLEAN_FACE_ACT, PROC_REF(clean_face))
- // List of signals which force a visible name update
- // TRAIT_UNKNOWN is excluded as it calls update_ID_card which also calls update_visible_name
- var/static/list/name_update_signals = list(
- SIGNAL_ADDTRAIT(TRAIT_INVISIBLE_MAN),
- SIGNAL_REMOVETRAIT(TRAIT_INVISIBLE_MAN),
- SIGNAL_ADDTRAIT(TRAIT_DISFIGURED),
- SIGNAL_REMOVETRAIT(TRAIT_DISFIGURED),
- )
- RegisterSignals(src, name_update_signals, PROC_REF(update_visible_name))
+ RegisterSignals(src, list(SIGNAL_ADDTRAIT(TRAIT_HUSK), SIGNAL_REMOVETRAIT(TRAIT_HUSK)), PROC_REF(refresh_obscured))
+ RegisterSignals(src, list(SIGNAL_ADDTRAIT(TRAIT_INVISIBLE_MAN), SIGNAL_REMOVETRAIT(TRAIT_INVISIBLE_MAN)), PROC_REF(invisible_man_toggle))
+ RegisterSignals(src, list(SIGNAL_ADDTRAIT(TRAIT_DISFIGURED), SIGNAL_REMOVETRAIT(TRAIT_DISFIGURED)), PROC_REF(update_visible_name))
/// Gaining or losing [TRAIT_DWARF] updates our height and grants passtable
/mob/living/carbon/human/proc/on_dwarf_trait(datum/source)
@@ -91,3 +85,9 @@
vision_distance = COMBAT_MESSAGE_RANGE,
)
playsound(src, SFX_RUSTLE, 50, TRUE, -5, frequency = 0.8)
+
+/// When [TRAIT_INVISIBLE_MAN] is added or removed we need to update a few things
+/mob/living/carbon/human/proc/invisible_man_toggle(datum/source)
+ SIGNAL_HANDLER
+ refresh_obscured()
+ update_visible_name()
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index 6e3c4363de0..85ac5c3c0f6 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -222,7 +222,6 @@
. = ..() //See mob.dm for an explanation on this and some rage about people copypasting instead of calling ..() like they should.
if(!. || !item_dropping)
return
- var/not_handled = FALSE //if we actually unequipped an item, this is because we dont want to run this proc twice, once for carbons and once for humans
if(item_dropping == wear_suit)
if(s_store && invdrop)
dropItemToGround(s_store, TRUE) //It makes no sense for your suit storage to stay on you if you drop your suit.
@@ -293,15 +292,12 @@
s_store = null
if(!QDELETED(src))
update_suit_storage()
- else
- not_handled = TRUE
- if(not_handled)
- return
-
- update_equipment_speed_mods()
- update_obscured_slots(item_dropping.flags_inv)
- hud_used?.update_locked_slots()
+/mob/living/carbon/human/item_coverage_changed(added_slots, removed_slots)
+ . = ..()
+ if((added_slots|removed_slots) & HIDEFACE)
+ sec_hud_set_security_status()
+ update_visible_name()
/mob/living/carbon/human/toggle_internals(obj/item/tank, is_external = FALSE)
// Just close the tank if it's the one the mob already has open.
@@ -433,9 +429,3 @@
new_bodypart.try_attach_limb(src, TRUE)
hand_bodyparts[i] = new_bodypart
..() //Don't redraw hands until we have organs for them
-
-/mob/living/carbon/human/update_equipment(obj/item/source)
- . = ..()
- // If the item we equipped/unequipped hides our face, we (potentially) need to update our name
- if (source.flags_inv & HIDEFACE)
- update_visible_name()
diff --git a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm
index 338ebc5a8bd..4a565b6d765 100644
--- a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm
@@ -78,12 +78,7 @@
return SSaccessories.caps_list
/datum/bodypart_overlay/mutant/mushroom_cap/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner)
- var/mob/living/carbon/human/human = bodypart_owner.owner
- if(!istype(human))
- return TRUE
- if((human.head?.flags_inv & HIDEHAIR) || (human.wear_mask?.flags_inv & HIDEHAIR))
- return FALSE
- return TRUE
+ return !(bodypart_owner.owner?.obscured_slots & HIDEHAIR)
/datum/bodypart_overlay/mutant/mushroom_cap/override_color(obj/item/bodypart/bodypart_owner)
//The mushroom cap is red by default (can still be dyed)
diff --git a/code/modules/mob/living/carbon/inventory.dm b/code/modules/mob/living/carbon/inventory.dm
index a2f4b623826..f4cf1757d9a 100644
--- a/code/modules/mob/living/carbon/inventory.dm
+++ b/code/modules/mob/living/carbon/inventory.dm
@@ -1,21 +1,3 @@
-/// Returns a list of slots that are *visibly* covered by clothing and thus cannot be seen by others
-/mob/living/carbon/proc/check_obscured_slots()
- var/hidden_slots = NONE
-
- for(var/obj/item/equipped_item in get_equipped_items())
- hidden_slots |= equipped_item.flags_inv
-
- return hidden_slots_to_inventory_slots(hidden_slots)
-
-/// Returns a list of slots that are protected by other clothing, but could possibly be seen by others, via transparent visors and similar stuff
-/mob/living/carbon/proc/check_covered_slots()
- var/hidden_slots = NONE
-
- for(var/obj/item/equipped_item in get_equipped_items())
- hidden_slots |= equipped_item.flags_inv | equipped_item.transparent_protection
-
- return hidden_slots_to_inventory_slots(hidden_slots)
-
/// Convers HIDEX to ITEM_SLOT_X, should be phased out in favor of using latter everywhere later
/proc/hidden_slots_to_inventory_slots(hidden_slots)
var/obscured = NONE
@@ -81,34 +63,13 @@
/// Returns items which are currently visible on the mob
/mob/living/carbon/proc/get_visible_items()
- var/static/list/visible_slots = list(
- ITEM_SLOT_OCLOTHING,
- ITEM_SLOT_ICLOTHING,
- ITEM_SLOT_GLOVES,
- ITEM_SLOT_EYES,
- ITEM_SLOT_EARS,
- ITEM_SLOT_MASK,
- ITEM_SLOT_HEAD,
- ITEM_SLOT_FEET,
- ITEM_SLOT_ID,
- ITEM_SLOT_BELT,
- ITEM_SLOT_BACK,
- ITEM_SLOT_NECK,
- ITEM_SLOT_HANDS,
- ITEM_SLOT_SUITSTORE,
- ITEM_SLOT_HANDCUFFED,
- ITEM_SLOT_LEGCUFFED,
- )
- var/list/obscured = check_obscured_slots()
var/list/visible_items = list()
- for (var/slot in visible_slots)
- if (obscured & slot)
- continue
- var/obj/item/equipped = get_item_by_slot(slot)
- if (equipped)
- visible_items += equipped
+ var/obscured_item_slots = hidden_slots_to_inventory_slots(obscured_slots)
for (var/obj/item/held in held_items)
visible_items += held
+ for(var/obj/item/thing in get_equipped_items())
+ if(!(get_slot_by_item(thing) & obscured_item_slots))
+ visible_items += thing
return visible_items
/mob/living/carbon/proc/equip_in_one_of_slots(obj/item/equipping, list/slots, qdel_on_fail = TRUE, indirect_action = FALSE)
@@ -154,13 +115,10 @@
equipping.pulledby.stop_pulling()
equipping.screen_loc = null
- if(client)
- client.screen -= equipping
+ client?.screen -= equipping
- if(observers?.len)
- for(var/mob/dead/observe as anything in observers)
- if(observe.client)
- observe.client.screen -= equipping
+ for(var/mob/dead/observe as anything in observers)
+ observe.client?.screen -= equipping
equipping.forceMove(src)
SET_PLANE_EXPLICIT(equipping, ABOVE_HUD_PLANE, src)
@@ -190,7 +148,6 @@
update_worn_neck(equipping)
if(ITEM_SLOT_HANDCUFFED)
set_handcuffed(equipping)
- update_handcuffed()
if(ITEM_SLOT_LEGCUFFED)
legcuffed = equipping
update_worn_legcuffs()
@@ -208,19 +165,32 @@
return not_handled
-/mob/living/carbon/has_equipped(obj/item/item, slot, initial)
- . = ..()
- hud_used?.update_locked_slots()
-
/mob/living/carbon/get_equipped_speed_mod_items()
return ..() + get_equipped_items()
+/mob/living/carbon/has_equipped(obj/item/item, slot, initial = FALSE)
+ . = ..()
+ if(!.)
+ return
+
+ update_equipment_speed_mods()
+ hud_used?.update_locked_slots()
+ add_item_coverage(item)
+
+/mob/living/carbon/has_unequipped(obj/item/item)
+ . = ..() // NB: ATP the item is still in the slot, but no longer has the IN_INVENTORY flag (so is not returned by get_equipped_items)
+ if(!.)
+ return
+
+ update_equipment_speed_mods()
+ hud_used?.update_locked_slots()
+ remove_item_coverage(item)
+
/mob/living/carbon/doUnEquip(obj/item/item_dropping, force, newloc, no_move, invdrop = TRUE, silent = FALSE)
. = ..() //Sets the default return value to what the parent returns.
if(!. || !item_dropping) //We don't want to set anything to null if the parent returned 0.
return
- var/not_handled = FALSE //if we actually unequipped an item, this is because we dont want to run this proc twice, once for carbons and once for humans
if(item_dropping == head)
head = null
if(!QDELETED(src))
@@ -241,14 +211,10 @@
set_handcuffed(null)
if(buckled?.buckle_requires_restraints)
buckled.unbuckle_mob(src)
- if(!QDELETED(src))
- update_handcuffed()
else if(item_dropping == legcuffed)
legcuffed = null
if(!QDELETED(src))
update_worn_legcuffs()
- else
- not_handled = TRUE
// Not an else-if because we're probably equipped in another slot
if(item_dropping == internal && (QDELETED(src) || QDELETED(item_dropping) || item_dropping.loc != src))
@@ -256,12 +222,44 @@
if(!QDELETED(src))
update_mob_action_buttons(UPDATE_BUTTON_STATUS)
- if(not_handled)
- return
+/// Adds the passed item's coverage to the mob's coverage related flags
+/mob/living/carbon/proc/add_item_coverage(obj/item/item)
+ var/pre_coverage = obscured_slots
+ obscured_slots |= item.flags_inv
+ covered_slots |= item.flags_inv | item.transparent_protection
+ if(pre_coverage != obscured_slots)
+ item_coverage_changed(obscured_slots & ~pre_coverage, pre_coverage & ~obscured_slots)
- update_equipment_speed_mods()
- update_obscured_slots(item_dropping.flags_inv)
- hud_used?.update_locked_slots()
+/// Removes the passed item's coverage from the mob's coverage related flags
+/mob/living/carbon/proc/remove_item_coverage(obj/item/item)
+ refresh_obscured() // No way to remove a single item's coverage without recalculating everything
+
+/mob/living/carbon/refresh_obscured()
+ var/pre_coverage = obscured_slots
+
+ obscured_slots = NONE
+ covered_slots = NONE
+ for(var/obj/item/other_equipped_item as anything in get_equipped_items())
+ obscured_slots |= other_equipped_item.flags_inv
+ covered_slots |= other_equipped_item.flags_inv | other_equipped_item.transparent_protection
+
+ if(HAS_TRAIT(src, TRAIT_HUSK) || HAS_TRAIT(src, TRAIT_INVISIBLE_MAN))
+ obscured_slots |= HIDEHAIR|HIDEFACIALHAIR
+
+ if(pre_coverage != obscured_slots)
+ item_coverage_changed(obscured_slots & ~pre_coverage, pre_coverage & ~obscured_slots)
+
+/**
+ * Called when a mob's obscured slots change
+ *
+ * Args
+ * * added_slots - slots that were added to obscured_slots
+ * * removed_slots - slots that were removed from obscured_slots
+ */
+/mob/living/carbon/proc/item_coverage_changed(added_slots, removed_slots)
+ update_clothing(hidden_slots_to_inventory_slots(added_slots|removed_slots))
+ if((added_slots|removed_slots) & (HIDEJUMPSUIT|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT|HIDEMUTWINGS|HIDEANTENNAE))
+ update_body()
/// Returns the helmet if an air tank compatible helmet is equipped.
/mob/living/carbon/proc/can_breathe_helmet()
diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm
index 0f90ab91ab9..f033bc2978a 100644
--- a/code/modules/mob/living/emote.dm
+++ b/code/modules/mob/living/emote.dm
@@ -14,6 +14,19 @@
. = ..()
user.spin(TAUNT_EMOTE_DURATION, 0.1 SECONDS)
+/datum/emote/living/tongue
+ key = "tongue"
+ key_third_person = "tongues"
+ message = "sticks their tongue out."
+
+/datum/emote/living/tongue/run_emote(mob/user, params, type_override, intentional)
+ var/mob/living/carbon/human/human_user = user
+ if(istype(human_user) && !human_user.get_organ_slot(ORGAN_SLOT_TONGUE))
+ to_chat(human_user, span_warning("You don't have a tongue!"))
+ return
+ . = ..()
+ QDEL_IN(human_user.give_emote_overlay(/datum/bodypart_overlay/simple/emote/tongue), 5.2 SECONDS)
+
/datum/emote/living/blush
key = "blush"
key_third_person = "blushes"
@@ -635,7 +648,7 @@
TIMER_COOLDOWN_START(user, COOLDOWN_YAWN_PROPAGATION, cooldown * 3)
var/mob/living/carbon/carbon_user = user
- if(istype(carbon_user) && ((carbon_user.wear_mask?.flags_inv & HIDEFACE) || carbon_user.head?.flags_inv & HIDEFACE))
+ if(carbon_user.obscured_slots & HIDEFACE)
return // if your face is obscured, skip propagation
var/propagation_distance = user.client ? 5 : 2 // mindless mobs are less able to spread yawns
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 7609e3df670..b491c72ae54 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -2549,11 +2549,6 @@ GLOBAL_LIST_EMPTY(fire_appearances)
if(GRAB_KILL)
add_movespeed_modifier(/datum/movespeed_modifier/grab_slowdown/kill)
-
-/// Only defined for carbons who can wear masks and helmets, we just assume other mobs have visible faces
-/mob/living/proc/is_face_visible()
- return TRUE
-
/// Sprite to show for photocopying mob butts
/mob/living/proc/get_butt_sprite()
return null
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index 00726ab2e87..fa1bdd78a51 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -349,7 +349,6 @@
return FALSE
if(!current_target.handcuffed)
current_target.set_handcuffed(new cuff_type(current_target))
- current_target.update_handcuffed()
playsound(src, SFX_LAW, 50, FALSE)
back_to_idle()
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index af4d5728341..398b08265d9 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -714,18 +714,25 @@
return
// check to see if their face is blocked or, if not, a signal blocks it
- if(examined_mob.is_face_visible() && SEND_SIGNAL(src, COMSIG_MOB_EYECONTACT, examined_mob, TRUE) != COMSIG_BLOCK_EYECONTACT)
+ if(examined_mob.can_eye_contact() && SEND_SIGNAL(src, COMSIG_MOB_EYECONTACT, examined_mob, TRUE) != COMSIG_BLOCK_EYECONTACT)
var/obj/item/clothing/eye_cover = examined_mob.is_eyes_covered()
if (!eye_cover || (!eye_cover.tint && !eye_cover.flash_protect))
var/msg = span_smallnotice("You make eye contact with [examined_mob].")
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), src, msg), 0.3 SECONDS) // so the examine signal has time to fire and this will print after
- if(!imagined_eye_contact && is_face_visible() && !examined_mob.is_blind() && SEND_SIGNAL(examined_mob, COMSIG_MOB_EYECONTACT, src, FALSE) != COMSIG_BLOCK_EYECONTACT)
+ if(!imagined_eye_contact && can_eye_contact() && !examined_mob.is_blind() && SEND_SIGNAL(examined_mob, COMSIG_MOB_EYECONTACT, src, FALSE) != COMSIG_BLOCK_EYECONTACT)
var/obj/item/clothing/eye_cover = is_eyes_covered()
if (!eye_cover || (!eye_cover.tint && !eye_cover.flash_protect))
var/msg = span_smallnotice("[src] makes eye contact with you.")
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), examined_mob, msg), 0.3 SECONDS)
+/// Checks if we can make eye contact or someone can make eye contact with us
+/mob/living/proc/can_eye_contact()
+ return TRUE
+
+/mob/living/carbon/can_eye_contact()
+ return !(obscured_slots & HIDEFACE)
+
/**
* Called by using Activate Held Object with an empty hand/limb
*
@@ -1563,11 +1570,6 @@
else
living_flags |= QUEUE_NUTRITION_UPDATE
-/// Update mob stats based on equipment we are wearing when an item is equipped/dropped, to be overriden by children
-/// source - Item that caused the update by being equipped/dropped
-/mob/proc/update_equipment(obj/item/source)
- update_equipment_speed_mods()
-
/// Apply a proper movespeed modifier based on items we have equipped
/mob/proc/update_equipment_speed_mods()
var/speedies = 0
diff --git a/code/modules/mob/mob_update_icons.dm b/code/modules/mob/mob_update_icons.dm
index b14da72e830..210c041408c 100644
--- a/code/modules/mob/mob_update_icons.dm
+++ b/code/modules/mob/mob_update_icons.dm
@@ -42,42 +42,24 @@
if(slot_flags & ITEM_SLOT_HANDS)
update_held_items()
-///Updates item slots obscured by this item (or using an override of flags to check)
-/mob/proc/update_obscured_slots(obscured_flags)
- if(obscured_flags & HIDEGLOVES)
- update_worn_gloves(update_obscured = FALSE)
- if(obscured_flags & HIDESUITSTORAGE)
- update_suit_storage(update_obscured = FALSE)
- if(obscured_flags & HIDEJUMPSUIT)
- update_worn_undersuit(update_obscured = FALSE)
- if(obscured_flags & HIDESHOES)
- update_worn_shoes(update_obscured = FALSE)
- if(obscured_flags & HIDEMASK)
- update_worn_mask(update_obscured = FALSE)
- if(obscured_flags & HIDEBELT)
- update_worn_belt(update_obscured = FALSE)
- if(obscured_flags & HIDEEARS)
- update_worn_ears(update_obscured = FALSE)
- if(obscured_flags & HIDEEYES)
- update_worn_glasses(update_obscured = FALSE)
- if(obscured_flags & HIDENECK)
- update_worn_neck(update_obscured = FALSE)
- if(obscured_flags & HIDEHEADGEAR)
- update_worn_head(update_obscured = FALSE)
+/// Recalculates the mob's obscured and covered slots based on currently equipped items
+/mob/proc/refresh_obscured()
+ SIGNAL_HANDLER
+ return
/mob/proc/update_icons()
return
///Updates the handcuff overlay & HUD element.
-/mob/proc/update_worn_handcuffs(update_obscured = FALSE)
+/mob/proc/update_worn_handcuffs()
return
///Updates the legcuff overlay & HUD element.
-/mob/proc/update_worn_legcuffs(update_obscured = FALSE)
+/mob/proc/update_worn_legcuffs()
return
///Updates the back overlay & HUD element.
-/mob/proc/update_worn_back(update_obscured = FALSE)
+/mob/proc/update_worn_back()
return
///Updates the held items overlay(s) & HUD element.
@@ -86,27 +68,27 @@
SEND_SIGNAL(src, COMSIG_MOB_UPDATE_HELD_ITEMS)
///Updates the mask overlay & HUD element.
-/mob/proc/update_worn_mask(update_obscured = FALSE)
+/mob/proc/update_worn_mask()
return
///Updates the neck overlay & HUD element.
-/mob/proc/update_worn_neck(update_obscured = FALSE)
+/mob/proc/update_worn_neck()
return
///Updates the oversuit overlay & HUD element.
-/mob/proc/update_worn_oversuit(update_obscured = FALSE)
+/mob/proc/update_worn_oversuit()
return
///Updates the undersuit/uniform overlay & HUD element.
-/mob/proc/update_worn_undersuit(update_obscured = FALSE)
+/mob/proc/update_worn_undersuit()
return
///Updates the belt overlay & HUD element.
-/mob/proc/update_worn_belt(update_obscured = FALSE)
+/mob/proc/update_worn_belt()
return
///Updates the on-head overlay & HUD element.
-/mob/proc/update_worn_head(update_obscured = FALSE)
+/mob/proc/update_worn_head()
return
///Updates every part of a carbon's body. Including parts, mutant parts, lips, underwear, and socks.
@@ -117,23 +99,23 @@
return
///Updates the glasses overlay & HUD element.
-/mob/proc/update_worn_glasses(update_obscured = FALSE)
+/mob/proc/update_worn_glasses()
return
///Updates the id overlay & HUD element.
-/mob/proc/update_worn_id(update_obscured = FALSE)
+/mob/proc/update_worn_id()
return
///Updates the shoes overlay & HUD element.
-/mob/proc/update_worn_shoes(update_obscured = FALSE)
+/mob/proc/update_worn_shoes()
return
///Updates the glasses overlay & HUD element.
-/mob/proc/update_worn_gloves(update_obscured = FALSE)
+/mob/proc/update_worn_gloves()
return
///Updates the suit storage overlay & HUD element.
-/mob/proc/update_suit_storage(update_obscured = FALSE)
+/mob/proc/update_suit_storage()
return
///Updates the pocket overlay & HUD element.
@@ -141,5 +123,5 @@
return
///Updates the headset overlay & HUD element.
-/mob/proc/update_worn_ears(update_obscured = FALSE)
+/mob/proc/update_worn_ears()
return
diff --git a/code/modules/mod/mod_actions.dm b/code/modules/mod/mod_actions.dm
index d0424d9682d..8385b657671 100644
--- a/code/modules/mod/mod_actions.dm
+++ b/code/modules/mod/mod_actions.dm
@@ -32,7 +32,7 @@
/datum/action/item_action/mod/do_effect(trigger_flags)
var/obj/item/mod/control/mod = target
- if(mod.malfunctioning && prob(75))
+ if(mod.malfunctioning && prob(MOD_MALFUNCTION_PROB))
mod.balloon_alert(usr, "button malfunctions!")
return FALSE
return TRUE
@@ -182,7 +182,7 @@
. = ..()
if(!.)
return
- module.on_select()
+ module.on_select(owner)
/datum/action/item_action/mod/pinnable/module/apply_button_overlay(atom/movable/screen/movable/action_button/current_button, force)
current_button.cut_overlays()
diff --git a/code/modules/mod/mod_activation.dm b/code/modules/mod/mod_activation.dm
index 0961e86af49..d900fd43538 100644
--- a/code/modules/mod/mod_activation.dm
+++ b/code/modules/mod/mod_activation.dm
@@ -271,7 +271,7 @@
part.alternate_worn_layer = part_datum.unsealed_layer
update_speed()
wearer.update_clothing(part.slot_flags | slot_flags)
- wearer.update_obscured_slots(part.visor_flags_inv)
+ wearer.refresh_obscured()
if((part.clothing_flags & (MASKINTERNALS|HEADINTERNALS)) && wearer.invalid_internals())
wearer.cutoff_internals()
SEND_SIGNAL(src, COMSIG_MOD_PART_SEALED, part_datum)
diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm
index c0f03b8997d..906dd08ca31 100644
--- a/code/modules/mod/mod_control.dm
+++ b/code/modules/mod/mod_control.dm
@@ -192,6 +192,7 @@
set_wearer(user)
else if(wearer)
unset_wearer()
+ return ..()
/obj/item/mod/control/dropped(mob/user)
. = ..()
@@ -393,7 +394,7 @@
return cell
/obj/item/mod/control/GetAccess()
- if(ai_controller)
+ if(ai_controller && req_access)
return req_access.Copy()
else
return ..()
diff --git a/code/modules/mod/mod_theme.dm b/code/modules/mod/mod_theme.dm
index 8bd6f1bb7fc..df33739bab0 100644
--- a/code/modules/mod/mod_theme.dm
+++ b/code/modules/mod/mod_theme.dm
@@ -169,6 +169,7 @@
part.worn_icon = used_skin[MOD_WORN_ICON_OVERRIDE] || 'icons/mob/clothing/modsuit/mod_clothing.dmi'
part.icon_state = "[skin]-[part.base_icon_state][mod.get_part_datum(part).sealed ? "-sealed" : ""]"
mod.wearer?.update_clothing(part.slot_flags)
+ mod.wearer?.refresh_obscured()
/datum/armor/mod_theme
melee = 10
diff --git a/code/modules/mod/mod_ui.dm b/code/modules/mod/mod_ui.dm
index 9a8e77f7e8e..e25c3b2a836 100644
--- a/code/modules/mod/mod_ui.dm
+++ b/code/modules/mod/mod_ui.dm
@@ -86,7 +86,7 @@
. = ..()
if(.)
return
- if(malfunctioning && prob(75))
+ if(malfunctioning && prob(MOD_MALFUNCTION_PROB))
balloon_alert(ui.user, "button malfunctions!")
return
switch(action)
@@ -108,7 +108,7 @@
var/obj/item/mod/module/module = locate(params["ref"]) in modules
if(!module)
return
- module.on_select()
+ module.on_select(ui.user) // We can now
if("configure")
var/obj/item/mod/module/module = locate(params["ref"]) in modules
if(!module)
diff --git a/code/modules/mod/modules/_module.dm b/code/modules/mod/modules/_module.dm
index fb9b7c9d155..3ee0fed7449 100644
--- a/code/modules/mod/modules/_module.dm
+++ b/code/modules/mod/modules/_module.dm
@@ -105,32 +105,29 @@
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)
- if(ismob(mod.loc))
- balloon_alert(mod.loc, "not equipped!")
+/obj/item/mod/module/proc/on_select(mob/activator)
+ if(!mod.wearer && !(allow_flags & MODULE_ALLOW_UNWORN)) //No wearer and cannot be used unworn
+ balloon_alert(activator, "not equipped!")
return
- if(((!mod.active || mod.activating) && !(allow_flags & MODULE_ALLOW_INACTIVE)) || module_type == MODULE_PASSIVE)
- if(mod.wearer)
- balloon_alert(mod.wearer, "not active!")
+ if(((!mod.active || mod.activating) && !(allow_flags & (MODULE_ALLOW_INACTIVE | MODULE_ALLOW_UNWORN))) || module_type == MODULE_PASSIVE) // not active
+ balloon_alert(activator, "not active!")
return
- if(!has_required_parts(mod.mod_parts, need_active = TRUE))
- if(mod.wearer)
- balloon_alert(mod.wearer, "required parts inactive!")
- var/list/slot_strings = list()
- for(var/slot in required_slots)
- var/list/slot_list = parse_slot_flags(slot)
- slot_strings += (length(slot_list) == 1 ? "" : "one of ") + english_list(slot_list, and_text = " or ")
- to_chat(mod.wearer, span_warning("[src] requires these slots to be deployed: [english_list(slot_strings)]"))
- playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+ if(!has_required_parts(mod.mod_parts, need_active = TRUE) && !(allow_flags & MODULE_ALLOW_UNWORN)) // Doesn't have parts
+ balloon_alert(activator, "required parts inactive!")
+ var/list/slot_strings = list()
+ for(var/slot in required_slots)
+ var/list/slot_list = parse_slot_flags(slot)
+ slot_strings += (length(slot_list) == 1 ? "" : "one of ") + english_list(slot_list, and_text = " or ")
+ to_chat(activator, span_warning("[src] requires these slots to be deployed: [english_list(slot_strings)]"))
+ playsound(src, 'sound/machines/scanner/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
return
if(module_type != MODULE_USABLE)
if(active)
- deactivate()
+ deactivate(activator)
else
- activate()
+ activate(activator)
else
- used()
+ used(activator)
SEND_SIGNAL(mod, COMSIG_MOD_MODULE_SELECTED, src)
/// Apply a cooldown until this item can be used again
@@ -141,12 +138,12 @@
SEND_SIGNAL(src, COMSIG_MODULE_COOLDOWN_STARTED, applied_cooldown)
/// Called when the module is activated
-/obj/item/mod/module/proc/activate()
+/obj/item/mod/module/proc/activate(mob/activator)
if(!COOLDOWN_FINISHED(src, cooldown_timer))
- balloon_alert(mod.wearer, "on cooldown!")
+ balloon_alert(activator, "on cooldown!")
return FALSE
if(((!mod.active || mod.activating) && !(allow_flags & MODULE_ALLOW_INACTIVE)) || !mod.get_charge()) // SKYRAT EDIT ADDITION: INACTIVE USE
- balloon_alert(mod.wearer, "unpowered!")
+ balloon_alert(activator, "unpowered!")
return FALSE
// SKYRAT EDIT START - No using modules when not all parts are deployed.
@@ -158,7 +155,7 @@
// SKYRAT EDIT END
if(!(allow_flags & MODULE_ALLOW_PHASEOUT) && istype(mod.wearer.loc, /obj/effect/dummy/phased_mob))
//specifically a to_chat because the user is phased out.
- to_chat(mod.wearer, span_warning("You cannot activate this right now."))
+ to_chat(activator, span_warning("You cannot activate this right now."))
return FALSE
if(SEND_SIGNAL(src, COMSIG_MODULE_TRIGGERED, mod.wearer) & MOD_ABORT_USE)
return FALSE
@@ -168,25 +165,25 @@
mod.selected_module = src
if(device)
if(mod.wearer.put_in_hands(device))
- balloon_alert(mod.wearer, "[device] extended")
+ balloon_alert(activator, "[device] extended")
RegisterSignal(mod.wearer, COMSIG_ATOM_EXITED, PROC_REF(on_exit))
RegisterSignal(mod.wearer, COMSIG_KB_MOB_DROPITEM_DOWN, PROC_REF(dropkey))
else
- balloon_alert(mod.wearer, "can't extend [device]!")
+ balloon_alert(activator, "can't extend [device]!")
mod.wearer.transferItemToLoc(device, src, force = TRUE)
return FALSE
else
var/used_button = mod.wearer.client?.prefs.read_preference(/datum/preference/choiced/mod_select) || MIDDLE_CLICK
update_signal(used_button)
- balloon_alert(mod.wearer, "[src] activated, [used_button]-click to use")
+ balloon_alert(mod.wearer, "[src] activated, [used_button]-click to use") // As of now, only wearers can "use" mods
active = TRUE
SEND_SIGNAL(src, COMSIG_MODULE_ACTIVATED)
- on_activation()
+ on_activation(activator)
update_clothing_slots()
return TRUE
/// Called when the module is deactivated
-/obj/item/mod/module/proc/deactivate(display_message = TRUE, deleting = FALSE)
+/obj/item/mod/module/proc/deactivate(mob/activator, display_message = TRUE, deleting = FALSE)
active = FALSE
if(module_type == MODULE_ACTIVE)
mod.selected_module = null
@@ -200,12 +197,15 @@
UnregisterSignal(mod.wearer, used_signal)
used_signal = null
SEND_SIGNAL(src, COMSIG_MODULE_DEACTIVATED, mod.wearer)
- on_deactivation(display_message = TRUE, deleting = FALSE)
+ on_deactivation(activator, display_message = TRUE, deleting = FALSE)
update_clothing_slots()
return TRUE
/// Call to update all slots visually affected by this module
/obj/item/mod/module/proc/update_clothing_slots()
+ if(!mod.wearer)
+ return
+
var/updated_slots = mod.slot_flags
if (mask_worn_overlay)
for (var/obj/item/part as anything in mod.get_parts())
@@ -216,24 +216,25 @@
mod.wearer.update_clothing(updated_slots)
/// Called when the module is used
-/obj/item/mod/module/proc/used()
+/obj/item/mod/module/proc/used(mob/activator)
if(!COOLDOWN_FINISHED(src, cooldown_timer))
- balloon_alert(mod.wearer, "on cooldown!")
+ balloon_alert(activator, "on cooldown!")
return FALSE
if(!check_power(use_energy_cost))
- balloon_alert(mod.wearer, "not enough charge!")
+ balloon_alert(activator, "not enough charge!")
return FALSE
if(!(allow_flags & MODULE_ALLOW_PHASEOUT) && istype(mod.wearer.loc, /obj/effect/dummy/phased_mob))
//specifically a to_chat because the user is phased out.
- to_chat(mod.wearer, span_warning("You cannot activate this right now."))
+ to_chat(activator, span_warning("You cannot activate this right now."))
return FALSE
if(SEND_SIGNAL(src, COMSIG_MODULE_TRIGGERED, mod.wearer) & MOD_ABORT_USE)
return FALSE
start_cooldown()
- addtimer(CALLBACK(mod.wearer, TYPE_PROC_REF(/mob, update_clothing), mod.slot_flags), cooldown_time+1) //need to run it a bit after the cooldown starts to avoid conflicts
+ if(mod.wearer)
+ addtimer(CALLBACK(mod.wearer, TYPE_PROC_REF(/mob, update_clothing), mod.slot_flags), cooldown_time+1) //need to run it a bit after the cooldown starts to avoid conflicts
update_clothing_slots()
SEND_SIGNAL(src, COMSIG_MODULE_USED)
- on_use()
+ on_use(activator)
return TRUE
/// Called when an activated module without a device is used
@@ -265,15 +266,15 @@
return TRUE
/// Called from the module's activate()
-/obj/item/mod/module/proc/on_activation()
+/obj/item/mod/module/proc/on_activation(mob/activator)
return
/// Called from the module's deactivate()
-/obj/item/mod/module/proc/on_deactivation(display_message = TRUE, deleting = FALSE)
+/obj/item/mod/module/proc/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE)
return
/// Called from the module's used()
-/obj/item/mod/module/proc/on_use()
+/obj/item/mod/module/proc/on_use(mob/activator)
return
/// Called on the MODsuit's process if it is an active module
diff --git a/code/modules/mod/modules/module_kinesis.dm b/code/modules/mod/modules/module_kinesis.dm
index 436d3dc9e87..f79701e7961 100644
--- a/code/modules/mod/modules/module_kinesis.dm
+++ b/code/modules/mod/modules/module_kinesis.dm
@@ -63,7 +63,7 @@
drain_power(use_energy_cost)
grab_atom(target)
-/obj/item/mod/module/anomaly_locked/kinesis/on_deactivation(display_message = TRUE, deleting = FALSE)
+/obj/item/mod/module/anomaly_locked/kinesis/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE)
clear_grab(playsound = !deleting)
/obj/item/mod/module/anomaly_locked/kinesis/process(seconds_per_tick)
diff --git a/code/modules/mod/modules/module_pathfinder.dm b/code/modules/mod/modules/module_pathfinder.dm
index 9f1cec7e9fa..4b948d6ed07 100644
--- a/code/modules/mod/modules/module_pathfinder.dm
+++ b/code/modules/mod/modules/module_pathfinder.dm
@@ -15,12 +15,22 @@
use_energy_cost = DEFAULT_CHARGE_DRAIN * 10
incompatible_modules = list(/obj/item/mod/module/pathfinder)
required_slots = list(ITEM_SLOT_BACK|ITEM_SLOT_BELT)
+ allow_flags = list(MODULE_ALLOW_INACTIVE|MODULE_ALLOW_UNWORN)
/// The pathfinding implant.
var/obj/item/implant/mod/implant
+ /// Whether the implant has been used or not
+ var/implant_inside = TRUE
+ /// The jet icon we apply to the MOD.
+ var/image/jet_icon
+ /// Allow suit activation - Lets this module be recalled from the MOD.
+ var/allow_suit_activation = FALSE // I'm not here to argue about balance
+
/obj/item/mod/module/pathfinder/Initialize(mapload)
. = ..()
implant = new(src)
+ jet_icon = image(icon = 'icons/obj/clothing/modsuit/mod_modules.dmi', icon_state = "mod_jet", layer = LOW_ITEM_LAYER)
+
/obj/item/mod/module/pathfinder/Destroy()
QDEL_NULL(implant)
@@ -28,28 +38,28 @@
/obj/item/mod/module/pathfinder/Exited(atom/movable/gone, direction)
if(gone == implant)
- implant = null
+ implant_inside = FALSE
update_icon_state()
return ..()
/obj/item/mod/module/pathfinder/update_icon_state()
. = ..()
- icon_state = implant ? "pathfinder" : "pathfinder_empty"
+ icon_state = implant_inside ? "pathfinder" : "pathfinder_empty"
/obj/item/mod/module/pathfinder/examine(mob/user)
. = ..()
- if(implant)
+ if(implant_inside)
. += span_notice("Use it on a human to implant them.")
else
. += span_warning("The implant is missing.")
/obj/item/mod/module/pathfinder/attack(mob/living/target, mob/living/user, list/modifiers, list/attack_modifiers)
- if(!ishuman(target) || !implant)
+ if(!ishuman(target) || !implant_inside) // Not human, or no implant in module
return
if(!do_after(user, 1.5 SECONDS, target = target))
balloon_alert(user, "interrupted!")
return
- if(!implant.implant(target, user))
+ if(!implant.implant(target, user)) // If implant fails
balloon_alert(user, "can't implant!")
return
if(target == user)
@@ -57,21 +67,29 @@
else
target.visible_message(span_notice("[user] implants [target]."), span_notice("[user] implants you with [implant]."))
playsound(src, 'sound/effects/spray.ogg', 30, TRUE, -6)
- module_type = MODULE_PASSIVE
-/obj/item/mod/module/pathfinder/on_use()
+/obj/item/mod/module/pathfinder/on_use(mob/activator)
. = ..()
- if (!ishuman(mod.wearer) || !implant)
+ if(mod.wearer && implant_inside) // implant them
+ try_implant(activator)
+ return
+ if(mod.wearer)
+ balloon_alert(activator, "suit already worn!")
+ else
+ recall(activator)
+
+
+/// Assuming we have a wearer, attempt to implant them.
+/obj/item/mod/module/pathfinder/proc/try_implant(mob/activator)
+ if(!ishuman(mod.wearer)) // Wearer isn't human
return
if(!implant.implant(mod.wearer, mod.wearer))
- balloon_alert(mod.wearer, "can't implant!")
+ balloon_alert(activator, "can't implant!")
return
- balloon_alert(mod.wearer, "implanted")
+ balloon_alert(activator, "implanted")
+ if(!(activator == mod.wearer)) // someone else implanted you
+ balloon_alert(mod.wearer, "pathfinder MOD tracker implanted!")
playsound(src, 'sound/effects/spray.ogg', 30, TRUE, -6)
- module_type = MODULE_PASSIVE
- var/datum/action/item_action/mod/pinnable/module/existing_action = pinned_to[REF(mod.wearer)]
- if(existing_action)
- mod.remove_item_action(existing_action)
/obj/item/mod/module/pathfinder/proc/attach(mob/living/user)
if(!ishuman(user))
@@ -87,27 +105,86 @@
playsound(mod, 'sound/machines/ping.ogg', 50, TRUE)
drain_power(use_energy_cost)
+/obj/item/mod/module/pathfinder/proc/recall(mob/recaller)
+ if(!implant)
+ balloon_alert(recaller, "no target implant!")
+ return FALSE
+ if(recaller != implant.imp_in && !allow_suit_activation) // No pAI recalling
+ balloon_alert(recaller, "sector safety regulations prevent MOD-side recalling!")
+ return FALSE
+ if(mod.open)
+ balloon_alert(recaller, "cover open!")
+ return FALSE
+ if(mod.ai_controller)
+ balloon_alert(recaller, "already moving!")
+ return FALSE
+ if(ismob(get_atom_on_turf(mod)))
+ balloon_alert(recaller, "already on someone!")
+ return FALSE
+ if(mod.z != implant.imp_in.z || get_dist(implant.imp_in, mod) > MOD_AI_RANGE)
+ balloon_alert(recaller, "too far!")
+ return FALSE
+ var/datum/ai_controller/mod_ai = new /datum/ai_controller/mod(mod)
+ mod.ai_controller = mod_ai
+ mod_ai.set_movement_target(type, implant.imp_in)
+ mod_ai.set_blackboard_key(BB_MOD_TARGET, implant.imp_in)
+ mod_ai.set_blackboard_key(BB_MOD_MODULE, src)
+ mod.interaction_flags_item &= ~INTERACT_ITEM_ATTACK_HAND_PICKUP
+ mod.AddElement(/datum/element/movetype_handler)
+ ADD_TRAIT(mod, TRAIT_MOVE_FLYING, MOD_TRAIT)
+ animate(mod, 0.2 SECONDS, pixel_x = base_pixel_y, pixel_y = base_pixel_y)
+ mod.add_overlay(jet_icon)
+ RegisterSignal(mod, COMSIG_MOVABLE_MOVED, PROC_REF(on_move))
+ balloon_alert(recaller, "suit recalled")
+ if(!(recaller == mod.wearer))
+ balloon_alert(mod.wearer, "suit recalled")
+ return TRUE
+
+/obj/item/mod/module/pathfinder/proc/on_move(atom/movable/source, atom/old_loc, dir, forced)
+ SIGNAL_HANDLER
+
+ var/matrix/mod_matrix = matrix()
+ mod_matrix.Turn(get_angle(source, implant.imp_in))
+ source.transform = mod_matrix
+
+/obj/item/mod/module/pathfinder/proc/end_recall(successful = TRUE)
+ if(!mod)
+ return
+ QDEL_NULL(mod.ai_controller)
+ mod.interaction_flags_item |= INTERACT_ITEM_ATTACK_HAND_PICKUP
+ REMOVE_TRAIT(mod, TRAIT_MOVE_FLYING, MOD_TRAIT)
+ mod.RemoveElement(/datum/element/movetype_handler)
+ mod.cut_overlay(jet_icon)
+ mod.transform = matrix()
+ UnregisterSignal(mod, COMSIG_MOVABLE_MOVED)
+ if(!successful)
+ balloon_alert(implant.imp_in, "suit lost connection!")
+
+// ###########
+// THE INPLANT
+// ###########
+
+
/obj/item/implant/mod
name = "MOD pathfinder implant"
desc = "Lets you recall a MODsuit to you at any time."
actions_types = list(/datum/action/item_action/mod_recall)
+ allow_multiple = TRUE // Surgrey is annoying if you loose your MOD
/// The pathfinder module we are linked to.
var/obj/item/mod/module/pathfinder/module
- /// The jet icon we apply to the MOD.
- var/image/jet_icon
+
+
/obj/item/implant/mod/Initialize(mapload)
. = ..()
if(!istype(loc, /obj/item/mod/module/pathfinder))
return INITIALIZE_HINT_QDEL
module = loc
- jet_icon = image(icon = 'icons/obj/clothing/modsuit/mod_modules.dmi', icon_state = "mod_jet", layer = LOW_ITEM_LAYER)
/obj/item/implant/mod/Destroy()
if(module?.mod?.ai_controller)
- end_recall(successful = FALSE)
+ module.end_recall(successful = FALSE)
module = null
- jet_icon = null
return ..()
/obj/item/implant/mod/get_data()
@@ -115,55 +192,6 @@
Name: Nakamura Engineering Pathfinder Implant \
Implant Details: Allows for the recall of a Modular Outerwear Device by the implant owner at any time. "
-/obj/item/implant/mod/proc/recall()
- if(!module?.mod)
- balloon_alert(imp_in, "no connected unit!")
- return FALSE
- if(module.mod.open)
- balloon_alert(imp_in, "cover open!")
- return FALSE
- if(module.mod.ai_controller)
- balloon_alert(imp_in, "already moving!")
- return FALSE
- if(ismob(get_atom_on_turf(module.mod)))
- balloon_alert(imp_in, "already on someone!")
- return FALSE
- if(module.z != z || get_dist(imp_in, module.mod) > MOD_AI_RANGE)
- balloon_alert(imp_in, "too far!")
- return FALSE
- var/datum/ai_controller/mod_ai = new /datum/ai_controller/mod(module.mod)
- module.mod.ai_controller = mod_ai
- mod_ai.set_movement_target(type, imp_in)
- mod_ai.set_blackboard_key(BB_MOD_TARGET, imp_in)
- mod_ai.set_blackboard_key(BB_MOD_IMPLANT, src)
- module.mod.interaction_flags_item &= ~INTERACT_ITEM_ATTACK_HAND_PICKUP
- module.mod.AddElement(/datum/element/movetype_handler)
- ADD_TRAIT(module.mod, TRAIT_MOVE_FLYING, MOD_TRAIT)
- animate(module.mod, 0.2 SECONDS, pixel_x = base_pixel_y, pixel_y = base_pixel_y)
- module.mod.add_overlay(jet_icon)
- RegisterSignal(module.mod, COMSIG_MOVABLE_MOVED, PROC_REF(on_move))
- balloon_alert(imp_in, "suit recalled")
- return TRUE
-
-/obj/item/implant/mod/proc/end_recall(successful = TRUE)
- if(!module?.mod)
- return
- QDEL_NULL(module.mod.ai_controller)
- module.mod.interaction_flags_item |= INTERACT_ITEM_ATTACK_HAND_PICKUP
- REMOVE_TRAIT(module.mod, TRAIT_MOVE_FLYING, MOD_TRAIT)
- module.mod.RemoveElement(/datum/element/movetype_handler)
- module.mod.cut_overlay(jet_icon)
- module.mod.transform = matrix()
- UnregisterSignal(module.mod, COMSIG_MOVABLE_MOVED)
- if(!successful)
- balloon_alert(imp_in, "suit lost connection!")
-
-/obj/item/implant/mod/proc/on_move(atom/movable/source, atom/old_loc, dir, forced)
- SIGNAL_HANDLER
-
- var/matrix/mod_matrix = matrix()
- mod_matrix.Turn(get_angle(source, imp_in))
- source.transform = mod_matrix
/datum/action/item_action/mod_recall
name = "Recall MOD"
@@ -185,7 +213,7 @@
/datum/action/item_action/mod_recall/do_effect(trigger_flags)
var/obj/item/implant/mod/implant = target
if(!COOLDOWN_FINISHED(src, recall_cooldown))
- implant.balloon_alert(implant.imp_in, "on cooldown!")
+ implant.balloon_alert(owner, "on cooldown!")
return
- if(implant.recall())
+ if(implant.module.recall(owner)) // change this
COOLDOWN_START(src, recall_cooldown, 15 SECONDS)
diff --git a/code/modules/mod/modules/modules_antag.dm b/code/modules/mod/modules/modules_antag.dm
index d8449338f7b..32b11f23c59 100644
--- a/code/modules/mod/modules/modules_antag.dm
+++ b/code/modules/mod/modules/modules_antag.dm
@@ -78,6 +78,8 @@
idle_power_cost = 0 //magic
use_energy_cost = 0 //magic too
max_charges = 5
+ recharge_start_delay = 20 SECONDS
+ charge_increment_delay = 3 SECONDS
shield_icon_file = 'icons/effects/magic.dmi'
shield_icon = "mageshield"
required_slots = list()
@@ -290,7 +292,7 @@
complexity = 2
incompatible_modules = list(/obj/item/mod/module/chameleon)
cooldown_time = 0.5 SECONDS
- allow_flags = MODULE_ALLOW_INACTIVE
+ allow_flags = list(MODULE_ALLOW_INACTIVE|MODULE_ALLOW_UNWORN)
/// A list of all the items the suit can disguise as.
var/list/possible_disguises = list()
/// The path of the item we're disguised as.
@@ -312,17 +314,17 @@
return_look()
possible_disguises = null
-/obj/item/mod/module/chameleon/used()
+/obj/item/mod/module/chameleon/used(mob/activator)
if(mod.active || mod.activating)
- balloon_alert(mod.wearer, "unit active!")
+ balloon_alert(activator, "unit active!")
return FALSE
return ..()
-/obj/item/mod/module/chameleon/on_use()
+/obj/item/mod/module/chameleon/on_use(mob/activator)
if(current_disguise)
return_look()
return
- var/picked_name = tgui_input_list(mod.wearer, "Select look to change into", "Chameleon Settings", possible_disguises)
+ var/picked_name = tgui_input_list(activator, "Select look to change into", "Chameleon Settings", possible_disguises)
if(!possible_disguises[picked_name] || mod.active || mod.activating)
return
current_disguise = possible_disguises[picked_name]
@@ -504,10 +506,10 @@
if(disrupted.on_saboteur(src, 1 MINUTES))
mod.add_charge(DEFAULT_CHARGE_DRAIN * 250)
-/obj/item/mod/module/stealth/wraith/on_activation()
+/obj/item/mod/module/stealth/wraith/on_activation(mob/activator)
return // Don't activate stealth when the module is activated because the stealth portion of the module is fully passive
-/obj/item/mod/module/stealth/wraith/on_deactivation(display_message = TRUE, deleting = FALSE)
+/obj/item/mod/module/stealth/wraith/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE)
. = ..()
UnregisterSignal(mod.wearer, list(COMSIG_LIVING_MOB_BUMP, COMSIG_ATOM_BUMPED, COMSIG_MOB_FIRED_GUN))
diff --git a/code/modules/mod/modules/modules_engineering.dm b/code/modules/mod/modules/modules_engineering.dm
index fa28e7aaee6..5838e2391cd 100644
--- a/code/modules/mod/modules/modules_engineering.dm
+++ b/code/modules/mod/modules/modules_engineering.dm
@@ -81,11 +81,11 @@
. = ..()
UnregisterSignal(mod, COMSIG_MOD_UPDATE_SPEED)
-/obj/item/mod/module/magboot/on_activation()
+/obj/item/mod/module/magboot/on_activation(mob/activator)
mod.wearer.add_traits(active_traits, REF(src))
mod.update_speed()
-/obj/item/mod/module/magboot/on_deactivation(display_message = TRUE, deleting = FALSE)
+/obj/item/mod/module/magboot/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE)
mod.wearer.remove_traits(active_traits, REF(src))
mod.update_speed()
@@ -140,7 +140,7 @@
if (key == "cut_tethers")
SEND_SIGNAL(src, COMSIG_MOD_TETHER_SNAP)
-/obj/item/mod/module/tether/on_deactivation(display_message, deleting)
+/obj/item/mod/module/tether/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE)
SEND_SIGNAL(src, COMSIG_MOD_TETHER_SNAP)
/obj/projectile/tether
@@ -222,6 +222,7 @@
anchor.pixel_x = hitx
anchor.pixel_y = hity
anchor.anchored = TRUE
+ anchor.reset_pixel_pos = TRUE
anchor.parent_module = parent_module
firer.AddComponent(/datum/component/tether, anchor, 7, "MODtether", parent_module = parent_module, tether_trait_source = REF(parent_module))
@@ -238,6 +239,8 @@
interaction_flags_atom = INTERACT_ATOM_ATTACK_HAND | INTERACT_ATOM_UI_INTERACT
/// MODsuit tether module that created our projectile
var/obj/item/mod/module/tether/parent_module
+ /// Should we reset our pixel positions next time we move?
+ var/reset_pixel_pos = FALSE
/obj/item/tether_anchor/Initialize(mapload)
. = ..()
@@ -255,8 +258,12 @@
/obj/item/tether_anchor/wrench_act(mob/living/user, obj/item/tool)
. = ..()
- default_unfasten_wrench(user, tool)
- return ITEM_INTERACT_SUCCESS
+ if (default_unfasten_wrench(user, tool))
+ pixel_x = 0
+ pixel_y = 0
+ reset_pixel_pos = FALSE
+ return ITEM_INTERACT_SUCCESS
+ return ITEM_INTERACT_BLOCKING
/obj/item/tether_anchor/attack_hand_secondary(mob/user, list/modifiers)
if (!can_interact(user) || !user.CanReach(src) || !isturf(loc))
@@ -274,6 +281,13 @@
user.AddComponent(/datum/component/tether, src, 7, "tether", tether_trait_source = REF(src))
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
+/obj/item/tether_anchor/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change)
+ . = ..()
+ if (reset_pixel_pos)
+ pixel_x = 0
+ pixel_y = 0
+ reset_pixel_pos = FALSE
+
/obj/item/tether_anchor/mouse_drop_receive(atom/target, mob/user, params)
if (!can_interact(user) || !user.CanReach(src) || !isturf(loc))
return
@@ -394,7 +408,7 @@
/obj/item/mod/module/constructor/on_part_deactivation(deleting = FALSE)
REMOVE_TRAIT(mod.wearer, TRAIT_QUICK_BUILD, REF(src))
-/obj/item/mod/module/constructor/on_use()
+/obj/item/mod/module/constructor/on_use(mob/activator)
rcd_scan(src, fade_time = 10 SECONDS)
drain_power(use_energy_cost)
diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm
index 38d5049faef..104f6058549 100644
--- a/code/modules/mod/modules/modules_general.dm
+++ b/code/modules/mod/modules/modules_general.dm
@@ -171,12 +171,12 @@
return FALSE
return TRUE
-/obj/item/mod/module/jetpack/on_activation()
+/obj/item/mod/module/jetpack/on_activation(mob/activator)
mod.wearer.add_movespeed_modifier(/datum/movespeed_modifier/jetpack/full_speed)
if (!stabilize)
ADD_TRAIT(mod.wearer, TRAIT_NOGRAV_ALWAYS_DRIFT, REF(src))
-/obj/item/mod/module/jetpack/on_deactivation(display_message = TRUE, deleting = FALSE)
+/obj/item/mod/module/jetpack/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE)
mod.wearer.remove_movespeed_modifier(/datum/movespeed_modifier/jetpack/full_speed)
REMOVE_TRAIT(mod.wearer, TRAIT_NOGRAV_ALWAYS_DRIFT, REF(src))
@@ -206,9 +206,9 @@
incompatible_modules = list(/obj/item/mod/module/jump_jet)
required_slots = list(ITEM_SLOT_BACK)
-/obj/item/mod/module/jump_jet/on_use()
+/obj/item/mod/module/jump_jet/on_use(mob/activator)
if (DOING_INTERACTION(mod.wearer, mod.wearer))
- balloon_alert(mod.wearer, "busy!")
+ balloon_alert(activator, "busy!")
return
balloon_alert(mod.wearer, "launching...")
mod.wearer.Shake(duration = 1 SECONDS)
@@ -438,12 +438,12 @@
/// Maximum range we can set.
var/max_range = 5
-/obj/item/mod/module/flashlight/on_activation()
+/obj/item/mod/module/flashlight/on_activation(mob/activator)
set_light_flags(light_flags | LIGHT_ATTACHED)
set_light_on(active)
active_power_cost = base_power * light_range
-/obj/item/mod/module/flashlight/on_deactivation(display_message = TRUE, deleting = FALSE)
+/obj/item/mod/module/flashlight/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE)
set_light_flags(light_flags & ~LIGHT_ATTACHED)
set_light_on(active)
@@ -518,13 +518,13 @@
/// Time it takes for us to dispense.
var/dispense_time = 0 SECONDS
-/obj/item/mod/module/dispenser/on_use()
+/obj/item/mod/module/dispenser/on_use(mob/activator)
if(dispense_time && !do_after(mod.wearer, dispense_time, target = mod))
balloon_alert(mod.wearer, "interrupted!")
return FALSE
var/obj/item/dispensed = new dispense_type(mod.wearer.loc)
mod.wearer.put_in_hands(dispensed)
- balloon_alert(mod.wearer, "[dispensed] dispensed")
+ balloon_alert(activator, "[dispensed] dispensed")
playsound(src, 'sound/machines/click.ogg', 100, TRUE)
drain_power(use_energy_cost)
return dispensed
@@ -627,7 +627,7 @@
UnregisterSignal(mod, COMSIG_ATOM_EMP_ACT)
UnregisterSignal(mod, COMSIG_ATOM_EMAG_ACT)
-/obj/item/mod/module/dna_lock/on_use()
+/obj/item/mod/module/dna_lock/on_use(mob/activator)
/// Bubber Edit Start - Proteans
if(istype(mod, /obj/item/mod/control/pre_equipped/protean))
var/obj/item/mod/control/pre_equipped/protean/p_suit = mod
@@ -637,7 +637,7 @@
return balloon_alert(p_suit.wearer, "button unresponsive")
/// Bubber Edit End
dna = mod.wearer.dna.unique_enzymes
- balloon_alert(mod.wearer, "dna updated")
+ balloon_alert(activator, "dna updated")
drain_power(use_energy_cost)
/obj/item/mod/module/dna_lock/emp_act(severity)
@@ -868,11 +868,11 @@
container = null
return ..()
-/obj/item/mod/module/recycler/on_activation()
+/obj/item/mod/module/recycler/on_activation(mob/activator)
connector = AddComponent(/datum/component/connect_loc_behalf, mod.wearer, loc_connections)
RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, PROC_REF(on_wearer_moved))
-/obj/item/mod/module/recycler/on_deactivation(display_message, deleting = FALSE)
+/obj/item/mod/module/recycler/on_deactivation(mob/activator, display_message, deleting = FALSE)
QDEL_NULL(connector)
UnregisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, PROC_REF(on_wearer_moved))
diff --git a/code/modules/mod/modules/modules_maint.dm b/code/modules/mod/modules/modules_maint.dm
index 17804dcd406..2e0b2dba3a0 100644
--- a/code/modules/mod/modules/modules_maint.dm
+++ b/code/modules/mod/modules/modules_maint.dm
@@ -136,12 +136,12 @@
QDEL_NULL(rave_screen)
return ..()
-/obj/item/mod/module/visor/rave/on_activation()
+/obj/item/mod/module/visor/rave/on_activation(mob/activator)
rave_screen = mod.wearer.add_client_colour(/datum/client_colour/rave, REF(src))
rave_screen.update_color(rainbow_order[rave_number])
music_player.start_music(mod.wearer)
-/obj/item/mod/module/visor/rave/on_deactivation(display_message = TRUE, deleting = FALSE)
+/obj/item/mod/module/visor/rave/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE)
QDEL_NULL(rave_screen)
if(isnull(music_player.active_song_sound))
return
@@ -199,7 +199,7 @@
cooldown_time = 30 SECONDS
required_slots = list(ITEM_SLOT_OCLOTHING|ITEM_SLOT_ICLOTHING)
-/obj/item/mod/module/tanner/on_use()
+/obj/item/mod/module/tanner/on_use(mob/activator)
playsound(src, 'sound/machines/microwave/microwave-end.ogg', 50, TRUE)
var/datum/reagents/holder = new()
holder.add_reagent(/datum/reagent/spraytan, 10)
@@ -223,7 +223,7 @@
var/blowing_time = 10 SECONDS
var/oxygen_damage = 20
-/obj/item/mod/module/balloon/on_use()
+/obj/item/mod/module/balloon/on_use(mob/activator)
if(!do_after(mod.wearer, blowing_time, target = mod))
return FALSE
mod.wearer.adjustOxyLoss(oxygen_damage)
@@ -247,7 +247,7 @@
/// The total number of sheets created by this MOD. The more sheets, them more likely they set on fire.
var/num_sheets_dispensed = 0
-/obj/item/mod/module/paper_dispenser/on_use()
+/obj/item/mod/module/paper_dispenser/on_use(mob/activator)
if(!do_after(mod.wearer, 1 SECONDS, target = mod))
return FALSE
@@ -316,7 +316,7 @@
/// If you use the module on a planetary turf, you fly up. To the sky.
var/you_fucked_up = FALSE
-/obj/item/mod/module/atrocinator/on_activation()
+/obj/item/mod/module/atrocinator/on_activation(mob/activator)
playsound(src, 'sound/effects/curse/curseattack.ogg', 50)
mod.wearer.AddElement(/datum/element/forced_gravity, NEGATIVE_GRAVITY)
RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, PROC_REF(check_upstairs))
@@ -325,13 +325,13 @@
passtable_on(mod.wearer, REF(src))
check_upstairs() //todo at some point flip your screen around
-/obj/item/mod/module/atrocinator/deactivate(display_message = TRUE, deleting = FALSE)
+/obj/item/mod/module/atrocinator/deactivate(mob/activator, display_message = TRUE, deleting = FALSE)
if(you_fucked_up && !deleting)
- to_chat(mod.wearer, span_danger("It's too late."))
+ to_chat(activator, span_danger("It's too late."))
return FALSE
return ..()
-/obj/item/mod/module/atrocinator/on_deactivation(display_message = TRUE, deleting = FALSE)
+/obj/item/mod/module/atrocinator/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE)
if(!deleting)
playsound(src, 'sound/effects/curse/curseattack.ogg', 50)
qdel(mod.wearer.RemoveElement(/datum/element/forced_gravity, NEGATIVE_GRAVITY))
diff --git a/code/modules/mod/modules/modules_ninja.dm b/code/modules/mod/modules/modules_ninja.dm
index 5f9596ab213..11346d00f28 100644
--- a/code/modules/mod/modules/modules_ninja.dm
+++ b/code/modules/mod/modules/modules_ninja.dm
@@ -19,7 +19,7 @@
/// The alpha applied when the cloak is on.
var/stealth_alpha = 50
-/obj/item/mod/module/stealth/on_activation()
+/obj/item/mod/module/stealth/on_activation(mob/activator)
if(bumpoff)
RegisterSignal(mod.wearer, COMSIG_LIVING_MOB_BUMP, PROC_REF(unstealth))
RegisterSignal(mod.wearer, COMSIG_LIVING_UNARMED_ATTACK, PROC_REF(on_unarmed_attack))
@@ -28,7 +28,7 @@
animate(mod.wearer, alpha = stealth_alpha, time = 1.5 SECONDS)
drain_power(use_energy_cost)
-/obj/item/mod/module/stealth/on_deactivation(display_message = TRUE, deleting = FALSE)
+/obj/item/mod/module/stealth/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE)
if(bumpoff)
UnregisterSignal(mod.wearer, COMSIG_LIVING_MOB_BUMP)
UnregisterSignal(mod.wearer, list(COMSIG_LIVING_UNARMED_ATTACK, COMSIG_MOB_ITEM_ATTACK, COMSIG_ATOM_ATTACKBY, COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_BULLET_ACT, COMSIG_ATOM_HITBY, COMSIG_ATOM_HULK_ATTACK, COMSIG_ATOM_ATTACK_PAW, COMSIG_CARBON_CUFF_ATTEMPTED))
@@ -72,11 +72,11 @@
cooldown_time = 3 SECONDS
-/obj/item/mod/module/stealth/ninja/on_activation()
+/obj/item/mod/module/stealth/ninja/on_activation(mob/activator)
. = ..()
ADD_TRAIT(mod.wearer, TRAIT_SILENT_FOOTSTEPS, REF(src))
-/obj/item/mod/module/stealth/ninja/on_deactivation(display_message = TRUE, deleting = FALSE)
+/obj/item/mod/module/stealth/ninja/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE)
. = ..()
REMOVE_TRAIT(mod.wearer, TRAIT_SILENT_FOOTSTEPS, REF(src))
@@ -289,7 +289,7 @@
use_energy_cost = DEFAULT_CHARGE_DRAIN * 10
cooldown_time = 8 SECONDS
-/obj/item/mod/module/emp_shield/pulse/on_use()
+/obj/item/mod/module/emp_shield/pulse/on_use(mob/activator)
playsound(src, 'sound/effects/empulse.ogg', 60, TRUE)
empulse(src, heavy_range = 4, light_range = 6)
drain_power(use_energy_cost)
@@ -422,7 +422,7 @@
return FALSE
return ..()
-/obj/item/mod/module/adrenaline_boost/on_use()
+/obj/item/mod/module/adrenaline_boost/on_use(mob/activator)
if(IS_SPACE_NINJA(mod.wearer))
mod.wearer.say(pick_list_replacements(NINJA_FILE, "lines"), forced = type)
to_chat(mod.wearer, span_notice("You have used the adrenaline boost."))
diff --git a/code/modules/mod/modules/modules_science.dm b/code/modules/mod/modules/modules_science.dm
index 8cb15d35370..8a41d449edf 100644
--- a/code/modules/mod/modules/modules_science.dm
+++ b/code/modules/mod/modules/modules_science.dm
@@ -13,10 +13,10 @@
incompatible_modules = list(/obj/item/mod/module/reagent_scanner)
required_slots = list(ITEM_SLOT_HEAD|ITEM_SLOT_EYES|ITEM_SLOT_MASK)
-/obj/item/mod/module/reagent_scanner/on_activation()
+/obj/item/mod/module/reagent_scanner/on_activation(mob/activator)
ADD_TRAIT(mod.wearer, TRAIT_REAGENT_SCANNER, REF(src))
-/obj/item/mod/module/reagent_scanner/on_deactivation(display_message = TRUE, deleting = FALSE)
+/obj/item/mod/module/reagent_scanner/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE)
REMOVE_TRAIT(mod.wearer, TRAIT_REAGENT_SCANNER, REF(src))
/obj/item/mod/module/reagent_scanner/advanced
@@ -29,12 +29,12 @@
removable = FALSE
var/explosion_detection_dist = 21
-/obj/item/mod/module/reagent_scanner/advanced/on_activation()
+/obj/item/mod/module/reagent_scanner/advanced/on_activation(mob/activator)
. = ..()
ADD_TRAIT(mod.wearer, TRAIT_RESEARCH_SCANNER, REF(src))
RegisterSignal(SSdcs, COMSIG_GLOB_EXPLOSION, PROC_REF(sense_explosion))
-/obj/item/mod/module/reagent_scanner/advanced/on_deactivation(display_message = TRUE, deleting = FALSE)
+/obj/item/mod/module/reagent_scanner/advanced/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE)
. = ..()
REMOVE_TRAIT(mod.wearer, TRAIT_RESEARCH_SCANNER, REF(src))
UnregisterSignal(SSdcs, COMSIG_GLOB_EXPLOSION)
@@ -61,13 +61,13 @@
accepted_anomalies = list(/obj/item/assembly/signaler/anomaly/grav)
required_slots = list(ITEM_SLOT_BACK|ITEM_SLOT_BELT)
-/obj/item/mod/module/anomaly_locked/antigrav/on_activation()
+/obj/item/mod/module/anomaly_locked/antigrav/on_activation(mob/activator)
if(mod.wearer.has_gravity())
new /obj/effect/temp_visual/mook_dust(get_turf(src))
mod.wearer.AddElement(/datum/element/forced_gravity, 0)
playsound(src, 'sound/effects/gravhit.ogg', 50)
-/obj/item/mod/module/anomaly_locked/antigrav/on_deactivation(display_message = TRUE, deleting = FALSE)
+/obj/item/mod/module/anomaly_locked/antigrav/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE)
mod.wearer.RemoveElement(/datum/element/forced_gravity, 0)
if(deleting)
return
diff --git a/code/modules/mod/modules/modules_security.dm b/code/modules/mod/modules/modules_security.dm
index a19cd09db2b..efe5d4646ef 100644
--- a/code/modules/mod/modules/modules_security.dm
+++ b/code/modules/mod/modules/modules_security.dm
@@ -82,7 +82,7 @@
/obj/item/mod/module/pepper_shoulders/on_part_deactivation(deleting = FALSE)
UnregisterSignal(mod.wearer, COMSIG_LIVING_CHECK_BLOCK)
-/obj/item/mod/module/pepper_shoulders/on_use()
+/obj/item/mod/module/pepper_shoulders/on_use(mob/activator)
playsound(src, 'sound/effects/spray.ogg', 30, TRUE, -6)
var/datum/reagents/capsaicin_holder = new(10)
capsaicin_holder.add_reagent(/datum/reagent/consumable/condensedcapsaicin, 10)
@@ -117,7 +117,7 @@
/// Gun we have holstered.
var/obj/item/gun/holstered
-/obj/item/mod/module/holster/on_use()
+/obj/item/mod/module/holster/on_use(mob/activator)
if(!holstered)
var/obj/item/gun/holding = mod.wearer.get_active_held_item()
if(!holding)
@@ -163,10 +163,10 @@
/// List of spans we add to the speaker.
var/list/voicespan = list(SPAN_COMMAND)
-/obj/item/mod/module/megaphone/on_activation()
+/obj/item/mod/module/megaphone/on_activation(mob/activator)
RegisterSignal(mod.wearer, COMSIG_MOB_SAY, PROC_REF(handle_speech))
-/obj/item/mod/module/megaphone/on_deactivation(display_message = TRUE, deleting = FALSE)
+/obj/item/mod/module/megaphone/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE)
UnregisterSignal(mod.wearer, COMSIG_MOB_SAY)
/obj/item/mod/module/megaphone/proc/handle_speech(datum/source, list/speech_args)
@@ -203,7 +203,7 @@
idle_power_cost = linked_bodybag ? (DEFAULT_CHARGE_DRAIN * 3) : 0
return ..()
-/obj/item/mod/module/criminalcapture/on_deactivation(display_message = TRUE, deleting = FALSE)
+/obj/item/mod/module/criminalcapture/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE)
if(!linked_bodybag)
return
packup()
@@ -269,7 +269,7 @@
overlay_state_inactive = "module_mirage_grenade"
dispense_type = /obj/item/grenade/mirage
-/obj/item/mod/module/dispenser/mirage/on_use()
+/obj/item/mod/module/dispenser/mirage/on_use(mob/activator)
var/obj/item/grenade/mirage/grenade = ..()
grenade.arm_grenade(mod.wearer)
@@ -318,18 +318,18 @@
/// Effect image on projectiles.
var/image/projectile_effect
/// The dampening field
- var/datum/proximity_monitor/advanced/projectile_dampener/dampening_field
+ var/datum/proximity_monitor/advanced/bubble/projectile_dampener/dampening_field
/obj/item/mod/module/projectile_dampener/Initialize(mapload)
. = ..()
projectile_effect = image('icons/effects/fields.dmi', "projectile_dampen_effect")
-/obj/item/mod/module/projectile_dampener/on_activation()
+/obj/item/mod/module/projectile_dampener/on_activation(mob/activator)
if(istype(dampening_field))
QDEL_NULL(dampening_field)
dampening_field = new(mod.wearer, field_radius, TRUE, src)
-/obj/item/mod/module/projectile_dampener/on_deactivation(display_message, deleting = FALSE)
+/obj/item/mod/module/projectile_dampener/on_deactivation(mob/activator, display_message, deleting = FALSE)
QDEL_NULL(dampening_field)
///Active Sonar - Displays a hud circle on the turf of any living creatures in the given radius
@@ -429,12 +429,12 @@
scanned_slice = 1
COOLDOWN_START(src, scan_cooldown, scan_cooldown_time)
-/obj/item/mod/module/active_sonar/on_use()
- balloon_alert(mod.wearer, "readying sonar...")
+/obj/item/mod/module/active_sonar/on_use(mob/activator)
+ balloon_alert(activator, "readying sonar...")
playsound(mod.wearer, 'sound/vehicles/mecha/skyfall_power_up.ogg', vol = 20, vary = TRUE, extrarange = SHORT_RANGE_SOUND_EXTRARANGE)
if(!do_after(mod.wearer, 1.1 SECONDS, target = mod))
return
- playsound(mod.wearer, 'sound/effects/ping_hit.ogg', vol = 75, vary = TRUE) // Should be audible for the radius of the sonar
+ playsound(src, 'sound/effects/ping_hit.ogg', vol = 75, vary = TRUE) // Should be audible for the radius of the sonar
to_chat(mod.wearer, span_notice("You slam your fist into the ground, sending out a sonic wave that detects [detect_living_creatures()] living beings nearby!"))
for(var/mob/living/creature as anything in keyed_creatures)
new /obj/effect/temp_visual/sonar_ping(mod.wearer.loc, mod.wearer, creature)
diff --git a/code/modules/mod/modules/modules_service.dm b/code/modules/mod/modules/modules_service.dm
index 3a53705e24b..9ca53939fb2 100644
--- a/code/modules/mod/modules/modules_service.dm
+++ b/code/modules/mod/modules/modules_service.dm
@@ -12,7 +12,7 @@
incompatible_modules = list(/obj/item/mod/module/bikehorn)
cooldown_time = 1 SECONDS
-/obj/item/mod/module/bikehorn/on_use()
+/obj/item/mod/module/bikehorn/on_use(mob/activator)
playsound(src, 'sound/items/bikehorn.ogg', 100, FALSE)
drain_power(use_energy_cost)
diff --git a/code/modules/mod/modules/modules_supply.dm b/code/modules/mod/modules/modules_supply.dm
index 77b13a32836..a87c3f39cc0 100644
--- a/code/modules/mod/modules/modules_supply.dm
+++ b/code/modules/mod/modules/modules_supply.dm
@@ -18,8 +18,8 @@
. = ..()
AddComponent(/datum/component/gps/item, "MOD0", state = GLOB.deep_inventory_state, overlay_state = FALSE)
-/obj/item/mod/module/gps/on_use()
- attack_self(mod.wearer)
+/obj/item/mod/module/gps/on_use(mob/activator)
+ attack_self(mod.wearer) // todo: refactor to make compatable with pAIs. Maybe ui_interact(activator)
///Hydraulic Clamp - Lets you pick up and drop crates.
/obj/item/mod/module/clamp
@@ -40,16 +40,28 @@
var/load_time = 3 SECONDS
/// The max amount of crates you can carry.
var/max_crates = 3
+ /// Disallow mobs larger than this size in containers
+ var/max_mob_size = MOB_SIZE_SMALL
+ /// Items that allowed to be picked up by this module
+ var/list/accepted_items
/// The crates stored in the module.
var/list/stored_crates = list()
+
+/obj/item/mod/module/clamp/Initialize(mapload)
+ . = ..()
+ accepted_items = typecacheof(list(
+ /obj/structure/closet/crate,
+ /obj/item/delivery/big
+ ))
+
/obj/item/mod/module/clamp/on_select_use(atom/target)
. = ..()
if(!.)
return
if(!mod.wearer.Adjacent(target))
return
- if(istype(target, /obj/structure/closet/crate) || istype(target, /obj/item/delivery/big))
+ if(is_type_in_typecache(target, accepted_items))
var/atom/movable/picked_crate = target
if(!check_crate_pickup(picked_crate))
return
@@ -92,7 +104,7 @@
balloon_alert(mod.wearer, "too many crates!")
return FALSE
for(var/mob/living/mob in target.get_all_contents())
- if(mob.mob_size < MOB_SIZE_HUMAN)
+ if(mob.mob_size <= max_mob_size)
continue
balloon_alert(mod.wearer, "crate too heavy!")
return FALSE
@@ -124,10 +136,10 @@
overlay_state_active = "module_drill"
required_slots = list(ITEM_SLOT_GLOVES)
-/obj/item/mod/module/drill/on_activation()
+/obj/item/mod/module/drill/on_activation(mob/activator)
RegisterSignal(mod.wearer, COMSIG_MOVABLE_BUMP, PROC_REF(bump_mine))
-/obj/item/mod/module/drill/on_deactivation(display_message = TRUE, deleting = FALSE)
+/obj/item/mod/module/drill/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE)
UnregisterSignal(mod.wearer, COMSIG_MOVABLE_BUMP)
/obj/item/mod/module/drill/on_select_use(atom/target)
@@ -202,7 +214,7 @@
ore.forceMove(src)
ores += ore
-/obj/item/mod/module/orebag/on_use()
+/obj/item/mod/module/orebag/on_use(mob/activator)
for(var/obj/item/ore as anything in ores)
ore.forceMove(drop_location())
ores -= ore
@@ -333,7 +345,7 @@
locker.throw_at(mod.wearer, range = 7, speed = 3, force = MOVE_FORCE_WEAK, \
callback = CALLBACK(src, PROC_REF(check_locker), locker))
-/obj/item/mod/module/magnet/on_deactivation(display_message = TRUE, deleting = FALSE)
+/obj/item/mod/module/magnet/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE)
if(istype(mod.wearer.pulling, /obj/structure/closet))
mod.wearer.stop_pulling()
@@ -483,13 +495,13 @@
TRAIT_NO_SLIP_ALL,
)
-/obj/item/mod/module/sphere_transform/activate()
+/obj/item/mod/module/sphere_transform/activate(mob/activator)
if(!mod.wearer.has_gravity())
- balloon_alert(mod.wearer, "no gravity!")
+ balloon_alert(activator, "no gravity!")
return FALSE
return ..()
-/obj/item/mod/module/sphere_transform/on_activation()
+/obj/item/mod/module/sphere_transform/on_activation(mob/activator)
playsound(src, 'sound/items/modsuit/ballin.ogg', 100, TRUE)
mod.wearer.add_filter("mod_ball", 1, alpha_mask_filter(icon = icon('icons/mob/clothing/modsuit/mod_modules.dmi', "ball_mask"), flags = MASK_INVERSE))
mod.wearer.add_filter("mod_blur", 2, angular_blur_filter(size = 15))
@@ -503,7 +515,7 @@
mod.wearer.add_movespeed_modifier(/datum/movespeed_modifier/sphere)
RegisterSignal(mod.wearer, COMSIG_MOB_STATCHANGE, PROC_REF(on_statchange))
-/obj/item/mod/module/sphere_transform/on_deactivation(display_message = TRUE, deleting = FALSE)
+/obj/item/mod/module/sphere_transform/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE)
if(!deleting)
playsound(src, 'sound/items/modsuit/ballin.ogg', 100, TRUE, frequency = -1)
mod.wearer.remove_offsets(REF(src))
@@ -516,9 +528,9 @@
mod.wearer.remove_movespeed_modifier(/datum/movespeed_modifier/sphere)
UnregisterSignal(mod.wearer, COMSIG_MOB_STATCHANGE)
-/obj/item/mod/module/sphere_transform/used()
+/obj/item/mod/module/sphere_transform/used(mob/activator)
if(!lavaland_equipment_pressure_check(get_turf(src)))
- balloon_alert(mod.wearer, "too much pressure!")
+ balloon_alert(activator, "too much pressure!")
playsound(src, 'sound/items/weapons/gun/general/dry_fire.ogg', 25, TRUE)
return FALSE
return ..()
diff --git a/code/modules/mod/modules/modules_timeline.dm b/code/modules/mod/modules/modules_timeline.dm
index 701cbc30421..0a18a559830 100644
--- a/code/modules/mod/modules/modules_timeline.dm
+++ b/code/modules/mod/modules/modules_timeline.dm
@@ -29,9 +29,10 @@
UnregisterSignal(mod, COMSIG_MOD_ACTIVATE)
UnregisterSignal(mod, COMSIG_MOD_MODULE_REMOVAL)
-/obj/item/mod/module/eradication_lock/on_use()
+/obj/item/mod/module/eradication_lock/on_use(mob/activator)
true_owner_ckey = mod.wearer.ckey
- balloon_alert(mod.wearer, "user remembered")
+ balloon_alert(activator, "user remembered")
+ playsound(src, 'sound/items/pshoom/pshoom.ogg', 25, TRUE)
drain_power(use_energy_cost)
///Signal fired when the modsuit tries activating
@@ -66,8 +67,8 @@
cooldown_time = 20 SECONDS
required_slots = list(ITEM_SLOT_BACK)
-/obj/item/mod/module/rewinder/on_use()
- balloon_alert(mod.wearer, "anchor point set")
+/obj/item/mod/module/rewinder/on_use(mob/activator)
+ balloon_alert(activator, "anchor point set")
playsound(src, 'sound/items/modsuit/time_anchor_set.ogg', 50, TRUE)
//stops all mods from triggering during rewinding
for(var/obj/item/mod/module/module as anything in mod.modules)
@@ -110,13 +111,13 @@
///The current timestop in progress.
var/obj/effect/timestop/channelled/timestop
-/obj/item/mod/module/timestopper/used()
+/obj/item/mod/module/timestopper/used(mob/activator)
if(timestop)
- mod.balloon_alert(mod.wearer, "already freezing time!")
+ mod.balloon_alert(activator, "already freezing time!")
return FALSE
return ..()
-/obj/item/mod/module/timestopper/on_use()
+/obj/item/mod/module/timestopper/on_use(mob/activator)
//stops all mods from triggering during timestop- including timestop itself
for(var/obj/item/mod/module/module as anything in mod.modules)
RegisterSignal(module, COMSIG_MODULE_TRIGGERED, PROC_REF(on_module_triggered))
@@ -159,14 +160,14 @@
///The dummy for phasing from this module, the wearer is phased out while this exists.
var/obj/effect/dummy/phased_mob/chrono/phased_mob
-/obj/item/mod/module/timeline_jumper/used()
+/obj/item/mod/module/timeline_jumper/used(mob/activator)
var/area/noteleport_check = get_area(mod.wearer)
if(noteleport_check && !check_teleport_valid(mod.wearer, get_turf(mod.wearer)))
- to_chat(mod.wearer, span_danger("Some dull, universal force is between you and the [phased_mob ? "current timeline" : "stream between timelines"]."))
+ to_chat(activator, span_danger("Some dull, universal force is between you and the [phased_mob ? "current timeline" : "stream between timelines"]."))
return FALSE
return ..()
-/obj/item/mod/module/timeline_jumper/on_use()
+/obj/item/mod/module/timeline_jumper/on_use(mob/activator)
if(!phased_mob)
//phasing out
mod.visible_message(span_warning("[mod.wearer] leaps out of the timeline!"))
diff --git a/code/modules/mod/modules/modules_visor.dm b/code/modules/mod/modules/modules_visor.dm
index 7897ac404f2..c865cc3e670 100644
--- a/code/modules/mod/modules/modules_visor.dm
+++ b/code/modules/mod/modules/modules_visor.dm
@@ -12,12 +12,12 @@
/// The traits given by the visor.
var/list/visor_traits = list()
-/obj/item/mod/module/visor/on_activation()
+/obj/item/mod/module/visor/on_activation(mob/activator)
if(length(visor_traits))
mod.wearer.add_traits(visor_traits, REF(src))
mod.wearer.update_sight()
-/obj/item/mod/module/visor/on_deactivation(display_message = TRUE, deleting = FALSE)
+/obj/item/mod/module/visor/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE)
if(length(visor_traits))
mod.wearer.remove_traits(visor_traits, REF(src))
mod.wearer.update_sight()
@@ -91,10 +91,10 @@
incompatible_modules = list(/obj/item/mod/module/night, /obj/item/mod/module/visor/night)
required_slots = list(ITEM_SLOT_HEAD|ITEM_SLOT_EYES|ITEM_SLOT_MASK)
-/obj/item/mod/module/night/on_activation()
- ADD_TRAIT(mod.wearer, TRAIT_TRUE_NIGHT_VISION, REF(src))
+/obj/item/mod/module/night/on_activation(mob/activator)
+ mod.wearer.add_traits(mod.wearer, TRAIT_TRUE_NIGHT_VISION, REF(src))
mod.wearer.update_sight()
-/obj/item/mod/module/night/on_deactivation(display_message = TRUE, deleting = FALSE)
- REMOVE_TRAIT(mod.wearer, TRAIT_TRUE_NIGHT_VISION, REF(src))
+/obj/item/mod/module/night/on_deactivation(mob/activator, display_message = TRUE, deleting = FALSE)
+ mod.wearer.remove_traits(mod.wearer, TRAIT_TRUE_NIGHT_VISION, REF(src))
mod.wearer.update_sight()
diff --git a/code/modules/photography/camera/camera.dm b/code/modules/photography/camera/camera.dm
index c55c038de29..9ef40666fc3 100644
--- a/code/modules/photography/camera/camera.dm
+++ b/code/modules/photography/camera/camera.dm
@@ -315,8 +315,9 @@
qdel(clone_area)
get_icon.Blend("#000", ICON_UNDERLAY)
for(var/mob/living/carbon/human/person in mobs)
- if(person.is_face_visible())
- names += "[person.name]"
+ if(person.obscured_slots & HIDEFACE)
+ continue
+ names += "[person.name]"
var/datum/picture/picture = new("picture", desc.Join(" "), mobs_spotted, dead_spotted, names, get_icon, null, psize_x, psize_y, blueprints, can_see_ghosts = see_ghosts)
after_picture(user, picture)
diff --git a/code/modules/plumbing/plumbers/_plumb_machinery.dm b/code/modules/plumbing/plumbers/_plumb_machinery.dm
index 1627b667f1a..84e51918dc8 100644
--- a/code/modules/plumbing/plumbers/_plumb_machinery.dm
+++ b/code/modules/plumbing/plumbers/_plumb_machinery.dm
@@ -98,7 +98,9 @@
/obj/machinery/plumbing/plunger_act(obj/item/plunger/attacking_plunger, mob/living/user, reinforced)
user.balloon_alert_to_viewers("furiously plunging...")
- if(do_after(user, 3 SECONDS, target = src))
- user.balloon_alert_to_viewers("finished plunging")
- reagents.expose(get_turf(src), TOUCH) //splash on the floor
- reagents.clear_reagents()
+ if(!do_after(user, 3 SECONDS, target = src))
+ return TRUE
+ user.balloon_alert_to_viewers("finished plunging")
+ reagents.expose(get_turf(src), TOUCH) //splash on the floor
+ reagents.clear_reagents()
+ return TRUE
diff --git a/code/modules/plumbing/plumbers/iv_drip.dm b/code/modules/plumbing/plumbers/iv_drip.dm
index a2e3f905d1f..0fef34ef4ca 100644
--- a/code/modules/plumbing/plumbers/iv_drip.dm
+++ b/code/modules/plumbing/plumbers/iv_drip.dm
@@ -22,10 +22,12 @@
/obj/machinery/iv_drip/plumbing/plunger_act(obj/item/plunger/attacking_plunger, mob/living/user, reinforced)
user.balloon_alert_to_viewers("furiously plunging...", "plunging iv drip...")
- if(do_after(user, 3 SECONDS, target = src))
- user.balloon_alert_to_viewers("finished plunging")
- reagents.expose(get_turf(src), TOUCH) //splash on the floor
- reagents.clear_reagents()
+ if(!do_after(user, 3 SECONDS, target = src))
+ return TRUE
+ user.balloon_alert_to_viewers("finished plunging")
+ reagents.expose(get_turf(src), TOUCH) //splash on the floor
+ reagents.clear_reagents()
+ return TRUE
/obj/machinery/iv_drip/plumbing/wrench_act(mob/living/user, obj/item/tool)
if(default_unfasten_wrench(user, tool) != SUCCESSFUL_UNFASTEN)
diff --git a/code/modules/projectiles/guns/energy/crank_guns.dm b/code/modules/projectiles/guns/energy/crank_guns.dm
index 32aa65827cf..05139823fae 100644
--- a/code/modules/projectiles/guns/energy/crank_guns.dm
+++ b/code/modules/projectiles/guns/energy/crank_guns.dm
@@ -44,6 +44,7 @@
shaded_charge = 1
charge_sections = 1
spread = 22.5
+ obj_flags = UNIQUE_RENAME
/obj/item/gun/energy/disabler/smoothbore/Initialize(mapload)
. = ..()
diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
index 039e6a2898b..39e76fea268 100644
--- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
@@ -137,6 +137,7 @@
name = "Methamphetamine"
description = "Reduces stun times by about 300%, speeds the user up, and allows the user to quickly recover stamina while dealing a small amount of Brain damage. If overdosed the subject will move randomly, laugh randomly, drop items and suffer from Toxin and Brain damage. If addicted the subject will constantly jitter and drool, before becoming dizzy and losing motor control and eventually suffer heavy toxin damage."
color = "#78C8FA" //best case scenario is the "default", gets muddled depending on purity
+ taste_description = "harsh, burning chemicals"
overdose_threshold = 20
metabolization_rate = 0.75 * REAGENTS_METABOLISM
ph = 5
@@ -169,7 +170,7 @@
/datum/reagent/drug/methamphetamine/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
- var/high_message = pick("You feel hyper.", "You feel like you need to go faster.", "You feel like you can run the world.")
+ var/high_message = pick("You feel hyper.", "You feel like you need to go faster.", "You feel like you can run the world.", "You understand now.")
if(SPT_PROB(2.5, seconds_per_tick))
to_chat(affected_mob, span_notice("[high_message]"))
affected_mob.add_mood_event("tweaking", /datum/mood_event/stimulant_medium)
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index 2d2a2d1cd83..50c480b9cbf 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -718,6 +718,7 @@
name = "Morphine"
description = "A painkiller that allows the patient to move at full speed even when injured. Causes drowsiness and eventually unconsciousness in high doses. Overdose will cause a variety of effects, ranging from minor to lethal."
color = "#A9FBFB"
+ taste_description = "a perfumy, bitter vanilla"
metabolization_rate = 0.5 * REAGENTS_METABOLISM
overdose_threshold = 30
ph = 8.96
diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
index 6c9ae29d4c3..ab4de8a550e 100644
--- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
@@ -259,26 +259,39 @@
ph = 13
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
-/datum/reagent/toxin/zombiepowder/on_mob_metabolize(mob/living/holder_mob)
+/datum/reagent/toxin/zombiepowder/expose_mob(mob/living/exposed_mob, methods, reac_volume, show_message, touch_protection)
. = ..()
+ if(!isliving(exposed_mob) || !(methods & (INGEST|INHALE)))
+ return
+
+ LAZYINITLIST(data)
+ data["method"] |= methods
+
+ //the stomach handles INGEST via on_mob_metabolize() we only deal with INHALE
+ //also means vapour works much faster which is realistic
+ if(methods & INHALE)
+ zombify(exposed_mob)
+/**
+ * Does the fake death & oxy loss on the mob
+ *
+ * Arguments
+ * * mob/living/holder_mob - the mob we are zombifying
+*/
+/datum/reagent/toxin/zombiepowder/proc/zombify(mob/living/holder_mob)
+ PRIVATE_PROC(TRUE)
+
holder_mob.adjustOxyLoss(0.5*REM, FALSE, required_biotype = affected_biotype, required_respiration_type = affected_respiration_type)
if((data?["method"] & (INGEST|INHALE)) && holder_mob.stat != DEAD)
holder_mob.fakedeath(type)
+/datum/reagent/toxin/zombiepowder/on_mob_metabolize(mob/living/holder_mob)
+ . = ..()
+ zombify(holder_mob)
+
/datum/reagent/toxin/zombiepowder/on_mob_end_metabolize(mob/living/affected_mob)
. = ..()
affected_mob.cure_fakedeath(type)
-/datum/reagent/toxin/zombiepowder/expose_mob(mob/living/exposed_mob, methods, reac_volume, show_message, touch_protection)
- . = ..()
- if(!(methods & (INGEST|INHALE)))
- return
-
- var/datum/reagent/zombiepowder = exposed_mob.reagents.has_reagent(/datum/reagent/toxin/zombiepowder)
- if(zombiepowder)
- LAZYINITLIST(zombiepowder.data)
- zombiepowder.data["method"] |= (INGEST|INHALE)
-
/datum/reagent/toxin/zombiepowder/on_mob_life(mob/living/affected_mob, seconds_per_tick, times_fired)
. = ..()
if(HAS_TRAIT(affected_mob, TRAIT_FAKEDEATH) && HAS_TRAIT(affected_mob, TRAIT_DEATHCOMA))
diff --git a/code/modules/reagents/chemistry/recipes/drugs.dm b/code/modules/reagents/chemistry/recipes/drugs.dm
index 531b8b4ba40..c9a84809ffc 100644
--- a/code/modules/reagents/chemistry/recipes/drugs.dm
+++ b/code/modules/reagents/chemistry/recipes/drugs.dm
@@ -77,6 +77,46 @@
e.start(holder.my_atom)
holder.clear_reagents()
+/datum/chemical_reaction/meth_crystal //Since the meth is a cooled pharmaceutical solvent, this precipitates it into a solid.
+ required_reagents = list(/datum/reagent/drug/methamphetamine = 10, /datum/reagent/toxin/acid = 2)
+ mob_react = FALSE
+ reaction_flags = REACTION_INSTANT
+ reaction_tags = REACTION_TAG_EASY | REACTION_TAG_DRUG | REACTION_TAG_ORGAN | REACTION_TAG_DAMAGING
+
+/datum/chemical_reaction/meth_crystal/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume)
+ var/location = get_turf(holder.my_atom)
+
+ // Calculate purity ignoring sulfuric acid
+ var/total_nonacid = 0
+ var/meth_amt_in_mix = 0
+ for(var/datum/reagent/R in holder.reagent_list)
+ if(istype(R, /datum/reagent/toxin/acid))
+ continue // acid doesn't count against purity
+ total_nonacid += R.volume
+ if(istype(R, /datum/reagent/drug/methamphetamine))
+ meth_amt_in_mix += R.volume
+
+ var/purity = (total_nonacid > 0) ? (meth_amt_in_mix / total_nonacid) : 0.5 //All this tints the crystal above blue purity.
+
+ for(var/i in 1 to round(created_volume, CHEMICAL_VOLUME_ROUNDING))
+ var/obj/item/food/drug/meth_crystal/new_crystal = new(location)
+ new_crystal.pixel_x = rand(-6, 6)
+ new_crystal.pixel_y = rand(-6, 6)
+
+ var/effective_purity = 0
+ if(purity > 0.9)
+ effective_purity = (purity - 0.9) / 0.1
+
+ new_crystal.color = BlendRGB("#FAFAFA", "#78C8FA", effective_purity)
+
+ if(new_crystal.reagents)
+ new_crystal.reagents.clear_reagents()
+ var/meth_amt = 10
+ new_crystal.reagents.add_reagent(/datum/reagent/drug/methamphetamine, meth_amt)
+ var/imp_amt = round(meth_amt * (1 - purity) * 0.25, 0.1)
+ if(imp_amt > 0)
+ new_crystal.reagents.add_reagent(/datum/reagent/consumable/failed_reaction, imp_amt)
+
/datum/chemical_reaction/bath_salts
results = list(/datum/reagent/drug/bath_salts = 7)
required_reagents = list(/datum/reagent/toxin/bad_food = 1, /datum/reagent/saltpetre = 1, /datum/reagent/consumable/nutriment = 1, /datum/reagent/space_cleaner = 1, /datum/reagent/consumable/enzyme = 1, /datum/reagent/consumable/tea = 1, /datum/reagent/mercury = 1)
diff --git a/code/modules/reagents/reagent_containers/patch.dm b/code/modules/reagents/reagent_containers/patch.dm
index 8694499586e..b293a527e73 100644
--- a/code/modules/reagents/reagent_containers/patch.dm
+++ b/code/modules/reagents/reagent_containers/patch.dm
@@ -186,6 +186,11 @@
list_reagents = list(/datum/reagent/medicine/c2/aiuri = 2, /datum/reagent/medicine/granibitaluri = 8)
icon_state = "bandaid_burn"
+/obj/item/reagent_containers/applicator/patch/fent
+ name = "unmarked patch"
+ desc = "An unmarked, unlabeled transdermal patch for you to wear!"
+ list_reagents = list(/datum/reagent/toxin/fentanyl = 2)
+
/obj/item/reagent_containers/applicator/patch/synthflesh
name = "synthflesh patch"
desc = "Helps with brute and burn injuries. Slightly toxic. Three patches applied can restore a corpse husked by burns."
diff --git a/code/modules/research/designs/autolathe/materials.dm b/code/modules/research/designs/autolathe/materials.dm
index cc07a59ea7e..8fdc01234ce 100644
--- a/code/modules/research/designs/autolathe/materials.dm
+++ b/code/modules/research/designs/autolathe/materials.dm
@@ -130,3 +130,36 @@
RND_CATEGORY_INITIAL,
RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MATERIALS,
)
+
+/datum/design/bs_crystal
+ name = "Bluespace Crystal"
+ id = "bscrystal"
+ build_type = AUTOLATHE
+ materials = list(/datum/material/bluespace = SHEET_MATERIAL_AMOUNT)
+ build_path = /obj/item/stack/sheet/bluespace_crystal
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MATERIALS,
+ )
+
+/datum/design/mythril
+ name = "Mythril"
+ id = "mythril"
+ build_type = AUTOLATHE
+ materials = list(/datum/material/mythril = SHEET_MATERIAL_AMOUNT)
+ build_path = /obj/item/stack/sheet/mineral/mythril
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MATERIALS,
+ )
+
+/datum/design/alien_alloy
+ name = "Alien Alloy"
+ id = "allienalloy"
+ build_type = AUTOLATHE
+ materials = list(/datum/material/alloy/alien = SHEET_MATERIAL_AMOUNT)
+ build_path = /obj/item/stack/sheet/mineral/abductor
+ category = list(
+ RND_CATEGORY_INITIAL,
+ RND_CATEGORY_CONSTRUCTION + RND_SUBCATEGORY_CONSTRUCTION_MATERIALS,
+ )
diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm
index dd1298af175..f3fa22a6824 100644
--- a/code/modules/research/designs/misc_designs.dm
+++ b/code/modules/research/designs/misc_designs.dm
@@ -1162,3 +1162,21 @@
RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
+
+// Anomaly locked item
+
+/datum/design/space_furnace
+ name = "Space Furnace"
+ desc = "A heavy furnace capable of forming a temporary bubble that holds in breathable air. Requires a pyroclastic anomaly core to function."
+ id = "space_furnace"
+ build_type = PROTOLATHE | AWAY_LATHE
+ materials = list(
+ /datum/material/iron = SHEET_MATERIAL_AMOUNT*5,
+ /datum/material/silver = SHEET_MATERIAL_AMOUNT*2.5,
+ /datum/material/gold = SHEET_MATERIAL_AMOUNT * 2.5,
+ )
+ build_path = /obj/item/flashlight/lamp/space_bubble
+ category = list(
+ RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_SCIENCE
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
diff --git a/code/modules/research/techweb/nodes/research_nodes.dm b/code/modules/research/techweb/nodes/research_nodes.dm
index 41222be25bb..bf22457c7ba 100644
--- a/code/modules/research/techweb/nodes/research_nodes.dm
+++ b/code/modules/research/techweb/nodes/research_nodes.dm
@@ -80,6 +80,7 @@
"anomaly_refinery",
"anomaly_neutralizer",
"reactive_armour",
+ "space_furnace",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
announce_channels = list(RADIO_CHANNEL_SCIENCE)
diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm
index 3829de47517..119d238472b 100644
--- a/code/modules/surgery/bodyparts/dismemberment.dm
+++ b/code/modules/surgery/bodyparts/dismemberment.dm
@@ -214,10 +214,9 @@
arm_owner.dropItemToGround(arm_owner.get_item_for_held_index(held_index), 1)
. = ..()
if(arm_owner.handcuffed)
- arm_owner.handcuffed.forceMove(drop_location())
- arm_owner.handcuffed.dropped(arm_owner)
+ var/obj/item/lost_cuffs = arm_owner.handcuffed
arm_owner.set_handcuffed(null)
- arm_owner.update_handcuffed()
+ arm_owner.dropItemToGround(lost_cuffs, force = TRUE)
if(arm_owner.hud_used)
var/atom/movable/screen/inventory/hand/associated_hand = arm_owner.hud_used.hand_slots["[held_index]"]
associated_hand?.update_appearance()
@@ -230,13 +229,8 @@
. = ..()
if(special || !leg_owner)
return
- if(leg_owner.legcuffed)
- leg_owner.legcuffed.forceMove(drop_location())
- leg_owner.legcuffed.dropped(leg_owner)
- leg_owner.legcuffed = null
- leg_owner.update_worn_legcuffs()
- if(leg_owner.shoes)
- leg_owner.dropItemToGround(leg_owner.shoes, force = TRUE)
+ leg_owner.dropItemToGround(leg_owner.legcuffed, force = TRUE)
+ leg_owner.dropItemToGround(leg_owner.shoes, force = TRUE)
/obj/item/bodypart/head/drop_limb(special, dismembered, move_to_floor = TRUE)
if(!special)
diff --git a/code/modules/surgery/bodyparts/head_hair_and_lips.dm b/code/modules/surgery/bodyparts/head_hair_and_lips.dm
index 7479a4a0dea..daf99b4976d 100644
--- a/code/modules/surgery/bodyparts/head_hair_and_lips.dm
+++ b/code/modules/surgery/bodyparts/head_hair_and_lips.dm
@@ -11,17 +11,10 @@
LAZYNULL(hair_masks)
if(human_head_owner)
for(var/obj/item/worn_item in human_head_owner.get_equipped_items())
- if(worn_item.flags_inv & HIDEHAIR)
- hair_hidden = TRUE
- if(worn_item.flags_inv & HIDEFACIALHAIR)
- facial_hair_hidden = TRUE
if(worn_item.hair_mask)
LAZYSET(hair_masks, worn_item.hair_mask, TRUE)
-
- //invisibility and husk stuff
- if(HAS_TRAIT(human_head_owner, TRAIT_INVISIBLE_MAN) || HAS_TRAIT(human_head_owner, TRAIT_HUSK))
- hair_hidden = TRUE
- facial_hair_hidden = TRUE
+ hair_hidden = !!(human_head_owner.obscured_slots & HIDEHAIR)
+ facial_hair_hidden = !!(human_head_owner.obscured_slots & HIDEFACIALHAIR)
if(is_husked)
hair_hidden = TRUE
facial_hair_hidden = TRUE
diff --git a/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm
index c0a87e9bf90..00544aa97f2 100644
--- a/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm
@@ -65,7 +65,7 @@
var/uniform_compatible = isnull(worn_uniform) \
|| (worn_uniform.supports_variations_flags & DIGITIGRADE_VARIATIONS) \
|| !(worn_uniform.body_parts_covered & LEGS) \
- || (worn_suit?.flags_inv & HIDEJUMPSUIT) // If suit hides our jumpsuit, it doesn't matter if it squishes
+ || (obscured_slots & HIDEJUMPSUIT) // If suit hides our jumpsuit, it doesn't matter if it squishes
var/suit_compatible = isnull(worn_suit) \
|| (worn_suit.supports_variations_flags & DIGITIGRADE_VARIATIONS) \
diff --git a/code/modules/surgery/organs/external/_visual_organs.dm b/code/modules/surgery/organs/external/_visual_organs.dm
index fe1d4f5ead8..cebcc1f0853 100644
--- a/code/modules/surgery/organs/external/_visual_organs.dm
+++ b/code/modules/surgery/organs/external/_visual_organs.dm
@@ -123,12 +123,7 @@ Unlike normal organs, we're actually inside a persons limbs at all times
dyable = TRUE
/datum/bodypart_overlay/mutant/horns/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner)
- var/mob/living/carbon/human/human = bodypart_owner.owner
- if(!istype(human))
- return TRUE
- if((human.head?.flags_inv & HIDEHAIR) || (human.wear_mask?.flags_inv & HIDEHAIR))
- return FALSE
- return TRUE
+ return !(bodypart_owner.owner?.obscured_slots & HIDEHAIR)
/datum/bodypart_overlay/mutant/horns/get_global_feature_list()
return SSaccessories.sprite_accessories["horns"] // SKYRAT EDIT - Customization - ORIGINAL: return SSaccessories.horns_list
@@ -155,12 +150,7 @@ Unlike normal organs, we're actually inside a persons limbs at all times
feature_key = FEATURE_FRILLS
/datum/bodypart_overlay/mutant/frills/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner)
- var/mob/living/carbon/human/human = bodypart_owner.owner
- if(!istype(human))
- return TRUE
- if(!(human.head?.flags_inv & HIDEEARS))
- return TRUE
- return FALSE
+ return !(bodypart_owner.owner?.obscured_slots & HIDEEARS)
/datum/bodypart_overlay/mutant/frills/get_global_feature_list()
return SSaccessories.sprite_accessories["frills"] // SKYRAT EDIT - Customization - ORIGINAL: return SSaccessories.frills_list
@@ -189,12 +179,7 @@ Unlike normal organs, we're actually inside a persons limbs at all times
feature_key = FEATURE_SNOUT
/datum/bodypart_overlay/mutant/snout/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner)
- var/mob/living/carbon/human/human = bodypart_owner.owner
- if(!istype(human))
- return TRUE
- if((human.head?.flags_inv & HIDESNOUT) || (human.wear_mask?.flags_inv & HIDESNOUT))
- return FALSE
- return TRUE
+ return !(bodypart_owner.owner?.obscured_slots & HIDESNOUT)
/datum/bodypart_overlay/mutant/snout/get_global_feature_list()
return SSaccessories.sprite_accessories["snout"] // SKYRAT EDIT - Customization - ORIGINAL : return SSaccessories.snouts_list
@@ -287,12 +272,7 @@ Unlike normal organs, we're actually inside a persons limbs at all times
if(!.)
return
// BUBBER EDIT ADDITION END: Customization
- var/mob/living/carbon/human/human = bodypart_owner.owner
- if(!istype(human))
- return TRUE
- if(!(human.head?.flags_inv & HIDEANTENNAE))
- return TRUE
- return FALSE
+ return !(bodypart_owner.owner?.obscured_slots & HIDEANTENNAE)
///The leafy hair of a podperson
/obj/item/organ/pod_hair
@@ -338,9 +318,4 @@ Unlike normal organs, we're actually inside a persons limbs at all times
overlay.color = null
/datum/bodypart_overlay/mutant/pod_hair/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner)
- var/mob/living/carbon/human/human = bodypart_owner.owner
- if(!istype(human))
- return TRUE
- if((human.head?.flags_inv & HIDEHAIR) || (human.wear_mask?.flags_inv & HIDEHAIR))
- return FALSE
- return TRUE
+ return !(bodypart_owner.owner?.obscured_slots & HIDEHAIR)
diff --git a/code/modules/surgery/organs/external/spines.dm b/code/modules/surgery/organs/external/spines.dm
index 808106e9786..1ca48b3303e 100644
--- a/code/modules/surgery/organs/external/spines.dm
+++ b/code/modules/surgery/organs/external/spines.dm
@@ -38,12 +38,7 @@
return SSaccessories.sprite_accessories["spines"] // SKYRAT EDIT - Customization - ORIGINAL: return SSaccessories.spines_list
/datum/bodypart_overlay/mutant/spines/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner)
- var/mob/living/carbon/human/human = bodypart_owner.owner
- if(!istype(human))
- return TRUE
- if(human.wear_suit?.flags_inv & HIDEJUMPSUIT)
- return FALSE
- return TRUE
+ return !(bodypart_owner.owner?.obscured_slots & HIDEJUMPSUIT)
/datum/bodypart_overlay/mutant/spines/set_dye_color(new_color, obj/item/organ/tail/organ)
var/obj/item/organ/tail/tail = organ?.owner.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL)
diff --git a/code/modules/surgery/organs/external/tails.dm b/code/modules/surgery/organs/external/tails.dm
index acc68dd5d64..bcfc4951b2b 100644
--- a/code/modules/surgery/organs/external/tails.dm
+++ b/code/modules/surgery/organs/external/tails.dm
@@ -158,12 +158,7 @@
// SKYRAT EDIT ADDITION END
/datum/bodypart_overlay/mutant/tail/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner)
- var/mob/living/carbon/human/human = bodypart_owner.owner
- if(!istype(human))
- return TRUE
- if(human.wear_suit?.flags_inv & HIDEJUMPSUIT)
- return FALSE
- return TRUE
+ return !(bodypart_owner.owner?.obscured_slots & HIDEJUMPSUIT)
/obj/item/organ/tail/cat
name = "tail"
@@ -296,12 +291,7 @@
return (!isnull(tail_spine_key) ? "[tail_spine_key]_" : "") + (wagging ? "wagging_" : "") + sprite_datum.icon_state // Select the wagging state if appropriate
/datum/bodypart_overlay/mutant/tail_spines/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner)
- var/mob/living/carbon/human/human = bodypart_owner.owner
- if(!istype(human))
- return TRUE
- if(human.wear_suit?.flags_inv & HIDEJUMPSUIT)
- return FALSE
- return TRUE
+ return !(bodypart_owner.owner?.obscured_slots & HIDEJUMPSUIT)
/datum/bodypart_overlay/mutant/tail_spines/set_dye_color(new_color, obj/item/organ/organ)
dye_color = new_color //no update_body_parts() call, tail/set_dye_color will do it.
diff --git a/code/modules/surgery/organs/external/wings/functional_wings.dm b/code/modules/surgery/organs/external/wings/functional_wings.dm
index e1bb0b94039..9fd8da6545d 100644
--- a/code/modules/surgery/organs/external/wings/functional_wings.dm
+++ b/code/modules/surgery/organs/external/wings/functional_wings.dm
@@ -82,8 +82,8 @@
if(human.stat || human.body_position == LYING_DOWN || isnull(human.client))
return FALSE
//Jumpsuits have tail holes, so it makes sense they have wing holes too
- if(!cant_hide && human.wear_suit && ((human.wear_suit.flags_inv & HIDEJUMPSUIT) && (!human.wear_suit.species_exception || !is_type_in_list(src, human.wear_suit.species_exception))))
- to_chat(human, span_warning("Your suit blocks your wings from extending!"))
+ if(!cant_hide && (human.obscured_slots & HIDEJUMPSUIT))
+ to_chat(human, span_warning("Your clothing blocks your wings from extending!"))
return FALSE
var/turf/location = get_turf(human)
if(!location)
diff --git a/code/modules/surgery/organs/external/wings/moth_wings.dm b/code/modules/surgery/organs/external/wings/moth_wings.dm
index 703e5be3d41..12383051c7e 100644
--- a/code/modules/surgery/organs/external/wings/moth_wings.dm
+++ b/code/modules/surgery/organs/external/wings/moth_wings.dm
@@ -54,11 +54,7 @@
return FALSE
if(owner.has_gravity())
return FALSE
- if(ishuman(owner))
- var/mob/living/carbon/human/human_owner = owner
- if(human_owner.wear_suit?.flags_inv & HIDEMUTWINGS)
- return FALSE //Can't fly with hidden wings
- if(burnt)
+ if((owner.obscured_slots & HIDEMUTWINGS) || burnt)
return FALSE
var/datum/gas_mixture/current = owner.loc.return_air()
if(current && (current.return_pressure() >= ONE_ATMOSPHERE*0.85))
@@ -119,12 +115,7 @@
if(!.)
return
// BUBBER EDIT ADDITION END - Customization
- var/mob/living/carbon/human/human = bodypart_owner.owner
- if(!istype(human))
- return TRUE
- if(human.wear_suit?.flags_inv & HIDEMUTWINGS)
- return FALSE
- return TRUE
+ return !(bodypart_owner.owner?.obscured_slots & HIDEMUTWINGS)
/datum/bodypart_overlay/mutant/wings/moth/get_base_icon_state()
return burnt ? burn_datum.icon_state : sprite_datum.icon_state
diff --git a/code/modules/surgery/organs/external/wings/wings.dm b/code/modules/surgery/organs/external/wings/wings.dm
index 0c42a9784ca..a801f9720da 100644
--- a/code/modules/surgery/organs/external/wings/wings.dm
+++ b/code/modules/surgery/organs/external/wings/wings.dm
@@ -25,14 +25,4 @@
feature_key = FEATURE_WINGS
/datum/bodypart_overlay/mutant/wings/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner)
- var/mob/living/carbon/human/human = bodypart_owner.owner
- if(!istype(human))
- return TRUE
- if(!human.wear_suit)
- return TRUE
- if(!(human.wear_suit.flags_inv & HIDEJUMPSUIT))
- return TRUE
- if(human.wear_suit.species_exception && is_type_in_list(src, human.wear_suit.species_exception))
- return TRUE
- return FALSE
-
+ return !(bodypart_owner.owner?.obscured_slots & HIDEJUMPSUIT)
diff --git a/code/modules/surgery/organs/internal/ears/_ears.dm b/code/modules/surgery/organs/internal/ears/_ears.dm
index 061ff234de7..0c684e0d246 100644
--- a/code/modules/surgery/organs/internal/ears/_ears.dm
+++ b/code/modules/surgery/organs/internal/ears/_ears.dm
@@ -178,12 +178,7 @@
return SSaccessories.sprite_accessories["ears"] // SKYRAT EDIT - Customization - ORIGINAL: return SSaccessories.ears_list
/datum/bodypart_overlay/mutant/cat_ears/can_draw_on_bodypart(obj/item/bodypart/bodypart_owner)
- var/mob/living/carbon/human/human = bodypart_owner.owner
- if(!istype(human))
- return TRUE
- if((human.head?.flags_inv & HIDEHAIR) || (human.wear_mask?.flags_inv & HIDEHAIR))
- return FALSE
- return TRUE
+ return !(bodypart_owner.owner?.obscured_slots & HIDEHAIR)
/datum/bodypart_overlay/mutant/cat_ears/get_image(image_layer, obj/item/bodypart/limb)
var/mutable_appearance/base_ears = ..()
diff --git a/code/modules/surgery/organs/internal/eyes/_eyes.dm b/code/modules/surgery/organs/internal/eyes/_eyes.dm
index 937b3a7b3a5..70c284aa2db 100644
--- a/code/modules/surgery/organs/internal/eyes/_eyes.dm
+++ b/code/modules/surgery/organs/internal/eyes/_eyes.dm
@@ -275,8 +275,7 @@
var/mutable_appearance/eye_right = mutable_appearance(eye_icon, "[eye_icon_state]_r", -eyes_layer, parent) // SKYRAT EDIT CHANGE - Customization - ORIGINAL: var/mutable_appearance/eye_right = mutable_appearance('icons/mob/human/human_face.dmi', "[eye_icon_state]_r", -EYES_LAYER, parent)
var/list/overlays = list(eye_left, eye_right)
- var/obscured = parent.check_obscured_slots()
- if(overlay_ignore_lighting && !(obscured & ITEM_SLOT_EYES))
+ if(overlay_ignore_lighting && !(parent.obscured_slots & HIDEEYES))
overlays += emissive_appearance(eye_left.icon, eye_left.icon_state, parent, -EYES_LAYER, alpha = eye_left.alpha)
overlays += emissive_appearance(eye_right.icon, eye_right.icon_state, parent, -EYES_LAYER, alpha = eye_right.alpha)
@@ -470,7 +469,8 @@
/// Animates one eyelid at a time, thanks BYOND and thanks animation chains
/obj/item/organ/eyes/proc/animate_eyelid(obj/effect/abstract/eyelid_effect/eyelid, mob/living/carbon/human/parent, sync_blinking = TRUE, list/anim_times = null)
. = list()
-
+ if(isnull(eyelid)) // Can't blink if we don't have an eyelid
+ return
var/prevent_loops = HAS_TRAIT(parent, TRAIT_PREVENT_BLINK_LOOPS)
animate(eyelid, alpha = 0, time = 0, loop = (prevent_loops ? 0 : -1))
diff --git a/code/modules/unit_tests/screenshots/screenshot_digi_leg_test.png b/code/modules/unit_tests/screenshots/screenshot_digi_leg_test.png
index a8e3dfe648a..8fb16d008fe 100644
Binary files a/code/modules/unit_tests/screenshots/screenshot_digi_leg_test.png and b/code/modules/unit_tests/screenshots/screenshot_digi_leg_test.png differ
diff --git a/code/modules/unit_tests/strippable.dm b/code/modules/unit_tests/strippable.dm
index 47a76a1ca75..36083804b15 100644
--- a/code/modules/unit_tests/strippable.dm
+++ b/code/modules/unit_tests/strippable.dm
@@ -25,7 +25,6 @@
var/handcuffs = allocate(/obj/item/restraints/handcuffs, user)
user.forceMove(target.loc)
user.set_handcuffed(handcuffs)
- user.update_handcuffed()
TEST_ASSERT_EQUAL(strip_menu.ui_status(user, ui_state), UI_UPDATE, "Being within range but cuffed was not update-only.")
user.set_handcuffed(null)
qdel(handcuffs)
diff --git a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm
index c3545fc0edf..d4dbc1257f6 100644
--- a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm
+++ b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm
@@ -668,7 +668,6 @@
if(autocuff && iscarbon(target))
var/mob/living/carbon/carbontarget = target
carbontarget.set_handcuffed(new cuff_type(carbontarget))
- carbontarget.update_handcuffed()
return
if(istype(target, /obj/machinery/door))
diff --git a/code/modules/vehicles/mecha/mecha_defense.dm b/code/modules/vehicles/mecha/mecha_defense.dm
index 5bb9084c550..3dcd5835b2e 100644
--- a/code/modules/vehicles/mecha/mecha_defense.dm
+++ b/code/modules/vehicles/mecha/mecha_defense.dm
@@ -269,6 +269,8 @@
return part.try_attach_part(user, src, FALSE)
if(is_wire_tool(tool) && (mecha_flags & PANEL_OPEN))
+ if(user.combat_mode)
+ return
if(wires.interact(user))
return ITEM_INTERACT_SUCCESS
diff --git a/code/modules/vending/medical.dm b/code/modules/vending/medical.dm
index 98ad3e37376..79bc6a33b44 100644
--- a/code/modules/vending/medical.dm
+++ b/code/modules/vending/medical.dm
@@ -91,6 +91,8 @@
/obj/item/reagent_containers/cup/bottle/salglu_solution = 3,
/obj/item/reagent_containers/cup/bottle/toxin = 3,
/obj/item/reagent_containers/syringe/antiviral = 6,
+ /obj/item/reagent_containers/medigel/libital = 2,
+ /obj/item/reagent_containers/medigel/aiuri = 2,
/obj/item/reagent_containers/medigel/sterilizine = 6, // BUBBER EDIT CHANGE - ORIGINAL: 3
)
contraband = list(
diff --git a/code/modules/vending/medical_wall.dm b/code/modules/vending/medical_wall.dm
index 53027e5b7df..0b7bc91aac2 100644
--- a/code/modules/vending/medical_wall.dm
+++ b/code/modules/vending/medical_wall.dm
@@ -6,19 +6,20 @@
panel_type = "wallmed-panel"
density = FALSE
products = list(
- /obj/item/stack/medical/bandage = 1,
- /obj/item/stack/medical/ointment = 1,
- /obj/item/stack/medical/gauze = 1,
- /obj/item/reagent_containers/hypospray/medipen/ekit = 1,
- /obj/item/healthanalyzer/simple = 1,
+ /obj/item/stack/medical/bandage = 4,
+ /obj/item/stack/medical/ointment = 2,
+ /obj/item/reagent_containers/applicator/pill/multiver = 2,
+ /obj/item/stack/medical/gauze = 4,
+ /obj/item/reagent_containers/hypospray/medipen/ekit = 2,
+ /obj/item/healthanalyzer/simple = 2,
)
contraband = list(
/obj/item/storage/box/bandages = 1,
/obj/item/storage/box/gum/happiness = 1,
)
premium = list(
- /obj/item/reagent_containers/applicator/patch/libital = 1,
- /obj/item/reagent_containers/applicator/patch/aiuri = 1,
+ /obj/item/reagent_containers/applicator/patch/libital = 2,
+ /obj/item/reagent_containers/applicator/patch/aiuri = 2,
)
refill_canister = /obj/item/vending_refill/wallmed
default_price = PAYCHECK_CREW * 0.3 // Cheap since crew should be able to affort it in emergency situations
diff --git a/code/modules/vending/vendor/inventory.dm b/code/modules/vending/vendor/inventory.dm
index 25b133025e0..8955e1002ab 100644
--- a/code/modules/vending/vendor/inventory.dm
+++ b/code/modules/vending/vendor/inventory.dm
@@ -273,7 +273,7 @@
var/datum/bank_account/account = paying_id_card.registered_account
//deduct money from person
- if(!discountless && account.account_job.paycheck_department == payment_department)
+ if(!discountless && account.account_job?.paycheck_department == payment_department)
price_to_use = max(round(price_to_use * DEPARTMENT_DISCOUNT), 1) //No longer free, but signifigantly cheaper.
if(attempt_charge(src, mob_paying, price_to_use) & COMPONENT_OBJ_CANCEL_CHARGE)
speak("You do not possess the funds to purchase [product_to_vend.name].")
diff --git a/code/modules/wiremod/core/component_printer.dm b/code/modules/wiremod/core/component_printer.dm
index bece40978eb..c1f39f3d48d 100644
--- a/code/modules/wiremod/core/component_printer.dm
+++ b/code/modules/wiremod/core/component_printer.dm
@@ -390,7 +390,7 @@
. = ..()
if (.)
return
- var/obj/item/card/id/advanced/user_card = astype(usr, /mob/living)?.get_idcard()
+ var/alist/user_data = ID_DATA(usr)
switch (action)
if ("print")
@@ -401,14 +401,14 @@
var/list/design = scanned_designs[design_id]
- if (!materials.can_use_resource(user_card))
+ if (!materials.can_use_resource(user_data = user_data))
return TRUE
if (!materials.mat_container.has_materials(design["materials"], efficiency_coeff))
say("Not enough materials.")
return TRUE
- materials.use_materials(design["materials"], efficiency_coeff, 1, "processed", design["name"], user_card)
+ materials.use_materials(design["materials"], efficiency_coeff, 1, design["name"], design["materials"], user_data = user_data)
print_module(design)
balloon_alert_to_viewers("printed [design["name"]]")
if ("remove_mat")
diff --git a/dependencies.sh b/dependencies.sh
index 910fc9d0281..56596e18d39 100644
--- a/dependencies.sh
+++ b/dependencies.sh
@@ -17,7 +17,7 @@ export NODE_VERSION_LTS=22.11.0
export BUN_VERSION=1.2.16
# SpacemanDMM git tag
-export SPACEMAN_DMM_VERSION=suite-1.10
+export SPACEMAN_DMM_VERSION=suite-1.11
# Python version for mapmerge and other tools
export PYTHON_VERSION=3.9.0
diff --git a/html/changelogs/AutoChangeLog-pr-92803.yml b/html/changelogs/AutoChangeLog-pr-92803.yml
deleted file mode 100644
index 05b0171c189..00000000000
--- a/html/changelogs/AutoChangeLog-pr-92803.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SmArtKar"
-delete-after: True
-changes:
- - admin: "Clientless mobs no longer log their emotes"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-92849.yml b/html/changelogs/AutoChangeLog-pr-92849.yml
new file mode 100644
index 00000000000..d0b4abd9a06
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-92849.yml
@@ -0,0 +1,6 @@
+author: "SyncIt21"
+delete-after: True
+changes:
+ - qol: "hand crafted air sensors now auto connect to input & output ports if they are located within a 4 tile radius from it"
+ - qol: "atmos control monitors now locate all air sensors nearest to in on that same z level meaning you can have multiple air sensors of the same type on the same map"
+ - refactor: "refactored how air sensors & atmos monitors connect to each other. Please report any atmos computers that have missing input valves/output ports on their connected air sensors or those that don't list any air sensors at all on github"
\ No newline at end of file
diff --git a/html/changelogs/archive/2025-09.yml b/html/changelogs/archive/2025-09.yml
index fd0e72de5eb..12b37290680 100644
--- a/html/changelogs/archive/2025-09.yml
+++ b/html/changelogs/archive/2025-09.yml
@@ -152,3 +152,136 @@
- bugfix: prevents eaten remote signalers from following you between bodies
nikothedude:
- bugfix: Player-controlled medbots can now inject chloral on healthy targets
+2025-09-08:
+ Aliceee2ch:
+ - bugfix: Fixed oversight from "Material tab for the autolathe" PR. You can now
+ eject BS crystals, allien alloy and mythril from autolathe.
+ - bugfix: Fixed wires interaction and fixed mech multitool/wirecutters interaction.
+ Krysonism:
+ - balance: vatbeasts, mega arachnids and butterbears now attack much quicker, in
+ line with their old player controlled attack speed.
+ Melber:
+ - balance: Advanced first aid kits in the bridge are back to being normal first
+ aid kids
+ - balance: Emergency Nanomed vendors have larger stocks and better supplies
+ - rscadd: Replaces a majority of Emergency Nanomeds on stations and shuttles with
+ Deforest First Aid Stations. Left clicking these stationary machines will heal
+ minor damage and blood loss over time - at a (small) price. Right clicking them
+ will provide gauze, also for a price. All costs are waived on shuttles, during
+ red alert, or for medical staff. You can also click-drag to have other mobs
+ use the machine. However, robotic limbs need not apply.
+ Melbert:
+ - rscdel: Golems which somehow manage to grow wings and somehow manage to equip
+ something that covers their jumpsuit can no longer fly. (Seriously, this will
+ not affect anyone)
+ - refactor: Refactored clothing obscurity entirely. Items should be a loooot more
+ consistent and what covers what, and should update a lot snappier. As always,
+ report any oddities, like mysteriously disappearing articles of clothing, hair,
+ or species parts
+ SmArtKar:
+ - bugfix: Fixed organ fishing blocking alternate material rod loot from spawning
+ - rscadd: Toilets now require plumbing or water reclaimers to function, and can
+ get clogged by small items.
+ - bugfix: Trying to use plungers on plumbing objects will no longer hit them after
+ finishing the interaction.
+ - code_imp: Updated toilet item interaction code
+ - bugfix: Fixed mobs without guaranteed butcher drops not dropping any crusher trophies
+ - admin: Clientless mobs no longer log their emotes
+ Stonetear:
+ - refactor: MODsuit module code now knows who clicked the activation button.
+ SyncIt21:
+ - bugfix: ore silo id restriction button in the UI now changes text & colour correctly
+ - bugfix: ore silo id restriction is now only enforced for station loaded silo and
+ is optional in other cases
+ - bugfix: no runtime for vendors using department cards
+ - bugfix: the map reader now reads null & 0 values into lists
+ - bugfix: the map reader now parses associative lists(maps/alists) correctly in
+ cases where = sign is embedded within a string
+ - bugfix: the map reader now parses associative lists(maps/alists) who's values
+ themselves can be lists
+ - bugfix: the map reader can now parse nested lists to any degree
+ - bugfix: Chemmaster highlights selected icon & has its window scaled up
+ - bugfix: zombie powder works through inhale(now faster acting)/ingest again
+ Webcomicartist:
+ - qol: The slot machine spins faster, allowing for more time-efficient gambling.
+ Xander3359:
+ - refactor: change some attack procs to use item interaction
+ arbuzik456:
+ - rscadd: Added tongue emote mechanic where you can stick out your tongue
+ lelandkemble:
+ - bugfix: Arcade machine experiment now succeeds on output rather than input of
+ tickets
+ - spellcheck: Fixes a bunch of manual's formatting, and updates Chef Recipes
+ - bugfix: Escape pods no longer have planetary gravity
+ - bugfix: tooltip for secure briefcases now shows correct button.
+ - qol: You can now hear heart attacks with a stethoscope
+ loganuk:
+ - bugfix: Stops coffee machines having melee god mode
+ - qol: Right clicking on coffee machine without coffee pot has correct message
+ necromanceranne:
+ - balance: The Multiphase X-01 has 12 lethal shots to match the capacity of the
+ standard energy gun.
+ - qol: Lets you rename the smoothbore disabler.
+ pebis36012:
+ - bugfix: Splattercasting touch spells no longer give infinite blood
+ sushi:
+ - bugfix: force say works again
+ - bugfix: crates and other objects causing elevation will no longer leave behind
+ magic elevating turfs upon destruction
+ - rscadd: recyclers will now deconstruct non-item objects that they eat instead
+ of just deleting them
+ uaioy:
+ - balance: wizard modsuit shield recharges slower
+ vinylspiders:
+ - bugfix: dead bodies in the morgue will no longer try to blink
+2025-09-09:
+ Bisar:
+ - bugfix: The .tsx code for Ore Silo logs will now catch nulls instead of TBing.
+ - bugfix: Fixed ANOTHER place where user_data for an ore silo log wasn't set correctly.
+ JohnFulpWillard, sprites by PopLop:
+ - rscadd: Added a new pyroclastic anomaly locked item, the Space Furnace. Grants
+ space immunity to people nearby while active.
+ Xander3359:
+ - balance: Downgraded CE tools to T1 instead of T2
+ lelandkemble:
+ - rscdel: you can't grill a bone into a steak anymore
+ loganuk:
+ - bugfix: Fixes using syndie graffiti spray/crayon writing while zero grav drifting
+ nikothedude:
+ - rscadd: 2 aiuri and 2 libital cans to nanodrug plus
+ - rscadd: Asthma quirk, based on IRL asthma
+ - rscadd: Inhalers, a new reagent administering method that uses INHALE
+ - rscadd: Albuterol, a new reagent that increases the amount of gas you inhale by
+ 40%
+ - balance: Inverse convermol now forms once the reaction is done, not on metabolize
+ sushi:
+ - rscadd: water vapor on a turf will now also wash radiation off of the items on
+ it
+2025-09-10:
+ Ghommie:
+ - balance: sand is now made of sand and not glass. Get a welder if you plan to shove
+ it into a protolathe.
+ - rscdel: Removed now useless sand blocks.
+ - bugfix: Crafting recipes with tools such as wirecutters, wrenches, screwdrivers
+ etc. should take the right amount of time to complete.
+ SmArtKar:
+ - qol: Significantly improved MODtether behavior, they should be easier to work
+ with now.
+ - bugfix: Fixed multiple MODtethers bugs and a potential server crash related to
+ them.
+ - bugfix: Fixed foam sometimes passing through directional windows.
+ SyncIt21:
+ - bugfix: map export won't break exported gas strings & other that depend on semicolon
+ - code_imp: non ascii chars inside lists in map files can be read without error
+ loganuk:
+ - map: Catwalk lower Science changes [C.A.T]
+ massaheartsu:
+ - rscadd: Added meth, opium, and their production! Also added to black market uplink.
+ - rscadd: Added a craftable glass pipe.
+ - rscadd: Added to contraband spawners.
+ - qol: Can now insert any drug item into a pipe.
+ - bugfix: Spacemen can now smoke meth without exploding!!
+ timothymtorres:
+ - bugfix: Santa has put cargo in his very naughty list for spam producing his presents
+ by dumpster diving. This fixes Christmas presents (and other holiday items)
+ from spawning inside dumpsters.
diff --git a/icons/effects/fields.dmi b/icons/effects/fields.dmi
index 1e428707876..a9394b6ab06 100644
Binary files a/icons/effects/fields.dmi and b/icons/effects/fields.dmi differ
diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi
index d73e28d1aec..48d7f64893e 100644
Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ
diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi
index 7c2d6d324a5..ed570225bdc 100644
Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ
diff --git a/icons/mob/human/emote_visuals.dmi b/icons/mob/human/emote_visuals.dmi
index 8a29603850f..8880693066d 100644
Binary files a/icons/mob/human/emote_visuals.dmi and b/icons/mob/human/emote_visuals.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index f38ce001619..8dacbfca894 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index 4639b290fe3..cb1a99ea114 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/obj/cigarettes.dmi b/icons/obj/cigarettes.dmi
index 7b155f73216..1b8a7f58af0 100644
Binary files a/icons/obj/cigarettes.dmi and b/icons/obj/cigarettes.dmi differ
diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi
index d5fc9993549..4d5ec832827 100644
Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ
diff --git a/icons/obj/machines/wall_healer.dmi b/icons/obj/machines/wall_healer.dmi
new file mode 100644
index 00000000000..f09ad6f7339
Binary files /dev/null and b/icons/obj/machines/wall_healer.dmi differ
diff --git a/icons/obj/medical/drugs.dmi b/icons/obj/medical/drugs.dmi
index 21c52523ed1..8afa6d309d5 100644
Binary files a/icons/obj/medical/drugs.dmi and b/icons/obj/medical/drugs.dmi differ
diff --git a/icons/obj/storage/box.dmi b/icons/obj/storage/box.dmi
index 58b67dc3779..23e5a8428a3 100644
Binary files a/icons/obj/storage/box.dmi and b/icons/obj/storage/box.dmi differ
diff --git a/strings/tips.txt b/strings/tips.txt
index 6bd118ffb07..0eba101a1c0 100644
--- a/strings/tips.txt
+++ b/strings/tips.txt
@@ -317,3 +317,4 @@ As the Captain, your sabre deals extra damage to Assistants (as long as they hav
You can automatically extract and retract arm implants by 'activating' the empty hand they're on. This includes integrated toolsets, cursed katanas, and vorpal scythes.
You can combine the Carpet reagent with various different reagents, such as Oil and Cyanide, to create unique carpet types.
You can bake a birthday cake and then microwave it to create a legendary cake hat. You can then combine it with an energy sword to create an energy cake.
+You can quickly remove radiation from items in a room by releasing water vapor into the air around them (including worn items).
diff --git a/tgstation.dme b/tgstation.dme
index f031eecf254..84f77ec5ed0 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1946,8 +1946,10 @@
#include "code\datums\proximity_monitor\field.dm"
#include "code\datums\proximity_monitor\proximity_monitor.dm"
#include "code\datums\proximity_monitor\fields\ai_target_tracking.dm"
+#include "code\datums\proximity_monitor\fields\bubble.dm"
#include "code\datums\proximity_monitor\fields\gravity.dm"
#include "code\datums\proximity_monitor\fields\heretic_arena.dm"
+#include "code\datums\proximity_monitor\fields\space_protection.dm"
#include "code\datums\proximity_monitor\fields\timestop.dm"
#include "code\datums\proximity_monitor\fields\void_storm.dm"
#include "code\datums\proximity_monitor\fields\projectile_dampener\projectile_dampener.dm"
@@ -2352,6 +2354,7 @@
#include "code\game\machinery\teambuilder.dm"
#include "code\game\machinery\teleporter.dm"
#include "code\game\machinery\transformer.dm"
+#include "code\game\machinery\wall_healer.dm"
#include "code\game\machinery\washing_machine.dm"
#include "code\game\machinery\wishgranter.dm"
#include "code\game\machinery\camera\camera.dm"
diff --git a/tgui/packages/tgui-say/TguiSay.tsx b/tgui/packages/tgui-say/TguiSay.tsx
index 785891e9f41..fc3cdc2a34a 100644
--- a/tgui/packages/tgui-say/TguiSay.tsx
+++ b/tgui/packages/tgui-say/TguiSay.tsx
@@ -27,13 +27,11 @@ export function TguiSay() {
const chatHistory = useRef(new ChatHistory());
const messages = useRef(byondMessages);
const scale = useRef(true);
+ const currentPrefix = useRef(null);
// I initially wanted to make these an object or a reducer, but it's not really worth it.
// You lose the granulatity and add a lot of boilerplate.
const [buttonContent, setButtonContent] = useState('');
- const [currentPrefix, setCurrentPrefix] = useState<
- keyof typeof RADIO_PREFIXES | null
- >(null);
const [lightMode, setLightMode] = useState(false);
const [maxLength, setMaxLength] = useState(1024);
const [size, setSize] = useState(WindowSize.Small);
@@ -42,6 +40,10 @@ export function TguiSay() {
const position = useRef([window.screenX, window.screenY]);
const isDragging = useRef(false);
+ function setCurrentPrefix(prefix: keyof typeof RADIO_PREFIXES | null): void {
+ currentPrefix.current = prefix;
+ }
+
function handleArrowKeys(direction: KEY.Up | KEY.Down): void {
const chat = chatHistory.current;
const iterator = channelIterator.current;
@@ -77,10 +79,10 @@ export function TguiSay() {
// User is on a chat history message
if (!chat.isAtLatest()) {
chat.reset();
- setButtonContent(currentPrefix ?? iterator.current());
+ setButtonContent(currentPrefix.current ?? iterator.current());
// Empty input, resets the channel
- } else if (currentPrefix && iterator.isSay() && value?.length === 0) {
+ } else if (currentPrefix.current && iterator.isSay() && value?.length === 0) {
setCurrentPrefix(null);
setButtonContent(iterator.current());
}
@@ -123,7 +125,7 @@ export function TguiSay() {
function handleEnter(): void {
const iterator = channelIterator.current;
- const prefix = currentPrefix ?? '';
+ const prefix = currentPrefix.current ?? '';
if (value?.length && value.length < maxLength) {
chatHistory.current.add(value);
@@ -138,15 +140,16 @@ export function TguiSay() {
function handleForceSay(): void {
const iterator = channelIterator.current;
+ const currentValue = innerRef.current?.value;
// Only force say if we're on a visible channel and have typed something
- if (!value || iterator.isVisible()) return;
+ if (!currentValue || !iterator.isVisible()) return;
- const prefix = currentPrefix ?? '';
- const grunt = iterator.isSay() ? prefix + value : value;
+ const prefix = currentPrefix.current ?? '';
+ const grunt = iterator.isSay() ? prefix + currentValue : currentValue;
messages.current.forceSayMsg(grunt, iterator.current());
- unloadChat();
+ handleClose();
}
function handleIncrementChannel(): void {
@@ -162,9 +165,9 @@ export function TguiSay() {
const iterator = channelIterator.current;
let newValue = event.currentTarget.value;
- const newPrefix = getPrefix(newValue) || currentPrefix;
+ const newPrefix = getPrefix(newValue) || currentPrefix.current;
// Handles switching prefixes
- if (newPrefix && newPrefix !== currentPrefix) {
+ if (newPrefix && newPrefix !== currentPrefix.current) {
setButtonContent(RADIO_PREFIXES[newPrefix]);
setCurrentPrefix(newPrefix);
newValue = newValue.slice(3);
@@ -268,7 +271,7 @@ export function TguiSay() {
const theme =
(lightMode && 'lightMode') ||
- (currentPrefix && RADIO_PREFIXES[currentPrefix]) ||
+ (currentPrefix.current && RADIO_PREFIXES[currentPrefix.current]) ||
channelIterator.current.current();
return (
diff --git a/tgui/packages/tgui/interfaces/ChemMaster.tsx b/tgui/packages/tgui/interfaces/ChemMaster.tsx
index 94b6f2f34d0..77767a078bc 100644
--- a/tgui/packages/tgui/interfaces/ChemMaster.tsx
+++ b/tgui/packages/tgui/interfaces/ChemMaster.tsx
@@ -5,8 +5,8 @@ import {
Button,
ColorBox,
Divider,
- DmIcon,
Icon,
+ ImageButton,
LabeledList,
NumberInput,
ProgressBar,
@@ -406,36 +406,28 @@ const ContainerButton = (props: CategoryButtonProps) => {
key={container.ref}
content={`${capitalize(container.name)}\xa0(${container.volume}u)`}
>
-
+ />
);
};
diff --git a/tgui/packages/tgui/interfaces/DynamicTester.tsx b/tgui/packages/tgui/interfaces/DynamicTester.tsx
index af86fff955b..13cd36fd392 100644
--- a/tgui/packages/tgui/interfaces/DynamicTester.tsx
+++ b/tgui/packages/tgui/interfaces/DynamicTester.tsx
@@ -70,7 +70,7 @@ export const DynamicTester = () => {
act('set_tier', { tier: e })}
@@ -81,7 +81,7 @@ export const DynamicTester = () => {
act('set_num_players', { num_players: e })}
diff --git a/tgui/packages/tgui/interfaces/ListInputWindow/ListInputModal.tsx b/tgui/packages/tgui/interfaces/ListInputWindow/ListInputModal.tsx
index fb18ae8ad37..7a0a7ba20c2 100644
--- a/tgui/packages/tgui/interfaces/ListInputWindow/ListInputModal.tsx
+++ b/tgui/packages/tgui/interfaces/ListInputWindow/ListInputModal.tsx
@@ -9,7 +9,6 @@ import {
KEY_Z,
} from 'tgui-core/keycodes';
-import { useBackend } from '../../backend';
import { InputButtons } from '../common/InputButtons';
type ListInputModalProps = {
@@ -21,8 +20,6 @@ type ListInputModalProps = {
};
export const ListInputModal = (props: ListInputModalProps) => {
- const { act } = useBackend();
-
const { items = [], default_item, message, on_selected, on_cancel } = props;
const [selected, setSelected] = useState(items.indexOf(default_item));
@@ -143,6 +140,7 @@ export const ListInputModal = (props: ListInputModalProps) => {
{
autoFocus
autoSelect
fluid
- onEnter={() => {
- act('submit', { entry: filteredItems[selected] });
- }}
+ onEnter={() => on_selected(filteredItems[selected])}
onChange={onSearch}
placeholder="Search..."
value={searchQuery}
@@ -173,14 +169,28 @@ export const ListInputModal = (props: ListInputModalProps) => {
);
};
+interface ListDisplayProps {
+ filteredItems: string[];
+ onClick: (itemIndex: number) => void;
+ onDoubleClick: (entry: string) => void;
+ onFocusSearch: () => void;
+ searchBarVisible: boolean;
+ selected: number;
+}
+
/**
* Displays the list of selectable items.
* If a search query is provided, filters the items.
*/
-const ListDisplay = (props) => {
- const { act } = useBackend();
- const { filteredItems, onClick, onFocusSearch, searchBarVisible, selected } =
- props;
+const ListDisplay = (props: ListDisplayProps) => {
+ const {
+ filteredItems,
+ onClick,
+ onDoubleClick,
+ onFocusSearch,
+ searchBarVisible,
+ selected,
+ } = props;
return (
@@ -190,13 +200,10 @@ const ListDisplay = (props) => {
className="candystripe"
color="transparent"
fluid
- id={index}
+ id={`${index}`}
key={index}
onClick={() => onClick(index)}
- onDoubleClick={(event) => {
- event.preventDefault();
- act('submit', { entry: filteredItems[selected] });
- }}
+ onDoubleClick={() => onDoubleClick(item)}
onKeyDown={(event) => {
const keyCode = window.event ? event.which : event.keyCode;
if (searchBarVisible && keyCode >= KEY_A && keyCode <= KEY_Z) {
diff --git a/tgui/packages/tgui/interfaces/OreSilo.tsx b/tgui/packages/tgui/interfaces/OreSilo.tsx
index 9e48a87c0ae..ad6ce50d556 100644
--- a/tgui/packages/tgui/interfaces/OreSilo.tsx
+++ b/tgui/packages/tgui/interfaces/OreSilo.tsx
@@ -68,7 +68,7 @@ type Data = {
logs: Log[];
// Banned users is a list of bank account datum IDs
banned_users: number[];
- id_required: BooleanLike;
+ ID_required: BooleanLike;
};
const actionToColor = {
@@ -238,20 +238,22 @@ type LogsListProps = {
const RestrictButton = () => {
const { act, data } = useBackend();
- const { id_required } = data;
+ const { ID_required } = data;
return (
-
+
+
+
);
};
@@ -332,10 +334,10 @@ const LogsList = (props: LogsListProps) => {
const UserItem = (props: UserData) => {
const {
- name,
- age,
- assignment,
- account_id,
+ name = 'NAME_RES_FAIL',
+ age = 0,
+ assignment = 'ASSGN-RES_FAIL',
+ account_id = 0,
account_holder,
account_assignment,
accesses,
diff --git a/tools/UpdatePaths/Scripts/92849_atmos_monitor_sensor_connect.txt b/tools/UpdatePaths/Scripts/92849_atmos_monitor_sensor_connect.txt
new file mode 100644
index 00000000000..17dda3a68db
--- /dev/null
+++ b/tools/UpdatePaths/Scripts/92849_atmos_monitor_sensor_connect.txt
@@ -0,0 +1,3 @@
+/obj/machinery/atmospherics/components/unary/vent_pump/@SUBTYPES{chamber_id=@ANY} : /obj/machinery/atmospherics/components/unary/vent_pump/@SUBTYPES{@OLD;chamber_id=@SKIP}
+/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/@SUBTYPES{chamber_id=@ANY} : /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/@SUBTYPES{@OLD;chamber_id=@SKIP}
+