Step One: Nerd Co SpySpeks tm upon your face.
-Step Two: Place the included "ProfitProtektor tm" camera assembly in a place of your choosing - make sure to make heavy use of it's inconspicous design!
+Step Two: Place the included "ProfitProtektor tm" camera assembly in a place of your choosing - make sure to make heavy use of its inconspicous design!
Step Three: Press the "Activate Remote View" Button on the side of your SpySpeks tm to open a movable camera display in the corner of your vision, it's just that easy!
TROUBLESHOOTING
My SpySpeks tm Make a shrill beep while attempting to use!
diff --git a/code/game/objects/items/drug_items.dm b/code/game/objects/items/drug_items.dm
index f313dad5f74ea8..d25c957145561e 100644
--- a/code/game/objects/items/drug_items.dm
+++ b/code/game/objects/items/drug_items.dm
@@ -18,6 +18,10 @@
icon_state = "saturnx_glob" //tell kryson to sprite two more variants in the future.
food_reagents = list(/datum/reagent/drug/saturnx = 10)
+/obj/item/food/drug/saturnx/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_CONTRABAND, INNATE_TRAIT)
+
/obj/item/food/drug/moon_rock
name = "moon rock"
desc = "A small hard lump of kronkaine freebase.\nIt is said the average kronkaine addict causes as much criminal damage as four cat burglars, two arsonists and one rabid pit bull terrier combined."
@@ -28,6 +32,7 @@
. = ..()
icon_state = pick("moon_rock1", "moon_rock2", "moon_rock3")
AddElement(/datum/element/swabable, CELL_LINE_TABLE_MOONICORN, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5)
+ ADD_TRAIT(src, TRAIT_CONTRABAND, INNATE_TRAIT)
/obj/item/reagent_containers/cup/blastoff_ampoule
name = "bLaSToFF ampoule" //stylized name
@@ -70,3 +75,7 @@
SplashReagents(hit_atom, TRUE)
qdel(src)
hit_atom.Bumped(ampoule_shard)
+
+/obj/item/reagent_containers/cup/blastoff_ampoule/Initialize(mapload, vol)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_CONTRABAND, INNATE_TRAIT)
diff --git a/code/game/objects/items/dualsaber.dm b/code/game/objects/items/dualsaber.dm
index 183a7d413beeeb..9231bf191c2ad8 100644
--- a/code/game/objects/items/dualsaber.dm
+++ b/code/game/objects/items/dualsaber.dm
@@ -58,10 +58,9 @@
/// Triggered on wield of two handed item
/// Specific hulk checks due to reflection chance for balance issues and switches hitsounds.
/obj/item/dualsaber/proc/on_wield(obj/item/source, mob/living/carbon/user)
- if(user?.has_dna())
- if(user.dna.check_mutation(/datum/mutation/human/hulk))
- to_chat(user, span_warning("You lack the grace to wield this!"))
- return COMPONENT_TWOHANDED_BLOCK_WIELD
+ if(user && HAS_TRAIT(user, TRAIT_HULK))
+ to_chat(user, span_warning("You lack the grace to wield this!"))
+ return COMPONENT_TWOHANDED_BLOCK_WIELD
update_weight_class(w_class_on)
hitsound = 'sound/weapons/blade1.ogg'
START_PROCESSING(SSobj, src)
@@ -125,12 +124,11 @@
. = ..()
/obj/item/dualsaber/attack(mob/target, mob/living/carbon/human/user)
- if(user.has_dna())
- if(user.dna.check_mutation(/datum/mutation/human/hulk))
- to_chat(user, span_warning("You grip the blade too hard and accidentally drop it!"))
- if(HAS_TRAIT(src, TRAIT_WIELDED))
- user.dropItemToGround(src, force=TRUE)
- return
+ if(HAS_TRAIT(user, TRAIT_HULK))
+ to_chat(user, span_warning("You grip the blade too hard and accidentally drop it!"))
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
+ user.dropItemToGround(src, force=TRUE)
+ return
..()
if(!HAS_TRAIT(src, TRAIT_WIELDED))
return
diff --git a/code/game/objects/items/emags.dm b/code/game/objects/items/emags.dm
index cf89c0bb12cd0b..5590f72eaf3baf 100644
--- a/code/game/objects/items/emags.dm
+++ b/code/game/objects/items/emags.dm
@@ -144,7 +144,8 @@
if(!can_emag(interacting_with, user))
return ITEM_INTERACT_BLOCKING
log_combat(user, interacting_with, "attempted to emag")
- interacting_with.emag_act(user, src)
+ if(interacting_with.emag_act(user, src))
+ SSblackbox.record_feedback("tally", "atom_emagged", 1, interacting_with.type)
return ITEM_INTERACT_SUCCESS
/obj/item/card/emag/ranged_interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
diff --git a/code/game/objects/items/fireaxe.dm b/code/game/objects/items/fireaxe.dm
index 38e4c840694f5b..8a8f26b2c8995f 100644
--- a/code/game/objects/items/fireaxe.dm
+++ b/code/game/objects/items/fireaxe.dm
@@ -77,7 +77,7 @@
icon_state = "metalh2_axe0"
base_icon_state = "metalh2_axe"
name = "metallic hydrogen axe"
- desc = "A lightweight crowbar with an extreme sharp fire axe head attached. It trades it's hefty as a weapon by making it easier to carry around when holstered to suits without having to sacrifice your backpack."
+ desc = "A lightweight crowbar with an extreme sharp fire axe head attached. It trades its heft as a weapon by making it easier to carry around when holstered to suits without having to sacrifice your backpack."
force_unwielded = 5
force_wielded = 15
demolition_mod = 2
diff --git a/code/game/objects/items/food/meatdish.dm b/code/game/objects/items/food/meatdish.dm
index 537c7688d2dd4a..c03470ff416b3f 100644
--- a/code/game/objects/items/food/meatdish.dm
+++ b/code/game/objects/items/food/meatdish.dm
@@ -34,6 +34,7 @@
foodtypes = SEAFOOD
eatverbs = list("bite", "chew", "gnaw", "swallow", "chomp")
w_class = WEIGHT_CLASS_SMALL
+ starting_reagent_purity = 1.0
/obj/item/food/fishmeat/carp
name = "carp fillet"
@@ -88,6 +89,7 @@
name = "donkfillet"
desc = "The dreaded donkfish fillet. No sane spaceman would eat this, and it does not get better when cooked."
icon_state = "donkfillet"
+ starting_reagent_purity = 0.3
/obj/item/food/fishmeat/octopus
name = "octopus tentacle"
diff --git a/code/game/objects/items/food/meatslab.dm b/code/game/objects/items/food/meatslab.dm
index 7816fb0e83a70b..a5fe073e56f3fb 100644
--- a/code/game/objects/items/food/meatslab.dm
+++ b/code/game/objects/items/food/meatslab.dm
@@ -16,12 +16,12 @@
/datum/component/blood_walk,\
blood_type = blood_decal_type,\
blood_spawn_chance = 45,\
- max_blood = custom_materials[custom_materials[1]],\
+ max_blood = custom_materials[custom_materials[1]] / SHEET_MATERIAL_AMOUNT,\
)
AddComponent(
/datum/component/bloody_spreader,\
- blood_left = custom_materials[custom_materials[1]],\
+ blood_left = custom_materials[custom_materials[1]] / SHEET_MATERIAL_AMOUNT,\
blood_dna = list("meaty DNA" = "MT-"),\
diseases = null,\
)
diff --git a/code/game/objects/items/food/pastries.dm b/code/game/objects/items/food/pastries.dm
index e1449007b71d48..1024e44c625f30 100644
--- a/code/game/objects/items/food/pastries.dm
+++ b/code/game/objects/items/food/pastries.dm
@@ -387,7 +387,8 @@
/obj/item/food/icecream/make_edible()
. = ..()
- AddComponent(/datum/component/ice_cream_holder, filled_name = "ice cream", change_desc = TRUE, prefill_flavours = prefill_flavours)
+ var/max_scoops = check_holidays(ICE_CREAM_DAY) ? DEFAULT_MAX_ICE_CREAM_SCOOPS * 4 : DEFAULT_MAX_ICE_CREAM_SCOOPS
+ AddComponent(/datum/component/ice_cream_holder, max_scoops, filled_name = "ice cream", change_desc = TRUE, prefill_flavours = prefill_flavours)
/obj/item/food/icecream/chocolate
name = "chocolate cone"
diff --git a/code/game/objects/items/granters/magic/knock.dm b/code/game/objects/items/granters/magic/knock.dm
index 11bdfeeadbfa21..0e4aaf9ee6c4d5 100644
--- a/code/game/objects/items/granters/magic/knock.dm
+++ b/code/game/objects/items/granters/magic/knock.dm
@@ -9,7 +9,7 @@
"Slow down, book. I still haven't finished this page...",
"The book won't stop moving!",
"I think this is hurting the spine of the book...",
- "I can't get to the next page, it's stuck t- I'm good, it just turned to the next page on it's own.",
+ "I can't get to the next page, it's stuck t- I'm good, it just turned to the next page on its own.",
"Yeah, staff of doors does the same thing. Go figure...",
)
diff --git a/code/game/objects/items/grenades/_grenade.dm b/code/game/objects/items/grenades/_grenade.dm
index ec16b4c22fe956..6c84b5cf46eea7 100644
--- a/code/game/objects/items/grenades/_grenade.dm
+++ b/code/game/objects/items/grenades/_grenade.dm
@@ -25,7 +25,7 @@
var/type_cluster = FALSE
///How long it takes for a grenade to explode after being armed
var/det_time = 5 SECONDS
- ///Will this state what it's det_time is when examined?
+ ///Will this state what its det_time is when examined?
var/display_timer = TRUE
///Used in botch_check to determine how a user's clumsiness affects that user's ability to prime a grenade correctly.
var/clumsy_check = GRENADE_CLUMSY_FUMBLE
diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm
index 6a4a08a02fb68b..e485490f077cda 100644
--- a/code/game/objects/items/grenades/chem_grenade.dm
+++ b/code/game/objects/items/grenades/chem_grenade.dm
@@ -35,7 +35,6 @@
set_wires(new /datum/wires/explosive/chem_grenade(src))
/obj/item/grenade/chem_grenade/Destroy(force)
- QDEL_NULL(wires)
QDEL_NULL(landminemode)
QDEL_LIST(beakers)
return ..()
diff --git a/code/game/objects/items/grenades/plastic.dm b/code/game/objects/items/grenades/plastic.dm
index 49f66b06896b80..c9090912cc7e64 100644
--- a/code/game/objects/items/grenades/plastic.dm
+++ b/code/game/objects/items/grenades/plastic.dm
@@ -51,8 +51,6 @@
set_wires(new /datum/wires/explosive/c4(src))
/obj/item/grenade/c4/Destroy()
- qdel(wires)
- set_wires(null)
target = null
return ..()
diff --git a/code/game/objects/items/hand_items.dm b/code/game/objects/items/hand_items.dm
index 371ecee6ff8038..23fa5f2ad40c96 100644
--- a/code/game/objects/items/hand_items.dm
+++ b/code/game/objects/items/hand_items.dm
@@ -143,7 +143,7 @@
affix_desc = "on [target.p_their()] sensitive antennae"
affix_desc_target = "on your highly sensitive antennae"
brutal_noogie = TRUE
- if(user.dna?.check_mutation(/datum/mutation/human/hulk))
+ if(HAS_TRAIT(user, TRAIT_HULK))
prefix_desc = "sickeningly brutal"
brutal_noogie = TRUE
@@ -178,7 +178,7 @@
var/damage = rand(1, 5)
if(HAS_TRAIT(target, TRAIT_ANTENNAE))
damage += rand(3,7)
- if(user.dna?.check_mutation(/datum/mutation/human/hulk))
+ if(HAS_TRAIT(user, TRAIT_HULK))
damage += rand(3,7)
if(damage >= 5)
diff --git a/code/game/objects/items/holosign_creator.dm b/code/game/objects/items/holosign_creator.dm
index 926131151e92ba..049ea8928feff0 100644
--- a/code/game/objects/items/holosign_creator.dm
+++ b/code/game/objects/items/holosign_creator.dm
@@ -38,10 +38,11 @@
/obj/item/holosign_creator/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
if(!check_allowed_items(interacting_with, not_inside = TRUE))
return NONE
+
var/turf/target_turf = get_turf(interacting_with)
var/obj/structure/holosign/target_holosign = locate(holosign_type) in target_turf
+
if(target_holosign)
- qdel(target_holosign)
return ITEM_INTERACT_BLOCKING
if(target_turf.is_blocked_turf(TRUE)) //can't put holograms on a tile that has dense stuff
return ITEM_INTERACT_BLOCKING
@@ -51,7 +52,9 @@
if(LAZYLEN(signs) >= max_signs)
balloon_alert(user, "max capacity!")
return ITEM_INTERACT_BLOCKING
+
playsound(src, 'sound/machines/click.ogg', 20, TRUE)
+
if(creation_time)
holocreator_busy = TRUE
if(!do_after(user, creation_time, target = interacting_with))
@@ -62,6 +65,7 @@
return ITEM_INTERACT_BLOCKING
if(target_turf.is_blocked_turf(TRUE)) //don't try to sneak dense stuff on our tile during the wait.
return ITEM_INTERACT_BLOCKING
+
target_holosign = create_holosign(interacting_with, user)
return ITEM_INTERACT_SUCCESS
@@ -105,15 +109,15 @@
/obj/item/holosign_creator/security
name = "security holobarrier projector"
- desc = "A holographic projector that creates holographic security barriers."
+ desc = "A holographic projector that creates holographic security barriers. You can remotely open barriers with it."
icon_state = "signmaker_sec"
holosign_type = /obj/structure/holosign/barrier
- creation_time = 3 SECONDS
+ creation_time = 2 SECONDS
max_signs = 6
/obj/item/holosign_creator/engineering
name = "engineering holobarrier projector"
- desc = "A holographic projector that creates holographic engineering barriers."
+ desc = "A holographic projector that creates holographic engineering barriers. You can remotely open barriers with it."
icon_state = "signmaker_engi"
holosign_type = /obj/structure/holosign/barrier/engineering
creation_time = 1 SECONDS
diff --git a/code/game/objects/items/implants/implant_explosive.dm b/code/game/objects/items/implants/implant_explosive.dm
index 687b8db014e045..b8f55b00855291 100644
--- a/code/game/objects/items/implants/implant_explosive.dm
+++ b/code/game/objects/items/implants/implant_explosive.dm
@@ -109,7 +109,7 @@
/**
* Merges two explosive implants together, adding the stats of the latter to the former before qdeling the latter implant.
* kept_implant = the implant that is kept
- * stat_implant = the implant which has it's stats added to kept_implant, before being deleted.
+ * stat_implant = the implant which has its stats added to kept_implant, before being deleted.
*/
/obj/item/implant/explosive/proc/merge_implants(obj/item/implant/explosive/kept_implant, obj/item/implant/explosive/stat_implant)
kept_implant.explosion_devastate += stat_implant.explosion_devastate
diff --git a/code/game/objects/items/implants/implant_storage.dm b/code/game/objects/items/implants/implant_storage.dm
index 216d8481afafa9..e513967bc46805 100644
--- a/code/game/objects/items/implants/implant_storage.dm
+++ b/code/game/objects/items/implants/implant_storage.dm
@@ -36,7 +36,7 @@
return TRUE
return FALSE
create_storage(storage_type = /datum/storage/implant)
-
+ ADD_TRAIT(src, TRAIT_CONTRABAND_BLOCKER, INNATE_TRAIT)
return ..()
/obj/item/implanter/storage
diff --git a/code/game/objects/items/inspector.dm b/code/game/objects/items/inspector.dm
index 82a36336c42b9c..4aff1f03388ab3 100644
--- a/code/game/objects/items/inspector.dm
+++ b/code/game/objects/items/inspector.dm
@@ -8,7 +8,7 @@
*/
/obj/item/inspector
name = "\improper N-spect scanner"
- desc = "Central Command-issued inspection device. Performs inspections according to Nanotrasen protocols when activated, then prints an encrypted report regarding the maintenance of the station. Definitely not giving you cancer."
+ desc = "Central Command standard issue inspection device. Can perform either wide area scans that central command can use to verify the security of the station, or detailed scan. Can scan people for contraband on their person or items being contraband."
icon = 'icons/obj/devices/scanner.dmi'
icon_state = "inspector"
worn_icon_state = "salestagger"
@@ -20,6 +20,7 @@
interaction_flags_click = NEED_DEXTERITY
throw_range = 1
throw_speed = 1
+ COOLDOWN_DECLARE(scanning_person) //Cooldown for scanning a carbon
///How long it takes to print on time each mode, ordered NORMAL, FAST, HONK
var/list/time_list = list(5 SECONDS, 1 SECONDS, 0.1 SECONDS)
///Which print time mode we're on.
@@ -32,11 +33,15 @@
var/cell_cover_open = FALSE
///Energy used per print.
var/energy_per_print = INSPECTOR_ENERGY_USAGE_NORMAL
+ ///Does this item scan for contraband correctly? If not, will provide a flipped response.
+ var/scans_correctly = TRUE
/obj/item/inspector/Initialize(mapload)
. = ..()
if(ispath(cell))
cell = new cell(src)
+ register_context()
+ register_item_context()
// Clean up the cell on destroy
/obj/item/inspector/Exited(atom/movable/gone, direction)
@@ -87,12 +92,93 @@
if(!cell_cover_open)
. += "Its cell cover is closed. It looks like it could be pried out, but doing so would require an appropriate tool."
return
- . += "It's cell cover is open, exposing the cell slot. It looks like it could be pried in, but doing so would require an appropriate tool."
+ . += "Its cell cover is open, exposing the cell slot. It looks like it could be pried in, but doing so would require an appropriate tool."
if(!cell)
. += "The slot for a cell is empty."
else
. += "\The [cell] is firmly in place. [span_info("Ctrl-click with an empty hand to remove it.")]"
+/obj/item/inspector/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ if(!user.Adjacent(interacting_with))
+ return ITEM_INTERACT_BLOCKING
+ if(cell_cover_open)
+ balloon_alert(user, "close cover first!")
+ return ITEM_INTERACT_BLOCKING
+ if(!cell || !cell.use(INSPECTOR_ENERGY_USAGE_LOW))
+ balloon_alert(user, "check cell!")
+ return ITEM_INTERACT_BLOCKING
+
+ if(iscarbon(interacting_with)) //Prevents insta scanning people
+ if(!COOLDOWN_FINISHED(src, scanning_person))
+ return ITEM_INTERACT_BLOCKING
+
+ visible_message(span_warning("[user] starts scanning [interacting_with] with [src]"))
+ to_chat(interacting_with, span_userdanger("[user] is trying to scan you for contraband!"))
+ balloon_alert_to_viewers("scanning...")
+ playsound(src, 'sound/effects/genetics.ogg', 40, FALSE)
+ COOLDOWN_START(src, scanning_person, 4 SECONDS)
+ if(!do_after(user, 4 SECONDS, interacting_with))
+ return ITEM_INTERACT_BLOCKING
+
+ if(contraband_scan(interacting_with, user))
+ playsound(src, 'sound/machines/uplinkerror.ogg', 40)
+ balloon_alert(user, "contraband detected!")
+ return ITEM_INTERACT_SUCCESS
+ else
+ playsound(src, 'sound/machines/ping.ogg', 20)
+ balloon_alert(user, "clear")
+ return ITEM_INTERACT_SUCCESS
+
+
+/obj/item/inspector/add_context(atom/source, list/context, obj/item/held_item, mob/user)
+ var/update_context = FALSE
+ if(cell_cover_open && cell)
+ context[SCREENTIP_CONTEXT_CTRL_LMB] = "Remove cell"
+ update_context = TRUE
+
+ if(cell_cover_open && !cell && istype(held_item, /obj/item/stock_parts/power_store/cell))
+ context[SCREENTIP_CONTEXT_LMB] = "Install cell"
+ update_context = TRUE
+
+ if(held_item?.tool_behaviour == TOOL_CROWBAR)
+ context[SCREENTIP_CONTEXT_LMB] = "[cell_cover_open ? "close" : "open"] battery panel"
+ update_context = TRUE
+
+ if(update_context)
+ return CONTEXTUAL_SCREENTIP_SET
+ return NONE
+
+/obj/item/inspector/add_item_context(obj/item/source, list/context, atom/target, mob/living/user)
+ if(cell_cover_open || !cell)
+ return NONE
+ if(isitem(target))
+ context[SCREENTIP_CONTEXT_LMB] = "Contraband Scan"
+ return CONTEXTUAL_SCREENTIP_SET
+ return NONE
+
+/**
+ * Scans the carbon or item for contraband.
+ *
+ * Arguments:
+ * - scanned - what or who is scanned?
+ * - user - who is performing the scanning?
+ */
+/obj/item/inspector/proc/contraband_scan(scanned, user)
+ if(iscarbon(scanned))
+ var/mob/living/carbon/scanned_carbon = scanned
+ for(var/obj/item/content in scanned_carbon.get_all_contents_skipping_traits(TRAIT_CONTRABAND_BLOCKER))
+ var/contraband_content = content.is_contraband()
+ if((contraband_content && scans_correctly) || (!contraband_content && !scans_correctly))
+ return TRUE
+
+ if(isitem(scanned))
+ var/obj/item/contraband_item = scanned
+ var/contraband_status = contraband_item.is_contraband()
+ if((contraband_status && scans_correctly) || (!contraband_status && !scans_correctly))
+ return TRUE
+
+ return FALSE
+
/**
* Create our report
*
@@ -178,6 +264,7 @@
* Can be crafted into a bananium HONK-spect scanner
*/
/obj/item/inspector/clown
+ scans_correctly = FALSE
///will only cycle through modes with numbers lower than this
var/max_mode = CLOWN_INSPECTOR_PRINT_SOUND_MODE_LAST
///names of modes, ordered first to last
diff --git a/code/game/objects/items/nitrium_crystals.dm b/code/game/objects/items/nitrium_crystals.dm
deleted file mode 100644
index 828f437ade2fd1..00000000000000
--- a/code/game/objects/items/nitrium_crystals.dm
+++ /dev/null
@@ -1,18 +0,0 @@
-/obj/item/nitrium_crystal
- desc = "A weird brown crystal, it smokes when broken"
- name = "nitrium crystal"
- icon = 'icons/obj/pipes_n_cables/atmos.dmi'
- icon_state = "nitrium_crystal"
- var/cloud_size = 1
-
-/obj/item/nitrium_crystal/attack_self(mob/user)
- . = ..()
- var/datum/effect_system/fluid_spread/smoke/chem/smoke = new
- var/turf/location = get_turf(src)
- create_reagents(5)
- reagents.add_reagent(/datum/reagent/nitrium_low_metabolization, 3)
- reagents.add_reagent(/datum/reagent/nitrium_high_metabolization, 2)
- smoke.attach(location)
- smoke.set_up(cloud_size, holder = src, location = location, carry = reagents, silent = TRUE)
- smoke.start()
- qdel(src)
diff --git a/code/game/objects/items/pillow.dm b/code/game/objects/items/pillow.dm
index f699dd34b3bfa0..b924983a4272f2 100644
--- a/code/game/objects/items/pillow.dm
+++ b/code/game/objects/items/pillow.dm
@@ -131,7 +131,7 @@
icon_state = "pillow_[variation]_t"
inhand_icon_state = "pillow_t"
-/// Puts a brick inside the pillow, increasing it's damage
+/// Puts a brick inside the pillow, increasing its damage
/obj/item/pillow/proc/become_bricked()
bricked = TRUE
var/datum/component/two_handed/two_handed = GetComponent(/datum/component/two_handed)
diff --git a/code/game/objects/items/puzzle_pieces.dm b/code/game/objects/items/puzzle_pieces.dm
index 1fabf13d31ac13..335e7b3d5fbd73 100644
--- a/code/game/objects/items/puzzle_pieces.dm
+++ b/code/game/objects/items/puzzle_pieces.dm
@@ -86,6 +86,18 @@
puzzle_id = null //honestly these cant be closed anyway and im not fucking around with door code anymore
INVOKE_ASYNC(src, PROC_REF(try_puzzle_open), null)
+/obj/machinery/door/puzzle/animation_length(animation)
+ switch(animation)
+ if(DOOR_OPENING_ANIMATION)
+ return 1.0 SECONDS
+
+/obj/machinery/door/puzzle/animation_segment_delay(animation)
+ switch(animation)
+ if(DOOR_OPENING_PASSABLE)
+ return 0.8 SECONDS
+ if(DOOR_OPENING_FINISHED)
+ return 1.0 SECONDS
+
/obj/machinery/door/puzzle/Bumped(atom/movable/AM)
return !density && ..()
@@ -157,7 +169,7 @@
trigger_item = TRUE
specific_item = /obj/structure/holobox
removable_signaller = FALSE //Being a pressure plate subtype, this can also use signals.
- roundstart_signaller_freq = FREQ_HOLOGRID_SOLUTION //Frequency is kept on it's own default channel however.
+ roundstart_signaller_freq = FREQ_HOLOGRID_SOLUTION //Frequency is kept on its own default channel however.
active = TRUE
trigger_delay = 10
protected = TRUE
@@ -558,6 +570,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/puzzle/password/pin, 32)
desc = "A board filled with colored dots. What could this mean?"
icon = 'icons/obj/fluff/puzzle_small.dmi'
icon_state = "puzzle_dots"
+ layer = ABOVE_NORMAL_TURF_LAYER
plane = GAME_PLANE //visible over walls
resistance_flags = INDESTRUCTIBLE | FIRE_PROOF | UNACIDABLE | LAVA_PROOF
flags_1 = UNPAINTABLE_1
diff --git a/code/game/objects/items/rcd/RSF.dm b/code/game/objects/items/rcd/RSF.dm
index ef0be22acc4764..ee85994143a001 100644
--- a/code/game/objects/items/rcd/RSF.dm
+++ b/code/game/objects/items/rcd/RSF.dm
@@ -30,7 +30,7 @@ RSF
///The cost of the object we are going to dispense
var/dispense_cost = 0
w_class = WEIGHT_CLASS_NORMAL
- ///An associated list of atoms and charge costs. This can contain a separate list, as long as it's associated item is an object
+ ///An associated list of atoms and charge costs. This can contain a separate list, as long as its associated item is an object
///The RSF item list below shows in the player facing ui in this order, this is why it isn't in alphabetical order, but instead sorted by category
var/list/cost_by_item = list(
/obj/item/reagent_containers/cup/glass/drinkingglass = 20,
@@ -47,7 +47,7 @@ RSF
/obj/item/pen = 50,
/obj/item/cigarette = 10,
)
- ///An associated list of fuel and it's value
+ ///An associated list of fuel and its value
var/list/matter_by_item = list(/obj/item/rcd_ammo = 10,)
///A list of surfaces that we are allowed to place things on.
var/list/allowed_surfaces = list(/turf/open/floor, /obj/structure/table)
diff --git a/code/game/objects/items/robot/ai_upgrades.dm b/code/game/objects/items/robot/ai_upgrades.dm
index 5660de8d604326..f6357b229efb98 100644
--- a/code/game/objects/items/robot/ai_upgrades.dm
+++ b/code/game/objects/items/robot/ai_upgrades.dm
@@ -8,6 +8,9 @@
icon = 'icons/obj/devices/circuitry_n_data.dmi'
icon_state = "datadisk3"
+/obj/item/malf_upgrade/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_CONTRABAND, INNATE_TRAIT)
/obj/item/malf_upgrade/pre_attack(atom/A, mob/living/user, proximity)
if(!proximity)
@@ -37,6 +40,10 @@
icon = 'icons/obj/devices/circuitry_n_data.dmi'
icon_state = "datadisk3"
+/obj/item/surveillance_upgrade/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_CONTRABAND, INNATE_TRAIT)
+
/obj/item/surveillance_upgrade/pre_attack(atom/A, mob/living/user, proximity)
if(!proximity)
return ..()
diff --git a/code/game/objects/items/robot/items/food.dm b/code/game/objects/items/robot/items/food.dm
index 865e5c792e56bd..b7b018362c73c1 100644
--- a/code/game/objects/items/robot/items/food.dm
+++ b/code/game/objects/items/robot/items/food.dm
@@ -152,6 +152,10 @@
return NONE
/obj/item/borg/lollipop/attack_self(mob/living/user)
+ switch_mode(user)
+ return ..()
+
+/obj/item/borg/lollipop/proc/switch_mode(mob/living/user)
switch(mode)
if(DISPENSE_LOLLIPOP_MODE)
mode = THROW_LOLLIPOP_MODE
@@ -165,7 +169,17 @@
if(DISPENSE_ICECREAM_MODE)
mode = DISPENSE_LOLLIPOP_MODE
to_chat(user, span_notice("Module is now dispensing lollipops."))
- ..()
+
+/obj/item/borg/lollipop/ice_cream
+ name = "ice cream fabricator"
+ desc = "Reward humans with vanilla ice cream. Can't go wrong with it."
+ candy = 4
+ candymax = 4
+ charge_delay = 15 SECONDS
+ mode = DISPENSE_ICECREAM_MODE
+
+/obj/item/borg/lollipop/ice_cream/switch_mode(mob/living/user)
+ return
/obj/item/ammo_casing/gumball
name = "Gumball"
diff --git a/code/game/objects/items/robot/items/storage.dm b/code/game/objects/items/robot/items/storage.dm
index 2d91128adb68d6..3e030a9bd8f23d 100644
--- a/code/game/objects/items/robot/items/storage.dm
+++ b/code/game/objects/items/robot/items/storage.dm
@@ -41,6 +41,11 @@
stored.forceMove(get_turf(usr))
return
+/obj/item/borg/apparatus/get_proxy_attacker_for(atom/target, mob/user)
+ if(stored) // Use the stored item if available
+ return stored
+ return ..()
+
/**
* Attack_self will pass for the stored item.
*/
@@ -57,10 +62,6 @@
return CLICK_ACTION_SUCCESS
/obj/item/borg/apparatus/pre_attack(atom/atom, mob/living/user, params)
- if(stored)
- stored.melee_attack_chain(user, atom, params)
- return TRUE
-
if(istype(atom.loc, /mob/living/silicon/robot) || istype(atom.loc, /obj/item/robot_model) || HAS_TRAIT(atom, TRAIT_NODROP))
return ..() // Borgs should not be grabbing their own modules
@@ -132,7 +133,6 @@
else
. += "Nothing."
- . += span_notice(" Right-clicking will splash the beaker on the ground.")
. += span_notice(" Alt-click will drop the currently stored beaker. ")
/obj/item/borg/apparatus/beaker/update_overlays()
@@ -151,15 +151,6 @@
arm.pixel_y = arm.pixel_y - 5
. += arm
-/// Secondary attack spills the content of the beaker.
-/obj/item/borg/apparatus/beaker/pre_attack_secondary(atom/target, mob/living/silicon/robot/user)
- var/obj/item/reagent_containers/stored_beaker = stored
- if(!stored_beaker)
- return ..()
- stored_beaker.SplashReagents(drop_location(user))
- loc.visible_message(span_notice("[user] spills the contents of [stored_beaker] all over the ground."))
- return ..()
-
/obj/item/borg/apparatus/beaker/extra
name = "secondary beaker storage apparatus"
desc = "A supplementary beaker storage apparatus."
diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm
index 25c83d1b9635a3..7e954fbcec5cd6 100644
--- a/code/game/objects/items/robot/robot_parts.dm
+++ b/code/game/objects/items/robot/robot_parts.dm
@@ -30,7 +30,7 @@
/// If the cyborg starts movement free and not under lockdown
var/locomotion = TRUE
- /// If the cyborg synchronizes it's laws with it's master AI
+ /// If the cyborg synchronizes its laws with its master AI
var/lawsync = TRUE
/// If the cyborg starts with a master AI
var/aisync = TRUE
diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm
index a8ed3b757258bf..fc684fb7a20f72 100644
--- a/code/game/objects/items/robot/robot_upgrades.dm
+++ b/code/game/objects/items/robot/robot_upgrades.dm
@@ -2,10 +2,10 @@
// Contains various borg upgrades.
/obj/item/borg/upgrade
- name = "borg upgrade module."
+ name = "borg upgrade module"
desc = "Protected by FRM."
- icon = 'icons/obj/devices/circuitry_n_data.dmi'
- icon_state = "cyborg_upgrade"
+ icon = 'icons/mob/silicon/robot_items.dmi'
+ icon_state = "module_general"
w_class = WEIGHT_CLASS_SMALL
var/locked = FALSE
var/installed = FALSE
@@ -73,6 +73,7 @@
/obj/item/borg/upgrade/rename
name = "cyborg reclassification board"
desc = "Used to rename a cyborg."
+ icon = 'icons/obj/devices/circuitry_n_data.dmi'
icon_state = "cyborg_upgrade1"
var/heldname = ""
one_use = TRUE
@@ -99,7 +100,7 @@
/obj/item/borg/upgrade/disablercooler
name = "cyborg rapid disabler cooling module"
desc = "Used to cool a mounted disabler, increasing the potential current in it and thus its recharge rate."
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_security"
require_model = TRUE
model_type = list(/obj/item/robot_model/security)
model_flags = BORG_MODEL_SECURITY
@@ -134,7 +135,7 @@
/obj/item/borg/upgrade/thrusters
name = "ion thruster upgrade"
desc = "An energy-operated thruster system for cyborgs."
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_general"
/obj/item/borg/upgrade/thrusters/action(mob/living/silicon/robot/borg, mob/living/user = usr)
. = ..()
@@ -156,7 +157,7 @@
/obj/item/borg/upgrade/diamond_drill
name = "mining cyborg diamond drill"
desc = "A diamond drill replacement for the mining model's standard drill."
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_miner"
require_model = TRUE
model_type = list(/obj/item/robot_model/miner)
model_flags = BORG_MODEL_MINER
@@ -167,7 +168,7 @@
/obj/item/borg/upgrade/soh
name = "mining cyborg satchel of holding"
desc = "A satchel of holding replacement for mining cyborg's ore satchel module."
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_miner"
require_model = TRUE
model_type = list(/obj/item/robot_model/miner)
model_flags = BORG_MODEL_MINER
@@ -178,7 +179,7 @@
/obj/item/borg/upgrade/tboh
name = "janitor cyborg trash bag of holding"
desc = "A trash bag of holding replacement for the janiborg's standard trash bag."
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_janitor"
require_model = TRUE
model_type = list(/obj/item/robot_model/janitor)
model_flags = BORG_MODEL_JANITOR
@@ -189,7 +190,7 @@
/obj/item/borg/upgrade/amop
name = "janitor cyborg advanced mop"
desc = "An advanced mop replacement for the janiborg's standard mop."
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_janitor"
require_model = TRUE
model_type = list(/obj/item/robot_model/janitor)
model_flags = BORG_MODEL_JANITOR
@@ -200,7 +201,7 @@
/obj/item/borg/upgrade/prt
name = "janitor cyborg plating repair tool"
desc = "A tiny heating device to repair burnt and damaged hull platings with."
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_janitor"
require_model = TRUE
model_type = list(/obj/item/robot_model/janitor)
model_flags = BORG_MODEL_JANITOR
@@ -210,9 +211,13 @@
/obj/item/borg/upgrade/syndicate
name = "illegal equipment module"
desc = "Unlocks the hidden, deadlier functions of a cyborg."
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_illegal"
require_model = TRUE
+/obj/item/borg/upgrade/syndicate/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_CONTRABAND, INNATE_TRAIT)
+
/obj/item/borg/upgrade/syndicate/action(mob/living/silicon/robot/borg, mob/living/user = usr)
. = ..()
if(!.)
@@ -235,7 +240,7 @@
/obj/item/borg/upgrade/lavaproof
name = "mining cyborg lavaproof chassis"
desc = "An upgrade kit to apply specialized coolant systems and insulation layers to a mining cyborg's chassis, enabling them to withstand exposure to molten rock and liquid plasma."
- icon_state = "cyborg_ash_tracks"
+ icon_state = "module_miner"
resistance_flags = LAVA_PROOF | FIRE_PROOF | FREEZE_PROOF
require_model = TRUE
model_type = list(/obj/item/robot_model/miner)
@@ -256,7 +261,7 @@
/obj/item/borg/upgrade/selfrepair
name = "self-repair module"
desc = "This module will repair the cyborg over time."
- icon_state = "cyborg_upgrade5"
+ icon_state = "module_general"
require_model = TRUE
var/repair_amount = -1
/// world.time of next repair
@@ -356,7 +361,7 @@
name = "medical cyborg hypospray advanced synthesiser"
desc = "An upgrade to the Medical model cyborg's hypospray, allowing it \
to produce more advanced and complex medical reagents."
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_medical"
require_model = TRUE
model_type = list(/obj/item/robot_model/medical)
model_flags = BORG_MODEL_MEDICAL
@@ -385,7 +390,7 @@
name = "cyborg piercing hypospray"
desc = "An upgrade to a cyborg's hypospray, allowing it to \
pierce armor and thick material."
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_medical"
/obj/item/borg/upgrade/piercing_hypospray/action(mob/living/silicon/robot/borg, mob/living/user = usr)
. = ..()
@@ -416,7 +421,7 @@
name = "cyborg surgical omni-tool upgrade"
desc = "An upgrade to the Medical model, upgrading the built-in \
surgical omnitool, to be on par with advanced surgical tools"
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_medical"
require_model = TRUE
model_type = list(/obj/item/robot_model/medical, /obj/item/robot_model/syndicate_medical)
model_flags = BORG_MODEL_MEDICAL
@@ -448,7 +453,7 @@
name = "cyborg engineering omni-tool upgrade"
desc = "An upgrade to the Engineering model, upgrading the built-in \
engineering omnitool, to be on par with advanced engineering tools"
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_engineer"
require_model = TRUE
model_type = list(/obj/item/robot_model/engineering, /obj/item/robot_model/saboteur)
model_flags = BORG_MODEL_ENGINEERING
@@ -475,7 +480,7 @@
name = "medical cyborg defibrillator"
desc = "An upgrade to the Medical model, installing a built-in \
defibrillator, for on the scene revival."
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_medical"
require_model = TRUE
model_type = list(/obj/item/robot_model/medical)
model_flags = BORG_MODEL_MEDICAL
@@ -526,7 +531,7 @@
desc = "An upgrade to the Medical model, installing a processor \
capable of scanning surgery disks and carrying \
out procedures"
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_medical"
require_model = TRUE
model_type = list(/obj/item/robot_model/medical, /obj/item/robot_model/syndicate_medical)
model_flags = BORG_MODEL_MEDICAL
@@ -536,6 +541,7 @@
/obj/item/borg/upgrade/ai
name = "B.O.R.I.S. module"
desc = "Bluespace Optimized Remote Intelligence Synchronization. An uplink device which takes the place of an MMI in cyborg endoskeletons, creating a robotic shell controlled by an AI."
+ icon = 'icons/obj/devices/circuitry_n_data.dmi'
icon_state = "boris"
/obj/item/borg/upgrade/ai/action(mob/living/silicon/robot/borg, mob/living/user = usr)
@@ -559,7 +565,7 @@
/obj/item/borg/upgrade/expand
name = "borg expander"
desc = "A cyborg resizer, it makes a cyborg huge."
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_general"
/obj/item/borg/upgrade/expand/action(mob/living/silicon/robot/borg, mob/living/user = usr)
. = ..()
@@ -606,8 +612,7 @@
/obj/item/borg/upgrade/rped
name = "engineering cyborg RPED"
desc = "A rapid part exchange device for the engineering cyborg."
- icon = 'icons/obj/storage/storage.dmi'
- icon_state = "borgrped"
+ icon_state = "module_engineer"
require_model = TRUE
model_type = list(/obj/item/robot_model/engineering, /obj/item/robot_model/saboteur)
model_flags = BORG_MODEL_ENGINEERING
@@ -617,6 +622,7 @@
/obj/item/borg/upgrade/inducer
name = "engineering integrated power inducer"
desc = "An integrated inducer that can charge a device's internal cell from power provided by the cyborg."
+ icon_state = "module_engineer"
require_model = TRUE
model_type = list(/obj/item/robot_model/engineering, /obj/item/robot_model/saboteur)
model_flags = BORG_MODEL_ENGINEERING
@@ -641,8 +647,7 @@
/obj/item/borg/upgrade/pinpointer
name = "medical cyborg crew pinpointer"
desc = "A crew pinpointer module for the medical cyborg. Permits remote access to the crew monitor."
- icon = 'icons/obj/devices/tracker.dmi'
- icon_state = "pinpointer_crew"
+ icon_state = "module_medical"
require_model = TRUE
model_type = list(/obj/item/robot_model/medical, /obj/item/robot_model/syndicate_medical)
model_flags = BORG_MODEL_MEDICAL
@@ -679,7 +684,7 @@
/obj/item/borg/upgrade/transform
name = "borg model picker (Standard)"
desc = "Allows you to to turn a cyborg into a standard cyborg."
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_general"
var/obj/item/robot_model/new_model = null
/obj/item/borg/upgrade/transform/action(mob/living/silicon/robot/borg, mob/living/user = usr)
@@ -690,13 +695,13 @@
/obj/item/borg/upgrade/transform/clown
name = "borg model picker (Clown)"
desc = "Allows you to to turn a cyborg into a clown, honk."
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_honk"
new_model = /obj/item/robot_model/clown
/obj/item/borg/upgrade/circuit_app
name = "circuit manipulation apparatus"
desc = "An engineering cyborg upgrade allowing for manipulation of circuit boards."
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_engineer"
require_model = TRUE
model_type = list(/obj/item/robot_model/engineering, /obj/item/robot_model/saboteur)
model_flags = BORG_MODEL_ENGINEERING
@@ -706,7 +711,7 @@
/obj/item/borg/upgrade/beaker_app
name = "beaker storage apparatus"
desc = "A supplementary beaker storage apparatus for medical cyborgs."
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_medical"
require_model = TRUE
model_type = list(/obj/item/robot_model/medical)
model_flags = BORG_MODEL_MEDICAL
@@ -716,7 +721,7 @@
/obj/item/borg/upgrade/drink_app
name = "glass storage apparatus"
desc = "A supplementary drinking glass storage apparatus for service cyborgs."
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_service"
require_model = TRUE
model_type = list(/obj/item/robot_model/service)
model_flags = BORG_MODEL_SERVICE
@@ -726,7 +731,7 @@
/obj/item/borg/upgrade/broomer
name = "experimental push broom"
desc = "An experimental push broom used for efficiently pushing refuse."
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_janitor"
require_model = TRUE
model_type = list(/obj/item/robot_model/janitor)
model_flags = BORG_MODEL_JANITOR
@@ -736,7 +741,7 @@
/obj/item/borg/upgrade/condiment_synthesizer
name = "Service Cyborg Condiment Synthesiser"
desc = "An upgrade to the service model cyborg, allowing it to produce solid condiments."
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_service"
require_model = TRUE
model_type = list(/obj/item/robot_model/service)
model_flags = BORG_MODEL_SERVICE
@@ -746,7 +751,7 @@
/obj/item/borg/upgrade/silicon_knife
name = "Service Cyborg Kitchen Toolset"
desc = "An upgrade to the service model cyborg, to help process foods."
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_service"
require_model = TRUE
model_type = list(/obj/item/robot_model/service)
model_flags = BORG_MODEL_SERVICE
@@ -756,7 +761,7 @@
/obj/item/borg/upgrade/service_apparatus
name = "Service Cyborg Service Apparatus"
desc = "An upgrade to the service model cyborg, to help handle foods and paper."
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_service"
require_model = TRUE
model_type = list(/obj/item/robot_model/service)
model_flags = BORG_MODEL_SERVICE
@@ -766,7 +771,7 @@
/obj/item/borg/upgrade/rolling_table
name = "Service Cyborg Rolling Table Dock"
desc = "An upgrade to the service model cyborg, to help provide mobile service."
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_service"
require_model = TRUE
model_type = list(/obj/item/robot_model/service)
model_flags = BORG_MODEL_SERVICE
@@ -776,7 +781,7 @@
/obj/item/borg/upgrade/service_cookbook
name = "Service Cyborg Cookbook"
desc = "An upgrade to the service model cyborg, that lets them create more foods."
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_service"
require_model = TRUE
model_type = list(/obj/item/robot_model/service)
model_flags = BORG_MODEL_SERVICE
diff --git a/code/game/objects/items/sharpener.dm b/code/game/objects/items/sharpener.dm
index a0f41574e4b47e..709747efc66630 100644
--- a/code/game/objects/items/sharpener.dm
+++ b/code/game/objects/items/sharpener.dm
@@ -3,7 +3,7 @@
*
* Items used for sharpening stuff
*
-* Whetstones can be used to increase an item's force, throw_force and wound_bonus and it's change it's sharpness to SHARP_EDGED. Whetstones do not work with energy weapons. Two-handed weapons will only get the throw_force bonus. A whetstone can only be used once.
+* Whetstones can be used to increase an item's force, throw_force and wound_bonus and it changes its sharpness to SHARP_EDGED. Whetstones do not work with energy weapons. Two-handed weapons will only get the throw_force bonus. A whetstone can only be used once.
*
*/
/obj/item/sharpener
diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm
index 5a8e1361c28c39..6314c16c8449c6 100644
--- a/code/game/objects/items/stacks/rods.dm
+++ b/code/game/objects/items/stacks/rods.dm
@@ -39,6 +39,8 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \
cost = HALF_SHEET_MATERIAL_AMOUNT
source = /datum/robot_energy_storage/material/iron
merge_type = /obj/item/stack/rods
+ pickup_sound = 'sound/items/iron_rod_pick_up.ogg'
+ drop_sound = 'sound/items/metal_drop.ogg'
/datum/embed_data/rods
embed_chance = 50
diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm
index a9d71fa127abbb..19e290170f8af3 100644
--- a/code/game/objects/items/stacks/sheets/glass.dm
+++ b/code/game/objects/items/stacks/sheets/glass.dm
@@ -32,6 +32,8 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
cost = SHEET_MATERIAL_AMOUNT
source = /datum/robot_energy_storage/material/glass
sniffable = TRUE
+ pickup_sound = 'sound/items/glass_pick_up.ogg'
+ drop_sound = 'sound/items/glass_drop.ogg'
/datum/armor/sheet_glass
fire = 50
@@ -102,6 +104,8 @@ GLOBAL_LIST_INIT(pglass_recipes, list ( \
grind_results = list(/datum/reagent/silicon = 20, /datum/reagent/toxin/plasma = 10)
material_flags = NONE
tableVariant = /obj/structure/table/glass/plasmaglass
+ pickup_sound = 'sound/items/glass_pick_up.ogg'
+ drop_sound = 'sound/items/glass_drop.ogg'
/obj/item/stack/sheet/plasmaglass/fifty
amount = 50
@@ -160,6 +164,8 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \
grind_results = list(/datum/reagent/silicon = 20, /datum/reagent/iron = 10)
matter_amount = 6
tableVariant = /obj/structure/table/reinforced/rglass
+ pickup_sound = 'sound/items/glass_pick_up.ogg'
+ drop_sound = 'sound/items/glass_drop.ogg'
/obj/item/stack/sheet/rglass/fifty
amount = 50
@@ -198,6 +204,8 @@ GLOBAL_LIST_INIT(prglass_recipes, list ( \
gulag_valid = TRUE
matter_amount = 8
tableVariant = /obj/structure/table/reinforced/plasmarglass
+ pickup_sound = 'sound/items/glass_pick_up.ogg'
+ drop_sound = 'sound/items/glass_drop.ogg'
/datum/armor/sheet_plasmarglass
melee = 20
@@ -228,6 +236,8 @@ GLOBAL_LIST_INIT(titaniumglass_recipes, list(
resistance_flags = ACID_PROOF
merge_type = /obj/item/stack/sheet/titaniumglass
tableVariant = /obj/structure/table/reinforced/titaniumglass
+ pickup_sound = 'sound/items/glass_pick_up.ogg'
+ drop_sound = 'sound/items/glass_drop.ogg'
/obj/item/stack/sheet/titaniumglass/fifty
amount = 50
@@ -258,6 +268,8 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
resistance_flags = ACID_PROOF
merge_type = /obj/item/stack/sheet/plastitaniumglass
tableVariant = /obj/structure/table/reinforced/plastitaniumglass
+ pickup_sound = 'sound/items/glass_pick_up.ogg'
+ drop_sound = 'sound/items/glass_drop.ogg'
/obj/item/stack/sheet/plastitaniumglass/fifty
amount = 50
diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm
index fbd69dbd20d4bb..f02a2af11f8355 100644
--- a/code/game/objects/items/stacks/sheets/leather.dm
+++ b/code/game/objects/items/stacks/sheets/leather.dm
@@ -6,6 +6,9 @@
novariants = TRUE
merge_type = /obj/item/stack/sheet/animalhide
+ pickup_sound = null
+ drop_sound = null
+
/obj/item/stack/sheet/animalhide/human
name = "human skin"
desc = "The by-product of human farming."
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 2f084bc299a77d..5d992853da8077 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -330,7 +330,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
new/datum/stack_recipe("cat house", /obj/structure/cat_house, 5, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_STRUCTURE), \
new/datum/stack_recipe("coffin", /obj/structure/closet/crate/coffin, 5, time = 1.5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
new/datum/stack_recipe("book case", /obj/structure/bookcase, 4, time = 1.5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
- new/datum/stack_recipe("drying rack", /obj/machinery/smartfridge/drying_rack, 10, time = 1.5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_TOOLS), \
+ new/datum/stack_recipe("drying rack", /obj/machinery/smartfridge/drying/rack, 10, time = 1.5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_TOOLS), \
new/datum/stack_recipe("wooden barrel", /obj/structure/fermenting_barrel, 8, time = 5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_CONTAINERS), \
new/datum/stack_recipe("dog bed", /obj/structure/bed/dogbed, 10, time = 1 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
new/datum/stack_recipe("dresser", /obj/structure/dresser, 10, time = 1.5 SECONDS, crafting_flags = CRAFT_CHECK_DENSITY | CRAFT_ONE_PER_TURF | CRAFT_ON_SOLID_GROUND, category = CAT_FURNITURE), \
@@ -387,6 +387,8 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
grind_results = list(/datum/reagent/cellulose = 20) //no lignocellulose or lignin reagents yet,
walltype = /turf/closed/wall/mineral/wood
stairs_type = /obj/structure/stairs/wood
+ pickup_sound = 'sound/items/wood_pick_up.ogg'
+ drop_sound = 'sound/items/wood_drop.ogg'
/datum/armor/mineral_wood
fire = 50
@@ -856,6 +858,8 @@ GLOBAL_LIST_INIT(plastic_recipes, list(
throwforce = 7
material_type = /datum/material/plastic
merge_type = /obj/item/stack/sheet/plastic
+ pickup_sound = 'sound/items/plastic_pick_up.ogg'
+ drop_sound = 'sound/items/plastic_drop.ogg'
/obj/item/stack/sheet/plastic/fifty
amount = 50
diff --git a/code/game/objects/items/stacks/sheets/sheets.dm b/code/game/objects/items/stacks/sheets/sheets.dm
index 8b81953528ee14..568fd2f49aa29c 100644
--- a/code/game/objects/items/stacks/sheets/sheets.dm
+++ b/code/game/objects/items/stacks/sheets/sheets.dm
@@ -13,6 +13,8 @@
attack_verb_simple = list("bash", "batter", "bludgeon", "thrash", "smash")
novariants = FALSE
material_flags = MATERIAL_EFFECTS
+ pickup_sound = 'sound/items/metal_pick_up.ogg'
+ drop_sound = 'sound/items/metal_drop.ogg'
var/sheettype = null //this is used for girders in the creation of walls/false walls
///If true, this is worth points in the gulag labour stacker
var/gulag_valid = FALSE
@@ -22,6 +24,8 @@
var/walltype
/// whether this sheet can be sniffed by the material sniffer
var/sniffable = FALSE
+ /// this makes pickup and drop sounds vary
+ sound_vary = TRUE
/obj/item/stack/sheet/Initialize(mapload, new_amount, merge = TRUE, list/mat_override=null, mat_amt=1)
. = ..()
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index c371f459cb77e8..c96cebd58cc508 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -34,7 +34,7 @@
var/merge_type = null
/// The weight class the stack has at amount > 2/3rds max_amount
var/full_w_class = WEIGHT_CLASS_NORMAL
- /// Determines whether the item should update it's sprites based on amount.
+ /// Determines whether the item should update its sprites based on amount.
var/novariants = TRUE
/// List that tells you how much is in a single unit.
var/list/mats_per_unit
diff --git a/code/game/objects/items/stacks/tape.dm b/code/game/objects/items/stacks/tape.dm
index 0e054ba8d10623..acfc59b64d0370 100644
--- a/code/game/objects/items/stacks/tape.dm
+++ b/code/game/objects/items/stacks/tape.dm
@@ -127,12 +127,15 @@
singular_name = "surgical tape"
desc = "Made for patching broken bones back together alongside bone gel, not for playing pranks."
prefix = "surgical"
- conferred_embed = list("embed_chance" = 30, "pain_mult" = 0, "jostle_pain_mult" = 0, "ignore_throwspeed_threshold" = TRUE)
+ conferred_embed = /datum/embed_data/sticky_tape/surgical
splint_factor = 0.5
custom_price = PAYCHECK_CREW
merge_type = /obj/item/stack/sticky_tape/surgical
greyscale_colors = "#70BAE7#BD6A62"
tape_gag = /obj/item/clothing/mask/muzzle/tape/surgical
+/datum/embed_data/sticky_tape/surgical
+ embed_chance = 30
+
/obj/item/stack/sticky_tape/surgical/get_surgery_tool_overlay(tray_extended)
return "tape" + (tray_extended ? "" : "_out")
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index a73f4e3d439190..4a540bb5ba5d26 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -1266,7 +1266,6 @@
/obj/item/stack/tile/catwalk_tile/iron,
/obj/item/stack/tile/catwalk_tile/iron_white,
/obj/item/stack/tile/catwalk_tile/iron_dark,
- /obj/item/stack/tile/catwalk_tile/flat_white,
/obj/item/stack/tile/catwalk_tile/titanium,
/obj/item/stack/tile/catwalk_tile/iron_smooth //this is the original greenish one
)
@@ -1292,12 +1291,6 @@
icon_state = "darkiron_catwalk"
turf_type = /turf/open/floor/catwalk_floor/iron_dark
-/obj/item/stack/tile/catwalk_tile/flat_white
- name = "flat white catwalk floor"
- singular_name = "flat white catwalk floor tile"
- icon_state = "flatwhite_catwalk"
- turf_type = /turf/open/floor/catwalk_floor/flat_white
-
/obj/item/stack/tile/catwalk_tile/titanium
name = "titanium catwalk floor"
singular_name = "titanium catwalk floor tile"
diff --git a/code/game/objects/items/stickers.dm b/code/game/objects/items/stickers.dm
index a02cfd9515ed48..19ac58f6f4072f 100644
--- a/code/game/objects/items/stickers.dm
+++ b/code/game/objects/items/stickers.dm
@@ -174,6 +174,10 @@
icon_state = "synd"
contraband = TRUE
+/obj/item/sticker/syndicate/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_CONTRABAND, INNATE_TRAIT)
+
/obj/item/sticker/syndicate/c4
name = "C-4 sticker"
icon_state = "c4"
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index e2658f3451909a..4199b544f818f8 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -277,11 +277,11 @@
/datum/component/blood_walk,\
blood_type = /obj/effect/decal/cleanable/blood,\
blood_spawn_chance = 15,\
- max_blood = 300,\
+ max_blood = custom_materials[custom_materials[1]] / SHEET_MATERIAL_AMOUNT,\
)
AddComponent(
/datum/component/bloody_spreader,\
- blood_left = INFINITY,\
+ blood_left = custom_materials[custom_materials[1]] / SHEET_MATERIAL_AMOUNT,\
blood_dna = list("MEAT DNA" = "MT+"),\
diseases = null,\
)
@@ -377,7 +377,7 @@
/obj/item/storage/backpack/satchel/flat
name = "smuggler's satchel"
- desc = "A very slim satchel that can easily fit into tight spaces."
+ desc = "A very slim satchel that can easily fit into tight spaces. Its contents cannot be detected by contraband scanners."
icon_state = "satchel-flat"
inhand_icon_state = "satchel-flat"
w_class = WEIGHT_CLASS_NORMAL //Can fit in backpacks itself.
@@ -387,6 +387,7 @@
AddElement(/datum/element/undertile, TRAIT_T_RAY_VISIBLE, INVISIBILITY_MAXIMUM, use_anchor = TRUE) // SKYRAT EDIT - Ghosts can't see smuggler's satchels
atom_storage.max_total_storage = 15
atom_storage.set_holdable(cant_hold_list = /obj/item/storage/backpack/satchel/flat) //muh recursive backpacks
+ ADD_TRAIT(src, TRAIT_CONTRABAND_BLOCKER, INNATE_TRAIT)
/obj/item/storage/backpack/satchel/flat/PopulateContents()
for(var/items in 1 to 4)
diff --git a/code/game/objects/items/storage/boxes/security_boxes.dm b/code/game/objects/items/storage/boxes/security_boxes.dm
index 459c0ab7ce29e9..935ead8f93e952 100644
--- a/code/game/objects/items/storage/boxes/security_boxes.dm
+++ b/code/game/objects/items/storage/boxes/security_boxes.dm
@@ -204,6 +204,16 @@
for(var/i in 1 to 7)
new /obj/item/ammo_casing/shotgun/breacher(src)
+/obj/item/storage/box/large_dart
+ name = "box of XL shotgun darts"
+ name = "A box full of shotgun darts with increased chemical storage capacity."
+ icon_state = "shotdart_box"
+ illustration = null
+
+/obj/item/storage/box/large_dart/PopulateContents()
+ for(var/i in 1 to 7)
+ new /obj/item/ammo_casing/shotgun/dart/large(src)
+
/obj/item/storage/box/emptysandbags
name = "box of empty sandbags"
illustration = "sandbag"
diff --git a/code/game/objects/items/storage/lockbox.dm b/code/game/objects/items/storage/lockbox.dm
index 387d8c22554af2..421d82b667fdee 100644
--- a/code/game/objects/items/storage/lockbox.dm
+++ b/code/game/objects/items/storage/lockbox.dm
@@ -200,7 +200,7 @@
req_access = list(ACCESS_QM)
/obj/item/storage/lockbox/medal/cargo/PopulateContents()
- new /obj/item/clothing/accessory/medal/ribbon/cargo(src)
+ new /obj/item/clothing/accessory/medal/ribbon/cargo(src)
/obj/item/storage/lockbox/medal/service
name = "service award box"
@@ -208,7 +208,7 @@
req_access = list(ACCESS_HOP)
/obj/item/storage/lockbox/medal/service/PopulateContents()
- new /obj/item/clothing/accessory/medal/silver/excellence(src)
+ new /obj/item/clothing/accessory/medal/silver/excellence(src)
/obj/item/storage/lockbox/medal/sci
name = "science medal box"
diff --git a/code/game/objects/items/storage/medkit.dm b/code/game/objects/items/storage/medkit.dm
index 944289598d17ba..c3c97c790fdf3f 100644
--- a/code/game/objects/items/storage/medkit.dm
+++ b/code/game/objects/items/storage/medkit.dm
@@ -454,6 +454,8 @@
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
w_class = WEIGHT_CLASS_SMALL
+ pickup_sound = 'sound/items/handling/pill_bottle_pickup.ogg'
+ drop_sound = 'sound/items/handling/pill_bottle_place.ogg'
/obj/item/storage/pill_bottle/Initialize(mapload)
. = ..()
@@ -462,6 +464,8 @@
/obj/item/reagent_containers/pill,
/obj/item/food/bait/natural,
))
+ atom_storage.open_sound = 'sound/items/handling/pill_bottle_open.ogg'
+ atom_storage.open_sound_vary = FALSE
/obj/item/storage/pill_bottle/suicide_act(mob/living/user)
user.visible_message(span_suicide("[user] is trying to get the cap off [src]! It looks like [user.p_theyre()] trying to commit suicide!"))
diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm
index 5bef4162f02308..60e6d4113b5e87 100644
--- a/code/game/objects/items/storage/uplink_kits.dm
+++ b/code/game/objects/items/storage/uplink_kits.dm
@@ -267,7 +267,7 @@
if(KIT_MR_FREEZE)
new /obj/item/clothing/glasses/cold(src)
- new /obj/item/clothing/gloves/color/black(src)
+ new /obj/item/clothing/gloves/color/black/security/blu(src)
new /obj/item/clothing/mask/chameleon(src)
new /obj/item/clothing/suit/hooded/wintercoat(src)
new /obj/item/clothing/shoes/winterboots(src)
diff --git a/code/game/objects/items/storage/wallets.dm b/code/game/objects/items/storage/wallets.dm
index b20a1e31ae0206..ab2d8f35341afc 100644
--- a/code/game/objects/items/storage/wallets.dm
+++ b/code/game/objects/items/storage/wallets.dm
@@ -9,6 +9,7 @@
var/obj/item/card/id/front_id = null
var/list/combined_access
var/cached_flat_icon
+ var/overlay_icon_state = "wallet_overlay"
/obj/item/storage/wallet/Initialize(mapload)
. = ..()
@@ -107,7 +108,7 @@
return
. += mutable_appearance(front_id.icon, front_id.icon_state)
. += front_id.overlays
- . += mutable_appearance(icon, "wallet_overlay")
+ . += mutable_appearance(icon, overlay_icon_state)
/obj/item/storage/wallet/proc/get_cached_flat_icon()
if(!cached_flat_icon)
@@ -121,9 +122,9 @@
/obj/item/storage/wallet/proc/update_label()
if(front_id)
- name = "wallet displaying [front_id]"
+ name = "[src::name] displaying [front_id]"
else
- name = "wallet"
+ name = src::name
/obj/item/storage/wallet/examine()
. = ..()
diff --git a/code/game/objects/items/surgery_tray.dm b/code/game/objects/items/surgery_tray.dm
index 37e4fcc3d79171..457e971b90dd62 100644
--- a/code/game/objects/items/surgery_tray.dm
+++ b/code/game/objects/items/surgery_tray.dm
@@ -68,7 +68,7 @@
. = ..()
if(is_portable)
desc = "The wheels and bottom storage of this medical cart have been stowed away, \
- leaving a cumbersome tray in it's place."
+ leaving a cumbersome tray in its place."
else
desc = initial(desc)
diff --git a/code/game/objects/items/tanks/tanks.dm b/code/game/objects/items/tanks/tanks.dm
index bdbfa79001ddf4..ee1f314c92addf 100644
--- a/code/game/objects/items/tanks/tanks.dm
+++ b/code/game/objects/items/tanks/tanks.dm
@@ -69,7 +69,7 @@
if (QDELETED(breathing_mob))
breathing_mob = null
return
- // Close open air tank if it got dropped by it's current user.
+ // Close open air tank if it got dropped by its current user.
if (loc != breathing_mob)
breathing_mob.cutoff_internals()
diff --git a/code/game/objects/items/toy_mechs.dm b/code/game/objects/items/toy_mechs.dm
index c50908738fe940..1b3367032c1901 100644
--- a/code/game/objects/items/toy_mechs.dm
+++ b/code/game/objects/items/toy_mechs.dm
@@ -606,7 +606,7 @@
/obj/item/toy/mecha/deathripley/super_special_attack(obj/item/toy/mecha/victim)
playsound(src, 'sound/weapons/sonic_jackhammer.ogg', 20, TRUE)
- if(victim.combat_health < combat_health) //Instantly kills the other mech if it's health is below our's.
+ if(victim.combat_health < combat_health) //Instantly kills the other mech if its health is below ours.
say("EXECUTE!!")
victim.combat_health = 0
else //Otherwise, just deal one damage.
diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index 5384a11cf3bbe0..fbe11fe933d1b8 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -162,7 +162,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
/obj/item/claymore/carrot
name = "carrot sword"
- desc = "A full-sized carrot sword. Definitely \not\ good for the eyes, not anymore."
+ desc = "A full-sized carrot sword. Definitely not good for the eyes, not anymore."
icon_state = "carrot_sword"
inhand_icon_state = "carrot_sword"
worn_icon_state = "carrot_sword"
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index bfdd0f71426c5a..ce1b48985bb675 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -199,7 +199,7 @@ GLOBAL_LIST_EMPTY(objects_by_id_tag)
/obj/proc/plunger_act(obj/item/plunger/attacking_plunger, mob/living/user, reinforced)
return SEND_SIGNAL(src, COMSIG_PLUNGER_ACT, attacking_plunger, user, reinforced)
-// Should move all contained objects to it's location.
+// Should move all contained objects to its location.
/obj/proc/dump_contents()
SHOULD_CALL_PARENT(FALSE)
CRASH("Unimplemented.")
diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm
index dc33112b5e12b1..28d84e32ef0940 100644
--- a/code/game/objects/structures/beds_chairs/chair.dm
+++ b/code/game/objects/structures/beds_chairs/chair.dm
@@ -269,15 +269,16 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool, 0)
return
/obj/structure/chair/mouse_drop_dragged(atom/over_object, mob/user, src_location, over_location, params)
- if(over_object == user)
- if(!item_chair || has_buckled_mobs())
- return
- user.visible_message(span_notice("[user] grabs \the [src.name]."), span_notice("You grab \the [src.name]."))
- var/obj/item/C = new item_chair(loc)
- C.set_custom_materials(custom_materials)
- TransferComponents(C)
- user.put_in_hands(C)
- qdel(src)
+ if(!isliving(user) || over_object != user)
+ return
+ if(!item_chair || has_buckled_mobs())
+ return
+ user.visible_message(span_notice("[user] grabs \the [src.name]."), span_notice("You grab \the [src.name]."))
+ var/obj/item/C = new item_chair(loc)
+ C.set_custom_materials(custom_materials)
+ TransferComponents(C)
+ user.put_in_hands(C)
+ qdel(src)
/obj/structure/chair/user_buckle_mob(mob/living/M, mob/user, check_loc = TRUE)
return ..()
@@ -287,6 +288,13 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool, 0)
desc = "It has some unsavory stains on it..."
icon_state = "bar"
item_chair = /obj/item/chair/stool/bar
+ can_buckle = TRUE
+
+/obj/structure/chair/stool/bar/post_buckle_mob(mob/living/M)
+ M.pixel_y += 4
+
+/obj/structure/chair/stool/bar/post_unbuckle_mob(mob/living/M)
+ M.pixel_y -= 4
MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool/bar, 0)
diff --git a/code/game/objects/structures/construction_console/construction_console.dm b/code/game/objects/structures/construction_console/construction_console.dm
index d3ae2984e3170c..f13dd1d78c64ae 100644
--- a/code/game/objects/structures/construction_console/construction_console.dm
+++ b/code/game/objects/structures/construction_console/construction_console.dm
@@ -119,7 +119,7 @@
return ..()
/mob/camera/ai_eye/remote/base_construction/relaymove(mob/living/user, direction)
- //This camera eye is visible, and as such needs to keep it's dir updated
+ //This camera eye is visible, and as such needs to keep its dir updated
dir = direction
return ..()
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index 3c966bb7a801a4..a21aa5926fa122 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -62,6 +62,7 @@
)
if(paint_jobs)
paint_jobs = crate_paint_jobs
+ AddComponent(/datum/component/soapbox)
/obj/structure/closet/crate/Destroy()
QDEL_NULL(manifest)
diff --git a/code/game/objects/structures/curtains.dm b/code/game/objects/structures/curtains.dm
index aead6fafb017c7..be4180b5fa1772 100644
--- a/code/game/objects/structures/curtains.dm
+++ b/code/game/objects/structures/curtains.dm
@@ -146,7 +146,7 @@
set_opacity(TRUE)
/obj/structure/curtain/cloth/fancy/mechanical/attack_hand(mob/user, list/modifiers)
- return
+ return
/obj/structure/curtain/cloth/fancy/mechanical/start_closed
icon_state = "cur_fancy-closed"
diff --git a/code/game/objects/structures/deployable_turret.dm b/code/game/objects/structures/deployable_turret.dm
index f24df392dedef7..2b1a90500ccf8e 100644
--- a/code/game/objects/structures/deployable_turret.dm
+++ b/code/game/objects/structures/deployable_turret.dm
@@ -213,7 +213,7 @@
/obj/machinery/deployable_turret/hmg
name = "heavy machine gun turret"
- desc = "A heavy caliber machine gun commonly used by Nanotrasen forces, famed for it's ability to give people on the receiving end more holes than normal."
+ desc = "A heavy caliber machine gun commonly used by Nanotrasen forces, famed for its ability to give people on the receiving end more holes than normal."
icon_state = "hmg"
max_integrity = 250
projectile_type = /obj/projectile/bullet/manned_turret/hmg
diff --git a/code/game/objects/structures/fake_stairs.dm b/code/game/objects/structures/fake_stairs.dm
index a5e03ed6b5986a..1152a8c02dcca8 100644
--- a/code/game/objects/structures/fake_stairs.dm
+++ b/code/game/objects/structures/fake_stairs.dm
@@ -6,6 +6,7 @@
anchored = TRUE
move_resist = INFINITY
+ layer = ABOVE_OPEN_TURF_LAYER
plane = FLOOR_PLANE //one with the floor
MAPPING_DIRECTIONAL_HELPERS(/obj/structure/fake_stairs, 0)
diff --git a/code/game/objects/structures/fluff.dm b/code/game/objects/structures/fluff.dm
index 82569c8f9e7940..7acfa65f625779 100644
--- a/code/game/objects/structures/fluff.dm
+++ b/code/game/objects/structures/fluff.dm
@@ -87,7 +87,7 @@
icon = 'icons/obj/mining_zones/survival_pod.dmi'
icon_state = "fan_tiny"
plane = FLOOR_PLANE
- layer = LOW_OBJ_LAYER
+ layer = ABOVE_OPEN_TURF_LAYER
/**
* A variety of statue in disrepair; parts are broken off and a gemstone is missing
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index 3bd3e00cc273ba..aa9af66868fdd6 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -17,6 +17,8 @@
integrity_failure = 0.4
var/rods_type = /obj/item/stack/rods
var/rods_amount = 2
+ /// Whether or not we're disappearing but dramatically
+ var/dramatically_disappearing = FALSE
/datum/armor/structure_grille
melee = 50
@@ -365,6 +367,31 @@
/obj/structure/grille/get_dumping_location()
return null
+/obj/structure/grille/proc/temporary_shatter(time_to_go = 0 SECONDS, time_to_return = 4 SECONDS)
+ if(dramatically_disappearing)
+ return
+
+ //dissapear in 1 second
+ dramatically_disappearing = TRUE
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/movable, moveToNullspace)), time_to_go) //woosh
+
+ // come back in 1 + 4 seconds
+ addtimer(VARSET_CALLBACK(src, atom_integrity, atom_integrity), time_to_go + time_to_return) //set the health back (icon is updated on move)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/movable, forceMove), loc), time_to_go + time_to_return) //we back boys
+ addtimer(VARSET_CALLBACK(src, dramatically_disappearing, FALSE), time_to_go + time_to_return) //also set the var back
+
+/// Do some very specific checks to see if we *would* get shocked. Returns TRUE if it's shocked
+/obj/structure/grille/proc/is_shocked()
+ var/turf/turf = get_turf(src)
+ var/obj/structure/cable/cable = turf.get_cable_node()
+ var/list/powernet_info = get_powernet_info_from_source(cable)
+
+ if(!powernet_info)
+ return FALSE
+
+ var/datum/powernet/powernet = powernet_info["powernet"]
+ return !!powernet.get_electrocute_damage()
+
/obj/structure/grille/broken // Pre-broken grilles for map placement
icon_state = "brokengrille"
density = FALSE
diff --git a/code/game/objects/structures/gym/punching_bag.dm b/code/game/objects/structures/gym/punching_bag.dm
index 03a64725ab5e3d..59ccf6f23c2c31 100644
--- a/code/game/objects/structures/gym/punching_bag.dm
+++ b/code/game/objects/structures/gym/punching_bag.dm
@@ -58,6 +58,10 @@
if (is_heavy_gravity)
stamina_exhaustion *= 1.5
+ var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = user.get_organ_slot(ORGAN_SLOT_SPINE)
+ if(istype(potential_spine))
+ stamina_exhaustion *= potential_spine.athletics_boost_multiplier
+
if(HAS_TRAIT(user, TRAIT_STRENGTH)) //The strong get reductions to stamina damage taken while exercising
stamina_exhaustion *= 0.5
diff --git a/code/game/objects/structures/gym/weight_machine.dm b/code/game/objects/structures/gym/weight_machine.dm
index 3c531f04889291..352ef65ff0050d 100644
--- a/code/game/objects/structures/gym/weight_machine.dm
+++ b/code/game/objects/structures/gym/weight_machine.dm
@@ -171,10 +171,14 @@
var/workout_reps = total_workout_reps[user.mind.get_skill_level(/datum/skill/athletics)] * gravity_modifier
// total stamina drain of 1 workout calculated based on the workout length
var/stamina_exhaustion = FLOOR(user.maxHealth / workout_reps / WORKOUT_LENGTH, 0.1)
-
+
+ var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = user.get_organ_slot(ORGAN_SLOT_SPINE)
+ if(istype(potential_spine))
+ stamina_exhaustion *= potential_spine.athletics_boost_multiplier
+
if(HAS_TRAIT(user, TRAIT_STRENGTH)) //The strong get reductions to stamina damage taken while exercising
stamina_exhaustion *= 0.5
-
+
user.adjustStaminaLoss(stamina_exhaustion * seconds_per_tick)
return TRUE
diff --git a/code/game/objects/structures/holosign.dm b/code/game/objects/structures/holosign.dm
index 1d7fc470afff8a..30983c5088d677 100644
--- a/code/game/objects/structures/holosign.dm
+++ b/code/game/objects/structures/holosign.dm
@@ -3,7 +3,7 @@
/obj/structure/holosign
name = "holo sign"
- icon = 'icons/effects/effects.dmi'
+ icon = 'icons/effects/holosigns.dmi'
anchored = TRUE
max_integrity = 1
armor_type = /datum/armor/structure_holosign
@@ -21,10 +21,7 @@
/obj/structure/holosign/Initialize(mapload, source_projector)
. = ..()
- var/turf/our_turf = get_turf(src)
- if(use_vis_overlay)
- alpha = 0
- SSvis_overlays.add_vis_overlay(src, icon, icon_state, ABOVE_MOB_LAYER, MUTATE_PLANE(GAME_PLANE, our_turf), dir, add_appearance_flags = RESET_ALPHA) //you see mobs under it, but you hit them like they are above it
+ create_vis_overlay()
if(source_projector)
projector = source_projector
LAZYADD(projector.signs, src)
@@ -41,6 +38,11 @@
return
attack_holosign(user, modifiers)
+/obj/structure/holosign/CanAllowThrough(atom/movable/mover, border_dir)
+ . = ..()
+ if(!. && isprojectile(mover)) // Its short enough to be shot over
+ return TRUE
+
/obj/structure/holosign/proc/attack_holosign(mob/living/user, list/modifiers)
user.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
user.changeNext_move(CLICK_CD_MELEE)
@@ -54,38 +56,100 @@
if(BURN)
playsound(loc, 'sound/weapons/egloves.ogg', 80, TRUE)
+/obj/structure/holosign/proc/create_vis_overlay()
+ var/turf/our_turf = get_turf(src)
+ if(use_vis_overlay)
+ alpha = 0
+ SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays)
+ SSvis_overlays.add_vis_overlay(src, icon, icon_state, ABOVE_MOB_LAYER, MUTATE_PLANE(GAME_PLANE, our_turf), dir, add_appearance_flags = RESET_ALPHA) //you see mobs under it, but you hit them like they are above it
+
/obj/structure/holosign/wetsign
name = "wet floor sign"
desc = "The words flicker as if they mean nothing."
- icon = 'icons/effects/effects.dmi'
icon_state = "holosign"
/obj/structure/holosign/barrier
- name = "holobarrier"
- desc = "A short holographic barrier which can only be passed by walking."
+ name = "security holobarrier"
+ desc = "A strong short security holographic barrier used for crowd control and blocking crime scenes. Can only be passed by walking."
icon_state = "holosign_sec"
+ base_icon_state = "holosign_sec"
pass_flags_self = PASSTABLE | PASSGRILLE | PASSGLASS | LETPASSTHROW
density = TRUE
max_integrity = 20
- var/allow_walk = TRUE //can we pass through it on walk intent
+ COOLDOWN_DECLARE(cooldown_open)
+ ///Can we pass through it on walk intent?
+ var/allow_walk = TRUE
+ ///Can it be temporarily opened with the holosign projector?
+ var/openable = TRUE
+ ///Is it opened?
+ var/opened = FALSE
+ ///What is the icon of opened holobarrier?
+ var/pass_icon_state = "holosign_pass"
/obj/structure/holosign/barrier/CanAllowThrough(atom/movable/mover, border_dir)
. = ..()
if(.)
return
+
+ if(opened)
+ return TRUE
+
if(iscarbon(mover))
- var/mob/living/carbon/C = mover
- if(C.stat) // Lets not prevent dragging unconscious/dead people.
+ var/mob/living/carbon/moving_carbon = mover
+ if(moving_carbon.stat) // Lets not prevent dragging unconscious/dead people.
return TRUE
- if(allow_walk && C.move_intent == MOVE_INTENT_WALK)
+ if(allow_walk && moving_carbon.move_intent == MOVE_INTENT_WALK)
return TRUE
+/obj/structure/holosign/barrier/ranged_item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+ . = ..()
+ if(tool != projector)
+ return
+ if(openable)
+ open(user)
+
+/obj/structure/holosign/barrier/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+ . = ..()
+ if(tool != projector)
+ return
+ qdel(src)
+
+/obj/structure/holosign/barrier/update_icon_state()
+ if(!opened)
+ icon_state = base_icon_state
+ else
+ icon_state = pass_icon_state
+
+ create_vis_overlay()
+ . = ..()
+
+/obj/structure/holosign/barrier/proc/open(user)
+ if(!openable)
+ balloon_alert(user, "unable!")
+ return
+
+ if(!COOLDOWN_FINISHED(src, cooldown_open))
+ balloon_alert(user, "on cooldown!")
+ return
+
+ if(!opened)
+ density = FALSE
+ opened = TRUE
+ playsound(src, 'sound/machines/door_open.ogg', 50, TRUE)
+ else
+ density = TRUE
+ opened = FALSE
+ playsound(src, 'sound/machines/door_close.ogg', 50, TRUE)
+
+ update_icon_state()
+ COOLDOWN_START(src, cooldown_open, 1 SECONDS)
+
/obj/structure/holosign/barrier/wetsign
name = "wet floor holobarrier"
- desc = "When it says walk it means walk."
- icon = 'icons/effects/effects.dmi'
- icon_state = "holosign"
+ desc = "When it says walk it means WALK!"
+ icon_state = "holosign_dense"
max_integrity = 1
+ openable = FALSE
/obj/structure/holosign/barrier/wetsign/CanAllowThrough(atom/movable/mover, border_dir)
. = ..()
@@ -97,7 +161,10 @@
return FALSE
/obj/structure/holosign/barrier/engineering
+ name = "engineering holobarrier"
+ desc = "A short engineering holographic barrier used for designating hazardous zones, slightly blocks radiation. Can only be passed by walking."
icon_state = "holosign_engi"
+ base_icon_state = "holosign_engi"
rad_insulation = RAD_LIGHT_INSULATION
max_integrity = 1
@@ -105,6 +172,7 @@
name = "holofirelock"
desc = "A holographic barrier resembling a firelock. Though it does not prevent solid objects from passing through, gas is kept out."
icon_state = "holo_firelock"
+ openable = FALSE
density = FALSE
anchored = TRUE
can_atmos_pass = ATMOS_PASS_NO
@@ -129,11 +197,13 @@
/obj/structure/holosign/barrier/atmos/sturdy
name = "sturdy holofirelock"
max_integrity = 150
+ openable = FALSE
/obj/structure/holosign/barrier/atmos/tram
name = "tram atmos barrier"
max_integrity = 150
icon_state = "holo_tram"
+ openable = FALSE
/obj/structure/holosign/barrier/atmos/Initialize(mapload)
. = ..()
@@ -166,9 +236,10 @@
name = "\improper PENLITE holobarrier"
desc = "A holobarrier that uses biometrics to detect human viruses. Denies passing to personnel with easily-detected, malicious viruses. Good for quarantines."
icon_state = "holo_medical"
- alpha = 125 //lazy :)
+ base_icon_state = "holo_medical"
max_integrity = 1
- var/buzzcd = 0
+ openable = FALSE
+ COOLDOWN_DECLARE(virus_detected)
/obj/structure/holosign/barrier/medical/CanAllowThrough(atom/movable/mover, border_dir)
. = ..()
@@ -183,12 +254,18 @@
/obj/structure/holosign/barrier/medical/Bumped(atom/movable/AM)
. = ..()
- icon_state = "holo_medical"
- if(ishuman(AM) && !CheckHuman(AM))
- if(buzzcd < world.time)
- playsound(get_turf(src),'sound/machines/buzz-sigh.ogg',65,TRUE,4)
- buzzcd = (world.time + 60)
- icon_state = "holo_medical-deny"
+ icon_state = base_icon_state
+ update_icon_state()
+ if(!ishuman(AM) && CheckHuman(AM))
+ return
+
+ if(!COOLDOWN_FINISHED(src, virus_detected))
+ return
+
+ playsound(get_turf(src),'sound/machines/buzz-sigh.ogg', 65, TRUE, 4)
+ COOLDOWN_START(src, virus_detected, 1 SECONDS)
+ icon_state = "holo_medical-deny"
+ update_icon_state()
/obj/structure/holosign/barrier/medical/proc/CheckHuman(mob/living/carbon/human/sickboi)
var/threat = sickboi.check_virus()
diff --git a/code/game/objects/structures/ladders.dm b/code/game/objects/structures/ladders.dm
index ef6ea9d433e8f8..314539aa2b4120 100644
--- a/code/game/objects/structures/ladders.dm
+++ b/code/game/objects/structures/ladders.dm
@@ -105,7 +105,20 @@
/obj/structure/ladder/proc/start_travelling(mob/user, going_up)
show_initial_fluff_message(user, going_up)
- if(do_after(user, travel_time, target = src, interaction_key = DOAFTER_SOURCE_CLIMBING_LADDER))
+
+ // Our climbers athletics ability
+ var/fitness_level = user.mind?.get_skill_level(/datum/skill/athletics)
+
+ // Misc bonuses to the climb speed.
+ var/misc_multiplier = 1
+
+ var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = user.get_organ_slot(ORGAN_SLOT_SPINE)
+ if(istype(potential_spine))
+ misc_multiplier *= potential_spine.athletics_boost_multiplier
+
+ var/final_travel_time = (travel_time - fitness_level) * misc_multiplier
+
+ if(do_after(user, final_travel_time, target = src, interaction_key = DOAFTER_SOURCE_CLIMBING_LADDER))
travel(user, going_up)
/// The message shown when the player starts climbing the ladder
diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm
index cf6fe65abe2744..0d7d23191742c7 100644
--- a/code/game/objects/structures/lattice.dm
+++ b/code/game/objects/structures/lattice.dm
@@ -23,6 +23,7 @@
if(length(give_turf_traits))
give_turf_traits = string_list(give_turf_traits)
AddElement(/datum/element/give_turf_traits, give_turf_traits)
+ AddElement(/datum/element/footstep_override, footstep = FOOTSTEP_CATWALK)
/datum/armor/structure_lattice
melee = 50
@@ -98,10 +99,6 @@
obj_flags = CAN_BE_HIT | BLOCK_Z_OUT_DOWN | BLOCK_Z_IN_UP
give_turf_traits = list(TRAIT_TURF_IGNORE_SLOWDOWN, TRAIT_LAVA_STOPPED, TRAIT_CHASM_STOPPED, TRAIT_IMMERSE_STOPPED, TRAIT_HYPERSPACE_STOPPED)
-/obj/structure/lattice/catwalk/Initialize(mapload)
- . = ..()
- AddElement(/datum/element/footstep_override, footstep = FOOTSTEP_CATWALK)
-
/obj/structure/lattice/catwalk/deconstruction_hints(mob/user)
return span_notice("The supporting rods look like they could be cut.")
diff --git a/code/game/objects/structures/lavaland/geyser.dm b/code/game/objects/structures/lavaland/geyser.dm
index 7ef40423e0d440..045a703250b0a7 100644
--- a/code/game/objects/structures/lavaland/geyser.dm
+++ b/code/game/objects/structures/lavaland/geyser.dm
@@ -45,7 +45,7 @@
///start making those CHHHHHEEEEEEMS. Called whenever chems are removed, it's fine because START_PROCESSING checks if we arent already processing
/obj/structure/geyser/proc/start_chemming()
- START_PROCESSING(SSplumbing, src) //It's main function is to be plumbed, so use SSplumbing
+ START_PROCESSING(SSplumbing, src) //Its main function is to be plumbed, so use SSplumbing
///We're full so stop processing
/obj/structure/geyser/proc/stop_chemming()
diff --git a/code/game/objects/structures/lavaland/gulag_vent.dm b/code/game/objects/structures/lavaland/gulag_vent.dm
index b564908cdc6c18..c269c5213e71a9 100644
--- a/code/game/objects/structures/lavaland/gulag_vent.dm
+++ b/code/game/objects/structures/lavaland/gulag_vent.dm
@@ -30,7 +30,14 @@
var/mob/living/living_user = user
occupied = TRUE
living_user.balloon_alert_to_viewers("hauling...")
- var/succeeded = do_after(living_user, 8 SECONDS, src)
+
+ var/boulder_lift_speed = 8 SECONDS
+
+ var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = living_user.get_organ_slot(ORGAN_SLOT_SPINE)
+ if(istype(potential_spine))
+ boulder_lift_speed *= potential_spine.athletics_boost_multiplier
+
+ var/succeeded = do_after(living_user, boulder_lift_speed, src)
occupied = FALSE
if (!succeeded)
return
diff --git a/code/game/objects/structures/lavaland/ore_vent.dm b/code/game/objects/structures/lavaland/ore_vent.dm
index cb9d203e3f2c77..024276198ab512 100644
--- a/code/game/objects/structures/lavaland/ore_vent.dm
+++ b/code/game/objects/structures/lavaland/ore_vent.dm
@@ -159,7 +159,7 @@
* This proc is called when the ore vent is initialized, in order to determine what minerals boulders it spawns can contain.
* The materials available are determined by SSore_generation.ore_vent_minerals, which is a list of all minerals that can be contained in ore vents for a given cave generation.
* As a result, minerals use a weighted list as seen by ore_vent_minerals_lavaland, which is then copied to ore_vent_minerals.
- * Once a material is picked from the weighted list, it's removed from ore_vent_minerals, so that it can't be picked again and provided it's own internal weight used when assigning minerals to boulders spawned by this vent.
+ * Once a material is picked from the weighted list, it's removed from ore_vent_minerals, so that it can't be picked again and provided its own internal weight used when assigning minerals to boulders spawned by this vent.
* May also be called after the fact, as seen in SSore_generation's initialize, to add more minerals to an existing vent.
*
* The above applies only when spawning in at mapload, otherwise we pick randomly from ore_vent_minerals_lavaland.
diff --git a/code/game/objects/structures/maintenance.dm b/code/game/objects/structures/maintenance.dm
index ecd6f54d2557a4..768bd22d2abe22 100644
--- a/code/game/objects/structures/maintenance.dm
+++ b/code/game/objects/structures/maintenance.dm
@@ -81,7 +81,7 @@ at the cost of risking a vicious bite.**/
if(critter_infested && prob(50) && iscarbon(user))
var/mob/living/carbon/bite_victim = user
var/obj/item/bodypart/affecting = bite_victim.get_bodypart("[(user.active_hand_index % 2 == 0) ? "r" : "l" ]_arm")
- to_chat(user, span_danger("You feel a sharp pain as an unseen creature sinks it's [pick("fangs", "beak", "proboscis")] into your arm!"))
+ to_chat(user, span_danger("You feel a sharp pain as an unseen creature sinks its [pick("fangs", "beak", "proboscis")] into your arm!"))
if(affecting?.receive_damage(30))
bite_victim.update_damage_overlays()
playsound(src,'sound/weapons/bite.ogg', 70, TRUE)
diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm
index d843454875742e..27997d3059c1ee 100644
--- a/code/game/objects/structures/morgue.dm
+++ b/code/game/objects/structures/morgue.dm
@@ -425,6 +425,10 @@ GLOBAL_LIST_EMPTY(crematoriums)
/obj/structure/bodycontainer/crematorium/Initialize(mapload)
. = ..()
+ if(mapload && check_holidays(ICE_CREAM_DAY) && !istype(src, /obj/structure/bodycontainer/crematorium/creamatorium))
+ var/obj/structure/bodycontainer/crematorium/creamatorium/creamy = new(loc)
+ creamy.id = id
+ return INITIALIZE_HINT_QDEL
GLOB.crematoriums += src
/obj/structure/bodycontainer/crematorium/Destroy()
diff --git a/code/game/objects/structures/shower.dm b/code/game/objects/structures/shower.dm
index c37be03652c57a..7faf3e5d478ec7 100644
--- a/code/game/objects/structures/shower.dm
+++ b/code/game/objects/structures/shower.dm
@@ -4,7 +4,7 @@
#define SHOWER_NORMAL_TEMP 300
#define SHOWER_BOILING "boiling"
#define SHOWER_BOILING_TEMP 400
-/// The volume of it's internal reagents the shower applies to everything it sprays.
+/// The volume of its internal reagents the shower applies to everything it sprays.
#define SHOWER_SPRAY_VOLUME 5
/// How much the volume of the shower's spay reagents are amplified by when it sprays something.
#define SHOWER_EXPOSURE_MULTIPLIER 2 // Showers effectively double exposed reagents
@@ -49,7 +49,7 @@ GLOBAL_LIST_INIT(shower_mode_descriptions, list(
var/reagent_capacity = 200
///How many units the shower refills every second.
var/refill_rate = 0.5
- ///Does the shower have a water recycler to recollect it's water supply?
+ ///Does the shower have a water recycler to recollect its water supply?
var/has_water_reclaimer = TRUE
///Which mode the shower is operating in.
var/mode = SHOWER_MODE_UNTIL_EMPTY
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 43ebb5ae53eef2..e44a2e2596a226 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -228,70 +228,100 @@
if(istype(tool, /obj/item/construction/rcd))
return NONE
+ var/deck_act_value = NONE
if(istype(tool, /obj/item/toy/cards/deck))
- var/obj/item/toy/cards/deck/dealer_deck = tool
- if(HAS_TRAIT(dealer_deck, TRAIT_WIELDED)) // deal a card faceup on the table
- var/obj/item/toy/singlecard/card = dealer_deck.draw(user)
- if(card)
- card.Flip()
- attackby(card, user, list2params(modifiers))
- return ITEM_INTERACT_SUCCESS
+ deck_act_value = deck_act(user, tool, modifiers, TRUE)
+ // Continue to placing if we don't do anything else
+ if(deck_act_value != NONE)
+ return deck_act_value
- return item_interaction(user, tool, modifiers)
+ if(!user.combat_mode)
+ return table_place_act(user, tool, modifiers)
+
+ return NONE
/obj/structure/table/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+ . = NONE
if(istype(tool, /obj/item/storage/bag/tray))
- var/obj/item/storage/bag/tray/tray = tool
- if(tray.contents.len > 0) // If the tray isn't empty
- for(var/obj/item/thing in tray.contents)
- AfterPutItemOnTable(thing, user)
- tool.atom_storage.remove_all(drop_location())
- user.visible_message(span_notice("[user] empties [tool] on [src]."))
- return ITEM_INTERACT_SUCCESS
- // If the tray IS empty, continue on (tray will be placed on the table like other items)
+ . = tray_act(user, tool)
+ else if(istype(tool, /obj/item/toy/cards/deck))
+ . = deck_act(user, tool, modifiers, FALSE)
+ else if(istype(tool, /obj/item/riding_offhand))
+ . = riding_offhand_act(user, tool)
- if(istype(tool, /obj/item/toy/cards/deck))
- var/obj/item/toy/cards/deck/dealer_deck = tool
- if(HAS_TRAIT(dealer_deck, TRAIT_WIELDED)) // deal a card facedown on the table
- var/obj/item/toy/singlecard/card = dealer_deck.draw(user)
- if(card)
- attackby(card, user, list2params(modifiers))
- return ITEM_INTERACT_SUCCESS
-
- if(istype(tool, /obj/item/riding_offhand))
- var/obj/item/riding_offhand/riding_item = tool
- var/mob/living/carried_mob = riding_item.rider
- if(carried_mob == user) //Piggyback user.
- return NONE
- if(user.combat_mode)
- user.unbuckle_mob(carried_mob)
- tablelimbsmash(user, carried_mob)
- else
- var/tableplace_delay = 3.5 SECONDS
- var/skills_space = ""
- if(HAS_TRAIT(user, TRAIT_QUICKER_CARRY))
- tableplace_delay = 2 SECONDS
- skills_space = " expertly"
- else if(HAS_TRAIT(user, TRAIT_QUICK_CARRY))
- tableplace_delay = 2.75 SECONDS
- skills_space = " quickly"
- carried_mob.visible_message(span_notice("[user] begins to[skills_space] place [carried_mob] onto [src]..."),
- span_userdanger("[user] begins to[skills_space] place [carried_mob] onto [src]..."))
- if(do_after(user, tableplace_delay, target = carried_mob))
- user.unbuckle_mob(carried_mob)
- tableplace(user, carried_mob)
- return ITEM_INTERACT_SUCCESS
+ // Continue to placing if we don't do anything else
+ if(. != NONE)
+ return .
- // Where putting things on tables is handled.
- if(!user.combat_mode && !(tool.item_flags & ABSTRACT) && user.transferItemToLoc(tool, drop_location(), silent = FALSE))
- //Clamp it so that the icon never moves more than 16 pixels in either direction (thus leaving the table turf)
- tool.pixel_x = clamp(text2num(LAZYACCESS(modifiers, ICON_X)) - 16, -(world.icon_size/2), world.icon_size/2)
- tool.pixel_y = clamp(text2num(LAZYACCESS(modifiers, ICON_Y)) - 16, -(world.icon_size/2), world.icon_size/2)
- AfterPutItemOnTable(tool, user)
- return ITEM_INTERACT_SUCCESS
+ if(!user.combat_mode)
+ return table_place_act(user, tool, modifiers)
return NONE
+/obj/structure/table/proc/tray_act(mob/living/user, obj/item/storage/bag/tray/used_tray)
+ if(used_tray.contents.len <= 0)
+ return NONE // If the tray IS empty, continue on (tray will be placed on the table like other items)
+
+ for(var/obj/item/thing in used_tray.contents)
+ AfterPutItemOnTable(thing, user)
+ used_tray.atom_storage.remove_all(drop_location())
+ user.visible_message(span_notice("[user] empties [used_tray] on [src]."))
+ return ITEM_INTERACT_SUCCESS
+
+/obj/structure/table/proc/deck_act(mob/living/user, obj/item/toy/cards/deck/dealer_deck, list/modifiers, flip)
+ if(!HAS_TRAIT(dealer_deck, TRAIT_WIELDED))
+ return NONE
+
+ var/obj/item/toy/singlecard/card = dealer_deck.draw(user)
+ if(isnull(card))
+ return ITEM_INTERACT_BLOCKING
+ if(flip)
+ card.Flip()
+ return table_place_act(user, card, modifiers)
+
+/obj/structure/table/proc/riding_offhand_act(mob/living/user, obj/item/riding_offhand/riding_item)
+ var/mob/living/carried_mob = riding_item.rider
+ if(carried_mob == user) //Piggyback user.
+ return NONE
+
+ if(user.combat_mode)
+ user.unbuckle_mob(carried_mob)
+ tablelimbsmash(user, carried_mob)
+ return ITEM_INTERACT_SUCCESS
+
+ var/tableplace_delay = 3.5 SECONDS
+ var/skills_space = ""
+ if(HAS_TRAIT(user, TRAIT_QUICKER_CARRY))
+ tableplace_delay = 2 SECONDS
+ skills_space = " expertly"
+ else if(HAS_TRAIT(user, TRAIT_QUICK_CARRY))
+ tableplace_delay = 2.75 SECONDS
+ skills_space = " quickly"
+
+ var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = user.get_organ_slot(ORGAN_SLOT_SPINE)
+ if(istype(potential_spine))
+ tableplace_delay *= potential_spine.athletics_boost_multiplier
+
+ carried_mob.visible_message(span_notice("[user] begins to[skills_space] place [carried_mob] onto [src]..."),
+ span_userdanger("[user] begins to[skills_space] place [carried_mob] onto [src]..."))
+ if(!do_after(user, tableplace_delay, target = carried_mob))
+ return ITEM_INTERACT_BLOCKING
+ user.unbuckle_mob(carried_mob)
+ tableplace(user, carried_mob)
+ return ITEM_INTERACT_SUCCESS
+
+// Where putting things on tables is handled.
+/obj/structure/table/proc/table_place_act(mob/living/user, obj/item/tool, list/modifiers)
+ if(tool.item_flags & ABSTRACT)
+ return NONE
+ if(!user.transferItemToLoc(tool, drop_location(), silent = FALSE))
+ return ITEM_INTERACT_BLOCKING
+ //Clamp it so that the icon never moves more than 16 pixels in either direction (thus leaving the table turf)
+ tool.pixel_x = clamp(text2num(LAZYACCESS(modifiers, ICON_X)) - 16, -(world.icon_size/2), world.icon_size/2)
+ tool.pixel_y = clamp(text2num(LAZYACCESS(modifiers, ICON_Y)) - 16, -(world.icon_size/2), world.icon_size/2)
+ AfterPutItemOnTable(tool, user)
+ return ITEM_INTERACT_SUCCESS
+
/obj/structure/table/proc/AfterPutItemOnTable(obj/item/thing, mob/living/user)
return
@@ -822,7 +852,7 @@
layer = TABLE_LAYER
density = TRUE
anchored = TRUE
- pass_flags_self = LETPASSTHROW //You can throw objects over this, despite it's density.
+ pass_flags_self = LETPASSTHROW //You can throw objects over this, despite its density.
max_integrity = 20
/obj/structure/rack/skeletal
diff --git a/code/game/objects/structures/water_structures/sink.dm b/code/game/objects/structures/water_structures/sink.dm
index 24cb2e806965fb..878dab578a52e5 100644
--- a/code/game/objects/structures/water_structures/sink.dm
+++ b/code/game/objects/structures/water_structures/sink.dm
@@ -14,7 +14,7 @@
var/buildstacktype = /obj/item/stack/sheet/iron
///Number of sheets of material to drop when broken or deconstructed.
var/buildstackamount = 1
- ///Does the sink have a water recycler to recollect it's water supply?
+ ///Does the sink 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
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index c9460fc9357f20..04428bb617fdb9 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -35,6 +35,8 @@
var/bloodied = FALSE
///Datum that the shard and debris type is pulled from for when the glass is broken.
var/datum/material/glass_material_datum = /datum/material/glass
+ /// Whether or not we're disappearing but dramatically
+ var/dramatically_disappearing = FALSE
/datum/armor/structure_window
melee = 50
@@ -428,6 +430,36 @@
return TRUE
+/obj/structure/window/proc/temporary_shatter(time_to_go = 1 SECONDS, time_to_return = 4 SECONDS, take_grill = TRUE)
+ if(dramatically_disappearing)
+ return
+
+ // do a cute breaking animation
+ var/static/time_interval = 2 DECISECONDS //per how many steps should we do damage?
+ for(var/damage_step in 1 to (floor(time_to_go / time_interval) - 1)) //10 ds / 2 ds = 5 damage steps, minus 1 so we dont actually break it
+ // slowly drain our total health for the illusion of shattering
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, take_damage), floor(atom_integrity / (time_to_go / time_interval))), time_interval * damage_step)
+
+ //dissapear in 1 second
+ dramatically_disappearing = TRUE
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), loc, break_sound, 70, TRUE), time_to_go) //SHATTER SOUND
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/movable, moveToNullspace)), time_to_go) //woosh
+
+ // come back in 1 + 4 seconds
+ addtimer(VARSET_CALLBACK(src, atom_integrity, atom_integrity), time_to_go + time_to_return) //set the health back (icon is updated on move)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/movable, forceMove), loc), time_to_go + time_to_return) //we back boys
+ addtimer(VARSET_CALLBACK(src, dramatically_disappearing, FALSE), time_to_go + time_to_return) //also set the var back
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), time_to_go + time_to_return)
+
+ var/obj/structure/grille/grill = take_grill ? (locate(/obj/structure/grille) in loc) : null
+ if(grill)
+ grill.temporary_shatter(time_to_go, time_to_return)
+
+/obj/structure/window/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change)
+ . = ..()
+ if(loc)
+ update_nearby_icons()
+
MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/spawner, 0)
/obj/structure/window/unanchored
diff --git a/code/game/turfs/closed/indestructible.dm b/code/game/turfs/closed/indestructible.dm
index 4e576ebede63d5..ed80e02a8be348 100644
--- a/code/game/turfs/closed/indestructible.dm
+++ b/code/game/turfs/closed/indestructible.dm
@@ -185,6 +185,9 @@ SKYRAT EDIT REMOVAL END */
smoothing_groups = SMOOTH_GROUP_ABDUCTOR_WALLS + SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS
canSmoothWith = SMOOTH_GROUP_ABDUCTOR_WALLS
+/turf/closed/indestructible/alien/nodiagonal
+ icon_state = "abductor_wall-15"
+ smoothing_flags = SMOOTH_BITMASK
/turf/closed/indestructible/cult
name = "runed metal wall"
diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm
index 304b2dbbdb72aa..8b29df20ed4c5b 100644
--- a/code/game/turfs/closed/minerals.dm
+++ b/code/game/turfs/closed/minerals.dm
@@ -278,7 +278,7 @@
/turf/closed/mineral/random
/// What are the base odds that this turf spawns a mineral in the wall on initialize?
var/mineralChance = 13
- /// Does this mineral determine it's random chance and mineral contents based on proximity to a vent? Overrides mineralChance and mineralAmt.
+ /// Does this mineral determine its random chance and mineral contents based on proximity to a vent? Overrides mineralChance and mineralAmt.
var/proximity_based = FALSE
/// Returns a list of the chances for minerals to spawn.
diff --git a/code/game/turfs/closed/walls.dm b/code/game/turfs/closed/walls.dm
index c9a00a0febab5c..0ff9e3c76d435a 100644
--- a/code/game/turfs/closed/walls.dm
+++ b/code/game/turfs/closed/walls.dm
@@ -99,7 +99,7 @@
if(is_station_level(z))
GLOB.station_turfs += src
if(smoothing_flags & SMOOTH_DIAGONAL_CORNERS && fixed_underlay) //Set underlays for the diagonal walls.
- var/mutable_appearance/underlay_appearance = mutable_appearance(layer = TURF_LAYER, offset_spokesman = src, plane = FLOOR_PLANE)
+ var/mutable_appearance/underlay_appearance = mutable_appearance(layer = LOW_FLOOR_LAYER, offset_spokesman = src, plane = FLOOR_PLANE)
if(fixed_underlay["space"])
generate_space_underlay(underlay_appearance, src)
else
diff --git a/code/game/turfs/open/_open.dm b/code/game/turfs/open/_open.dm
index 20f9c67aabf5b5..777adb9bb2cb12 100644
--- a/code/game/turfs/open/_open.dm
+++ b/code/game/turfs/open/_open.dm
@@ -1,4 +1,5 @@
/turf/open
+ layer = LOW_FLOOR_LAYER
plane = FLOOR_PLANE
///negative for faster, positive for slower
var/slowdown = 0
diff --git a/code/game/turfs/open/asteroid.dm b/code/game/turfs/open/asteroid.dm
index 8db5753a7196b7..d0234b826a219d 100644
--- a/code/game/turfs/open/asteroid.dm
+++ b/code/game/turfs/open/asteroid.dm
@@ -151,7 +151,7 @@ GLOBAL_LIST_EMPTY(dug_up_basalt)
/turf/open/misc/asteroid/basalt/refill_dug()
. = ..()
GLOB.dug_up_basalt -= src
- set_basalt_light(src)
+ set_basalt_light()
/turf/open/misc/asteroid/basalt/lava //lava underneath
baseturfs = /turf/open/lava/smooth
@@ -162,14 +162,14 @@ GLOBAL_LIST_EMPTY(dug_up_basalt)
/turf/open/misc/asteroid/basalt/Initialize(mapload)
. = ..()
- set_basalt_light(src)
+ set_basalt_light()
-/proc/set_basalt_light(turf/open/floor/B)
- switch(B.icon_state)
+/turf/open/misc/asteroid/basalt/proc/set_basalt_light()
+ switch(icon_state)
if("basalt1", "basalt2", "basalt3")
- B.set_light(2, 0.6, LIGHT_COLOR_LAVA) //more light
+ set_light(BASALT_LIGHT_RANGE_BRIGHT, BASALT_LIGHT_POWER, LIGHT_COLOR_LAVA) //more light
if("basalt5", "basalt9")
- B.set_light(1.4, 0.6, LIGHT_COLOR_LAVA) //barely anything!
+ set_light(BASALT_LIGHT_RANGE_DIM, BASALT_LIGHT_POWER, LIGHT_COLOR_LAVA) //barely anything!
///////Surface. The surface is warm, but survivable without a suit. Internals are required. The floors break to chasms, which drop you into the underground.
@@ -311,3 +311,18 @@ GLOBAL_LIST_EMPTY(dug_up_basalt)
floor_variance = 0
base_icon_state = "moon_dug"
icon_state = "moon_dug"
+
+ //used in outpost45
+
+/turf/open/misc/asteroid/plasma //floor piece
+ gender = PLURAL
+ name = "asteroid gravel"
+ desc = "It's coarse and rough and gets everywhere."
+ baseturfs = /turf/open/misc/asteroid
+ icon = 'icons/turf/floors.dmi'
+ damaged_dmi = 'icons/turf/floors.dmi'
+ icon_state = "asteroid"
+ base_icon_state = "asteroid"
+ initial_gas_mix = "co2=173.4;n2=135.1;plasma=229.8;TEMP=351.9"
+ planetary_atmos = TRUE
+
diff --git a/code/game/turfs/open/basalt.dm b/code/game/turfs/open/basalt.dm
index e52a6053a6efeb..e1a423d3c47f65 100644
--- a/code/game/turfs/open/basalt.dm
+++ b/code/game/turfs/open/basalt.dm
@@ -11,7 +11,11 @@
AddElement(/datum/element/diggable, /obj/item/stack/ore/glass/basalt, 2)
if(prob(15))
icon_state = "basalt[rand(0, 12)]"
- set_basalt_light(src)
+ switch(icon_state)
+ if("basalt1", "basalt2", "basalt3")
+ set_light(BASALT_LIGHT_RANGE_BRIGHT, BASALT_LIGHT_POWER, LIGHT_COLOR_LAVA)
+ if("basalt5", "basalt9")
+ set_light(BASALT_LIGHT_RANGE_DIM, BASALT_LIGHT_POWER, LIGHT_COLOR_LAVA)
/turf/open/misc/basalt/safe
planetary_atmos = FALSE
diff --git a/code/game/turfs/open/floor/catwalk_plating.dm b/code/game/turfs/open/floor/catwalk_plating.dm
index 57bd0b74107eeb..6e2979b8512f97 100644
--- a/code/game/turfs/open/floor/catwalk_plating.dm
+++ b/code/game/turfs/open/floor/catwalk_plating.dm
@@ -19,14 +19,10 @@
rust_resistance = RUST_RESISTANCE_BASIC
var/covered = TRUE
var/catwalk_type = "maint"
- var/static/list/catwalk_underlays = list()
/turf/open/floor/catwalk_floor/Initialize(mapload)
. = ..()
- if(!catwalk_underlays[catwalk_type])
- var/mutable_appearance/plating_underlay = mutable_appearance(icon, "[catwalk_type]_below", TURF_LAYER)
- catwalk_underlays[catwalk_type] = plating_underlay
- underlays += catwalk_underlays[catwalk_type]
+ underlays += mutable_appearance(icon, "[catwalk_type]_below", LOW_FLOOR_LAYER, src, FLOOR_PLANE)
update_appearance()
/turf/open/floor/catwalk_floor/examine(mob/user)
@@ -43,7 +39,7 @@
covered = !covered
if(!covered)
underfloor_accessibility = UNDERFLOOR_INTERACTABLE
- layer = TURF_LAYER
+ layer = LOW_FLOOR_LAYER
icon_state = "[catwalk_type]_below"
else
underfloor_accessibility = UNDERFLOOR_VISIBLE
@@ -80,12 +76,6 @@
floor_tile = /obj/item/stack/tile/catwalk_tile/iron_dark
catwalk_type = "darkiron"
-/turf/open/floor/catwalk_floor/flat_white
- name = "white large plated catwalk floor"
- icon_state = "flatwhite_above"
- floor_tile = /obj/item/stack/tile/catwalk_tile/flat_white
- catwalk_type = "flatwhite"
-
/turf/open/floor/catwalk_floor/titanium
name = "titanium plated catwalk floor"
icon_state = "titanium_above"
@@ -115,9 +105,6 @@
/turf/open/floor/catwalk_floor/iron_dark/telecomms
initial_gas_mix = TCOMMS_ATMOS
-/turf/open/floor/catwalk_floor/flat_white/airless
- initial_gas_mix = AIRLESS_ATMOS
-
/turf/open/floor/catwalk_floor/titanium/Airless
initial_gas_mix = AIRLESS_ATMOS
diff --git a/code/game/turfs/open/floor/fancy_floor.dm b/code/game/turfs/open/floor/fancy_floor.dm
index cfece702af4f1f..370d65b92865ef 100644
--- a/code/game/turfs/open/floor/fancy_floor.dm
+++ b/code/game/turfs/open/floor/fancy_floor.dm
@@ -242,7 +242,11 @@
AddElement(/datum/element/diggable, /obj/item/stack/ore/glass/basalt, 2, worm_chance = 0)
if(prob(15))
icon_state = "basalt[rand(0, 12)]"
- set_basalt_light(src)
+ switch(icon_state)
+ if("basalt1", "basalt2", "basalt3")
+ set_light(BASALT_LIGHT_RANGE_BRIGHT, BASALT_LIGHT_POWER, LIGHT_COLOR_LAVA)
+ if("basalt5", "basalt9")
+ set_light(BASALT_LIGHT_RANGE_DIM, BASALT_LIGHT_POWER, LIGHT_COLOR_LAVA)
/turf/open/floor/carpet
name = "carpet"
@@ -871,6 +875,7 @@
icon = 'icons/turf/space.dmi'
icon_state = "space"
floor_tile = /obj/item/stack/tile/fakespace
+ layer = SPACE_LAYER
plane = PLANE_SPACE
tiled_dirt = FALSE
damaged_dmi = 'icons/turf/space.dmi'
diff --git a/code/game/turfs/open/openspace.dm b/code/game/turfs/open/openspace.dm
index f250be2b51779a..1af42be3071cd1 100644
--- a/code/game/turfs/open/openspace.dm
+++ b/code/game/turfs/open/openspace.dm
@@ -10,6 +10,7 @@
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
pathing_pass_method = TURF_PATHING_PASS_PROC
plane = TRANSPARENT_FLOOR_PLANE
+ layer = SPACE_LAYER
rust_resistance = RUST_RESISTANCE_ABSOLUTE
var/can_cover_up = TRUE
var/can_build_on = TRUE
diff --git a/code/game/turfs/open/planet.dm b/code/game/turfs/open/planet.dm
index 893942fc49c52e..e0fe7e842b941d 100644
--- a/code/game/turfs/open/planet.dm
+++ b/code/game/turfs/open/planet.dm
@@ -78,6 +78,9 @@
/turf/open/misc/grass/jungle/lavaland
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
+/turf/open/misc/grass/jungle/station
+ baseturfs = /turf/open/misc/dirt/station
+
/turf/closed/mineral/random/jungle
baseturfs = /turf/open/misc/dirt/dark/jungle
diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm
index fd3806c6a9ec05..3eb5deb0c25f9d 100644
--- a/code/modules/admin/IsBanned.dm
+++ b/code/modules/admin/IsBanned.dm
@@ -1,6 +1,6 @@
//Blocks an attempt to connect before even creating our client datum thing.
-//How many new ckey matches before we revert the stickyban to it's roundstart state
+//How many new ckey matches before we revert the stickyban to its roundstart state
//These are exclusive, so once it goes over one of these numbers, it reverts the ban
#define STICKYBAN_MAX_MATCHES 15
#define STICKYBAN_MAX_EXISTING_USER_MATCHES 3 //ie, users who were connected before the ban triggered
diff --git a/code/modules/admin/create_mob.dm b/code/modules/admin/create_mob.dm
index e25205d50e7991..77d1546eeb71ae 100644
--- a/code/modules/admin/create_mob.dm
+++ b/code/modules/admin/create_mob.dm
@@ -42,16 +42,6 @@
* (IE, no wacky hair styles / colors)
*/
/proc/randomize_human_normie(mob/living/carbon/human/human, randomize_mutations = FALSE)
- var/static/list/natural_hair_colors = list(
- "#111111", "#362925", "#3B3831", "#41250C", "#412922",
- "#544C49", "#583322", "#593029", "#703b30", "#714721",
- "#744729", "#74482a", "#7b746e", "#855832", "#863019",
- "#8c4734", "#9F550E", "#A29A96", "#A4381C", "#B17B41",
- "#C0BAB7", "#EFE5E4", "#F7F3F1", "#FFF2D6", "#a15537",
- "#a17e61", "#b38b67", "#ba673c", "#c89f73", "#d9b380",
- "#dbc9b8", "#e1621d", "#e17d17", "#e1af93", "#f1cc8f",
- "#fbe7a1",
- )
// Sorry enbys but statistically you are not average enough
human.gender = human.dna.species.sexes ? pick(MALE, FEMALE) : PLURAL
human.physique = human.gender
@@ -61,14 +51,14 @@
human.eye_color_right = human.eye_color_left
human.skin_tone = pick(GLOB.skin_tones)
// No underwear generation handled here
- var/picked_color = pick(natural_hair_colors)
+ var/picked_color = random_hair_color()
human.set_haircolor(picked_color, update = FALSE)
human.set_facial_haircolor(picked_color, update = FALSE)
var/datum/sprite_accessory/hairstyle = SSaccessories.hairstyles_list[random_hairstyle(human.gender)]
- if(hairstyle?.natural_spawn)
+ if(hairstyle && hairstyle.natural_spawn && !hairstyle.locked)
human.set_hairstyle(hairstyle.name, update = FALSE)
var/datum/sprite_accessory/facial_hair = SSaccessories.facial_hairstyles_list[random_facial_hairstyle(human.gender)]
- if(facial_hair?.natural_spawn)
+ if(facial_hair && facial_hair.natural_spawn && !facial_hair.locked)
human.set_facial_hairstyle(facial_hair.name, update = FALSE)
// Normal DNA init stuff, these can generally be wacky but we care less, they're aliens after all
human.dna.initialize_dna(newblood_type = random_blood_type(), create_mutation_blocks = randomize_mutations, randomize_features = TRUE)
diff --git a/code/modules/admin/outfit_manager.dm b/code/modules/admin/outfit_manager.dm
index f3ef7d2685c228..c5f14db8ae3e82 100644
--- a/code/modules/admin/outfit_manager.dm
+++ b/code/modules/admin/outfit_manager.dm
@@ -7,9 +7,6 @@ ADMIN_VERB(outfit_manager, R_DEBUG|R_ADMIN, "Outfit Manager", "View and edit out
/datum/outfit_manager/ui_state(mob/user)
return GLOB.admin_state
-/datum/outfit_manager/ui_close(mob/user)
- qdel(src)
-
/datum/outfit_manager/ui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
diff --git a/code/modules/admin/sql_ban_system.dm b/code/modules/admin/sql_ban_system.dm
index e8e3ef6fb36a29..4f1e84b4cf295e 100644
--- a/code/modules/admin/sql_ban_system.dm
+++ b/code/modules/admin/sql_ban_system.dm
@@ -433,6 +433,7 @@
ROLE_WIZARD,
ROLE_BORER, // SKYRAT EDIT ADDITION
ROLE_ASSAULT_OPERATIVE, // SKYRAT EDIT ADDITION
+ ROLE_VOIDWALKER,
),
"Skyrat Ban Options" = list(
BAN_PACIFICATION,
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index dc851793775356..42d51b0b3499c5 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -1764,6 +1764,15 @@
if(!paper_to_show)
return
paper_to_show.ui_interact(usr)
+ else if (href_list["print_fax"])
+ if(!check_rights(R_ADMIN))
+ return
+
+ for(var/obj/machinery/fax/FAX as anything in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/fax))
+ if(!is_centcom_level(FAX.z))
+ continue
+
+ FAX.receive(locate(href_list["print_fax"]), href_list["fax_name"])
// SKYRAT EDIT ADDITION START
else if(href_list["pass_opfor_candidate"])
if(!check_rights(R_ADMIN))
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index 23676cd8ea9090..4c984c42b71ae4 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -246,7 +246,7 @@ ADMIN_VERB(cmd_admin_pm_panel, R_NONE, "Admin PM", "Show a list of clients to PM
request = "[request] an Administrator."
else
request = "[request] [recipient_print_key]."
- //get message text, limit it's length.and clean/escape html
+ //get message text, limit its length.and clean/escape html
msg = input(src,"Message:", request) as message|null
msg = trim(msg)
diff --git a/code/modules/admin/verbs/ai_triumvirate.dm b/code/modules/admin/verbs/ai_triumvirate.dm
new file mode 100644
index 00000000000000..d63994a25c3197
--- /dev/null
+++ b/code/modules/admin/verbs/ai_triumvirate.dm
@@ -0,0 +1,49 @@
+
+///global reference to the current theme, if there is one.
+GLOBAL_DATUM(triple_ai_controller, /datum/triple_ai_controller)
+
+/**
+ * The triple ai controller handles the admin triple AI mode, if enabled.
+ * It is first created when "Toggle AI Triumvirate" triggers it, and it can be referenced from GLOB.triple_ai_controller
+ * After it handles roundstart business, it cleans itself up.
+ */
+/datum/triple_ai_controller
+
+/datum/triple_ai_controller/New()
+ . = ..()
+ RegisterSignal(SSjob, COMSIG_OCCUPATIONS_DIVIDED, PROC_REF(on_occupations_divided))
+
+/datum/triple_ai_controller/proc/on_occupations_divided(datum/source, pure, allow_all)
+ SIGNAL_HANDLER
+
+ for(var/datum/job/ai/ai_datum in SSjob.joinable_occupations)
+ ai_datum.spawn_positions = 3
+ if(!pure)
+ for(var/obj/effect/landmark/start/ai/secondary/secondary_ai_spawn in GLOB.start_landmarks_list)
+ secondary_ai_spawn.latejoin_active = TRUE
+ qdel(src)
+
+/datum/triple_ai_controller/Destroy(force)
+ UnregisterSignal(SSjob, COMSIG_OCCUPATIONS_DIVIDED)
+ GLOB.triple_ai_controller = null
+ . = ..()
+
+/client/proc/triple_ai()
+ set category = "Admin.Events"
+ set name = "Toggle AI Triumvirate"
+
+ if(SSticker.current_state > GAME_STATE_PREGAME)
+ to_chat(usr, "This option is currently only usable during pregame. This may change at a later date.", confidential = TRUE)
+ return
+
+ var/datum/job/job = SSjob.GetJobType(/datum/job/ai)
+ if(!job)
+ to_chat(usr, "Unable to locate the AI job", confidential = TRUE)
+ CRASH("triple_ai() called, no /datum/job/ai to be found.")
+
+ if(!GLOB.triple_ai_controller)
+ GLOB.triple_ai_controller = new()
+ else
+ QDEL_NULL(GLOB.triple_ai_controller)
+ to_chat(usr, "There will[GLOB.triple_ai_controller ? "" : "not"] be an AI Triumvirate at round start.")
+ message_admins(span_adminnotice("[key_name_admin(usr)] has toggled [GLOB.triple_ai_controller ? "on" : "off"] triple AIs at round start."))
diff --git a/code/modules/admin/verbs/secrets.dm b/code/modules/admin/verbs/secrets.dm
index c124a5fba2266c..107d74d9c3975d 100644
--- a/code/modules/admin/verbs/secrets.dm
+++ b/code/modules/admin/verbs/secrets.dm
@@ -257,6 +257,11 @@ ADMIN_VERB(secrets, R_NONE, "Secrets", "Abuse harder than you ever have before w
return
holder.anon_names()
SSblackbox.record_feedback("nested tally", "admin_secrets_fun_used", 1, list("Anonymous Names"))
+ if("tripleAI")
+ if(!is_funmin)
+ return
+ holder.triple_ai()
+ SSblackbox.record_feedback("nested tally", "admin_secrets_fun_used", 1, list("Triple AI"))
if("onlyone")
if(!is_funmin)
return
diff --git a/code/modules/admin/verbs/server.dm b/code/modules/admin/verbs/server.dm
index 71000fd310d18f..e3a66dcd1b3cfe 100644
--- a/code/modules/admin/verbs/server.dm
+++ b/code/modules/admin/verbs/server.dm
@@ -74,6 +74,9 @@ ADMIN_VERB(toggle_ooc_dead, R_ADMIN, "Toggle Dead OOC", "Toggle the OOC channel
message_admins("[key_name_admin(user)] toggled Dead OOC.")
SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle Dead OOC", "[GLOB.dooc_allowed ? "Enabled" : "Disabled"]"))
+ADMIN_VERB(toggle_vote_dead, R_ADMIN, "Toggle Dead Vote", "Toggle the vote for dead players on or off.", ADMIN_CATEGORY_SERVER)
+ SSvote.toggle_dead_voting(user)
+
ADMIN_VERB(start_now, R_SERVER, "Start Now", "Start the round RIGHT NOW.", ADMIN_CATEGORY_SERVER)
var/static/list/waiting_states = list(GAME_STATE_PREGAME, GAME_STATE_STARTUP)
if(!(SSticker.current_state in waiting_states))
diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm
index 440feb91b76220..56ee817f0f5c19 100644
--- a/code/modules/antagonists/_common/antag_spawner.dm
+++ b/code/modules/antagonists/_common/antag_spawner.dm
@@ -187,7 +187,7 @@
desc = "A single-use beacon designed to quickly launch reinforcement clown operatives into the field."
special_role_name = ROLE_CLOWN_OPERATIVE
outfit = /datum/outfit/syndicate/clownop/no_crystals
- antag_datum = /datum/antagonist/nukeop/clownop
+ antag_datum = /datum/antagonist/nukeop/reinforcement/clownop
pod_style = STYLE_HONK
use_subtypes = FALSE
diff --git a/code/modules/antagonists/blob/overmind.dm b/code/modules/antagonists/blob/overmind.dm
index ea6706f96e999e..217a215e8753c4 100644
--- a/code/modules/antagonists/blob/overmind.dm
+++ b/code/modules/antagonists/blob/overmind.dm
@@ -206,7 +206,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
if(live_guy.stat != DEAD)
live_guy.investigate_log("has died from blob takeover.", INVESTIGATE_DEATHS)
live_guy.death()
- create_spore(guy_turf)
+ create_spore(guy_turf, spore_type = /mob/living/basic/blob_minion/spore)
else
live_guy.fully_heal()
diff --git a/code/modules/antagonists/brother/brother.dm b/code/modules/antagonists/brother/brother.dm
index d84aa5131bf798..f608ae6ccaf51e 100644
--- a/code/modules/antagonists/brother/brother.dm
+++ b/code/modules/antagonists/brother/brother.dm
@@ -94,7 +94,7 @@
flashed.balloon_alert(source, "[flashed.p_theyre()] loyal to someone else!")
return
- if (HAS_TRAIT(flashed, TRAIT_MINDSHIELD) || flashed.mind.assigned_role?.departments_bitflags & DEPARTMENT_BITFLAG_SECURITY)
+ if (HAS_TRAIT(flashed, TRAIT_MINDSHIELD))
flashed.balloon_alert(source, "[flashed.p_they()] resist!")
return
diff --git a/code/modules/antagonists/changeling/powers/adrenaline.dm b/code/modules/antagonists/changeling/powers/adrenaline.dm
index 3b6a550b18b0f4..72bf91f1919f29 100644
--- a/code/modules/antagonists/changeling/powers/adrenaline.dm
+++ b/code/modules/antagonists/changeling/powers/adrenaline.dm
@@ -14,7 +14,7 @@
if(!.)
return FALSE
- if(HAS_TRAIT_FROM(user, TRAIT_IGNOREDAMAGESLOWDOWN, CHANGELING_TRAIT))
+ if(HAS_TRAIT_FROM(user, TRAIT_PARALYSIS_L_ARM, CHANGELING_TRAIT) || HAS_TRAIT_FROM(user, TRAIT_PARALYSIS_R_ARM, CHANGELING_TRAIT))
user.balloon_alert(user, "already boosted!")
return FALSE
@@ -40,7 +40,8 @@
var/our_leg_zones = (GLOB.all_body_zones - GLOB.leg_zones)
user.regenerate_limbs(excluded_zones = our_leg_zones) // why is this exclusive rather than inclusive
- user.add_traits(list(TRAIT_IGNOREDAMAGESLOWDOWN, TRAIT_PARALYSIS_L_ARM, TRAIT_PARALYSIS_R_ARM), CHANGELING_TRAIT)
+ user.add_traits(list(TRAIT_PARALYSIS_L_ARM, TRAIT_PARALYSIS_R_ARM), CHANGELING_TRAIT)
+ user.add_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown)
// Revert above mob changes.
addtimer(CALLBACK(src, PROC_REF(unsting_action), user), 20 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE)
@@ -57,4 +58,5 @@
/datum/action/changeling/adrenaline/proc/unsting_action(mob/living/user)
to_chat(user, span_changeling("The muscles in our limbs shift back to their usual places."))
- user.remove_traits(list(TRAIT_IGNOREDAMAGESLOWDOWN, TRAIT_PARALYSIS_L_ARM, TRAIT_PARALYSIS_R_ARM), CHANGELING_TRAIT)
+ user.remove_traits(list(TRAIT_PARALYSIS_L_ARM, TRAIT_PARALYSIS_R_ARM), CHANGELING_TRAIT)
+ user.remove_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown)
diff --git a/code/modules/antagonists/clown_ops/clownop.dm b/code/modules/antagonists/clown_ops/clownop.dm
index 85cf2c0f631e7b..07c1cc84ad756b 100644
--- a/code/modules/antagonists/clown_ops/clownop.dm
+++ b/code/modules/antagonists/clown_ops/clownop.dm
@@ -65,6 +65,11 @@
if(liver)
ADD_TRAIT(liver, TRAIT_COMEDY_METABOLISM, CLOWNOP_TRAIT)
+// Clown op reinforcements
+/datum/antagonist/nukeop/reinforcement/clownop
+ name = "Clown Operative Reinforcement"
+ nukeop_outfit = /datum/outfit/syndicate/clownop/no_crystals
+
/datum/outfit/clown_operative
name = "Clown Operative (Preview only)"
diff --git a/code/modules/antagonists/clown_ops/outfits.dm b/code/modules/antagonists/clown_ops/outfits.dm
index 7dc84b56d856fb..fb025e40dbd20c 100644
--- a/code/modules/antagonists/clown_ops/outfits.dm
+++ b/code/modules/antagonists/clown_ops/outfits.dm
@@ -24,6 +24,7 @@
id_trim = /datum/id_trim/chameleon/operative/clown
/datum/outfit/syndicate/clownop/no_crystals
+ name = "Clown Operative - Reinforcement"
tc = 0
/datum/outfit/syndicate/clownop/leader
diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm
index f680ab00bb6a82..bc71d9386824f4 100644
--- a/code/modules/antagonists/cult/blood_magic.dm
+++ b/code/modules/antagonists/cult/blood_magic.dm
@@ -12,7 +12,7 @@
default_button_position = DEFAULT_BLOODSPELLS
var/list/spells = list()
var/channeling = FALSE
- /// If the magic has been enhanced somehow, likely due to a crimson focus.
+ /// If the magic has been enhanced somehow, likely due to a crimson medallion.
var/magic_enhanced = FALSE
/datum/action/innate/cult/blood_magic/Remove()
diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm
index 595d95c168ebf5..ceaa5a0694386c 100644
--- a/code/modules/antagonists/cult/cult_items.dm
+++ b/code/modules/antagonists/cult/cult_items.dm
@@ -85,6 +85,7 @@ Striking a noncultist, however, will tear their flesh."}
speed = 4 SECONDS, \
effectiveness = 100, \
)
+ ADD_TRAIT(src, TRAIT_CONTRABAND, INNATE_TRAIT)
/obj/item/melee/cultblade/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK, damage_type = BRUTE)
if(IS_CULTIST(owner) && prob(final_block_chance))
@@ -210,6 +211,7 @@ Striking a noncultist, however, will tear their flesh."}
awakener = awakener,\
allow_renaming = FALSE,\
allow_channeling = FALSE,\
+ allow_exorcism = FALSE,\
)
// Get the heretic's new body and antag datum.
@@ -658,6 +660,10 @@ Striking a noncultist, however, will tear their flesh."}
righthand_file = 'icons/mob/inhands/items/drinks_righthand.dmi'
list_reagents = list(/datum/reagent/fuel/unholywater = 50)
+/obj/item/reagent_containers/cup/beaker/unholywater/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_CONTRABAND, INNATE_TRAIT)
+
///how many times can the shuttle be cursed?
#define MAX_SHUTTLE_CURSES 3
///if the max number of shuttle curses are used within this duration, the entire cult gets an achievement
diff --git a/code/modules/antagonists/cult/cult_structure_archives.dm b/code/modules/antagonists/cult/cult_structure_archives.dm
index d3a96dd1f77aad..9917d9505f7bea 100644
--- a/code/modules/antagonists/cult/cult_structure_archives.dm
+++ b/code/modules/antagonists/cult/cult_structure_archives.dm
@@ -2,7 +2,7 @@
#define CULT_BLINDFOLD "Zealot's Blindfold"
#define CURSE_ORB "Shuttle Curse"
#define VEIL_WALKER "Veil Walker Set"
-#define CRIMSON_FOCUS "Crimson Focus"
+#define CRIMSON_MEDALLION "Crimson Medallion"
// Cult archives. Gives out utility items.
/obj/structure/destructible/cult/item_dispenser/archives
@@ -38,11 +38,11 @@
options += extra_item
/obj/structure/destructible/cult/item_dispenser/archives/extra_options()
- if(!cult_team?.unlocked_heretic_items[CRIMSON_FOCUS_UNLOCKED])
+ if(!cult_team?.unlocked_heretic_items[CRIMSON_MEDALLION_UNLOCKED])
return
- return list(CRIMSON_FOCUS = list(
- PREVIEW_IMAGE = image(icon = 'icons/obj/clothing/neck.dmi', icon_state = "crimson_focus"),
- OUTPUT_ITEMS = list(/obj/item/clothing/neck/heretic_focus/crimson_focus),
+ return list(CRIMSON_MEDALLION = list(
+ PREVIEW_IMAGE = image(icon = 'icons/obj/clothing/neck.dmi', icon_state = "crimson_medallion"),
+ OUTPUT_ITEMS = list(/obj/item/clothing/neck/heretic_focus/crimson_medallion),
),
)
@@ -56,4 +56,4 @@
#undef CULT_BLINDFOLD
#undef CURSE_ORB
#undef VEIL_WALKER
-#undef CRIMSON_FOCUS
+#undef CRIMSON_MEDALLION
diff --git a/code/modules/antagonists/cult/cult_structures.dm b/code/modules/antagonists/cult/cult_structures.dm
index 5067dcf9799049..2cdb2c2e6f4688 100644
--- a/code/modules/antagonists/cult/cult_structures.dm
+++ b/code/modules/antagonists/cult/cult_structures.dm
@@ -131,6 +131,7 @@
COOLDOWN_START(src, use_cooldown, use_cooldown_duration)
for(var/item_to_make in spawned_items)
var/obj/item/made_item = new item_to_make(get_turf(src))
+ ADD_TRAIT(made_item, TRAIT_CONTRABAND, INNATE_TRAIT)
succcess_message(user, made_item)
diff --git a/code/modules/antagonists/cult/datums/cult_team.dm b/code/modules/antagonists/cult/datums/cult_team.dm
index 09d4a25a321c41..72c7df8bf5d141 100644
--- a/code/modules/antagonists/cult/datums/cult_team.dm
+++ b/code/modules/antagonists/cult/datums/cult_team.dm
@@ -22,7 +22,7 @@
/// List that keeps track of which items have been unlocked after a heretic was sacked.
var/list/unlocked_heretic_items = list(
CURSED_BLADE_UNLOCKED = FALSE,
- CRIMSON_FOCUS_UNLOCKED = FALSE,
+ CRIMSON_MEDALLION_UNLOCKED = FALSE,
PROTEON_ORB_UNLOCKED = FALSE,
)
diff --git a/code/modules/antagonists/cult/datums/cultist.dm b/code/modules/antagonists/cult/datums/cultist.dm
index b0fbea4421aa91..f56d79a8f4b183 100644
--- a/code/modules/antagonists/cult/datums/cultist.dm
+++ b/code/modules/antagonists/cult/datums/cultist.dm
@@ -151,7 +151,8 @@
///Attempts to make a new item and put it in a potential inventory slot in the provided mob.
/datum/antagonist/cult/proc/cult_give_item(obj/item/item_path, mob/living/carbon/human/mob)
- var/item = new item_path(mob)
+ var/obj/item = new item_path(mob)
+ ADD_TRAIT(item, TRAIT_CONTRABAND, INNATE_TRAIT)
var/where = mob.equip_conspicuous_item(item)
if(!where)
to_chat(mob, span_userdanger("Unfortunately, you weren't able to get [item]. This is very bad and you should adminhelp immediately (press F1)."))
diff --git a/code/modules/antagonists/cult/sword_fling.dm b/code/modules/antagonists/cult/sword_fling.dm
index 766f97917de60a..83238b0d8a2f46 100644
--- a/code/modules/antagonists/cult/sword_fling.dm
+++ b/code/modules/antagonists/cult/sword_fling.dm
@@ -55,6 +55,8 @@
particle_to_spawn = /obj/effect/particle_effect/sparks/electricity
new particle_to_spawn(get_turf(loccer))
+ loccer.shake_up_animation()
+ playsound(loccer, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
if(prob(resist_chance))
flinged_sword.forceMove(get_turf(loccer))
@@ -82,6 +84,9 @@
flinged_sword.throw_at(cast_on, cast_range, flinged_sword.throw_speed, owner)
flinged_sword.visible_message(\
span_warning("\the [flinged_sword] lunges at \the [cast_on]!"))
+ playsound(flinged_sword, 'sound/items/haunted/ghostitemattack.ogg', 100, TRUE)
+ flinged_sword.add_filter("cool_glow", 2, list("type" = "outline", "color" = COLOR_HERETIC_GREEN, "size" = 0.7))
+ addtimer(CALLBACK(flinged_sword, TYPE_PROC_REF(/datum, remove_filter), "cool_glow"), 0.7 SECONDS)
/obj/effect/temp_visual/eldritch_sparks
icon_state = "purplesparkles"
diff --git a/code/modules/antagonists/heretic/heretic_antag.dm b/code/modules/antagonists/heretic/heretic_antag.dm
index 8f788697d42806..1e40f0fff38566 100644
--- a/code/modules/antagonists/heretic/heretic_antag.dm
+++ b/code/modules/antagonists/heretic/heretic_antag.dm
@@ -88,7 +88,7 @@
/// List that keeps track of which items have been gifted to the heretic after a cultist was sacrificed. Used to alter drop chances to reduce dupes.
var/list/unlocked_heretic_items = list(
/obj/item/melee/sickly_blade/cursed = 0,
- /obj/item/clothing/neck/heretic_focus/crimson_focus = 0,
+ /obj/item/clothing/neck/heretic_focus/crimson_medallion = 0,
/mob/living/basic/construct/harvester/heretic = 0,
)
/// Simpler version of above used to limit amount of loot that can be hoarded
diff --git a/code/modules/antagonists/heretic/heretic_knowledge.dm b/code/modules/antagonists/heretic/heretic_knowledge.dm
index 6cfa8db05608f5..16c8bde219c8ef 100644
--- a/code/modules/antagonists/heretic/heretic_knowledge.dm
+++ b/code/modules/antagonists/heretic/heretic_knowledge.dm
@@ -155,7 +155,9 @@
return FALSE
for(var/result in result_atoms)
- new result(loc)
+ var/atom/result_item = new result(loc)
+ if(isitem(result_item))
+ ADD_TRAIT(result_item, TRAIT_CONTRABAND, INNATE_TRAIT)
return TRUE
/**
@@ -226,7 +228,7 @@
/**
* A knowledge subtype for knowledge that can only
- * have a limited amount of it's resulting atoms
+ * have a limited amount of its resulting atoms
* created at once.
*/
/datum/heretic_knowledge/limited_amount
@@ -582,7 +584,6 @@
var/datum/antagonist/heretic_monster/heretic_monster = summoned.mind.add_antag_datum(/datum/antagonist/heretic_monster)
heretic_monster.set_owner(user.mind)
- summoned.RegisterSignal(user, COMSIG_LIVING_DEATH, TYPE_PROC_REF(/mob/living/, on_master_death))
var/datum/objective/heretic_summon/summon_objective = locate() in user.mind.get_all_objectives()
summon_objective?.num_summoned++
diff --git a/code/modules/antagonists/heretic/heretic_monsters.dm b/code/modules/antagonists/heretic/heretic_monsters.dm
index fcdea512879809..5bc7041cd461de 100644
--- a/code/modules/antagonists/heretic/heretic_monsters.dm
+++ b/code/modules/antagonists/heretic/heretic_monsters.dm
@@ -28,6 +28,7 @@
*/
/datum/antagonist/heretic_monster/proc/set_owner(datum/mind/master)
src.master = master
+ owner.enslave_mind_to_creator(master.current)
var/datum/objective/master_obj = new()
master_obj.owner = owner
@@ -38,7 +39,3 @@
owner.announce_objectives()
to_chat(owner, span_boldnotice("You are a [ishuman(owner.current) ? "shambling corpse returned":"horrible creation brought"] to this plane through the Gates of the Mansus."))
to_chat(owner, span_notice("Your master is [master]. Assist them to all ends."))
-
- if(istype(owner.current, /mob/living/basic/construct/harvester/heretic))
- var/mob/living/basic/construct/harvester/heretic/shitcode = owner.current
- shitcode.master = master
diff --git a/code/modules/antagonists/heretic/items/heretic_armor.dm b/code/modules/antagonists/heretic/items/heretic_armor.dm
index 45ddea163fa718..0c64e4a227eaf6 100644
--- a/code/modules/antagonists/heretic/items/heretic_armor.dm
+++ b/code/modules/antagonists/heretic/items/heretic_armor.dm
@@ -97,6 +97,7 @@
. = ..()
create_storage(storage_type = /datum/storage/pockets/void_cloak)
make_visible()
+ ADD_TRAIT(src, TRAIT_CONTRABAND_BLOCKER, INNATE_TRAIT)
/obj/item/clothing/suit/hooded/cultrobes/void/equipped(mob/user, slot)
. = ..()
diff --git a/code/modules/antagonists/heretic/items/heretic_necks.dm b/code/modules/antagonists/heretic/items/heretic_necks.dm
index 3f140dc99df1dc..5c73c22a4e7937 100644
--- a/code/modules/antagonists/heretic/items/heretic_necks.dm
+++ b/code/modules/antagonists/heretic/items/heretic_necks.dm
@@ -9,16 +9,16 @@
. = ..()
AddElement(/datum/element/heretic_focus)
-/obj/item/clothing/neck/heretic_focus/crimson_focus
- name = "Crimson Focus"
+/obj/item/clothing/neck/heretic_focus/crimson_medallion
+ name = "Crimson Medallion"
desc = "A blood-red focusing glass that provides a link to the world beyond, and worse. Its eye is constantly twitching and gazing in all directions. It almost seems to be silently screaming..."
- icon_state = "crimson_focus"
+ icon_state = "crimson_medallion"
/// The aura healing component. Used to delete it when taken off.
var/datum/component/component
/// If active or not, used to add and remove its cult and heretic buffs.
var/active = FALSE
-/obj/item/clothing/neck/heretic_focus/crimson_focus/equipped(mob/living/user, slot)
+/obj/item/clothing/neck/heretic_focus/crimson_medallion/equipped(mob/living/user, slot)
. = ..()
if(!(slot & ITEM_SLOT_NECK))
return
@@ -51,7 +51,7 @@
healing_color = team_color, \
)
-/obj/item/clothing/neck/heretic_focus/crimson_focus/dropped(mob/living/user)
+/obj/item/clothing/neck/heretic_focus/crimson_medallion/dropped(mob/living/user)
. = ..()
if(!istype(user))
@@ -75,7 +75,7 @@
magic_holder?.magic_enhanced = FALSE
-/obj/item/clothing/neck/heretic_focus/crimson_focus/attack_self(mob/living/user, modifiers)
+/obj/item/clothing/neck/heretic_focus/crimson_medallion/attack_self(mob/living/user, modifiers)
. = ..()
to_chat(user, span_danger("You start tightly squeezing [src]..."))
if(!do_after(user, 1.25 SECONDS, src))
@@ -90,7 +90,7 @@
user.reagents?.add_reagent(/datum/reagent/eldritch, rand(6, 10))
qdel(src)
-/obj/item/clothing/neck/heretic_focus/crimson_focus/examine(mob/user)
+/obj/item/clothing/neck/heretic_focus/crimson_medallion/examine(mob/user)
. = ..()
var/magic_dude
diff --git a/code/modules/antagonists/heretic/knowledge/rust_lore.dm b/code/modules/antagonists/heretic/knowledge/rust_lore.dm
index 5e96119135f710..fe0d03ec18f50e 100644
--- a/code/modules/antagonists/heretic/knowledge/rust_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/rust_lore.dm
@@ -220,7 +220,6 @@
/// A static list of traits we give to the heretic when on rust.
var/static/list/conditional_immunities = list(
TRAIT_BOMBIMMUNE,
- TRAIT_IGNOREDAMAGESLOWDOWN,
TRAIT_IGNORESLOWDOWN,
TRAIT_NO_SLIP_ALL,
TRAIT_NOBREATH,
@@ -306,7 +305,7 @@
*
* Gives our heretic ([source]) buffs if they stand on rust.
*/
-/datum/heretic_knowledge/ultimate/rust_final/proc/on_move(mob/source, atom/old_loc, dir, forced, list/old_locs)
+/datum/heretic_knowledge/ultimate/rust_final/proc/on_move(mob/living/source, atom/old_loc, dir, forced, list/old_locs)
SIGNAL_HANDLER
// If we're on a rusty turf, and haven't given out our traits, buff our guy
@@ -314,12 +313,14 @@
if(HAS_TRAIT(our_turf, TRAIT_RUSTY))
if(!immunities_active)
source.add_traits(conditional_immunities, type)
+ source.add_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown)
immunities_active = TRUE
// If we're not on a rust turf, and we have given out our traits, nerf our guy
else
if(immunities_active)
source.remove_traits(conditional_immunities, type)
+ source.remove_movespeed_mod_immunities(type, /datum/movespeed_modifier/damage_slowdown)
immunities_active = FALSE
/**
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 8da3b90494899c..a34927a6b6f341 100644
--- a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm
+++ b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm
@@ -214,7 +214,7 @@
heretic_datum.knowledge_points += 3
heretic_datum.high_value_sacrifices++
feedback += " graciously"
- else if(cultist_datum)
+ if(cultist_datum)
heretic_datum.knowledge_points += 1
grant_reward(user, sacrifice, loc)
// easier to read
@@ -229,9 +229,9 @@
span_narsie(" one of our own. Destroy and sacrifice the infidel before it claims more!")
to_chat(mind.current, message)
// he(retic) gets a warn too
- var/message = span_cult_bold("You feel that your action has attracted") + \
- span_cult_bold_italic(" attention.")
- to_chat(user, message)
+ to_chat(user, span_narsiesmall("How DARE you!? I will see you destroyed for this."))
+ var/non_flavor_warning = span_cult_bold("You feel that your action has attracted ") + span_hypnophrase("attention") + span_cult_bold(".")
+ to_chat(user, non_flavor_warning)
return
else
heretic_datum.knowledge_points += 2
@@ -263,12 +263,6 @@
var/datum/antagonist/heretic/antag = IS_HERETIC(user)
antag.rewards_given++
- // We limit the amount so the heretic doesn't just turn into a frickin' god (early)
- to_chat(user, span_hierophant("You feel the rotten energies of the infidel warp and twist, mixing with that of your own..."))
- if(prob(8 * antag.rewards_given))
- to_chat(user, span_hierophant("Faint, dark red sparks flit around the dust, then fade. It looks like your patrons weren't able to fashion something out of it."))
- return
-
// Cool effect for the rune as well as the item
var/obj/effect/heretic_rune/rune = locate() in range(2, user)
if(rune)
@@ -285,7 +279,7 @@
/datum/heretic_knowledge/hunt_and_sacrifice/proc/deposit_reward(mob/user, turf/loc, loop = 0, obj/rune)
if(loop > 5) // Max limit for retrying a reward
return
- // Remove the rays, we don't need them anymore.
+ // Remove the outline, we don't need it anymore.
rune?.remove_filter("reward_outline")
playsound(loc, 'sound/magic/repulse.ogg', 75, TRUE)
var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user)
diff --git a/code/modules/antagonists/heretic/magic/flesh_surgery.dm b/code/modules/antagonists/heretic/magic/flesh_surgery.dm
index 96ccb8450f97be..a486b986cd81e0 100644
--- a/code/modules/antagonists/heretic/magic/flesh_surgery.dm
+++ b/code/modules/antagonists/heretic/magic/flesh_surgery.dm
@@ -83,7 +83,7 @@
return .
-/// If cast on an organ, we'll restore it's health and even un-fail it.
+/// If cast on an organ, we'll restore its health and even un-fail it.
/datum/action/cooldown/spell/touch/flesh_surgery/proc/heal_organ(obj/item/melee/touch_attack/hand, obj/item/organ/to_heal, mob/living/carbon/caster)
if(to_heal.damage == 0)
to_heal.balloon_alert(caster, "already in good condition!")
diff --git a/code/modules/antagonists/heretic/magic/space_crawl.dm b/code/modules/antagonists/heretic/magic/space_crawl.dm
index 49677e3bb50869..90f74a37047f35 100644
--- a/code/modules/antagonists/heretic/magic/space_crawl.dm
+++ b/code/modules/antagonists/heretic/magic/space_crawl.dm
@@ -84,8 +84,8 @@
RegisterSignal(jaunter, SIGNAL_REMOVETRAIT(TRAIT_ALLOW_HERETIC_CASTING), PROC_REF(on_focus_lost))
RegisterSignal(jaunter, COMSIG_MOB_STATCHANGE, PROC_REF(on_stat_change))
- our_turf.visible_message(span_warning("[jaunter] sinks into [our_turf]!"))
playsound(our_turf, 'sound/magic/cosmic_energy.ogg', 50, TRUE, -1)
+ our_turf.visible_message(span_warning("[jaunter] sinks into [our_turf]!"))
new /obj/effect/temp_visual/space_explosion(our_turf)
jaunter.extinguish_mob()
@@ -102,7 +102,6 @@
if(!exit_jaunt(jaunter, our_turf))
return FALSE
-
our_turf.visible_message(span_boldwarning("[jaunter] rises out of [our_turf]!"))
return TRUE
diff --git a/code/modules/antagonists/heretic/status_effects/buffs.dm b/code/modules/antagonists/heretic/status_effects/buffs.dm
index 35a6ab92687848..c72e6bfdef1138 100644
--- a/code/modules/antagonists/heretic/status_effects/buffs.dm
+++ b/code/modules/antagonists/heretic/status_effects/buffs.dm
@@ -53,11 +53,11 @@
alert_type = /atom/movable/screen/alert/status_effect/marshal
/datum/status_effect/marshal/on_apply()
- ADD_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, STATUS_EFFECT_TRAIT)
+ owner.add_movespeed_mod_immunities(id, /datum/movespeed_modifier/damage_slowdown)
return TRUE
/datum/status_effect/marshal/on_remove()
- REMOVE_TRAIT(owner, TRAIT_IGNOREDAMAGESLOWDOWN, STATUS_EFFECT_TRAIT)
+ owner.remove_movespeed_mod_immunities(id, /datum/movespeed_modifier/damage_slowdown)
/datum/status_effect/marshal/tick(seconds_between_ticks)
if(!iscarbon(owner))
diff --git a/code/modules/antagonists/highlander/highlander.dm b/code/modules/antagonists/highlander/highlander.dm
index 077bd2158b8f6d..a1c31241e0b754 100644
--- a/code/modules/antagonists/highlander/highlander.dm
+++ b/code/modules/antagonists/highlander/highlander.dm
@@ -12,6 +12,7 @@
TRAIT_NODISMEMBER,
TRAIT_NOFIRE,
TRAIT_NOGUNS,
+ TRAIT_TOSS_GUN_HARD,
TRAIT_SHOCKIMMUNE,
)
diff --git a/code/modules/antagonists/malf_ai/malf_ai_modules.dm b/code/modules/antagonists/malf_ai/malf_ai_modules.dm
index 5ef50a209aa0fd..95cb3742f5d372 100644
--- a/code/modules/antagonists/malf_ai/malf_ai_modules.dm
+++ b/code/modules/antagonists/malf_ai/malf_ai_modules.dm
@@ -1044,14 +1044,14 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module))
owner.speech_span = say_span
to_chat(usr, span_notice("Voice set to [selection]."))
if("verb")
- say_verb = params["verb"]
+ say_verb = strip_html(params["verb"], MAX_NAME_LEN)
if(changing_voice)
owner.verb_say = say_verb
owner.verb_ask = say_verb
owner.verb_exclaim = say_verb
owner.verb_yell = say_verb
if("name")
- say_name = params["name"]
+ say_name = strip_html(params["name"], MAX_NAME_LEN)
/datum/ai_module/utility/emag
name = "Targeted Safeties Override"
diff --git a/code/modules/antagonists/nightmare/nightmare_equipment.dm b/code/modules/antagonists/nightmare/nightmare_equipment.dm
index ec07639cb449cc..6fbe6c6097bec3 100644
--- a/code/modules/antagonists/nightmare/nightmare_equipment.dm
+++ b/code/modules/antagonists/nightmare/nightmare_equipment.dm
@@ -52,10 +52,9 @@
if(!has_crit)
return
playsound(target, 'sound/effects/wounds/crackandbleed.ogg', 100, TRUE)
- var/datum/dna/target_dna = target.has_dna()
if(target.stat == DEAD)
user.visible_message(span_warning("[user] gores [target] with [src]!"), span_warning("You gore [target] with [src], which doesn't accomplish much, but it does make you feel a little better."))
- else if(!target_dna?.check_mutation(/datum/mutation/human/hulk) && (iscarbon(target) || issilicon(target)))
+ else if(!HAS_TRAIT(target, TRAIT_HULK) && (iscarbon(target) || issilicon(target)))
user.visible_message(span_boldwarning("[user] gores [target] with [src], bringing them to a halt!"), span_userdanger("You gore [target] with [src], bringing them to a halt!"))
target.Paralyze(issilicon(target) ? 2 SECONDS : 1 SECONDS)
else
diff --git a/code/modules/antagonists/nightmare/nightmare_organs.dm b/code/modules/antagonists/nightmare/nightmare_organs.dm
index 576b911652fa0c..a77aaa79b23ea8 100644
--- a/code/modules/antagonists/nightmare/nightmare_organs.dm
+++ b/code/modules/antagonists/nightmare/nightmare_organs.dm
@@ -70,6 +70,8 @@
visual = TRUE
color = COLOR_CRAYON_BLACK
decay_factor = 0
+ // No love is to be found in a heart so twisted.
+ food_reagents = list(/datum/reagent/consumable/nutriment = 5)
/// How many life ticks in the dark the owner has been dead for. Used for nightmare respawns.
var/respawn_progress = 0
/// The armblade granted to the host of this heart.
diff --git a/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm b/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm
index a7611c24448211..0160fbd89149cc 100644
--- a/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm
+++ b/code/modules/antagonists/nukeop/equipment/nuclear_challenge.dm
@@ -99,6 +99,13 @@ GLOBAL_LIST_EMPTY(jam_on_wardec)
for(var/obj/machinery/computer/camera_advanced/shuttle_docker/dock as anything in GLOB.jam_on_wardec)
dock.jammed = TRUE
+ var/datum/techweb/station_techweb = locate(/datum/techweb/science) in SSresearch.techwebs
+ if(station_techweb)
+ var/obj/machinery/announcement_system/announcement_system = pick(GLOB.announcement_systems)
+ if (!isnull(announcement_system))
+ announcement_system.broadcast("Additional research data received from Nanotrasen R&D Division following the emergency protocol.", list(RADIO_CHANNEL_SCIENCE))
+ station_techweb.add_point_list(list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_5_POINTS * 3))
+
qdel(src)
/obj/item/nuclear_challenge/proc/distribute_tc()
diff --git a/code/modules/antagonists/nukeop/equipment/overwatch_tools.dm b/code/modules/antagonists/nukeop/equipment/overwatch_tools.dm
index 852c0d7d32fbd7..6c409f063707db 100644
--- a/code/modules/antagonists/nukeop/equipment/overwatch_tools.dm
+++ b/code/modules/antagonists/nukeop/equipment/overwatch_tools.dm
@@ -44,3 +44,21 @@ Happy hunting!
flash_protect = FLASH_PROTECTION_WELDER
clothing_traits = list(TRAIT_REAGENT_SCANNER)
var/list/hudlist = list(DATA_HUD_MEDICAL_ADVANCED, DATA_HUD_DIAGNOSTIC_ADVANCED, DATA_HUD_SECURITY_ADVANCED)
+
+/obj/item/clothing/glasses/overwatch/equipped(mob/user, slot)
+ . = ..()
+ if(!(slot & ITEM_SLOT_EYES) || !ishuman(user))
+ return
+ for(var/hud in hudlist)
+ var/datum/atom_hud/our_hud = GLOB.huds[hud]
+ our_hud.show_to(user)
+ user.add_traits(list(TRAIT_MEDICAL_HUD, TRAIT_SECURITY_HUD, TRAIT_DIAGNOSTIC_HUD), GLASSES_TRAIT)
+
+/obj/item/clothing/glasses/overwatch/dropped(mob/user)
+ . = ..()
+ user.remove_traits(list(TRAIT_MEDICAL_HUD, TRAIT_SECURITY_HUD, TRAIT_DIAGNOSTIC_HUD), GLASSES_TRAIT)
+ if(!ishuman(user))
+ return
+ for(var/hud in hudlist)
+ var/datum/atom_hud/our_hud = GLOB.huds[hud]
+ our_hud.hide_from(user)
diff --git a/code/modules/antagonists/nukeop/equipment/pinpointer.dm b/code/modules/antagonists/nukeop/equipment/pinpointer.dm
index da72e41ef51e3d..59ab16be7dc9c2 100644
--- a/code/modules/antagonists/nukeop/equipment/pinpointer.dm
+++ b/code/modules/antagonists/nukeop/equipment/pinpointer.dm
@@ -62,7 +62,7 @@
/obj/item/pinpointer/nuke/proc/switch_mode_to(new_mode)
if(isliving(loc))
var/mob/living/L = loc
- to_chat(L, span_userdanger("Your [name] beeps as it reconfigures it's tracking algorithms."))
+ to_chat(L, span_userdanger("Your [name] beeps as it reconfigures its tracking algorithms."))
playsound(L, 'sound/machines/triple_beep.ogg', 50, TRUE)
mode = new_mode
scan_for_target()
diff --git a/code/modules/antagonists/nukeop/outfits.dm b/code/modules/antagonists/nukeop/outfits.dm
index 8c2820d11be68c..0d122cff0c0617 100644
--- a/code/modules/antagonists/nukeop/outfits.dm
+++ b/code/modules/antagonists/nukeop/outfits.dm
@@ -52,8 +52,7 @@
if(command_radio)
radio.command = TRUE
radio.use_command = TRUE
-
- if(ispath(uplink_type, /obj/item/uplink/nuclear) || tc) // /obj/item/uplink/nuclear understands 0 tc
+ if(ispath(uplink_type, /obj/item/uplink) || tc) // /obj/item/uplink understands 0 tc
var/obj/item/uplink = new uplink_type(nukie, nukie.key, tc)
nukie.equip_to_slot_or_del(uplink, ITEM_SLOT_BACKPACK, indirect_action = TRUE)
diff --git a/code/modules/antagonists/pirate/pirate_roles.dm b/code/modules/antagonists/pirate/pirate_roles.dm
index 78a3d3fd12acfe..3ea82d4c2002e7 100644
--- a/code/modules/antagonists/pirate/pirate_roles.dm
+++ b/code/modules/antagonists/pirate/pirate_roles.dm
@@ -146,7 +146,7 @@
desc = "A surprisingly clean cryogenic sleeper. You can see your reflection on the sides!"
density = FALSE
you_are_text = "You are an agent working for the space IRS"
- flavour_text = "Not even in the expanse of the expanding universe can someone evade the tax man! Whether you are just a well disciplined and professional pirate gang or an actual agent from a local polity. You will squeeze the station dry of it's income regardless! Through peaceful means or otherwise..."
+ flavour_text = "Not even in the expanse of the expanding universe can someone evade the tax man! Whether you are just a well disciplined and professional pirate gang or an actual agent from a local polity. You will squeeze the station dry of its income regardless! Through peaceful means or otherwise..."
icon = 'icons/obj/machines/sleeper.dmi'
icon_state = "sleeper"
prompt_name = "An agent of the space IRS"
@@ -208,7 +208,7 @@
/obj/effect/mob_spawn/ghost_role/human/pirate/medieval/special(mob/living/carbon/spawned_mob)
. = ..()
if(rank == "Footsoldier")
- ADD_TRAIT(spawned_mob, TRAIT_NOGUNS, INNATE_TRAIT)
+ spawned_mob.add_traits(list(TRAIT_NOGUNS, TRAIT_TOSS_GUN_HARD), INNATE_TRAIT)
spawned_mob.AddComponent(/datum/component/unbreakable)
var/datum/action/cooldown/mob_cooldown/dash/dodge = new(spawned_mob)
dodge.Grant(spawned_mob)
diff --git a/code/modules/antagonists/voidwalker/voidwalker.dm b/code/modules/antagonists/voidwalker/voidwalker.dm
new file mode 100644
index 00000000000000..6ba5ee4490dc08
--- /dev/null
+++ b/code/modules/antagonists/voidwalker/voidwalker.dm
@@ -0,0 +1,59 @@
+/// Space antagonist that harasses people near space and cursed them if they get the chance
+/datum/antagonist/voidwalker
+ name = "\improper Voidwalker"
+ antagpanel_category = ANTAG_GROUP_ABOMINATIONS
+ job_rank = ROLE_VOIDWALKER
+ show_in_antagpanel = TRUE
+ antagpanel_category = "Voidwalker"
+ show_name_in_check_antagonists = TRUE
+ show_to_ghosts = TRUE
+ ui_name = "AntagInfoVoidwalker"
+ suicide_cry = "FOR THE VOID!!"
+ preview_outfit = /datum/outfit/voidwalker
+
+/datum/antagonist/voidwalker/greet()
+ . = ..()
+ owner.announce_objectives()
+
+/datum/antagonist/voidwalker/on_gain()
+ . = ..()
+
+ var/mob/living/carbon/human/body = owner.current
+ if(ishuman(body))
+ body.set_species(/datum/species/voidwalker)
+
+ forge_objectives()
+
+/datum/antagonist/voidwalker/on_removal()
+ var/mob/living/carbon/human/body = owner.current
+ if(ishuman(body))
+ body.set_species(/datum/species/human)
+
+ return ..()
+
+/datum/antagonist/voidwalker/forge_objectives()
+ var/datum/objective/voidwalker_objective/objective = new
+ objective.owner = owner
+ objectives += objective
+
+/datum/outfit/voidwalker
+ name = "Voidwalker (Preview only)"
+
+/datum/outfit/voidwalker/post_equip(mob/living/carbon/human/human, visualsOnly)
+ human.set_species(/datum/species/voidwalker)
+
+/datum/objective/voidwalker_objective
+
+/datum/objective/voidwalker_objective/New()
+ var/list/explanation_texts = list(
+ "Show them the beauty of the void. Drag them into the cosmic abyss, then impart the truth of the void unto them. Seek to enlighten, not destroy.",
+ "They must see what you have seen. They must walk where you have walked. Bring them to the void and show them the truth. The dead cannot know what you know.",
+ "Recover what you have lost. Bring your children into the inky black and return them to your flock.",
+ )
+ if(prob(20))
+ explanation_text += "Man I fucking love glass."
+ explanation_text = pick(explanation_texts)
+ ..()
+
+/datum/objective/voidwalker_objective/check_completion()
+ return owner.current.stat != DEAD
diff --git a/code/modules/antagonists/voidwalker/voidwalker_abilities.dm b/code/modules/antagonists/voidwalker/voidwalker_abilities.dm
new file mode 100644
index 00000000000000..4fe88f50d01c6b
--- /dev/null
+++ b/code/modules/antagonists/voidwalker/voidwalker_abilities.dm
@@ -0,0 +1,67 @@
+/// Remain in someones view without breaking line of sight
+/datum/action/cooldown/spell/pointed/unsettle
+ name = "Unsettle"
+ desc = "Stare directly into someone who doesn't see you. Remain in their view for a bit to stun them for 2 seconds and announce your presence to them. "
+ button_icon_state = "terrify"
+ background_icon_state = "bg_void"
+ panel = null
+ spell_requirements = NONE
+ cooldown_time = 12 SECONDS
+ cast_range = 9
+ active_msg = "You prepare to stare down a target..."
+ deactive_msg = "You refocus your eyes..."
+ /// how long we need to stare at someone to unsettle them (woooooh)
+ var/stare_time = 8 SECONDS
+ /// how long we stun someone on succesful cast
+ var/stun_time = 2 SECONDS
+ /// stamina damage we doooo
+ var/stamina_damage = 80
+
+/datum/action/cooldown/spell/pointed/unsettle/is_valid_target(atom/cast_on)
+ . = ..()
+
+ if(!isliving(cast_on))
+ cast_on.balloon_alert(owner, "cannot be targeted!")
+ return FALSE
+
+ if(!check_if_in_view(cast_on))
+ owner.balloon_alert(owner, "cannot see you!")
+ return FALSE
+
+ return TRUE
+
+/datum/action/cooldown/spell/pointed/unsettle/cast(mob/living/carbon/human/cast_on)
+ . = ..()
+
+ if(do_after(owner, stare_time, cast_on, IGNORE_TARGET_LOC_CHANGE | IGNORE_USER_LOC_CHANGE, extra_checks = CALLBACK(src, PROC_REF(check_if_in_view), cast_on), hidden = TRUE))
+ spookify(cast_on)
+ return
+ owner.balloon_alert(owner, "line of sight broken!")
+ return SPELL_CANCEL_CAST
+
+/datum/action/cooldown/spell/pointed/unsettle/proc/check_if_in_view(mob/living/carbon/human/target)
+ SIGNAL_HANDLER
+
+ if(target.is_blind() || !(owner in view(target, world.view)))
+ return FALSE
+ return TRUE
+
+/datum/action/cooldown/spell/pointed/unsettle/proc/spookify(mob/living/carbon/human/target)
+ target.Paralyze(stun_time)
+ target.adjustStaminaLoss(stamina_damage)
+ target.apply_status_effect(/datum/status_effect/speech/slurring/generic)
+ target.emote("scream")
+
+ new /obj/effect/temp_visual/circle_wave/unsettle(get_turf(owner))
+ new /obj/effect/temp_visual/circle_wave/unsettle(get_turf(target))
+ SEND_SIGNAL(owner, COMSIG_ATOM_REVEAL)
+
+/obj/effect/temp_visual/circle_wave/unsettle
+ color = COLOR_PURPLE
+
+/datum/action/cooldown/spell/list_target/telepathy/voidwalker
+ name = "Transmit"
+ background_icon_state = "bg_void"
+ button_icon = 'icons/mob/actions/actions_voidwalker.dmi'
+ button_icon_state = "voidwalker_telepathy"
+ panel = null
diff --git a/code/modules/antagonists/voidwalker/voidwalker_bodyparts.dm b/code/modules/antagonists/voidwalker/voidwalker_bodyparts.dm
new file mode 100644
index 00000000000000..a8e5b8de30f395
--- /dev/null
+++ b/code/modules/antagonists/voidwalker/voidwalker_bodyparts.dm
@@ -0,0 +1,147 @@
+///Turn the damage overlays glassy
+#define GLASSY_OVERLAY_MATRIX list(\
+ 1, 2, 2, 0, \
+ 0, 1, 0, 0, \
+ 0, 0, 1, 0, \
+ 0, 0, 0, 1, \
+ 0, 0, 0, 0)
+
+/obj/item/bodypart/head/voidwalker
+ texture_bodypart_overlay = /datum/bodypart_overlay/texture/spacey
+ icon_greyscale = 'icons/mob/human/species/voidwalker.dmi'
+ limb_id = SPECIES_VOIDWALKER
+ is_dimorphic = FALSE
+ bodypart_traits = list(TRAIT_MUTE)
+ head_flags = NONE
+ blocks_emissive = EMISSIVE_BLOCK_NONE
+
+ damage_overlay_color = GLASSY_OVERLAY_MATRIX
+
+ light_brute_msg = "splintered"
+ medium_brute_msg = "cracked"
+ heavy_brute_msg = "shattered"
+
+ light_burn_msg = "bent"
+ medium_burn_msg = "deformed"
+ heavy_burn_msg = "warped"
+
+ damage_examines = list(
+ BRUTE = GLASSY_BRUTE_EXAMINE_TEXT,
+ BURN = GLASSY_BURN_EXAMINE_TEXT,
+ )
+
+/obj/item/bodypart/chest/voidwalker
+ texture_bodypart_overlay = /datum/bodypart_overlay/texture/spacey
+ icon_greyscale = 'icons/mob/human/species/voidwalker.dmi'
+ limb_id = SPECIES_VOIDWALKER
+ is_dimorphic = FALSE
+ blocks_emissive = EMISSIVE_BLOCK_NONE
+
+ damage_overlay_color = GLASSY_OVERLAY_MATRIX
+
+ light_brute_msg = "splintered"
+ medium_brute_msg = "cracked"
+ heavy_brute_msg = "shattered"
+
+ light_burn_msg = "bent"
+ medium_burn_msg = "deformed"
+ heavy_burn_msg = "warped"
+
+ damage_examines = list(
+ BRUTE = GLASSY_BRUTE_EXAMINE_TEXT,
+ BURN = GLASSY_BURN_EXAMINE_TEXT,
+ )
+
+/obj/item/bodypart/arm/left/voidwalker
+ texture_bodypart_overlay = /datum/bodypart_overlay/texture/spacey
+ icon_greyscale = 'icons/mob/human/species/voidwalker.dmi'
+ limb_id = SPECIES_VOIDWALKER
+ is_dimorphic = FALSE
+ blocks_emissive = EMISSIVE_BLOCK_NONE
+
+ bodypart_traits = list(TRAIT_CHUNKYFINGERS)
+
+ damage_overlay_color = GLASSY_OVERLAY_MATRIX
+
+ light_brute_msg = "splintered"
+ medium_brute_msg = "cracked"
+ heavy_brute_msg = "shattered"
+
+ light_burn_msg = "bent"
+ medium_burn_msg = "deformed"
+ heavy_burn_msg = "warped"
+
+ damage_examines = list(
+ BRUTE = GLASSY_BRUTE_EXAMINE_TEXT,
+ BURN = GLASSY_BURN_EXAMINE_TEXT,
+ )
+
+/obj/item/bodypart/arm/right/voidwalker
+ texture_bodypart_overlay = /datum/bodypart_overlay/texture/spacey
+ icon_greyscale = 'icons/mob/human/species/voidwalker.dmi'
+ limb_id = SPECIES_VOIDWALKER
+ is_dimorphic = FALSE
+ blocks_emissive = EMISSIVE_BLOCK_NONE
+
+ bodypart_traits = list(TRAIT_CHUNKYFINGERS)
+
+ damage_overlay_color = GLASSY_OVERLAY_MATRIX
+
+ light_brute_msg = "splintered"
+ medium_brute_msg = "cracked"
+ heavy_brute_msg = "shattered"
+
+ light_burn_msg = "bent"
+ medium_burn_msg = "deformed"
+ heavy_burn_msg = "warped"
+
+ damage_examines = list(
+ BRUTE = GLASSY_BRUTE_EXAMINE_TEXT,
+ BURN = GLASSY_BURN_EXAMINE_TEXT,
+ )
+
+/obj/item/bodypart/leg/left/voidwalker
+ texture_bodypart_overlay = /datum/bodypart_overlay/texture/spacey
+ icon_greyscale = 'icons/mob/human/species/voidwalker.dmi'
+ limb_id = SPECIES_VOIDWALKER
+ is_dimorphic = FALSE
+ blocks_emissive = EMISSIVE_BLOCK_NONE
+
+ damage_overlay_color = GLASSY_OVERLAY_MATRIX
+
+ light_brute_msg = "splintered"
+ medium_brute_msg = "cracked"
+ heavy_brute_msg = "shattered"
+
+ light_burn_msg = "bent"
+ medium_burn_msg = "deformed"
+ heavy_burn_msg = "warped"
+
+ damage_examines = list(
+ BRUTE = GLASSY_BRUTE_EXAMINE_TEXT,
+ BURN = GLASSY_BURN_EXAMINE_TEXT,
+ )
+
+/obj/item/bodypart/leg/right/voidwalker
+ texture_bodypart_overlay = /datum/bodypart_overlay/texture/spacey
+ icon_greyscale = 'icons/mob/human/species/voidwalker.dmi'
+ limb_id = SPECIES_VOIDWALKER
+ is_dimorphic = FALSE
+ blocks_emissive = EMISSIVE_BLOCK_NONE
+
+ damage_overlay_color = GLASSY_OVERLAY_MATRIX
+
+ light_brute_msg = "splintered"
+ medium_brute_msg = "cracked"
+ heavy_brute_msg = "shattered"
+
+ light_burn_msg = "bent"
+ medium_burn_msg = "deformed"
+ heavy_burn_msg = "warped"
+
+ damage_examines = list(
+ BRUTE = GLASSY_BRUTE_EXAMINE_TEXT,
+ BURN = GLASSY_BURN_EXAMINE_TEXT,
+ )
+
+#undef GLASSY_OVERLAY_MATRIX
diff --git a/code/modules/antagonists/voidwalker/voidwalker_kidnap.dm b/code/modules/antagonists/voidwalker/voidwalker_kidnap.dm
new file mode 100644
index 00000000000000..b763d094cb75a6
--- /dev/null
+++ b/code/modules/antagonists/voidwalker/voidwalker_kidnap.dm
@@ -0,0 +1,112 @@
+/// A global assoc list for the drop of point
+GLOBAL_LIST_EMPTY(voidwalker_void)
+
+/// Lardmarks meant to designate where voidwalker kidnapees are sent
+/obj/effect/landmark/voidwalker_void
+ name = "default voidwalker void landmark"
+ icon_state = "x"
+
+/obj/effect/landmark/voidwalker_void/Initialize(mapload)
+ . = ..()
+ GLOB.voidwalker_void += src
+
+/obj/effect/landmark/voidwalker_void/Destroy()
+ GLOB.voidwalker_void -= src
+ return ..()
+
+/// Voidwalker void where the people go
+/area/centcom/voidwalker_void
+ name = "Voidwalker void"
+ icon_state = "voidwalker"
+ has_gravity = STANDARD_GRAVITY
+ ambience_index = AMBIENCE_SPOOKY
+ sound_environment = SOUND_ENVIRONMENT_CAVE
+ area_flags = UNIQUE_AREA | NOTELEPORT | HIDDEN_AREA | BLOCK_SUICIDE
+
+/// Mini car where people drive around in in their mangled corpse to heal a bit before they get dumped back on station
+/obj/effect/wisp_mobile
+ name = "wisp"
+
+ icon = 'icons/obj/weapons/voidwalker_items.dmi'
+ icon_state = "wisp"
+
+ light_system = OVERLAY_LIGHT
+ light_color = COLOR_WHITE
+ light_range = 4
+ light_power = 1
+ light_on = TRUE
+
+ /// Delay between movements
+ var/move_delay = 0.5 SECONDS
+ /// when can we move again?
+ var/can_move
+ /// what do we eatt?
+ var/food_type = /obj/effect/wisp_food
+ /// how much do we heal per food?
+ var/heal_per_food = 15
+ /// Traits given to the wisp driver
+ var/wisp_driver_traits = list(TRAIT_STASIS, TRAIT_NOSOFTCRIT, TRAIT_NOHARDCRIT, TRAIT_HANDS_BLOCKED)
+
+/obj/effect/wisp_mobile/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs)
+ . = ..()
+
+ if(!isliving(arrived))
+ return
+
+ var/mob/living/driver = arrived
+ driver.forceMove(src)
+ driver.add_traits(wisp_driver_traits, REF(src))
+ add_atom_colour(random_color(), FIXED_COLOUR_PRIORITY)
+
+ addtimer(CALLBACK(driver, TYPE_PROC_REF(/atom/movable, forceMove), get_safe_random_station_turf()), 60 SECONDS)
+
+/obj/effect/wisp_mobile/relaymove(mob/living/user, direction)
+ if(can_move >= world.time)
+ return
+ can_move = world.time + move_delay
+
+ if(isturf(loc))
+ can_move = world.time + move_delay
+ try_step_multiz(direction)
+
+/obj/effect/wisp_mobile/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change)
+ . = ..()
+
+ var/obj/food = locate(food_type) in loc
+ if(!food)
+ return
+
+ qdel(food)
+
+ // make new food
+ var/area/our_area = get_area(src)
+ new food_type(pick(get_area_turfs(our_area)))
+
+ var/mob/living/driver = locate(/mob/living) in contents
+ if(driver)
+ driver.heal_ordered_damage(heal_per_food, list(BRUTE, BURN, OXY))
+ playsound(src, 'sound/misc/server-ready.ogg', 50, TRUE, -1)
+
+/obj/effect/wisp_mobile/Exited(atom/movable/gone, direction)
+ . = ..()
+
+ gone.remove_traits(wisp_driver_traits, REF(src))
+ to_chat(gone, span_boldwarning("You feel it would be very bad to get caught again."))
+ qdel(src)
+
+/// we only exist to be eaten by wisps for food 😔👊
+/obj/effect/wisp_food
+ name = "wisp"
+ icon = 'icons/obj/weapons/voidwalker_items.dmi'
+ icon_state = "wisp"
+
+ color = COLOR_YELLOW
+
+ light_system = OVERLAY_LIGHT
+ light_color = COLOR_WHITE
+ light_range = 4
+ light_power = 1
+ light_on = TRUE
+
+/obj/item/restraints/handcuffs/energy/void
+ breakouttime = INFINITY
diff --git a/code/modules/antagonists/voidwalker/voidwalker_loot.dm b/code/modules/antagonists/voidwalker/voidwalker_loot.dm
new file mode 100644
index 00000000000000..8d3420d0a5278d
--- /dev/null
+++ b/code/modules/antagonists/voidwalker/voidwalker_loot.dm
@@ -0,0 +1,39 @@
+/// Gives someone the stable voided trauma and then self destructs
+/obj/item/cosmic_skull
+ name = "cosmic skull"
+ desc = "You can see and feel the surrounding space pulsing through it..."
+
+ icon = 'icons/obj/weapons/voidwalker_items.dmi'
+ icon_state = "cosmic_skull_charged"
+
+ /// Icon state for when drained
+ var/drained_icon_state = "cosmic_skull_drained"
+ /// How many uses does it have left?
+ var/uses = 1
+
+/obj/item/cosmic_skull/attack_self(mob/user, modifiers)
+ . = ..()
+
+ if(!uses || !ishuman(user))
+ return
+
+ var/mob/living/carbon/human/hewmon = user
+ if(is_species(hewmon, /datum/species/voidwalker))
+ to_chat(user, span_bolddanger("OH GOD NOO!!!! WHYYYYYYYYY!!!!! WHO WOULD DO THIS?!!"))
+ return
+
+ to_chat(user, span_purple("You begin staring into the [name]..."))
+
+ if(!do_after(user, 10 SECONDS, src))
+ return
+
+ var/mob/living/carbon/human/starer = user
+ starer.cure_trauma_type(/datum/brain_trauma/voided) //this wouldn't make much sense to have anymore
+
+ starer.gain_trauma(/datum/brain_trauma/voided/stable)
+ to_chat(user, span_purple("And a whole world opens up to you."))
+ playsound(get_turf(user), 'sound/effects/curse5.ogg', 60)
+
+ uses--
+ if(uses <= 0 )
+ icon_state = drained_icon_state
diff --git a/code/modules/antagonists/voidwalker/voidwalker_organs.dm b/code/modules/antagonists/voidwalker/voidwalker_organs.dm
new file mode 100644
index 00000000000000..e6e3d028ac8ef9
--- /dev/null
+++ b/code/modules/antagonists/voidwalker/voidwalker_organs.dm
@@ -0,0 +1,132 @@
+/// Voidwalker eyes with nightvision and thermals
+/obj/item/organ/internal/eyes/voidwalker
+ name = "blackened orbs"
+ desc = "These orbs will withstand the light of the sun, yet still see within the darkest voids."
+ eye_icon_state = null
+ pepperspray_protect = TRUE
+ flash_protect = FLASH_PROTECTION_WELDER
+ color_cutoffs = list(20, 10, 40)
+ sight_flags = SEE_MOBS
+
+/// Voidwalker brain stacked with a lot of the abilities
+/obj/item/organ/internal/brain/voidwalker
+ name = "cosmic brain"
+ desc = "A mind fully integrated into the cosmic thread."
+ icon = 'icons/obj/medical/organs/shadow_organs.dmi'
+ can_smoothen_out = FALSE
+
+ /// Alpha we have in space
+ var/space_alpha = 15
+ /// Alpha we have elsewhere
+ var/non_space_alpha = 255
+ /// We settle the un
+ var/datum/action/unsettle = /datum/action/cooldown/spell/pointed/unsettle
+ /// Regen effect we have in space
+ var/datum/status_effect/regen = /datum/status_effect/space_regeneration
+ /// Speed modifier given when in gravity
+ var/datum/movespeed_modifier/speed_modifier = /datum/movespeed_modifier/grounded_voidwalker
+ /// The void eater weapon
+ var/obj/item/glass_breaker = /obj/item/void_eater
+ /// Our brain transmit telepathy spell
+ var/datum/action/transmit = /datum/action/cooldown/spell/list_target/telepathy/voidwalker
+
+/obj/item/organ/internal/brain/voidwalker/on_mob_insert(mob/living/carbon/organ_owner, special, movement_flags)
+ . = ..()
+
+ RegisterSignal(organ_owner, COMSIG_ATOM_ENTERING, PROC_REF(on_atom_entering))
+
+ organ_owner.AddComponent(/datum/component/space_camo, space_alpha, non_space_alpha, 5 SECONDS)
+
+ organ_owner.AddElement(/datum/element/only_pull_living)
+ organ_owner.AddElement(/datum/element/glass_pacifist)
+ organ_owner.AddElement(/datum/element/no_crit_hitting)
+
+ organ_owner.apply_status_effect(regen)
+
+ unsettle = new unsettle(organ_owner)
+ unsettle.Grant(organ_owner)
+
+ transmit = new transmit(organ_owner)
+ transmit.Grant(organ_owner)
+
+ glass_breaker = new/obj/item/void_eater
+ organ_owner.put_in_hands(glass_breaker)
+
+/obj/item/organ/internal/brain/voidwalker/on_mob_remove(mob/living/carbon/organ_owner, special)
+ . = ..()
+
+ UnregisterSignal(organ_owner, COMSIG_ENTER_AREA)
+ alpha = 255
+
+ qdel(organ_owner.GetComponent(/datum/component/space_camo))
+
+ organ_owner.RemoveElement(/datum/element/only_pull_living)
+ organ_owner.RemoveElement(/datum/element/glass_pacifist)
+ organ_owner.RemoveElement(/datum/element/no_crit_hitting)
+
+ organ_owner.remove_status_effect(regen)
+
+ unsettle.Remove(organ_owner)
+ unsettle = initial(unsettle)
+
+ transmit.Remove(organ_owner)
+ transmit = initial(transmit)
+
+ if(glass_breaker)
+ qdel(glass_breaker)
+
+/obj/item/organ/internal/brain/voidwalker/proc/on_atom_entering(mob/living/carbon/organ_owner, atom/entering)
+ SIGNAL_HANDLER
+
+ if(!isturf(entering))
+ return
+
+ var/turf/new_turf = entering
+
+ //apply debufs for being in gravity
+ if(new_turf.has_gravity())
+ organ_owner.add_movespeed_modifier(speed_modifier)
+ //remove debufs for not being in gravity
+ else
+ organ_owner.remove_movespeed_modifier(speed_modifier)
+
+/obj/item/organ/internal/brain/voidwalker/on_death()
+ . = ..()
+
+ var/turf/spawn_loc = get_turf(owner)
+ new /obj/effect/spawner/random/glass_shards (spawn_loc)
+ new /obj/item/cosmic_skull (spawn_loc)
+ playsound(get_turf(owner), SFX_SHATTER, 100)
+
+ qdel(owner)
+
+/obj/item/implant/radio/voidwalker
+ radio_key = /obj/item/encryptionkey/heads/captain
+ actions_types = null
+
+/obj/effect/spawner/random/glass_shards
+ loot = list(/obj/item/shard = 2, /obj/item/shard/plasma = 1, /obj/item/shard/titanium = 1, /obj/item/shard/plastitanium = 1)
+ spawn_random_offset = TRUE
+
+ /// Min shards we generate
+ var/min_spawn = 4
+ /// Max shards we generate
+ var/max_spawn = 6
+
+/obj/effect/spawner/random/glass_shards/Initialize(mapload)
+ spawn_loot_count = rand(min_spawn, max_spawn)
+
+ return ..()
+
+/obj/effect/spawner/random/glass_shards/mini
+ min_spawn = 1
+ max_spawn = 2
+
+/obj/effect/spawner/random/glass_debris
+ /// Weighted list for the debris we spawn
+ loot = list(
+ /obj/effect/decal/cleanable/glass = 2,
+ /obj/effect/decal/cleanable/glass/plasma = 1,
+ /obj/effect/decal/cleanable/glass/titanium = 1,
+ /obj/effect/decal/cleanable/glass/plastitanium = 1,
+ )
diff --git a/code/modules/antagonists/voidwalker/voidwalker_particles.dm b/code/modules/antagonists/voidwalker/voidwalker_particles.dm
new file mode 100644
index 00000000000000..8ffbd4abd449e2
--- /dev/null
+++ b/code/modules/antagonists/voidwalker/voidwalker_particles.dm
@@ -0,0 +1,15 @@
+/particles/void_kidnap
+ icon = 'icons/effects/particles/voidwalker.dmi'
+ icon_state = list("kidnap_1" = 1, "kidnap_2" = 1, "kidnap_3" = 2)
+ width = 100
+ height = 300
+ count = 1000
+ spawning = 20
+ lifespan = 1.5 SECONDS
+ fade = 1 SECONDS
+ velocity = list(0, 0.4, 0)
+ position = generator(GEN_SPHERE, 12, 12, NORMAL_RAND)
+ drift = generator(GEN_SPHERE, 0, 1, NORMAL_RAND)
+ friction = 0.2
+ gravity = list(0.95, 0)
+ grow = 0.05
diff --git a/code/modules/antagonists/voidwalker/voidwalker_species.dm b/code/modules/antagonists/voidwalker/voidwalker_species.dm
new file mode 100644
index 00000000000000..069582fbb2c7e0
--- /dev/null
+++ b/code/modules/antagonists/voidwalker/voidwalker_species.dm
@@ -0,0 +1,73 @@
+/// Species for the voidwalker antagonist
+/datum/species/voidwalker
+ name = "\improper Voidling"
+ id = SPECIES_VOIDWALKER
+ sexes = FALSE
+ inherent_traits = list(
+ TRAIT_NOBREATH,
+ TRAIT_NO_UNDERWEAR,
+ TRAIT_RADIMMUNE,
+ TRAIT_VIRUSIMMUNE,
+ TRAIT_NOBLOOD,
+ TRAIT_NODISMEMBER,
+ TRAIT_NEVER_WOUNDED,
+ TRAIT_MOVE_FLYING,
+ TRAIT_RESISTCOLD,
+ TRAIT_RESISTHIGHPRESSURE,
+ TRAIT_RESISTLOWPRESSURE,
+ TRAIT_NOHUNGER,
+ TRAIT_FREE_HYPERSPACE_MOVEMENT,
+ TRAIT_ADVANCEDTOOLUSER,
+ TRAIT_NO_BLOOD_OVERLAY,
+ TRAIT_NO_THROWING,
+ )
+ changesource_flags = MIRROR_BADMIN
+
+ bodypart_overrides = list(
+ BODY_ZONE_HEAD = /obj/item/bodypart/head/voidwalker,
+ BODY_ZONE_CHEST = /obj/item/bodypart/chest/voidwalker,
+ BODY_ZONE_L_ARM = /obj/item/bodypart/arm/left/voidwalker,
+ BODY_ZONE_R_ARM = /obj/item/bodypart/arm/right/voidwalker,
+ BODY_ZONE_L_LEG = /obj/item/bodypart/leg/left/voidwalker,
+ BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/voidwalker,
+ )
+
+ no_equip_flags = ITEM_SLOT_OCLOTHING | ITEM_SLOT_ICLOTHING | ITEM_SLOT_GLOVES | ITEM_SLOT_MASK | ITEM_SLOT_HEAD | ITEM_SLOT_FEET | ITEM_SLOT_BACK | ITEM_SLOT_EARS | ITEM_SLOT_EYES
+
+ mutantbrain = /obj/item/organ/internal/brain/voidwalker
+ mutanteyes = /obj/item/organ/internal/eyes/voidwalker
+ mutantheart = null
+ mutantlungs = null
+ mutanttongue = null
+
+ siemens_coeff = 0
+
+/datum/species/voidwalker/on_species_gain(mob/living/carbon/human/human_who_gained_species, datum/species/old_species, pref_load)
+ . = ..()
+
+ human_who_gained_species.AddComponent(/datum/component/glass_passer)
+ human_who_gained_species.AddComponent(/datum/component/space_dive)
+ human_who_gained_species.AddComponent(/datum/component/space_kidnap)
+
+ var/obj/item/implant/radio = new /obj/item/implant/radio/voidwalker (human_who_gained_species)
+ radio.implant(human_who_gained_species, null, TRUE, TRUE)
+
+ human_who_gained_species.AddComponent(/datum/component/planet_allergy)
+
+ human_who_gained_species.fully_replace_character_name(null, pick(GLOB.voidwalker_names))
+
+/datum/species/voidwalker/on_species_loss(mob/living/carbon/human/human, datum/species/new_species, pref_load)
+ . = ..()
+
+ qdel(human.GetComponent(/datum/component/glass_passer))
+ qdel(human.GetComponent(/datum/component/space_dive))
+ qdel(human.GetComponent(/datum/component/space_kidnap))
+
+ var/obj/item/implant/radio = locate(/obj/item/implant/radio/voidwalker) in human
+ if(radio)
+ qdel(radio)
+
+ qdel(human.GetComponent(/datum/component/planet_allergy))
+
+/datum/species/voidwalker/check_roundstart_eligible()
+ return FALSE
diff --git a/code/modules/antagonists/voidwalker/voidwalker_status_effects.dm b/code/modules/antagonists/voidwalker/voidwalker_status_effects.dm
new file mode 100644
index 00000000000000..6dc9cdc35ca7bc
--- /dev/null
+++ b/code/modules/antagonists/voidwalker/voidwalker_status_effects.dm
@@ -0,0 +1,41 @@
+/// THE GRAVITY!!! IT WEIGHS!!!
+/datum/movespeed_modifier/grounded_voidwalker
+ multiplicative_slowdown = 1.1
+
+/// Regenerate in space
+/datum/status_effect/space_regeneration
+ id = "space_regeneration"
+ duration = INFINITE
+ alert_type = null
+ // How much do we heal per tick?
+ var/healing = 1.5
+
+/datum/status_effect/space_regeneration/tick(effect)
+ heal_owner()
+
+/// Regenerate health whenever this status effect is applied or reapplied
+/datum/status_effect/space_regeneration/proc/heal_owner()
+ if(isspaceturf(get_turf(owner)))
+ owner.heal_ordered_damage(healing, list(BRUTE, BURN, OXY, STAMINA, TOX, BRAIN))
+
+/datum/status_effect/planet_allergy
+ id = "planet_allergy"
+ duration = INFINITE
+ alert_type = /atom/movable/screen/alert/veryhighgravity
+
+/datum/status_effect/planet_allergy/tick()
+ owner.adjustBruteLoss(1)
+
+/datum/status_effect/void_eatered
+ duration = 10 SECONDS
+ remove_on_fullheal = TRUE
+
+/datum/status_effect/void_eatered/on_apply()
+ . = ..()
+
+ ADD_TRAIT(owner, TRAIT_NODEATH, REF(src))
+
+/datum/status_effect/void_eatered/on_remove()
+ . = ..()
+
+ REMOVE_TRAIT(owner, TRAIT_NODEATH, REF(src))
diff --git a/code/modules/antagonists/voidwalker/voidwalker_traumas.dm b/code/modules/antagonists/voidwalker/voidwalker_traumas.dm
new file mode 100644
index 00000000000000..cf4f389a0d6f33
--- /dev/null
+++ b/code/modules/antagonists/voidwalker/voidwalker_traumas.dm
@@ -0,0 +1,91 @@
+/// Curse brain trauma that makes someone space textured, mute, pacifist and forbids them from entering space
+/datum/brain_trauma/voided
+ name = "Voided"
+ desc = "They've seen the secrets of the cosmos, in exchange for a curse that keeps them chained."
+ scan_desc = "cosmic neural pattern"
+ gain_text = ""
+ lose_text = ""
+ resilience = TRAUMA_RESILIENCE_LOBOTOMY
+ random_gain = FALSE
+ /// Type for the bodypart texture we add
+ var/bodypart_overlay_type = /datum/bodypart_overlay/texture/spacey
+ ///traits we give on gain
+ var/list/traits_to_apply = list(TRAIT_MUTE, TRAIT_PACIFISM)
+ /// Do we ban the person from entering space?
+ var/ban_from_space = TRUE
+
+/datum/brain_trauma/voided/on_gain()
+ . = ..()
+
+ owner.add_traits(traits_to_apply, REF(src))
+ if(ban_from_space)
+ owner.AddComponent(/datum/component/banned_from_space)
+ owner.AddComponent(/datum/component/planet_allergy)
+ RegisterSignal(owner, COMSIG_CARBON_ATTACH_LIMB, PROC_REF(texture_limb)) //also catch new limbs being attached
+ RegisterSignal(owner, COMSIG_CARBON_REMOVE_LIMB, PROC_REF(untexture_limb)) //and remove it from limbs if they go away
+
+ for(var/obj/item/bodypart as anything in owner.bodyparts)
+ texture_limb(owner, bodypart)
+
+ //your underwear is belong to us
+ if(ishuman(owner))
+ var/mob/living/carbon/human/human = owner //CARBON WILL NEVER BE REAL!!!!!
+ human.underwear = "Nude"
+ human.undershirt = "Nude"
+ human.socks = "Nude"
+
+ owner.update_body()
+
+/datum/brain_trauma/voided/on_lose()
+ . = ..()
+
+ owner.remove_traits(traits_to_apply, REF(src))
+ UnregisterSignal(owner, list(COMSIG_CARBON_ATTACH_LIMB, COMSIG_CARBON_REMOVE_LIMB))
+ if(ban_from_space)
+ qdel(owner.GetComponent(/datum/component/banned_from_space))
+ qdel(owner.GetComponent(/datum/component/planet_allergy))
+
+ for(var/obj/item/bodypart/bodypart as anything in owner.bodyparts)
+ untexture_limb(owner, bodypart)
+
+/// Apply the space texture
+/datum/brain_trauma/voided/proc/texture_limb(atom/source, obj/item/bodypart/limb)
+ SIGNAL_HANDLER
+
+ limb.add_bodypart_overlay(new bodypart_overlay_type)
+ if(istype(limb, /obj/item/bodypart/head))
+ var/obj/item/bodypart/head/head = limb
+ head.head_flags &= ~HEAD_EYESPRITES
+
+/datum/brain_trauma/voided/proc/untexture_limb(atom/source, obj/item/bodypart/limb)
+ SIGNAL_HANDLER
+
+ var/overlay = locate(bodypart_overlay_type) in limb.bodypart_overlays
+ if(overlay)
+ limb.remove_bodypart_overlay(overlay)
+
+ if(istype(limb, /obj/item/bodypart/head))
+ var/obj/item/bodypart/head/head = limb
+ head.head_flags = initial(head.head_flags)
+
+/datum/brain_trauma/voided/on_death()
+ . = ..()
+
+ if(is_on_a_planet(owner))
+ qdel(src)
+
+/// Positive version of the previous. Get space immunity and the ability to slowly move through glass (but you still get muted)
+/datum/brain_trauma/voided/stable
+ scan_desc = "stable cosmic neural pattern"
+ traits_to_apply = list(TRAIT_MUTE, TRAIT_RESISTLOWPRESSURE, TRAIT_RESISTCOLD)
+ ban_from_space = FALSE
+
+/datum/brain_trauma/voided/stable/on_gain()
+ . = ..()
+
+ owner.AddComponent(/datum/component/glass_passer, 2 SECONDS)
+
+/datum/brain_trauma/voided/stable/on_lose()
+ . = ..()
+
+ qdel(owner.GetComponent(/datum/component/glass_passer))
diff --git a/code/modules/antagonists/voidwalker/voidwalker_void_eater.dm b/code/modules/antagonists/voidwalker/voidwalker_void_eater.dm
new file mode 100644
index 00000000000000..db638c2b948186
--- /dev/null
+++ b/code/modules/antagonists/voidwalker/voidwalker_void_eater.dm
@@ -0,0 +1,99 @@
+/**
+ * An armblade that pops windows
+ */
+/obj/item/void_eater
+ name = "void eater" //as opposed to full eater
+ desc = "A deformed appendage, capable of shattering any glass and any flesh."
+ icon = 'icons/obj/weapons/voidwalker_items.dmi'
+ icon_state = "tentacle"
+ inhand_icon_state = "tentacle"
+ force = 25
+ armour_penetration = 35
+ lefthand_file = 'icons/mob/inhands/antag/voidwalker_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/antag/voidwalker_righthand.dmi'
+ blocks_emissive = EMISSIVE_BLOCK_NONE
+ item_flags = ABSTRACT | DROPDEL
+ resistance_flags = INDESTRUCTIBLE | ACID_PROOF | FIRE_PROOF | LAVA_PROOF | UNACIDABLE
+ w_class = WEIGHT_CLASS_HUGE
+ tool_behaviour = TOOL_MINING
+ hitsound = 'sound/weapons/bladeslice.ogg'
+ wound_bonus = -30
+ bare_wound_bonus = 20
+
+ /// Damage we loss per hit
+ var/damage_loss_per_hit = 0.5
+ /// The minimal damage we can reach
+ var/damage_minimum = 15
+
+/obj/item/void_eater/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT)
+
+ AddComponent(/datum/component/temporary_glass_shatterer)
+
+/obj/item/void_eater/pickup(mob/user)
+ . = ..()
+
+ RegisterSignal(user, COMSIG_VOIDWALKER_SUCCESFUL_KIDNAP, PROC_REF(refresh))
+
+/obj/item/void_eater/dropped(mob/user, silent)
+ . = ..()
+ UnregisterSignal(user, COMSIG_VOIDWALKER_SUCCESFUL_KIDNAP)
+
+/obj/item/void_eater/examine(mob/user)
+ . = ..()
+ . += span_notice("The [name] weakens each hit, recharge it by kidnapping someone!")
+ . += span_notice("Sharpness: [round(force)]/[initial(force)]")
+
+/obj/item/void_eater/attack(mob/living/target_mob, mob/living/user, params)
+ if(!ishuman(target_mob))
+ return ..()
+
+ var/mob/living/carbon/human/hewmon = target_mob
+
+ if(hewmon.has_trauma_type(/datum/brain_trauma/voided))
+ var/turf/spawnloc = get_turf(hewmon)
+
+ if(hewmon.stat != DEAD)
+ hewmon.balloon_alert(user, "already voided!")
+ playsound(hewmon, SFX_SHATTER, 60)
+ new /obj/effect/spawner/random/glass_shards/mini (spawnloc)
+ hewmon.adjustBruteLoss(10) // BONUS DAMAGE
+ else
+ hewmon.balloon_alert(user, "shattering...")
+ if(do_after(user, 4 SECONDS, hewmon))
+ new /obj/effect/spawner/random/glass_shards (spawnloc)
+ var/obj/item/organ/brain = hewmon.get_organ_by_type(/obj/item/organ/internal/brain)
+ if(brain)
+ brain.Remove(hewmon)
+ brain.forceMove(spawnloc)
+ brain.balloon_alert(user, "shattered!")
+ playsound(hewmon, SFX_SHATTER, 100)
+ qdel(hewmon)
+ return COMPONENT_CANCEL_ATTACK_CHAIN
+
+ if(hewmon.stat == HARD_CRIT && !hewmon.has_trauma_type(/datum/brain_trauma/voided))
+ target_mob.balloon_alert(user, "is in crit!")
+ return COMPONENT_CANCEL_ATTACK_CHAIN
+
+ target_mob.apply_status_effect(/datum/status_effect/void_eatered)
+
+ if(force == damage_minimum + damage_loss_per_hit)
+ user.balloon_alert(user, "void eater blunted!")
+
+ force = max(force - damage_loss_per_hit, damage_minimum)
+
+ if(prob(5))
+ new /obj/effect/spawner/random/glass_debris (get_turf(user))
+ return ..()
+
+/// Called when the voidwalker kidnapped someone
+/obj/item/void_eater/proc/refresh(mob/living/carbon/human/voidwalker)
+ SIGNAL_HANDLER
+
+ force = initial(force)
+
+ color = "#000000"
+ animate(src, color = null, time = 1 SECONDS)//do a color flashy woosh
+
+ to_chat(voidwalker, span_boldnotice("Your [name] refreshes!"))
diff --git a/code/modules/antagonists/wizard/equipment/soulstone.dm b/code/modules/antagonists/wizard/equipment/soulstone.dm
index 9130883d457ef2..a954391bfdb7f4 100644
--- a/code/modules/antagonists/wizard/equipment/soulstone.dm
+++ b/code/modules/antagonists/wizard/equipment/soulstone.dm
@@ -516,7 +516,7 @@
playsound(newstruct, 'sound/effects/constructform.ogg', 50)
if(stoner)
newstruct.faction |= "[REF(stoner)]"
- newstruct.master = stoner
+ newstruct.construct_master = stoner
var/datum/action/innate/seek_master/seek_master = new
seek_master.Grant(newstruct)
diff --git a/code/modules/antagonists/wizard/equipment/spellbook_entries/_entry.dm b/code/modules/antagonists/wizard/equipment/spellbook_entries/_entry.dm
index 0586d7ea6da4a5..18e2dae715c34c 100644
--- a/code/modules/antagonists/wizard/equipment/spellbook_entries/_entry.dm
+++ b/code/modules/antagonists/wizard/equipment/spellbook_entries/_entry.dm
@@ -70,6 +70,15 @@
for(var/spell in user.actions)
if(is_type_in_typecache(spell, no_coexistance_typecache))
return FALSE
+ var/datum/antagonist/wizard/wizard_datum = user.mind.has_antag_datum(/datum/antagonist/wizard)
+ if(!wizard_datum)
+ return TRUE
+ for(var/perks in wizard_datum.perks)
+ if(is_type_in_typecache(perks, no_coexistance_typecache))
+ return FALSE
+ if(is_type_in_list(src, wizard_datum.perks))
+ to_chat(user, span_warning("This perk already learned!"))
+ return FALSE
return TRUE
/**
@@ -137,6 +146,9 @@
* Return TRUE if it can refunded, FALSE otherwise
*/
/datum/spellbook_entry/proc/can_refund(mob/living/carbon/human/user, obj/item/spellbook/book)
+ if(HAS_TRAIT(user, TRAIT_SPELLS_LOTTERY))
+ to_chat(user, span_notice("No refund."))
+ return FALSE
if(!refundable)
return FALSE
if(!book.refunds_allowed)
@@ -203,6 +215,11 @@
log_spellbook("[key_name(user)] bought [src] for [cost] points")
SSblackbox.record_feedback("tally", "wizard_spell_learned", 1, name)
log_purchase(user.key)
+
+ ADD_TRAIT(spawned_path, TRAIT_CONTRABAND, INNATE_TRAIT)
+ for(var/obj/contained as anything in spawned_path.contents)
+ ADD_TRAIT(contained, TRAIT_CONTRABAND, INNATE_TRAIT)
+
try_equip_item(user, spawned_path)
return spawned_path
diff --git a/code/modules/antagonists/wizard/equipment/spellbook_entries/defensive.dm b/code/modules/antagonists/wizard/equipment/spellbook_entries/defensive.dm
index a66d99c21c88d3..e7c204a39e214b 100644
--- a/code/modules/antagonists/wizard/equipment/spellbook_entries/defensive.dm
+++ b/code/modules/antagonists/wizard/equipment/spellbook_entries/defensive.dm
@@ -55,7 +55,7 @@
it will become easier for others to find your item of power."
spell_type = /datum/action/cooldown/spell/lichdom
category = SPELLBOOK_CATEGORY_DEFENSIVE
- no_coexistance_typecache = list(/datum/action/cooldown/spell/splattercasting)
+ no_coexistance_typecache = list(/datum/action/cooldown/spell/splattercasting, /datum/spellbook_entry/perks/wormborn)
/datum/spellbook_entry/chuunibyou
name = "Chuuni Invocations"
diff --git a/code/modules/antagonists/wizard/equipment/spellbook_entries/offensive.dm b/code/modules/antagonists/wizard/equipment/spellbook_entries/offensive.dm
index 9eb35cbf7b42eb..6b8272ed5b7ad1 100644
--- a/code/modules/antagonists/wizard/equipment/spellbook_entries/offensive.dm
+++ b/code/modules/antagonists/wizard/equipment/spellbook_entries/offensive.dm
@@ -39,6 +39,13 @@
category = SPELLBOOK_CATEGORY_OFFENSIVE
cost = 1
+/datum/spellbook_entry/tie_shoes
+ name = "Tie Shoes"
+ desc = "This unassuming spell first unties, then knots the target's shoes. While weak at first glance, each upgrade quietens the spell, allowing it to untie laceless footwear and even summon shoes to knot!"
+ spell_type = /datum/action/cooldown/spell/pointed/untie_shoes
+ category = SPELLBOOK_CATEGORY_OFFENSIVE
+ cost = 1
+
/datum/spellbook_entry/mutate
name = "Mutate"
desc = "Causes you to turn into a hulk and gain laser vision for a short while."
diff --git a/code/modules/antagonists/wizard/equipment/spellbook_entries/perks.dm b/code/modules/antagonists/wizard/equipment/spellbook_entries/perks.dm
new file mode 100644
index 00000000000000..6cebe8fa1e9746
--- /dev/null
+++ b/code/modules/antagonists/wizard/equipment/spellbook_entries/perks.dm
@@ -0,0 +1,184 @@
+#define SPELLBOOK_CATEGORY_PERKS "Perks"
+
+/datum/spellbook_entry/perks
+ desc = "Main node of perks"
+ category = SPELLBOOK_CATEGORY_PERKS
+ refundable = FALSE // no refund
+ requires_wizard_garb = FALSE
+
+/datum/spellbook_entry/perks/buy_spell(mob/living/carbon/human/user, obj/item/spellbook/book, log_buy)
+ var/datum/antagonist/wizard/wizard_datum = user.mind.has_antag_datum(/datum/antagonist/wizard)
+ if(wizard_datum)
+ wizard_datum.perks += src
+ to_chat(user, span_notice("You got a new perk: [src.name]."))
+ return TRUE
+
+/datum/spellbook_entry/perks/fourhands
+ name = "Four Hands"
+ desc = "Gives you even more hands to perform magic"
+
+/datum/spellbook_entry/perks/fourhands/buy_spell(mob/living/carbon/human/user, obj/item/spellbook/book, log_buy)
+ . = ..()
+ user.change_number_of_hands(4)
+
+/datum/spellbook_entry/perks/wormborn
+ name = "Worm Born"
+ desc = "Your soul is infested with mana worms. When you die, you will be reborn as a large worm. \
+ When the worm dies, it has no such luck. Parasitic infection prevents you from binding your soul to objects."
+ no_coexistance_typecache = list(/datum/action/cooldown/spell/lichdom)
+
+/datum/spellbook_entry/perks/wormborn/buy_spell(mob/living/carbon/human/user, obj/item/spellbook/book, log_buy)
+ . = ..()
+ user.AddComponent(/datum/component/wormborn)
+
+/datum/spellbook_entry/perks/dejavu
+ name = "Déjà vu"
+ desc = "Every 60 seconds returns you to the place where you were 60 seconds ago with the same amount of health as you had 60 seconds ago."
+
+/datum/spellbook_entry/perks/dejavu/buy_spell(mob/living/carbon/human/user, obj/item/spellbook/book, log_buy)
+ . = ..()
+ RegisterSignal(user, COMSIG_ENTER_AREA, PROC_REF(give_dejavu))
+
+/datum/spellbook_entry/perks/dejavu/proc/give_dejavu(mob/living/carbon/human/wizard, area/new_area)
+ SIGNAL_HANDLER
+
+ if(new_area == GLOB.areas_by_type[/area/centcom/wizard_station])
+ return
+ wizard.AddComponent(/datum/component/dejavu/timeline, -1, 60 SECONDS)
+ UnregisterSignal(wizard, COMSIG_ENTER_AREA)
+
+/datum/spellbook_entry/perks/spell_lottery
+ name = "Spells Lottery"
+ desc = "Spells Lottery gives you the chance to get something from the book absolutely free, but you can no longer refund any purchases."
+
+/datum/spellbook_entry/perks/spell_lottery/buy_spell(mob/living/carbon/human/user, obj/item/spellbook/book, log_buy)
+ . = ..()
+ ADD_TRAIT(user, TRAIT_SPELLS_LOTTERY, REF(src))
+
+/datum/spellbook_entry/perks/gamble
+ name = "Gamble"
+ desc = "You get 2 random perks."
+
+/datum/spellbook_entry/perks/gamble/buy_spell(mob/living/carbon/human/user, obj/item/spellbook/book, log_buy)
+ . = ..()
+ var/datum/antagonist/wizard/check_perks = user.mind.has_antag_datum(/datum/antagonist/wizard)
+ var/perks_allocated = 0
+ var/list/taking_perks = list()
+ for(var/datum/spellbook_entry/perks/generate_perk in book.entries)
+ if(istype(generate_perk, src))
+ continue
+ if(check_perks && is_type_in_list(generate_perk, check_perks.perks))
+ continue
+ taking_perks += generate_perk
+ perks_allocated++
+ if(perks_allocated >= 2)
+ break
+ if(taking_perks.len < 1)
+ to_chat(user, span_warning("Gamble cannot give 2 perks, so points are returned"))
+ return FALSE
+ taking_perks = shuffle(taking_perks)
+ for(var/datum/spellbook_entry/perks/perks_ready in taking_perks)
+ perks_ready.buy_spell(user, book, log_buy)
+
+/datum/spellbook_entry/perks/heart_eater
+ name = "Heart Eater"
+ desc = "Gives you ability to obtain a person's life force by eating their heart. \
+ By eating someone's heart you can increase your damage resistance or gain random mutation. \
+ Heart also give strong healing buff."
+
+/datum/spellbook_entry/perks/heart_eater/buy_spell(mob/living/carbon/human/user, obj/item/spellbook/book, log_buy)
+ . = ..()
+ user.AddComponent(/datum/component/heart_eater)
+
+/datum/spellbook_entry/perks/slime_friends
+ name = "Slime Friends"
+ desc = "Slimes are your friends. \
+ Every 15 seconds you lose some nutriments and summon a random evil slime to fight on your side."
+
+/datum/spellbook_entry/perks/slime_friends/buy_spell(mob/living/carbon/human/user, obj/item/spellbook/book, log_buy)
+ . = ..()
+ user.AddComponent(/datum/component/slime_friends)
+
+/datum/spellbook_entry/perks/transparence
+ name = "Transparence"
+ desc = "You become a little closer to the world of the dead. \
+ Projectiles pass through you, but you lose 25% of your health and you are hunted by a terrible curse which wants to return you to the afterlife."
+
+/datum/spellbook_entry/perks/transparence/buy_spell(mob/living/carbon/human/user, obj/item/spellbook/book, log_buy)
+ . = ..()
+ user.maxHealth *= 0.75
+ user.alpha = 125
+ ADD_TRAIT(user, TRAIT_UNHITTABLE_BY_PROJECTILES, REF(src))
+ RegisterSignal(user, COMSIG_ENTER_AREA, PROC_REF(make_stalker))
+
+/datum/spellbook_entry/perks/transparence/proc/make_stalker(mob/living/carbon/human/wizard, area/new_area)
+ SIGNAL_HANDLER
+
+ if(new_area == GLOB.areas_by_type[/area/centcom/wizard_station])
+ return
+ wizard.gain_trauma(/datum/brain_trauma/magic/stalker)
+ UnregisterSignal(wizard, COMSIG_ENTER_AREA)
+
+/datum/spellbook_entry/perks/magnetism
+ name = "Magnetism"
+ desc = "You get a small gravity anomaly that orbit around you. \
+ Nearby things will be attracted to you."
+
+/datum/spellbook_entry/perks/magnetism/buy_spell(mob/living/carbon/human/user, obj/item/spellbook/book, log_buy)
+ . = ..()
+ var/atom/movable/magnitizm = new /obj/effect/wizard_magnetism(get_turf(user))
+ magnitizm.orbit(user, 20)
+
+/obj/effect/wizard_magnetism
+ name = "magnetic anomaly"
+ icon = 'icons/effects/effects.dmi'
+ icon_state = "shield2"
+ /// We need to orbit around someone.
+ var/datum/weakref/owner
+
+/obj/effect/wizard_magnetism/New(loc, ...)
+ . = ..()
+ transform *= 0.4
+
+/obj/effect/wizard_magnetism/orbit(atom/new_owner, radius, clockwise, rotation_speed, rotation_segments, pre_rotation)
+ . = ..()
+ if(!isliving(new_owner))
+ return
+ owner = WEAKREF(new_owner)
+ RegisterSignal(new_owner, COMSIG_ENTER_AREA, PROC_REF(check_area))
+ RegisterSignal(new_owner, COMSIG_LIVING_DEATH, PROC_REF(on_owner_death))
+
+/obj/effect/wizard_magnetism/proc/check_area(mob/living/wizard, area/new_area)
+ SIGNAL_HANDLER
+
+ if(new_area == GLOB.areas_by_type[/area/centcom/wizard_station])
+ return
+ START_PROCESSING(SSprocessing, src)
+ UnregisterSignal(wizard, COMSIG_ENTER_AREA)
+
+/obj/effect/wizard_magnetism/proc/on_owner_death()
+ SIGNAL_HANDLER
+
+ stop_orbit()
+
+/obj/effect/wizard_magnetism/process(seconds_per_tick)
+ if(isnull(owner))
+ stop_orbit()
+ return
+ var/mob/living/wizard = owner.resolve()
+ var/list/things_in_range = orange(5, wizard) - orange(1, wizard)
+ for(var/obj/take_object in things_in_range)
+ if(!take_object.anchored)
+ step_towards(take_object, wizard)
+ for(var/mob/living/living_mov in things_in_range)
+ if(wizard)
+ if(living_mov == wizard)
+ continue
+ if(!living_mov.mob_negates_gravity())
+ step_towards(living_mov, wizard)
+
+/obj/effect/wizard_magnetism/stop_orbit()
+ STOP_PROCESSING(SSprocessing, src)
+ qdel(src)
+
+#undef SPELLBOOK_CATEGORY_PERKS
diff --git a/code/modules/antagonists/wizard/equipment/wizard_spellbook.dm b/code/modules/antagonists/wizard/equipment/wizard_spellbook.dm
index f13b53b12edd40..b0016bffe5f43f 100644
--- a/code/modules/antagonists/wizard/equipment/wizard_spellbook.dm
+++ b/code/modules/antagonists/wizard/equipment/wizard_spellbook.dm
@@ -229,6 +229,10 @@
return FALSE
to_buy.times++
+ if(HAS_TRAIT(user, TRAIT_SPELLS_LOTTERY))
+ if(prob(50 / to_buy.cost))
+ to_chat(user, span_notice("This spell was given to you for free!"))
+ return TRUE
uses -= to_buy.cost
return TRUE
diff --git a/code/modules/antagonists/wizard/grand_ritual/finales/clown.dm b/code/modules/antagonists/wizard/grand_ritual/finales/clown.dm
index d2f4a5a0763584..7c228574a06947 100644
--- a/code/modules/antagonists/wizard/grand_ritual/finales/clown.dm
+++ b/code/modules/antagonists/wizard/grand_ritual/finales/clown.dm
@@ -9,7 +9,16 @@
/datum/grand_finale/clown/trigger(mob/living/carbon/human/invoker)
for(var/mob/living/carbon/human/victim as anything in GLOB.human_list)
victim.Unconscious(3 SECONDS)
- if (!victim.mind || IS_HUMAN_INVADER(victim) || victim == invoker)
+ if (victim == invoker)
+ if(locate(/datum/action/cooldown/spell/pointed/untie_shoes) in invoker.actions)
+ continue
+ var/datum/action/cooldown/spell/pointed/untie_shoes/newer_spell = new(invoker)
+ newer_spell.Grant(invoker)
+ for(var/i in 1 to newer_spell.spell_max_level)
+ newer_spell.level_spell()
+ newer_spell.invocation_type = INVOCATION_SHOUT
+ continue
+ if (!victim.mind || IS_HUMAN_INVADER(victim))
continue
if (HAS_TRAIT(victim, TRAIT_CLOWN_ENJOYER))
victim.add_mood_event("clown_world", /datum/mood_event/clown_world)
@@ -23,6 +32,8 @@
if (is_clown_job(victim.mind.assigned_role))
var/datum/action/cooldown/spell/conjure_item/clown_pockets/new_spell = new(victim)
new_spell.Grant(victim)
+ var/datum/action/cooldown/spell/pointed/untie_shoes/newer_spell = new(victim)
+ newer_spell.Grant(victim)
continue
dress_as_magic_clown(victim)
if (prob(15))
diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm
index 3efb007ab6eaa9..223c4d73b70caa 100644
--- a/code/modules/antagonists/wizard/wizard.dm
+++ b/code/modules/antagonists/wizard/wizard.dm
@@ -25,6 +25,8 @@ GLOBAL_LIST_EMPTY(wizard_spellbook_purchases_by_key)
show_to_ghosts = TRUE
/// This mob's Grand Ritual ability
var/datum/action/cooldown/grand_ritual/ritual
+ /// Perks that wizard learn
+ var/list/perks = list()
/datum/antagonist/wizard/New()
if(move_to_lair) // kick off loading of your lair, if you want to be moved to it
diff --git a/code/modules/art/paintings.dm b/code/modules/art/paintings.dm
index 0bb3bcfe8ead74..8affc71e568f3c 100644
--- a/code/modules/art/paintings.dm
+++ b/code/modules/art/paintings.dm
@@ -91,6 +91,14 @@
painting_metadata.height = height
ADD_KEEP_TOGETHER(src, INNATE_TRAIT)
+/obj/item/canvas/Destroy()
+ last_patron = null
+ if(istype(loc,/obj/structure/sign/painting))
+ var/obj/structure/sign/painting/frame = loc
+ frame.remove_art_element(painting_metadata.credit_value)
+ painting_metadata = null
+ return ..()
+
/obj/item/canvas/proc/reset_grid()
grid = new/list(width,height)
for(var/x in 1 to width)
@@ -102,6 +110,8 @@
ui_interact(user)
/obj/item/canvas/ui_state(mob/user)
+ if(isobserver(user))
+ return GLOB.observer_state
if(finalized)
return GLOB.physical_obscured_state
else
@@ -154,6 +164,9 @@
if(.)
return
var/mob/user = usr
+ ///this is here to allow observers to zoom in and out but not do anything else.
+ if(action != "zoom_in" && action != "zoom_out" && isobserver(user))
+ return
switch(action)
if("paint")
if(finalized)
@@ -286,10 +299,16 @@
curator.adjust_money(curator_cut, "Painting: Patronage cut")
curator.bank_card_talk("Cut on patronage received, account now holds [curator.account_balance] cr.")
+ if(istype(loc, /obj/structure/sign/painting))
+ var/obj/structure/sign/painting/frame = loc
+ frame.remove_art_element(painting_metadata.credit_value)
+ frame.add_art_element(offer_amount)
+
painting_metadata.patron_ckey = user.ckey
painting_metadata.patron_name = user.real_name
painting_metadata.credit_value = offer_amount
last_patron = WEAKREF(user.mind)
+
to_chat(user, span_notice("Nanotrasen Trust Foundation thanks you for your contribution. You're now an official patron of this painting."))
var/list/possible_frames = SSpersistent_paintings.get_available_frames(offer_amount)
if(possible_frames.len <= 1) // Not much room for choices here.
@@ -566,6 +585,8 @@
/obj/structure/sign/painting/Exited(atom/movable/movable, atom/newloc)
. = ..()
if(movable == current_canvas)
+ if(!QDELETED(current_canvas))
+ remove_art_element(current_canvas.painting_metadata.credit_value)
current_canvas = null
update_appearance()
@@ -585,6 +606,7 @@
if(!current_canvas.finalized)
current_canvas.finalize(user)
to_chat(user,span_notice("You frame [current_canvas]."))
+ add_art_element()
update_appearance()
return TRUE
return FALSE
@@ -654,10 +676,31 @@
new_canvas.finalized = TRUE
new_canvas.name = "painting - [painting.title]"
current_canvas = new_canvas
+ add_art_element()
current_canvas.update_appearance()
update_appearance()
return TRUE
+/obj/structure/sign/painting/proc/add_art_element()
+ var/artistic_value = get_art_value(current_canvas.painting_metadata.credit_value)
+ if(artistic_value)
+ AddElement(/datum/element/art, artistic_value)
+
+/obj/structure/sign/painting/proc/remove_art_element(patronage)
+ var/artistic_value = get_art_value(patronage)
+ if(artistic_value)
+ RemoveElement(/datum/element/art, artistic_value)
+
+/obj/structure/sign/painting/proc/get_art_value(patronage)
+ switch(patronage)
+ if(PATRONAGE_SUPERB_FRAME to INFINITY)
+ return GREAT_ART
+ if(PATRONAGE_EXCELLENT_FRAME to PATRONAGE_SUPERB_FRAME)
+ return GOOD_ART
+ if(PATRONAGE_NICE_FRAME to PATRONAGE_EXCELLENT_FRAME)
+ return OK_ART
+ return 0
+
/obj/structure/sign/painting/proc/save_persistent()
if(!persistence_id || !current_canvas || current_canvas.no_save || current_canvas.painting_metadata.loaded_from_json)
return
diff --git a/code/modules/asset_cache/assets/vending.dm b/code/modules/asset_cache/assets/vending.dm
index 4d99eeefdc9d06..caec9bb4f82188 100644
--- a/code/modules/asset_cache/assets/vending.dm
+++ b/code/modules/asset_cache/assets/vending.dm
@@ -6,22 +6,28 @@
var/target_items = list()
for(var/obj/machinery/vending/vendor as anything in typesof(/obj/machinery/vending))
vendor = new vendor() // It seems `initial(list var)` has nothing. need to make a type.
- for(var/each in list(vendor.products, vendor.premium, vendor.contraband))
- target_items |= each
+ target_items |= vendor.products
+ target_items |= vendor.premium
+ target_items |= vendor.contraband
qdel(vendor)
// building icons for each item
- for (var/k in target_items)
- var/atom/item = k
+ for (var/atom/item as anything in target_items)
if (!ispath(item, /atom))
continue
var/icon_file
- if (initial(item.greyscale_colors) && initial(item.greyscale_config))
+ var/icon_state = initial(item.icon_state)
+ var/icon_color = initial(item.color)
+ // GAGS icons must be pregenerated
+ if(initial(item.greyscale_config) && initial(item.greyscale_colors))
icon_file = SSgreyscale.GetColoredIconByType(initial(item.greyscale_config), initial(item.greyscale_colors))
- else
+ // Colored atoms must be pregenerated
+ else if(icon_color && icon_state)
icon_file = initial(item.icon)
- var/icon_state = initial(item.icon_state)
+ // Otherwise we can rely on DMIcon, so skip it to save init time
+ else
+ continue
if (PERFORM_ALL_TESTS(focus_only/invalid_vending_machine_icon_states))
var/icon_states_list = icon_states(icon_file)
@@ -36,11 +42,10 @@
stack_trace("[item] does not have a valid icon state, icon=[icon_file], icon_state=[json_encode(icon_state)]([text_ref(icon_state)]), icon_states=[icon_states_string]")
continue
- var/icon/I = icon(icon_file, icon_state, SOUTH)
- var/c = initial(item.color)
- if (!isnull(c) && c != COLOR_WHITE)
- I.Blend(c, ICON_MULTIPLY)
+ var/icon/produced = icon(icon_file, icon_state, SOUTH)
+ if (!isnull(icon_color) && icon_color != COLOR_WHITE)
+ produced.Blend(icon_color, ICON_MULTIPLY)
var/imgid = replacetext(replacetext("[item]", "/obj/item/", ""), "/", "-")
- Insert(imgid, I)
+ Insert(imgid, produced)
diff --git a/code/modules/atmospherics/Atmospherics.md b/code/modules/atmospherics/Atmospherics.md
index 1203ed232e184b..8d280c6dcdcb55 100644
--- a/code/modules/atmospherics/Atmospherics.md
+++ b/code/modules/atmospherics/Atmospherics.md
@@ -38,7 +38,7 @@ Now then, into the breach.
The air controller is, at its core, quite simple, yet it is absolutely fundamental to the atmospheric system. The air controller is the clock which triggers all continuous actions within the atmos system, such as vents distributing air or gas moving between tiles. The actions taken by the air controller are quite simple, and will be enumerated here. Much of the substance of the air ticker is due to the game's master controller, whose intricacies I will not delve into for this document. I will however go into more detail about how SSAir in particular works in Chapter 6. In any case, this is a simplified list of the air controller's actions in a single tick:
1. Rebuild Pipenets
- Runs each time SSAir processes, sometimes out of order. It ensures that no pipeline sit unresolved or unbuilt
- - Processes the `rebuild_queue` list into the `expansion_queue` list, and then builds a full pipeline piecemeal. We do a ton of fenagling here to reduce overrun
+ - Processes the `rebuild_queue` list into the `expansion_queue` list, and then builds a full pipeline piecemeal. We do a ton of fenagling here to reduce overrun
2. Pipenets
- Updates the internal gasmixes of attached pipe machinery, and reacts the gases in a pipeline
- Calls `process()` on each `/datum/pipenet` in the `networks` list
@@ -180,7 +180,7 @@ You may notice something like this in `process_cell()`. It's not quite the same
Back in the old FEA days, neighbor count was hardcoded to 4 (Likely because this is what cell sharing on an infinite grid would look like). This means that turf A -> turf B is the same as turf B -> turf A, because they're each portioning up the gas in the same way.
-But when we moved to LINDA, we started using the length of our atmos_adjacent_turfs list (or an analog).
+But when we moved to LINDA, we started using the length of our atmos_adjacent_turfs list (or an analog).
We need this so things like multiz can work, and so tiles in a corner share in a way that makes sense.
Because of this, turf A -> turf B was no longer the same as turf B -> turf A, assuming one of those turfs had a different neighbor count, from I DON'T KNOW WALLS?
@@ -269,7 +269,7 @@ I've been talking kinda abstractly about turfs sleeping. That's because turfs on
### A brief romp to talk about excited groups and LAST_SHARE_CHECK
-Excited groups can tell the amount of diff being shared by hooking into a value `share()` sets on gasmixes, the absolute amount of gas shared by each tile. The issue is this isn't pressure, it's molar count. So heat being shared in a sealed room causes excited groups to break down, then reform from sources. This isn't a major issue due to how breakdown evens things out, but it's worth knowing.
+Excited groups can tell the amount of diff being shared by hooking into a value `share()` sets on gasmixes, the absolute amount of gas shared by each tile. The issue is this isn't pressure, its molar count. So heat being shared in a sealed room causes excited groups to break down, then reform from sources. This isn't a major issue due to how breakdown evens things out, but it's worth knowing.
### Back to the main thread
diff --git a/code/modules/atmospherics/gasmixtures/gas_types.dm b/code/modules/atmospherics/gasmixtures/gas_types.dm
index 32acadb3bee527..7bbfea3dcf253f 100644
--- a/code/modules/atmospherics/gasmixtures/gas_types.dm
+++ b/code/modules/atmospherics/gasmixtures/gas_types.dm
@@ -45,7 +45,7 @@
|||| only by meta_gas_list(). ||||
\*||||||||||||||||||||||||||||||||||||||||*/
-//This is a plot created using the values for gas exports. Each gas has a value that works as it's kind of soft-cap, which limits you from making billions of credits per sale, based on the base_value variable on the gasses themselves. Most of these gasses as a result have a rather low value when sold, like nitrogen and oxygen at 1500 and 600 respectively at their maximum value. The
+//This is a plot created using the values for gas exports. Each gas has a value that works as its kind of soft-cap, which limits you from making billions of credits per sale, based on the base_value variable on the gasses themselves. Most of these gasses as a result have a rather low value when sold, like nitrogen and oxygen at 1500 and 600 respectively at their maximum value. The
/datum/gas
var/id = ""
var/specific_heat = 0
@@ -108,7 +108,7 @@
dangerous = TRUE
rarity = 800
base_value = 1.5
- desc = "A flammable gas with many other curious properties. It's research is one of NT's primary objective."
+ desc = "A flammable gas with many other curious properties. Its research is one of NT's primary objective."
primary_color = "#ffc0cb"
/datum/gas/water_vapor
@@ -220,7 +220,7 @@
fusion_power = -5
rarity = 10
base_value = 5
- desc = "A coolant gas. Mainly used for it's endothermic reaction with oxygen."
+ desc = "A coolant gas. Mainly used for its endothermic reaction with oxygen."
primary_color = "#afeeee"
/datum/gas/hydrogen
@@ -267,7 +267,7 @@
moles_visible = MOLES_GAS_VISIBLE
rarity = 1
base_value = 7
- desc = "A highly toxic gas, it's production is highly regulated on top of being difficult. It also breaks down when in contact with nitrogen."
+ desc = "A highly toxic gas, its production is highly regulated on top of being difficult. It also breaks down when in contact with nitrogen."
primary_color = "#006400"
/datum/gas/halon
@@ -289,7 +289,7 @@
fusion_power = 7
rarity = 50
base_value = 3.5
- desc = "A very inert gas produced by the fusion of hydrogen and it's derivatives."
+ desc = "A very inert gas produced by the fusion of hydrogen and its derivatives."
primary_color = "#f0f8ff"
/datum/gas/antinoblium
diff --git a/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm b/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm
index 0a6aa23b34d585..0cb82c5c77c7c3 100644
--- a/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm
+++ b/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm
@@ -137,7 +137,6 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm)
/obj/machinery/airalarm/Destroy()
if(my_area)
my_area = null
- QDEL_NULL(wires)
QDEL_NULL(alarm_manager)
GLOB.air_alarms -= src
return ..()
diff --git a/code/modules/atmospherics/machinery/air_alarm/air_alarm_thresholds.dm b/code/modules/atmospherics/machinery/air_alarm/air_alarm_thresholds.dm
index cfe74f13c346c8..197e0f520a61f8 100644
--- a/code/modules/atmospherics/machinery/air_alarm/air_alarm_thresholds.dm
+++ b/code/modules/atmospherics/machinery/air_alarm/air_alarm_thresholds.dm
@@ -5,7 +5,7 @@
var/hazard_min = 0
var/hazard_max = 0
-/** Initialize a TLV and set it's values if given arguments, mostly for map varedits.
+/** Initialize a TLV and set its values if given arguments, mostly for map varedits.
* We provide this functionality but please consider not doing this and making proper subtypes.
* Only by doing the latter will [datum/tlv/proc/reset_value] work.
*/
@@ -47,7 +47,7 @@
if(threshold_type & TLV_VAR_HAZARD_MAX)
hazard_max = value
-/** Reset this particular TLV to it's original value.
+/** Reset this particular TLV to its original value.
*
* Arguments:
* * threshold_type: What kind of variable do we want to set. Accepts bitfield subsets of [TLV_VAR_ALL].
diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm
index fa8b8332345863..8674e6331e4acd 100644
--- a/code/modules/atmospherics/machinery/atmosmachinery.dm
+++ b/code/modules/atmospherics/machinery/atmosmachinery.dm
@@ -327,7 +327,10 @@
return FALSE
//if the target is not in the same piping layer & it does not have the all layer connection flag[which allows it to be connected regardless of layer] then we are out
- if(target.piping_layer != given_layer && !(target.pipe_flags & PIPING_ALL_LAYER))
+ if(target.pipe_flags & PIPING_DISTRO_AND_WASTE_LAYERS)
+ if(ISODD(given_layer))
+ return FALSE
+ else if(target.piping_layer != given_layer && !(target.pipe_flags & PIPING_ALL_LAYER))
return FALSE
//if the target does not have the same color and it does not have all color connection flag[which allows it to be connected regardless of color] & one of the pipes is not gray[allowing for connection regardless] then we are out
@@ -666,7 +669,7 @@
SET_PLANE_EXPLICIT(cap_overlay, initial(plane), our_turf)
cap_overlay.color = pipe_color
- cap_overlay.layer = layer
+ cap_overlay.layer = initial(layer)
cap_overlay.icon_state = "[bitfield]_[piping_layer]"
cap_overlay.forceMove(our_turf)
diff --git a/code/modules/atmospherics/machinery/components/components_base.dm b/code/modules/atmospherics/machinery/components/components_base.dm
index b4e5d88d62c718..ded9110bdfd74c 100644
--- a/code/modules/atmospherics/machinery/components/components_base.dm
+++ b/code/modules/atmospherics/machinery/components/components_base.dm
@@ -62,9 +62,12 @@
color = null
SET_PLANE_IMPLICIT(src, showpipe ? GAME_PLANE : FLOOR_PLANE)
+ // Layer is handled in update_layer()
if(!showpipe)
return ..()
+ if(pipe_flags & PIPING_DISTRO_AND_WASTE_LAYERS)
+ return ..()
var/connected = 0 //Direction bitset
@@ -327,7 +330,7 @@
connect_nodes()
/obj/machinery/atmospherics/components/update_layer()
- layer = initial(layer) + (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_LCHANGE + (GLOB.pipe_colors_ordered[pipe_color] * 0.001)
+ layer = (showpipe ? initial(layer) : ABOVE_OPEN_TURF_LAYER) + (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_LCHANGE + (GLOB.pipe_colors_ordered[pipe_color] * 0.001)
/**
* Handles air relocation to the pipenet/environment
diff --git a/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer_items.dm b/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer_items.dm
index 95b548998a1942..26cb3951135192 100644
--- a/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer_items.dm
+++ b/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer_items.dm
@@ -38,3 +38,22 @@
if(uses <= 0)
qdel(src)
return ITEM_INTERACT_SUCCESS
+
+/obj/item/nitrium_crystal
+ desc = "A weird brown crystal, it smokes when broken"
+ name = "nitrium crystal"
+ icon = 'icons/obj/pipes_n_cables/atmos.dmi'
+ icon_state = "nitrium_crystal"
+ var/cloud_size = 1
+
+/obj/item/nitrium_crystal/attack_self(mob/user)
+ . = ..()
+ var/datum/effect_system/fluid_spread/smoke/chem/smoke = new
+ var/turf/location = get_turf(src)
+ create_reagents(5)
+ reagents.add_reagent(/datum/reagent/nitrium_low_metabolization, 3)
+ reagents.add_reagent(/datum/reagent/nitrium_high_metabolization, 2)
+ smoke.attach(location)
+ smoke.set_up(cloud_size, holder = src, location = location, carry = reagents, silent = TRUE)
+ smoke.start()
+ qdel(src)
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/airlock_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/airlock_pump.dm
new file mode 100644
index 00000000000000..804f868e9c189a
--- /dev/null
+++ b/code/modules/atmospherics/machinery/components/unary_devices/airlock_pump.dm
@@ -0,0 +1,455 @@
+/**
+ * The pump looks up for the airlocks automatically based on airlock_pump_distance_limit and airlock_group_distance_limit values.
+ * When placed, the dir value (direction where the pipes are coming from) is considered as a direction towards the station (internal). The opposite direction is external.
+ * The airlock then tries to find airlocks or walls towards these directions until airlock_pump_distance_limit number of tiles reached.
+ * When it finds a valid object, then it tries to find airlocks, in directions perpendicular to the found tiles.
+ * And then adds them to the corresponding group (external/internal) until airlock_group_distance_limit number of tiles reached
+ *
+ * Example scheme of a valid configuration:
+ * A-----W
+ * A-----A
+ * W--P--A
+ * W-----W
+ * A-----W
+ *
+ * Where:
+ * A - airlocks
+ * W - walls
+ * P - pump
+ */
+/// A vent, scrubber and a sensor in a single device meant specifically for cycling airlocks. Ideal for airlocks of up to 3x3 tiles in size to avoid wind and timing out.
+/obj/machinery/atmospherics/components/unary/airlock_pump
+ name = "external airlock pump"
+ desc = "A pump for cycling an external airlock controlled by the connected doors."
+ icon = 'icons/obj/machines/atmospherics/unary_devices.dmi'
+ icon_state = "airlock_pump"
+ pipe_state = "airlock_pump"
+ use_power = ACTIVE_POWER_USE
+ active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION
+ can_unwrench = TRUE
+ welded = FALSE
+ vent_movement = VENTCRAWL_ALLOWED | VENTCRAWL_CAN_SEE | VENTCRAWL_ENTRANCE_ALLOWED
+ max_integrity = 100
+ paintable = FALSE
+ pipe_flags = PIPING_ONE_PER_TURF | PIPING_DISTRO_AND_WASTE_LAYERS | PIPING_DEFAULT_LAYER_ONLY | PIPING_ALL_COLORS
+ layer = GAS_PUMP_LAYER
+ hide = TRUE
+ device_type = BINARY // Even though it is unary, it has two nodes on one side - used in node count checks
+
+ ///Indicates that the direction of the pump, if ATMOS_DIRECTION_SIPHONING is siphoning, if ATMOS_DIRECTION_RELEASING is releasing
+ var/pump_direction = ATMOS_DIRECTION_SIPHONING
+ ///Target pressure for pressurization cycle
+ var/internal_pressure_target = ONE_ATMOSPHERE
+ ///Target pressure for depressurization cycle
+ var/external_pressure_target = 0
+ ///Target pressure for the current cycle
+ var/cycle_pressure_target
+ ///Allowed error in pressure checks
+ var/allowed_pressure_error = ONE_ATMOSPHERE / 100
+ ///Minimal distro pressure to start cycling
+ var/min_distro_pressure = ONE_ATMOSPHERE / 10
+ ///Rate of the pump to remove gases from the air
+ var/volume_rate = 1000
+ ///The start time of the current cycle to calculate cycle duration
+ var/cycle_start_time
+ ///Max duration of cycle, after which the pump will unlock the airlocks with a warning
+ var/cycle_timeout = 10 SECONDS
+ ///List of the turfs adjacent to the pump for faster cycling and avoiding wind
+ var/list/turf/adjacent_turfs = list()
+ ///Max distance between the airlock and the pump. Used to set up cycling.
+ var/airlock_pump_distance_limit = 2
+ ///Max distance between the central airlock and the side airlocks in a group
+ var/airlock_group_distance_limit = 2
+ ///Type of airlocks required for automatic cycling setup. To avoid hacking bridge doors. Ignored for mapspawn pump.
+ var/valid_airlock_typepath = /obj/machinery/door/airlock/external
+ ///Station-facing airlocks used in cycling
+ var/list/obj/machinery/door/airlock/internal_airlocks
+ ///Space-facing airlocks used in cycling
+ var/list/obj/machinery/door/airlock/external_airlocks
+ ///Whether both airlocks are specified and cycling is available
+ var/cycling_set_up = FALSE
+ ///Whether the pump opens the airlocks up instead of simpy unbolting them on cycle
+ var/open_airlock_on_cycle = TRUE
+ ///Airlocks currently animating
+ var/airlocks_animating = FALSE
+ ///Whether the airlocks comment the cycling details to the chat
+ var/is_cycling_audible = TRUE
+
+ COOLDOWN_DECLARE(check_turfs_cooldown)
+
+
+/obj/machinery/atmospherics/components/unary/airlock_pump/update_icon_nopipes()
+ if(!on || !is_operational || !powered())
+ icon_state = "vent_off"
+ else
+ icon_state = pump_direction ? "vent_out" : "vent_in"
+
+
+/obj/machinery/atmospherics/components/unary/airlock_pump/update_overlays()
+ . = ..()
+ if(!showpipe)
+ return
+
+ var/mutable_appearance/distro_pipe_appearance = get_pipe_image(icon, "pipe_exposed", dir, COLOR_BLUE, piping_layer = 4)
+ if(nodes[1])
+ distro_pipe_appearance = get_pipe_image(icon, "pipe_intact", dir, COLOR_BLUE, piping_layer = 4)
+ . += distro_pipe_appearance
+
+ var/mutable_appearance/waste_pipe_appearance = get_pipe_image(icon, "pipe_exposed", dir, COLOR_RED, piping_layer = 2)
+ if(nodes[2])
+ waste_pipe_appearance = get_pipe_image(icon, "pipe_intact", dir, COLOR_RED, piping_layer = 2)
+ . += waste_pipe_appearance
+
+ var/mutable_appearance/distro_cap_appearance = get_pipe_image(icon, "vent_cap", dir, piping_layer = 4)
+ . += distro_cap_appearance
+
+ var/mutable_appearance/waste_cap_appearance = get_pipe_image(icon, "vent_cap", dir, piping_layer = 2)
+ . += waste_cap_appearance
+
+
+/obj/machinery/atmospherics/components/unary/airlock_pump/atmos_init(list/node_connects)
+ for(var/obj/machinery/atmospherics/target in get_step(src, dir))
+ if(connection_check(target, 4) && !nodes[1])
+ nodes[1] = target // Distro
+ if(connection_check(target, 2) && !nodes[2])
+ nodes[2] = target // Waste
+ update_appearance()
+
+
+/obj/machinery/atmospherics/components/unary/airlock_pump/Initialize(mapload)
+ . = ..()
+ if(mapload)
+ can_unwrench = FALSE
+
+
+/obj/machinery/atmospherics/components/unary/airlock_pump/post_machine_initialize()
+ . = ..()
+ set_links()
+
+
+/obj/machinery/atmospherics/components/unary/airlock_pump/New()
+ . = ..()
+ var/datum/gas_mixture/distro_air = airs[1]
+ var/datum/gas_mixture/waste_air = airs[2]
+ distro_air.volume = 1000
+ waste_air.volume = 1000
+
+
+/obj/machinery/atmospherics/components/unary/airlock_pump/on_deconstruction(disassembled)
+ . = ..()
+ if(cycling_set_up)
+ break_all_links()
+
+
+/obj/machinery/atmospherics/components/unary/airlock_pump/can_unwrench(mob/user)
+ . = ..()
+ if(!.)
+ to_chat(user, span_warning("You cannot unwrench [src], it is secured firmly in place!"))
+ return FALSE
+ if(. && on)
+ to_chat(user, span_warning("You cannot unwrench [src], wait for the cycle completion!"))
+ return FALSE
+
+
+/obj/machinery/atmospherics/components/unary/airlock_pump/process_atmos()
+ if(!on)
+ return
+
+ if(!powered())
+ stop_cycle("No power. Cycle aborted.", unbolt_only = TRUE)
+ return //Couldn't complete the cycle due to power outage
+
+ var/turf/location = get_turf(loc)
+ if(isclosedturf(location))
+ return
+
+ if(COOLDOWN_FINISHED(src, check_turfs_cooldown))
+ check_turfs()
+ COOLDOWN_START(src, check_turfs_cooldown, 2 SECONDS)
+
+ if(world.time - cycle_start_time > cycle_timeout)
+ stop_cycle("Cycling timed out, bolts unlocked.", unbolt_only = TRUE)
+ return //Couldn't complete the cycle before timeout
+
+ var/datum/gas_mixture/distro_air = airs[1]
+ var/datum/gas_mixture/tile_air = loc.return_air()
+ var/tile_air_pressure = tile_air.return_pressure()
+
+ if(pump_direction == ATMOS_DIRECTION_RELEASING) //distro node -> tile
+ var/pressure_delta = cycle_pressure_target - tile_air_pressure
+ if(pressure_delta <= allowed_pressure_error && stop_cycle("Pressurization complete."))
+ return //Internal target pressure reached
+
+ var/available_moles = distro_air.total_moles()
+ var/total_tiles = adjacent_turfs.len + 1
+ var/split_moles = QUANTIZE(available_moles / total_tiles)
+
+ fill_tile(loc, split_moles, pressure_delta)
+ for(var/turf/tile as anything in adjacent_turfs)
+ fill_tile(tile, split_moles, pressure_delta)
+ else //tile -> waste node
+ var/pressure_delta = tile_air_pressure - cycle_pressure_target
+ if(pressure_delta <= allowed_pressure_error && stop_cycle("Decompression complete."))
+ return //External target pressure reached
+
+ siphon_tile(loc)
+ for(var/turf/tile as anything in adjacent_turfs)
+ siphon_tile(tile)
+
+
+/// Fill a tile with air from the distro node
+/obj/machinery/atmospherics/components/unary/airlock_pump/proc/fill_tile(turf/tile, moles, pressure_delta)
+ var/datum/pipeline/distro_pipe = parents[1]
+ var/datum/gas_mixture/distro_air = airs[1]
+ var/datum/gas_mixture/tile_air = tile.return_air()
+ var/transfer_moles = (volume_rate / tile_air.volume) * (pressure_delta * tile_air.volume) / (distro_air.temperature * R_IDEAL_GAS_EQUATION)
+ moles = min(moles, transfer_moles)
+
+ var/datum/gas_mixture/removed_air = distro_air.remove(moles)
+
+ if(!removed_air)
+ return //No air in distro
+
+ tile.assume_air(removed_air)
+ distro_pipe.update = TRUE
+
+
+/// Siphon air from the tile to the waste node within the volume rate limit
+/obj/machinery/atmospherics/components/unary/airlock_pump/proc/siphon_tile(turf/tile)
+ var/datum/pipeline/waste_pipe = parents[2]
+ var/datum/gas_mixture/waste_air = airs[2]
+ var/datum/gas_mixture/tile_air = tile.return_air()
+
+ var/transfer_moles = tile_air.total_moles() * (volume_rate / tile_air.volume)
+ var/datum/gas_mixture/removed_air = tile.remove_air(transfer_moles)
+
+ if(!removed_air)
+ return //No air on the tile
+
+ waste_air.merge(removed_air)
+ waste_pipe.update = TRUE
+
+
+/// Proc for triggering cycle by clicking on a bolted airlock that has a pump assigned
+/obj/machinery/atmospherics/components/unary/airlock_pump/proc/airlock_act(obj/machinery/door/airlock/airlock)
+ if(on)
+ airlock.run_animation(DOOR_DENY_ANIMATION) // Already cycling
+ return
+ if(!cycling_set_up)
+ airlock.say("Airlock pair not found.")
+ return
+ if(airlock in external_airlocks)
+ start_cycle(ATMOS_DIRECTION_SIPHONING, airlock)
+ else if(airlock in internal_airlocks)
+ start_cycle(ATMOS_DIRECTION_RELEASING, airlock)
+
+
+///Start decompression or pressurization cycle depending on the passed direction
+/obj/machinery/atmospherics/components/unary/airlock_pump/proc/start_cycle(cycle_direction, obj/machinery/door/airlock/source_airlock = null)
+ if(on || !cycling_set_up || airlocks_animating || !powered())
+ return FALSE
+
+ pump_direction = cycle_direction
+
+ for(var/obj/machinery/door/airlock/airlock as anything in (internal_airlocks + external_airlocks))
+ INVOKE_ASYNC(airlock, TYPE_PROC_REF(/obj/machinery/door/airlock, secure_close))
+
+ airlocks_animating = TRUE
+ stoplag(1 SECONDS) // Wait for closing animation
+ airlocks_animating = FALSE
+
+ on = TRUE
+ cycle_start_time = world.time
+
+ var/turf/local_turf = get_turf(src)
+ var/tile_air_pressure = max(0, local_turf.return_air().return_pressure())
+
+ if(pump_direction == ATMOS_DIRECTION_RELEASING)
+ cycle_pressure_target = internal_pressure_target
+ var/pressure_delta = cycle_pressure_target - tile_air_pressure
+ if(pressure_delta <= allowed_pressure_error)
+ stop_cycle("Pressure nominal, cycle skipped.")
+ return TRUE
+
+ var/datum/gas_mixture/distro_air = airs[1]
+ if(distro_air.return_pressure() < min_distro_pressure)
+ stop_cycle("Low pipe pressure, cycle skipped. Proceed with caution.", unbolt_only = TRUE)
+ return TRUE
+
+ if(!source_airlock)
+ source_airlock = internal_airlocks[1]
+ if(is_cycling_audible)
+ source_airlock.say("Pressurizing airlock.")
+ else
+ cycle_pressure_target = external_pressure_target
+ var/pressure_delta = tile_air_pressure - cycle_pressure_target
+ if(pressure_delta <= allowed_pressure_error)
+ stop_cycle("Pressure nominal, cycle skipped.")
+ return TRUE
+
+ for(var/obj/machinery/door/airlock/airlock as anything in external_airlocks)
+ if(airlock.shuttledocked)
+ stop_cycle("Shuttle docked, cycle skipped.")
+ return TRUE
+
+ if(!source_airlock)
+ source_airlock = external_airlocks[1]
+ if(is_cycling_audible)
+ source_airlock.say("Decompressing airlock.")
+
+ update_appearance()
+ return TRUE
+
+
+///Complete/Abort cycle with the passed message
+/obj/machinery/atmospherics/components/unary/airlock_pump/proc/stop_cycle(message = null, unbolt_only = FALSE)
+ if(!on)
+ return FALSE
+ on = FALSE
+
+ var/list/obj/machinery/door/airlock/unlocked_airlocks = pump_direction == ATMOS_DIRECTION_RELEASING ? internal_airlocks : external_airlocks
+ for(var/obj/machinery/door/airlock/airlock as anything in unlocked_airlocks)
+ airlock.unbolt()
+ if(open_airlock_on_cycle && !unbolt_only)
+ INVOKE_ASYNC(airlock, TYPE_PROC_REF(/obj/machinery/door/airlock, secure_open)) //Can unbolt, but without audio
+
+ airlocks_animating = TRUE
+ stoplag(1 SECONDS) // Wait for opening animation
+ airlocks_animating = FALSE
+
+ if(message && is_cycling_audible)
+ unlocked_airlocks[1].say(message)
+
+ update_appearance()
+ return TRUE
+
+
+///Update adjacent_turfs with atmospherically adjacent tiles
+/obj/machinery/atmospherics/components/unary/airlock_pump/proc/check_turfs()
+ adjacent_turfs.Cut()
+ var/turf/local_turf = get_turf(src)
+ adjacent_turfs = local_turf.get_atmos_adjacent_turfs(alldir = TRUE)
+
+
+///Find airlocks and link up with them
+/obj/machinery/atmospherics/components/unary/airlock_pump/proc/set_links()
+ var/perpendicular_dirs = NSCOMPONENT(dir) ? WEST|EAST : NORTH|SOUTH
+ var/turf/internal_airlocks_origin = find_density(get_turf(src), dir)
+ var/turf/external_airlocks_origin = find_density(get_turf(src), REVERSE_DIR(dir))
+ internal_airlocks = get_adjacent_airlocks(internal_airlocks_origin, perpendicular_dirs)
+ external_airlocks = get_adjacent_airlocks(external_airlocks_origin, perpendicular_dirs)
+
+ if(!internal_airlocks.len || !internal_airlocks.len)
+ if(!can_unwrench) //maploaded pump
+ CRASH("[type] couldn't find airlocks to cycle with!")
+ internal_airlocks = list()
+ external_airlocks = list()
+ say("Cycling setup failed. No opposite airlocks found.")
+ return
+
+ for(var/obj/machinery/door/airlock/airlock as anything in (internal_airlocks + external_airlocks))
+ airlock.set_cycle_pump(src)
+ RegisterSignal(airlock, COMSIG_QDELETING, PROC_REF(unlink_airlock))
+ if (airlock in external_airlocks)
+ INVOKE_ASYNC(airlock, TYPE_PROC_REF(/obj/machinery/door/airlock, secure_close))
+ else if(open_airlock_on_cycle)
+ INVOKE_ASYNC(airlock, TYPE_PROC_REF(/obj/machinery/door/airlock, secure_open))
+
+ cycle_timeout *= round((internal_airlocks.len + external_airlocks.len) / 2)
+ cycling_set_up = TRUE
+ if(can_unwrench)
+ say("Cycling setup complete.")
+
+
+///Get the turf of the first found airlock or an airtight structure (walls) within the allowed range
+/obj/machinery/atmospherics/components/unary/airlock_pump/proc/find_density(turf/origin, direction, max_distance = airlock_pump_distance_limit)
+ var/turf/next_turf = origin
+ var/limit = max(1, max_distance)
+ while(limit)
+ limit--
+ next_turf = get_step(next_turf, direction)
+ var/obj/machinery/door/airlock/found_airlock = locate() in next_turf
+ if(is_valid_airlock(found_airlock))
+ return found_airlock.loc
+ if(!next_turf.can_atmos_pass)
+ return next_turf
+
+
+///Find airlocks adjacent to the central one, lined up along the provided directions
+/obj/machinery/atmospherics/components/unary/airlock_pump/proc/get_adjacent_airlocks(origin_turf, directions)
+ var/list/airlocks = list()
+
+ var/obj/machinery/door/airlock/origin_airlock = locate() in origin_turf
+ if(is_valid_airlock(origin_airlock))
+ airlocks.Add(origin_airlock)
+
+ for(var/direction in GLOB.cardinals)
+ if(!(direction & directions))
+ continue
+ var/turf/next_turf = origin_turf
+ var/limit = max(0, airlock_group_distance_limit)
+ while(limit)
+ limit--
+ next_turf = get_step(next_turf, direction)
+ var/obj/machinery/door/airlock/found_airlock = locate() in next_turf
+ if (is_valid_airlock(found_airlock))
+ airlocks.Add(found_airlock)
+ else
+ limit = 0
+
+ return airlocks
+
+
+///Whether the passed airlock can be linked with
+/obj/machinery/atmospherics/components/unary/airlock_pump/proc/is_valid_airlock(obj/machinery/door/airlock/airlock)
+ if(!airlock)
+ return FALSE
+ if(airlock.cycle_pump)
+ return FALSE // Already linked
+ if(can_unwrench && !istype(airlock, valid_airlock_typepath))
+ return FALSE // Invalid airlock type and the pump is not mapspawn
+ return TRUE
+
+
+///Find airlocks and link up with them
+/obj/machinery/atmospherics/components/unary/airlock_pump/proc/unlink_airlock(airlock)
+ UnregisterSignal(airlock, COMSIG_QDELETING)
+
+ if(airlock in internal_airlocks)
+ internal_airlocks.Remove(airlock)
+ if(airlock in external_airlocks)
+ external_airlocks.Remove(airlock)
+
+ if(!internal_airlocks.len || !external_airlocks.len)
+ break_all_links()
+
+
+///Break the cycling setup
+/obj/machinery/atmospherics/components/unary/airlock_pump/proc/break_all_links()
+ for(var/obj/machinery/door/airlock/airlock as anything in (internal_airlocks + external_airlocks))
+ UnregisterSignal(airlock, COMSIG_QDELETING)
+
+ external_airlocks = list()
+ internal_airlocks = list()
+ cycle_timeout = initial(cycle_timeout)
+ cycling_set_up = FALSE
+
+
+/obj/machinery/atmospherics/components/unary/airlock_pump/relaymove(mob/living/user, direction)
+ if(initialize_directions & direction)
+ return ..()
+ if((NORTH|EAST) & direction)
+ user.ventcrawl_layer = clamp(user.ventcrawl_layer + 2, PIPING_LAYER_DEFAULT - 1, PIPING_LAYER_DEFAULT + 1)
+ if((SOUTH|WEST) & direction)
+ user.ventcrawl_layer = clamp(user.ventcrawl_layer - 2, PIPING_LAYER_DEFAULT - 1, PIPING_LAYER_DEFAULT + 1)
+ to_chat(user, "You align yourself with the [user.ventcrawl_layer == 2 ? 1 : 2]\th output.")
+
+/obj/machinery/atmospherics/components/unary/airlock_pump/unbolt_only
+ open_airlock_on_cycle = FALSE
+
+/obj/machinery/atmospherics/components/unary/airlock_pump/silent
+ is_cycling_audible = FALSE
+
+/obj/machinery/atmospherics/components/unary/airlock_pump/lavaland
+ external_pressure_target = LAVALAND_EQUIPMENT_EFFECT_PRESSURE
+
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
index 55237aba340df7..59ce701924c915 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
@@ -80,7 +80,7 @@
use_power = IDLE_POWER_USE
idle_power_usage = BASE_MACHINE_IDLE_CONSUMPTION * 0.75
active_power_usage = BASE_MACHINE_ACTIVE_CONSUMPTION * 1.5
- flags_1 = PREVENT_CLICK_UNDER_1
+ flags_1 = PREVENT_CLICK_UNDER_1 | IGNORE_TURF_PIXEL_OFFSET_1
interaction_flags_mouse_drop = NEED_DEXTERITY
///If TRUE will eject the mob once healing is complete
diff --git a/code/modules/atmospherics/machinery/datum_pipeline.dm b/code/modules/atmospherics/machinery/datum_pipeline.dm
index 867da91d6c893d..37cb21ee8cee4a 100644
--- a/code/modules/atmospherics/machinery/datum_pipeline.dm
+++ b/code/modules/atmospherics/machinery/datum_pipeline.dm
@@ -131,7 +131,7 @@
/**
* For a machine to properly "connect" to a pipeline and share gases,
- * the pipeline needs to acknowledge a gas mixture as it's member.
+ * the pipeline needs to acknowledge a gas mixture as its member.
* This is currently handled by the other_airs list in the pipeline datum.
*
* Other_airs itself is populated by gas mixtures through the parents list that each machineries have.
diff --git a/code/modules/atmospherics/machinery/pipes/bridge_pipe.dm b/code/modules/atmospherics/machinery/pipes/bridge_pipe.dm
index 472cb3ed2034a8..4c1cd63016c922 100644
--- a/code/modules/atmospherics/machinery/pipes/bridge_pipe.dm
+++ b/code/modules/atmospherics/machinery/pipes/bridge_pipe.dm
@@ -5,6 +5,7 @@
name = "bridge pipe"
desc = "A one meter section of regular pipe used to connect pipenets over pipes."
+ layer = HIGH_PIPE_LAYER
dir = SOUTH
initialize_directions = NORTH | SOUTH
pipe_flags = PIPING_CARDINAL_AUTONORMALIZE | PIPING_BRIDGE
@@ -28,4 +29,5 @@
PIPING_LAYER_DOUBLE_SHIFT(center, piping_layer)
. += center
- layer = HIGH_PIPE_LAYER //to stay above all sorts of pipes
+/obj/machinery/atmospherics/pipe/bridge_pipe/update_layer()
+ layer = (HAS_TRAIT(src, TRAIT_UNDERFLOOR) ? ABOVE_OPEN_TURF_LAYER + 1 : initial(layer))
diff --git a/code/modules/atmospherics/machinery/pipes/layermanifold.dm b/code/modules/atmospherics/machinery/pipes/layermanifold.dm
index 730e193671dbed..fde47b1baf0eeb 100644
--- a/code/modules/atmospherics/machinery/pipes/layermanifold.dm
+++ b/code/modules/atmospherics/machinery/pipes/layermanifold.dm
@@ -41,7 +41,7 @@
nodes = list()
/obj/machinery/atmospherics/pipe/layer_manifold/update_layer()
- layer = initial(layer) + (PIPING_LAYER_MAX * PIPING_LAYER_LCHANGE) //This is above everything else.
+ layer = (HAS_TRAIT(src, TRAIT_UNDERFLOOR) ? ABOVE_OPEN_TURF_LAYER : initial(layer)) + (PIPING_LAYER_MAX * PIPING_LAYER_LCHANGE) //This is above everything else.
/obj/machinery/atmospherics/pipe/layer_manifold/update_overlays()
. = ..()
@@ -65,10 +65,15 @@
for(var/i in PIPING_LAYER_MIN to PIPING_LAYER_MAX)
. += get_attached_image(get_dir(src, machine_check), i, COLOR_VERY_LIGHT_GRAY)
return
+ if(istype(machine_check, /obj/machinery/atmospherics/components/unary/airlock_pump))
+ . += get_attached_image(get_dir(src, machine_check), 4, COLOR_BLUE)
+ //. += get_attached_image(get_dir(src, machine_check), 2, COLOR_RED) // Only the distro node is added currently to the pipenet, it doesn't merge the pipenet with the waste node
+ return
. += get_attached_image(get_dir(src, machine_check), machine_check.piping_layer, machine_check.pipe_color)
/obj/machinery/atmospherics/pipe/layer_manifold/proc/get_attached_image(p_dir, p_layer, p_color)
- var/mutable_appearance/muta = mutable_appearance('icons/obj/pipes_n_cables/layer_manifold_underlays.dmi', "intact_[p_dir]_[p_layer]", layer = layer - 0.01, appearance_flags = RESET_COLOR)
+ var/working_layer = FLOAT_LAYER - HAS_TRAIT(src, TRAIT_UNDERFLOOR) ? 1 : 0.01
+ var/mutable_appearance/muta = mutable_appearance('icons/obj/pipes_n_cables/layer_manifold_underlays.dmi', "intact_[p_dir]_[p_layer]", layer = working_layer, appearance_flags = RESET_COLOR)
muta.color = p_color
return muta
diff --git a/code/modules/atmospherics/machinery/pipes/mapping.dm b/code/modules/atmospherics/machinery/pipes/mapping.dm
index 3615147e4d1bf3..dce09be9092ed5 100644
--- a/code/modules/atmospherics/machinery/pipes/mapping.dm
+++ b/code/modules/atmospherics/machinery/pipes/mapping.dm
@@ -83,7 +83,7 @@ HELPER(yellow, COLOR_YELLOW)
HELPER(general, COLOR_VERY_LIGHT_GRAY)
HELPER(cyan, COLOR_CYAN)
HELPER(green, COLOR_VIBRANT_LIME)
-HELPER(orange, COLOR_TAN_ORANGE)
+HELPER(orange, COLOR_ENGINEERING_ORANGE)
HELPER(purple, COLOR_PURPLE)
HELPER(dark, COLOR_DARK)
HELPER(brown, COLOR_BROWN)
diff --git a/code/modules/atmospherics/machinery/pipes/pipes.dm b/code/modules/atmospherics/machinery/pipes/pipes.dm
index 40258db903ff0f..230edc9a897f00 100644
--- a/code/modules/atmospherics/machinery/pipes/pipes.dm
+++ b/code/modules/atmospherics/machinery/pipes/pipes.dm
@@ -139,4 +139,4 @@
current_node.update_icon()
/obj/machinery/atmospherics/pipe/update_layer()
- layer = initial(layer) + (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_LCHANGE + (GLOB.pipe_colors_ordered[pipe_color] * 0.0001)
+ layer = (HAS_TRAIT(src, TRAIT_UNDERFLOOR) ? ABOVE_OPEN_TURF_LAYER : initial(layer)) + (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_LCHANGE + (GLOB.pipe_colors_ordered[pipe_color] * 0.0001)
diff --git a/code/modules/awaymissions/away_props.dm b/code/modules/awaymissions/away_props.dm
index 22d9f532efcbd4..843e55b963fe4e 100644
--- a/code/modules/awaymissions/away_props.dm
+++ b/code/modules/awaymissions/away_props.dm
@@ -1,6 +1,6 @@
/obj/effect/oneway
name = "one way effect"
- desc = "Only lets things in from it's dir."
+ desc = "Only lets things in from its dir."
icon = 'icons/effects/mapping_helpers.dmi'
icon_state = "field_dir"
invisibility = INVISIBILITY_MAXIMUM
@@ -13,7 +13,7 @@
/obj/effect/wind
name = "wind effect"
- desc = "Creates pressure effect in it's direction. Use sparingly."
+ desc = "Creates pressure effect in its direction. Use sparingly."
icon = 'icons/effects/mapping_helpers.dmi'
icon_state = "field_dir"
invisibility = INVISIBILITY_MAXIMUM
@@ -56,6 +56,7 @@
name = "pit grate"
icon = 'icons/obj/smooth_structures/lattice.dmi'
icon_state = "lattice-255"
+ layer = ABOVE_OPEN_TURF_LAYER
plane = FLOOR_PLANE
anchored = TRUE
obj_flags = CAN_BE_HIT | BLOCK_Z_OUT_DOWN | BLOCK_Z_IN_UP
@@ -95,6 +96,7 @@
talpha = 255
obj_flags |= BLOCK_Z_OUT_DOWN | BLOCK_Z_IN_UP
SET_PLANE_IMPLICIT(src, ABOVE_LIGHTING_PLANE) //What matters it's one above openspace, so our animation is not dependant on what's there. Up to revision with 513
+ layer = ABOVE_NORMAL_TURF_LAYER
animate(src,alpha = talpha,time = 10)
addtimer(CALLBACK(src, PROC_REF(reset_plane)), 1 SECONDS)
if(hidden)
@@ -106,6 +108,7 @@
/obj/structure/pitgrate/proc/reset_plane()
SET_PLANE_IMPLICIT(src, FLOOR_PLANE)
+ layer = ABOVE_OPEN_TURF_LAYER
/obj/structure/pitgrate/Destroy()
if(hidden)
diff --git a/code/modules/bitrunning/areas.dm b/code/modules/bitrunning/areas.dm
index 720bf0f1e5d2cd..4fcf0a0496e473 100644
--- a/code/modules/bitrunning/areas.dm
+++ b/code/modules/bitrunning/areas.dm
@@ -43,8 +43,14 @@
icon_state = "bit_ice"
area_flags = UNIQUE_AREA | NOTELEPORT | EVENT_PROTECTED | HIDDEN_AREA
-/area/ruin/space/has_grav/powered/virtual_domain
- name = "Virtual Domain Space Ruins"
+/area/ruin/space/virtual_domain
+ name = "Virtual Domain Unexplored Location"
+ icon = 'icons/area/areas_station.dmi'
+ icon_state = "bit_ruin"
+ area_flags = UNIQUE_AREA | NOTELEPORT | EVENT_PROTECTED | HIDDEN_AREA
+
+/area/space/virtual_domain
+ name = "Virtual Domain Space"
icon = 'icons/area/areas_station.dmi'
icon_state = "bit_space"
area_flags = UNIQUE_AREA | NOTELEPORT | EVENT_PROTECTED | HIDDEN_AREA
diff --git a/code/modules/bitrunning/netpod/utils.dm b/code/modules/bitrunning/netpod/utils.dm
index 6e0033fe02d930..c593b457e9cc1d 100644
--- a/code/modules/bitrunning/netpod/utils.dm
+++ b/code/modules/bitrunning/netpod/utils.dm
@@ -76,6 +76,11 @@
balloon_alert(neo, "nothing loaded!")
return
+ balloon_alert(neo, "establishing connection...")
+ if(!do_after(neo, 2 SECONDS, src))
+ open_machine()
+ return
+
var/mob/living/carbon/current_avatar = avatar_ref?.resolve()
if(isnull(current_avatar) || current_avatar.stat != CONSCIOUS) // We need a viable avatar
current_avatar = server.start_new_connection(neo, netsuit)
@@ -130,9 +135,6 @@
/// Checks for cases to eject/fail connecting an avatar
/obj/machinery/netpod/proc/validate_entry(mob/living/neo, mob/living/avatar)
- if(!do_after(neo, 2 SECONDS, src))
- return FALSE
-
// Very invalid
if(QDELETED(neo) || QDELETED(avatar) || QDELETED(src) || !is_operational)
return FALSE
diff --git a/code/modules/cards/singlecard.dm b/code/modules/cards/singlecard.dm
index 300523254ed7dc..5f2c6e37f387aa 100644
--- a/code/modules/cards/singlecard.dm
+++ b/code/modules/cards/singlecard.dm
@@ -170,10 +170,10 @@
user.balloon_alert_to_viewers("deals a card")
var/obj/item/toy/cards/cardhand/new_cardhand = new (drop_location())
- new_cardhand.insert(src)
- new_cardhand.insert(card)
new_cardhand.pixel_x = pixel_x
new_cardhand.pixel_y = pixel_y
+ new_cardhand.insert(src)
+ new_cardhand.insert(card)
if(!isturf(loc)) // make a cardhand in our active hand
user.temporarilyRemoveItemFromInventory(src, TRUE)
diff --git a/code/modules/cargo/bounties/assistant.dm b/code/modules/cargo/bounties/assistant.dm
index d4ef4b6a148e0d..23e578c2ed2dbd 100644
--- a/code/modules/cargo/bounties/assistant.dm
+++ b/code/modules/cargo/bounties/assistant.dm
@@ -213,7 +213,7 @@
/datum/bounty/item/assistant/fish
name = "Fish"
description = "We need fish to populate our aquariums with. Fishes that are dead or bought from cargo will only be paid half as much."
- reward = CARGO_CRATE_VALUE * 9
+ reward = CARGO_CRATE_VALUE * 9.5
required_count = 4
wanted_types = list(/obj/item/fish = TRUE, /obj/item/storage/fish_case = TRUE)
///the penalty for shipping dead/bought fish, which can subtract up to half the reward in total.
@@ -249,7 +249,7 @@
///A subtype of the fish bounty that requires fish with a specific fluid type
/datum/bounty/item/assistant/fish/fluid
- reward = CARGO_CRATE_VALUE * 11
+ reward = CARGO_CRATE_VALUE * 12
///The required fluid type of the fish for it to be shipped
var/fluid_type
@@ -261,42 +261,3 @@
/datum/bounty/item/assistant/fish/fluid/can_ship_fish(obj/item/fish/fishie)
return compatible_fluid_type(fishie.required_fluid_type, fluid_type)
-
-///A subtype of the fish bounty that requires specific fish types. The higher their rarity, the better the pay.
-/datum/bounty/item/assistant/fish/specific
- description = "Our prestigious fish collection is currently lacking a few specific species. Fishes that are dead or bought from cargo will only be paid half as much."
- reward = CARGO_CRATE_VALUE * 16
- required_count = 3
- wanted_types = list(/obj/item/storage/fish_case = TRUE)
-
-/datum/bounty/item/assistant/fish/specific/New()
- var/static/list/choosable_fishes
- if(isnull(choosable_fishes))
- choosable_fishes = list()
- for(var/obj/item/fish/prototype as anything in subtypesof(/obj/item/fish))
- if(initial(prototype.experisci_scannable) && initial(prototype.show_in_catalog))
- choosable_fishes += prototype
-
- var/list/fishes_copylist = choosable_fishes.Copy()
- ///Used to calculate the extra reward
- var/total_rarity = 0
- var/list/name_list = list()
- var/num_paths = rand(2,3)
- for(var/i in 1 to num_paths)
- var/obj/item/fish/chosen_path = pick_n_take(fishes_copylist)
- wanted_types[chosen_path] = TRUE
- name_list += initial(chosen_path.name)
- total_rarity += initial(chosen_path.random_case_rarity) / num_paths
- name = english_list(name_list)
-
- switch(total_rarity)
- if(FISH_RARITY_NOPE to FISH_RARITY_GOOD_LUCK_FINDING_THIS)
- reward += CARGO_CRATE_VALUE * 14
- if(FISH_RARITY_GOOD_LUCK_FINDING_THIS to FISH_RARITY_VERY_RARE)
- reward += CARGO_CRATE_VALUE * 6.5
- if(FISH_RARITY_VERY_RARE to FISH_RARITY_RARE)
- reward += CARGO_CRATE_VALUE * 3
- if(FISH_RARITY_RARE to FISH_RARITY_BASIC-1)
- reward += CARGO_CRATE_VALUE * 1
-
- ..()
diff --git a/code/modules/cargo/bounties/security.dm b/code/modules/cargo/bounties/security.dm
index cc83aa228a8ff7..8281408c179672 100644
--- a/code/modules/cargo/bounties/security.dm
+++ b/code/modules/cargo/bounties/security.dm
@@ -1,8 +1,8 @@
/datum/bounty/item/security/recharger
- name = "Rechargers"
- description = "Nanotrasen military academy is conducting marksmanship exercises. They request that rechargers be shipped."
+ name = "Weapon Recharger"
+ description = "Nanotrasen military academy is conducting marksmanship exercises. They request that a recharger be shipped."
reward = CARGO_CRATE_VALUE * 4
- required_count = 3
+ required_count = 1
wanted_types = list(/obj/machinery/recharger = TRUE)
/datum/bounty/item/security/pepperspray
@@ -81,3 +81,13 @@
if(istype(slip.scanned_area, demanded_area))
return TRUE
return FALSE
+
+/datum/bounty/item/security/contraband
+ name = "Confiscated Contraband"
+ description = "The syndicate are constantly acting to subvert crewmates of Nanotrasen afilliated stations. Ship us your latest batch of confiscated contraband."
+ reward = CARGO_CRATE_VALUE * 4
+ required_count = 5
+ wanted_types = list(/obj/item = TRUE)
+
+/datum/bounty/item/security/contraband/applies_to(obj/O)
+ return HAS_TRAIT(O, TRAIT_CONTRABAND)
diff --git a/code/modules/cargo/centcom_podlauncher.dm b/code/modules/cargo/centcom_podlauncher.dm
index cf4a5dfc8759fd..5d5bc3f29f57d8 100644
--- a/code/modules/cargo/centcom_podlauncher.dm
+++ b/code/modules/cargo/centcom_podlauncher.dm
@@ -331,7 +331,7 @@ ADMIN_VERB(centcom_podlauncher, R_ADMIN, "Config/Launch Supplypod", "Configure a
if("effectName") //Give the supplypod a custom name. Supplypods automatically get their name based on their style (see supplypod/setStyle() proc), so doing this overrides that.
if (temp_pod.adminNamed) //If we're already adminNamed, set the name of the pod back to default
temp_pod.adminNamed = FALSE
- temp_pod.setStyle(temp_pod.style) //This resets the name of the pod based on it's current style (see supplypod/setStyle() proc)
+ temp_pod.setStyle(temp_pod.style) //This resets the name of the pod based on its current style (see supplypod/setStyle() proc)
return
var/nameInput= tgui_input_text(usr, "Enter a custom name", "Custom name", GLOB.podstyles[temp_pod.style][POD_NAME], MAX_NAME_LEN) //Gather input for name and desc
if (isnull(nameInput))
@@ -765,7 +765,7 @@ ADMIN_VERB(centcom_podlauncher, R_ADMIN, "Config/Launch Supplypod", "Configure a
else
var/atom/movable/movable_to_launch = thing_to_launch
movable_to_launch.forceMove(toLaunch) //and forceMove any atom/moveable into the supplypod
- new /obj/effect/pod_landingzone(target_turf, toLaunch) //Then, create the DPTarget effect, which will eventually forceMove the temp_pod to it's location
+ new /obj/effect/pod_landingzone(target_turf, toLaunch) //Then, create the DPTarget effect, which will eventually forceMove the temp_pod to its location
if (launchClone)
launchCounter++ //We only need to increment launchCounter if we are cloning objects.
//If we aren't cloning objects, taking and removing the first item each time from the acceptableTurfs list will inherently iterate through the list in order
diff --git a/code/modules/cargo/exports/fish.dm b/code/modules/cargo/exports/fish.dm
new file mode 100644
index 00000000000000..c68eeaaa70063f
--- /dev/null
+++ b/code/modules/cargo/exports/fish.dm
@@ -0,0 +1,10 @@
+/datum/export/fish
+ cost = 50
+ unit_name = "fish"
+ export_types = list(/obj/item/fish)
+
+/datum/export/fish/get_cost(obj/item/fish/fish, apply_elastic)
+ var/elastic_cost = ..()
+ var/elastic_percent = elastic_cost / init_cost
+ var/size_weight_exponentation = (fish.size * fish.weight * 0.01)^0.85
+ return round(elastic_cost + size_weight_exponentation * elastic_percent)
diff --git a/code/modules/cargo/markets/_market.dm b/code/modules/cargo/markets/_market.dm
index 78585ed842f2eb..0a93469411cdb4 100644
--- a/code/modules/cargo/markets/_market.dm
+++ b/code/modules/cargo/markets/_market.dm
@@ -10,8 +10,10 @@
var/list/available_items = list()
/// Item categories available from this market, only items which are in these categories can be gotten from this market. Automatically assigned, so don't manually adjust.
var/list/categories = list()
+ /// Are the items from this market legal or illegal? If illegal, apply a contrband trait to the bought object.
+ var/legal_status = TRUE
-/// Adds item to the available items and add it's category if it is not in categories yet.
+/// Adds item to the available items and add its category if it is not in categories yet.
/datum/market/proc/add_item(datum/market_item/item)
if(ispath(item, /datum/market_item))
item = new item()
@@ -30,7 +32,15 @@
if(!length(available_items[item.category]))
available_items -= item.category
-/// Handles buying the item, this is mainly for future use and moving the code away from the uplink.
+/**
+ * Handles buying the item for a market.
+ *
+ * @param identifier The identifier of the item to buy.
+ * @param category The category of the item to buy.
+ * @param method The shipping method to use to get the item on the station.
+ * @param uplink The uplink object that is buying the item.
+ * @param user The mob that is buying the item.
+ */
/datum/market/proc/purchase(identifier, category, method, obj/item/market_uplink/uplink, user)
var/datum/market_item/item = available_items[category][identifier]
if(isnull(item))
@@ -54,7 +64,7 @@
to_chat(user, span_warning("You don't have enough credits in [uplink] for [item] with [method] shipping."))
return FALSE
- if(item.buy(uplink, user, method))
+ if(item.buy(uplink, user, method, legal_status))
uplink.current_user.adjust_money(-price, "Other: Third Party Transaction")
if(ismob(user))
var/mob/m_user = user
@@ -70,3 +80,4 @@
SHIPPING_METHOD_LAUNCH = 10,
SHIPPING_METHOD_TELEPORT= 75,
)
+ legal_status = FALSE
diff --git a/code/modules/cargo/markets/market_item.dm b/code/modules/cargo/markets/market_item.dm
index 21ff3d01deb3b4..5e3ce4efb6c079 100644
--- a/code/modules/cargo/markets/market_item.dm
+++ b/code/modules/cargo/markets/market_item.dm
@@ -81,8 +81,15 @@
return new item(loc)
CRASH("Invalid item type for market item [item || "null"]")
-/// Buys the item and makes SSblackmarket handle it.
-/datum/market_item/proc/buy(obj/item/market_uplink/uplink, mob/buyer, shipping_method)
+/**
+ * Buys the item and makes SSblackmarket handle it.
+ *
+ * @param uplink The uplink that is buying the item.
+ * @param buyer The mob that is buying the item.
+ * @param shipping_method The shipping method used to get the market item onto the station.
+ * @param legal_status The legal status of the market. Determines if the item to be spawned is contraband.
+ */
+/datum/market_item/proc/buy(obj/item/market_uplink/uplink, mob/buyer, shipping_method, legal_status)
SHOULD_CALL_PARENT(TRUE)
// Sanity
if(!istype(uplink) || !istype(buyer))
@@ -93,7 +100,7 @@
return FALSE
// Alright, the item has been purchased.
- var/datum/market_purchase/purchase = new(src, uplink, shipping_method)
+ var/datum/market_purchase/purchase = new(src, uplink, shipping_method, legal_status)
// SSblackmarket takes care of the shipping.
if(SSblackmarket.queue_item(purchase))
@@ -102,6 +109,7 @@
return TRUE
return FALSE
+
// This exists because it is easier to keep track of all the vars this way.
/datum/market_purchase
/// The entry being purchased.
@@ -112,13 +120,16 @@
var/obj/item/market_uplink/uplink
/// Shipping method used to buy this item.
var/method
+ /// Is this item considered contraband? If illegal, applies the contraband trait to the item when spawned.
+ var/legallity
-/datum/market_purchase/New(datum/market_item/entry, obj/item/market_uplink/uplink, method)
+/datum/market_purchase/New(datum/market_item/entry, obj/item/market_uplink/uplink, method, legal_status)
if(!uplink || !entry || !method)
CRASH("[type] created with a false value arg: (entry: [entry] - uplink: [uplink] - method: [method])")
src.entry = entry
src.uplink = uplink
src.method = method
+ src.legallity = legal_status
RegisterSignal(entry, COMSIG_QDELETING, PROC_REF(on_instance_del))
RegisterSignal(uplink, COMSIG_QDELETING, PROC_REF(on_instance_del))
if(ismovable(entry.item))
@@ -137,3 +148,13 @@
return
// Uh oh, uplink or item is gone. We will just keep the money and you will not get your order.
qdel(src)
+
+/**
+ * Proc that applies secondary effects to objects that are spawned via a market.
+ *
+ * @param spawned_item - Reference to the atom being spawned.
+ * @param legal_status - Is this item considered legal? If illegal, will apply the contraband trait to the spawned item.
+ */
+/datum/market_purchase/proc/post_purchase_effects(atom/spawned_item)
+ if(!legallity && isobj(spawned_item))
+ ADD_TRAIT(spawned_item, TRAIT_CONTRABAND, INNATE_TRAIT)
diff --git a/code/modules/cargo/markets/market_items/clothing.dm b/code/modules/cargo/markets/market_items/clothing.dm
index 82bda848eb8e99..ee0ae6e0a39970 100644
--- a/code/modules/cargo/markets/market_items/clothing.dm
+++ b/code/modules/cargo/markets/market_items/clothing.dm
@@ -4,7 +4,7 @@
/datum/market_item/clothing/ninja_mask
name = "Space Ninja Mask"
- desc = "Apart from being acid, lava, fireproof and being hard to take off someone it does nothing special on it's own."
+ desc = "Apart from being acid, lava, fireproof and being hard to take off someone it does nothing special on its own."
item = /obj/item/clothing/mask/gas/ninja
price_min = CARGO_CRATE_VALUE
@@ -32,13 +32,23 @@
stock_max = 4
availability_prob = 50
+/datum/market_item/tool/medsechud
+ name = "MedSec HUD"
+ desc = "A mostly defunct combination of security and health scanner HUDs. They don't produce these around anymore."
+ item = /obj/item/clothing/glasses/hud/medsechud
+
+ price_min = CARGO_CRATE_VALUE * 2
+ price_max = CARGO_CRATE_VALUE * 3.5
+ stock_max = 3
+ availability_prob = 50
+
/datum/market_item/clothing/full_spacesuit_set
name = "\improper Nanotrasen Branded Spacesuit Box"
desc = "A few boxes of \"Old Style\" space suits fell off the back of a space truck."
item = /obj/item/storage/box
- price_min = CARGO_CRATE_VALUE * 7.5
- price_max = CARGO_CRATE_VALUE * 20
+ price_min = CARGO_CRATE_VALUE * 1.875
+ price_max = CARGO_CRATE_VALUE * 4
stock_max = 3
availability_prob = 30
@@ -66,7 +76,7 @@
item = /obj/item/clothing/shoes/bhop/rocket
price_min = CARGO_CRATE_VALUE * 5
- price_max = CARGO_CRATE_VALUE * 15
+ price_max = CARGO_CRATE_VALUE * 10
stock_max = 1
availability_prob = 40
diff --git a/code/modules/cargo/markets/market_items/consumables.dm b/code/modules/cargo/markets/market_items/consumables.dm
index f002ff994249df..b7eed89a1951ff 100644
--- a/code/modules/cargo/markets/market_items/consumables.dm
+++ b/code/modules/cargo/markets/market_items/consumables.dm
@@ -19,10 +19,20 @@
stock_min = 2
stock_max = 5
- price_min = CARGO_CRATE_VALUE * 1.625
- price_max = CARGO_CRATE_VALUE * 2
+ price_min = CARGO_CRATE_VALUE * 1.375
+ price_max = CARGO_CRATE_VALUE * 1.825
availability_prob = 80
+/datum/market_item/consumable/donk_pocket_box/spawn_item(loc)
+ var/static/list/choices
+ if(isnull(choices))
+ choices = list()
+ for(var/boxtype as anything in typesof(/obj/item/storage/box/donkpockets))
+ choices[boxtype] = 3
+ choices[/obj/item/storage/box/donkpockets/donkpocketgondola] = 1
+ item = pick_weight(choices)
+ return ..()
+
/datum/market_item/consumable/suspicious_pills
name = "Bottle of Suspicious Pills"
desc = "A random cocktail of luxury drugs that are sure to put a smile on your face!"
@@ -30,17 +40,18 @@
stock_min = 2
stock_max = 3
- price_min = CARGO_CRATE_VALUE * 2
- price_max = CARGO_CRATE_VALUE * 3.5
+ price_min = CARGO_CRATE_VALUE * 0.625
+ price_max = CARGO_CRATE_VALUE * 1.25
availability_prob = 50
/datum/market_item/consumable/suspicious_pills/spawn_item(loc)
- var/pillbottle = pick(list(/obj/item/storage/pill_bottle/zoom,
- /obj/item/storage/pill_bottle/happy,
- /obj/item/storage/pill_bottle/lsd,
- /obj/item/storage/pill_bottle/aranesp,
- /obj/item/storage/pill_bottle/stimulant))
- item = pillbottle
+ item = pick(list(/obj/item/storage/pill_bottle/zoom,
+ /obj/item/storage/pill_bottle/happy,
+ /obj/item/storage/pill_bottle/lsd,
+ /obj/item/storage/pill_bottle/aranesp,
+ /obj/item/storage/pill_bottle/stimulant,
+ /obj/item/storage/pill_bottle/maintenance_pill,
+ ))
return ..()
/datum/market_item/consumable/floor_pill
diff --git a/code/modules/cargo/markets/market_items/misc.dm b/code/modules/cargo/markets/market_items/misc.dm
index 435396c15f2519..b0ea89485801c7 100644
--- a/code/modules/cargo/markets/market_items/misc.dm
+++ b/code/modules/cargo/markets/market_items/misc.dm
@@ -2,7 +2,7 @@
category = "Miscellaneous"
abstract_path = /datum/market_item/misc
-/datum/market_item/misc/Clear_PDA
+/datum/market_item/misc/clear_pda
name = "Clear PDA"
desc = "Show off your style with this limited edition clear PDA!."
item = /obj/item/modular_computer/pda/clear
@@ -12,7 +12,7 @@
stock_max = 2
availability_prob = 50
-/datum/market_item/misc/jade_Lantern
+/datum/market_item/misc/jade_lantern
name = "Jade Lantern"
desc = "Found in a box labeled 'Danger: Radioactive'. Probably safe."
item = /obj/item/flashlight/lantern/jade
@@ -90,7 +90,7 @@
/datum/market_item/misc/smugglers_satchel
name = "Smuggler's Satchel"
- desc = "This easily hidden satchel can become a versatile tool to anybody with the desire to keep certain items out of sight and out of mind."
+ desc = "This easily hidden satchel can become a versatile tool to anybody with the desire to keep certain items out of sight and out of mind. Its contents cannot be detected by contraband scanners."
item = /obj/item/storage/backpack/satchel/flat/empty
price_min = CARGO_CRATE_VALUE * 3.75
diff --git a/code/modules/cargo/markets/market_items/tools.dm b/code/modules/cargo/markets/market_items/tools.dm
index 9576810b3a3c99..963d7fbaeb0755 100644
--- a/code/modules/cargo/markets/market_items/tools.dm
+++ b/code/modules/cargo/markets/market_items/tools.dm
@@ -60,8 +60,8 @@
item = /obj/item/binoculars
stock = 1
- price_min = CARGO_CRATE_VALUE * 2
- price_max = CARGO_CRATE_VALUE * 4.8
+ price_min = CARGO_CRATE_VALUE * 1.75
+ price_max = CARGO_CRATE_VALUE * 4
availability_prob = 30
/datum/market_item/tool/riot_shield
@@ -76,23 +76,13 @@
/datum/market_item/tool/thermite_bottle
name = "Thermite Bottle"
- desc = "30u of Thermite to assist in creating a quick access point or get away!"
+ desc = "50u of Thermite to assist in creating a quick access point or get away!"
item = /obj/item/reagent_containers/cup/bottle/thermite
- price_min = CARGO_CRATE_VALUE * 2.5
- price_max = CARGO_CRATE_VALUE * 7.5
- stock_max = 3
- availability_prob = 30
-
-/datum/market_item/tool/science_goggles
- name = "Science Goggles"
- desc = "These glasses scan the contents of containers and projects their contents to the user in an easy to read format."
- item = /obj/item/clothing/glasses/science
-
price_min = CARGO_CRATE_VALUE * 0.75
price_max = CARGO_CRATE_VALUE
stock_max = 3
- availability_prob = 50
+ availability_prob = 30
/**
* # Fake N-spect scanner black market entry
diff --git a/code/modules/cargo/markets/market_items/weapons.dm b/code/modules/cargo/markets/market_items/weapons.dm
index 3323e169162347..4f20cf865bc9b2 100644
--- a/code/modules/cargo/markets/market_items/weapons.dm
+++ b/code/modules/cargo/markets/market_items/weapons.dm
@@ -13,16 +13,15 @@
availability_prob = 40
/datum/market_item/weapon/shotgun_dart
- name = "Shotgun Dart"
+ name = "Box of XL Shotgun Darts"
desc = "These handy darts can be filled up with any chemical and be shot with a shotgun! \
Prank your friends by shooting them with laughter! \
Not recommended for comercial use."
- item = /obj/item/ammo_casing/shotgun/dart
+ item = /obj/item/storage/box/large_dart
- price_min = CARGO_CRATE_VALUE * 0.05
- price_max = CARGO_CRATE_VALUE * 0.25
- stock_min = 10
- stock_max = 60
+ price_min = CARGO_CRATE_VALUE * 1.375
+ price_max = CARGO_CRATE_VALUE * 2.875
+ stock_max = 4
availability_prob = 40
/datum/market_item/weapon/bone_spear
diff --git a/code/modules/cargo/markets/market_telepad.dm b/code/modules/cargo/markets/market_telepad.dm
index 4545b07e487f41..7c5b509a9421de 100644
--- a/code/modules/cargo/markets/market_telepad.dm
+++ b/code/modules/cargo/markets/market_telepad.dm
@@ -91,6 +91,7 @@
if(receiving)
receiving.item = receiving.entry.spawn_item(turf, receiving)
+ receiving.post_purchase_effects(receiving.item)
use_energy(energy_usage_per_teleport / power_efficiency)
var/datum/effect_system/spark_spread/sparks = new
diff --git a/code/modules/cargo/markets/market_uplink.dm b/code/modules/cargo/markets/market_uplink.dm
index df8c8eb36a5077..d13f59937b66ca 100644
--- a/code/modules/cargo/markets/market_uplink.dm
+++ b/code/modules/cargo/markets/market_uplink.dm
@@ -157,6 +157,9 @@
accessible_markets = list(/datum/market/blackmarket)
custom_premium_price = PAYCHECK_CREW * 2.5
+/obj/item/market_uplink/blackmarket/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_CONTRABAND, INNATE_TRAIT)
/datum/crafting_recipe/blackmarket_uplink
name = "Black Market Uplink"
diff --git a/code/modules/cargo/materials_market.dm b/code/modules/cargo/materials_market.dm
index 947197d16f298a..797ebf5411d6ff 100644
--- a/code/modules/cargo/materials_market.dm
+++ b/code/modules/cargo/materials_market.dm
@@ -232,7 +232,7 @@
var/material_str = params["material"]
var/quantity = text2num(params["quantity"])
- //find material from it's name
+ //find material from its name
var/datum/material/material_bought
var/obj/item/stack/sheet/sheet_to_buy
for(var/datum/material/mat as anything in SSstock_market.materials_prices)
@@ -346,7 +346,7 @@
var/datum/material/export_mat
/// Quantity of export material
var/quantity = 0
- /// Is this stock block currently updating it's value with the market (aka fluid)?
+ /// Is this stock block currently updating its value with the market (aka fluid)?
var/fluid = FALSE
/obj/item/stock_block/Initialize(mapload)
@@ -358,9 +358,9 @@
. = ..()
. += span_notice("\The [src] is worth [export_value] cr, from selling [quantity] sheets of [initial(export_mat?.name)].")
if(fluid)
- . += span_warning("\The [src] is currently liquid! It's value is based on the market price.")
+ . += span_warning("\The [src] is currently liquid! Its value is based on the market price.")
else
- . += span_notice("\The [src]'s value is still [span_boldnotice("locked in")]. [span_boldnotice("Sell it")] before it's value becomes liquid!")
+ . += span_notice("\The [src]'s value is still [span_boldnotice("locked in")]. [span_boldnotice("Sell it")] before its value becomes liquid!")
/obj/item/stock_block/proc/value_warning()
visible_message(span_warning("\The [src] is starting to become liquid!"))
diff --git a/code/modules/cargo/order.dm b/code/modules/cargo/order.dm
index 3f8ceb5ca02179..c675352d024b26 100644
--- a/code/modules/cargo/order.dm
+++ b/code/modules/cargo/order.dm
@@ -185,6 +185,9 @@
else
account_holder = "Cargo"
var/obj/structure/closet/crate/crate = pack.generate(A, paying_account)
+ if(pack.contraband)
+ for(var/atom/movable/item_within as anything in crate.get_all_contents())
+ ADD_TRAIT(item_within, TRAIT_CONTRABAND, INNATE_TRAIT)
if(department_destination)
crate.AddElement(/datum/element/deliver_first, department_destination, pack.cost)
generateManifest(crate, account_holder, pack, pack.cost)
diff --git a/code/modules/cargo/orderconsole.dm b/code/modules/cargo/orderconsole.dm
index a48e9db6bc6e6d..6e5643e383efb9 100644
--- a/code/modules/cargo/orderconsole.dm
+++ b/code/modules/cargo/orderconsole.dm
@@ -178,6 +178,7 @@
"desc" = P.desc || P.name, // If there is a description, use it. Otherwise use the pack's name.
"goody" = P.goody,
"access" = P.access,
+ "contraband" = P.contraband,
))
return data
diff --git a/code/modules/cargo/packs/_packs.dm b/code/modules/cargo/packs/_packs.dm
index 662938320cb76d..b6c533050f6757 100644
--- a/code/modules/cargo/packs/_packs.dm
+++ b/code/modules/cargo/packs/_packs.dm
@@ -77,6 +77,7 @@
continue
A.flags_1 |= ADMIN_SPAWNED_1
+
/// For generating supply packs at runtime. Returns a list of supply packs to use instead of this one.
/datum/supply_pack/proc/generate_supply_packs()
return
diff --git a/code/modules/cargo/packs/service.dm b/code/modules/cargo/packs/service.dm
index fddd093b4fb7e8..434450b430292a 100644
--- a/code/modules/cargo/packs/service.dm
+++ b/code/modules/cargo/packs/service.dm
@@ -195,7 +195,7 @@
/datum/supply_pack/service/greyidbox
name = "Grey ID Card Multipack Crate"
desc = "A convenient crate containing a box of seven cheap ID cards in a handy wallet-sized form factor. \
- Cards come in every colour you can imagne, as long as it's grey."
+ Cards come in every colour you can imagine, as long as it's grey."
cost = CARGO_CRATE_VALUE * 3
contains = list(/obj/item/storage/box/ids)
crate_name = "basic id card crate"
diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm
index 309d9435f00918..ff1208f634a574 100644
--- a/code/modules/cargo/supplypod.dm
+++ b/code/modules/cargo/supplypod.dm
@@ -38,7 +38,7 @@
var/effectCircle = FALSE //If true, allows the pod to come in at any angle. Bit of a weird feature but whatever its here
var/style = STYLE_STANDARD //Style is a variable that keeps track of what the pod is supposed to look like. It acts as an index to the GLOB.podstyles list in cargo.dm defines to get the proper icon/name/desc for the pod.
var/reversing = FALSE //If true, the pod will not send any items. Instead, after opening, it will close again (picking up items/mobs) and fly back to centcom
- var/list/reverse_dropoff_coords //Turf that the reverse pod will drop off it's newly-acquired cargo to
+ var/list/reverse_dropoff_coords //Turf that the reverse pod will drop off its newly-acquired cargo to
var/fallingSoundLength = 11
var/fallingSound = 'sound/weapons/mortar_long_whistle.ogg'//Admin sound to play before the pod lands
var/landingSound //Admin sound to play when the pod lands
@@ -656,7 +656,7 @@
transform = matrix() * 1.5
animate(src, transform = matrix()*0.01, time = pod.delays[POD_TRANSIT]+pod.delays[POD_FALLING])
-/obj/effect/pod_landingzone //This is the object that forceMoves the supplypod to it's location
+/obj/effect/pod_landingzone //This is the object that forceMoves the supplypod to its location
name = "Landing Zone Indicator"
desc = "A holographic projection designating the landing zone of something. It's probably best to stand back."
icon = 'icons/obj/supplypods_32x32.dmi'
diff --git a/code/modules/cargo/universal_scanner.dm b/code/modules/cargo/universal_scanner.dm
index fdcbc9ba2bb9bb..484f4a7a032010 100644
--- a/code/modules/cargo/universal_scanner.dm
+++ b/code/modules/cargo/universal_scanner.dm
@@ -165,7 +165,7 @@
context[SCREENTIP_CONTEXT_LMB] = "Scan for export value"
return CONTEXTUAL_SCREENTIP_SET
/**
- * Scans an object, target, and provides it's export value based on selling to the cargo shuttle, to mob/user.
+ * Scans an object, target, and provides its export value based on selling to the cargo shuttle, to mob/user.
*/
/obj/item/universal_scanner/proc/export_scan(obj/target, mob/user)
var/datum/export_report/report = export_item_and_contents(target, dry_run = TRUE)
@@ -240,7 +240,7 @@
to_chat(user, span_warning("Bank account not detected. Handling tip not registered."))
/**
- * Scans an object, target, and sets it's custom_price variable to new_custom_price, presenting it to the user.
+ * Scans an object, target, and sets its custom_price variable to new_custom_price, presenting it to the user.
*/
/obj/item/universal_scanner/proc/price_tag(obj/target, mob/user)
if(isitem(target))
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index b89cd042598723..d37ff1df22e076 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -490,7 +490,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
display_unread_notes(src, time_stamp)
qdel(query_last_connected)
- var/cached_player_age = set_client_age_from_db(tdata) //we have to cache this because other shit may change it and we need it's current value now down below.
+ var/cached_player_age = set_client_age_from_db(tdata) //we have to cache this because other shit may change it and we need its current value now down below.
if (isnum(cached_player_age) && cached_player_age == -1) //first connection
player_age = 0
var/nnpa = CONFIG_GET(number/notify_new_player_age)
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 6229cf55cc68e6..a8bef76b282757 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -33,7 +33,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/list/key_bindings_by_key = list()
var/toggles = TOGGLES_DEFAULT
- var/db_flags
+ var/db_flags = NONE
var/chat_toggles = TOGGLES_DEFAULT_CHAT
var/ghost_form = "ghost"
diff --git a/code/modules/client/preferences/_preference.dm b/code/modules/client/preferences/_preference.dm
index 05dfe53961274d..f70a92e583cff7 100644
--- a/code/modules/client/preferences/_preference.dm
+++ b/code/modules/client/preferences/_preference.dm
@@ -18,16 +18,19 @@
/// support the "use gender" option.
#define PREFERENCE_PRIORITY_BODY_TYPE 5
+/// Used for preferences that rely on body setup being finalized.
+#define PREFERENCE_PRORITY_LATE_BODY_TYPE 6
+
/// Equpping items based on preferences.
/// Should happen after species and body type to make sure it looks right.
/// Mostly redundant, but a safety net for saving/loading.
-#define PREFERENCE_PRIORITY_LOADOUT 6
+#define PREFERENCE_PRIORITY_LOADOUT 7
/// The priority at which names are decided, needed for proper randomization.
-#define PREFERENCE_PRIORITY_NAMES 7
+#define PREFERENCE_PRIORITY_NAMES 8
/// Preferences that aren't names, but change the name changes set by PREFERENCE_PRIORITY_NAMES.
-#define PREFERENCE_PRIORITY_NAME_MODIFICATIONS 8
+#define PREFERENCE_PRIORITY_NAME_MODIFICATIONS 9
/// The maximum preference priority, keep this updated, but don't use it for `priority`.
#define MAX_PREFERENCE_PRIORITY PREFERENCE_PRIORITY_NAME_MODIFICATIONS
diff --git a/code/modules/client/preferences/age.dm b/code/modules/client/preferences/age.dm
index cad9786ce1fefa..07b4644bc6a9e6 100644
--- a/code/modules/client/preferences/age.dm
+++ b/code/modules/client/preferences/age.dm
@@ -8,3 +8,6 @@
/datum/preference/numeric/age/apply_to_human(mob/living/carbon/human/target, value)
target.age = value
+
+/datum/preference/numeric/age/create_informed_default_value(datum/preferences/preferences)
+ return rand(max(minimum, 21), min(maximum, 50))
diff --git a/code/modules/client/preferences/blindfold_color.dm b/code/modules/client/preferences/blindfold_color.dm
index 9e6504579acb66..8081ac15be8aea 100644
--- a/code/modules/client/preferences/blindfold_color.dm
+++ b/code/modules/client/preferences/blindfold_color.dm
@@ -4,6 +4,9 @@
savefile_key = "blindfold_color"
savefile_identifier = PREFERENCE_CHARACTER
+/datum/preference/color/blindfold_color/create_default_value()
+ return COLOR_WHITE
+
/datum/preference/color/blindfold_color/is_accessible(datum/preferences/preferences)
if (!..(preferences))
return FALSE
diff --git a/code/modules/client/preferences/body_type.dm b/code/modules/client/preferences/body_type.dm
index 4e695f7ab9b320..caad2b0437b72d 100644
--- a/code/modules/client/preferences/body_type.dm
+++ b/code/modules/client/preferences/body_type.dm
@@ -5,6 +5,7 @@
priority = PREFERENCE_PRIORITY_BODY_TYPE
savefile_key = "body_type"
savefile_identifier = PREFERENCE_CHARACTER
+ can_randomize = FALSE
/datum/preference/choiced/body_type/init_possible_values()
return list(USE_GENDER, MALE, FEMALE)
diff --git a/code/modules/client/preferences/clothing.dm b/code/modules/client/preferences/clothing.dm
index 36161c15d1ee8d..b54149db2998b6 100644
--- a/code/modules/client/preferences/clothing.dm
+++ b/code/modules/client/preferences/clothing.dm
@@ -33,6 +33,9 @@
DMESSENGER,
)
+/datum/preference/choiced/backpack/create_default_value()
+ return DBACKPACK
+
/datum/preference/choiced/backpack/icon_for(value)
switch (value)
if (GBACKPACK)
@@ -66,6 +69,7 @@
/datum/preference/choiced/jumpsuit
savefile_key = "jumpsuit_style"
savefile_identifier = PREFERENCE_CHARACTER
+ priority = PREFERENCE_PRIORITY_BODY_TYPE
main_feature_name = "Jumpsuit"
category = PREFERENCE_CATEGORY_CLOTHING
should_generate_icons = TRUE
@@ -76,6 +80,9 @@
PREF_SKIRT,
)
+/datum/preference/choiced/jumpsuit/create_default_value()
+ return PREF_SUIT
+
/datum/preference/choiced/jumpsuit/icon_for(value)
switch (value)
if (PREF_SUIT)
@@ -86,6 +93,15 @@
/datum/preference/choiced/jumpsuit/apply_to_human(mob/living/carbon/human/target, value)
target.jumpsuit_style = value
+/datum/preference/choiced/jumpsuit/create_informed_default_value(datum/preferences/preferences)
+ switch(preferences.read_preference(/datum/preference/choiced/gender))
+ if(MALE)
+ return PREF_SUIT
+ if(FEMALE)
+ return PREF_SKIRT
+
+ return ..()
+
/// Socks preference
/datum/preference/choiced/socks
savefile_key = "socks"
@@ -93,10 +109,14 @@
main_feature_name = "Socks"
category = PREFERENCE_CATEGORY_CLOTHING
should_generate_icons = TRUE
+ can_randomize = FALSE
/datum/preference/choiced/socks/init_possible_values()
return assoc_to_keys_features(SSaccessories.socks_list)
+/datum/preference/choiced/socks/create_default_value()
+ return /datum/sprite_accessory/socks/nude::name
+
/datum/preference/choiced/socks/icon_for(value)
var/static/icon/lower_half
@@ -114,13 +134,29 @@
/datum/preference/choiced/undershirt
savefile_key = "undershirt"
savefile_identifier = PREFERENCE_CHARACTER
+ priority = PREFERENCE_PRIORITY_BODY_TYPE
main_feature_name = "Undershirt"
category = PREFERENCE_CATEGORY_CLOTHING
should_generate_icons = TRUE
+ can_randomize = FALSE
/datum/preference/choiced/undershirt/init_possible_values()
return assoc_to_keys_features(SSaccessories.undershirt_list)
+/datum/preference/choiced/undershirt/create_default_value()
+ return /datum/sprite_accessory/undershirt/nude::name
+
+/* // SKYRAT EDIT REMOVAL - sports bra doesn't exist as an undershirt. so just let this default to naked and we'll add underwear elsewhere
+/datum/preference/choiced/undershirt/create_informed_default_value(datum/preferences/preferences)
+ switch(preferences.read_preference(/datum/preference/choiced/gender))
+ if(MALE)
+ return /datum/sprite_accessory/undershirt/nude::name
+ if(FEMALE)
+ return /datum/sprite_accessory/undershirt/sports_bra::name
+
+ return ..()
+*/ // NOVA EDIT REMOVAL END
+
/datum/preference/choiced/undershirt/icon_for(value)
var/static/icon/body
if (isnull(body))
@@ -152,10 +188,14 @@
main_feature_name = "Underwear"
category = PREFERENCE_CATEGORY_CLOTHING
should_generate_icons = TRUE
+ can_randomize = FALSE
/datum/preference/choiced/underwear/init_possible_values()
return assoc_to_keys_features(SSaccessories.underwear_list)
+/datum/preference/choiced/underwear/create_default_value()
+ return /datum/sprite_accessory/underwear/male_hearts::name
+
/datum/preference/choiced/underwear/icon_for(value)
var/static/icon/lower_half
diff --git a/code/modules/client/preferences/gender.dm b/code/modules/client/preferences/gender.dm
index 38c9342449b463..4861fae7e1aa98 100644
--- a/code/modules/client/preferences/gender.dm
+++ b/code/modules/client/preferences/gender.dm
@@ -13,3 +13,8 @@
value = PLURAL //disregard gender preferences on this species
*/ // SKYRAT EDIT REMOVAL END
target.gender = value
+
+/datum/preference/choiced/gender/create_informed_default_value(datum/preferences/preferences)
+ // The only reason I'm limiting this to male or female
+ // is that hairstyle randomization handles enbies poorly
+ return pick(MALE, FEMALE)
diff --git a/code/modules/client/preferences/glasses.dm b/code/modules/client/preferences/glasses.dm
index a08f15955eaa44..e5158f1acbbdeb 100644
--- a/code/modules/client/preferences/glasses.dm
+++ b/code/modules/client/preferences/glasses.dm
@@ -4,6 +4,9 @@
savefile_identifier = PREFERENCE_CHARACTER
should_generate_icons = TRUE
+/datum/preference/choiced/glasses/create_default_value()
+ return "Random"
+
/datum/preference/choiced/glasses/init_possible_values()
return assoc_to_keys(GLOB.nearsighted_glasses) + "Random"
diff --git a/code/modules/client/preferences/language.dm b/code/modules/client/preferences/language.dm
index 8d4c791763031d..dbe4c700a318e4 100644
--- a/code/modules/client/preferences/language.dm
+++ b/code/modules/client/preferences/language.dm
@@ -3,6 +3,9 @@
savefile_key = "language"
savefile_identifier = PREFERENCE_CHARACTER
+/datum/preference/choiced/language/create_default_value()
+ return "Random"
+
/datum/preference/choiced/language/is_accessible(datum/preferences/preferences)
if (!..(preferences))
return FALSE
diff --git a/code/modules/client/preferences/multiz_parallax.dm b/code/modules/client/preferences/multiz_parallax.dm
index d4f77e206b2a55..dab945e4bb3930 100644
--- a/code/modules/client/preferences/multiz_parallax.dm
+++ b/code/modules/client/preferences/multiz_parallax.dm
@@ -13,4 +13,4 @@
for(var/group_key as anything in my_hud.master_groups)
var/datum/plane_master_group/group = my_hud.master_groups[group_key]
- group.transform_lower_turfs(my_hud, my_hud.current_plane_offset)
+ group.build_planes_offset(my_hud, my_hud.current_plane_offset)
diff --git a/code/modules/client/preferences/multiz_performance.dm b/code/modules/client/preferences/multiz_performance.dm
index 7591401f2d8d1e..f4575357e3482d 100644
--- a/code/modules/client/preferences/multiz_performance.dm
+++ b/code/modules/client/preferences/multiz_performance.dm
@@ -18,4 +18,4 @@
for(var/group_key as anything in my_hud.master_groups)
var/datum/plane_master_group/group = my_hud.master_groups[group_key]
- group.transform_lower_turfs(my_hud, my_hud.current_plane_offset)
+ group.build_planes_offset(my_hud, my_hud.current_plane_offset)
diff --git a/code/modules/client/preferences/prosthetic_limb.dm b/code/modules/client/preferences/prosthetic_limb.dm
index 3d9525734e572f..be807ac4e1f760 100644
--- a/code/modules/client/preferences/prosthetic_limb.dm
+++ b/code/modules/client/preferences/prosthetic_limb.dm
@@ -3,6 +3,9 @@
savefile_key = "prosthetic"
savefile_identifier = PREFERENCE_CHARACTER
+/datum/preference/choiced/prosthetic/create_default_value()
+ return "Random"
+
/datum/preference/choiced/prosthetic/init_possible_values()
return list("Random") + GLOB.prosthetic_limb_choice
diff --git a/code/modules/client/preferences/prosthetic_organ.dm b/code/modules/client/preferences/prosthetic_organ.dm
index 35d3b818355ebe..02e8418e3db2f6 100644
--- a/code/modules/client/preferences/prosthetic_organ.dm
+++ b/code/modules/client/preferences/prosthetic_organ.dm
@@ -3,6 +3,9 @@
savefile_key = "prosthetic_organ"
savefile_identifier = PREFERENCE_CHARACTER
+/datum/preference/choiced/prosthetic_organ/create_default_value()
+ return "Random"
+
/datum/preference/choiced/prosthetic_organ/init_possible_values()
return list("Random") + GLOB.organ_choice
diff --git a/code/modules/client/preferences/species_features/basic.dm b/code/modules/client/preferences/species_features/basic.dm
index 3f101ad9e44a55..21459697f864f9 100644
--- a/code/modules/client/preferences/species_features/basic.dm
+++ b/code/modules/client/preferences/species_features/basic.dm
@@ -52,7 +52,7 @@
return random_eye_color()
/datum/preference/choiced/facial_hairstyle
- priority = PREFERENCE_PRIORITY_BODYPARTS
+ priority = PREFERENCE_PRORITY_LATE_BODY_TYPE
savefile_key = "facial_style_name"
savefile_identifier = PREFERENCE_CHARACTER
category = PREFERENCE_CATEGORY_FEATURES
@@ -69,15 +69,32 @@
/datum/preference/choiced/facial_hairstyle/apply_to_human(mob/living/carbon/human/target, value)
target.set_facial_hairstyle(value, update = FALSE)
+/datum/preference/choiced/facial_hairstyle/create_default_value()
+ return /datum/sprite_accessory/facial_hair/shaved::name
+
+/datum/preference/choiced/facial_hairstyle/create_informed_default_value(datum/preferences/preferences)
+ var/gender = preferences.read_preference(/datum/preference/choiced/gender)
+ var/species_type = preferences.read_preference(/datum/preference/choiced/species)
+ var/datum/species/species_real = GLOB.species_prototypes[species_type]
+ if(!gender || !species_real || !species_real.sexes)
+ return ..()
+
+ var/picked_beard = random_facial_hairstyle(gender)
+ var/datum/sprite_accessory/beard_style = SSaccessories.facial_hairstyles_list[picked_beard]
+ if(!beard_style || !beard_style.natural_spawn || beard_style.locked) // Invalid, go with god(bald)
+ return ..()
+
+ return picked_beard
+
/datum/preference/choiced/facial_hairstyle/compile_constant_data()
var/list/data = ..()
- data[SUPPLEMENTAL_FEATURE_KEY] = "facial_hair_color"
+ data[SUPPLEMENTAL_FEATURE_KEY] = /datum/preference/color/facial_hair_color::savefile_key
return data
/datum/preference/color/facial_hair_color
- priority = PREFERENCE_PRIORITY_BODYPARTS
+ priority = PREFERENCE_PRORITY_LATE_BODY_TYPE // Need to happen after hair oclor is set so we can match by default
savefile_key = "facial_hair_color"
savefile_identifier = PREFERENCE_CHARACTER
category = PREFERENCE_CATEGORY_SUPPLEMENTAL_FEATURES
@@ -86,12 +103,16 @@
/datum/preference/color/facial_hair_color/apply_to_human(mob/living/carbon/human/target, value)
target.set_facial_haircolor(value, update = FALSE)
+/datum/preference/color/facial_hair_color/create_informed_default_value(datum/preferences/preferences)
+ return preferences.read_preference(/datum/preference/color/hair_color) || random_hair_color()
+
/datum/preference/choiced/facial_hair_gradient
- priority = PREFERENCE_PRIORITY_BODYPARTS
+ priority = PREFERENCE_PRORITY_LATE_BODY_TYPE
category = PREFERENCE_CATEGORY_SECONDARY_FEATURES
savefile_identifier = PREFERENCE_CHARACTER
savefile_key = "facial_hair_gradient"
relevant_head_flag = HEAD_FACIAL_HAIR
+ can_randomize = FALSE
/datum/preference/choiced/facial_hair_gradient/init_possible_values()
return assoc_to_keys_features(SSaccessories.facial_hair_gradients_list)
@@ -100,10 +121,10 @@
target.set_facial_hair_gradient_style(new_style = value, update = FALSE)
/datum/preference/choiced/facial_hair_gradient/create_default_value()
- return "None"
+ return /datum/sprite_accessory/gradient/none::name
/datum/preference/color/facial_hair_gradient
- priority = PREFERENCE_PRIORITY_BODYPARTS
+ priority = PREFERENCE_PRORITY_LATE_BODY_TYPE
category = PREFERENCE_CATEGORY_SECONDARY_FEATURES
savefile_identifier = PREFERENCE_CHARACTER
savefile_key = "facial_hair_gradient_color"
@@ -115,10 +136,10 @@
/datum/preference/color/facial_hair_gradient/is_accessible(datum/preferences/preferences)
if (!..(preferences))
return FALSE
- return preferences.read_preference(/datum/preference/choiced/facial_hair_gradient) != "None"
+ return preferences.read_preference(/datum/preference/choiced/facial_hair_gradient) != /datum/sprite_accessory/gradient/none::name
/datum/preference/color/hair_color
- priority = PREFERENCE_PRIORITY_BODYPARTS
+ priority = PREFERENCE_PRIORITY_BODY_TYPE
savefile_key = "hair_color"
savefile_identifier = PREFERENCE_CHARACTER
category = PREFERENCE_CATEGORY_SUPPLEMENTAL_FEATURES
@@ -127,8 +148,11 @@
/datum/preference/color/hair_color/apply_to_human(mob/living/carbon/human/target, value)
target.set_haircolor(value, update = FALSE)
+/datum/preference/color/hair_color/create_informed_default_value(datum/preferences/preferences)
+ return random_hair_color()
+
/datum/preference/choiced/hairstyle
- priority = PREFERENCE_PRIORITY_BODYPARTS
+ priority = PREFERENCE_PRIORITY_BODY_TYPE // Happens after gender so we can picka hairstyle based on that
savefile_key = "hairstyle_name"
savefile_identifier = PREFERENCE_CHARACTER
category = PREFERENCE_CATEGORY_FEATURES
@@ -146,19 +170,37 @@
/datum/preference/choiced/hairstyle/apply_to_human(mob/living/carbon/human/target, value)
target.set_hairstyle(value, update = FALSE)
+/datum/preference/choiced/hairstyle/create_default_value()
+ return /datum/sprite_accessory/hair/bald::name
+
+/datum/preference/choiced/hairstyle/create_informed_default_value(datum/preferences/preferences)
+ var/gender = preferences.read_preference(/datum/preference/choiced/gender)
+ var/species_type = preferences.read_preference(/datum/preference/choiced/species)
+ var/datum/species/species_real = GLOB.species_prototypes[species_type]
+ if(!gender || !species_real || !species_real.sexes)
+ return ..()
+
+ var/picked_hair = random_hairstyle(gender)
+ var/datum/sprite_accessory/hair_style = SSaccessories.hairstyles_list[picked_hair]
+ if(!hair_style || !hair_style.natural_spawn || hair_style.locked) // Invalid, go with god(bald)
+ return ..()
+
+ return picked_hair
+
/datum/preference/choiced/hairstyle/compile_constant_data()
var/list/data = ..()
- data[SUPPLEMENTAL_FEATURE_KEY] = "hair_color"
+ data[SUPPLEMENTAL_FEATURE_KEY] = /datum/preference/color/hair_color::savefile_key
return data
/datum/preference/choiced/hair_gradient
- priority = PREFERENCE_PRIORITY_BODYPARTS
+ priority = PREFERENCE_PRIORITY_BODY_TYPE
category = PREFERENCE_CATEGORY_SECONDARY_FEATURES
savefile_identifier = PREFERENCE_CHARACTER
savefile_key = "hair_gradient"
relevant_head_flag = HEAD_HAIR
+ can_randomize = FALSE
/datum/preference/choiced/hair_gradient/init_possible_values()
return assoc_to_keys_features(SSaccessories.hair_gradients_list)
@@ -167,10 +209,10 @@
target.set_hair_gradient_style(new_style = value, update = FALSE)
/datum/preference/choiced/hair_gradient/create_default_value()
- return "None"
+ return /datum/sprite_accessory/gradient/none::name
/datum/preference/color/hair_gradient
- priority = PREFERENCE_PRIORITY_BODYPARTS
+ priority = PREFERENCE_PRIORITY_BODY_TYPE
category = PREFERENCE_CATEGORY_SECONDARY_FEATURES
savefile_identifier = PREFERENCE_CHARACTER
savefile_key = "hair_gradient_color"
@@ -182,4 +224,4 @@
/datum/preference/color/hair_gradient/is_accessible(datum/preferences/preferences)
if (!..(preferences))
return FALSE
- return preferences.read_preference(/datum/preference/choiced/hair_gradient) != "None"
+ return preferences.read_preference(/datum/preference/choiced/hair_gradient) != /datum/sprite_accessory/gradient/none::name
diff --git a/code/modules/client/preferences/species_features/felinid.dm b/code/modules/client/preferences/species_features/felinid.dm
index 6d4a06ff3852ac..8bf49fac227892 100644
--- a/code/modules/client/preferences/species_features/felinid.dm
+++ b/code/modules/client/preferences/species_features/felinid.dm
@@ -32,4 +32,5 @@
/datum/preference/choiced/ears/create_default_value()
var/datum/sprite_accessory/ears/cat/ears = /datum/sprite_accessory/ears/cat
return initial(ears.name)
+ return /datum/sprite_accessory/ears/cat::name
*/
diff --git a/code/modules/client/preferences/species_features/lizard.dm b/code/modules/client/preferences/species_features/lizard.dm
index ace8779ed15cf6..97154c106d54e8 100644
--- a/code/modules/client/preferences/species_features/lizard.dm
+++ b/code/modules/client/preferences/species_features/lizard.dm
@@ -145,4 +145,5 @@
/datum/preference/choiced/lizard_tail/create_default_value()
var/datum/sprite_accessory/tails/lizard/smooth/tail = /datum/sprite_accessory/tails/lizard/smooth
return initial(tail.name)
+ return /datum/sprite_accessory/tails/lizard/smooth::name
*/
diff --git a/code/modules/client/preferences/species_features/monkey.dm b/code/modules/client/preferences/species_features/monkey.dm
index 8e469f3ab038fa..07448ea7fc2970 100644
--- a/code/modules/client/preferences/species_features/monkey.dm
+++ b/code/modules/client/preferences/species_features/monkey.dm
@@ -4,6 +4,7 @@
savefile_identifier = PREFERENCE_CHARACTER
category = PREFERENCE_CATEGORY_SECONDARY_FEATURES
relevant_external_organ = /obj/item/organ/external/tail/monkey
+ can_randomize = FALSE
/datum/preference/choiced/monkey_tail/init_possible_values()
return assoc_to_keys_features(SSaccessories.tails_list_monkey)
@@ -14,4 +15,5 @@
/datum/preference/choiced/monkey_tail/create_default_value()
var/datum/sprite_accessory/tails/monkey/default/tail = /datum/sprite_accessory/tails/monkey/default
return initial(tail.name)
-*/ // SKYRAT EDIT REMOVAL END
+ return /datum/sprite_accessory/tails/monkey/default::name
+*/
diff --git a/code/modules/client/preferences/trans_prosthetic.dm b/code/modules/client/preferences/trans_prosthetic.dm
index fd28cb1ecf8c89..ea8128a1f44e44 100644
--- a/code/modules/client/preferences/trans_prosthetic.dm
+++ b/code/modules/client/preferences/trans_prosthetic.dm
@@ -3,6 +3,9 @@
savefile_key = "trans_prosthetic"
savefile_identifier = PREFERENCE_CHARACTER
+/datum/preference/choiced/trans_prosthetic/create_default_value()
+ return "Random"
+
/datum/preference/choiced/trans_prosthetic/init_possible_values()
return list("Random") + GLOB.part_choice_transhuman
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index fff783341b8691..7034cd3484c23c 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -292,13 +292,13 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
return FALSE
// Read everything into cache
- for (var/preference_type in GLOB.preference_entries)
- var/datum/preference/preference = GLOB.preference_entries[preference_type]
+ // Uses priority order as some values may rely on others for creating default values
+ for (var/datum/preference/preference as anything in get_preferences_in_priority_order())
if (preference.savefile_identifier != PREFERENCE_CHARACTER)
continue
- value_cache -= preference_type
- read_preference(preference_type)
+ value_cache -= preference.type
+ read_preference(preference.type)
//Character
randomise = save_data?["randomise"]
diff --git a/code/modules/clothing/chameleon/generic_chameleon_clothing.dm b/code/modules/clothing/chameleon/generic_chameleon_clothing.dm
index 63bede9ec88c81..47b6f4db185a57 100644
--- a/code/modules/clothing/chameleon/generic_chameleon_clothing.dm
+++ b/code/modules/clothing/chameleon/generic_chameleon_clothing.dm
@@ -252,6 +252,10 @@ do { \
name = "backpack"
actions_types = list(/datum/action/item_action/chameleon/change/backpack)
+/obj/item/storage/backpack/chameleon/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_CONTRABAND_BLOCKER, INNATE_TRAIT)
+
/obj/item/storage/backpack/chameleon/broken
/obj/item/storage/backpack/chameleon/broken/Initialize(mapload)
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index cbd6ec3b360f90..f6d477afbb9239 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -353,7 +353,7 @@
how_cool_are_your_threads += ""
. += how_cool_are_your_threads.Join()
- if(get_armor().has_any_armor() || (flags_cover & (HEADCOVERSMOUTH|PEPPERPROOF)))
+ if(get_armor().has_any_armor() || (flags_cover & (HEADCOVERSMOUTH|PEPPERPROOF)) || (clothing_flags & STOPSPRESSUREDAMAGE) || (visor_flags & STOPSPRESSUREDAMAGE))
. += span_notice("OOC: Click here to see its protection classes.") // SKYRAT EDIT ORIGINAL: ("It has a tag listing its protection classes.")
/obj/item/clothing/Topic(href, href_list)
@@ -393,6 +393,20 @@
readout += "COVERAGE"
readout += "It will block [english_list(things_blocked)]."
+ if(clothing_flags & STOPSPRESSUREDAMAGE || visor_flags & STOPSPRESSUREDAMAGE)
+ var/list/parts_covered = list()
+ var/output_string = "It"
+ if(!(clothing_flags & STOPSPRESSUREDAMAGE))
+ output_string = "When sealed, it"
+ if(body_parts_covered & HEAD)
+ parts_covered += "head"
+ if(body_parts_covered & CHEST)
+ parts_covered += "torso"
+ if(length(parts_covered)) // Just in case someone makes spaceproof gloves or something
+ readout += "[output_string] will protect the wearer's [english_list(parts_covered)] from [span_tooltip("The extremely low pressure is the biggest danger posed by the vacuum of space.", "low pressure")]."
+
+ if(min_cold_protection_temperature == SPACE_SUIT_MIN_TEMP_PROTECT)
+ readout += "It will insulate the wearer from [span_tooltip("While not as dangerous as the lack of pressure, the extremely low temperature of space is also a hazard.", "the cold of space")]."
if(!length(readout))
readout += "No armor or durability information available."
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index 4f5668f7bcce79..f82f56a48fbe5b 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -2,7 +2,8 @@
name = "HUD"
desc = "A heads-up display that provides important info in (almost) real time."
flags_1 = null //doesn't protect eyes because it's a monocle, duh
- var/hud_type = null
+ ///A list of atom hud types added to the mob when the glasses are worn on the appropriate slot.
+ var/list/hud_types
// NOTE: Just because you have a HUD display doesn't mean you should be able to interact with stuff on examine, that's where the associated trait (TRAIT_MEDICAL_HUD, TRAIT_SECURITY_HUD, etc) is necessary.
@@ -10,7 +11,7 @@
..()
if(!(slot & ITEM_SLOT_EYES))
return
- if(hud_type)
+ for(var/hud_type in hud_types)
var/datum/atom_hud/our_hud = GLOB.huds[hud_type]
our_hud.show_to(user)
@@ -18,7 +19,7 @@
..()
if(!istype(user) || user.glasses != src)
return
- if(hud_type)
+ for(var/hud_type in hud_types)
var/datum/atom_hud/our_hud = GLOB.huds[hud_type]
our_hud.hide_from(user)
@@ -55,10 +56,17 @@
name = "health scanner HUD"
desc = "A heads-up display that scans the humanoids in view and provides accurate data about their health status."
icon_state = "healthhud"
- hud_type = DATA_HUD_MEDICAL_ADVANCED
+ hud_types = list(DATA_HUD_MEDICAL_ADVANCED)
clothing_traits = list(TRAIT_MEDICAL_HUD)
glass_colour_type = /datum/client_colour/glass_colour/lightblue
+/obj/item/clothing/glasses/hud/medsechud
+ name = "health scanner security HUD"
+ desc = "A heads-up display that scans the humanoids in view and provides accurate data about their health status, ID status and security records."
+ icon_state = "medsechud"
+ hud_types = list(DATA_HUD_MEDICAL_ADVANCED, DATA_HUD_SECURITY_ADVANCED)
+ clothing_traits = list(TRAIT_MEDICAL_HUD, TRAIT_SECURITY_HUD)
+
/obj/item/clothing/glasses/hud/health/night
name = "night vision health scanner HUD"
desc = "An advanced medical heads-up display that allows doctors to find patients in complete darkness."
@@ -110,7 +118,7 @@
name = "diagnostic HUD"
desc = "A heads-up display capable of analyzing the integrity and status of robotics and exosuits."
icon_state = "diagnostichud"
- hud_type = DATA_HUD_DIAGNOSTIC_BASIC
+ hud_types = list(DATA_HUD_DIAGNOSTIC_BASIC)
clothing_traits = list(TRAIT_DIAGNOSTIC_HUD)
glass_colour_type = /datum/client_colour/glass_colour/lightorange
@@ -153,7 +161,7 @@
name = "security HUD"
desc = "A heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records."
icon_state = "securityhud"
- hud_type = DATA_HUD_SECURITY_ADVANCED
+ hud_types = list(DATA_HUD_SECURITY_ADVANCED)
clothing_traits = list(TRAIT_SECURITY_HUD)
glass_colour_type = /datum/client_colour/glass_colour/red
@@ -243,18 +251,18 @@
if (wearer.glasses != src)
return
- if (hud_type)
+ for(var/hud_type in hud_types)
var/datum/atom_hud/our_hud = GLOB.huds[hud_type]
our_hud.hide_from(user)
- if (hud_type == DATA_HUD_MEDICAL_ADVANCED)
- hud_type = null
- else if (hud_type == DATA_HUD_SECURITY_ADVANCED)
- hud_type = DATA_HUD_MEDICAL_ADVANCED
+ if (DATA_HUD_MEDICAL_ADVANCED in hud_types)
+ hud_types = null
+ else if (DATA_HUD_SECURITY_ADVANCED in hud_types)
+ hud_types = list(DATA_HUD_MEDICAL_ADVANCED)
else
- hud_type = DATA_HUD_SECURITY_ADVANCED
+ hud_types = list(DATA_HUD_SECURITY_ADVANCED)
- if (hud_type)
+ for(var/hud_type in hud_types)
var/datum/atom_hud/our_hud = GLOB.huds[hud_type]
our_hud.show_to(user)
@@ -265,13 +273,14 @@
name = "thermal HUD scanner"
desc = "Thermal imaging HUD in the shape of glasses."
icon_state = "thermal"
- hud_type = DATA_HUD_SECURITY_ADVANCED
+ hud_types = list(DATA_HUD_SECURITY_ADVANCED)
vision_flags = SEE_MOBS
color_cutoffs = list(25, 8, 5)
glass_colour_type = /datum/client_colour/glass_colour/red
/obj/item/clothing/glasses/hud/toggle/thermal/attack_self(mob/user)
..()
+ var/hud_type = hud_types[1]
switch (hud_type)
if (DATA_HUD_MEDICAL_ADVANCED)
icon_state = "meson"
diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index 96b7b39f5ab21c..83d670458e1b36 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -37,6 +37,15 @@
slapcraft_recipes = slapcraft_recipe_list,\
)
+/obj/item/clothing/gloves/color/black/security
+ name = "security gloves"
+ desc = "These security gloves come with microchips that help the user quickly restrain suspects."
+ icon_state = "sec"
+ clothing_traits = list(TRAIT_FAST_CUFFING)
+
+/obj/item/clothing/gloves/color/black/security/blu
+ icon_state = "sec_blu"
+
/obj/item/clothing/gloves/fingerless
name = "fingerless gloves"
desc = "Plain black gloves without fingertips for the hard-working."
diff --git a/code/modules/clothing/gloves/tacklers.dm b/code/modules/clothing/gloves/tacklers.dm
index 4adb374d92bd75..bbe7f5dba18b4a 100644
--- a/code/modules/clothing/gloves/tacklers.dm
+++ b/code/modules/clothing/gloves/tacklers.dm
@@ -59,9 +59,8 @@
/obj/item/clothing/gloves/tackler/combat
name = "gorilla gloves"
desc = "Premium quality combative gloves, heavily reinforced to give the user an edge in close combat tackles, though they are more taxing to use than normal gripper gloves. Fireproof to boot!"
- icon_state = "black"
- inhand_icon_state = "greyscale_gloves"
- greyscale_colors = "#2f2e31"
+ icon_state = "gorilla"
+ inhand_icon_state = null
tackle_stam_cost = 30
base_knockdown = 1.25 SECONDS
@@ -77,6 +76,7 @@
/obj/item/clothing/gloves/tackler/combat/insulated
name = "guerrilla gloves"
desc = "Superior quality combative gloves, good for performing tackle takedowns as well as absorbing electrical shocks."
+ icon_state = "guerrilla"
siemens_coefficient = 0
armor_type = /datum/armor/combat_insulated
@@ -101,7 +101,7 @@
desc = "Ratty looking fingerless gloves wrapped with sticky tape. Beware anyone wearing these, for they clearly have no shame and nothing to lose."
icon_state = "fingerless"
inhand_icon_state = null
-
+ clothing_traits = list(TRAIT_FINGERPRINT_PASSTHROUGH)
tackle_stam_cost = 30
base_knockdown = 1.75 SECONDS
min_distance = 2
diff --git a/code/modules/clothing/head/costume.dm b/code/modules/clothing/head/costume.dm
index ec5ee81741fcca..13a6e549b0e915 100644
--- a/code/modules/clothing/head/costume.dm
+++ b/code/modules/clothing/head/costume.dm
@@ -156,10 +156,8 @@
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' //Grandfathered in from the wallframe for status displays.
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
clothing_flags = SNUG_FIT
- flash_protect = FLASH_PROTECTION_SENSITIVE
- flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF
+ flags_cover = HEADCOVERSEYES|HEADCOVERSMOUTH
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
- var/has_fov = TRUE
/datum/armor/costume_bronze
melee = 5
@@ -169,15 +167,6 @@
fire = 20
acid = 20
-/obj/item/clothing/head/costume/tv_head/Initialize(mapload)
- . = ..()
- if(has_fov)
- AddComponent(/datum/component/clothing_fov_visor, FOV_90_DEGREES)
-
-/obj/item/clothing/head/costume/tv_head/fov_less
- desc = "A mysterious headgear made from the hollowed out remains of a status display. How very retro-retro-futuristic of you. It's very easy to see out of this one."
- has_fov = FALSE
-
/obj/item/clothing/head/costume/irs
name = "internal revenue service cap"
desc = "Even in space, you can't avoid the tax collectors."
@@ -210,3 +199,9 @@
It's only a replica, and probably wouldn't protect you from anything."
icon_state = "allies_helmet"
inhand_icon_state = null
+
+/obj/item/clothing/head/costume/hairpin
+ name = "fancy hairpin"
+ desc = "A delicate hairpin normally paired with traditional clothing"
+ icon_state = "hairpin_fancy"
+ inhand_icon_state = "hairpin_fancy"
diff --git a/code/modules/clothing/head/frenchberet.dm b/code/modules/clothing/head/frenchberet.dm
index 40d8abc5b62ce6..de63c6fddfdd12 100644
--- a/code/modules/clothing/head/frenchberet.dm
+++ b/code/modules/clothing/head/frenchberet.dm
@@ -6,37 +6,17 @@
greyscale_config_worn = /datum/greyscale_config/beret/worn
greyscale_colors = "#972A2A"
+/obj/item/clothing/head/frenchberet/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/speechmod, replacements = strings("french_replacement.json", "french"), end_string = list(" Honh honh honh!"," Honh!"," Zut Alors!"), end_string_chance = 3, slots = ITEM_SLOT_HEAD)
/obj/item/clothing/head/frenchberet/equipped(mob/M, slot)
. = ..()
if (slot & ITEM_SLOT_HEAD)
- RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(handle_speech))
ADD_TRAIT(M, TRAIT_GARLIC_BREATH, type)
else
- UnregisterSignal(M, COMSIG_MOB_SAY)
REMOVE_TRAIT(M, TRAIT_GARLIC_BREATH, type)
/obj/item/clothing/head/frenchberet/dropped(mob/M)
. = ..()
- UnregisterSignal(M, COMSIG_MOB_SAY)
REMOVE_TRAIT(M, TRAIT_GARLIC_BREATH, type)
-
-/obj/item/clothing/head/frenchberet/proc/handle_speech(datum/source, list/speech_args)
- SIGNAL_HANDLER
- var/message = speech_args[SPEECH_MESSAGE]
- if(message[1] != "*")
- message = " [message]"
- var/list/french_words = strings("french_replacement.json", "french")
-
- for(var/key in french_words)
- var/value = french_words[key]
- if(islist(value))
- value = pick(value)
-
- message = replacetextEx(message, " [uppertext(key)]", " [uppertext(value)]")
- message = replacetextEx(message, " [capitalize(key)]", " [capitalize(value)]")
- message = replacetextEx(message, " [key]", " [value]")
-
- if(prob(3))
- message += pick(" Honh honh honh!"," Honh!"," Zut Alors!")
- speech_args[SPEECH_MESSAGE] = trim(message)
diff --git a/code/modules/clothing/head/hat.dm b/code/modules/clothing/head/hat.dm
index 15929ac5f0673e..d9258b8c7ddca3 100644
--- a/code/modules/clothing/head/hat.dm
+++ b/code/modules/clothing/head/hat.dm
@@ -53,11 +53,12 @@
/obj/item/clothing/head/bio_hood/plague
name = "plague doctor's hat"
- desc = "These were once used by plague doctors. Will protect you from exposure to the Pestilence."
+ desc = "These were once used by plague doctors. This hat will only slightly protect you from exposure to the Pestilence."
icon_state = "plaguedoctor"
- clothing_flags = THICKMATERIAL | BLOCK_GAS_SMOKE_EFFECT | SNUG_FIT | STACKABLE_HELMET_EXEMPT
armor_type = /datum/armor/bio_hood_plague
flags_inv = NONE
+ clothing_flags = SNUG_FIT
+ flags_cover = NONE
/datum/armor/bio_hood_plague
bio = 100
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 4d41d9daa5c764..68921334510384 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -137,7 +137,7 @@
/obj/item/clothing/head/helmet/marine/pmc
icon_state = "marine"
- desc = "A tactical black helmet, designed to protect one's head from various injuries sustained in operations. Its stellar survivability making up is for it's lack of space worthiness"
+ desc = "A tactical black helmet, designed to protect one's head from various injuries sustained in operations. Its stellar survivability making up is for its lack of space worthiness"
min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT
max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT
clothing_flags = null
diff --git a/code/modules/clothing/head/tophat.dm b/code/modules/clothing/head/tophat.dm
index 2affc4c63da186..612f02ce692e92 100644
--- a/code/modules/clothing/head/tophat.dm
+++ b/code/modules/clothing/head/tophat.dm
@@ -38,7 +38,7 @@
/obj/item/clothing/head/hats/tophat/balloon
name = "balloon top-hat"
- desc = "It's an colourful looking top-hat to match yout colourful personality."
+ desc = "It's a colourful looking top-hat to match your colourful personality."
icon_state = "balloon_tophat"
inhand_icon_state = "balloon_that"
throwforce = 0
diff --git a/code/modules/clothing/masks/_masks.dm b/code/modules/clothing/masks/_masks.dm
index c1d29d65c86417..5255b758b6faf3 100644
--- a/code/modules/clothing/masks/_masks.dm
+++ b/code/modules/clothing/masks/_masks.dm
@@ -8,7 +8,6 @@
strip_delay = 40
equip_delay_other = 40
visor_vars_to_toggle = NONE
- var/modifies_speech = FALSE
var/adjusted_flags = null
///Did we install a filtering cloth?
var/has_filter = FALSE
@@ -25,31 +24,6 @@
var/status = !(clothing_flags & VOICEBOX_DISABLED)
to_chat(user, span_notice("You turn the voice box in [src] [status ? "on" : "off"]."))
-/obj/item/clothing/mask/equipped(mob/M, slot)
- . = ..()
- if ((slot & ITEM_SLOT_MASK) && modifies_speech)
- RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(handle_speech))
- else
- UnregisterSignal(M, COMSIG_MOB_SAY)
-
-/obj/item/clothing/mask/dropped(mob/M)
- . = ..()
- UnregisterSignal(M, COMSIG_MOB_SAY)
-
-/obj/item/clothing/mask/vv_edit_var(vname, vval)
- if(vname == NAMEOF(src, modifies_speech) && ismob(loc))
- var/mob/M = loc
- if(M.get_item_by_slot(ITEM_SLOT_MASK) == src)
- if(vval)
- if(!modifies_speech)
- RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(handle_speech))
- else if(modifies_speech)
- UnregisterSignal(M, COMSIG_MOB_SAY)
- return ..()
-
-/obj/item/clothing/mask/proc/handle_speech()
- SIGNAL_HANDLER
-
/obj/item/clothing/mask/worn_overlays(mutable_appearance/standing, isinhands = FALSE)
. = ..()
if(isinhands)
diff --git a/code/modules/clothing/masks/animal_masks.dm b/code/modules/clothing/masks/animal_masks.dm
index 5df5c6738d8e51..05e5888168e12b 100644
--- a/code/modules/clothing/masks/animal_masks.dm
+++ b/code/modules/clothing/masks/animal_masks.dm
@@ -16,7 +16,7 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list(
/obj/item/clothing/mask/animal
w_class = WEIGHT_CLASS_SMALL
clothing_flags = VOICEBOX_TOGGLABLE
- modifies_speech = TRUE
+ var/modifies_speech = TRUE
flags_cover = MASKCOVERSMOUTH
var/animal_type ///what kind of animal the masks represents. used for automatic name and description generation.
@@ -32,6 +32,17 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list(
if(cursed)
make_cursed()
+/obj/item/clothing/mask/animal/equipped(mob/M, slot)
+ . = ..()
+ if ((slot & ITEM_SLOT_MASK) && modifies_speech)
+ RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(handle_speech))
+ else
+ UnregisterSignal(M, COMSIG_MOB_SAY)
+
+/obj/item/clothing/mask/animal/dropped(mob/M)
+ . = ..()
+ UnregisterSignal(M, COMSIG_MOB_SAY)
+
/obj/item/clothing/mask/animal/vv_edit_var(vname, vval)
if(vname == NAMEOF(src, cursed))
if(vval)
@@ -39,6 +50,14 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list(
make_cursed()
else if(cursed)
clear_curse()
+ if(vname == NAMEOF(src, modifies_speech) && ismob(loc))
+ var/mob/M = loc
+ if(M.get_item_by_slot(ITEM_SLOT_MASK) == src)
+ if(vval)
+ if(!modifies_speech)
+ RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(handle_speech))
+ else if(modifies_speech)
+ UnregisterSignal(M, COMSIG_MOB_SAY)
return ..()
/obj/item/clothing/mask/animal/examine(mob/user)
@@ -90,7 +109,9 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list(
UnregisterSignal(M, COMSIG_MOB_SAY)
M.update_worn_mask()
-/obj/item/clothing/mask/animal/handle_speech(datum/source, list/speech_args)
+/obj/item/clothing/mask/animal/proc/handle_speech(datum/source, list/speech_args)
+ SIGNAL_HANDLER
+
if(clothing_flags & VOICEBOX_DISABLED)
return
if(!modifies_speech || !LAZYLEN(animal_sounds))
diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm
index 468b1272f86044..2e75cebf5d98f2 100644
--- a/code/modules/clothing/masks/boxing.dm
+++ b/code/modules/clothing/masks/boxing.dm
@@ -34,31 +34,10 @@
inhand_icon_state = null
flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
w_class = WEIGHT_CLASS_SMALL
- modifies_speech = TRUE
-/obj/item/clothing/mask/luchador/handle_speech(datum/source, list/speech_args)
- var/message = speech_args[SPEECH_MESSAGE]
- if(message[1] != "*")
- message = replacetext(message, "captain", "CAPITÁN")
- message = replacetext(message, "station", "ESTACIÓN")
- message = replacetext(message, "sir", "SEÑOR")
- message = replacetext(message, "the ", "el ")
- message = replacetext(message, "my ", "mi ")
- message = replacetext(message, "is ", "es ")
- message = replacetext(message, "it's", "es")
- message = replacetext(message, "friend", "amigo")
- message = replacetext(message, "buddy", "amigo")
- message = replacetext(message, "hello", "hola")
- message = replacetext(message, " hot", " caliente")
- message = replacetext(message, " very ", " muy ")
- message = replacetext(message, "sword", "espada")
- message = replacetext(message, "library", "biblioteca")
- message = replacetext(message, "traitor", "traidor")
- message = replacetext(message, "wizard", "mago")
- message = uppertext(message) //Things end up looking better this way (no mixed cases), and it fits the macho wrestler image.
- if(prob(25))
- message += " OLE!"
- speech_args[SPEECH_MESSAGE] = message
+/obj/item/clothing/mask/luchador/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/speechmod, replacements = strings("luchador_replacement.json", "luchador"), end_string = " OLE!", end_string_chance = 25, uppercase = TRUE, slots = ITEM_SLOT_MASK)
/obj/item/clothing/mask/luchador/tecnicos
name = "Tecnicos Mask"
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index b95bccce7d860e..3f734f420d5f25 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -250,12 +250,12 @@ GLOBAL_LIST_INIT(clown_mask_options, list(
//Plague Dr suit can be found in clothing/suits/bio.dm
/obj/item/clothing/mask/gas/plaguedoctor
name = "plague doctor mask"
- desc = "A modernised version of the classic design, this mask will not only filter out toxins but it can also be connected to an air supply."
+ desc = "A modernised version of the classic design, this mask will not only protect you from exposure to the Pestilence but it can also be connected to an air supply."
icon_state = "plaguedoctor"
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR|HIDESNOUT|HIDEHAIR
inhand_icon_state = "gas_mask"
has_fov = FALSE
- flags_cover = MASKCOVERSEYES
+ clothing_flags = BLOCK_GAS_SMOKE_EFFECT|MASKINTERNALS
/obj/item/clothing/mask/gas/syndicate
name = "syndicate mask"
diff --git a/code/modules/clothing/masks/gondola.dm b/code/modules/clothing/masks/gondola.dm
index 7a8283293ded28..bfaae3cb3f3140 100644
--- a/code/modules/clothing/masks/gondola.dm
+++ b/code/modules/clothing/masks/gondola.dm
@@ -5,18 +5,7 @@
inhand_icon_state = null
flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
w_class = WEIGHT_CLASS_SMALL
- modifies_speech = TRUE
-/obj/item/clothing/mask/gondola/handle_speech(datum/source, list/speech_args)
- var/message = speech_args[SPEECH_MESSAGE]
- if(message[1] != "*")
- message = " [message]"
- var/list/spurdo_words = strings("spurdo_replacement.json", "spurdo")
- for(var/key in spurdo_words)
- var/value = spurdo_words[key]
- if(islist(value))
- value = pick(value)
- message = replacetextEx(message,regex(uppertext(key),"g"), "[uppertext(value)]")
- message = replacetextEx(message,regex(capitalize(key),"g"), "[capitalize(value)]")
- message = replacetextEx(message,regex(key,"g"), "[value]")
- speech_args[SPEECH_MESSAGE] = trim(message)
+/obj/item/clothing/mask/gondola/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/speechmod, replacements = strings("spurdo_replacement.json", "spurdo"), slots = ITEM_SLOT_MASK)
diff --git a/code/modules/clothing/masks/moustache.dm b/code/modules/clothing/masks/moustache.dm
index aaf59be51e4fdb..5b71e7a4260901 100644
--- a/code/modules/clothing/masks/moustache.dm
+++ b/code/modules/clothing/masks/moustache.dm
@@ -10,23 +10,7 @@
/obj/item/clothing/mask/fakemoustache/italian
name = "italian moustache"
desc = "Made from authentic Italian moustache hairs. Gives the wearer an irresistable urge to gesticulate wildly."
- modifies_speech = TRUE
-/obj/item/clothing/mask/fakemoustache/italian/handle_speech(datum/source, list/speech_args)
- var/message = speech_args[SPEECH_MESSAGE]
- if(message[1] != "*")
- message = " [message]"
- var/list/italian_words = strings("italian_replacement.json", "italian")
-
- for(var/key in italian_words)
- var/value = italian_words[key]
- if(islist(value))
- value = pick(value)
-
- message = replacetextEx(message, " [uppertext(key)]", " [uppertext(value)]")
- message = replacetextEx(message, " [capitalize(key)]", " [capitalize(value)]")
- message = replacetextEx(message, " [key]", " [value]")
-
- if(prob(3))
- message += pick(" Ravioli, ravioli, give me the formuoli!"," Mamma-mia!"," Mamma-mia! That's a spicy meat-ball!", " La la la la la funiculi funicula!")
- speech_args[SPEECH_MESSAGE] = trim(message)
+/obj/item/clothing/mask/fakemoustache/italian/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/speechmod, replacements = strings("italian_replacement.json", "italian"), end_string = list(" Ravioli, ravioli, give me the formuoli!"," Mamma-mia!"," Mamma-mia! That's a spicy meat-ball!", " La la la la la funiculi funicula!"), end_string_chance = 3, slots = ITEM_SLOT_MASK)
diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm
index e30dfc2f5acb29..28bd5e8b85c647 100644
--- a/code/modules/clothing/shoes/_shoes.dm
+++ b/code/modules/clothing/shoes/_shoes.dm
@@ -118,9 +118,10 @@
* *
* * state: SHOES_UNTIED, SHOES_TIED, or SHOES_KNOTTED, depending on what you want them to become
* * user: used to check to see if we're the ones unknotting our own laces
+ * * force_lacing: boolean. if TRUE, ignores can_be_tied
*/
-/obj/item/clothing/shoes/proc/adjust_laces(state, mob/user)
- if(!can_be_tied)
+/obj/item/clothing/shoes/proc/adjust_laces(state, mob/user, force_lacing = FALSE)
+ if(!can_be_tied && !force_lacing)
return
var/mob/living/carbon/human/our_guy
diff --git a/code/modules/clothing/shoes/sandals.dm b/code/modules/clothing/shoes/sandals.dm
index 9c948e2fac88e4..92c90a90348ce3 100644
--- a/code/modules/clothing/shoes/sandals.dm
+++ b/code/modules/clothing/shoes/sandals.dm
@@ -11,6 +11,12 @@
can_be_tied = FALSE
species_exception = list(/datum/species/golem)
+/obj/item/clothing/shoes/sandal/alt
+ desc = "A pair of shiny black wooden sandals."
+ name = "black sandals"
+ icon_state = "blacksandals"
+ inhand_icon_state = "blacksandals"
+
/datum/armor/shoes_sandal
bio = 10
diff --git a/code/modules/clothing/shoes/sneakers.dm b/code/modules/clothing/shoes/sneakers.dm
index 55a5be872c3e28..81f5006f9e8a4d 100644
--- a/code/modules/clothing/shoes/sneakers.dm
+++ b/code/modules/clothing/shoes/sneakers.dm
@@ -13,6 +13,11 @@
greyscale_config_worn_digi = /datum/greyscale_config/sneakers/worn/digi //SKYRAT EDIT ADDITION - DigiGreyscale
interaction_flags_mouse_drop = NEED_HANDS
+/obj/item/clothing/shoes/sneakers/random/Initialize(mapload)
+ . = ..()
+ greyscale_colors = "#" + random_color() + "#" + random_color()
+ update_greyscale()
+
/obj/item/clothing/shoes/sneakers/black
name = "black shoes"
desc = "A pair of black shoes."
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 7aca981aae10b4..9c34574840d798 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -107,7 +107,7 @@
body_parts_covered = CHEST|GROIN
/obj/item/clothing/suit/armor/vest/marine/pmc
- desc = "A set of the finest mass produced, stamped plasteel armor plates, for an all-around door-kicking and ass-smashing. Its stellar survivability making up is for it's lack of space worthiness"
+ desc = "A set of the finest mass produced, stamped plasteel armor plates, for an all-around door-kicking and ass-smashing. Its stellar survivability making up is for its lack of space worthiness"
min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT
max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT
clothing_flags = THICKMATERIAL
@@ -676,7 +676,7 @@
/obj/item/clothing/suit/armor/militia
name = "station defender's coat"
- desc = "A well worn uniform used by militia across the frontier, it's thick padding useful for cushioning blows."
+ desc = "A well worn uniform used by militia across the frontier, its thick padding useful for cushioning blows."
icon_state = "militia"
inhand_icon_state = "b_suit"
body_parts_covered = CHEST|GROIN|ARMS
diff --git a/code/modules/clothing/suits/ghostsheet.dm b/code/modules/clothing/suits/ghostsheet.dm
index 9bd8753f50b41c..65213fd176dba9 100644
--- a/code/modules/clothing/suits/ghostsheet.dm
+++ b/code/modules/clothing/suits/ghostsheet.dm
@@ -22,8 +22,18 @@
if(!isinhands && check_holidays(HALLOWEEN))
. += emissive_appearance('icons/mob/simple/mob.dmi', "ghost", offset_spokesman = src, alpha = src.alpha)
-/obj/item/clothing/suit/costume/ghost_sheet/spooky
+/obj/item/clothing/suit/spooky_ghost_sheet
name = "spooky ghost"
desc = "This is obviously just a bedsheet, but maybe try it on?"
+ icon = 'icons/obj/clothing/suits/costume.dmi'
+ worn_icon = 'icons/mob/clothing/suits/costume.dmi'
user_vars_to_edit = list("name" = "Spooky Ghost", "real_name" = "Spooky Ghost" , "incorporeal_move" = INCORPOREAL_MOVE_BASIC, "appearance_flags" = KEEP_TOGETHER|TILE_BOUND, "alpha" = 150)
+ inhand_icon_state = null
+ throwforce = 0
+ throw_speed = 1
+ throw_range = 2
+ w_class = WEIGHT_CLASS_TINY
+ flags_inv = HIDEGLOVES|HIDEEARS|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
+ species_exception = list(/datum/species/golem)
+ supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
alternate_worn_layer = ABOVE_BODY_FRONT_LAYER //so the bedsheet goes over everything but fire
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index 2b8fef5bb5b46f..d211b3cc91edf8 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -234,7 +234,7 @@
/obj/item/clothing/suit/jacket/quartermaster
name = "quartermaster's overcoat"
- desc = "A luxury, brown double-breasted overcoat made from kangaroo skin. It's gold cuffs are linked and styled on the credits symbol. It makes you feel more important than you probably are."
+ desc = "A luxury, brown double-breasted overcoat made from kangaroo skin. Its gold cuffs are linked and styled on the credits symbol. It makes you feel more important than you probably are."
icon_state = "qm_coat"
blood_overlay_type = "coat"
body_parts_covered = CHEST|GROIN|LEGS|ARMS
diff --git a/code/modules/clothing/under/costume.dm b/code/modules/clothing/under/costume.dm
index bc9aad4198a9db..ba30233d2b7b99 100644
--- a/code/modules/clothing/under/costume.dm
+++ b/code/modules/clothing/under/costume.dm
@@ -129,6 +129,45 @@
body_parts_covered = CHEST|GROIN|ARMS
can_adjust = FALSE
+/obj/item/clothing/under/costume/yukata
+ name = "black yukata"
+ desc = "A comfortable black cotton yukata inspired by traditional designs, perfect for a non-formal setting."
+ icon_state = "yukata1"
+ body_parts_covered = CHEST|GROIN|ARMS
+ can_adjust = FALSE
+ supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
+
+/obj/item/clothing/under/costume/yukata/green
+ name = "green yukata"
+ desc = "A comfortable green cotton yukata inspired by traditional designs, perfect for a non-formal setting."
+ icon_state = "yukata2"
+
+/obj/item/clothing/under/costume/yukata/white
+ name = "white yukata"
+ desc = "A comfortable white cotton yukata inspired by traditional designs, perfect for a non-formal setting."
+ icon_state = "yukata3"
+
+/obj/item/clothing/under/costume/kimono
+ name = "black kimono"
+ desc = "A luxurious black silk kimono with traditional flair, ideal for elegant festive occasions."
+ icon_state = "kimono1"
+ inhand_icon_state = "yukata1"
+ body_parts_covered = CHEST|GROIN|ARMS
+ can_adjust = FALSE
+ supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON
+
+/obj/item/clothing/under/costume/kimono/red
+ name = "red kimono"
+ desc = "A luxurious red silk kimono with traditional flair, ideal for elegant festive occasions."
+ icon_state = "kimono2"
+ inhand_icon_state = "kimono2"
+
+/obj/item/clothing/under/costume/kimono/purple
+ name = "purple kimono"
+ desc = "A luxurious purple silk kimono with traditional flair, ideal for elegant festive occasions."
+ icon_state = "kimono3"
+ inhand_icon_state = "kimono3"
+
/obj/item/clothing/under/costume/villain
name = "villain suit"
desc = "A change of wardrobe is necessary if you ever want to catch a real superhero."
diff --git a/code/modules/deathmatch/deathmatch_controller.dm b/code/modules/deathmatch/deathmatch_controller.dm
index 45b5f087c5bb5a..0b098871624dcb 100644
--- a/code/modules/deathmatch/deathmatch_controller.dm
+++ b/code/modules/deathmatch/deathmatch_controller.dm
@@ -76,6 +76,9 @@
return
switch (action)
if ("host")
+ if(!(GLOB.ghost_role_flags & GHOSTROLE_MINIGAME))
+ tgui_alert(usr, "Deathmatch has been temporarily disabled by admins.")
+ return
if (lobbies[usr.ckey])
return
if(!SSticker.HasRoundStarted())
@@ -84,6 +87,9 @@
ui.close()
create_new_lobby(usr)
if ("join")
+ if(!(GLOB.ghost_role_flags & GHOSTROLE_MINIGAME))
+ tgui_alert(usr, "Deathmatch has been temporarily disabled by admins.")
+ return
if (!lobbies[params["id"]])
return
var/datum/deathmatch_lobby/playing_lobby = find_lobby_by_user(usr.ckey)
diff --git a/code/modules/events/anomaly/anomaly_ectoplasm.dm b/code/modules/events/anomaly/anomaly_ectoplasm.dm
index 6bd929d69225c0..b693d221d388e3 100644
--- a/code/modules/events/anomaly/anomaly_ectoplasm.dm
+++ b/code/modules/events/anomaly/anomaly_ectoplasm.dm
@@ -8,7 +8,7 @@
typepath = /datum/round_event/anomaly/anomaly_ectoplasm
min_players = 30
max_occurrences = 2
- weight = 4 //Rare because of it's wacky and silly nature
+ weight = 4 //Rare because of its wacky and silly nature
category = EVENT_CATEGORY_ANOMALIES
min_wizard_trigger_potency = 0
max_wizard_trigger_potency = 3
diff --git a/code/modules/events/brand_intelligence.dm b/code/modules/events/brand_intelligence.dm
index 950adf622ec06c..cfab77009d4704 100644
--- a/code/modules/events/brand_intelligence.dm
+++ b/code/modules/events/brand_intelligence.dm
@@ -60,7 +60,7 @@
announce_to_ghosts(origin_machine)
/datum/round_event/brand_intelligence/tick()
- if(!origin_machine || QDELETED(origin_machine) || origin_machine.shut_up || origin_machine.wires.is_all_cut()) //if the original vending machine is missing or has it's voice switch flipped
+ if(!origin_machine || QDELETED(origin_machine) || origin_machine.shut_up || origin_machine.wires.is_all_cut()) //if the original vending machine is missing or has its voice switch flipped
for(var/obj/machinery/vending/saved in infected_machines)
saved.shoot_inventory = FALSE
if(origin_machine)
diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm
index 5970a2e87872e3..bf7dbe23862fad 100644
--- a/code/modules/events/disease_outbreak.dm
+++ b/code/modules/events/disease_outbreak.dm
@@ -106,7 +106,7 @@
var/list/afflicted = list()
/datum/round_event/disease_outbreak/announce(fake)
- if(isnull(illness_type))
+ if(!illness_type)
var/list/virus_candidates = list(
/datum/disease/anxiety,
/datum/disease/beesease,
diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm
index 7afc67266102cd..686adf1e5d3f60 100644
--- a/code/modules/events/ion_storm.dm
+++ b/code/modules/events/ion_storm.dm
@@ -106,7 +106,7 @@
var/ionallergysev = pick_list(ION_FILE, "ionallergysev")
//Species, for when the AI has to commit genocide. Plural.
var/ionspecies = pick_list(ION_FILE, "ionspecies")
- //Abstract concepts for the AI to decide on it's own definition of.
+ //Abstract concepts for the AI to decide on its own definition of.
var/ionabstract = pick_list(ION_FILE, "ionabstract")
//Foods. Drinks aren't included due to grammar; if you want to add drinks, make a new set
//of possible laws for best effect. Unless you want the crew having to drink hamburgers.
diff --git a/code/modules/events/space_vines/vine_mutations.dm b/code/modules/events/space_vines/vine_mutations.dm
index f081c81b985822..5dbbd1d9795fdb 100644
--- a/code/modules/events/space_vines/vine_mutations.dm
+++ b/code/modules/events/space_vines/vine_mutations.dm
@@ -335,6 +335,7 @@
//This specific mutation only covers floors instead of structures, items, mobs and cant tangle mobs
/datum/spacevine_mutation/timid/on_birth(obj/structure/spacevine/holder)
SET_PLANE_IMPLICIT(holder, FLOOR_PLANE)
+ holder.layer = ABOVE_OPEN_TURF_LAYER
holder.light_state = PASS_LIGHT
holder.can_tangle = FALSE
return ..()
diff --git a/code/modules/events/supermatter_surge.dm b/code/modules/events/supermatter_surge.dm
index 6c790c84f8d7ed..c7fb6f969d82b1 100644
--- a/code/modules/events/supermatter_surge.dm
+++ b/code/modules/events/supermatter_surge.dm
@@ -91,7 +91,8 @@
end_when = rand(SURGE_DURATION_MIN, SURGE_DURATION_MAX)
/datum/round_event/supermatter_surge/announce(fake)
- priority_announce("The Crystal Integrity Monitoring System has detected unusual atmospheric properties in the supermatter chamber, energy output from the supermatter crystal has increased significantly. Engineering intervention is required to stabilize the engine.", "Class [surge_class] Supermatter Surge Alert", 'sound/machines/engine_alert3.ogg')
+ var/class_to_announce = fake ? pick(1, 2, 3, 4) : surge_class
+ priority_announce("The Crystal Integrity Monitoring System has detected unusual atmospheric properties in the supermatter chamber, energy output from the supermatter crystal has increased significantly. Engineering intervention is required to stabilize the engine.", "Class [class_to_announce] Supermatter Surge Alert", 'sound/machines/engine_alert3.ogg')
/datum/round_event/supermatter_surge/start()
engine.bullet_energy = surge_class + SURGE_BULLET_ENERGY_ADDITION
@@ -99,7 +100,6 @@
sm_gas.heat_power_generation = (surge_class * SURGE_POWER_GENERATION_MODIFIER) - 1
sm_gas.heat_modifier = (surge_class * SURGE_HEAT_MODIFIER) - 1
-
/datum/round_event/supermatter_surge/end()
engine.bullet_energy = initial(engine.bullet_energy)
sm_gas.powerloss_inhibition = initial(sm_gas.powerloss_inhibition)
diff --git a/code/modules/experisci/experiment/experiments.dm b/code/modules/experisci/experiment/experiments.dm
index 244145221ea3b8..de5b3abc15a300 100644
--- a/code/modules/experisci/experiment/experiments.dm
+++ b/code/modules/experisci/experiment/experiments.dm
@@ -82,7 +82,7 @@
/datum/experiment/ordnance/explosive/hydrogenbomb
name = "Hydrogen Explosives"
- description = "Combustion of Hydrogen and it's derivatives can be very powerful. Capture any tank explosion with a Doppler Array and publish the data in a paper. Only Hydrogen or Tritium Fires are allowed."
+ description = "Combustion of Hydrogen and its derivatives can be very powerful. Capture any tank explosion with a Doppler Array and publish the data in a paper. Only Hydrogen or Tritium Fires are allowed."
gain = list(15,40,60)
target_amount = list(50,75,150)
experiment_proper = TRUE
diff --git a/code/modules/fishing/aquarium/aquarium.dm b/code/modules/fishing/aquarium/aquarium.dm
index cd05d0bd34baf4..97ce717b4c5247 100644
--- a/code/modules/fishing/aquarium/aquarium.dm
+++ b/code/modules/fishing/aquarium/aquarium.dm
@@ -45,7 +45,7 @@
var/list/fluid_types = list(AQUARIUM_FLUID_SALTWATER, AQUARIUM_FLUID_FRESHWATER, AQUARIUM_FLUID_SULPHWATEVER, AQUARIUM_FLUID_AIR)
- var/panel_open = TRUE
+ var/panel_open = FALSE
///Current layers in use by aquarium contents
var/list/used_layers = list()
diff --git a/code/modules/fishing/aquarium/fish_analyzer.dm b/code/modules/fishing/aquarium/fish_analyzer.dm
index 2038f1960f9039..f59f1901b8563f 100644
--- a/code/modules/fishing/aquarium/fish_analyzer.dm
+++ b/code/modules/fishing/aquarium/fish_analyzer.dm
@@ -20,14 +20,8 @@
greyscale_config_worn = /datum/greyscale_config/fish_analyzer_worn
///The color of the case. Used by grayscale configs and update_overlays()
var/case_color
- /**
- * The radial menu shown when analyzing aquariums. Having a persistent one allows us
- * to update it whenever fish come and go, and is also required since we have a select callback
- * used to check right clicks for scanning traits instead of status.
- */
- var/datum/radial_menu/persistent/fish_menu
- /// A cached list of the current choices for the aforedefined radial menu.
- var/list/radial_choices
+ ///the item we have scanned
+ var/datum/weakref/scanned_item
/obj/item/fish_analyzer/Initialize(mapload)
case_color = rgb(rand(16, 255), rand(16, 255), rand(16, 255))
@@ -47,11 +41,6 @@
register_item_context()
update_appearance()
-/obj/item/fish_analyzer/Destroy()
- if(fish_menu)
- QDEL_NULL(fish_menu)
- radial_choices = null
- return ..()
/obj/item/fish_analyzer/examine(mob/user)
. = ..()
@@ -68,190 +57,82 @@
. += case
. += emissive_appearance(icon, "fish_analyzer_emissive", src)
-/obj/item/fish_analyzer/add_item_context(obj/item/source, list/context, atom/target)
- if (isfish(target))
- context[SCREENTIP_CONTEXT_LMB] = "Analyze status"
- context[SCREENTIP_CONTEXT_RMB] = "Analyze traits"
- return CONTEXTUAL_SCREENTIP_SET
- else if(isaquarium(target))
- context[SCREENTIP_CONTEXT_LMB] = "Open radial menu"
- return CONTEXTUAL_SCREENTIP_SET
- return NONE
-
/obj/item/fish_analyzer/interact_with_atom(atom/target, mob/living/user, list/modifiers)
if(!isfish(target) && !isaquarium(target))
return NONE
if(!user.can_read(src) || user.is_blind())
return ITEM_INTERACT_BLOCKING
- if(isfish(target))
- balloon_alert(user, "analyzing stats")
- user.visible_message(span_notice("[user] analyzes [target]."), span_notice("You analyze [target]."))
- analyze_status(target, user)
- else if(istype(target, /obj/structure/aquarium))
- scan_aquarium(target, user)
- return ITEM_INTERACT_SUCCESS
-
-/obj/item/fish_analyzer/interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers)
- if(!isfish(interacting_with))
- return NONE
- if(!user.can_read(src) || user.is_blind())
- return ITEM_INTERACT_BLOCKING
-
- balloon_alert(user, "analyzing traits")
- analyze_traits(interacting_with, user)
- return ITEM_INTERACT_SUCCESS
-
-///Instantiates the radial menu, populates the list of choices, shows it and register signals on the aquarium.
-/obj/item/fish_analyzer/proc/scan_aquarium(obj/structure/aquarium/aquarium, mob/user)
- if(fish_menu)
- balloon_alert(user, "already scanning")
- return
- var/list/fishes = aquarium.get_fishes()
- if(!length(fishes))
- balloon_alert(user, "no fish to scan")
- return
- radial_choices = list()
- for(var/obj/item/fish/fish as anything in fishes)
- radial_choices(fish)
- fish_menu = show_radial_menu_persistent(user, aquarium, radial_choices, select_proc = CALLBACK(src, PROC_REF(choice_selected), user, aquarium), tooltips = TRUE, custom_check = CALLBACK(src, PROC_REF(can_select_fish), user, aquarium))
- RegisterSignal(aquarium, COMSIG_ATOM_ABSTRACT_ENTERED, PROC_REF(on_aquarium_entered))
- RegisterSignal(aquarium, COMSIG_ATOM_ABSTRACT_EXITED, PROC_REF(on_aquarium_exited))
- RegisterSignal(aquarium, COMSIG_QDELETING, PROC_REF(delete_radial))
-
-///Instantiates a radial menu choice datum for the current fish and adds it to the list of choices.
-/obj/item/fish_analyzer/proc/radial_choices(obj/item/fish/fish)
- var/datum/radial_menu_choice/menu_choice = new
- menu_choice.name = fish.name
- menu_choice.info = "[fish.status == FISH_ALIVE ? "Alive" : "Dead"]\n[fish.size] cm\n[fish.weight] g\nProgenitors: [fish.progenitors]\nRight-click to analyze traits"
- var/mutable_appearance/fish_appearance = new(fish)
- fish_appearance.layer = FLOAT_LAYER
- fish_appearance.plane = FLOAT_PLANE
- menu_choice.image = fish_appearance
- radial_choices[fish] = menu_choice
-
-///Called when the user has selected a choice. If it's a right click, analyze the traits, else the status
-/obj/item/fish_analyzer/proc/choice_selected(mob/user, obj/structure/aquarium/aquarium, obj/item/fish/choice, params)
- if(!choice || !can_select_fish(user, aquarium))
- delete_radial(aquarium)
- return
- var/is_right_clicking = LAZYACCESS(params2list(params), RIGHT_CLICK)
- user.visible_message(span_notice("[user] analyzes [choice] inside [aquarium]."), span_notice("You analyze [choice] inside [aquarium]."))
- if(is_right_clicking)
- analyze_traits(choice, user)
- else
- analyze_status(choice, user)
-
-///Whether the item should continue to show its radial menu or delete it.
-/obj/item/fish_analyzer/proc/can_select_fish(mob/user, obj/structure/aquarium/aquarium)
- if(!user.is_holding(src) || !user?.CanReach(aquarium) || IS_DEAD_OR_INCAP(user))
- delete_radial(aquarium)
- return FALSE
- return TRUE
-
-///Called when something enters the aquarium. If it's a fish, update the choices.
-/obj/item/fish_analyzer/proc/on_aquarium_entered(obj/structure/aquarium/source, atom/movable/arrived)
- SIGNAL_HANDLER
- if(isfish(arrived))
- radial_choices(arrived)
- fish_menu.change_choices(radial_choices, tooltips = TRUE, animate = TRUE)
-
-///Called when something exits the aquarium. If it's a fish, update the choices.
-/obj/item/fish_analyzer/proc/on_aquarium_exited(obj/structure/aquarium/source, atom/movable/gone)
- SIGNAL_HANDLER
- if(!isfish(gone))
- return
- radial_choices -= gone
- if(!length(radial_choices))
- delete_radial(source)
- return
- fish_menu.change_choices(radial_choices, tooltips = TRUE, animate = TRUE)
+ if(isfish(target) || istype(target, /obj/structure/aquarium))
+ scanned_item = WEAKREF(target)
+ ui_interact(user)
+ return ITEM_INTERACT_SUCCESS
-///Unregisters signals, delete the radial menu, unsets the choices.
-/obj/item/fish_analyzer/proc/delete_radial(obj/structure/aquarium/source)
- SIGNAL_HANDLER
- UnregisterSignal(source, list(COMSIG_ATOM_ABSTRACT_EXITED, COMSIG_ATOM_ABSTRACT_ENTERED, COMSIG_QDELETING))
- QDEL_NULL(fish_menu)
- radial_choices = null
-
-/**
- * Called when a fish or a menu choice is left-clicked.
- * This returns the fish's status, size, weight, feed type, hunger, breeding timeout.
- */
-/obj/item/fish_analyzer/proc/analyze_status(obj/item/fish/fish, mob/user)
-
- // the final list of strings to render
- var/render_list = list()
-
- var/fish_status = fish.status == FISH_DEAD ? span_alert("Deceased") : "[PERCENT(fish.health/initial(fish.health))]% healthy"
-
- render_list += "[span_info("Analyzing status for [fish]:")]\nOverrall status: [fish_status]\n"
- render_list += "Size: [fish.size] cm - Weight: [fish.weight] g\n"
- render_list += "Required feed type: [initial(fish.food.name)]\n"
- render_list += "Safe temperature: [fish.required_temperature_min] - [fish.required_temperature_max]K"
- if(isaquarium(fish.loc))
- var/obj/structure/aquarium/aquarium = fish.loc
- if(!ISINRANGE(aquarium.fluid_temp, fish.required_temperature_min, fish.required_temperature_max))
- render_list += span_alert("(OUT OF RANGE)")
- render_list += "\n"
- render_list += "Safe fluid type: [fish.required_fluid_type]"
- if(isaquarium(fish.loc))
- var/obj/structure/aquarium/aquarium = fish.loc
- if(!compatible_fluid_type(fish.required_fluid_type, aquarium.fluid_type))
- render_list += span_alert("(IN UNSAFE FLUID)")
- render_list += ""
-
- if(fish.status != FISH_DEAD)
- render_list += "\n"
- if(!HAS_TRAIT(fish, TRAIT_FISH_NO_HUNGER))
- var/hunger = PERCENT(min((world.time - fish.last_feeding) / fish.feeding_frequency, 1))
- var/hunger_string = "[hunger]%"
- switch(hunger)
- if(0 to 60)
- hunger_string = span_info(hunger_string)
- if(60 to 90)
- hunger_string = span_warning(hunger_string)
- if(90 to 100)
- hunger_string = span_alert(hunger_string)
- render_list += "Hunger: [hunger_string]\n"
- var/time_left = round(max(fish.breeding_wait - world.time, 0)/10)
- render_list += "Time until it can breed: [time_left] seconds"
-
- to_chat(user, examine_block(jointext(render_list, "")), type = MESSAGE_TYPE_INFO)
-
- SEND_SIGNAL(src, COMSIG_FISH_ANALYZER_ANALYZE_STATUS, fish, user)
-
-/**
- * Called when a fish or a menu choice is left-clicked.
- * This returns the fish's progenitors, traits and their inheritability.
- */
-/obj/item/fish_analyzer/proc/analyze_traits(obj/item/fish/fish, mob/user)
-
- // the final list of strings to render
- var/render_list = list()
-
- render_list += "[span_info("Analyzing traits for [fish]:")]\nProgenitor species: [fish.progenitors]\n"
-
- if(!length(fish.fish_traits))
- render_list += "This fish has no trait to speak of...\n"
- else
- render_list += "Traits:\n"
- for(var/trait_type in fish.fish_traits)
- var/datum/fish_trait/trait = GLOB.fish_traits[trait_type]
- var/tooltipped_trait = span_tooltip(trait.catalog_description, trait.name)
- render_list += "[tooltipped_trait] - Inheritabilities: [trait.inheritability]% - [trait.diff_traits_inheritability]%\n"
-
- var/evolution_len = length(fish.evolution_types)
- if(!evolution_len)
- render_list += "This fish has no evolution to speak of..."
- for(var/index in 1 to evolution_len)
- var/datum/fish_evolution/evolution = GLOB.fish_evolutions[fish.evolution_types[index]]
- var/evolution_name = evolution.name
- var/evolution_tooltip = evolution.get_evolution_tooltip()
- if(evolution_tooltip)
- evolution_name = span_tooltip(evolution_tooltip, evolution_name)
- render_list += "[evolution_name] - Base Probability: [evolution.probability]%"
- if(index != evolution_len)
- render_list += "\n"
+ return NONE
- to_chat(user, examine_block(jointext(render_list, "")), type = MESSAGE_TYPE_INFO)
+/obj/item/fish_analyzer/ui_interact(mob/user, datum/tgui/ui)
+ if(isnull(scanned_item?.resolve()))
+ balloon_alert(user, "no specimen data!")
+ return TRUE
+
+ ui = SStgui.try_update_ui(user, src, ui)
+ if(!ui)
+ ui = new(user, src, "FishAnalyzer")
+ ui.open()
+
+/obj/item/fish_analyzer/ui_static_data(mob/user)
+ var/list/data = list()
+ var/atom/scanned_object = scanned_item?.resolve()
+ data["fish_list"] = list()
+ data["fish_scanned"] = FALSE
+
+ if(isfish(scanned_object))
+ data["fish_scanned"] = TRUE
+ return extract_fish_info(data, scanned_object)
+
+ var/obj/structure/aquarium/aquarium = scanned_object
+ for(var/obj/item/fish/fishie in aquarium)
+ extract_fish_info(data, fishie, aquarium)
+
+ return data
+
+/obj/item/fish_analyzer/proc/extract_fish_info(list/data, obj/item/fish/fishie, obj/structure/aquarium/aquarium)
+ var/list/fish_traits = list()
+ var/list/fish_evolutions = list()
+
+ for(var/evolution_type in fishie.evolution_types)
+ var/datum/fish_evolution/evolution = GLOB.fish_evolutions[evolution_type]
+ var/obj/item/evolution_fish = evolution.new_fish_type
+ fish_evolutions += list(list(
+ "evolution_name" = evolution.name,
+ "evolution_icon" = evolution_fish::icon,
+ "evolution_icon_state" = evolution_fish::icon_state,
+ "evolution_probability" = evolution.probability,
+ "evolution_conditions" = evolution.conditions_note,
+ ))
+
+ for(var/trait_type in fishie.fish_traits)
+ var/datum/fish_trait/trait = GLOB.fish_traits[trait_type]
+ fish_traits += list(list("trait_name" = trait.name, "trait_desc" = trait.catalog_description, "trait_inherit" = trait.diff_traits_inheritability))
+
+ data["fish_list"] += list(list(
+ "fish_name" = fishie.name,
+ "fish_icon" = fishie::icon,
+ "fish_icon_state" = fishie::icon_state,
+ "fish_health" = fishie.status == FISH_DEAD ? 0 : PERCENT(fishie.health/initial(fishie.health)),
+ "fish_size" = fishie.size,
+ "fish_weight" = fishie.weight,
+ "fish_food" = fishie.food::name,
+ "fish_food_color" = fishie.food::color,
+ "fish_min_temp" = fishie.required_temperature_min,
+ "fish_max_temp" = fishie.required_temperature_max,
+ "fish_hunger" = HAS_TRAIT(fishie, TRAIT_FISH_NO_HUNGER) ? 0 : PERCENT(min((world.time - fishie.last_feeding) / fishie.feeding_frequency, 1)),
+ "fish_fluid_compatible" = aquarium ? compatible_fluid_type(fishie.required_fluid_type, aquarium.fluid_type) : null,
+ "fish_fluid_type" = fishie.required_fluid_type,
+ "fish_breed_timer" = round(max(fishie.breeding_wait - world.time, 0) / 10),
+ "fish_traits" = fish_traits,
+ "fish_evolutions" = fish_evolutions,
+ "fish_suitable_temp" = aquarium ? ISINRANGE(aquarium.fluid_temp, fishie.required_temperature_min, fishie.required_temperature_max) : null
+ ))
+
+ return data
diff --git a/code/modules/fishing/fish/_fish.dm b/code/modules/fishing/fish/_fish.dm
index c4be35817b7aca..081f794029041c 100644
--- a/code/modules/fishing/fish/_fish.dm
+++ b/code/modules/fishing/fish/_fish.dm
@@ -12,7 +12,7 @@
attack_verb_simple = list("slap", "whack")
hitsound = 'sound/weapons/slap.ogg'
///The grind results of the fish. They scale with the weight of the fish.
- grind_results = list(/datum/reagent/blood = 20, /datum/reagent/consumable/liquidgibs = 5)
+ grind_results = list(/datum/reagent/blood = 5, /datum/reagent/consumable/liquidgibs = 5)
obj_flags = UNIQUE_RENAME
/// Resulting width of aquarium visual icon - default size of "fish_greyscale" state
@@ -253,18 +253,21 @@
var/list/same_traits = x_traits & y_traits
var/list/all_traits = (x_traits|y_traits)-removed_traits
- /**
- * Traits that the fish is guaranteed to inherit will be inherited,
- * with the assertion that they're compatible anyway.
- */
- for(var/trait_type in all_traits)
- var/datum/fish_trait/trait = GLOB.fish_traits[trait_type]
- if(type in trait.guaranteed_inheritance_types)
- fish_traits |= trait_type
- all_traits -= trait_type
- ///Build a list of incompatible traits. Don't let any such trait pass onto the fish.
+ /// a list of incompatible traits that'll be filled as it goes on. Don't let any such trait pass onto the fish.
var/list/incompatible_traits = list()
+
+ ///some traits can spontaneously manifest for some fishes. These have higher priorities than other traits
+ var/list/potential_spontaneous_traits = GLOB.spontaneous_fish_traits[type]
+ for(var/trait_type in potential_spontaneous_traits)
+ if(!prob(potential_spontaneous_traits[trait_type]))
+ continue
+ var/datum/fish_trait/trait = GLOB.fish_traits[trait_type]
+ if(length(fish_traits & trait.incompatible_traits))
+ continue
+ fish_traits |= trait_type
+ incompatible_traits |= trait.incompatible_traits
+
for(var/trait_type in fish_traits)
var/datum/fish_trait/trait = GLOB.fish_traits[trait_type]
incompatible_traits |= trait.incompatible_traits
@@ -278,6 +281,8 @@
if(trait_type in incompatible_traits)
continue
var/datum/fish_trait/trait = GLOB.fish_traits[trait_type]
+ if(!isnull(trait.fish_whitelist) && !(type in trait.fish_whitelist))
+ continue
if(length(fish_traits & trait.incompatible_traits))
continue
if((trait_type in same_traits) ? prob(trait.inheritability) : prob(trait.diff_traits_inheritability))
@@ -447,10 +452,6 @@
if(health <= 0)
set_status(FISH_DEAD)
-
-//Fish breeding stops if fish count exceeds this.
-#define AQUARIUM_MAX_BREEDING_POPULATION 20
-
/obj/item/fish/proc/ready_to_reproduce(being_targeted = FALSE)
var/obj/structure/aquarium/aquarium = loc
if(!istype(aquarium))
@@ -461,8 +462,6 @@
return FALSE
return aquarium.allow_breeding && health >= initial(health) * 0.8 && stable_population > 1 && world.time >= breeding_wait
-#undef AQUARIUM_MAX_BREEDING_POPULATION
-
/obj/item/fish/proc/try_to_reproduce()
var/obj/structure/aquarium/aquarium = loc
if(!istype(aquarium))
diff --git a/code/modules/fishing/fish/chasm_detritus.dm b/code/modules/fishing/fish/chasm_detritus.dm
index 8d6653781595f3..ea9fcb4775770d 100644
--- a/code/modules/fishing/fish/chasm_detritus.dm
+++ b/code/modules/fishing/fish/chasm_detritus.dm
@@ -24,27 +24,30 @@ GLOBAL_LIST_INIT_TYPED(chasm_detritus_types, /datum/chasm_detritus, init_chasm_d
/// Stuff which you can always fish up even if nothing fell into a hole. Associative by type.
var/static/list/default_contents = list(
NORMAL_CONTENTS = list(
- /obj/item/stack/sheet/bone = 3,
- /obj/item/stack/ore/slag = 2,
+ /obj/item/stack/sheet/bone = 6,
+ /obj/item/stack/ore/slag = 4,
+ /obj/effect/mob_spawn/corpse/human/skeleton = 2,
/mob/living/basic/mining/lobstrosity/lava = 1,
- /obj/effect/mob_spawn/corpse/human/skeleton = 1,
+ /mob/living/basic/mining/lobstrosity/juvenile/lava = 1,
),
BODIES_ONLY = list(
- /obj/effect/mob_spawn/corpse/human/skeleton = 3,
+ /obj/effect/mob_spawn/corpse/human/skeleton = 6,
/mob/living/basic/mining/lobstrosity/lava = 1,
+ /mob/living/basic/mining/lobstrosity/juvenile/lava = 1,
),
NO_CORPSES = list(
- /obj/item/stack/sheet/bone = 14,
- /obj/item/stack/ore/slag = 10,
+ /obj/item/stack/sheet/bone = 28,
+ /obj/item/stack/ore/slag = 20,
/mob/living/basic/mining/lobstrosity/lava = 1,
+ /mob/living/basic/mining/lobstrosity/juvenile/lava = 1,
),
)
-/datum/chasm_detritus/proc/dispense_detritus(mob/fisherman, turf/fishing_spot)
+/datum/chasm_detritus/proc/dispense_detritus(atom/spawn_location, turf/fishing_spot)
if(prob(default_contents_chance))
var/default_spawn = pick(default_contents[default_contents_key])
- return new default_spawn(get_turf(fisherman))
- return find_chasm_contents(fishing_spot, get_turf(fisherman))
+ return new default_spawn(spawn_location)
+ return find_chasm_contents(fishing_spot, spawn_location)
/// Returns the chosen detritus from the given list of things to choose from
/datum/chasm_detritus/proc/determine_detritus(list/chasm_stuff)
diff --git a/code/modules/fishing/fish/fish_evolution.dm b/code/modules/fishing/fish/fish_evolution.dm
index c04ef2c30796d2..e6e2f1d9570ac4 100644
--- a/code/modules/fishing/fish/fish_evolution.dm
+++ b/code/modules/fishing/fish/fish_evolution.dm
@@ -88,7 +88,7 @@ GLOBAL_LIST_INIT(fish_evolutions, init_subtypes_w_path_keys(/datum/fish_evolutio
conditions_note = "The fish (and its mate) need to be unusually big both in size and weight."
/datum/fish_evolution/mastodon/check_conditions(obj/item/fish/source, obj/item/fish/mate, obj/structure/aquarium/aquarium)
- if((source.size < 144 || source.weight < 4000) || (mate && (mate.size < 144 || mate.weight < 4000)))
+ if((source.size < 120 || source.weight < 3000) || (mate && (mate.size < 120 || mate.weight < 3000)))
return FALSE
return ..()
diff --git a/code/modules/fishing/fish/fish_traits.dm b/code/modules/fishing/fish/fish_traits.dm
index 67804cba9fcd15..76b0cc8691c21c 100644
--- a/code/modules/fishing/fish/fish_traits.dm
+++ b/code/modules/fishing/fish/fish_traits.dm
@@ -1,5 +1,26 @@
+///A global list of singleton fish traits by their paths
GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list()))
+/**
+ * A nested list of fish types and traits that they can spontaneously manifest with associated probabilities
+ * e.g. list(/obj/item/fish = list(/datum/fish_trait = 100), etc...)
+ */
+GLOBAL_LIST_INIT(spontaneous_fish_traits, populate_spontaneous_fish_traits())
+
+/proc/populate_spontaneous_fish_traits()
+ var/list/list = list()
+ for(var/trait_path as anything in GLOB.fish_traits)
+ var/datum/fish_trait/trait = GLOB.fish_traits[trait_path]
+ if(isnull(trait.spontaneous_manifest_types))
+ continue
+ var/list/trait_typecache = zebra_typecacheof(trait.spontaneous_manifest_types) - /obj/item/fish
+ for(var/fish_type in trait_typecache)
+ var/trait_prob = trait_typecache[fish_type]
+ if(!trait_prob)
+ continue
+ LAZYSET(list[fish_type], trait_path, trait_typecache[fish_type])
+ return list
+
/datum/fish_trait
var/name = "Unnamed Trait"
/// Description of the trait in the fishing catalog and scanner
@@ -10,8 +31,10 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list(
var/inheritability = 100
/// Same as above, but for when only one has it.
var/diff_traits_inheritability = 50
- /// fishes of types within this list are granted to have this trait, no matter the probability
- var/list/guaranteed_inheritance_types
+ /// A list of fish types and traits that they can spontaneously manifest with associated probabilities
+ var/list/spontaneous_manifest_types
+ /// An optional whitelist of fish that can get this trait
+ var/list/fish_whitelist
/// Depending on the value, fish with trait will be reported as more or less difficult in the catalog.
var/added_difficulty = 0
@@ -33,6 +56,15 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list(
/datum/fish_trait/proc/apply_to_fish(obj/item/fish/fish)
return
+/// Applies some special qualities to basic mobs generated by fish (i.e. chasm chrab --> young lobstrosity --> lobstrosity).
+/datum/fish_trait/proc/apply_to_mob(mob/living/basic/mob)
+ SHOULD_CALL_PARENT(TRUE)
+ RegisterSignal(mob, COMSIG_MOB_CHANGED_TYPE, PROC_REF(on_transformed))
+
+/datum/fish_trait/proc/on_transformed(mob/source, mob/desired_mob)
+ SIGNAL_HANDLER
+ apply_to_mob(desired_mob)
+
/// Proc used by both the predator and necrophage traits.
/datum/fish_trait/proc/eat_fish(obj/item/fish/predator, obj/item/fish/prey)
predator.last_feeding = world.time
@@ -41,6 +73,12 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list(
SEND_SIGNAL(prey, COMSIG_FISH_EATEN_BY_OTHER_FISH, predator)
qdel(prey)
+/// Proc that inserts a reagent to the grind_results list of the fish. You'll still have to set the processed comsig proc yourself.
+/datum/fish_trait/proc/add_to_reagents(obj/item/fish/fish, reagent_type, amount)
+ LAZYINITLIST(fish.grind_results)
+ fish.grind_results.Insert(1, reagent_type)
+ fish.grind_results[reagent_type] = amount
+
/datum/fish_trait/wary
name = "Wary"
catalog_description = "This fish will avoid visible fish lines, cloaked line recommended."
@@ -98,9 +136,38 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list(
if(light_amount > SHADOW_SPECIES_LIGHT_THRESHOLD)
source.adjust_health(source.health - 0.5 * seconds_per_tick)
+/datum/fish_trait/nocturnal/apply_to_mob(mob/living/basic/mob)
+ . = ..()
+ // Make sure the mob can also ee in the dark
+ mob.lighting_cutoff_red = min(mob.lighting_cutoff_red, 20)
+ mob.lighting_cutoff_green = min(mob.lighting_cutoff_green, 20)
+ mob.lighting_cutoff_blue = min(mob.lighting_cutoff_blue, 20)
+ mob.update_sight()
+
+ RegisterSignal(mob, COMSIG_LIVING_HANDLE_BREATHING, PROC_REF(on_non_stasis_life))
+
+/datum/fish_trait/nocturnal/proc/on_non_stasis_life(mob/living/basic/mob, seconds_per_tick = SSMOBS_DT)
+ SIGNAL_HANDLER
+ var/turf/our_turf = mob.loc
+ if(!isturf(our_turf))
+ return
+ var/light_amount = our_turf.get_lumcount()
+
+ if (light_amount < SHADOW_SPECIES_LIGHT_THRESHOLD) //heal in the dark
+ mob.apply_status_effect(/datum/status_effect/shadow_regeneration)
+
/datum/fish_trait/heavy
name = "Heavy"
- catalog_description = "This fish tends to stay near the waterbed.";
+ catalog_description = "This fish tends to stay near the waterbed."
+
+/datum/fish_trait/heavy/apply_to_mob(mob/living/basic/mob)
+ . = ..()
+ mob.add_movespeed_modifier(/datum/movespeed_modifier/heavy_fish)
+ mob.maxHealth *= 1.5
+ mob.health *= 1.5
+ mob.melee_damage_lower *= 1.3
+ mob.melee_damage_upper *= 1.3
+ mob.obj_damage *= 1.3
/datum/fish_trait/heavy/minigame_mod(obj/item/fishing_rod/rod, mob/fisherman, datum/fishing_challenge/minigame)
minigame.fish_idle_velocity -= 10
@@ -161,6 +228,22 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list(
source.adjust_health(source.health + 3 * seconds_per_tick)
source.last_feeding = world.time //it feeds on the emulsion!
+/datum/fish_trait/emulsijack/apply_to_mob(mob/living/basic/mob)
+ . = ..()
+ RegisterSignal(mob, COMSIG_LIVING_HANDLE_BREATHING, PROC_REF(on_non_stasis_life))
+
+/datum/fish_trait/emulsijack/proc/on_non_stasis_life(mob/living/basic/mob, seconds_per_tick = SSMOBS_DT)
+ SIGNAL_HANDLER
+ var/turf/open/our_turf = get_turf(mob)
+ if(our_turf.return_air().return_pressure() > ONE_ATMOSPHERE * 1.5) //put a cap otherwise closed spaces may overpressurize
+ return
+
+ var/datum/gas_mixture/stench = new
+ ADD_GAS(/datum/gas/miasma, stench.gases)
+ stench.gases[/datum/gas/miasma][MOLES] = MIASMA_CORPSE_MOLES * 2 * seconds_per_tick
+ stench.temperature = mob.bodytemperature
+ our_turf.assume_air(stench)
+
/datum/fish_trait/necrophage
name = "Necrophage"
catalog_description = "This fish will eat carcasses of dead fish when hungry."
@@ -205,7 +288,7 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list(
diff_traits_inheritability = 15
name = "Self-Revival"
catalog_description = "This fish shows a peculiar ability of reviving itself a minute or two after death."
- guaranteed_inheritance_types = list(/obj/item/fish/boned, /obj/item/fish/mastodon)
+ spontaneous_manifest_types = list(/obj/item/fish/boned = 100, /obj/item/fish/mastodon = 100)
/datum/fish_trait/revival/apply_to_fish(obj/item/fish/fish)
RegisterSignal(fish, COMSIG_FISH_STATUS_CHANGED, PROC_REF(check_status))
@@ -226,6 +309,10 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list(
else
source.visible_message(message)
+/datum/fish_trait/revival/apply_to_mob(mob/living/basic/mob)
+ . = ..()
+ mob.AddComponent(/datum/component/regenerator, regeneration_delay = 6 SECONDS, brute_per_second = 2 SECONDS, outline_colour = COLOR_BLUE)
+
/datum/fish_trait/predator
name = "Predator"
catalog_description = "It's a predatory fish. It'll hunt down and eat live fishes of smaller size when hungry."
@@ -254,7 +341,7 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list(
/datum/fish_trait/yucky/apply_to_fish(obj/item/fish/fish)
RegisterSignal(fish, COMSIG_ATOM_PROCESSED, PROC_REF(add_yuck))
ADD_TRAIT(fish, TRAIT_YUCKY_FISH, FISH_TRAIT_DATUM)
- LAZYSET(fish.grind_results, /datum/reagent/yuck, 3)
+ add_to_reagents(fish, /datum/reagent/yuck, 3)
/datum/fish_trait/yucky/proc/add_yuck(obj/item/fish/source, mob/living/user, obj/item/process_item, list/results)
var/amount = source.grind_results[/datum/reagent/yuck] / length(results)
@@ -269,12 +356,12 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list(
/datum/fish_trait/toxic/apply_to_fish(obj/item/fish/fish)
RegisterSignal(fish, COMSIG_ATOM_PROCESSED, PROC_REF(add_toxin))
RegisterSignal(fish, COMSIG_FISH_EATEN_BY_OTHER_FISH, PROC_REF(on_eaten))
- LAZYSET(fish.grind_results, /datum/reagent/toxin/tetrodotoxin, 0.5)
+ add_to_reagents(fish, /datum/reagent/toxin/tetrodotoxin, 2.5)
/datum/fish_trait/toxic/proc/add_toxin(obj/item/fish/source, mob/living/user, obj/item/process_item, list/results)
var/amount = source.grind_results[ /datum/reagent/toxin/tetrodotoxin] / length(results)
for(var/atom/result as anything in results)
- result.reagents?.add_reagent( /datum/reagent/toxin/tetrodotoxin, amount)
+ result.reagents?.add_reagent(/datum/reagent/toxin/tetrodotoxin, amount)
/datum/fish_trait/toxic/proc/on_eaten(obj/item/fish/source, obj/item/fish/predator)
if(HAS_TRAIT(predator, TRAIT_FISH_TOXIN_IMMUNE))
@@ -291,6 +378,10 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list(
if(source.status == FISH_DEAD)
UnregisterSignal(source, list(COMSIG_FISH_LIFE, COMSIG_FISH_STATUS_CHANGED))
+/datum/fish_trait/toxic/apply_to_mob(mob/living/basic/mob)
+ . = ..()
+ mob.AddElement(/datum/element/venomous, /datum/reagent/toxin/tetrodotoxin, 0.5 * mob.mob_size)
+
/datum/fish_trait/toxin_immunity
name = "Toxin Immunity"
catalog_description = "This fish has developed an ample-spected immunity to toxins."
@@ -335,13 +426,17 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list(
name = "Lubed"
inheritability = 90
diff_traits_inheritability = 45
- guaranteed_inheritance_types = list(/obj/item/fish/clownfish/lube)
- catalog_description = "This fish exudes a viscous, slippery lubrificant. It's reccomended not to step on it."
+ spontaneous_manifest_types = list(/obj/item/fish/clownfish/lube = 100)
+ catalog_description = "This fish exudes a viscous, slippery lubrificant. It's recommended not to step on it."
added_difficulty = 5
/datum/fish_trait/lubed/apply_to_fish(obj/item/fish/fish)
fish.AddComponent(/datum/component/slippery, 8 SECONDS, SLIDE|GALOSHES_DONT_HELP)
+/datum/fish_trait/lubed/apply_to_mob(mob/living/basic/mob)
+ . = ..()
+ mob.AddElement(/datum/element/lube_walking)
+
/datum/fish_trait/lubed/minigame_mod(obj/item/fishing_rod/rod, mob/fisherman, datum/fishing_challenge/minigame)
minigame.reeling_velocity *= 1.4
minigame.gravity_velocity *= 1.4
@@ -380,6 +475,11 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list(
/datum/fish_trait/antigrav/apply_to_fish(obj/item/fish/fish)
fish.AddElement(/datum/element/forced_gravity, NEGATIVE_GRAVITY)
+/datum/fish_trait/antigrav/apply_to_mob(mob/living/basic/mob)
+ . = ..()
+ mob.add_traits(list(TRAIT_FREE_HYPERSPACE_MOVEMENT, TRAIT_SPACEWALK), FISH_TRAIT_DATUM)
+ mob.AddElement(/datum/element/simple_flying)
+
///Anxiety means the fish will die if in a location with more than 3 fish (including itself)
///This is just barely enough to crossbreed out of anxiety, but it severely limits the potential of
/datum/fish_trait/anxiety
@@ -429,3 +529,20 @@ GLOBAL_LIST_INIT(fish_traits, init_subtypes_w_path_keys(/datum/fish_trait, list(
fish.attack_verb_continuous = fish::attack_verb_continuous
fish.attack_verb_simple = fish::attack_verb_simple
fish.hitsound = fish::hitsound
+
+/datum/fish_trait/electrogenesis/apply_to_mob(mob/living/basic/mob)
+ . = ..()
+ ADD_TRAIT(mob, TRAIT_SHOCKIMMUNE, FISH_TRAIT_DATUM)
+ mob.grant_actions_by_list(list(/datum/action/cooldown/mob_cooldown/charge_apc))
+ mob.AddElement(/datum/element/venomous, /datum/reagent/teslium, 3 * mob.mob_size)
+
+/datum/fish_trait/stunted
+ name = "Stunted Growth"
+ catalog_description = "This chrab's development is stunted, and will not properly reach adulthood."
+ spontaneous_manifest_types = list(/obj/item/fish/chasm_crab = 12, /obj/item/fish/chasm_crab/ice = 12)
+ fish_whitelist = list(/obj/item/fish/chasm_crab, /obj/item/fish/chasm_crab/ice)
+ diff_traits_inheritability = 40
+
+/datum/fish_trait/stunted/apply_to_mob(mob/living/basic/mob)
+ . = ..()
+ qdel(mob.GetComponent(/datum/component/growth_and_differentiation))
diff --git a/code/modules/fishing/fish/fish_types.dm b/code/modules/fishing/fish/fish_types.dm
index cc001560ee0a95..91c7bba5f3d9e3 100644
--- a/code/modules/fishing/fish/fish_types.dm
+++ b/code/modules/fishing/fish/fish_types.dm
@@ -243,7 +243,7 @@
required_temperature_min = MIN_AQUARIUM_TEMP+10
required_temperature_max = MIN_AQUARIUM_TEMP+32
-//Chasm fish
+/// Commonly found on the mining fishing spots. Can be grown into lobstrosities
/obj/item/fish/chasm_crab
name = "chasm chrab"
desc = "The young of the lobstrosity mature in pools below the earth, eating what falls in until large enough to clamber out. Those found near the station are well-fed."
@@ -270,17 +270,102 @@
evolution_types = list(/datum/fish_evolution/ice_chrab)
compatible_types = list(/obj/item/fish/chasm_crab/ice)
beauty = FISH_BEAUTY_GOOD
+ ///Chasm crabs mature into juveline lobstrositiess with time. This is the progess from 0 to 100
+ var/maturation = 0
+ ///This value represents how much the crab needs aren't being met. Higher values translate to a more likely hostile lobstrosity.
+ var/anger = 0
+ ///The lobstrosity type this matures into
+ var/lob_type = /mob/living/basic/mining/lobstrosity/juvenile/lava
+ ///at which rate the crab gains maturation
+ var/growth_rate = 100 / (12 MINUTES) * 10
+
+///A chasm crab growth speed is determined by its initial weight and size, ergo bigger crabs for faster lobstrosities
+/obj/item/fish/chasm_crab/update_size_and_weight(new_size = average_size, new_weight = average_weight)
+ . = ..()
+ var/multiplier = 1
+ switch(size)
+ if(0 to FISH_SIZE_TINY_MAX)
+ multiplier -= 0.2
+ if(FISH_SIZE_SMALL_MAX to FISH_SIZE_NORMAL_MAX)
+ multiplier += 0.2
+ if(FISH_SIZE_NORMAL_MAX to FISH_SIZE_BULKY_MAX)
+ multiplier += 0.5
+ if(FISH_SIZE_BULKY_MAX to INFINITY)
+ multiplier += 0.8
+
+ if(weight <= 800)
+ multiplier -= 0.1 * round((1000 - weight) / 200)
+ else if(weight >= 1500)
+ multiplier += min(0.1 * round((weight - 1000) / 500), 2)
+
+ growth_rate = initial(growth_rate) * multiplier
+
+/obj/item/fish/chasm_crab/process(seconds_per_tick)
+ . = ..()
+ grow_up(seconds_per_tick)
+
+///Slowly grow up each process tick (in an aquarium). This is its own proc so that it can be used in the unit test.
+/obj/item/fish/chasm_crab/proc/grow_up(seconds_per_tick)
+ var/hunger = CLAMP01((world.time - last_feeding) / feeding_frequency)
+ if(health <= initial(health) * 0.6 || hunger >= 0.6) //if too hurt or hungry, don't grow.
+ anger += growth_rate * 2 * seconds_per_tick
+ return
+
+ if(!isaquarium(loc)) //can't grow outside an aquarium.
+ return
+
+ var/obj/structure/aquarium/aquarium = loc
+ if(!aquarium.allow_breeding) //the aquarium has breeding disabled
+ return
+ if(hunger >= 0.4) //I'm hungry and angry
+ anger += growth_rate * 0.6 * seconds_per_tick
+ if(!locate(/obj/item/aquarium_prop) in aquarium) //the aquarium deco is quite barren
+ anger += growth_rate * 0.25 * seconds_per_tick
+ var/fish_count = length(aquarium.get_fishes())
+ if(!ISINRANGE(fish_count, 3, AQUARIUM_MAX_BREEDING_POPULATION * 0.5)) //too lonely or overcrowded
+ anger += growth_rate * 0.3 * seconds_per_tick
+ if(fish_count <= AQUARIUM_MAX_BREEDING_POPULATION * 0.5) //check if there's enough room to maturate.
+ maturation += growth_rate * seconds_per_tick
+
+ if(maturation >= 100)
+ return finish_growing()
+
+///spawn a juvenile lobstrosity on the aquarium turf
+/obj/item/fish/chasm_crab/proc/finish_growing()
+ var/mob/living/basic/mining/lobstrosity/juvenile/lob = new lob_type(get_turf(src))
+ for(var/trait_type in fish_traits)
+ var/datum/fish_trait/trait = GLOB.fish_traits[trait_type]
+ trait.apply_to_mob(lob)
+ if(!prob(anger))
+ lob.AddElement(/datum/element/ai_retaliate)
+ qdel(lob.ai_controller)
+ lob.ai_controller = new /datum/ai_controller/basic_controller/lobstrosity/juvenile/calm(lob)
+ else if(anger < 30) //not really that mad, just a bit unstable.
+ qdel(lob.ai_controller)
+ lob.ai_controller = new /datum/ai_controller/basic_controller/lobstrosity/juvenile/capricious(lob)
+
+ animate(lob, pixel_y = 18, time = 0.4 SECONDS, flags = ANIMATION_RELATIVE, easing = CUBIC_EASING|EASE_OUT)
+ animate(pixel_y = -18, time = 0.4 SECONDS, flags = ANIMATION_RELATIVE, easing = CUBIC_EASING|EASE_IN)
+ loc.visible_message(span_boldnotice("\A [lob] jumps out of [loc]!"))
+ playsound(loc, 'sound/effects/fish_splash.ogg', 60)
+
+ ///make sure it moves the next tick so that it properly glides to the next location after jumping off the aquarium.
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(random_step), lob, 1, 100), 0.1 SECONDS)
+
+ qdel(src)
+ return lob
/obj/item/fish/chasm_crab/ice
name = "arctic chrab"
desc = "A subspecies of chasm chrabs that has adapted to the cold climate and lack of abysmal holes of the icemoon."
icon_state = "arctic_chrab"
- dedicated_in_aquarium_icon_state = "ice_chrab_small"
+ dedicated_in_aquarium_icon_state = "arctic_chrab_small"
required_temperature_min = ICEBOX_MIN_TEMPERATURE-20
required_temperature_max = MIN_AQUARIUM_TEMP+15
evolution_types = list(/datum/fish_evolution/chasm_chrab)
compatible_types = list(/obj/item/fish/chasm_crab)
beauty = FISH_BEAUTY_GREAT
+ lob_type = /mob/living/basic/mining/lobstrosity/juvenile
/obj/item/fish/donkfish
name = "donk co. company patent donkfish"
@@ -317,7 +402,7 @@
sprite_height = 5
stable_population = 12
average_size = 110
- average_weight = 10000
+ average_weight = 6000
random_case_rarity = FISH_RARITY_GOOD_LUCK_FINDING_THIS
required_temperature_min = MIN_AQUARIUM_TEMP+10
required_temperature_max = MIN_AQUARIUM_TEMP+30
@@ -424,7 +509,7 @@
min_pressure = HAZARD_LOW_PRESSURE
health = 150
stable_population = 3
- grind_results = list(/datum/reagent/bone_dust = 20)
+ grind_results = list(/datum/reagent/bone_dust = 10)
fillet_type = /obj/item/stack/sheet/bone
num_fillets = 2
fish_traits = list(/datum/fish_trait/revival, /datum/fish_trait/carnivore)
@@ -452,7 +537,7 @@
min_pressure = HAZARD_LOW_PRESSURE
health = 300
stable_population = 2 //This means they can only crossbreed.
- grind_results = list(/datum/reagent/bone_dust = 15, /datum/reagent/consumable/liquidgibs = 5)
+ grind_results = list(/datum/reagent/bone_dust = 5, /datum/reagent/consumable/liquidgibs = 5)
fillet_type = /obj/item/stack/sheet/bone
num_fillets = 2
feeding_frequency = 2 MINUTES
@@ -565,7 +650,7 @@
safe_air_limits = null
min_pressure = 0
max_pressure = INFINITY
- grind_results = list(/datum/reagent/bluespace = 10, /datum/reagent/consumable/liquidgibs = 5)
+ grind_results = list(/datum/reagent/bluespace = 10)
fillet_type = null
fish_traits = list(/datum/fish_trait/antigrav, /datum/fish_trait/mixotroph)
beauty = FISH_BEAUTY_GREAT
diff --git a/code/modules/fishing/fishing_minigame.dm b/code/modules/fishing/fishing_minigame.dm
index 45739b79399e41..0a6b6b7cc87a96 100644
--- a/code/modules/fishing/fishing_minigame.dm
+++ b/code/modules/fishing/fishing_minigame.dm
@@ -183,7 +183,7 @@
special_effects |= FISHING_MINIGAME_RULE_KILL
if(special_effects & FISHING_MINIGAME_RULE_KILL && ispath(reward_path,/obj/item/fish))
- RegisterSignal(user, COMSIG_MOB_FISHING_REWARD_DISPENSED, PROC_REF(hurt_fish))
+ RegisterSignal(comp.fish_source, COMSIG_FISH_SOURCE_REWARD_DISPENSED, PROC_REF(hurt_fish))
difficulty += comp.fish_source.calculate_difficulty(reward_path, rod, user, src)
difficulty = clamp(round(difficulty), 1, 100)
diff --git a/code/modules/fishing/fishing_rod.dm b/code/modules/fishing/fishing_rod.dm
index 6ee02d6d9de4d7..e6ac4bac8abae0 100644
--- a/code/modules/fishing/fishing_rod.dm
+++ b/code/modules/fishing/fishing_rod.dm
@@ -71,6 +71,7 @@
. = ..()
if(currently_hooked)
context[SCREENTIP_CONTEXT_LMB] = "Reel in"
+ context[SCREENTIP_CONTEXT_RMB] = "Unhook"
return CONTEXTUAL_SCREENTIP_SET
return NONE
@@ -212,6 +213,16 @@
cast_line(interacting_with, user)
return ITEM_INTERACT_SUCCESS
+/obj/item/fishing_rod/interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers)
+ return ranged_interact_with_atom_secondary(interacting_with, user, modifiers)
+
+/obj/item/fishing_rod/ranged_interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers)
+ //Stop reeling, delete the fishing line
+ if(currently_hooked)
+ QDEL_NULL(fishing_line)
+ return ITEM_INTERACT_BLOCKING
+ return ..()
+
/// If the line to whatever that is is clear and we're not already busy, try fishing in it
/obj/item/fishing_rod/proc/cast_line(atom/target, mob/user)
if(casting || currently_hooked)
@@ -219,9 +230,6 @@
if(!hook)
balloon_alert(user, "install a hook first!")
return
- if(!CheckToolReach(user, target, cast_range))
- balloon_alert(user, "cannot reach there!")
- return
if(!COOLDOWN_FINISHED(src, casting_cd))
return
casting = TRUE
@@ -580,21 +588,21 @@
transform = transform.Scale(1, -1)
return ..()
-/obj/projectile/fishing_cast/Impact(atom/hit_atom)
+/obj/projectile/fishing_cast/on_hit(atom/target, blocked = 0, pierce_hit)
. = ..()
- owner.hook_hit(hit_atom)
- qdel(src)
+ if(blocked < 100)
+ QDEL_NULL(our_line) //we need to delete the old beam datum, otherwise it won't let you fish.
+ owner.hook_hit(target)
/obj/projectile/fishing_cast/fire(angle, atom/direct_target)
. = ..()
our_line = owner.create_fishing_line(src)
/obj/projectile/fishing_cast/Destroy()
- . = ..()
QDEL_NULL(our_line)
owner?.casting = FALSE
-
-
+ owner = null
+ return ..()
/datum/beam/fishing_line
// Is the fishing rod held in left side hand
diff --git a/code/modules/fishing/sources/_fish_source.dm b/code/modules/fishing/sources/_fish_source.dm
index 3c94ff8277d94d..602975ed75a00b 100644
--- a/code/modules/fishing/sources/_fish_source.dm
+++ b/code/modules/fishing/sources/_fish_source.dm
@@ -53,6 +53,10 @@ GLOBAL_LIST_INIT(specific_fish_icons, zebra_typecacheof(list(
var/catalog_description
/// Background image name from /datum/asset/simple/fishing_minigame
var/background = "background_default"
+ /// It true, repeated and large explosions won't be as efficient. This is usually meant for global fish sources.
+ var/explosive_malus = FALSE
+ /// If explosive_malus is true, this will be used to keep track of the turfs where an explosion happened for when we'll spawn the loot.
+ var/list/exploded_turfs
/datum/fish_source/New()
if(!PERFORM_ALL_TESTS(focus_only/fish_sources_tables))
@@ -61,6 +65,10 @@ GLOBAL_LIST_INIT(specific_fish_icons, zebra_typecacheof(list(
if(!(path in fish_table))
stack_trace("path [path] found in the 'fish_counts' list but not in the fish_table one of [type]")
+/datum/fish_source/Destroy()
+ exploded_turfs = null
+ return ..()
+
///Called when src is set as the fish source of a fishing spot component
/datum/fish_source/proc/on_fishing_spot_init(/datum/component/fishing_spot/spot)
return
@@ -166,13 +174,7 @@ GLOBAL_LIST_INIT(specific_fish_icons, zebra_typecacheof(list(
/// Gives out the reward if possible
/datum/fish_source/proc/dispense_reward(reward_path, mob/fisherman, turf/fishing_spot)
- if((reward_path in fish_counts)) // This is limited count result
- fish_counts[reward_path] -= 1
- if(!fish_counts[reward_path])
- fish_counts -= reward_path //Ran out of these since rolling (multiple fishermen on same source most likely)
- fish_table -= reward_path
-
- var/atom/movable/reward = spawn_reward(reward_path, fisherman, fishing_spot)
+ var/atom/movable/reward = simple_dispense_reward(reward_path, get_turf(fisherman), fishing_spot)
if(!reward) //balloon alert instead
fisherman.balloon_alert(fisherman, pick(duds))
return
@@ -185,18 +187,31 @@ GLOBAL_LIST_INIT(specific_fish_icons, zebra_typecacheof(list(
INVOKE_ASYNC(reward, TYPE_PROC_REF(/atom/movable, forceMove), get_turf(fisherman))
fisherman.balloon_alert(fisherman, "caught [reward]!")
- SEND_SIGNAL(fisherman, COMSIG_MOB_FISHING_REWARD_DISPENSED, reward)
+ return reward
+
+///Simplified version of dispense_reward that doesn't need a fisherman.
+/datum/fish_source/proc/simple_dispense_reward(reward_path, atom/spawn_location, turf/fishing_spot)
+ if(isnull(reward_path))
+ return null
+ if((reward_path in fish_counts)) // This is limited count result
+ fish_counts[reward_path] -= 1
+ if(!fish_counts[reward_path])
+ fish_counts -= reward_path //Ran out of these since rolling (multiple fishermen on same source most likely)
+ fish_table -= reward_path
+
+ var/atom/movable/reward = spawn_reward(reward_path, spawn_location, fishing_spot)
+ SEND_SIGNAL(src, COMSIG_FISH_SOURCE_REWARD_DISPENSED, reward)
return reward
/// Spawns a reward from a atom path right where the fisherman is. Part of the dispense_reward() logic.
-/datum/fish_source/proc/spawn_reward(reward_path, mob/fisherman, turf/fishing_spot)
+/datum/fish_source/proc/spawn_reward(reward_path, atom/spawn_location, turf/fishing_spot)
if(reward_path == FISHING_DUD)
return
if(ispath(reward_path, /datum/chasm_detritus))
- return GLOB.chasm_detritus_types[reward_path].dispense_detritus(fisherman, fishing_spot)
+ return GLOB.chasm_detritus_types[reward_path].dispense_detritus(spawn_location, fishing_spot)
if(!ispath(reward_path, /atom/movable))
CRASH("Unsupported /datum path [reward_path] passed to fish_source/proc/spawn_reward()")
- var/atom/movable/reward = new reward_path(get_turf(fisherman))
+ var/atom/movable/reward = new reward_path(spawn_location)
if(isfish(reward))
var/obj/item/fish/caught_fish = reward
caught_fish.randomize_size_and_weight()
@@ -310,9 +325,43 @@ GLOBAL_LIST(fishing_property_cache)
highest_fish_weight = fish_weight
for(var/fish in collected_fish_weights)
- var/difference = collected_fish_weights[fish] - highest_fish_weight
+ var/difference = highest_fish_weight - collected_fish_weights[fish]
if(!difference)
continue
final_table[fish] += round(difference**leveling_exponent, 1)
return final_table
+
+/datum/fish_source/proc/spawn_reward_from_explosion(atom/location, severity)
+ if(!explosive_malus)
+ explosive_spawn(location, severity)
+ return
+ if(isnull(exploded_turfs))
+ exploded_turfs = list()
+ addtimer(CALLBACK(src, PROC_REF(post_explosion_spawn)), 1) //run this the next tick.
+ var/turf/turf = get_turf(location)
+ var/peak_severity = max(exploded_turfs[turf], severity)
+ exploded_turfs[turf] = peak_severity
+
+/datum/fish_source/proc/post_explosion_spawn()
+ var/multiplier = 1/(length(exploded_turfs)**0.5)
+ for(var/turf/turf as anything in exploded_turfs)
+ explosive_spawn(turf, exploded_turfs[turf], multiplier)
+ exploded_turfs = null
+
+/datum/fish_source/proc/explosive_spawn(location, severity, multiplier = 1)
+ for(var/i in 1 to (severity + 2))
+ if(!prob((100 + 100 * severity)/i * multiplier))
+ continue
+ var/reward_loot = pick_weight(fish_table)
+ var/atom/movable/reward = simple_dispense_reward(reward_loot, location, location)
+ if(isnull(reward))
+ continue
+ if(isfish(reward))
+ var/obj/item/fish/fish = reward
+ fish.set_status(FISH_DEAD)
+ if(isitem(reward))
+ reward.pixel_x = rand(-9, 9)
+ reward.pixel_y = rand(-9, 9)
+ if(severity >= EXPLODE_DEVASTATE)
+ reward.ex_act(EXPLODE_LIGHT)
diff --git a/code/modules/fishing/sources/source_types.dm b/code/modules/fishing/sources/source_types.dm
index 9328f87be69053..583aa3e3e7ea9d 100644
--- a/code/modules/fishing/sources/source_types.dm
+++ b/code/modules/fishing/sources/source_types.dm
@@ -14,6 +14,7 @@
/obj/item/fish/clownfish/lube = 2,
)
fishing_difficulty = FISHING_DEFAULT_DIFFICULTY + 5
+ explosive_malus = TRUE
/datum/fish_source/ocean/beach
catalog_description = "Beach shore water"
@@ -159,7 +160,7 @@
challenge.special_effects |= effect
///Cherry on top, fish caught from the randomizer portal also have (almost completely) random traits
-/datum/fish_source/portal/random/spawn_reward(reward_path, mob/fisherman, turf/fishing_spot)
+/datum/fish_source/portal/random/spawn_reward(reward_path, atom/movable/spawn_location, turf/fishing_spot)
if(!ispath(reward_path, /obj/item/fish))
return ..()
@@ -170,16 +171,11 @@
var/datum/fish_trait/trait = GLOB.fish_traits[trait_type]
weighted_traits[trait.type] = round(trait.inheritability**2/100)
- var/obj/item/fish/caught_fish = new reward_path(get_turf(fisherman), FALSE)
- var/list/fixed_traits = list()
- for(var/trait_type in caught_fish.fish_traits)
- var/datum/fish_trait/trait = GLOB.fish_traits[trait_type]
- if(caught_fish.type in trait.guaranteed_inheritance_types)
- fixed_traits += trait_type
+ var/obj/item/fish/caught_fish = new reward_path(spawn_location, FALSE)
var/list/new_traits = list()
for(var/iteration in rand(1, 4))
new_traits |= pick_weight(weighted_traits)
- caught_fish.inherit_traits(new_traits, fixed_traits = fixed_traits)
+ caught_fish.inherit_traits(new_traits)
caught_fish.randomize_size_and_weight(deviation = 0.3)
caught_fish.progenitors = full_capitalize(caught_fish.name)
return caught_fish
@@ -211,7 +207,8 @@
return rod.hook.chasm_detritus_type
-/datum/fish_source/chasm
+/datum/fish_source/chasm/spawn_reward_from_explosion(atom/location, severity)
+ return //Spawned content would immediately fall back into the chasm, so it wouldn't matter.
/datum/fish_source/lavaland
catalog_description = "Lava vents"
@@ -228,6 +225,7 @@
)
fishing_difficulty = FISHING_DEFAULT_DIFFICULTY + 10
+ explosive_malus = TRUE
/datum/fish_source/lavaland/reason_we_cant_fish(obj/item/fishing_rod/rod, mob/fisherman, atom/parent)
. = ..()
@@ -241,14 +239,15 @@
catalog_description = "Liquid plasma vents"
fish_table = list(
FISHING_DUD = 5,
- /obj/item/fish/chasm_crab/ice = 15,
- /obj/item/fish/lavaloop/plasma_river = 15,
- /obj/item/coin/plasma = 3,
- /obj/item/stack/ore/plasma = 3,
+ /obj/item/fish/chasm_crab/ice = 30,
+ /obj/item/fish/lavaloop/plasma_river = 30,
+ /obj/item/coin/plasma = 6,
+ /obj/item/stack/ore/plasma = 6,
+ /obj/effect/decal/remains/plasma = 2,
+ /obj/item/stack/sheet/mineral/runite = 2,
+ /obj/item/stack/sheet/mineral/adamantine = 2,
/mob/living/basic/mining/lobstrosity = 1,
- /obj/effect/decal/remains/plasma = 1,
- /obj/item/stack/sheet/mineral/runite = 1,
- /obj/item/stack/sheet/mineral/adamantine = 1,
+ /mob/living/basic/mining/lobstrosity/juvenile = 1,
)
fish_counts = list(
/obj/item/stack/sheet/mineral/adamantine = 3,
@@ -360,6 +359,15 @@
return ..()
+/datum/fish_source/hydro_tray/spawn_reward_from_explosion(atom/location, severity)
+ if(!istype(location, /obj/machinery/hydroponics/constructable))
+ return ..()
+
+ var/obj/machinery/hydroponics/constructable/basin = location
+ if(basin.myseed || basin.waterlevel <= 0)
+ return
+ return ..()
+
/datum/fish_source/hydro_tray/spawn_reward(reward_path, mob/fisherman, turf/fishing_spot)
if(reward_path != RANDOM_SEED)
var/mob/living/created_reward = ..()
diff --git a/code/modules/food_and_drinks/machinery/deep_fryer.dm b/code/modules/food_and_drinks/machinery/deep_fryer.dm
index 60efe0627aec8f..f698ebe39e0e4d 100644
--- a/code/modules/food_and_drinks/machinery/deep_fryer.dm
+++ b/code/modules/food_and_drinks/machinery/deep_fryer.dm
@@ -38,6 +38,12 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list(
var/frying_fried = FALSE
/// Has our currently frying object been burnt?
var/frying_burnt = FALSE
+ /// How dirty the fryer is - show overlay at 1
+ var/grease_level = 0
+ /// The chance (%) of grease_level increase on process()
+ var/grease_increase_chance = 50
+ /// The amount of grease_level increase on process()
+ var/grease_Increase_amount = 0.1
/// Our sound loop for the frying sounde effect.
var/datum/looping_sound/deep_fryer/fry_loop
@@ -56,6 +62,7 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list(
create_reagents(50, OPENCONTAINER)
reagents.add_reagent(/datum/reagent/consumable/nutriment/fat/oil, 25)
fry_loop = new(src, FALSE)
+ RegisterSignal(src, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(on_cleaned))
/obj/machinery/deepfryer/Destroy()
QDEL_NULL(fry_loop)
@@ -75,6 +82,11 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list(
oil_use = initial(oil_use) - (oil_efficiency * 0.00475)
fry_speed = oil_efficiency
+/obj/machinery/deepfryer/update_overlays()
+ . = ..()
+ if(grease_level >= 1)
+ . += "fryer_greasy"
+
/obj/machinery/deepfryer/examine(mob/user)
. = ..()
if(frying)
@@ -140,6 +152,8 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list(
return
reagents.trans_to(frying, oil_use * seconds_per_tick, multiplier = fry_speed * 3) //Fried foods gain more of the reagent thanks to space magic
+ grease_level += prob(grease_increase_chance) * grease_Increase_amount
+
cook_time += fry_speed * seconds_per_tick
if(cook_time >= DEEPFRYER_COOKTIME && !frying_fried)
frying_fried = TRUE //frying... frying... fried
@@ -169,7 +183,9 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list(
frying_burnt = FALSE
fry_loop.stop()
cook_time = 0
+ flick("fryer_stop", src)
icon_state = "fryer_off"
+ update_appearance(UPDATE_OVERLAYS)
/obj/machinery/deepfryer/proc/start_fry(obj/item/frying_item, mob/user)
to_chat(user, span_notice("You put [frying_item] into [src]."))
@@ -188,6 +204,7 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list(
ADD_TRAIT(frying, TRAIT_FOOD_CHEF_MADE, REF(user.mind))
SEND_SIGNAL(frying, COMSIG_ITEM_ENTERED_FRYER)
+ flick("fryer_start", src)
icon_state = "fryer_on"
fry_loop.start()
@@ -234,5 +251,9 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list(
user.changeNext_move(CLICK_CD_MELEE)
return ..()
+/obj/machinery/deepfryer/proc/on_cleaned(obj/source_component, obj/source)
+ grease_level = 0
+ update_appearance(UPDATE_OVERLAYS)
+
#undef DEEPFRYER_COOKTIME
#undef DEEPFRYER_BURNTIME
diff --git a/code/modules/food_and_drinks/machinery/icecream_vat.dm b/code/modules/food_and_drinks/machinery/icecream_vat.dm
index 8b0c8eb14a5cad..355601693b9d2b 100644
--- a/code/modules/food_and_drinks/machinery/icecream_vat.dm
+++ b/code/modules/food_and_drinks/machinery/icecream_vat.dm
@@ -75,13 +75,15 @@
RegisterSignal(src, COMSIG_ATOM_REAGENT_EXAMINE, PROC_REF(allow_reagent_scan))
- create_reagents(300, NO_REACT|TRANSPARENT)
+ var/ice_cream_day = check_holidays(ICE_CREAM_DAY) //ice cream vats are more "robust" on this holiday
+
+ create_reagents(ice_cream_day ? 400 : 300, NO_REACT|TRANSPARENT)
reagents.chem_temp = T0C //So ice doesn't melt
register_context()
if(preinstall_reagents)
for(var/reagent in icecream_vat_reagents)
- reagents.add_reagent(reagent, icecream_vat_reagents[reagent], reagtemp = T0C)
+ reagents.add_reagent(reagent, icecream_vat_reagents[reagent] * (ice_cream_day ? 2.5 : 1), reagtemp = T0C)
/obj/machinery/icecream_vat/Exited(atom/movable/gone, direction)
. = ..()
diff --git a/code/modules/food_and_drinks/machinery/microwave.dm b/code/modules/food_and_drinks/machinery/microwave.dm
index bc5adfbd0f9515..2b790306b5ac74 100644
--- a/code/modules/food_and_drinks/machinery/microwave.dm
+++ b/code/modules/food_and_drinks/machinery/microwave.dm
@@ -112,7 +112,6 @@
/obj/machinery/microwave/Destroy()
QDEL_LIST(ingredients)
- QDEL_NULL(wires)
QDEL_NULL(soundloop)
QDEL_NULL(particles)
if(!isnull(cell))
@@ -382,6 +381,9 @@
if(operating)
return NONE
+ if (item.item_flags & ABSTRACT)
+ return NONE
+
if(broken > NOT_BROKEN)
balloon_alert(user, "it's broken!")
return ITEM_INTERACT_BLOCKING
diff --git a/code/modules/food_and_drinks/machinery/processor.dm b/code/modules/food_and_drinks/machinery/processor.dm
index 68095fcd4af1da..03b99f49ef734c 100644
--- a/code/modules/food_and_drinks/machinery/processor.dm
+++ b/code/modules/food_and_drinks/machinery/processor.dm
@@ -238,8 +238,10 @@
processed_slime.forceMove(drop_location())
processed_slime.balloon_alert_to_viewers("crawls free")
return
+
var/core_count = processed_slime.cores
- for(var/i in 1 to (core_count+rating_amount-1))
+ var/extra_cores = rating_amount - 1 // 0-3 bonus cores above what slime already has with upgraded parts
+ for(var/i in 1 to (core_count + extra_cores))
var/atom/movable/item = new processed_slime.slime_type.core_type(drop_location())
adjust_item_drop_location(item)
SSblackbox.record_feedback("tally", "slime_core_harvested", 1, processed_slime.slime_type.colour)
diff --git a/code/modules/food_and_drinks/machinery/smartfridge.dm b/code/modules/food_and_drinks/machinery/smartfridge.dm
index bd06c179d33e95..3519c55fc39aca 100644
--- a/code/modules/food_and_drinks/machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/machinery/smartfridge.dm
@@ -5,8 +5,8 @@
name = "smartfridge"
desc = "Keeps cold things cold and hot things cold."
icon = 'icons/obj/machines/smartfridge.dmi'
- icon_state = "smartfridge"
- base_icon_state = "plant"
+ icon_state = "smartfridge-icon"
+ base_icon_state = "smartfridge"
layer = BELOW_OBJ_LAYER
density = TRUE
circuit = /obj/item/circuitboard/machine/smartfridge
@@ -14,9 +14,11 @@
light_range = MINIMUM_USEFUL_LIGHT_RANGE
integrity_failure = 0.5
can_atmos_pass = ATMOS_PASS_NO
+ /// Icon state part for contents display
+ var/contents_overlay_icon = "plant"
/// What path boards used to construct it should build into when dropped. Needed so we don't accidentally have them build variants with items preloaded in them.
var/base_build_path = /obj/machinery/smartfridge
- /// Maximum number of items that can be loaded into the machine
+ /// Maximum number of items that can be loaded into the machine per matter bin tier
var/max_n_of_items = 1500
/// List of items that the machine starts with upon spawn
var/list/initial_contents
@@ -25,14 +27,18 @@
/// Is this smartfridge going to have a glowing screen? (Drying Racks are not)
var/has_emissive = TRUE
/// Whether the smartfridge is welded down to the floor disabling unwrenching
+ var/can_be_welded_down = TRUE
+ /// Whether the smartfridge is welded down to the floor disabling unwrenching
var/welded_down = FALSE
+ /// The sound of item retrieval
+ var/vend_sound = 'sound/machines/machine_vend.ogg'
/obj/machinery/smartfridge/Initialize(mapload)
. = ..()
create_reagents(100, NO_REACT)
air_update_turf(TRUE, TRUE)
register_context()
- if(mapload)
+ if(mapload && can_be_welded_down)
welded_down = TRUE
if(islist(initial_contents))
@@ -49,6 +55,8 @@
move_update_air(old_loc)
/obj/machinery/smartfridge/welder_act(mob/living/user, obj/item/tool)
+ if(!can_be_welded_down)
+ return ..()
if(welded_down)
if(!tool.tool_start_check(user, amount=2))
return ITEM_INTERACT_BLOCKING
@@ -112,9 +120,9 @@
/obj/machinery/smartfridge/screwdriver_act(mob/living/user, obj/item/tool)
if(default_deconstruction_screwdriver(user, icon_state, icon_state, tool))
if(panel_open)
- add_overlay("[initial(icon_state)]-panel")
+ add_overlay("[base_icon_state]-panel")
else
- cut_overlay("[initial(icon_state)]-panel")
+ cut_overlay("[base_icon_state]-panel")
SStgui.update_uis(src)
return ITEM_INTERACT_SUCCESS
return ITEM_INTERACT_BLOCKING
@@ -156,7 +164,7 @@
if(welded_down)
context[SCREENTIP_CONTEXT_LMB] = "Unweld"
tool_tip_set = TRUE
- else if (!welded_down && anchored)
+ else if (!welded_down && anchored && can_be_welded_down)
context[SCREENTIP_CONTEXT_LMB] = "Weld down"
tool_tip_set = TRUE
if(machine_stat & BROKEN)
@@ -181,7 +189,7 @@
/obj/machinery/smartfridge/RefreshParts()
. = ..()
for(var/datum/stock_part/matter_bin/matter_bin in component_parts)
- max_n_of_items = 1500 * matter_bin.tier
+ max_n_of_items = initial(max_n_of_items) * matter_bin.tier
/obj/machinery/smartfridge/examine(mob/user)
. = ..()
@@ -197,7 +205,7 @@
if(welded_down)
. += span_info("It's moorings are firmly [EXAMINE_HINT("welded")] to the floor.")
- else
+ else if (can_be_welded_down)
. += span_info("It's moorings are loose and can be [EXAMINE_HINT("welded")] down.")
if(anchored)
@@ -211,24 +219,21 @@
set_light((!(machine_stat & BROKEN) && powered()) ? MINIMUM_USEFUL_LIGHT_RANGE : 0)
/obj/machinery/smartfridge/update_icon_state()
- icon_state = "[initial(icon_state)]"
+ icon_state = "[base_icon_state]"
if(machine_stat & BROKEN)
icon_state += "-broken"
- else if(!powered())
- icon_state += "-off"
return ..()
/// Returns the number of items visible in the fridge. Faster than subtracting 2 lists
/obj/machinery/smartfridge/proc/visible_items()
- return contents.len - 1 // Circuitboard
+ return contents.len - 1 // Exclude circuitboard
/obj/machinery/smartfridge/update_overlays()
. = ..()
- var/initial_icon_state = initial(icon_state)
var/shown_contents_length = visible_items()
if(visible_contents && shown_contents_length)
- var/content_level = "[initial_icon_state]-[base_icon_state]"
+ var/content_level = "[base_icon_state]-[contents_overlay_icon]"
switch(shown_contents_length)
if(1 to 25)
content_level += "-1"
@@ -238,10 +243,10 @@
content_level += "-3"
. += mutable_appearance(icon, content_level)
- . += mutable_appearance(icon, "[initial_icon_state]-glass[(machine_stat & BROKEN) ? "-broken" : ""]")
-
- if(!machine_stat && has_emissive)
- . += emissive_appearance(icon, "[initial_icon_state]-light-mask", src, alpha = src.alpha)
+ . += mutable_appearance(icon, "[base_icon_state]-glass[(machine_stat & BROKEN) ? "-broken" : ""]")
+ if(has_emissive && powered() && !(machine_stat & BROKEN))
+ . += mutable_appearance(icon, "[base_icon_state]-powered")
+ . += emissive_appearance(icon, "[base_icon_state]-light-mask", src, alpha = src.alpha)
/obj/machinery/smartfridge/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
switch(damage_type)
@@ -364,14 +369,18 @@
var/atom/movable/atom = item
if (!QDELETED(atom))
- var/md5name = md5(atom.name) // This needs to happen because of a bug in a TGUI component, https://github.com/ractivejs/ractive/issues/744
- if (listofitems[md5name]) // which is fixed in a version we cannot use due to ie8 incompatibility
- listofitems[md5name]["amount"]++ // The good news is, #30519 made smartfridge UIs non-auto-updating
+ var/key = "[atom.type]"
+ if (listofitems[key])
+ listofitems[key]["amount"]++
else
- listofitems[md5name] = list("name" = atom.name, "amount" = 1)
- sort_list(listofitems)
-
- .["contents"] = listofitems
+ listofitems[key] = list(
+ "path" = key,
+ "name" = full_capitalize(atom.name),
+ "icon" = atom.icon,
+ "icon_state" = atom.icon_state,
+ "amount" = 1
+ )
+ .["contents"] = sort_list(listofitems)
.["name"] = name
.["isdryer"] = FALSE
@@ -389,32 +398,30 @@
switch(action)
if("Release")
- var/desired = 0
+ var/amount = text2num(params["amount"])
+ var/desired = 1
if(isAI(living_mob))
to_chat(living_mob, span_warning("[src] does not respect your authority!"))
return
- if (params["amount"])
- desired = text2num(params["amount"])
- else
- desired = tgui_input_number(living_mob, "How many items would you like to take out?", "Release", max_value = 50)
+ if (amount > 1)
+ desired = tgui_input_number(living_mob, "How many items would you like to take out?", "Release", default = min(amount, 50), max_value = min(amount, 50))
if(!desired)
return
for(var/obj/item/dispensed_item in src)
if(desired <= 0)
break
- // Grab the first item in contents which name matches our passed name.
- // format_text() is used here to strip \improper and \proper from both names,
- // which is required for correct string comparison between them.
- if(format_text(dispensed_item.name) == format_text(params["name"]))
+ if(istype(dispensed_item, text2path(params["path"])))
if(dispensed_item in component_parts)
CRASH("Attempted removal of [dispensed_item] component_part from smartfridge via smartfridge interface.")
//dispense the item
if(!living_mob.put_in_hands(dispensed_item))
dispensed_item.forceMove(drop_location())
adjust_item_drop_location(dispensed_item)
+ if(vend_sound)
+ playsound(src, vend_sound, 50, TRUE, extrarange = -3)
use_energy(active_power_usage)
desired--
@@ -425,89 +432,50 @@
return FALSE
// ----------------------------
-// Drying Rack 'smartfridge'
+// Drying 'smartfridge'
// ----------------------------
-/obj/machinery/smartfridge/drying_rack
- name = "drying rack"
- desc = "A wooden contraption, used to dry plant products, food and hide."
- icon = 'icons/obj/service/hydroponics/equipment.dmi'
- icon_state = "drying_rack"
- resistance_flags = FLAMMABLE
- visible_contents = FALSE
- base_build_path = /obj/machinery/smartfridge/drying_rack //should really be seeing this without admin fuckery.
- use_power = NO_POWER_USE
- idle_power_usage = 0
+/obj/machinery/smartfridge/drying
+ name = "dehydrator"
+ desc = "A machine meant to remove moisture from various food."
+ icon_state = "dehydrator-icon"
+ base_icon_state = "dehydrator"
+ contents_overlay_icon = "contents"
+ circuit = /obj/item/circuitboard/machine/dehydrator
+ light_power = 0.5
+ base_build_path = /obj/machinery/smartfridge/drying //should really be seeing this without admin fuckery.
has_emissive = FALSE
can_atmos_pass = ATMOS_PASS_YES
+ can_be_welded_down = FALSE
+ max_n_of_items = 25
+ vend_sound = null
/// Is the rack currently drying stuff
var/drying = FALSE
/// The reference to the last user's mind. Needed for the chef made trait to be properly applied correctly to dried food.
var/datum/weakref/current_user
-/obj/machinery/smartfridge/drying_rack/Initialize(mapload)
- . = ..()
-
- //you can't weld down wood
- welded_down = FALSE
-
- //so we don't drop any of the parent smart fridge parts upon deconstruction
- clear_components()
-
-/obj/machinery/smartfridge/drying_rack/Destroy()
+/obj/machinery/smartfridge/drying/Destroy()
current_user = null
return ..()
-/// We cleared out the components in initialize so we can optimize this
-/obj/machinery/smartfridge/drying_rack/visible_items()
- return contents.len
-
-/obj/machinery/smartfridge/drying_rack/add_context(atom/source, list/context, obj/item/held_item, mob/living/user)
- if(isnull(held_item))
- return NONE
-
- var/tool_tip_set = FALSE
- if(held_item.tool_behaviour == TOOL_CROWBAR)
- context[SCREENTIP_CONTEXT_LMB] = "Deconstruct"
- tool_tip_set = TRUE
- else if(held_item.tool_behaviour == TOOL_WRENCH)
- context[SCREENTIP_CONTEXT_LMB] = "[anchored ? "Un" : ""]anchore"
- tool_tip_set = TRUE
-
- return tool_tip_set ? CONTEXTUAL_SCREENTIP_SET : NONE
-
-/obj/machinery/smartfridge/drying_rack/structure_examine()
- . = ""
- if(anchored)
- . += span_info("It's currently anchored to the floor. It can be [EXAMINE_HINT("wrenched")] loose.")
- else
- . += span_info("It's not anchored to the floor. It can be [EXAMINE_HINT("wrenched")] down.")
- . += span_info("The whole rack can be [EXAMINE_HINT("pried")] apart.")
-
-/obj/machinery/smartfridge/drying_rack/welder_act(mob/living/user, obj/item/tool)
- return NONE
-
-/obj/machinery/smartfridge/drying_rack/welder_act_secondary(mob/living/user, obj/item/tool)
- return NONE
-
-/obj/machinery/smartfridge/drying_rack/default_deconstruction_screwdriver()
- return NONE
-
-/obj/machinery/smartfridge/drying_rack/exchange_parts()
- return
+/obj/machinery/smartfridge/drying/AllowDrop()
+ return TRUE // Allow drying results to stay inside
-/obj/machinery/smartfridge/drying_rack/on_deconstruction(disassembled)
- new /obj/item/stack/sheet/mineral/wood(drop_location(), 10)
+/obj/machinery/smartfridge/drying/update_overlays()
+ . = ..()
+ if(visible_contents && powered() && !(machine_stat & BROKEN))
+ var/suffix = drying ? "on" : "off"
+ . += mutable_appearance(icon, "[base_icon_state]-[suffix]")
+ . += emissive_appearance(icon, "[base_icon_state]-[suffix]", src, alpha = src.alpha)
-/obj/machinery/smartfridge/drying_rack/crowbar_act(mob/living/user, obj/item/tool)
- if(default_deconstruction_crowbar(tool, ignore_panel = TRUE))
- return ITEM_INTERACT_SUCCESS
+/obj/machinery/smartfridge/drying/visible_items()
+ return min(1, (contents.len - 1)) // Return one if has any, as there's only one icon for overlay
-/obj/machinery/smartfridge/drying_rack/ui_data(mob/user)
+/obj/machinery/smartfridge/drying/ui_data(mob/user)
. = ..()
.["isdryer"] = TRUE
.["drying"] = drying
-/obj/machinery/smartfridge/drying_rack/ui_act(action, params)
+/obj/machinery/smartfridge/drying/ui_act(action, params)
. = ..()
if(.)
update_appearance() // This is to handle a case where the last item is taken out manually instead of through drying pop-out
@@ -518,15 +486,15 @@
toggle_drying(FALSE, usr)
return TRUE
-/obj/machinery/smartfridge/drying_rack/powered()
+/obj/machinery/smartfridge/drying/powered()
return !anchored ? FALSE : ..()
-/obj/machinery/smartfridge/drying_rack/power_change()
+/obj/machinery/smartfridge/drying/power_change()
. = ..()
if(!powered())
toggle_drying(TRUE)
-/obj/machinery/smartfridge/drying_rack/load(obj/item/dried_object, mob/user) //For updating the filled overlay
+/obj/machinery/smartfridge/drying/load(obj/item/dried_object, mob/user) //For updating the filled overlay
. = ..()
if(!.)
return
@@ -534,25 +502,18 @@
if(drying && user?.mind)
current_user = WEAKREF(user.mind)
-/obj/machinery/smartfridge/drying_rack/update_overlays()
- . = ..()
- if(drying)
- . += "drying_rack_drying"
- if(contents.len)
- . += "drying_rack_filled"
-
-/obj/machinery/smartfridge/drying_rack/process()
+/obj/machinery/smartfridge/drying/process(seconds_per_tick)
if(drying)
for(var/obj/item/item_iterator in src)
if(!accept_check(item_iterator))
continue
- rack_dry(item_iterator)
+ SEND_SIGNAL(item_iterator, COMSIG_ITEM_DRIED, current_user, seconds_per_tick)
SStgui.update_uis(src)
update_appearance()
use_energy(active_power_usage)
-/obj/machinery/smartfridge/drying_rack/accept_check(obj/item/O)
+/obj/machinery/smartfridge/drying/accept_check(obj/item/O)
return HAS_TRAIT(O, TRAIT_DRYABLE)
/**
@@ -560,7 +521,7 @@
* Arguments
* * forceoff - if TRUE will force the dryer off always
*/
-/obj/machinery/smartfridge/drying_rack/proc/toggle_drying(forceoff, mob/user)
+/obj/machinery/smartfridge/drying/proc/toggle_drying(forceoff, mob/user)
if(drying || forceoff)
drying = FALSE
current_user = FALSE
@@ -572,15 +533,70 @@
update_use_power(ACTIVE_POWER_USE)
update_appearance()
-/obj/machinery/smartfridge/drying_rack/proc/rack_dry(obj/item/target)
- SEND_SIGNAL(target, COMSIG_ITEM_DRIED, current_user)
-
-/obj/machinery/smartfridge/drying_rack/emp_act(severity)
+/obj/machinery/smartfridge/drying/emp_act(severity)
. = ..()
if(. & EMP_PROTECT_SELF)
return
atmos_spawn_air("[TURF_TEMPERATURE(1000)]")
+/// Wooden version
+/obj/machinery/smartfridge/drying/rack
+ name = "drying rack"
+ desc = "A wooden contraption, used to dry plant products, food and hide."
+ icon_state = "drying-rack"
+ base_icon_state = "drying-rack"
+ resistance_flags = FLAMMABLE
+ visible_contents = FALSE
+ base_build_path = /obj/machinery/smartfridge/drying/rack
+ use_power = NO_POWER_USE
+ idle_power_usage = 0
+
+/obj/machinery/smartfridge/drying/rack/Initialize(mapload)
+ . = ..()
+ //so we don't drop any of the parent smart fridge parts upon deconstruction
+ clear_components()
+
+/obj/machinery/smartfridge/drying/rack/welder_act_secondary(mob/living/user, obj/item/tool)
+ return NONE // Can't repair wood with welder
+
+/obj/machinery/smartfridge/drying/rack/add_context(atom/source, list/context, obj/item/held_item, mob/living/user)
+ if(isnull(held_item))
+ return NONE
+
+ var/tool_tip_set = FALSE
+ if(held_item.tool_behaviour == TOOL_CROWBAR)
+ context[SCREENTIP_CONTEXT_LMB] = "Deconstruct"
+ tool_tip_set = TRUE
+ else if(held_item.tool_behaviour == TOOL_WRENCH)
+ context[SCREENTIP_CONTEXT_LMB] = "[anchored ? "Un" : ""]anchore"
+ tool_tip_set = TRUE
+
+ return tool_tip_set ? CONTEXTUAL_SCREENTIP_SET : NONE
+
+/obj/machinery/smartfridge/drying/rack/structure_examine()
+ . = ..()
+ . += span_info("The whole rack can be [EXAMINE_HINT("pried")] apart.")
+
+/obj/machinery/smartfridge/drying/rack/default_deconstruction_screwdriver()
+ return NONE
+
+/obj/machinery/smartfridge/drying/rack/exchange_parts()
+ return
+
+/obj/machinery/smartfridge/drying/rack/on_deconstruction(disassembled)
+ new /obj/item/stack/sheet/mineral/wood(drop_location(), 10)
+
+/obj/machinery/smartfridge/drying/rack/crowbar_act(mob/living/user, obj/item/tool)
+ if(default_deconstruction_crowbar(tool, ignore_panel = TRUE))
+ return ITEM_INTERACT_SUCCESS
+
+/obj/machinery/smartfridge/drying/rack/update_overlays()
+ . = ..()
+ if(drying)
+ . += "[base_icon_state]-drying"
+ if(contents.len)
+ . += "[base_icon_state]-filled"
+
// ----------------------------
// Bar drink smartfridge
// ----------------------------
@@ -588,7 +604,7 @@
name = "drink showcase"
desc = "A refrigerated storage unit for tasty tasty alcohol."
base_build_path = /obj/machinery/smartfridge/drinks
- base_icon_state = "drink"
+ contents_overlay_icon = "drink"
/obj/machinery/smartfridge/drinks/accept_check(obj/item/weapon)
//not an item or valid container
@@ -608,7 +624,7 @@
/obj/machinery/smartfridge/food
desc = "A refrigerated storage unit for food."
base_build_path = /obj/machinery/smartfridge/food
- base_icon_state = "food"
+ contents_overlay_icon = "food"
/obj/machinery/smartfridge/food/accept_check(obj/item/weapon)
if(weapon.w_class >= WEIGHT_CLASS_BULKY)
@@ -626,7 +642,7 @@
name = "smart slime extract storage"
desc = "A refrigerated storage unit for slime extracts."
base_build_path = /obj/machinery/smartfridge/extract
- base_icon_state = "slime"
+ contents_overlay_icon = "slime"
/obj/machinery/smartfridge/extract/accept_check(obj/item/weapon)
return (istype(weapon, /obj/item/slime_extract) || istype(weapon, /obj/item/slime_scanner))
@@ -641,7 +657,7 @@
name = "smart petri dish storage"
desc = "A refrigerated storage unit for petri dishes."
base_build_path = /obj/machinery/smartfridge/petri
- base_icon_state = "petri"
+ contents_overlay_icon = "petri"
/obj/machinery/smartfridge/petri/accept_check(obj/item/weapon)
return istype(weapon, /obj/item/petri_dish)
@@ -657,7 +673,7 @@
desc = "A refrigerated storage unit for organ storage."
max_n_of_items = 20 //vastly lower to prevent processing too long
base_build_path = /obj/machinery/smartfridge/organ
- base_icon_state = "organ"
+ contents_overlay_icon = "organ"
/// The rate at which this fridge will repair damaged organs
var/repair_rate = 0
@@ -710,7 +726,7 @@
name = "smart chemical storage"
desc = "A refrigerated storage unit for medicine storage."
base_build_path = /obj/machinery/smartfridge/chemistry
- base_icon_state = "chem"
+ contents_overlay_icon = "chem"
/obj/machinery/smartfridge/chemistry/accept_check(obj/item/weapon)
// not an item or reagent container
@@ -761,7 +777,7 @@
name = "smart virus storage"
desc = "A refrigerated storage unit for volatile sample storage."
base_build_path = /obj/machinery/smartfridge/chemistry/virology
- base_icon_state = "viro"
+ contents_overlay_icon = "viro"
/obj/machinery/smartfridge/chemistry/virology/preloaded
initial_contents = list(
@@ -782,10 +798,12 @@
name = "disk compartmentalizer"
desc = "A machine capable of storing a variety of disks. Denoted by most as the DSU (disk storage unit)."
icon_state = "disktoaster"
- icon = 'icons/obj/machines/vending.dmi'
+ base_icon_state = "disktoaster"
+ has_emissive = TRUE
pass_flags = PASSTABLE
can_atmos_pass = ATMOS_PASS_YES
visible_contents = FALSE
+ has_emissive = FALSE
base_build_path = /obj/machinery/smartfridge/disks
/obj/machinery/smartfridge/disks/accept_check(obj/item/weapon)
diff --git a/code/modules/food_and_drinks/recipes/soup_mixtures.dm b/code/modules/food_and_drinks/recipes/soup_mixtures.dm
index a549951890fe62..2b10fe169c272f 100644
--- a/code/modules/food_and_drinks/recipes/soup_mixtures.dm
+++ b/code/modules/food_and_drinks/recipes/soup_mixtures.dm
@@ -1469,6 +1469,20 @@
/datum/reagent/water = 5,
)
+//Fresh Jellyfish fillet soup!
+/datum/chemical_reaction/food/soup/jellyfish_stew_two
+ required_reagents = list(/datum/reagent/water = 50)
+ required_ingredients = list(
+ /obj/item/food/fishmeat/gunner_jellyfish = 1,
+ /obj/item/food/grown/soybeans = 1,
+ /obj/item/food/grown/redbeet = 1,
+ /obj/item/food/grown/potato = 1
+ )
+ results = list(
+ /datum/reagent/consumable/nutriment/soup/jellyfish = 50,
+ )
+
+
// Rootbread Soup
/datum/reagent/consumable/nutriment/soup/rootbread
name = "Rootbread Soup"
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm
index c02a7243368bdf..4d028de06fb228 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm
@@ -827,7 +827,7 @@
// Machinery: Drying rack
/datum/crafting_recipe/food/drying
- machinery = list(/obj/machinery/smartfridge/drying_rack)
+ machinery = list(/obj/machinery/smartfridge/drying)
steps = list("Put into the rack and dry")
category = CAT_MISCFOOD
non_craftable = TRUE
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_lizard.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_lizard.dm
index 100e74fd916820..71716a1ee7c2a8 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_lizard.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_lizard.dm
@@ -480,6 +480,10 @@
reaction = /datum/chemical_reaction/food/soup/jellyfish_stew
category = CAT_LIZARD
+/datum/crafting_recipe/food/reaction/soup/jellyfish_stew_two
+ reaction = /datum/chemical_reaction/food/soup/jellyfish_stew_two
+ category = CAT_LIZARD
+
/datum/crafting_recipe/food/reaction/soup/rootbread_soup
reaction = /datum/chemical_reaction/food/soup/rootbread_soup
category = CAT_LIZARD
diff --git a/code/modules/food_and_drinks/restaurant/customers/_customer.dm b/code/modules/food_and_drinks/restaurant/customers/_customer.dm
index 9c99a5811a3d3c..c9011ad8c8a28c 100644
--- a/code/modules/food_and_drinks/restaurant/customers/_customer.dm
+++ b/code/modules/food_and_drinks/restaurant/customers/_customer.dm
@@ -47,6 +47,10 @@
/datum/customer_data/New()
. = ..()
name_prefixes = world.file2list(prefix_file)
+ if(check_holidays(ICE_CREAM_DAY)) ///customers are more likely to order ice cream on this holiday
+ var/list/orderable_restaurant = orderable_objects[VENUE_RESTAURANT]
+ if(orderable_restaurant?[/datum/custom_order/icecream])
+ orderable_restaurant[/datum/custom_order/icecream] *= 3
/// Can this customer be chosen for this venue?
/datum/customer_data/proc/can_use(datum/venue/venue)
diff --git a/code/modules/hallucination/body.dm b/code/modules/hallucination/body.dm
index 2d017f969679de..8cd34cfcd4071a 100644
--- a/code/modules/hallucination/body.dm
+++ b/code/modules/hallucination/body.dm
@@ -10,7 +10,7 @@
/// Whether we apply the floating anim to the body
var/body_floats = FALSE
/// The layer this body will be drawn on, in case we want to bypass lighting
- var/body_layer = TURF_LAYER
+ var/body_layer = LOW_FLOOR_LAYER
/// if TRUE, spawns the body under the hallucinator instead of somewhere in view
var/spawn_under_hallucinator = FALSE
diff --git a/code/modules/hallucination/bubblegum_attack.dm b/code/modules/hallucination/bubblegum_attack.dm
index 5ee39ed8e86492..529d67dcd35516 100644
--- a/code/modules/hallucination/bubblegum_attack.dm
+++ b/code/modules/hallucination/bubblegum_attack.dm
@@ -36,7 +36,7 @@
if(hallucinator.client)
- fake_broken_wall = image('icons/turf/floors.dmi', wall_source, "plating", layer = TURF_LAYER)
+ fake_broken_wall = image('icons/turf/floors.dmi', wall_source, "plating", layer = LOW_FLOOR_LAYER)
SET_PLANE_EXPLICIT(fake_broken_wall, FLOOR_PLANE, wall_source)
fake_broken_wall.override = TRUE
fake_rune = image('icons/effects/96x96.dmi', target_landing_image_turf, "landing", layer = ABOVE_OPEN_TURF_LAYER)
diff --git a/code/modules/hallucination/hazard.dm b/code/modules/hallucination/hazard.dm
index 1dfdfd23970e73..34bcee62f6a879 100644
--- a/code/modules/hallucination/hazard.dm
+++ b/code/modules/hallucination/hazard.dm
@@ -29,7 +29,8 @@
/// These hallucination effects cause side effects when the hallucinator walks into them.
/obj/effect/client_image_holder/hallucination/danger
- image_layer = TURF_LAYER
+ image_layer = LOW_FLOOR_LAYER
+ image_plane = FLOOR_PLANE
/obj/effect/client_image_holder/hallucination/danger/Initialize(mapload, list/mobs_which_see_us, datum/hallucination/parent)
. = ..()
diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm
index 24e5274f7fbfeb..6fe7fdbc57d946 100644
--- a/code/modules/holiday/holidays.dm
+++ b/code/modules/holiday/holidays.dm
@@ -856,7 +856,7 @@
Ian.place_on_head(new /obj/item/clothing/head/helmet/space/santahat(Ian))
-// EASTER (this having it's own spot should be understandable)
+// EASTER (this having its own spot should be understandable)
/datum/holiday/easter
name = EASTER
diff --git a/code/modules/holiday/nth_week.dm b/code/modules/holiday/nth_week.dm
index ef4815de066467..6786e2ef7ce66d 100644
--- a/code/modules/holiday/nth_week.dm
+++ b/code/modules/holiday/nth_week.dm
@@ -84,3 +84,12 @@
/datum/holiday/nth_week/moth/getStationPrefix()
return pick("Mothball","Lepidopteran","Lightbulb","Moth","Giant Atlas","Twin-spotted Sphynx","Madagascan Sunset","Luna","Death's Head","Emperor Gum","Polyphenus","Oleander Hawk","Io","Rosy Maple","Cecropia","Noctuidae","Giant Leopard","Dysphania Militaris","Garden Tiger")
+
+/datum/holiday/nth_week/ice_cream
+ name = ICE_CREAM_DAY
+ begin_week = 3
+ begin_month = JULY
+ begin_weekday = SUNDAY
+
+/datum/holiday/nth_week/ice_cream/getStationPrefix()
+ return pick("Ice Cream", "Gelato", "Semifreddo", "Cornuto", "Soft Serve", "Cone", "Ice", "Cream", "I Scream", "Parfait", "Straccciatella", "Sherbet", "Snow", "Affogato", "Mochi", "Tartufo", "Sundae", "Neapolitan")
diff --git a/code/modules/holodeck/turfs.dm b/code/modules/holodeck/turfs.dm
index 0eb05fcdc30490..0222fd41cdcf15 100644
--- a/code/modules/holodeck/turfs.dm
+++ b/code/modules/holodeck/turfs.dm
@@ -120,13 +120,18 @@
. = ..()
if(prob(15))
icon_state = "basalt[rand(0, 12)]"
- set_basalt_light(src)
+ switch(icon_state)
+ if("basalt1", "basalt2", "basalt3")
+ set_light(BASALT_LIGHT_RANGE_BRIGHT, BASALT_LIGHT_POWER, LIGHT_COLOR_LAVA)
+ if("basalt5", "basalt9")
+ set_light(BASALT_LIGHT_RANGE_DIM, BASALT_LIGHT_POWER, LIGHT_COLOR_LAVA)
/turf/open/floor/holofloor/space
name = "\proper space"
desc = "Space-looking floor. Thankfully, the deadly aspects of space are not emulated here."
icon = 'icons/turf/space.dmi'
icon_state = "space"
+ layer = SPACE_LAYER
plane = PLANE_SPACE
/turf/open/floor/holofloor/hyperspace
diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm
index 35bf611b506a61..52df09c29cdf83 100644
--- a/code/modules/hydroponics/biogenerator.dm
+++ b/code/modules/hydroponics/biogenerator.dm
@@ -2,8 +2,6 @@
#define MAX_ITEMS_PER_RATING 10
/// How many items are converted per cycle, per rating point of the manipulator used.
#define PROCESSED_ITEMS_PER_RATING 5
-/// Starting purity of reagents made in biogenerator
-#define BIOGEN_REAGENT_PURITY 0.3
/obj/machinery/biogenerator
name = "biogenerator"
@@ -571,4 +569,3 @@
#undef MAX_ITEMS_PER_RATING
#undef PROCESSED_ITEMS_PER_RATING
-#undef BIOGEN_REAGENT_PURITY
diff --git a/code/modules/hydroponics/grown/beans.dm b/code/modules/hydroponics/grown/beans.dm
index fb827377114046..974b19889ecba0 100644
--- a/code/modules/hydroponics/grown/beans.dm
+++ b/code/modules/hydroponics/grown/beans.dm
@@ -44,12 +44,22 @@
/obj/item/food/grown/koibeans
seed = /obj/item/seeds/soya/koi
name = "koibean"
- desc = "Something about these seems fishy."
+ desc = "Something about these seems fishy, they seem really soft, almost squeezable!"
icon_state = "koibeans"
foodtypes = VEGETABLES
tastes = list("koi" = 1)
wine_power = 40
+//Now squeezable for imitation carpmeat
+/obj/item/food/grown/koibeans/attack_self(mob/living/user)
+ user.visible_message(span_notice("[user] crushes [src] into a slab of carplike meat."), span_notice("You crush [src] into something that resembles a slab of carplike meat."))
+ playsound(user, 'sound/effects/blobattack.ogg', 50, TRUE)
+ var/obj/item/food/fishmeat/carp/imitation/fishie = new(null)
+ fishie.reagents.set_all_reagents_purity(seed.get_reagent_purity())
+ qdel(src)
+ user.put_in_hands(fishie)
+ return TRUE
+
//Butterbeans, the beans wid da butta!
// Butterbeans! - Squeeze for a single butter slice!
/obj/item/seeds/soya/butter
diff --git a/code/modules/hydroponics/grown/kronkus.dm b/code/modules/hydroponics/grown/kronkus.dm
index e0b6e6b66aad36..90d264230e7503 100644
--- a/code/modules/hydroponics/grown/kronkus.dm
+++ b/code/modules/hydroponics/grown/kronkus.dm
@@ -16,6 +16,10 @@
growing_icon = 'icons/obj/service/hydroponics/growing.dmi'
reagents_add = list(/datum/reagent/consumable/nutriment = 0.05)
+/obj/item/seeds/kronkus/Initialize(mapload, nogenes)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_CONTRABAND, INNATE_TRAIT)
+
/obj/item/food/grown/kronkus
seed = /obj/item/seeds/kronkus
name = "kronkus vine segment"
@@ -24,3 +28,7 @@
filling_color = "#37946e"
foodtypes = VEGETABLES | TOXIC
distill_reagent = /datum/reagent/kronkus_extract
+
+/obj/item/food/grown/kronkus/Initialize(mapload, nogenes)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_CONTRABAND, INNATE_TRAIT)
diff --git a/code/modules/hydroponics/grown/replicapod.dm b/code/modules/hydroponics/grown/replicapod.dm
index a90397687a6f61..88c8572a3ae75e 100644
--- a/code/modules/hydroponics/grown/replicapod.dm
+++ b/code/modules/hydroponics/grown/replicapod.dm
@@ -1,4 +1,4 @@
-// A very special plant, deserving it's own file.
+// A very special plant, deserving its own file.
// Yes, i'm talking about cabbage, baby! No, just kidding, but cabbages are the precursor to replica pods, so they are here as well.
/obj/item/seeds/cabbage
diff --git a/code/modules/hydroponics/grown/weeds/kudzu.dm b/code/modules/hydroponics/grown/weeds/kudzu.dm
index d8f1a66795b2be..86b49672705b96 100644
--- a/code/modules/hydroponics/grown/weeds/kudzu.dm
+++ b/code/modules/hydroponics/grown/weeds/kudzu.dm
@@ -1,4 +1,4 @@
-// A very special plant, deserving it's own file.
+// A very special plant, deserving its own file.
/obj/item/seeds/kudzu
name = "pack of kudzu seeds"
diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm
index e55977e2dba967..ccb4bb571e270b 100644
--- a/code/modules/hydroponics/hydroitemdefines.dm
+++ b/code/modules/hydroponics/hydroitemdefines.dm
@@ -160,7 +160,7 @@
/**
* This proc is called when we scan a hydroponics tray or soil on left click (stats mode)
- * It formats the plant name, it's age, the plant's stats, and the tray's stats.
+ * It formats the plant name, its age, the plant's stats, and the tray's stats.
*
* - scanned_tray - the tray or soil we are scanning.
*
diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm
index a6cbf990e20ab1..5708327747bcd3 100644
--- a/code/modules/hydroponics/hydroponics.dm
+++ b/code/modules/hydroponics/hydroponics.dm
@@ -58,7 +58,7 @@
/obj/machinery/hydroponics/Initialize(mapload)
//ALRIGHT YOU DEGENERATES. YOU HAD REAGENT HOLDERS FOR AT LEAST 4 YEARS AND NONE OF YOU MADE HYDROPONICS TRAYS HOLD NUTRIENT CHEMS INSTEAD OF USING "Points".
- //SO HERE LIES THE "nutrilevel" VAR. IT'S DEAD AND I PUT IT OUT OF IT'S MISERY. USE "reagents" INSTEAD. ~ArcaneMusic, accept no substitutes.
+ //SO HERE LIES THE "nutrilevel" VAR. IT'S DEAD AND I PUT IT OUT OF ITS MISERY. USE "reagents" INSTEAD. ~ArcaneMusic, accept no substitutes.
create_reagents(maxnutri, INJECTABLE)
if(mapload)
reagents.add_reagent(/datum/reagent/plantnutriment/eznutriment, max(maxnutri / 2, 10)) //Half filled nutrient trays for dirt trays to have more to grow with in prison/lavaland.
@@ -781,7 +781,7 @@
/**
* Plant Cross-Pollination.
* Checks all plants in the tray's oview range, then averages out the seed's potency, instability, and yield values.
- * If the seed's instability is >= 20, the seed donates one of it's reagents to that nearby plant.
+ * If the seed's instability is >= 20, the seed donates one of its reagents to that nearby plant.
* * Range - The Oview range of trays to which to look for plants to donate reagents.
*/
/obj/machinery/hydroponics/proc/pollinate(range = 1)
@@ -1033,7 +1033,7 @@
to_chat(user, span_warning("[src] is empty!"))
return
if(myseed.endurance <= FLORA_GUN_MIN_ENDURANCE)
- to_chat(user, span_warning("[myseed.plantname] isn't hardy enough to sequence it's mutation!"))
+ to_chat(user, span_warning("[myseed.plantname] isn't hardy enough to sequence its mutation!"))
return
if(!LAZYLEN(myseed.mutatelist))
to_chat(user, span_warning("[myseed.plantname] has nothing else to mutate into!"))
diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm
index 952bef1c443d68..f7c6d3088fbcb1 100644
--- a/code/modules/hydroponics/plant_genes.dm
+++ b/code/modules/hydroponics/plant_genes.dm
@@ -487,7 +487,7 @@
/**
* A plant trait that causes the plant's capacity to double.
*
- * When harvested, the plant's individual capacity is set to double it's default.
+ * When harvested, the plant's individual capacity is set to double its default.
* However, the plant's maximum yield is also halved, only up to 5.
*/
/datum/plant_gene/trait/maxchem
@@ -763,7 +763,7 @@
/**
* A plant trait that causes the plant's food reagents to ferment instead.
*
- * In practice, it replaces the plant's nutriment and vitamins with half as much of it's fermented reagent.
+ * In practice, it replaces the plant's nutriment and vitamins with half as much of its fermented reagent.
* This exception is executed in seeds.dm under 'prepare_result'.
*
* Incompatible with auto-juicing composition.
diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm
index fefd4d999387fc..13a49b35189053 100644
--- a/code/modules/hydroponics/seeds.dm
+++ b/code/modules/hydroponics/seeds.dm
@@ -40,7 +40,7 @@
var/potency = 10
/// Amount of growth sprites the plant has.
var/growthstages = 6
- // Chance that a plant will mutate in each stage of it's life.
+ // Chance that a plant will mutate in each stage of its life.
var/instability = 5
/// How rare the plant is. Used for giving points to cargo when shipping off to CentCom.
var/rarity = 0
diff --git a/code/modules/instruments/items.dm b/code/modules/instruments/items.dm
index dcc4ef8daba3d8..170000eb11557d 100644
--- a/code/modules/instruments/items.dm
+++ b/code/modules/instruments/items.dm
@@ -17,7 +17,7 @@
/obj/item/instrument/Initialize(mapload)
. = ..()
song = new(src, allowed_instrument_ids, instrument_range)
- allowed_instrument_ids = null //We don't need this clogging memory after it's used.
+ allowed_instrument_ids = null //We don't need this clogging memory after its used.
/obj/item/instrument/Destroy()
QDEL_NULL(song)
diff --git a/code/modules/jobs/job_exp.dm b/code/modules/jobs/job_exp.dm
index b2c051a4e1c7d6..6b429b25f4831d 100644
--- a/code/modules/jobs/job_exp.dm
+++ b/code/modules/jobs/job_exp.dm
@@ -203,6 +203,6 @@ GLOBAL_PROTECT(exp_to_update)
if(flags_read.NextRow())
prefs.db_flags = text2num(flags_read.item[1])
else if(isnull(prefs.db_flags))
- prefs.db_flags = 0 //This PROBABLY won't happen, but better safe than sorry.
+ prefs.db_flags = NONE //This PROBABLY won't happen, but better safe than sorry.
qdel(flags_read)
return TRUE
diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm
index fbd9de566326ac..bbb41aafcae170 100644
--- a/code/modules/jobs/job_types/_job.dm
+++ b/code/modules/jobs/job_types/_job.dm
@@ -259,6 +259,11 @@
if(!SSdbcore.Connect())
return 0
+ // If they have been exempted from date availability checks, we assume they are old enough for all jobs.
+ // This is only added whenever an admin manually ticks the box for this player.
+ if(player.prefs?.db_flags & DB_FLAG_EXEMPT)
+ return 0
+
// As of the time of writing this comment, verifying database connection isn't "solved". Sometimes rust-g will report a
// connection mid-shift despite the database dying.
// If the client age is -1, it means that no code path has overwritten it. Even first time connections get it set to 0,
diff --git a/code/modules/jobs/job_types/antagonists/voidwalker.dm b/code/modules/jobs/job_types/antagonists/voidwalker.dm
new file mode 100644
index 00000000000000..c29d165efb8078
--- /dev/null
+++ b/code/modules/jobs/job_types/antagonists/voidwalker.dm
@@ -0,0 +1,2 @@
+/datum/job/voidwalker
+ title = ROLE_VOIDWALKER
diff --git a/code/modules/jobs/job_types/assistant/assistant.dm b/code/modules/jobs/job_types/assistant/assistant.dm
index 4e25f6a35b40c9..12e029f943fe67 100644
--- a/code/modules/jobs/job_types/assistant/assistant.dm
+++ b/code/modules/jobs/job_types/assistant/assistant.dm
@@ -39,7 +39,7 @@ Assistant
/datum/job/assistant/get_outfit(consistent)
if(consistent)
- return /datum/outfit/job/assistant/consistent
+ return /datum/outfit/job/assistant/preview
if(!HAS_TRAIT(SSstation, STATION_TRAIT_ASSISTANT_GIMMICKS))
return ..()
@@ -101,3 +101,12 @@ Assistant
if (SSatoms.initialized == INITIALIZATION_INSSATOMS)
H.w_uniform?.update_greyscale()
H.update_worn_undersuit()
+
+/datum/outfit/job/assistant/preview
+ name = "Assistant - Preview"
+
+/datum/outfit/job/assistant/preview/give_jumpsuit(mob/living/carbon/human/target)
+ if (target.jumpsuit_style == PREF_SUIT)
+ uniform = /obj/item/clothing/under/color/grey
+ else
+ uniform = /obj/item/clothing/under/color/jumpskirt/grey
diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm
index cc41ee7d01f1ac..f3627c3c2a2579 100644
--- a/code/modules/jobs/job_types/head_of_security.dm
+++ b/code/modules/jobs/job_types/head_of_security.dm
@@ -59,7 +59,7 @@
belt = /obj/item/modular_computer/pda/heads/hos
ears = /obj/item/radio/headset/heads/hos/alt
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
- gloves = /obj/item/clothing/gloves/color/black/security //SKYRAT EDIT CHANGE - Original: /obj/item/clothing/gloves/color/black
+ gloves = /obj/item/clothing/gloves/color/black/security
head = /obj/item/clothing/head/hats/hos/beret
shoes = /obj/item/clothing/shoes/jackboots/sec
l_pocket = /obj/item/restraints/handcuffs
diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm
index 74a75de8c42f6f..01eec3830e9524 100644
--- a/code/modules/jobs/job_types/security_officer.dm
+++ b/code/modules/jobs/job_types/security_officer.dm
@@ -226,7 +226,7 @@ GLOBAL_LIST_EMPTY(security_officer_distribution)
)
belt = /obj/item/modular_computer/pda/security
ears = /obj/item/radio/headset/headset_sec/alt
- gloves = /obj/item/clothing/gloves/color/black/security //SKYRAT EDIT CHANGE - Original: /obj/item/clothing/gloves/color/black
+ gloves = /obj/item/clothing/gloves/color/black/security
head = /obj/item/clothing/head/security_garrison //SKYRAT EDIT CHANGE - Original: /obj/item/clothing/head/helmet/sec
shoes = /obj/item/clothing/shoes/jackboots/sec
l_pocket = /obj/item/restraints/handcuffs
diff --git a/code/modules/jobs/job_types/station_trait/human_ai.dm b/code/modules/jobs/job_types/station_trait/human_ai.dm
index 0768505b665536..032ad08af5a609 100644
--- a/code/modules/jobs/job_types/station_trait/human_ai.dm
+++ b/code/modules/jobs/job_types/station_trait/human_ai.dm
@@ -98,9 +98,7 @@
/obj/item/door_remote/omni = 1,
/obj/item/machine_remote = 1,
/obj/item/secure_camera_console_pod = 1,
- )
- implants = list(
- /obj/item/implant/teleport_blocker,
+ /obj/item/sensor_device = 1,
)
uniform = /obj/item/clothing/under/rank/station_trait/human_ai
@@ -108,9 +106,6 @@
ears = /obj/item/radio/headset/silicon/human_ai
glasses = /obj/item/clothing/glasses/hud/diagnostic
- suit = /obj/item/clothing/suit/costume/cardborg
- head = /obj/item/clothing/head/costume/cardborg
-
l_pocket = /obj/item/laser_pointer/infinite_range //to punish borgs, this works through the camera console.
r_pocket = /obj/item/assembly/flash/handheld
diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm
index a671e0fdadf924..78240da4baf46e 100644
--- a/code/modules/jobs/job_types/warden.dm
+++ b/code/modules/jobs/job_types/warden.dm
@@ -55,7 +55,7 @@
belt = /obj/item/modular_computer/pda/warden
ears = /obj/item/radio/headset/headset_sec/alt
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
- gloves = /obj/item/clothing/gloves/color/black/security //SKYRAT EDIT CHANGE - Original: /obj/item/clothing/gloves/color/black
+ gloves = /obj/item/clothing/gloves/color/black/security
head = /obj/item/clothing/head/hats/warden //SKYRAT EDIT CHANGE - Original: /obj/item/clothing/head/hats/warden/red
shoes = /obj/item/clothing/shoes/jackboots/sec
l_pocket = /obj/item/restraints/handcuffs
diff --git a/code/modules/library/bibles.dm b/code/modules/library/bibles.dm
index 39abe7baa509bb..5221dc8047422e 100644
--- a/code/modules/library/bibles.dm
+++ b/code/modules/library/bibles.dm
@@ -316,7 +316,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list(
playsound(src,'sound/hallucinations/veryfar_noise.ogg',40,TRUE)
if(do_after(user, 4 SECONDS, target = sword))
playsound(src,'sound/effects/pray_chaplain.ogg',60,TRUE)
- new /obj/item/nullrod/claymore(get_turf(sword))
+ new /obj/item/nullrod/nullblade(get_turf(sword))
user.visible_message(span_notice("[user] exorcises [sword]!"))
qdel(sword)
return ITEM_INTERACT_SUCCESS
diff --git a/code/modules/library/bookcase.dm b/code/modules/library/bookcase.dm
index 16925dd5138e79..004db281c75c30 100644
--- a/code/modules/library/bookcase.dm
+++ b/code/modules/library/bookcase.dm
@@ -94,63 +94,81 @@
I.forceMove(Tsec)
update_appearance()
-/obj/structure/bookcase/attackby(obj/item/I, mob/user, params)
- switch(state)
- if(BOOKCASE_UNANCHORED)
- if(I.tool_behaviour == TOOL_WRENCH)
- if(I.use_tool(src, user, 20, volume=50))
- to_chat(user, span_notice("You wrench the frame into place."))
- set_anchored(TRUE)
- else if(I.tool_behaviour == TOOL_CROWBAR)
- if(I.use_tool(src, user, 20, volume=50))
- to_chat(user, span_notice("You pry the frame apart."))
- deconstruct(TRUE)
+/obj/structure/bookcase/attackby(obj/item/attacking_item, mob/user, params)
+ if(state == BOOKCASE_UNANCHORED)
+ if(attacking_item.tool_behaviour == TOOL_WRENCH)
+ if(attacking_item.use_tool(src, user, 20, volume=50))
+ balloon_alert(user, "wrenched in place")
+ set_anchored(TRUE)
+ return
+
+ if(attacking_item.tool_behaviour == TOOL_CROWBAR)
+ if(attacking_item.use_tool(src, user, 20, volume=50))
+ balloon_alert(user, "pried apart")
+ deconstruct(TRUE)
+ return
+ return ..()
- if(BOOKCASE_ANCHORED)
- if(istype(I, /obj/item/stack/sheet/mineral/wood))
- var/obj/item/stack/sheet/mineral/wood/W = I
- if(W.get_amount() >= 2)
- W.use(2)
- to_chat(user, span_notice("You add a shelf."))
- state = BOOKCASE_FINISHED
- update_appearance()
- else if(I.tool_behaviour == TOOL_WRENCH)
- I.play_tool_sound(src, 100)
- to_chat(user, span_notice("You unwrench the frame."))
- set_anchored(FALSE)
+ if(state == BOOKCASE_ANCHORED)
+ if(istype(attacking_item, /obj/item/stack/sheet/mineral/wood))
+ var/obj/item/stack/sheet/mineral/wood/W = attacking_item
+ if(W.get_amount() < 2)
+ balloon_alert(user, "not enough wood")
+ return
+ W.use(2)
+ balloon_alert(user, "shelf added")
+ state = BOOKCASE_FINISHED
+ update_appearance()
+ return
+
+ if(attacking_item.tool_behaviour == TOOL_WRENCH)
+ attacking_item.play_tool_sound(src, 100)
+ balloon_alert(user, "unwrenched the frame")
+ set_anchored(FALSE)
+ return
+ return ..()
- if(BOOKCASE_FINISHED)
- if(isbook(I))
- if(!user.transferItemToLoc(I, src))
- return
- update_appearance()
- else if(atom_storage)
- for(var/obj/item/T in I.contents)
- if(istype(T, /obj/item/book) || istype(T, /obj/item/spellbook))
- atom_storage.attempt_remove(T, src)
- to_chat(user, span_notice("You empty \the [I] into \the [src]."))
- update_appearance()
- else if(IS_WRITING_UTENSIL(I))
- if(!user.can_perform_action(src) || !user.can_write(I))
- return
- var/newname = tgui_input_text(user, "What would you like to title this bookshelf?", "Bookshelf Renaming", max_length = MAX_NAME_LEN)
- if(!user.can_perform_action(src) || !user.can_write(I))
- return
- if(!newname)
- return
- else
- name = "bookcase ([sanitize(newname)])"
- else if(I.tool_behaviour == TOOL_CROWBAR)
- if(length(contents))
- to_chat(user, span_warning("You need to remove the books first!"))
- else
- I.play_tool_sound(src, 100)
- to_chat(user, span_notice("You pry the shelf out."))
- new /obj/item/stack/sheet/mineral/wood(drop_location(), 2)
- state = BOOKCASE_ANCHORED
- update_appearance()
- else
- return ..()
+ if(isbook(attacking_item))
+ if(!user.transferItemToLoc(attacking_item, src))
+ return ..()
+ update_appearance()
+ return
+
+ if(atom_storage)
+ var/found_anything = FALSE
+ for(var/obj/item/T in attacking_item.contents)
+ if(istype(T, /obj/item/book) || istype(T, /obj/item/spellbook))
+ atom_storage.attempt_remove(T, src)
+ found_anything = TRUE
+
+ if (found_anything)
+ balloon_alert(user, "emptied into [src]")
+ update_appearance()
+ return
+
+ if(IS_WRITING_UTENSIL(attacking_item))
+ if(!user.can_perform_action(src) || !user.can_write(attacking_item))
+ return ..()
+ var/newname = tgui_input_text(user, "What would you like to title this bookshelf?", "Bookshelf Renaming", max_length = MAX_NAME_LEN)
+ if(!user.can_perform_action(src) || !user.can_write(attacking_item))
+ return ..()
+ if(!newname)
+ return
+ name = "bookcase ([sanitize(newname)])"
+ return
+
+ if(attacking_item.tool_behaviour == TOOL_CROWBAR)
+ if(length(contents))
+ balloon_alert(user, "remove the books first")
+ return
+ attacking_item.play_tool_sound(src, 100)
+ balloon_alert(user, "pried the shelf out")
+ new /obj/item/stack/sheet/mineral/wood(drop_location(), 2)
+ state = BOOKCASE_ANCHORED
+ update_appearance()
+ return
+
+ return ..()
/obj/structure/bookcase/attack_hand(mob/living/user, list/modifiers)
. = ..()
diff --git a/code/modules/library/skill_learning/generic_skillchips/matrix_flip.dm b/code/modules/library/skill_learning/generic_skillchips/matrix_flip.dm
new file mode 100644
index 00000000000000..a836442eca052b
--- /dev/null
+++ b/code/modules/library/skill_learning/generic_skillchips/matrix_flip.dm
@@ -0,0 +1,40 @@
+#define FLIP_STAMINA_COST 19
+
+/obj/item/skillchip/matrix_flip
+ name = "BULLET_DODGER skillchip"
+ skill_name = "Flip 2 Dodge"
+ skill_description = "At the cost of stamina, your flips can also be used to dodge incoming projectiles."
+ skill_icon = FA_ICON_SPINNER
+ activate_message = span_notice("You feel the urge to flip scenically as if you are the 'Chosen One'.")
+ deactivate_message = span_notice("The urge to flip goes away.")
+
+/obj/item/skillchip/matrix_flip/on_activate(mob/living/carbon/user, silent = FALSE)
+ . = ..()
+ ADD_TRAIT(user, TRAIT_SLOW_FLIP, SKILLCHIP_TRAIT)
+ RegisterSignal(user, COMSIG_MOB_EMOTED("flip"), PROC_REF(on_flip))
+ RegisterSignal(user, COMSIG_MOB_PRE_EMOTED, PROC_REF(check_if_we_can_flip))
+
+/obj/item/skillchip/matrix_flip/on_deactivate(mob/living/carbon/user, silent=FALSE)
+ REMOVE_TRAIT(user, TRAIT_SLOW_FLIP, SKILLCHIP_TRAIT)
+ UnregisterSignal(user, list(COMSIG_MOB_EMOTED("flip"), COMSIG_MOB_PRE_EMOTED))
+ return ..()
+
+///Prevent players from stamcritting from INTENTIONAL flips. 1.4s of bullet immunity isn't worth several secs of stun.
+/obj/item/skillchip/matrix_flip/proc/check_if_we_can_flip(mob/living/source, key, params, type_override, intentional, datum/emote/emote)
+ SIGNAL_HANDLER
+ if(key != "flip" || !intentional)
+ return
+ if((source.maxHealth - (source.getStaminaLoss() + FLIP_STAMINA_COST)) <= source.crit_threshold)
+ source.balloon_alert(source, "too tired!")
+ return COMPONENT_CANT_EMOTE
+
+/obj/item/skillchip/matrix_flip/proc/on_flip(mob/living/source)
+ SIGNAL_HANDLER
+ if(HAS_TRAIT_FROM(source, TRAIT_UNHITTABLE_BY_PROJECTILES, SKILLCHIP_TRAIT))
+ return
+ playsound(source, 'sound/weapons/fwoosh.ogg', 90, FALSE, frequency = 0.7)
+ ADD_TRAIT(source, TRAIT_UNHITTABLE_BY_PROJECTILES, SKILLCHIP_TRAIT)
+ source.adjustStaminaLoss(FLIP_STAMINA_COST)
+ addtimer(TRAIT_CALLBACK_REMOVE(source, TRAIT_UNHITTABLE_BY_PROJECTILES, SKILLCHIP_TRAIT), FLIP_EMOTE_DURATION * 2)
+
+#undef FLIP_STAMINA_COST
diff --git a/code/modules/library/skill_learning/skillchip.dm b/code/modules/library/skill_learning/skillchip.dm
index ae40b84c64be9d..cc284b91454aa0 100644
--- a/code/modules/library/skill_learning/skillchip.dm
+++ b/code/modules/library/skill_learning/skillchip.dm
@@ -499,28 +499,3 @@
skill_icon = FA_ICON_DRUMSTICK_BITE
activate_message = span_notice("You think of your favourite food and realise that you can rotate its flavour in your mind.")
deactivate_message = span_notice("You feel your food-based mind palace crumbling...")
-
-/obj/item/skillchip/matrix_flip
- name = "BULLET_DODGER skillchip"
- skill_name = "Flip 2 Dodge"
- skill_description = "At the cost of stamina, your flips can also be used to dodge incoming projectiles."
- skill_icon = FA_ICON_SPINNER
- activate_message = span_notice("You feel the urge to flip scenically as if you are the 'Chosen One'.")
- deactivate_message = span_notice("The urge to flip goes away.")
-
-/obj/item/skillchip/matrix_flip/on_activate(mob/living/carbon/user, silent = FALSE)
- . = ..()
- RegisterSignal(user, COMSIG_MOB_EMOTED("flip"), PROC_REF(on_flip))
-
-/obj/item/skillchip/matrix_flip/on_deactivate(mob/living/carbon/user, silent=FALSE)
- UnregisterSignal(user, COMSIG_MOB_EMOTED("flip"))
- return ..()
-
-/obj/item/skillchip/matrix_flip/proc/on_flip(mob/living/source)
- SIGNAL_HANDLER
- if(HAS_TRAIT_FROM(source, TRAIT_UNHITTABLE_BY_PROJECTILES, SKILLCHIP_TRAIT))
- return
- playsound(source, 'sound/weapons/fwoosh.ogg', 90, FALSE)
- ADD_TRAIT(source, TRAIT_UNHITTABLE_BY_PROJECTILES, SKILLCHIP_TRAIT)
- source.adjustStaminaLoss(20)
- addtimer(TRAIT_CALLBACK_REMOVE(source, TRAIT_UNHITTABLE_BY_PROJECTILES, SKILLCHIP_TRAIT), FLIP_EMOTE_DURATION + 0.1 SECONDS)
diff --git a/code/modules/lighting/lighting_source.dm b/code/modules/lighting/lighting_source.dm
index 1a32686aa19295..30c239160e5a68 100644
--- a/code/modules/lighting/lighting_source.dm
+++ b/code/modules/lighting/lighting_source.dm
@@ -95,6 +95,7 @@
LAZYADD(new_atom_host.light_sources, src)
if(ismovable(new_atom_host) && new_atom_host == source_atom)
RegisterSignal(new_atom_host, COMSIG_MOVABLE_MOVED, PROC_REF(update_host_lights))
+ RegisterSignal(new_atom_host, COMSIG_TURF_NO_LONGER_BLOCK_LIGHT, PROC_REF(force_update))
return TRUE
///remove this light source from old_atom_host's light_sources list, unsetting movement registrations
@@ -105,6 +106,7 @@
LAZYREMOVE(old_atom_host.light_sources, src)
if(ismovable(old_atom_host) && old_atom_host == source_atom)
UnregisterSignal(old_atom_host, COMSIG_MOVABLE_MOVED)
+ UnregisterSignal(old_atom_host, COMSIG_TURF_NO_LONGER_BLOCK_LIGHT)
return TRUE
// Yes this doesn't align correctly on anything other than 4 width tabs.
diff --git a/code/modules/lighting/lighting_turf.dm b/code/modules/lighting/lighting_turf.dm
index 26ebbd1ba4e29d..949d9b59b8f307 100644
--- a/code/modules/lighting/lighting_turf.dm
+++ b/code/modules/lighting/lighting_turf.dm
@@ -88,6 +88,9 @@
else //If fulltile and opaque, then the whole tile blocks view, no need to continue checking.
directional_opacity = ALL_CARDINALS
break
+ else
+ for(var/atom/movable/content as anything in contents)
+ SEND_SIGNAL(content, COMSIG_TURF_NO_LONGER_BLOCK_LIGHT)
if(. != directional_opacity && (. == ALL_CARDINALS || directional_opacity == ALL_CARDINALS))
reconsider_lights() //The lighting system only cares whether the tile is fully concealed from all directions or not.
diff --git a/code/modules/loadout/loadout_items.dm b/code/modules/loadout/loadout_items.dm
index 4c7d92324720fe..b4a51206392505 100644
--- a/code/modules/loadout/loadout_items.dm
+++ b/code/modules/loadout/loadout_items.dm
@@ -83,7 +83,7 @@ GLOBAL_LIST_INIT(all_loadout_categories, init_loadout_categories())
if(can_be_greyscale == DONT_GREYSCALE)
can_be_greyscale = FALSE
- else if(item_path::flags_1 & IS_PLAYER_COLORABLE_1)
+ else if((item_path::flags_1 & IS_PLAYER_COLORABLE_1) && item_path::greyscale_config && item_path::greyscale_colors)
can_be_greyscale = TRUE
if(isnull(name))
diff --git a/code/modules/mafia/outfits.dm b/code/modules/mafia/outfits.dm
index 3b805bd92f9c03..0fdc90c2f32130 100644
--- a/code/modules/mafia/outfits.dm
+++ b/code/modules/mafia/outfits.dm
@@ -89,7 +89,7 @@
name = "Mafia Security Officer"
uniform = /obj/item/clothing/under/rank/security/officer
- gloves = /obj/item/clothing/gloves/color/black
+ gloves = /obj/item/clothing/gloves/color/black/security
head = /obj/item/clothing/head/helmet/sec
suit = /obj/item/clothing/suit/armor/vest/alt
shoes = /obj/item/clothing/shoes/jackboots
@@ -116,7 +116,7 @@
uniform = /obj/item/clothing/under/rank/security/head_of_security
shoes = /obj/item/clothing/shoes/jackboots
suit = /obj/item/clothing/suit/armor/hos/trenchcoat
- gloves = /obj/item/clothing/gloves/color/black
+ gloves = /obj/item/clothing/gloves/color/black/security
head = /obj/item/clothing/head/hats/hos/beret
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
@@ -126,7 +126,7 @@
uniform = /obj/item/clothing/under/rank/security/warden
shoes = /obj/item/clothing/shoes/jackboots
suit = /obj/item/clothing/suit/armor/vest/warden/alt
- gloves = /obj/item/clothing/gloves/color/black
+ gloves = /obj/item/clothing/gloves/color/black/security
head = /obj/item/clothing/head/hats/warden/red
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
diff --git a/code/modules/mapfluff/ruins/icemoonruin_code/library.dm b/code/modules/mapfluff/ruins/icemoonruin_code/library.dm
index 1de9ce2dc728c7..2f3b6381f0484e 100644
--- a/code/modules/mapfluff/ruins/icemoonruin_code/library.dm
+++ b/code/modules/mapfluff/ruins/icemoonruin_code/library.dm
@@ -5,6 +5,18 @@
puzzle_id = "library"
open_message = "The door opens with a loud creak."
+/obj/machinery/door/puzzle/keycard/library/animation_length(animation)
+ switch(animation)
+ if(DOOR_OPENING_ANIMATION)
+ return 1.2 SECONDS
+
+/obj/machinery/door/puzzle/keycard/library/animation_segment_delay(animation)
+ switch(animation)
+ if(DOOR_OPENING_PASSABLE)
+ return 1.0 SECONDS
+ if(DOOR_OPENING_FINISHED)
+ return 1.2 SECONDS
+
/obj/item/keycard/library
name = "golden key"
desc = "A dull, golden key."
diff --git a/code/modules/mapfluff/ruins/objects_and_mobs/museum.dm b/code/modules/mapfluff/ruins/objects_and_mobs/museum.dm
index 1c0a5392fb9b25..57f20abb1aa190 100644
--- a/code/modules/mapfluff/ruins/objects_and_mobs/museum.dm
+++ b/code/modules/mapfluff/ruins/objects_and_mobs/museum.dm
@@ -78,15 +78,15 @@
desc = /obj/machinery/atmospherics/components/unary/vent_scrubber::desc
icon = /obj/machinery/atmospherics/components/unary/vent_scrubber::icon
layer = /obj/machinery/atmospherics/components/unary/vent_scrubber::layer
- plane = FLOOR_PLANE
+ plane = /obj/machinery/atmospherics/components/unary/vent_scrubber::plane
icon_state = "scrub_on"
/obj/structure/fluff/fake_vent
name = /obj/machinery/atmospherics/components/unary/vent_pump::name
desc = /obj/machinery/atmospherics/components/unary/vent_pump::desc
icon = /obj/machinery/atmospherics/components/unary/vent_pump::icon
- layer = /obj/machinery/atmospherics/components/unary/vent_scrubber::layer
- plane = FLOOR_PLANE
+ layer = /obj/machinery/atmospherics/components/unary/vent_pump::layer
+ plane = /obj/machinery/atmospherics/components/unary/vent_pump::plane
icon_state = "vent_out"
/turf/open/mirage
diff --git a/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm b/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm
index 8dc9cec326d953..860eb8c8168826 100644
--- a/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm
+++ b/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm
@@ -15,6 +15,7 @@
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
light_range = 8
light_color = LIGHT_COLOR_LAVA
+ can_atmos_pass = ATMOS_PASS_DENSITY
var/open = FALSE
var/changing_openness = FALSE
var/locked = FALSE
diff --git a/code/modules/mapfluff/ruins/spaceruin_code/TheDerelict.dm b/code/modules/mapfluff/ruins/spaceruin_code/TheDerelict.dm
index 3507cb7d94746c..ce50fcccc1568c 100644
--- a/code/modules/mapfluff/ruins/spaceruin_code/TheDerelict.dm
+++ b/code/modules/mapfluff/ruins/spaceruin_code/TheDerelict.dm
@@ -213,7 +213,7 @@
"\[15:29\] USELESS clown",
"\[15:35\] And BATSHIT fucking janitors",
"\[15:46\] That includes the crotchety fucking IBM piece of shit we're supposed to call an AI",
- "\[15:52\] And it's legion of cyborg assholes",
+ "\[15:52\] And its legion of cyborg assholes",
"\[15:58\] If this wasn't bad enough there is the wizards federation to worry about",
"\[16:06\] Crazy bastards",
"\[16:10\] What can be worse than a bunch of plasma-humping-space-freaks?",
@@ -244,7 +244,7 @@
"\[47:32\] Once they called me captain, but when it's all said and done",
"\[47:41\] I'll be a hero",
"\[47:45\] If you run across this transmission by chance",
- "\[47:52\] Get you pudgy little nerd ass over to Space Station 13 and start busting heads.",
+ "\[47:52\] Get your pudgy little nerd ass over to Space Station 13 and start busting heads.",
"\[48:00\] (farting noises)",
)
timestamp = list(
diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm
index e830718e12ed6a..587a62ec0e1b72 100644
--- a/code/modules/mapping/mapping_helpers.dm
+++ b/code/modules/mapping/mapping_helpers.dm
@@ -267,6 +267,16 @@
else
airlock.autoname = TRUE
+/obj/effect/mapping_helpers/airlock/inaccessible
+ name = "airlock inaccessible helper"
+ icon_state = "airlock_inaccessible"
+
+/obj/effect/mapping_helpers/airlock/inaccessible/payload(obj/machinery/door/airlock/airlock)
+ if(airlock.req_one_access != null)
+ log_mapping("[src] at [AREACOORD(src)] tried to set req_access, but req__one_access was already set!")
+ else
+ airlock.req_access += list(ACCESS_INACCESSIBLE)
+
//air alarm helpers
/obj/effect/mapping_helpers/airalarm
desc = "You shouldn't see this. Report it please."
diff --git a/code/modules/mapping/preloader.dm b/code/modules/mapping/preloader.dm
index b01ca83a8a24de..6ac3fd75f963c0 100644
--- a/code/modules/mapping/preloader.dm
+++ b/code/modules/mapping/preloader.dm
@@ -30,7 +30,7 @@ GLOBAL_LIST_INIT(_preloader_path, null)
what.vars[attribute] = value
/// Template noop (no operation) is used to skip a turf or area when the template is loaded this allows for template transparency
-/// ex. if a ship has gaps in it's design, you would use template_noop to fill these in so that when the ship moves z-level, any
+/// ex. if a ship has gaps in its design, you would use template_noop to fill these in so that when the ship moves z-level, any
/// tiles these gaps land on will not be deleted and replaced with the ships (empty) tiles
/area/template_noop
name = "Area Passthrough"
diff --git a/code/modules/meteors/meteor_dark_matteor.dm b/code/modules/meteors/meteor_dark_matteor.dm
index f72bbcff6fa134..18dbaf007024f0 100644
--- a/code/modules/meteors/meteor_dark_matteor.dm
+++ b/code/modules/meteors/meteor_dark_matteor.dm
@@ -32,7 +32,7 @@
START_PROCESSING(SSobj, src)
/obj/effect/meteor/dark_matteor/process(seconds_per_tick)
- //meteor's warp quickly contracts then slowly expands it's ring
+ //meteor's warp quickly contracts then slowly expands its ring
animate(warp, time = seconds_per_tick*3, transform = matrix().Scale(0.5,0.5))
animate(time = seconds_per_tick*7, transform = matrix())
diff --git a/code/modules/mining/boulder_processing/_boulder_processing.dm b/code/modules/mining/boulder_processing/_boulder_processing.dm
index 5795eed1d74900..ab72e4ebae57b6 100644
--- a/code/modules/mining/boulder_processing/_boulder_processing.dm
+++ b/code/modules/mining/boulder_processing/_boulder_processing.dm
@@ -15,7 +15,7 @@
var/boulders_held_max = 1
/// What sound plays when a thing operates?
var/usage_sound = 'sound/machines/mining/wooping_teleport.ogg'
- /// Silo link to it's materials list.
+ /// Silo link to its materials list.
var/datum/component/remote_materials/silo_materials
/// Mining points held by the machine for miners.
var/points_held = 0
diff --git a/code/modules/mining/equipment/grapple_gun.dm b/code/modules/mining/equipment/grapple_gun.dm
index 4e61b5d0fb3fd5..76da071ec6e2d8 100644
--- a/code/modules/mining/equipment/grapple_gun.dm
+++ b/code/modules/mining/equipment/grapple_gun.dm
@@ -41,8 +41,8 @@
if(target == user || !hooked)
return NONE
- if(!lavaland_equipment_pressure_check(get_turf(user)))
- user.balloon_alert(user, "gun mechanism wont work here!")
+ if(!lavaland_equipment_pressure_check(get_turf(user)) && !(obj_flags & EMAGGED))
+ user.balloon_alert(user, "gun mechanism won't work here!")
return ITEM_INTERACT_BLOCKING
if(get_dist(user, target) > 9)
user.balloon_alert(user, "too far away!")
@@ -73,6 +73,14 @@
update_appearance()
return ITEM_INTERACT_SUCCESS
+/obj/item/grapple_gun/emag_act(mob/user, obj/item/card/emag/emag_card)
+ . = ..()
+ if(obj_flags & EMAGGED)
+ return FALSE
+ balloon_alert(user, "pressure settings overloaded")
+ obj_flags |= EMAGGED
+ return TRUE
+
/obj/item/grapple_gun/proc/on_grapple_hit(datum/source, atom/movable/firer, atom/target, Angle)
SIGNAL_HANDLER
diff --git a/code/modules/mining/lavaland/tendril_loot.dm b/code/modules/mining/lavaland/tendril_loot.dm
index 27748135cbb44e..d49f1e6b02abbe 100644
--- a/code/modules/mining/lavaland/tendril_loot.dm
+++ b/code/modules/mining/lavaland/tendril_loot.dm
@@ -246,13 +246,13 @@
inhand_icon_state = "lantern-blue"
wisp.orbit(user, 20)
SSblackbox.record_feedback("tally", "wisp_lantern", 1, "Freed")
+ return
- else
- to_chat(user, span_notice("You return the wisp to the lantern."))
- icon_state = "lantern-blue-on"
- inhand_icon_state = "lantern-blue-on"
- wisp.forceMove(src)
- SSblackbox.record_feedback("tally", "wisp_lantern", 1, "Returned")
+ to_chat(user, span_notice("You return the wisp to the lantern."))
+ icon_state = "lantern-blue-on"
+ inhand_icon_state = "lantern-blue-on"
+ wisp.forceMove(src)
+ SSblackbox.record_feedback("tally", "wisp_lantern", 1, "Returned")
/obj/item/wisp_lantern/Initialize(mapload)
. = ..()
@@ -278,26 +278,30 @@
light_flags = LIGHT_ATTACHED
layer = ABOVE_ALL_MOB_LAYER
plane = ABOVE_GAME_PLANE
- var/sight_flags = SEE_MOBS
var/list/color_cutoffs = list(10, 25, 25)
/obj/effect/wisp/orbit(atom/thing, radius, clockwise, rotation_speed, rotation_segments, pre_rotation, lockinorbit)
. = ..()
- if(ismob(thing))
- RegisterSignal(thing, COMSIG_MOB_UPDATE_SIGHT, PROC_REF(update_user_sight))
- var/mob/being = thing
- being.update_sight()
- to_chat(thing, span_notice("The wisp enhances your vision."))
+ if(!ismob(thing))
+ return
+ var/mob/being = thing
+ RegisterSignal(being, COMSIG_MOB_UPDATE_SIGHT, PROC_REF(update_user_sight))
+ to_chat(being, span_notice("The wisp enhances your vision."))
+ ADD_TRAIT(being, TRAIT_THERMAL_VISION, REF(src))
+ being.update_sight()
/obj/effect/wisp/stop_orbit(datum/component/orbiter/orbits)
- . = ..()
- if(ismob(orbits.parent))
- UnregisterSignal(orbits.parent, COMSIG_MOB_UPDATE_SIGHT)
- to_chat(orbits.parent, span_notice("Your vision returns to normal."))
+ if(!ismob(orbit_target))
+ return ..()
+ var/mob/being = orbit_target
+ UnregisterSignal(being, COMSIG_MOB_UPDATE_SIGHT)
+ to_chat(being, span_notice("Your vision returns to normal."))
+ REMOVE_TRAIT(being, TRAIT_THERMAL_VISION, REF(src))
+ being.update_sight()
+ return ..()
/obj/effect/wisp/proc/update_user_sight(mob/user)
SIGNAL_HANDLER
- user.add_sight(sight_flags)
if(!isnull(color_cutoffs))
user.lighting_color_cutoffs = blend_cutoff_colors(user.lighting_color_cutoffs, color_cutoffs)
@@ -773,7 +777,7 @@
user.physiology.brute_mod *= 0.5
user.next_move_modifier *= BERSERK_ATTACK_SPEED_MODIFIER
user.add_atom_colour(COLOR_BUBBLEGUM_RED, TEMPORARY_COLOUR_PRIORITY)
- ADD_TRAIT(user, TRAIT_NOGUNS, BERSERK_TRAIT)
+ user.add_traits(list(TRAIT_NOGUNS, TRAIT_TOSS_GUN_HARD), BERSERK_TRAIT)
ADD_TRAIT(src, TRAIT_NODROP, BERSERK_TRAIT)
berserk_active = TRUE
START_PROCESSING(SSobj, src)
@@ -791,7 +795,7 @@
user.physiology.brute_mod *= 2
user.next_move_modifier /= BERSERK_ATTACK_SPEED_MODIFIER
user.remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, COLOR_BUBBLEGUM_RED)
- REMOVE_TRAIT(user, TRAIT_NOGUNS, BERSERK_TRAIT)
+ user.remove_traits(list(TRAIT_NOGUNS, TRAIT_TOSS_GUN_HARD), BERSERK_TRAIT)
REMOVE_TRAIT(src, TRAIT_NODROP, BERSERK_TRAIT)
STOP_PROCESSING(SSobj, src)
diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm
index 385afb0f81f3e8..c8a58a1d0f4930 100644
--- a/code/modules/mining/machine_stacking.dm
+++ b/code/modules/mining/machine_stacking.dm
@@ -13,7 +13,7 @@
/obj/machinery/mineral/stacking_unit_console/Initialize(mapload)
. = ..()
var/area/our_area = get_area(src)
- if(!isnull(our_area))
+ if(isnull(our_area))
return
var/list/turf_list = our_area.get_turfs_by_zlevel(z)
if(!islist(turf_list))
@@ -127,13 +127,16 @@
if(istype(AM, /obj/item/stack/sheet) && AM.loc == get_step(src, input_dir))
process_sheet(AM)
-/obj/machinery/mineral/stacking_machine/multitool_act(mob/living/user, obj/item/multitool/M)
- if(istype(M))
- if(istype(M.buffer, /obj/machinery/mineral/stacking_unit_console))
- console = M.buffer
- console.machine = src
- to_chat(user, span_notice("You link [src] to the console in [M]'s buffer."))
- return TRUE
+/obj/machinery/mineral/stacking_machine/multitool_act(mob/living/user, obj/item/multitool/multi_tool)
+ if(user.combat_mode || multi_tool.item_flags & ABSTRACT || multi_tool.flags_1 & HOLOGRAM_1)
+ return ITEM_INTERACT_SKIP_TO_ATTACK
+
+ . = ITEM_INTERACT_BLOCKING
+ if(istype(multi_tool.buffer, /obj/machinery/mineral/stacking_unit_console))
+ console = multi_tool.buffer
+ console.machine = src
+ to_chat(user, span_notice("You link [src] to the console in [multi_tool]'s buffer."))
+ return ITEM_INTERACT_SUCCESS
/obj/machinery/mineral/stacking_machine/proc/rotate(input)
if (input)
diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm
index d2a9af576ce42b..5d9809a01f7987 100644
--- a/code/modules/mining/ores_coins.dm
+++ b/code/modules/mining/ores_coins.dm
@@ -406,7 +406,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
/*****************************Coin********************************/
-// The coin's value is a value of it's materials.
+// The coin's value is a value of its materials.
// Yes, the gold standard makes a come-back!
// This is the only way to make coins that are possible to produce on station actually worth anything.
/obj/item/coin
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 54678d2399c48c..7f38332aa7a146 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -520,6 +520,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
. = ..()
//restart our floating animation after orbit is done.
pixel_y = base_pixel_y
+ // if we were autoobserving, reset perspective
+ if (!isnull(client) && !isnull(client.eye))
+ reset_perspective(null)
/mob/dead/observer/verb/jumptomob() //Moves the ghost instead of just changing the ghosts's eye -Nodrak
set category = "Ghost"
diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm
index ee0b4528995efe..bdb0b7ce37e889 100644
--- a/code/modules/mob/dead/observer/orbit.dm
+++ b/code/modules/mob/dead/observer/orbit.dm
@@ -211,13 +211,25 @@ GLOBAL_DATUM_INIT(orbit_menu, /datum/orbit_menu, new)
if(issilicon(player))
serialized["job"] = player.job
serialized["icon"] = "borg"
- else
- var/obj/item/card/id/id_card = player.get_idcard(hand_first = FALSE)
- serialized["job"] = id_card?.get_trim_assignment()
- serialized["icon"] = id_card?.get_trim_sechud_icon_state()
+ return serialized
- return serialized
+ var/obj/item/card/id/id_card = player.get_idcard(hand_first = FALSE)
+ serialized["job"] = id_card?.get_trim_assignment()
+ serialized["icon"] = id_card?.get_trim_sechud_icon_state()
+
+ var/datum/job/job = player.mind?.assigned_role
+ if (isnull(job))
+ return serialized
+ serialized["mind_job"] = job.title
+ var/datum/outfit/outfit = job.get_outfit()
+ if (isnull(outfit))
+ return serialized
+
+ var/datum/id_trim/trim = outfit.id_trim
+ if (!isnull(trim))
+ serialized["mind_icon"] = trim::sechud_icon_state
+ return serialized
/// Gets a list: Misc data and whether it's critical. Handles all snowflakey type cases
/datum/orbit_menu/proc/get_misc_data(atom/movable/atom_poi) as /list
diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm
index 58429ab5404f3a..021960395d086f 100644
--- a/code/modules/mob/emote.dm
+++ b/code/modules/mob/emote.dm
@@ -27,14 +27,19 @@
to_chat(src, span_notice("'[act]' emote does not exist. Say *help for a list."))
return FALSE
var/silenced = FALSE
- for(var/datum/emote/P in key_emotes)
- if(!P.check_cooldown(src, intentional))
+ for(var/datum/emote/emote in key_emotes)
+ if(!emote.check_cooldown(src, intentional))
silenced = TRUE
continue
- if(P.run_emote(src, param, m_type, intentional))
- SEND_SIGNAL(src, COMSIG_MOB_EMOTE, P, act, m_type, message, intentional)
- SEND_SIGNAL(src, COMSIG_MOB_EMOTED(P.key))
- return TRUE
+ if(!emote.can_run_emote(src, TRUE, intentional, param))
+ continue
+ if(SEND_SIGNAL(src, COMSIG_MOB_PRE_EMOTED, emote.key, param, m_type, intentional, emote) & COMPONENT_CANT_EMOTE)
+ silenced = TRUE
+ continue
+ emote.run_emote(src, param, m_type, intentional)
+ SEND_SIGNAL(src, COMSIG_MOB_EMOTE, emote, act, m_type, message, intentional)
+ SEND_SIGNAL(src, COMSIG_MOB_EMOTED(emote.key))
+ return TRUE
src.nextsoundemote = world.time // SKYRAT EDIT ADDITION
if(intentional && !silenced && !force_silence)
to_chat(src, span_notice("Unusable emote '[act]'. Say *help for a list."))
@@ -79,11 +84,15 @@
/datum/emote/flip/run_emote(mob/user, params , type_override, intentional)
. = ..()
- if(.)
- user.SpinAnimation(FLIP_EMOTE_DURATION,1)
+ user.SpinAnimation(HAS_TRAIT(user, TRAIT_SLOW_FLIP) ? FLIP_EMOTE_DURATION * 2 : FLIP_EMOTE_DURATION, 1)
/datum/emote/flip/check_cooldown(mob/user, intentional)
+ var/slow_flipper = HAS_TRAIT(user, TRAIT_SLOW_FLIP)
+ if(slow_flipper)
+ cooldown *= 2
. = ..()
+ if(slow_flipper)
+ cooldown *= 0.5
if(.)
return
if(!can_run_emote(user, intentional=intentional))
@@ -113,8 +122,7 @@
/datum/emote/spin/run_emote(mob/user, params, type_override, intentional)
. = ..()
- if(.)
- user.spin(20, 1)
+ user.spin(20, 1)
/datum/emote/spin/check_cooldown(mob/living/carbon/user, intentional)
. = ..()
diff --git a/code/modules/mob/living/basic/bots/_bots.dm b/code/modules/mob/living/basic/bots/_bots.dm
index 22ab453226912c..aad840aa185485 100644
--- a/code/modules/mob/living/basic/bots/_bots.dm
+++ b/code/modules/mob/living/basic/bots/_bots.dm
@@ -113,7 +113,7 @@ GLOBAL_LIST_INIT(command_strings, list(
RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(handle_loop_movement))
RegisterSignal(src, COMSIG_ATOM_WAS_ATTACKED, PROC_REF(after_attacked))
RegisterSignal(src, COMSIG_MOB_TRIED_ACCESS, PROC_REF(attempt_access))
- ADD_TRAIT(src, TRAIT_NO_GLIDE, INNATE_TRAIT)
+ add_traits(list(TRAIT_NO_GLIDE, TRAIT_SILICON_EMOTES_ALLOWED), INNATE_TRAIT)
GLOB.bots_list += src
// Give bots a fancy new ID card that can hold any access.
@@ -142,9 +142,6 @@ GLOBAL_LIST_INIT(command_strings, list(
var/datum/atom_hud/datahud = GLOB.huds[data_hud_type]
datahud.show_to(src)
- if(HAS_TRAIT(SSstation, STATION_TRAIT_BOTS_GLITCHED))
- randomize_language_if_on_station()
-
if(mapload && is_station_level(z) && (bot_mode_flags & BOT_MODE_CAN_BE_SAPIENT) && (bot_mode_flags & BOT_MODE_ROUNDSTART_POSSESSION))
enable_possession(mapload = mapload)
diff --git a/code/modules/mob/living/basic/bots/firebot/firebot.dm b/code/modules/mob/living/basic/bots/firebot/firebot.dm
index 31fa969fa59837..e6eeaa2031cc68 100644
--- a/code/modules/mob/living/basic/bots/firebot/firebot.dm
+++ b/code/modules/mob/living/basic/bots/firebot/firebot.dm
@@ -74,15 +74,15 @@
internal_ext.refill()
/mob/living/basic/bot/firebot/melee_attack(atom/attacked_atom, list/modifiers, ignore_cooldown = FALSE)
- use_extinguisher(attacked_atom)
+ use_extinguisher(attacked_atom, modifiers)
/mob/living/basic/bot/firebot/RangedAttack(atom/attacked_atom, list/modifiers)
- use_extinguisher(attacked_atom)
+ use_extinguisher(attacked_atom, modifiers)
-/mob/living/basic/bot/firebot/proc/use_extinguisher(atom/attacked_atom)
+/mob/living/basic/bot/firebot/proc/use_extinguisher(atom/attacked_atom, list/modifiers)
if(!(bot_mode_flags & BOT_MODE_ON))
return
- spray_water(attacked_atom)
+ spray_water(attacked_atom, modifiers)
/mob/living/basic/bot/firebot/emag_act(mob/user, obj/item/card/emag/emag_card)
. = ..()
@@ -137,12 +137,12 @@
foam.start()
COOLDOWN_START(src, foam_cooldown, FOAM_INTERVAL)
-/mob/living/basic/bot/firebot/proc/spray_water(atom/attacked_atom)
+/mob/living/basic/bot/firebot/proc/spray_water(atom/attacked_atom, list/modifiers)
if(firebot_mode_flags & FIREBOT_STATIONARY_MODE)
flick("firebots_use", src)
else
flick("firebot1_use", src)
- internal_ext?.melee_attack_chain(src, attacked_atom)
+ internal_ext?.interact_with_atom(attacked_atom, src, modifiers)
/mob/living/basic/bot/firebot/update_icon_state()
. = ..()
diff --git a/code/modules/mob/living/basic/cult/constructs/_construct.dm b/code/modules/mob/living/basic/cult/constructs/_construct.dm
index 79e6e7487721be..1c5e91b50c2634 100644
--- a/code/modules/mob/living/basic/cult/constructs/_construct.dm
+++ b/code/modules/mob/living/basic/cult/constructs/_construct.dm
@@ -35,7 +35,7 @@
/// Flavor text shown to players when they spawn as this construct
var/playstyle_string = "You are a generic construct. Your job is to not exist, and you should probably adminhelp this."
/// The construct's master
- var/master = null
+ var/mob/construct_master = null
/// Whether this construct is currently seeking nar nar
var/seeking = FALSE
/// Whether this construct can repair other constructs or cult buildings. Gets the healing_touch component if so.
diff --git a/code/modules/mob/living/basic/cult/constructs/harvester.dm b/code/modules/mob/living/basic/cult/constructs/harvester.dm
index 6d41bb43f26a16..b48a26b6819370 100644
--- a/code/modules/mob/living/basic/cult/constructs/harvester.dm
+++ b/code/modules/mob/living/basic/cult/constructs/harvester.dm
@@ -80,9 +80,9 @@
var/datum/objective/eldergod/summon_objective = locate() in cult_status.cult_team.objectives
if(summon_objective.check_completion())
- the_construct.master = cult_status.cult_team.blood_target
+ the_construct.construct_master = cult_status.cult_team.blood_target
- if(!the_construct.master)
+ if(!the_construct.construct_master)
to_chat(the_construct, span_cult_italic("You have no master to seek!"))
the_construct.seeking = FALSE
return
@@ -122,8 +122,8 @@
to_chat(the_construct, span_cult_italic("Nar'Sie has completed her harvest!"))
return
- the_construct.master = pick(GLOB.cult_narsie.souls_needed)
- var/mob/living/real_target = the_construct.master //We can typecast this way because Narsie only allows /mob/living into the souls list
+ the_construct.construct_master = pick(GLOB.cult_narsie.souls_needed)
+ var/mob/living/real_target = the_construct.construct_master //We can typecast this way because Narsie only allows /mob/living into the souls list
to_chat(the_construct, span_cult_italic("You are now tracking your prey, [real_target.real_name] - harvest [real_target.p_them()]!"))
desc = "Activate to track Nar'Sie!"
button_icon_state = "sintouch"
@@ -150,21 +150,26 @@
lighting_cutoff_red = 10
lighting_cutoff_green = 20
lighting_cutoff_blue = 5
- playstyle_string = "You are a Rusted Harvester, built to serve the Sanguine Apostate, twisted to work the will of the Mansus. You are fragile and weak, but you rend cultists (only) apart on each attack. Follow your Master's orders!"
+ playstyle_string = span_bold("You are a Rusted Harvester, built to serve the Sanguine Apostate, twisted to work the will of the Mansus. You are fragile and weak, but you rend cultists (only) apart on each attack. Follow your Master's orders!")
theme = THEME_HERETIC
/mob/living/basic/construct/harvester/heretic/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_MANSUS_TOUCHED, REF(src))
add_filter("rusted_harvester", 3, list("type" = "outline", "color" = COLOR_GREEN, "size" = 2, "alpha" = 40))
+ RegisterSignal(src, COMSIG_MIND_TRANSFERRED, TYPE_PROC_REF(/datum/mind, enslave_mind_to_creator))
+ RegisterSignal(src, COMSIG_MOB_ENSLAVED_TO, PROC_REF(link_master))
+/mob/living/basic/construct/harvester/heretic/proc/link_master(mob/self, mob/master)
+ src.construct_master = master
+ RegisterSignal(construct_master, COMSIG_LIVING_DEATH, PROC_REF(on_master_death))
+ SIGNAL_HANDLER
-/**
- * Somewhat janky proc called when a heretic monster's master dies
- * Used to kill any living Rusted Harvester
- */
-/mob/living/proc/on_master_death()
- return
+/mob/living/basic/construct/harvester/heretic/proc/on_master_death(mob/self, mob/master)
+ SIGNAL_HANDLER
+ to_chat(src, span_userdanger("Your link to the mansus suddenly snaps as your master [construct_master] perishes! Without [construct_master.p_their()] support, your body crumbles..."))
+ visible_message(span_alert("[src] suddenly crumbles to dust!"))
+ death()
/mob/living/basic/construct/harvester/heretic/attack_animal(mob/living/simple_animal/user, list/modifiers)
// They're pretty fragile so this is probably necessary to prevent bullshit deaths.
@@ -172,11 +177,6 @@
return
return ..()
-/mob/living/basic/construct/harvester/heretic/on_master_death()
- to_chat(src, span_userdanger("Your link to the mansus suddenly snaps as your master perishes! Without its support, your body crumbles..."))
- visible_message(span_alert("[src] suddenly crumbles to dust!"))
- death()
-
/mob/living/basic/construct/harvester/heretic/grant_abilities()
AddElement(/datum/element/wall_walker, or_trait = TRAIT_RUSTY)
AddElement(/datum/element/leeching_walk)
@@ -233,9 +233,6 @@
. = ..()
the_construct = Target
the_construct.seeking = TRUE
- var/datum/antagonist/heretic_monster/antag = IS_HERETIC_MONSTER(the_construct)
- if(antag)
- the_construct.master = antag.master
// no real reason for most of this weird oldcode
/datum/action/innate/seek_master/Activate()
diff --git a/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity.dm b/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity.dm
index ad10e30acecd71..a06ecb9e9b0401 100644
--- a/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity.dm
+++ b/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity.dm
@@ -28,6 +28,14 @@
ai_controller = /datum/ai_controller/basic_controller/lobstrosity
/// Charging ability
var/datum/action/cooldown/mob_cooldown/charge/basic_charge/lobster/charge
+ /// The type of charging ability we give this mob
+ var/charge_type = /datum/action/cooldown/mob_cooldown/charge/basic_charge/lobster
+ /// The pet command for the charging ability we give this mob
+ var/charge_command = /datum/pet_command/point_targeting/use_ability/lob_charge
+ /// At which speed do we amputate limbs
+ var/snip_speed = 5 SECONDS
+ ///Lobstrosities are natural anglers. This rapresent their proficiency at fishing when not mindless
+ var/base_fishing_level = SKILL_LEVEL_APPRENTICE
/// Things we will eat if we see them (arms, chiefly)
var/static/list/target_foods = list(/obj/item/bodypart/arm, /obj/item/fish/lavaloop)
@@ -35,20 +43,17 @@
. = ..()
var/static/list/food_types = list(/obj/item/fish/lavaloop)
ai_controller.set_blackboard_key(BB_BASIC_FOODS, typecacheof(food_types))
- var/static/list/fishing_preset = list(
- /turf/open/lava = /datum/fish_source/lavaland,
- /turf/open/lava/plasma = /datum/fish_source/lavaland/icemoon,
- )
- AddComponent(/datum/component/profound_fisher, npc_fishing_preset = fishing_preset)
+ AddComponent(/datum/component/profound_fisher)
AddElement(/datum/element/mob_grabber)
AddElement(/datum/element/footstep, FOOTSTEP_MOB_CLAW)
AddElement(/datum/element/basic_eating, food_types = target_foods)
AddComponent(\
/datum/component/amputating_limbs,\
+ surgery_time = snip_speed, \
surgery_verb = "begins snipping",\
target_zones = GLOB.arm_zones,\
)
- charge = new(src)
+ charge = new charge_type(src)
charge.Grant(src)
ai_controller.set_blackboard_key(BB_TARGETED_ACTION, charge)
@@ -59,6 +64,35 @@
/mob/living/basic/mining/lobstrosity/ranged_secondary_attack(atom/atom_target, modifiers)
charge.Trigger(target = atom_target)
+/mob/living/basic/mining/lobstrosity/tamed(mob/living/tamer, obj/item/food)
+ new /obj/effect/temp_visual/heart(loc)
+ /// Pet commands for this mob, however you'll have to tame juvenile lobstrosities to a trained adult one.
+ var/list/pet_commands = list(
+ /datum/pet_command/idle,
+ /datum/pet_command/free,
+ /datum/pet_command/point_targeting/attack,
+ charge_command,
+ /datum/pet_command/follow,
+ /datum/pet_command/point_targeting/fish,
+ )
+ AddComponent(/datum/component/happiness)
+ AddComponent(/datum/component/obeys_commands, pet_commands)
+ ai_controller.ai_traits = STOP_MOVING_WHEN_PULLED
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "gently pushes aside"
+ response_disarm_simple = "gently push aside"
+
+/mob/living/basic/mining/lobstrosity/befriend(mob/living/new_friend)
+ . = ..()
+ faction |= new_friend.faction
+ faction -= FACTION_MINING
+
+/mob/living/basic/mining/lobstrosity/mind_initialize()
+ . = ..()
+ if(mind.get_skill_level(/datum/skill/fishing) < base_fishing_level)
+ mind.set_level(/datum/skill/fishing, base_fishing_level, TRUE)
+
/// Lavaland lobster variant, it basically just looks different
/mob/living/basic/mining/lobstrosity/lava
name = "chasm lobstrosity"
@@ -87,5 +121,145 @@
. = ..()
if(!isliving(charger))
return
- var/mob/living/living_charger = charger
- living_charger.apply_status_effect(/datum/status_effect/tired_post_charge)
+ apply_post_charge(charger)
+
+/datum/action/cooldown/mob_cooldown/charge/basic_charge/lobster/proc/apply_post_charge(mob/living/charger)
+ charger.apply_status_effect(/datum/status_effect/tired_post_charge)
+
+///A weaker, yet somewhat faster lobstrosity. Sources include aquarium chasm chrabs, chasms, plasma rivers and perhaps xenobio.
+/mob/living/basic/mining/lobstrosity/juvenile
+ name = "juvenile arctic lobstrosity"
+ desc = "A youngling of the behemothic arctic lobstrosity. They usually stay put in the underground lakes they reside in until they're fully grown."
+ icon_state = "arctic_juveline_lobstrosity"
+ icon_living = "arctic_juveline_lobstrosity"
+ icon_dead = "arctic_juveline_lobstrosity_dead"
+ status_flags = parent_type::status_flags | CANPUSH
+ maxHealth = 65
+ health = 65
+ obj_damage = 6
+ melee_damage_lower = 6
+ melee_damage_upper = 9
+ melee_attack_cooldown = 0.9 SECONDS
+ speed = 0.7
+ mob_size = MOB_SIZE_HUMAN
+ butcher_results = list(
+ /obj/item/food/meat/slab/rawcrab = 1,
+ /obj/item/stack/sheet/bone = 1,
+ /obj/item/organ/internal/monster_core/rush_gland = 1,
+ )
+ crusher_loot = null
+ ai_controller = /datum/ai_controller/basic_controller/lobstrosity/juvenile
+ snip_speed = 6.5 SECONDS
+ charge_type = /datum/action/cooldown/mob_cooldown/charge/basic_charge/lobster/shrimp
+ charge_command = /datum/pet_command/point_targeting/use_ability/lob_charge/shrimp
+ base_fishing_level = SKILL_LEVEL_NOVICE
+ /// What do we become when we grow up?
+ var/mob/living/basic/mining/lobstrosity/grow_type = /mob/living/basic/mining/lobstrosity
+ /// Were we tamed? If yes, tame the mob we become when we grow up too.
+ var/was_tamed = FALSE
+
+/mob/living/basic/mining/lobstrosity/juvenile/Initialize(mapload)
+ . = ..()
+ var/growth_step = 1000/(8 MINUTES) //It should take 8 minutes if you keep the happiness above 40% and at most 14
+ AddComponent(\
+ /datum/component/growth_and_differentiation,\
+ growth_path = grow_type,\
+ growth_probability = 58,\
+ lower_growth_value = growth_step,\
+ upper_growth_value = growth_step,\
+ scale_with_happiness = TRUE,\
+ optional_checks = CALLBACK(src, PROC_REF(ready_to_grow)),\
+ optional_grow_behavior = CALLBACK(src, PROC_REF(grow_up))\
+ )
+ AddComponent(/datum/component/tameable, target_foods, tame_chance = 35, bonus_tame_chance = 20)
+ AddComponent(/datum/component/swarming, 16, 11)
+ ADD_TRAIT(src, TRAIT_MOB_HIDE_HAPPINESS, INNATE_TRAIT) //Do not let strangers know it gets happy when poked if stray.
+
+/mob/living/basic/mining/lobstrosity/juvenile/add_ranged_armour(list/vulnerable_projectiles)
+ AddElement(\
+ /datum/element/ranged_armour,\
+ minimum_projectile_force = 30,\
+ below_projectile_multiplier = 0.6,\
+ vulnerable_projectile_types = vulnerable_projectiles,\
+ minimum_thrown_force = 13,\
+ throw_blocked_message = throw_blocked_message,\
+ )
+
+#define MAX_JUVENILES_ALLOWED_ON_TURF 3
+
+///Juvenile lobstrosities can swarm and pass through each other, but only 3 at most can stand the same turf.
+/mob/living/basic/mining/lobstrosity/juvenile/CanAllowThrough(atom/movable/mover, border_dir)
+ if(!istype(mover, /mob/living/basic/mining/lobstrosity/juvenile))
+ return ..()
+ var/juveniles_count = 0
+ for(var/mob/living/basic/mining/lobstrosity/juvenile/lob in loc)
+ juveniles_count++
+ if(juveniles_count > MAX_JUVENILES_ALLOWED_ON_TURF)
+ return ..()
+ return TRUE
+
+#undef MAX_JUVENILES_ALLOWED_ON_TURF
+
+/mob/living/basic/mining/lobstrosity/juvenile/tamed(mob/living/tamer, obj/item/food)
+ . = ..()
+ was_tamed = TRUE
+ // They are more pettable I guess
+ AddElement(/datum/element/pet_bonus, "chitters pleasantly!")
+ REMOVE_TRAIT(src, TRAIT_MOB_HIDE_HAPPINESS, INNATE_TRAIT)
+
+/mob/living/basic/mining/lobstrosity/juvenile/proc/ready_to_grow()
+ return isturf(loc)
+
+/mob/living/basic/mining/lobstrosity/juvenile/proc/grow_up()
+ var/name_to_use = name == initial(name) ? grow_type::name : name
+ var/mob/living/basic/mining/lobstrosity/grown = change_mob_type(grow_type, get_turf(src), name_to_use)
+ if(was_tamed)
+ grown.tamed()
+ for(var/friend in ai_controller?.blackboard?[BB_FRIENDS_LIST])
+ grown.befriend(friend)
+ grown.setBruteLoss(getBruteLoss())
+ grown.setFireLoss(getFireLoss())
+ qdel(src) //We called change_mob_type without 'delete_old_mob = TRUE' since we had to pass down friends and damage
+
+/mob/living/basic/mining/lobstrosity/juvenile/lava
+ name = "juvenile chasm lobstrosity"
+ desc = "A youngling of the behemothic lobstrosity. They usually don't crawl out of the vents they reside in until they're fully grown."
+ icon_state = "juveline_lobstrosity"
+ icon_living = "juveline_lobstrosity"
+ icon_dead = "juveline_lobstrosity_dead"
+ grow_type = /mob/living/basic/mining/lobstrosity/lava
+
+/// Shorter, weaker version of the Lobster Rush
+/datum/action/cooldown/mob_cooldown/charge/basic_charge/lobster/shrimp
+ name = "Shrimp Rush"
+ charge_distance = 4
+ knockdown_duration = 1.8 SECONDS
+ charge_delay = 0.2 SECONDS
+ charge_damage = 13
+
+/datum/action/cooldown/mob_cooldown/charge/basic_charge/lobster/apply_post_charge(mob/living/charger)
+ charger.apply_status_effect(/datum/status_effect/tired_post_charge/lesser)
+
+///Command the lobster to charge at someone.
+/datum/pet_command/point_targeting/use_ability/lob_charge
+ command_name = "Charge"
+ command_desc = "Command your lobstrosity to charge against someone."
+ radial_icon = 'icons/mob/actions/actions_items.dmi'
+ radial_icon_state = "sniper_zoom"
+ speech_commands = list("charge", "slam", "tackle")
+ command_feedback = "growl"
+ pointed_reaction = "and growls"
+ pet_ability_key = BB_TARGETED_ACTION
+ ability_behavior = /datum/ai_behavior/pet_use_ability/then_attack/long_ranged
+
+/datum/pet_command/point_targeting/use_ability/lob_charge/set_command_target(mob/living/parent, atom/target)
+ if (!target)
+ return
+ var/datum/targeting_strategy/targeter = GET_TARGETING_STRATEGY(parent.ai_controller.blackboard[targeting_strategy_key])
+ if(!targeter?.can_attack(parent, target))
+ parent.balloon_alert_to_viewers("shakes head!")
+ return FALSE
+ return ..()
+
+/datum/pet_command/point_targeting/use_ability/lob_charge/shrimp
+ ability_behavior = /datum/ai_behavior/pet_use_ability/then_attack/short_ranged
diff --git a/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity_ai.dm b/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity_ai.dm
index fb0ba437bf48c4..75b64d051203a3 100644
--- a/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity_ai.dm
+++ b/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity_ai.dm
@@ -1,9 +1,20 @@
+#define SHRIMP_HARM_RESPONSES list(\
+ "*me stares blankly.",\
+ "*me stares shrimply.",\
+ "*me gives a confused look.",\
+ "*me chitters unpleasantly.",\
+)
+
/datum/ai_controller/basic_controller/lobstrosity
blackboard = list(
BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic/allow_items,
+ BB_PET_TARGETING_STRATEGY = /datum/targeting_strategy/basic/not_friends,
BB_TARGET_MINIMUM_STAT = HARD_CRIT,
BB_LOBSTROSITY_EXPLOIT_TRAITS = list(TRAIT_INCAPACITATED, TRAIT_FLOORED, TRAIT_IMMOBILIZED, TRAIT_KNOCKEDOUT),
- BB_LOBSTROSITY_FINGER_LUST = 0
+ BB_LOBSTROSITY_FINGER_LUST = 0,
+ BB_LOBSTROSITY_NAIVE_HUNTER = FALSE,
+ BB_BASIC_MOB_FLEE_DISTANCE = 8,
+ BB_OWNER_SELF_HARM_RESPONSES = SHRIMP_HARM_RESPONSES,
)
ai_traits = PAUSE_DURING_DO_AFTER
@@ -12,6 +23,32 @@
planning_subtrees = list(
/datum/ai_planning_subtree/random_speech/insect,
/datum/ai_planning_subtree/hoard_fingers,
+ /datum/ai_planning_subtree/pet_planning,
+ /datum/ai_planning_subtree/simple_find_target,
+ /datum/ai_planning_subtree/targeted_mob_ability/lobster,
+ /datum/ai_planning_subtree/flee_target/lobster,
+ /datum/ai_planning_subtree/attack_obstacle_in_path,
+ /datum/ai_planning_subtree/basic_melee_attack_subtree/lobster,
+ /datum/ai_planning_subtree/find_food,
+ /datum/ai_planning_subtree/find_and_hunt_target/lobster_fishing,
+ /datum/ai_planning_subtree/find_fingers,
+ )
+///Ensure that juveline lobstrosities witll charge at things they can reach.
+/datum/ai_controller/basic_controller/lobstrosity/juvenile
+ blackboard = list(
+ BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic/allow_items,
+ BB_PET_TARGETING_STRATEGY = /datum/targeting_strategy/basic/not_friends,
+ BB_TARGET_MINIMUM_STAT = SOFT_CRIT,
+ BB_LOBSTROSITY_EXPLOIT_TRAITS = list(TRAIT_INCAPACITATED, TRAIT_FLOORED, TRAIT_IMMOBILIZED, TRAIT_KNOCKEDOUT),
+ BB_LOBSTROSITY_FINGER_LUST = 0,
+ BB_LOBSTROSITY_NAIVE_HUNTER = TRUE,
+ BB_BASIC_MOB_FLEE_DISTANCE = 4,
+ BB_OWNER_SELF_HARM_RESPONSES = SHRIMP_HARM_RESPONSES,
+ )
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/random_speech/insect,
+ /datum/ai_planning_subtree/hoard_fingers,
+ /datum/ai_planning_subtree/pet_planning,
/datum/ai_planning_subtree/simple_find_target,
/datum/ai_planning_subtree/targeted_mob_ability/lobster,
/datum/ai_planning_subtree/flee_target/lobster,
@@ -22,10 +59,42 @@
/datum/ai_planning_subtree/find_fingers,
)
+///A subtype of juvenile lobster AI that has the target_retaliate behaviour instead of simple_find_target
+/datum/ai_controller/basic_controller/lobstrosity/juvenile/calm
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/random_speech/insect,
+ /datum/ai_planning_subtree/hoard_fingers,
+ /datum/ai_planning_subtree/pet_planning,
+ /datum/ai_planning_subtree/target_retaliate,
+ /datum/ai_planning_subtree/targeted_mob_ability/lobster/juvenile,
+ /datum/ai_planning_subtree/flee_target/lobster,
+ /datum/ai_planning_subtree/attack_obstacle_in_path,
+ /datum/ai_planning_subtree/basic_melee_attack_subtree/lobster,
+ /datum/ai_planning_subtree/find_food,
+ /datum/ai_planning_subtree/find_and_hunt_target/lobster_fishing,
+ /datum/ai_planning_subtree/find_fingers,
+ )
+
+///A subtype of juvenile lobster AI that has the capricious_retaliate behaviour instead of simple_find_target
+/datum/ai_controller/basic_controller/lobstrosity/juvenile/capricious
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/random_speech/insect,
+ /datum/ai_planning_subtree/hoard_fingers,
+ /datum/ai_planning_subtree/pet_planning,
+ /datum/ai_planning_subtree/capricious_retaliate,
+ /datum/ai_planning_subtree/targeted_mob_ability/lobster/juvenile,
+ /datum/ai_planning_subtree/flee_target/lobster,
+ /datum/ai_planning_subtree/attack_obstacle_in_path,
+ /datum/ai_planning_subtree/basic_melee_attack_subtree/lobster,
+ /datum/ai_planning_subtree/find_food,
+ /datum/ai_planning_subtree/find_and_hunt_target/lobster_fishing,
+ /datum/ai_planning_subtree/find_fingers,
+ )
+
/datum/ai_planning_subtree/find_and_hunt_target/lobster_fishing
target_key = BB_FISHING_TARGET
hunt_targets = list(/turf/open/lava)
- hunting_behavior = /datum/ai_behavior/hunt_target/unarmed_attack_target/reset_target
+ hunting_behavior = /datum/ai_behavior/hunt_target/unarmed_attack_target/reset_target_combat_mode
/datum/ai_planning_subtree/basic_melee_attack_subtree/lobster
melee_attack_behavior = /datum/ai_behavior/basic_melee_attack/lobster
@@ -49,11 +118,14 @@
if (isnull(target) || !istype(target))
return ..()
var/is_vulnerable = FALSE
- for (var/trait in controller.blackboard[BB_LOBSTROSITY_EXPLOIT_TRAITS])
- if (!HAS_TRAIT(target, trait))
- continue
+ if(controller.blackboard[BB_LOBSTROSITY_NAIVE_HUNTER] && target.body_position == LYING_DOWN)
is_vulnerable = TRUE
- break
+ else
+ for (var/trait in controller.blackboard[BB_LOBSTROSITY_EXPLOIT_TRAITS])
+ if (!HAS_TRAIT(target, trait))
+ continue
+ is_vulnerable = TRUE
+ break
if (!is_vulnerable)
controller.set_blackboard_key(BB_BASIC_MOB_STOP_FLEEING, FALSE)
if (!controller.blackboard[BB_BASIC_MOB_STOP_FLEEING])
@@ -78,6 +150,11 @@
if(isnull(target))
return ..()
+ if(isliving(target))
+ var/mob/living/living_target = target
+ if(controller.blackboard[BB_LOBSTROSITY_NAIVE_HUNTER] && living_target.body_position == LYING_DOWN)
+ controller.set_blackboard_key(BB_BASIC_MOB_STOP_FLEEING, TRUE)
+ return AI_BEHAVIOR_INSTANT | AI_BEHAVIOR_FAILED
for (var/trait in controller.blackboard[BB_LOBSTROSITY_EXPLOIT_TRAITS])
if (!HAS_TRAIT(target, trait))
continue
@@ -100,6 +177,10 @@
return FALSE
return ..()
+
+/datum/ai_planning_subtree/targeted_mob_ability/lobster/juvenile
+ use_ability_behaviour = /datum/ai_behavior/targeted_mob_ability/min_range/short
+
/// Look for loose arms lying around
/datum/ai_planning_subtree/find_fingers
/// Where do we store target limb data?
@@ -226,3 +307,4 @@
#undef FLEE_TO_RANGE
#undef MAX_LOBSTROSITY_PATIENCE
+#undef SHRIMP_HARM_RESPONSES
diff --git a/code/modules/mob/living/basic/lavaland/mining.dm b/code/modules/mob/living/basic/lavaland/mining.dm
index 38591dfb39c068..ca84e0d1d20c77 100644
--- a/code/modules/mob/living/basic/lavaland/mining.dm
+++ b/code/modules/mob/living/basic/lavaland/mining.dm
@@ -27,14 +27,7 @@
var/static/list/vulnerable_projectiles
if(!vulnerable_projectiles)
vulnerable_projectiles = string_list(MINING_MOB_PROJECTILE_VULNERABILITY)
- AddElement(\
- /datum/element/ranged_armour,\
- minimum_projectile_force = 30,\
- below_projectile_multiplier = 0.3,\
- vulnerable_projectile_types = vulnerable_projectiles,\
- minimum_thrown_force = 20,\
- throw_blocked_message = throw_blocked_message,\
- )
+ add_ranged_armour(vulnerable_projectiles)
if(crusher_loot)
AddElement(\
/datum/element/crusher_loot,\
@@ -44,6 +37,16 @@
)
RegisterSignal(src, COMSIG_ATOM_WAS_ATTACKED, PROC_REF(check_ashwalker_peace_violation))
+/mob/living/basic/mining/proc/add_ranged_armour(list/vulnerable_projectiles)
+ AddElement(\
+ /datum/element/ranged_armour,\
+ minimum_projectile_force = 30,\
+ below_projectile_multiplier = 0.3,\
+ vulnerable_projectile_types = vulnerable_projectiles,\
+ minimum_thrown_force = 20,\
+ throw_blocked_message = throw_blocked_message,\
+ )
+
/mob/living/basic/mining/proc/check_ashwalker_peace_violation(datum/source, mob/living/carbon/human/possible_ashwalker)
SIGNAL_HANDLER
diff --git a/code/modules/mob/living/basic/pets/orbie/orbie.dm b/code/modules/mob/living/basic/pets/orbie/orbie.dm
index 735f63977d362b..c0c6dd7b023fc6 100644
--- a/code/modules/mob/living/basic/pets/orbie/orbie.dm
+++ b/code/modules/mob/living/basic/pets/orbie/orbie.dm
@@ -50,6 +50,7 @@
var/static/list/food_types = list(/obj/item/food/virtual_chocolate)
AddComponent(/datum/component/obeys_commands, pet_commands)
AddElement(/datum/element/basic_eating, food_types = food_types)
+ ADD_TRAIT(src, TRAIT_SILICON_EMOTES_ALLOWED, INNATE_TRAIT)
RegisterSignal(src, COMSIG_ATOM_CAN_BE_PULLED, PROC_REF(on_pulled))
RegisterSignal(src, COMSIG_VIRTUAL_PET_LEVEL_UP, PROC_REF(on_level_up))
RegisterSignal(src, COMSIG_MOB_CLICKON, PROC_REF(on_click))
diff --git a/code/modules/mob/living/basic/ruin_defender/living_floor.dm b/code/modules/mob/living/basic/ruin_defender/living_floor.dm
index 851a0873657a01..105838f0c55dd2 100644
--- a/code/modules/mob/living/basic/ruin_defender/living_floor.dm
+++ b/code/modules/mob/living/basic/ruin_defender/living_floor.dm
@@ -35,7 +35,7 @@
move_resist = INFINITY
density = FALSE
combat_mode = TRUE
- layer = TURF_LAYER
+ layer = LOW_FLOOR_LAYER
plane = FLOOR_PLANE
faction = list(FACTION_HOSTILE)
melee_damage_lower = 20
diff --git a/code/modules/mob/living/basic/slime/emote.dm b/code/modules/mob/living/basic/slime/emote.dm
index 93b889a07a4f4e..617d33b9809c03 100644
--- a/code/modules/mob/living/basic/slime/emote.dm
+++ b/code/modules/mob/living/basic/slime/emote.dm
@@ -29,8 +29,6 @@
/datum/emote/slime/mood/run_emote(mob/user, params, type_override, intentional)
. = ..()
- if(!.)
- return
var/mob/living/basic/slime/slime_user = user
slime_user.current_mood = mood_key
slime_user.regenerate_icons()
diff --git a/code/modules/mob/living/basic/slime/slime.dm b/code/modules/mob/living/basic/slime/slime.dm
index fa40ac28d816d9..352a8149ca6166 100644
--- a/code/modules/mob/living/basic/slime/slime.dm
+++ b/code/modules/mob/living/basic/slime/slime.dm
@@ -189,15 +189,17 @@
cut_overlays()
if(slime_type.transparent)
alpha = SLIME_TRANSPARENCY_ALPHA
- var/icon_text = "[slime_type.colour]-[life_stage]"
- icon_dead = "[icon_text]-dead"
+
+ icon_dead = !cores ? "[slime_type.colour]-cut" : "[slime_type.colour]-[life_stage]-dead"
+
if(stat != DEAD)
- icon_state = icon_text
+ icon_state = "[slime_type.colour]-[life_stage]"
if(current_mood && current_mood != SLIME_MOOD_NONE && !stat)
add_overlay("aslime-[current_mood]")
else
icon_state = icon_dead
- ..()
+
+ return ..()
/mob/living/basic/slime/get_status_tab_items()
. = ..()
@@ -364,6 +366,21 @@
visible_message(span_warning("The mutated core shudders, and collapses into a puddle, unable to maintain its form."))
qdel(src)
+///Proc for slime core removal surgery, tries to remove cores from a dead slime.
+/mob/living/basic/slime/proc/try_extract_cores(count = 1)
+ if(stat != DEAD)
+ return FALSE
+ if(count <= 0 || cores < count)
+ return FALSE
+
+ var/core_count = min(count, cores)
+ for(var/i in 1 to core_count)
+ new slime_type.core_type(loc)
+ cores--
+
+ regenerate_icons()
+
+ return TRUE
///Makes the slime peaceful and content
/mob/living/basic/slime/proc/set_pacified_behaviour()
diff --git a/code/modules/mob/living/basic/space_fauna/meteor_heart/meteor_eyeball.dm b/code/modules/mob/living/basic/space_fauna/meteor_heart/meteor_eyeball.dm
index 44775ea7217ce2..0318b044a21cec 100644
--- a/code/modules/mob/living/basic/space_fauna/meteor_heart/meteor_eyeball.dm
+++ b/code/modules/mob/living/basic/space_fauna/meteor_heart/meteor_eyeball.dm
@@ -10,7 +10,7 @@ GLOBAL_LIST_EMPTY(meteor_eyeballs)
desc = "An eyeball growing out of the ground, gross."
icon_state = "eyeball"
max_integrity = 15
- layer = LOW_OBJ_LAYER
+ layer = ABOVE_OPEN_TURF_LAYER
plane = FLOOR_PLANE
/obj/structure/meateor_fluff/eyeball/Initialize(mapload)
diff --git a/code/modules/mob/living/basic/vermin/mothroach/mothroach_ai.dm b/code/modules/mob/living/basic/vermin/mothroach/mothroach_ai.dm
index 5ef330cdc64f9e..5801d183215947 100644
--- a/code/modules/mob/living/basic/vermin/mothroach/mothroach_ai.dm
+++ b/code/modules/mob/living/basic/vermin/mothroach/mothroach_ai.dm
@@ -27,9 +27,21 @@
SIGNAL_HANDLER
set_blackboard_key(BB_MOTHROACH_NEXT_EAT, world.time + MOTHROACH_EAT_TIMER)
+/datum/ai_planning_subtree/find_food/mothroach
+ finding_behavior = /datum/ai_behavior/find_and_set/in_list/mothroach_food
+
/datum/ai_planning_subtree/find_food/mothroach/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick)
if(world.time < controller.blackboard[BB_MOTHROACH_NEXT_EAT])
return
return ..()
+/datum/ai_behavior/find_and_set/in_list/mothroach_food
+
+/datum/ai_behavior/find_and_set/in_list/mothroach_food/search_tactic(datum/ai_controller/controller, locate_paths, search_range)
+ var/list/found = typecache_filter_list(oview(search_range, controller.pawn), locate_paths)
+ var/mob/living/living_pawn = controller.pawn
+ found -= living_pawn.loc
+ if(length(found))
+ return pick(found)
+
#undef MOTHROACH_EAT_TIMER
diff --git a/code/modules/mob/living/basic/vermin/mouse.dm b/code/modules/mob/living/basic/vermin/mouse.dm
index 724833af16f2a1..7361e4be7b3101 100644
--- a/code/modules/mob/living/basic/vermin/mouse.dm
+++ b/code/modules/mob/living/basic/vermin/mouse.dm
@@ -369,9 +369,7 @@
var/trans_amount = reagents.maximum_volume - reagents.total_volume * (4 / 3)
if(target_reagents.has_reagent(/datum/reagent/fuel) && target_reagents.trans_to(src, trans_amount))
to_chat(user, span_notice("You dip [src] into [interacting_with]."))
- else
- to_chat(user, span_warning("That's a terrible idea."))
- return ITEM_INTERACT_BLOCKING
+ return ITEM_INTERACT_SUCCESS
/obj/item/food/deadmouse/moldy
name = "moldy dead mouse"
diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm
index 5ac120fcee3f37..7d5d6bec936a71 100644
--- a/code/modules/mob/living/blood.dm
+++ b/code/modules/mob/living/blood.dm
@@ -25,10 +25,6 @@
adjust_nutrition(-nutrition_ratio * HUNGER_FACTOR * seconds_per_tick)
blood_volume = min(blood_volume + (BLOOD_REGEN_FACTOR * nutrition_ratio * seconds_per_tick), BLOOD_VOLUME_NORMAL)
- // Some effects are halved mid-combat.
- var/determined_mod = has_status_effect(/datum/status_effect/determined) ? 0.5 : 0
-
-
//Bloodloss from wounds
var/temp_bleed = 0
for(var/obj/item/bodypart/iter_part as anything in bodyparts)
@@ -45,6 +41,10 @@
//Effects of bloodloss
if(sigreturn & HANDLE_BLOOD_NO_OXYLOSS)
return
+
+ // Some effects are halved mid-combat.
+ var/determined_mod = has_status_effect(/datum/status_effect/determined) ? 0.5 : 0
+
var/word = pick("dizzy","woozy","faint")
switch(blood_volume)
if(BLOOD_VOLUME_EXCESS to BLOOD_VOLUME_MAX_LETHAL)
@@ -105,11 +105,12 @@
// Blood ratio! if you have 280 blood, this equals 0.5 as that's half of the current value, 560.
var/effective_blood_ratio = blood_volume / BLOOD_VOLUME_NORMAL
+ var/target_oxyloss = max((1 - effective_blood_ratio) * 100, 0)
// If your ratio is less than one (you're missing any blood) and your oxyloss is under missing blood %, start getting oxy damage.
// This damage accrues faster the less blood you have.
- // If KO or in hardcrit, the damage accrues even then to prevent being perma-KO.
- if(((effective_blood_ratio < 1) && (getOxyLoss() < ((1 - effective_blood_ratio) * 100))) || (stat in list(UNCONSCIOUS, HARD_CRIT)))
+ // If the damage surpasses the KO threshold for oxyloss, then we'll always tick up so you die eventually
+ if(target_oxyloss > 0 && (getOxyLoss() < target_oxyloss || (target_oxyloss >= OXYLOSS_PASSOUT_THRESHOLD && stat >= UNCONSCIOUS)))
// At roughly half blood this equals to 3 oxyloss per tick. At 90% blood it's close to 0.5
var/rounded_oxyloss = round(0.01 * (BLOOD_VOLUME_NORMAL - blood_volume), 0.25) * seconds_per_tick
adjustOxyLoss(rounded_oxyloss, updating_health = TRUE)
diff --git a/code/modules/mob/living/brain/brain.dm b/code/modules/mob/living/brain/brain.dm
index 1bacc08a8b6ffb..17f5be02a91cf9 100644
--- a/code/modules/mob/living/brain/brain.dm
+++ b/code/modules/mob/living/brain/brain.dm
@@ -16,6 +16,7 @@
forceMove(OB)
if(!container?.mecha && (!container || container.immobilize)) //Unless inside a mecha, brains are rather helpless.
add_traits(list(TRAIT_IMMOBILIZED, TRAIT_HANDS_BLOCKED), BRAIN_UNAIDED)
+ ADD_TRAIT(src, TRAIT_SILICON_EMOTES_ALLOWED, INNATE_TRAIT)
/mob/living/brain/on_changed_z_level(turf/old_turf, turf/new_turf, same_z_layer, notify_contents)
var/obj/item/organ/internal/brain/brain_loc = loc
diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm
index b0a747ff51d88d..b4c6f8e682d2d0 100644
--- a/code/modules/mob/living/brain/brain_item.dm
+++ b/code/modules/mob/living/brain/brain_item.dm
@@ -40,6 +40,10 @@
/// Size modifier for the sprite
var/brain_size = 1
+ /// Can this brain become smooth after it gets washed
+ var/can_smoothen_out = TRUE
+ /// We got smooth from being washed
+ var/smooth_brain = FALSE
/obj/item/organ/internal/brain/Initialize(mapload)
. = ..()
@@ -48,6 +52,8 @@
/obj/item/organ/internal/brain/examine()
. = ..()
+ if (smooth_brain)
+ . += span_notice("All the pesky wrinkles are gone. Now it just needs a good drying...")
if(brain_size < 1)
. += span_notice("It is a bit on the smaller side...")
if(brain_size > 1)
@@ -113,10 +119,10 @@
if(!QDELETED(organ_owner) && length(skillchips))
if(!special)
to_chat(organ_owner, span_notice("You feel your skillchips enable emergency power saving mode, deactivating as your brain leaves your body..."))
- for(var/chip in skillchips)
- var/obj/item/skillchip/skillchip = chip
- // Run the try_ proc with force = TRUE.
- skillchip.try_deactivate_skillchip(silent = special, force = TRUE)
+ for(var/chip in skillchips)
+ var/obj/item/skillchip/skillchip = chip
+ // Run the try_ proc with force = TRUE.
+ skillchip.try_deactivate_skillchip(silent = special, force = TRUE)
. = ..()
@@ -131,6 +137,10 @@
organ_owner.update_body_parts()
organ_owner.clear_mood_event("brain_damage")
+/obj/item/organ/internal/brain/update_icon_state()
+ icon_state = "[initial(icon_state)][smooth_brain ? "-smooth_brain" : ""]"
+ return ..()
+
/obj/item/organ/internal/brain/proc/transfer_identity(mob/living/L)
name = "[L.name]'s [initial(name)]"
if(brainmob)
@@ -373,6 +383,10 @@
/obj/item/organ/internal/brain/machine_wash(obj/machinery/washing_machine/brainwasher)
. = ..()
+ if (can_smoothen_out && !smooth_brain)
+ smooth_brain = TRUE
+ update_appearance()
+
if(HAS_TRAIT(brainwasher, TRAIT_BRAINWASHING))
set_organ_damage(0)
cure_all_traumas(TRAUMA_RESILIENCE_LOBOTOMY)
@@ -408,6 +422,7 @@
name = "crystalline matrix"
desc = "This collection of sparkling gems somehow allows a golem to think."
icon_state = "adamantine_resonator"
+ can_smoothen_out = FALSE
color = COLOR_GOLEM_GRAY
organ_flags = ORGAN_MINERAL
organ_traits = list(TRAIT_ADVANCEDTOOLUSER, TRAIT_LITERATE, TRAIT_CAN_STRIP, TRAIT_ROCK_METAMORPHIC)
@@ -416,6 +431,7 @@
name = "lustrous brain"
desc = "This is your brain on bluespace dust. Not even once."
icon_state = "random_fly_4"
+ can_smoothen_out = FALSE
organ_traits = list(TRAIT_ADVANCEDTOOLUSER, TRAIT_LITERATE, TRAIT_CAN_STRIP)
/obj/item/organ/internal/brain/lustrous/on_mob_remove(mob/living/carbon/organ_owner, special)
@@ -493,6 +509,11 @@
arguments = args.Copy(3)
. = brain_gain_trauma(trauma, resilience, arguments)
+/obj/item/organ/internal/brain/vv_edit_var(var_name, var_value)
+ . = ..()
+ if(var_name == NAMEOF(src, smooth_brain))
+ update_appearance()
+
//Direct trauma gaining proc. Necessary to assign a trauma to its brain. Avoid using directly.
/obj/item/organ/internal/brain/proc/brain_gain_trauma(datum/brain_trauma/trauma, resilience, list/arguments)
if(!can_gain_trauma(trauma, resilience))
diff --git a/code/modules/mob/living/brain/emote.dm b/code/modules/mob/living/brain/emote.dm
index 75599e892a25d0..c93e3acf4b24ae 100644
--- a/code/modules/mob/living/brain/emote.dm
+++ b/code/modules/mob/living/brain/emote.dm
@@ -3,7 +3,7 @@
mob_type_blacklist_typecache = list()
emote_type = EMOTE_AUDIBLE
-/datum/emote/brain/can_run_emote(mob/user, status_check = TRUE, intentional)
+/datum/emote/brain/can_run_emote(mob/user, status_check = TRUE, intentional, params)
. = ..()
var/mob/living/brain/B = user
if(!istype(B) || (!(B.container && istype(B.container, /obj/item/mmi))))
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index bc0d58169eeb21..e1033aeb4c8600 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -6,7 +6,7 @@
GLOB.carbon_list += src
ADD_TRAIT(src, TRAIT_CAN_HOLD_ITEMS, INNATE_TRAIT) // Carbons are assumed to be innately capable of having arms, we check their arms count instead
- breathing_loop = new(src)
+ breathing_loop = new(src, _direct = TRUE)
/mob/living/carbon/Destroy()
//This must be done first, so the mob ghosts correctly before DNA etc is nulled
@@ -153,7 +153,7 @@
if(grab_state >= GRAB_NECK)
neckgrab_throw = TRUE
stop_pulling()
- if(HAS_TRAIT(src, TRAIT_PACIFISM))
+ if(HAS_TRAIT(src, TRAIT_PACIFISM) || HAS_TRAIT(src, TRAIT_NO_THROWING))
to_chat(src, span_notice("You gently let go of [throwable_mob]."))
return FALSE
else
@@ -180,6 +180,8 @@
//SKYRAT EDIT END
if(neckgrab_throw)
power_throw++
+ if(HAS_TRAIT(src, TRAIT_TOSS_GUN_HARD) && isgun(thrown_thing))
+ power_throw++
if(isitem(thrown_thing))
var/obj/item/thrown_item = thrown_thing
frequency_number = 1-(thrown_item.w_class-3)/8 //At normal weight, the frequency is at 1. For tiny, it is 1.25. For huge, it is 0.75.
@@ -201,6 +203,11 @@
span_danger("You [verb_text] [thrown_thing][power_throw_text]"))
log_message("has thrown [thrown_thing] [power_throw_text]", LOG_ATTACK)
var/extra_throw_range = HAS_TRAIT(src, TRAIT_THROWINGARM) ? 2 : 0
+
+ var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = get_organ_slot(ORGAN_SLOT_SPINE)
+ if(istype(potential_spine))
+ extra_throw_range += potential_spine.added_throw_range
+
newtonian_move(get_dir(target, src))
thrown_thing.safe_throw_at(target, thrown_thing.throw_range + extra_throw_range, max(1,thrown_thing.throw_speed + power_throw), src, null, null, null, move_force)
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 5d476058e538b1..de35d03fc253a9 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -294,8 +294,8 @@
else
Knockdown(stun_duration)
-/mob/living/carbon/proc/help_shake_act(mob/living/carbon/helper)
- var/nosound = FALSE //SKYRAT EDIT ADDITION - EMOTES
+/mob/living/carbon/proc/help_shake_act(mob/living/carbon/helper, force_friendly)
+ var/nosound = FALSE //SKYRATEDIT ADDITION - EMOTES
if(on_fire)
to_chat(helper, span_warning("You can't put [p_them()] out with just your bare hands!"))
return
@@ -419,7 +419,7 @@
else if(bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT)
to_chat(helper, span_warning("It feels like [src] is freezing as you hug [p_them()]."))
- if(HAS_TRAIT(helper, TRAIT_FRIENDLY))
+ if(HAS_TRAIT(helper, TRAIT_FRIENDLY) || force_friendly)
if (helper.mob_mood.sanity >= SANITY_GREAT)
new /obj/effect/temp_visual/heart(loc)
add_mood_event("friendly_hug", /datum/mood_event/besthug, helper)
@@ -442,6 +442,9 @@
// Shake animation
if (incapacitated())
+ shake_up_animation()
+
+/mob/proc/shake_up_animation()
var/direction = prob(50) ? -1 : 1
animate(src, pixel_x = pixel_x + SHAKE_ANIMATION_OFFSET * direction, time = 1, easing = QUAD_EASING | EASE_OUT, flags = ANIMATION_PARALLEL)
animate(pixel_x = pixel_x - (SHAKE_ANIMATION_OFFSET * 2 * direction), time = 1)
@@ -591,10 +594,10 @@
*/
/mob/living/carbon/proc/check_passout()
var/mob_oxyloss = getOxyLoss()
- if(mob_oxyloss >= 50)
+ if(mob_oxyloss >= OXYLOSS_PASSOUT_THRESHOLD)
if(!HAS_TRAIT_FROM(src, TRAIT_KNOCKEDOUT, OXYLOSS_TRAIT))
ADD_TRAIT(src, TRAIT_KNOCKEDOUT, OXYLOSS_TRAIT)
- else if(mob_oxyloss < 50)
+ else if(mob_oxyloss < OXYLOSS_PASSOUT_THRESHOLD)
REMOVE_TRAIT(src, TRAIT_KNOCKEDOUT, OXYLOSS_TRAIT)
/mob/living/carbon/get_organic_health()
diff --git a/code/modules/mob/living/carbon/carbon_update_icons.dm b/code/modules/mob/living/carbon/carbon_update_icons.dm
index a96979abb6248c..83b46801aa8f11 100644
--- a/code/modules/mob/living/carbon/carbon_update_icons.dm
+++ b/code/modules/mob/living/carbon/carbon_update_icons.dm
@@ -306,6 +306,7 @@
continue
if(isnull(damage_overlay) && (iter_part.brutestate || iter_part.burnstate))
damage_overlay = mutable_appearance('icons/mob/effects/dam_mob.dmi', "blank", -DAMAGE_LAYER, appearance_flags = KEEP_TOGETHER)
+ damage_overlay.color = iter_part.damage_overlay_color
if(iter_part.brutestate)
damage_overlay.add_overlay("[iter_part.dmg_overlay_type]_[iter_part.body_zone]_[iter_part.brutestate]0") //we're adding icon_states of the base image as overlays
if(iter_part.burnstate)
@@ -486,6 +487,10 @@
var/list/needs_update = list()
var/limb_count_update = FALSE
for(var/obj/item/bodypart/limb as anything in bodyparts)
+ // SKYRAT EDIT BEGIN - Don't handle abstract limbs (Taurs, etc.)
+ if(!limb.show_icon)
+ continue
+ // SKYRAT EDIT END
limb.update_limb(is_creating = update_limb_data) //Update limb actually doesn't do much, get_limb_icon is the cpu eater.
var/old_key = icon_render_keys?[limb.body_zone] //Checks the mob's icon render key list for the bodypart
diff --git a/code/modules/mob/living/carbon/emote.dm b/code/modules/mob/living/carbon/emote.dm
index fd9807c32f1b05..3eb36e355b2fbe 100644
--- a/code/modules/mob/living/carbon/emote.dm
+++ b/code/modules/mob/living/carbon/emote.dm
@@ -49,7 +49,7 @@
hands_use_check = TRUE
cooldown = 6 SECONDS
-/datum/emote/living/carbon/crack/can_run_emote(mob/living/carbon/user, status_check = TRUE , intentional)
+/datum/emote/living/carbon/crack/can_run_emote(mob/living/carbon/user, status_check = TRUE , intentional, params)
if(!iscarbon(user) || user.usable_hands < 2)
return FALSE
return ..()
@@ -104,8 +104,6 @@
/datum/emote/living/carbon/noogie/run_emote(mob/user, params, type_override, intentional)
. = ..()
- if(!.)
- return
var/obj/item/hand_item/noogie/noogie = new(user)
if(user.put_in_hands(noogie))
to_chat(user, span_notice("You ready your noogie'ing hand."))
@@ -154,8 +152,6 @@
/datum/emote/living/carbon/slap/run_emote(mob/user, params, type_override, intentional)
. = ..()
- if(!.)
- return
var/obj/item/hand_item/slapper/N = new(user)
if(user.put_in_hands(N))
to_chat(user, span_notice("You ready your slapping hand."))
@@ -172,9 +168,6 @@
/datum/emote/living/carbon/hand/run_emote(mob/user, params, type_override, intentional)
. = ..()
- if(!.)
- return
-
var/obj/item/hand_item/hand/hand = new(user)
if(user.put_in_hands(hand))
to_chat(user, span_notice("You ready your hand."))
@@ -204,8 +197,6 @@
/datum/emote/living/carbon/shoesteal/run_emote(mob/user, params, type_override, intentional)
. = ..()
- if (!.)
- return
var/obj/item/hand_item/stealer/stealing_hand = new(user)
if (user.put_in_hands(stealing_hand))
user.balloon_alert(user, "preparing to steal shoes...")
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index b0aad75ac2a9c9..501f3c782f29b9 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -18,7 +18,7 @@
message = "pushes up their glasses."
emote_type = EMOTE_VISIBLE
-/datum/emote/living/carbon/human/glasses/can_run_emote(mob/user, status_check = TRUE, intentional)
+/datum/emote/living/carbon/human/glasses/can_run_emote(mob/user, status_check = TRUE, intentional, params)
var/obj/eyes_slot = user.get_item_by_slot(ITEM_SLOT_EYES)
if(istype(eyes_slot, /obj/item/clothing/glasses/regular) || istype(eyes_slot, /obj/item/clothing/glasses/sunglasses))
return ..()
@@ -66,10 +66,9 @@
only_forced_audio = TRUE
vary = TRUE
-
-/datum/emote/carbon/human/scream/run_emote(mob/user, params, type_override, intentional = FALSE)
+/datum/emote/living/carbon/human/scream/can_run_emote(mob/user, status_check = TRUE , intentional, params)
if(!intentional && HAS_TRAIT(user, TRAIT_ANALGESIA))
- return
+ return FALSE
return ..()
/datum/emote/living/carbon/human/scream/get_sound(mob/living/carbon/human/user)
@@ -120,8 +119,6 @@
/datum/emote/living/carbon/human/wag/run_emote(mob/user, params, type_override, intentional)
. = ..()
- if(!.)
- return
var/obj/item/organ/external/tail/oranges_accessory = user.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL)
//I am so sorry my son
//We bypass helpers here cause we already have the tail
@@ -138,7 +135,7 @@
else
. = "wags " + message
-/datum/emote/living/carbon/human/wag/can_run_emote(mob/user, status_check, intentional)
+/datum/emote/living/carbon/human/wag/can_run_emote(mob/user, status_check, intentional, params)
var/obj/item/organ/external/tail/tail = user.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL)
if(tail?.wag_flags & WAG_ABLE)
return ..()
@@ -151,8 +148,6 @@
/datum/emote/living/carbon/human/wing/run_emote(mob/user, params, type_override, intentional)
. = ..()
- if(!.)
- return
var/obj/item/organ/external/wings/functional/wings = user.get_organ_slot(ORGAN_SLOT_EXTERNAL_WINGS)
if(isnull(wings))
CRASH("[type] ran on a mob that has no wings!")
@@ -166,7 +161,7 @@
var/emote_verb = wings.wings_open ? "closes" : "opens"
return "[emote_verb] [message]"
-/datum/emote/living/carbon/human/wing/can_run_emote(mob/user, status_check = TRUE, intentional)
+/datum/emote/living/carbon/human/wing/can_run_emote(mob/user, status_check = TRUE, intentional, params)
if(!istype(user.get_organ_slot(ORGAN_SLOT_EXTERNAL_WINGS), /obj/item/organ/external/wings/functional))
return FALSE
return ..()
@@ -179,7 +174,7 @@
///Snowflake emotes only for le epic chimp
/datum/emote/living/carbon/human/monkey
-/datum/emote/living/carbon/human/monkey/can_run_emote(mob/user, status_check = TRUE, intentional)
+/datum/emote/living/carbon/human/monkey/can_run_emote(mob/user, status_check = TRUE, intentional, params)
if(ismonkey(user))
return ..()
return FALSE
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 3a2d406afc1b38..6887cbba2f37fd 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -552,7 +552,7 @@
#undef CPR_PANIC_SPEED
/mob/living/carbon/human/cuff_resist(obj/item/I)
- if(dna?.check_mutation(/datum/mutation/human/hulk))
+ if(HAS_TRAIT(src, TRAIT_HULK))
say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ), forced = "hulk")
if(..(I, cuff_break = FAST_CUFFBREAK))
dropItemToGround(I)
@@ -961,7 +961,7 @@
var/carrydelay = 5 SECONDS //if you have latex you are faster at grabbing
var/skills_space
- var/fitness_level = mind.get_skill_level(/datum/skill/athletics) - 1
+ var/fitness_level = mind?.get_skill_level(/datum/skill/athletics) - 1
if(HAS_TRAIT(src, TRAIT_QUICKER_CARRY))
carrydelay -= 2 SECONDS
else if(HAS_TRAIT(src, TRAIT_QUICK_CARRY))
@@ -970,6 +970,10 @@
// can remove up to 2 seconds at legendary
carrydelay -= fitness_level * (1/3) SECONDS
+ var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = get_organ_slot(ORGAN_SLOT_SPINE)
+ if(istype(potential_spine))
+ carrydelay *= potential_spine.athletics_boost_multiplier
+
if(carrydelay <= 3 SECONDS)
skills_space = " very quickly"
else if(carrydelay <= 4 SECONDS)
@@ -1049,10 +1053,6 @@
/mob/living/carbon/human/updatehealth()
. = ..()
- if(HAS_TRAIT(src, TRAIT_IGNOREDAMAGESLOWDOWN))
- remove_movespeed_modifier(/datum/movespeed_modifier/damage_slowdown)
- remove_movespeed_modifier(/datum/movespeed_modifier/damage_slowdown_flying)
- return
var/health_deficiency = max((maxHealth - health), staminaloss)
if(health_deficiency >= 40)
add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/damage_slowdown, TRUE, multiplicative_slowdown = health_deficiency / 75)
@@ -1168,3 +1168,6 @@
/mob/living/carbon/human/species/zombie/infectious
race = /datum/species/zombie/infectious
+
+/mob/living/carbon/human/species/voidwalker
+ race = /datum/species/voidwalker
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index acec80f56522b9..41c129dc4ab3df 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -553,7 +553,7 @@
. = rand(-1000, 1000)
..() //Called afterwards because getting the mind after getting gibbed is sketchy
-/mob/living/carbon/human/help_shake_act(mob/living/carbon/helper)
+/mob/living/carbon/human/help_shake_act(mob/living/carbon/helper, force_friendly)
if(!istype(helper))
return
diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm
index 728ff63c03cb87..8541f4f7424573 100644
--- a/code/modules/mob/living/carbon/human/human_helpers.dm
+++ b/code/modules/mob/living/carbon/human/human_helpers.dm
@@ -57,15 +57,27 @@
return if_no_id
//repurposed proc. Now it combines get_id_name() and get_face_name() to determine a mob's name variable. Made into a separate proc as it'll be useful elsewhere
-/mob/living/carbon/human/get_visible_name(add_id_name = TRUE)
- if(HAS_TRAIT(src, TRAIT_UNKNOWN))
- return "Unknown"
+/mob/living/carbon/human/get_visible_name(add_id_name = TRUE, force_real_name = FALSE)
var/list/identity = list(null, null)
SEND_SIGNAL(src, COMSIG_HUMAN_GET_VISIBLE_NAME, identity)
var/signal_face = LAZYACCESS(identity, VISIBLE_NAME_FACE)
var/signal_id = LAZYACCESS(identity, VISIBLE_NAME_ID)
var/face_name = !isnull(signal_face) ? signal_face : get_face_name("")
var/id_name = !isnull(signal_id) ? signal_id : get_id_name("")
+ if (force_real_name)
+ var/fake_name
+ if (face_name && face_name != real_name)
+ fake_name = face_name
+ if(add_id_name && id_name && id_name != real_name)
+ if (!isnull(fake_name) && id_name != face_name)
+ fake_name = "[fake_name]/[id_name]"
+ else
+ fake_name = id_name
+ if (HAS_TRAIT(src, TRAIT_UNKNOWN) || (!face_name && !id_name))
+ fake_name = "Unknown"
+ return "[real_name][fake_name ? " (as [fake_name])" : ""]"
+ if(HAS_TRAIT(src, TRAIT_UNKNOWN))
+ return "Unknown"
if(face_name)
if(add_id_name && id_name && (id_name != face_name))
return "[face_name] (as [id_name])"
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index d8119c6a5279a5..6bdbf8322f26e4 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -207,7 +207,7 @@
if(thermal_protection_flags & HAND_RIGHT)
thermal_protection += THERMAL_PROTECTION_HAND_RIGHT
- return min(1, thermal_protection)
+ return min(1, round(thermal_protection, 0.001))
//See proc/get_heat_protection_flags(temperature) for the description of this proc.
/mob/living/carbon/human/proc/get_cold_protection_flags(temperature)
@@ -268,7 +268,7 @@
if(thermal_protection_flags & HAND_RIGHT)
thermal_protection += THERMAL_PROTECTION_HAND_RIGHT
- return min(1, thermal_protection)
+ return min(1, round(thermal_protection, 0.001))
/mob/living/carbon/human/has_smoke_protection()
if(isclothing(wear_mask))
diff --git a/code/modules/mob/living/carbon/human/species_types/felinid.dm b/code/modules/mob/living/carbon/human/species_types/felinid.dm
index 28874842470520..783c3499e547da 100644
--- a/code/modules/mob/living/carbon/human/species_types/felinid.dm
+++ b/code/modules/mob/living/carbon/human/species_types/felinid.dm
@@ -23,6 +23,8 @@
family_heirlooms = list(/obj/item/toy/cattoy)
/// When false, this is a felinid created by mass-purrbation
var/original_felinid = TRUE
+ /// Yummy!
+ species_cookie = /obj/item/food/nugget
// Prevents felinids from taking toxin damage from carpotoxin
/datum/species/human/felinid/handle_chemical(datum/reagent/chem, mob/living/carbon/human/affected, seconds_per_tick, times_fired)
diff --git a/code/modules/mob/living/carbon/human/species_types/monkeys.dm b/code/modules/mob/living/carbon/human/species_types/monkeys.dm
index e1163f1387d5ca..449f2d775a301c 100644
--- a/code/modules/mob/living/carbon/human/species_types/monkeys.dm
+++ b/code/modules/mob/living/carbon/human/species_types/monkeys.dm
@@ -1,7 +1,7 @@
#define MONKEY_SPEC_ATTACK_BITE_MISS_CHANCE 25
/datum/species/monkey
- name = "Monkey"
+ name = "\improper Monkey"
id = SPECIES_MONKEY
external_organs = list(
/obj/item/organ/external/tail/monkey = "Monkey",
@@ -22,6 +22,7 @@
)
no_equip_flags = ITEM_SLOT_OCLOTHING | ITEM_SLOT_GLOVES | ITEM_SLOT_FEET | ITEM_SLOT_SUITSTORE
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | ERT_SPAWN | SLIME_EXTRACT
+ species_cookie = /obj/item/food/grown/banana
inherent_factions = list(FACTION_MONKEY)
sexes = FALSE
species_language_holder = /datum/language_holder/monkey
diff --git a/code/modules/mob/living/carbon/human/species_types/mothmen.dm b/code/modules/mob/living/carbon/human/species_types/mothmen.dm
index 36355ea080a7f8..e7e97b114869b7 100644
--- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm
+++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm
@@ -13,6 +13,7 @@
mutanttongue = /obj/item/organ/internal/tongue/moth
mutanteyes = /obj/item/organ/internal/eyes/moth
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
+ species_cookie = /obj/item/food/muffin/moffin
species_language_holder = /datum/language_holder/moth
death_sound = 'sound/voice/moth/moth_death.ogg'
payday_modifier = 1.0
diff --git a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
index bafa688afeb726..0e7ac486ba5197 100644
--- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
@@ -116,30 +116,3 @@
owner.apply_status_effect(applied_status)
if (!owner.has_status_effect(applied_status))
owner.take_overall_damage(brute = 0.5 * seconds_per_tick, burn = 0.5 * seconds_per_tick, required_bodytype = BODYTYPE_ORGANIC)
-
-/// Heal in darkness and potentially trigger other effects, persists for a short duration after leaving
-/datum/status_effect/shadow_regeneration
- id = "shadow_regeneration"
- duration = 2 SECONDS
- status_type = STATUS_EFFECT_REFRESH
- alert_type = /atom/movable/screen/alert/status_effect/shadow_regeneration
-
-/datum/status_effect/shadow_regeneration/on_apply()
- . = ..()
- if (!.)
- return FALSE
- heal_owner()
- return TRUE
-
-/datum/status_effect/shadow_regeneration/refresh(effect)
- . = ..()
- heal_owner()
-
-/// Regenerate health whenever this status effect is applied or reapplied
-/datum/status_effect/shadow_regeneration/proc/heal_owner()
- owner.heal_overall_damage(brute = 1, burn = 1, required_bodytype = BODYTYPE_ORGANIC)
-
-/atom/movable/screen/alert/status_effect/shadow_regeneration
- name = "Shadow Regeneration"
- desc = "Bathed in soothing darkness, you will slowly heal yourself."
- icon_state = "lightless"
diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm
index 4a5834101f61cc..cb6ca3252dfd37 100644
--- a/code/modules/mob/living/emote.dm
+++ b/code/modules/mob/living/emote.dm
@@ -63,9 +63,9 @@
/datum/emote/living/collapse/run_emote(mob/user, params, type_override, intentional)
. = ..()
- if(. && isliving(user))
- var/mob/living/L = user
- L.Unconscious(40)
+ if(isliving(user))
+ var/mob/living/living = user
+ living.Unconscious(4 SECONDS)
/datum/emote/living/dance
key = "dance"
@@ -95,7 +95,7 @@
message_animal_or_basic = custom_message
. = ..()
message_animal_or_basic = initial(message_animal_or_basic)
- if(!. && !user.can_speak() || user.getOxyLoss() >= 50)
+ if(!user.can_speak() || user.getOxyLoss() >= 50)
return //stop the sound if oxyloss too high/cant speak
var/mob/living/carbon/carbon_user = user
// For masks that give unique death sounds
@@ -117,9 +117,9 @@
/datum/emote/living/faint/run_emote(mob/user, params, type_override, intentional)
. = ..()
- if(. && isliving(user))
- var/mob/living/L = user
- L.SetSleeping(200)
+ if(isliving(user))
+ var/mob/living/living = user
+ living.SetSleeping(20 SECONDS)
/datum/emote/living/flap
key = "flap"
@@ -130,7 +130,7 @@
/datum/emote/living/flap/run_emote(mob/user, params, type_override, intentional)
. = ..()
- if(. && ishuman(user))
+ if(ishuman(user))
var/mob/living/carbon/human/human_user = user
var/open = FALSE
var/obj/item/organ/external/wings/functional/wings = human_user.get_organ_slot(ORGAN_SLOT_EXTERNAL_WINGS)
@@ -233,8 +233,6 @@
/datum/emote/living/jump/run_emote(mob/living/user, params, type_override, intentional)
. = ..()
- if(!.)
- return FALSE
animate(user, pixel_y = user.pixel_y + 4, time = 0.1 SECONDS)
animate(pixel_y = user.pixel_y - 4, time = 0.1 SECONDS)
@@ -248,8 +246,6 @@
/datum/emote/living/kiss/run_emote(mob/living/user, params, type_override, intentional)
. = ..()
- if(!.)
- return
var/kiss_type = /obj/item/hand_item/kisser
if(HAS_TRAIT(user, TRAIT_KISS_OF_DEATH))
@@ -271,7 +267,7 @@
audio_cooldown = 5 SECONDS
vary = TRUE
-/datum/emote/living/laugh/can_run_emote(mob/living/user, status_check = TRUE , intentional)
+/datum/emote/living/laugh/can_run_emote(mob/living/user, status_check = TRUE , intentional, params)
return ..() && user.can_speak(allow_mimes = TRUE)
/datum/emote/living/laugh/get_sound(mob/living/carbon/human/user)
@@ -334,7 +330,7 @@
audio_cooldown = 5 SECONDS
emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE | EMOTE_RUNECHAT
-/datum/emote/living/cough/can_run_emote(mob/user, status_check = TRUE , intentional)
+/datum/emote/living/cough/can_run_emote(mob/user, status_check = TRUE , intentional, params)
return !HAS_TRAIT(user, TRAIT_SOOTHED_THROAT) && ..()
/datum/emote/living/cough/get_sound(mob/living/carbon/human/user)
@@ -355,6 +351,7 @@
message = "screams!"
message_mime = "acts out a scream!"
emote_type = EMOTE_VISIBLE | EMOTE_AUDIBLE
+ mob_type_blacklist_typecache = list(/mob/living/brain, /mob/living/carbon/human)
/datum/emote/living/scream/run_emote(mob/user, params, type_override, intentional = FALSE)
if(!intentional && HAS_TRAIT(user, TRAIT_ANALGESIA))
@@ -384,8 +381,6 @@
#define SHIVER_LOOP_DURATION (1 SECONDS)
/datum/emote/living/shiver/run_emote(mob/living/user, params, type_override, intentional)
. = ..()
- if(!.)
- return FALSE
animate(user, pixel_x = user.pixel_x + 1, time = 0.1 SECONDS)
for(var/i in 1 to SHIVER_LOOP_DURATION / (0.2 SECONDS)) //desired total duration divided by the iteration duration to give the necessary iteration count
animate(pixel_x = user.pixel_x - 1, time = 0.1 SECONDS)
@@ -462,10 +457,10 @@
/datum/emote/living/surrender/run_emote(mob/user, params, type_override, intentional)
. = ..()
- if(. && isliving(user))
- var/mob/living/L = user
- L.Paralyze(200)
- L.remove_status_effect(/datum/status_effect/grouped/surrender)
+ if(isliving(user))
+ var/mob/living/living = user
+ living.Paralyze(20 SECONDS)
+ living.remove_status_effect(/datum/status_effect/grouped/surrender)
/datum/emote/living/sway
key = "sway"
@@ -474,8 +469,6 @@
/datum/emote/living/sway/run_emote(mob/living/user, params, type_override, intentional)
. = ..()
- if(!.)
- return FALSE
animate(user, pixel_x = user.pixel_x + 2, time = 0.5 SECONDS)
for(var/i in 1 to 2)
animate(pixel_x = user.pixel_x - 4, time = 1.0 SECONDS)
@@ -495,8 +488,6 @@
#define TREMBLE_LOOP_DURATION (4.4 SECONDS)
/datum/emote/living/tremble/run_emote(mob/living/user, params, type_override, intentional)
. = ..()
- if(!.)
- return FALSE
animate(user, pixel_x = user.pixel_x + 2, time = 0.2 SECONDS)
for(var/i in 1 to TREMBLE_LOOP_DURATION / (0.4 SECONDS)) //desired total duration divided by the iteration duration to give the necessary iteration count
animate(pixel_x = user.pixel_x - 2, time = 0.2 SECONDS)
@@ -511,8 +502,6 @@
/datum/emote/living/twitch/run_emote(mob/living/user, params, type_override, intentional)
. = ..()
- if(!.)
- return FALSE
animate(user, pixel_x = user.pixel_x - 1, time = 0.1 SECONDS)
animate(pixel_x = user.pixel_x + 1, time = 0.1 SECONDS)
animate(time = 0.1 SECONDS)
@@ -526,8 +515,6 @@
/datum/emote/living/twitch_s/run_emote(mob/living/user, params, type_override, intentional)
. = ..()
- if(!.)
- return FALSE
animate(user, pixel_x = user.pixel_x - 1, time = 0.1 SECONDS)
animate(pixel_x = user.pixel_x + 1, time = 0.1 SECONDS)
@@ -617,8 +604,36 @@
key_third_person = "custom"
message = null
-/datum/emote/living/custom/can_run_emote(mob/user, status_check, intentional)
- . = ..() && intentional
+/datum/emote/living/custom/can_run_emote(mob/user, status_check, intentional, params)
+ . = ..()
+ if(!. || !intentional)
+ return FALSE
+
+ if(!isnull(user.ckey) && is_banned_from(user.ckey, "Emote"))
+ to_chat(user, span_boldwarning("You cannot send custom emotes (banned)."))
+ return FALSE
+
+ if(QDELETED(user))
+ return FALSE
+
+ if(user.client && user.client.prefs.muted & MUTE_IC)
+ to_chat(user, span_boldwarning("You cannot send IC messages (muted)."))
+ return FALSE
+
+ var/our_message = params ? params : get_custom_emote_from_user()
+
+ if(!emote_is_valid(user, our_message))
+ return FALSE
+
+ if(!params)
+ var/user_emote_type = get_custom_emote_type_from_user()
+
+ if(!user_emote_type)
+ return FALSE
+
+ emote_type = user_emote_type
+
+ message = our_message
/datum/emote/living/custom/proc/emote_is_valid(mob/user, input)
// We're assuming clientless mobs custom emoting is something codebase-driven and not player-driven.
@@ -677,55 +692,17 @@
return FALSE
/datum/emote/living/custom/run_emote(mob/user, params, type_override = null, intentional = FALSE)
- if(!can_run_emote(user, TRUE, intentional))
- return FALSE
-
- if(!isnull(user.ckey) && is_banned_from(user.ckey, "Emote"))
- to_chat(user, span_boldwarning("You cannot send custom emotes (banned)."))
- return FALSE
-
- if(QDELETED(user))
- return FALSE
-
- if(user.client && user.client.prefs.muted & MUTE_IC)
- to_chat(user, span_boldwarning("You cannot send IC messages (muted)."))
- return FALSE
-
- message = params ? params : get_custom_emote_from_user()
-
- if(!emote_is_valid(user, message))
- message = null
- return FALSE
-
- if(!params)
- var/user_emote_type = get_custom_emote_type_from_user()
-
- if(!user_emote_type)
- return FALSE
-
- emote_type = user_emote_type
- else if(type_override)
+ if(params && type_override)
emote_type = type_override
-
message = user.say_emphasis(message) //SKYRAT EDIT ADDITION - EMOTES
-
. = ..()
-
+ ///Reset the message and emote type after it's run.
message = null
emote_type = EMOTE_VISIBLE
/datum/emote/living/custom/replace_pronoun(mob/user, message)
return message
-/datum/emote/living/beep
- key = "beep"
- key_third_person = "beeps"
- message = "beeps."
- message_param = "beeps at %t."
- sound = 'sound/machines/twobeep.ogg'
- mob_type_allowed_typecache = list(/mob/living/brain, /mob/living/silicon, /mob/living/basic/orbie)
- emote_type = EMOTE_AUDIBLE
-
/datum/emote/living/inhale
key = "inhale"
key_third_person = "inhales"
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 7e45a3f1ebd133..76623c19a87c23 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -62,6 +62,12 @@
. = SEND_SIGNAL(src, COMSIG_LIVING_Z_IMPACT, levels, impacted_turf)
if(. & ZIMPACT_CANCEL_DAMAGE)
return .
+ // multiplier for the damage taken from falling
+ var/damage_softening_multiplier = 1
+
+ var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = get_organ_slot(ORGAN_SLOT_SPINE)
+ if(istype(potential_spine))
+ damage_softening_multiplier *= potential_spine.athletics_boost_multiplier
//SKYRAT EDIT ADDITION START - Landing in liquids
if(impacted_turf.liquids && impacted_turf.liquids.liquid_state >= LIQUID_STATE_WAIST)
@@ -113,7 +119,7 @@
new /obj/effect/temp_visual/mook_dust(impacted_turf)
if(body_position == STANDING_UP)
- var/damage_for_each_leg = round(incoming_damage / 2)
+ var/damage_for_each_leg = round((incoming_damage / 2) * damage_softening_multiplier)
apply_damage(damage_for_each_leg, BRUTE, BODY_ZONE_L_LEG, wound_bonus = -2.5 * levels)
apply_damage(damage_for_each_leg, BRUTE, BODY_ZONE_R_LEG, wound_bonus = -2.5 * levels)
else
@@ -706,6 +712,10 @@
/mob/living/proc/get_up(instant = FALSE)
set waitfor = FALSE
+ var/get_up_time = 1 SECONDS
+ var/obj/item/organ/internal/cyberimp/chest/spine/potential_spine = get_organ_slot(ORGAN_SLOT_SPINE)
+ if(istype(potential_spine))
+ get_up_time *= potential_spine.athletics_boost_multiplier
// if(!instant && !do_after(src, 1 SECONDS, src, timed_action_flags = (IGNORE_USER_LOC_CHANGE|IGNORE_TARGET_LOC_CHANGE|IGNORE_HELD_ITEM), extra_checks = CALLBACK(src, TYPE_PROC_REF(/mob/living, rest_checks_callback)), interaction_key = DOAFTER_SOURCE_GETTING_UP, hidden = TRUE)) // SKYRAT EDIT REMOVAL
// SKYRAT EDIT ADDITION START
var/get_up_speed = GET_UP_FAST
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 939ecab4365761..375d82f5b69e60 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -139,12 +139,12 @@
return 0
/obj/item/proc/get_volume_by_throwforce_and_or_w_class()
- if(throwforce && w_class)
- return clamp((throwforce + w_class) * 5, 30, 100)// Add the item's throwforce to its weight class and multiply by 5, then clamp the value between 30 and 100
- else if(w_class)
- return clamp(w_class * 8, 20, 100) // Multiply the item's weight class by 8, then clamp the value between 20 and 100
- else
- return 0
+ if(throwforce && w_class)
+ return clamp((throwforce + w_class) * 5, 30, 100)// Add the item's throwforce to its weight class and multiply by 5, then clamp the value between 30 and 100
+ else if(w_class)
+ return clamp(w_class * 8, 20, 100) // Multiply the item's weight class by 8, then clamp the value between 20 and 100
+ else
+ return 0
/mob/living/proc/set_combat_mode(new_mode, silent = TRUE)
if(combat_mode == new_mode)
diff --git a/code/modules/mob/living/living_say.dm b/code/modules/mob/living/living_say.dm
index 4c4f7b789b1587..2a6b86df427db0 100644
--- a/code/modules/mob/living/living_say.dm
+++ b/code/modules/mob/living/living_say.dm
@@ -410,27 +410,13 @@ GLOBAL_LIST_INIT(message_modes_stat_limits, list(
var/list/filter = list()
var/list/special_filter = list()
- var/voice_to_use = voice
- var/use_radio = FALSE
if(length(voice_filter) > 0)
filter += voice_filter
if(length(tts_filter) > 0)
filter += tts_filter.Join(",")
- if(ishuman(src))
- var/mob/living/carbon/human/human_speaker = src
- if(istype(human_speaker.wear_mask, /obj/item/clothing/mask))
- var/obj/item/clothing/mask/worn_mask = human_speaker.wear_mask
- if(!worn_mask.up)
- if(worn_mask.voice_override)
- voice_to_use = worn_mask.voice_override
- if(worn_mask.voice_filter)
- filter += worn_mask.voice_filter
- use_radio = worn_mask.use_radio_beeps_tts
- if(use_radio)
- special_filter += TTS_FILTER_RADIO
- if(issilicon(src))
- special_filter += TTS_FILTER_SILICON
+
+ var/voice_to_use = get_tts_voice(filter, special_filter)
INVOKE_ASYNC(SStts, TYPE_PROC_REF(/datum/controller/subsystem/tts, queue_tts_message), src, html_decode(tts_message_to_use), message_language, voice_to_use, filter.Join(","), listened, message_range = message_range, pitch = pitch, special_filters = special_filter.Join("|"))
@@ -441,6 +427,22 @@ GLOBAL_LIST_INIT(message_modes_stat_limits, list(
LAZYADD(update_on_z, say_popup)
addtimer(CALLBACK(src, PROC_REF(clear_saypopup), say_popup), 3.5 SECONDS)
+/mob/living/proc/get_tts_voice(list/filter, list/special_filter)
+ . = voice
+ var/obj/item/clothing/mask/mask = get_item_by_slot(ITEM_SLOT_MASK)
+ if(!istype(mask) || mask.up)
+ return
+ if(mask.voice_override)
+ . = mask.voice_override
+ if(mask.voice_filter)
+ filter += mask.voice_filter
+ if(mask.use_radio_beeps_tts)
+ special_filter |= TTS_FILTER_RADIO
+
+/mob/living/silicon/get_tts_voice(list/filter, list/special_filter)
+ . = ..()
+ special_filter |= TTS_FILTER_SILICON
+
/mob/living/proc/clear_saypopup(image/say_popup)
LAZYREMOVE(update_on_z, say_popup)
diff --git a/code/modules/mob/living/silicon/ai/emote.dm b/code/modules/mob/living/silicon/ai/emote.dm
index 8050ff1d0a0d90..c4ec04e0899ec1 100644
--- a/code/modules/mob/living/silicon/ai/emote.dm
+++ b/code/modules/mob/living/silicon/ai/emote.dm
@@ -9,12 +9,6 @@
/datum/emote/ai/emotion_display/run_emote(mob/living/silicon/ai/user, params, type_override, intentional)
. = ..()
- if(!.)
- return
-
- if(!istype(user))
- return
-
user.apply_emote_display(emotion)
/datum/emote/ai/emotion_display/very_happy
@@ -72,9 +66,6 @@
/datum/emote/ai/emotion_display/friend_computer/run_emote(mob/user, params, type_override, intentional)
. = ..()
- if(!.)
- return
-
var/datum/radio_frequency/frequency = SSradio.return_frequency(FREQ_STATUS_DISPLAYS)
if(!frequency)
diff --git a/code/modules/mob/living/silicon/ai/freelook/README.txt b/code/modules/mob/living/silicon/ai/freelook/README.txt
index 78dc3b52f5cf22..818087f995982a 100644
--- a/code/modules/mob/living/silicon/ai/freelook/README.txt
+++ b/code/modules/mob/living/silicon/ai/freelook/README.txt
@@ -32,7 +32,7 @@ HOW IT UPDATES
The camera network uses a streaming method in order to effeciently update chunks. Since the server will have doors opening, doors closing,
turf being destroyed and other lag inducing stuff, we want to update it under certain conditions and not every tick.
-The chunks are not created straight away, only when an AI eye moves into it's area is when it gets created.
+The chunks are not created straight away, only when an AI eye moves into its area is when it gets created.
One a chunk is created, when a non glass door opens/closes or an opacity turf is destroyed, we check to see if an AI Eye is looking in the area.
We do this with the "seenby" list, which updates everytime an AI is near a chunk. If there is an AI eye inside the area, we update the chunk
that the changed atom is inside and all surrounding chunks, since a camera's vision could leak onto another chunk. If there is no AI Eye, we instead
diff --git a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
index a9ad9884045d6e..2c5e809e5d9212 100644
--- a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm
@@ -56,7 +56,7 @@ GLOBAL_DATUM_INIT(cameranet, /datum/cameranet, new)
if(!.)
chunks[key] = . = new /datum/camerachunk(x, y, lowest.z)
-/// Updates what the aiEye can see. It is recommended you use this when the aiEye moves or it's location is set.
+/// Updates what the aiEye can see. It is recommended you use this when the aiEye moves or its location is set.
/datum/cameranet/proc/visibility(list/moved_eyes, client/C, list/other_eyes, use_static = TRUE)
if(!islist(moved_eyes))
moved_eyes = moved_eyes ? list(moved_eyes) : list()
@@ -67,7 +67,7 @@ GLOBAL_DATUM_INIT(cameranet, /datum/cameranet, new)
for(var/mob/camera/ai_eye/eye as anything in moved_eyes)
var/list/visibleChunks = list()
- //Get the eye's turf in case it's located in an object like a mecha
+ //Get the eye's turf in case its located in an object like a mecha
var/turf/eye_turf = get_turf(eye)
if(eye.loc)
var/static_range = eye.static_visibility_range
diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm
index 41855a0db879ae..22158647823259 100644
--- a/code/modules/mob/living/silicon/robot/emote.dm
+++ b/code/modules/mob/living/silicon/robot/emote.dm
@@ -1,6 +1,5 @@
-/* SKYRAT EDIT REMOVAL
/datum/emote/silicon
- mob_type_allowed_typecache = list(/mob/living/silicon, /mob/living/simple_animal/bot, /mob/living/basic/bot)
+ trait_required = TRAIT_SILICON_EMOTES_ALLOWED
emote_type = EMOTE_AUDIBLE
/datum/emote/silicon/boop
@@ -8,6 +7,14 @@
key_third_person = "boops"
message = "boops."
+/datum/emote/silicon/beep
+ key = "beep"
+ key_third_person = "beeps"
+ message = "beeps."
+ message_param = "beeps at %t."
+ emote_type = EMOTE_AUDIBLE
+ sound = 'sound/machines/twobeep.ogg'
+
/datum/emote/silicon/buzz
key = "buzz"
key_third_person = "buzzes"
@@ -16,7 +23,6 @@
emote_type = EMOTE_AUDIBLE
sound = 'sound/machines/buzz-sigh.ogg'
-
/datum/emote/silicon/buzz2
key = "buzz2"
message = "buzzes twice."
@@ -63,4 +69,3 @@
message = "activates their slow clap processor."
emote_type = EMOTE_AUDIBLE
sound = 'sound/machines/slowclap.ogg'
-*/
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 89c1d7ae2856f8..71c7aa9fc89572 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -11,7 +11,7 @@
post_tipped_callback = CALLBACK(src, PROC_REF(after_tip_over)), \
post_untipped_callback = CALLBACK(src, PROC_REF(after_righted)), \
roleplay_friendly = TRUE, \
- roleplay_emotes = list(/datum/emote/living/human/buzz, /datum/emote/living/human/buzz2, /datum/emote/living/beep, /datum/emote/living/human/beep2), /* SKYRAT EDIT CHANGE - ORIGINAL: roleplay_emotes = list(/datum/emote/silicon/buzz, /datum/emote/silicon/buzz2, /datum/emote/living/beep), */ \
+ roleplay_emotes = list(/datum/emote/silicon/buzz, /datum/emote/silicon/buzz2, /datum/emote/silicon/beep, /datum/emote/silicon/beep2), /* SKYRAT EDIT CHANGE - ORIGINAL: roleplay_emotes = list(/datum/emote/silicon/buzz, /datum/emote/silicon/buzz2, /datum/emote/silicon/beep)*/ \
roleplay_callback = CALLBACK(src, PROC_REF(untip_roleplay)))
set_wires(new /datum/wires/robot(src))
@@ -125,9 +125,9 @@
GLOB.available_ai_shells -= src
QDEL_NULL(modularInterface)
- QDEL_NULL(wires)
QDEL_NULL(model)
QDEL_NULL(eye_lights)
+ QDEL_NULL(hat_overlay)
QDEL_NULL(inv1)
QDEL_NULL(inv2)
QDEL_NULL(inv3)
@@ -320,12 +320,34 @@
add_overlay("ov-opencover +c")
else
add_overlay("ov-opencover -c")
+
if(hat)
- var/mutable_appearance/head_overlay = hat.build_worn_icon(default_layer = 20, default_icon_file = 'icons/mob/clothing/head/default.dmi')
- head_overlay.pixel_z += hat_offset
- add_overlay(head_overlay)
+ hat_overlay = hat.build_worn_icon(default_layer = 20, default_icon_file = 'icons/mob/clothing/head/default.dmi')
+ update_worn_icons()
+ else if(hat_overlay)
+ QDEL_NULL(hat_overlay)
+
update_appearance(UPDATE_OVERLAYS)
+/mob/living/silicon/robot/proc/update_worn_icons()
+ if(!hat_overlay)
+ return
+ cut_overlay(hat_overlay)
+
+ if(islist(hat_offset))
+ var/list/offset = hat_offset[ISDIAGONALDIR(dir) ? dir2text(dir & (WEST|EAST)) : dir2text(dir)]
+ if(offset)
+ hat_overlay.pixel_w = offset[1]
+ hat_overlay.pixel_z = offset[2]
+
+ add_overlay(hat_overlay)
+
+/mob/living/silicon/robot/setDir(newdir)
+ var/old_dir = dir
+ . = ..()
+ if(. != old_dir)
+ update_worn_icons()
+
/mob/living/silicon/robot/on_changed_z_level(turf/old_turf, turf/new_turf, same_z_layer, notify_contents)
if(same_z_layer || QDELING(src))
return ..()
@@ -359,7 +381,7 @@
set_lockcharge(FALSE)
scrambledcodes = TRUE
log_silicon("CYBORG: [key_name(src)] has been unlinked from an AI.")
- //Disconnect it's camera so it's not so easily tracked.
+ //Disconnect its camera so it's not so easily tracked.
if(!QDELETED(builtInCamera))
QDEL_NULL(builtInCamera)
// I'm trying to get the Cyborg to not be listed in the camera list
diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm
index 2346c36ba5c03c..0e4e79f84ce509 100644
--- a/code/modules/mob/living/silicon/robot/robot_defense.dm
+++ b/code/modules/mob/living/silicon/robot/robot_defense.dm
@@ -242,7 +242,7 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real
if (!getBruteLoss())
to_chat(user, span_warning("[src] is already in good condition!"))
return
- if (!tool.tool_start_check(user, amount=1)) //The welder has 1u of fuel consumed by it's afterattack, so we don't need to worry about taking any away.
+ if (!tool.tool_start_check(user, amount=1)) //The welder has 1u of fuel consumed by its afterattack, so we don't need to worry about taking any away.
return
if(src == user)
to_chat(user, span_notice("You start fixing yourself..."))
diff --git a/code/modules/mob/living/silicon/robot/robot_defines.dm b/code/modules/mob/living/silicon/robot/robot_defines.dm
index 7556cc7d85bbab..6f8abfc725406e 100644
--- a/code/modules/mob/living/silicon/robot/robot_defines.dm
+++ b/code/modules/mob/living/silicon/robot/robot_defines.dm
@@ -55,7 +55,10 @@
////Power consumption of the light per lamp_intensity.
var/lamp_power_consumption = BORG_LAMP_POWER_CONSUMPTION
+ // Overlay for borg eye lights
var/mutable_appearance/eye_lights
+ // Overlay for borg hat
+ var/mutable_appearance/hat_overlay
// Hud
@@ -129,7 +132,7 @@
var/hasExpanded = FALSE
var/obj/item/hat
- var/hat_offset = -3
+ var/hat_offset = list("north" = list(0, -3), "south" = list(0, -3), "east" = list(4, -3), "west" = list(-4, -3))
///What types of mobs are allowed to ride/buckle to this mob
var/static/list/can_ride_typecache = typecacheof(/mob/living/carbon/human)
diff --git a/code/modules/mob/living/silicon/robot/robot_model.dm b/code/modules/mob/living/silicon/robot/robot_model.dm
index c3aa2bd1da1d28..ddf5631c3e03ae 100644
--- a/code/modules/mob/living/silicon/robot/robot_model.dm
+++ b/code/modules/mob/living/silicon/robot/robot_model.dm
@@ -45,8 +45,8 @@
var/allow_riding = TRUE
///Whether the borg can stuff itself into disposals
var/canDispose = FALSE
- ///The y offset of the hat put on
- var/hat_offset = -3
+ ///The pixel offset of the hat. List of "north" "south" "east" "west" x, y offsets
+ var/hat_offset = list("north" = list(0, -3), "south" = list(0, -3), "east" = list(4, -3), "west" = list(-4, -3))
///The x offsets of a person riding the borg
var/list/ride_offset_x = list("north" = 0, "south" = 0, "east" = -6, "west" = 6)
///The y offsets of a person riding the borg
@@ -65,6 +65,9 @@
emag_modules += new_module
emag_modules -= path
+ if(check_holidays(ICE_CREAM_DAY) && !(locate(/obj/item/borg/lollipop) in basic_modules))
+ basic_modules += new /obj/item/borg/lollipop/ice_cream(src)
+
/obj/item/robot_model/Destroy()
basic_modules.Cut()
emag_modules.Cut()
@@ -235,6 +238,7 @@
if(!new_model.be_transformed_to(src, forced))
qdel(new_model)
return
+ cyborg.drop_all_held_items()
cyborg.model = new_model
cyborg.update_module_innate()
new_model.rebuild_modules()
@@ -298,6 +302,8 @@
//SKYRAT EDIT ADDITION
if(!isnull(details[SKIN_FEATURES]))
model_features += details[SKIN_FEATURES]
+ if (!isnull(details[SKIN_HAT_REST_OFFSET]))
+ rest_hat_offset = details[SKIN_HAT_REST_OFFSET]
//SKYRAT EDIT END
for(var/i in old_model.added_modules)
added_modules += i
@@ -382,7 +388,7 @@
)
model_select_icon = "service"
cyborg_base_icon = "clown"
- hat_offset = -2
+ hat_offset = list("north" = list(0, -2), "south" = list(0, -2), "east" = list(4, -2), "west" = list(-4, -2))
/obj/item/robot_model/clown/respawn_consumable(mob/living/silicon/robot/cyborg, coeff = 1)
. = ..()
@@ -428,7 +434,7 @@
cyborg_base_icon = "engineer"
model_select_icon = "engineer"
model_traits = list(TRAIT_NEGATES_GRAVITY)
- hat_offset = -4
+ hat_offset = list("north" = list(0, -4), "south" = list(0, -4), "east" = list(4, -4), "west" = list(-4, -4))
/obj/item/robot_model/janitor
name = "Janitor"
@@ -455,7 +461,7 @@
)
cyborg_base_icon = "janitor"
model_select_icon = "janitor"
- hat_offset = -5
+ hat_offset = list("north" = list(0, -5), "south" = list(0, -5), "east" = list(4, -5), "west" = list(-4, -5))
/// Weakref to the wash toggle action we own
var/datum/weakref/wash_toggle_ref
@@ -725,10 +731,9 @@
cyborg_base_icon = "medical"
model_select_icon = "medical"
model_traits = list(TRAIT_PUSHIMMUNE)
- hat_offset = 3
borg_skins = list(
- "Machinified Doctor" = list(SKIN_ICON_STATE = "medical"),
- "Qualified Doctor" = list(SKIN_ICON_STATE = "qualified_doctor"),
+ "Machinified Doctor" = list(SKIN_ICON_STATE = "medical", SKIN_HAT_OFFSET = list("north" = list(0, 3), "south" = list(0, 3), "east" = list(-1, 3), "west" = list(1, 3))),
+ "Qualified Doctor" = list(SKIN_ICON_STATE = "qualified_doctor", SKIN_HAT_OFFSET = list("north" = list(0, 3), "south" = list(0, 3), "east" = list(1, 3), "west" = list(-1, 3))),
)
/obj/item/robot_model/miner
@@ -755,10 +760,10 @@
)
cyborg_base_icon = "miner"
model_select_icon = "miner"
- hat_offset = 0
+ hat_offset = list("north" = list(0, 0), "south" = list(0, 0), "east" = list(0, 0), "west" = list(0, 0))
borg_skins = list(
"Asteroid Miner" = list(SKIN_ICON_STATE = "minerOLD"),
- "Spider Miner" = list(SKIN_ICON_STATE = "spidermin"),
+ "Spider Miner" = list(SKIN_ICON_STATE = "spidermin", SKIN_HAT_OFFSET = list("north" = list(0, -2), "south" = list(0, -2), "east" = list(-2, -2), "west" = list(2, -2))),
"Lavaland Miner" = list(SKIN_ICON_STATE = "miner"),
)
@@ -780,7 +785,7 @@
cyborg_base_icon = "peace"
model_select_icon = "standard"
model_traits = list(TRAIT_PUSHIMMUNE)
- hat_offset = -2
+ hat_offset = list("north" = list(0, -2), "south" = list(0, -2), "east" = list(1, -2), "west" = list(-1, -2))
/obj/item/robot_model/peacekeeper/do_transform_animation()
..()
@@ -804,7 +809,7 @@
cyborg_base_icon = "sec"
model_select_icon = "security"
model_traits = list(TRAIT_PUSHIMMUNE)
- hat_offset = 3
+ hat_offset = list("north" = list(0, 3), "south" = list(0, 3), "east" = list(1, 3), "west" = list(-1, 3))
/obj/item/robot_model/security/do_transform_animation()
..()
@@ -874,11 +879,11 @@
cyborg_base_icon = "service_m" // display as butlerborg for radial model selection
model_select_icon = "service"
special_light_key = "service"
- hat_offset = 0
+ hat_offset = list("north" = list(0, 0), "south" = list(0, 0), "east" = list(0, 0), "west" = list(0, 0))
borg_skins = list(
"Bro" = list(SKIN_ICON_STATE = "brobot"),
"Butler" = list(SKIN_ICON_STATE = "service_m"),
- "Kent" = list(SKIN_ICON_STATE = "kent", SKIN_LIGHT_KEY = "medical", SKIN_HAT_OFFSET = 3),
+ "Kent" = list(SKIN_ICON_STATE = "kent", SKIN_LIGHT_KEY = "medical", SKIN_HAT_OFFSET = list("north" = list(0, 3), "south" = list(0, 3), "east" = list(-1, 3), "west" = list(1, 3))),
"Tophat" = list(SKIN_ICON_STATE = "tophat", SKIN_LIGHT_KEY = NONE, SKIN_HAT_OFFSET = INFINITY),
"Waitress" = list(SKIN_ICON_STATE = "service_f"),
)
@@ -907,7 +912,7 @@
cyborg_base_icon = "synd_sec"
model_select_icon = "malf"
model_traits = list(TRAIT_PUSHIMMUNE)
- hat_offset = 3
+ hat_offset = list("north" = list(0, 3), "south" = list(0, 3), "east" = list(4, 3), "west" = list(-4, 3))
/obj/item/robot_model/syndicate/rebuild_modules()
..()
@@ -942,7 +947,7 @@
cyborg_base_icon = "synd_medical"
model_select_icon = "malf"
model_traits = list(TRAIT_PUSHIMMUNE)
- hat_offset = 3
+ hat_offset = list("north" = list(0, 3), "south" = list(0, 3), "east" = list(-1, 3), "west" = list(1, 3))
/obj/item/robot_model/saboteur
name = "Syndicate Saboteur"
@@ -971,7 +976,7 @@
cyborg_base_icon = "synd_engi"
model_select_icon = "malf"
model_traits = list(TRAIT_PUSHIMMUNE, TRAIT_NEGATES_GRAVITY)
- hat_offset = -4
+ hat_offset = list("north" = list(0, -4), "south" = list(0, -4), "east" = list(4, -4), "west" = list(-4, -4))
canDispose = TRUE
/obj/item/robot_model/syndicate/kiltborg
@@ -982,7 +987,7 @@
)
model_select_icon = "kilt"
cyborg_base_icon = "kilt"
- hat_offset = -2
+ hat_offset = list("north" = list(0, -2), "south" = list(0, -2), "east" = list(4, -2), "west" = list(-4, -2))
breakable_modules = FALSE
locked_transform = FALSE //GO GO QUICKLY AND SLAUGHTER THEM ALL
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 7862d9cb442622..cde99e84c1f46f 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -80,6 +80,7 @@
)
add_traits(traits_to_apply, ROUNDSTART_TRAIT)
+ ADD_TRAIT(src, TRAIT_SILICON_EMOTES_ALLOWED, INNATE_TRAIT)
RegisterSignal(src, COMSIG_LIVING_ELECTROCUTE_ACT, PROC_REF(on_silicon_shocked))
/mob/living/silicon/Destroy()
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index 48d83da80a9c11..50b30b09aa88c8 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -196,15 +196,13 @@
path_hud.add_atom_to_hud(src)
path_hud.show_to(src)
- if(HAS_TRAIT(SSstation, STATION_TRAIT_BOTS_GLITCHED))
- randomize_language_if_on_station()
-
if(mapload && is_station_level(z) && bot_mode_flags & BOT_MODE_CAN_BE_SAPIENT && bot_mode_flags & BOT_MODE_ROUNDSTART_POSSESSION)
enable_possession(mapload = mapload)
pa_system = new(src, automated_announcements = automated_announcements)
pa_system.Grant(src)
RegisterSignal(src, COMSIG_MOB_TRIED_ACCESS, PROC_REF(attempt_access))
+ ADD_TRAIT(src, TRAIT_SILICON_EMOTES_ALLOWED, INNATE_TRAIT)
/mob/living/simple_animal/bot/Destroy()
GLOB.bots_list -= src
diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm
index ae1c52d1652da2..4bedf0d3d621bb 100644
--- a/code/modules/mob/living/simple_animal/bot/floorbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm
@@ -218,52 +218,54 @@
target = scan(tiles_scanned)
- if(!target && bot_mode_flags & BOT_MODE_AUTOPATROL)
- switch(mode)
- if(BOT_IDLE, BOT_START_PATROL)
- start_patrol()
- if(BOT_PATROL)
- bot_patrol()
-
- if(target)
- if(loc == target || loc == get_turf(target))
- if(check_bot(target)) //Target is not defined at the parent
- if(prob(50)) //50% chance to still try to repair so we dont end up with 2 floorbots failing to fix the last breach
- target = null
- path = list()
- return
- if(isturf(target) && !(bot_cover_flags & BOT_COVER_EMAGGED))
- repair(target)
- else if(bot_cover_flags & BOT_COVER_EMAGGED && isfloorturf(target))
- var/turf/open/floor/F = target
- toggle_magnet()
- mode = BOT_REPAIRING
- if(isplatingturf(F))
- F.attempt_lattice_replacement()
- else
- F.ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
- audible_message(span_danger("[src] makes an excited booping sound."))
- addtimer(CALLBACK(src, PROC_REF(go_idle)), 0.5 SECONDS)
- path = list()
- return
- if(!length(path))
- if(!isturf(target))
- var/turf/TL = get_turf(target)
- path = get_path_to(src, TL, max_distance=30, access=access_card.GetAccess(), simulated_only = FALSE)
- else
- path = get_path_to(src, target, max_distance=30, access=access_card.GetAccess(), simulated_only = FALSE)
+ if (!target)
+ if(bot_mode_flags & BOT_MODE_AUTOPATROL)
+ switch(mode)
+ if(BOT_IDLE, BOT_START_PATROL)
+ start_patrol()
+ if(BOT_PATROL)
+ bot_patrol()
+ return
- if(!bot_move(target))
- add_to_ignore(target)
+ if(loc == target || loc == get_turf(target))
+ if(check_bot(target)) //Target is not defined at the parent
+ if(prob(50)) //50% chance to still try to repair so we dont end up with 2 floorbots failing to fix the last breach
target = null
- mode = BOT_IDLE
+ path = list()
return
- else if( !bot_move(target) )
+ if(isturf(target) && !(bot_cover_flags & BOT_COVER_EMAGGED))
+ repair(target)
+ else if(bot_cover_flags & BOT_COVER_EMAGGED && isfloorturf(target))
+ var/turf/open/floor/floor = target
+ toggle_magnet()
+ mode = BOT_REPAIRING
+ if(isplatingturf(floor))
+ floor.attempt_lattice_replacement()
+ else
+ floor.ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
+ audible_message(span_danger("[src] makes an excited booping sound."))
+ addtimer(CALLBACK(src, PROC_REF(go_idle)), 0.5 SECONDS)
+ path = list()
+ return
+
+ if(!length(path))
+ if(!isturf(target))
+ var/turf/TL = get_turf(target)
+ path = get_path_to(src, TL, max_distance=30, access=access_card.GetAccess(), simulated_only = FALSE)
+ else
+ path = get_path_to(src, target, max_distance=30, access=access_card.GetAccess(), simulated_only = FALSE)
+
+ if(!bot_move(target))
+ add_to_ignore(target)
target = null
mode = BOT_IDLE
- return
+ else if(!bot_move(target))
+ target = null
+ mode = BOT_IDLE
/mob/living/simple_animal/bot/floorbot/proc/go_idle()
+ if (QDELETED(src))
+ return
toggle_magnet(FALSE)
mode = BOT_IDLE
target = null
@@ -278,7 +280,7 @@
//Floorbots, having several functions, need sort out special conditions here.
/mob/living/simple_animal/bot/floorbot/process_scan(scan_target)
var/result
- var/turf/open/floor/F
+ var/turf/open/floor/floor
move_resist = initial(move_resist)
switch(process_type)
if(HULL_BREACH) //The most common job, patching breaches in the station's hull.
@@ -290,21 +292,21 @@
result = scan_target
move_resist = INFINITY
if(PLACE_TILE)
- F = scan_target
- if(isplatingturf(F)) //The floor must not already have a tile.
- result = F
+ floor = scan_target
+ if(isplatingturf(floor)) //The floor must not already have a tile.
+ result = floor
if(REPLACE_TILE)
- F = scan_target
- if(isfloorturf(F) && !isplatingturf(F)) //The floor must already have a tile.
- result = F
+ floor = scan_target
+ if(isfloorturf(floor) && !isplatingturf(floor)) //The floor must already have a tile.
+ result = floor
if(FIX_TILE) //Selects only damaged floors.
- F = scan_target
- if(istype(F) && (F.broken || F.burnt))
- result = F
+ floor = scan_target
+ if(istype(floor) && (floor.broken || floor.burnt))
+ result = floor
if(TILE_EMAG) //Emag mode! Rip up the floor and cause breaches to space!
- F = scan_target
- if(!isplatingturf(F))
- result = F
+ floor = scan_target
+ if(!isplatingturf(floor))
+ result = floor
else //If no special processing is needed, simply return the result.
result = scan_target
return result
@@ -326,57 +328,69 @@
toggle_magnet()
visible_message(span_notice("[targetdirection ? "[src] begins installing a bridge plating." : "[src] begins to repair the hole."] "))
mode = BOT_REPAIRING
- if(do_after(src, 5 SECONDS, target = target_turf) && mode == BOT_REPAIRING)
- if(autotile) //Build the floor and include a tile.
- if(replacetiles && tilestack)
- target_turf.place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) //make sure a hull is actually below the floor tile
- tilestack.place_tile(target_turf, src)
- if(!tilestack)
- speak("Requesting refill of custom floor tiles to continue replacing.")
- else
- target_turf.place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) //make sure a hull is actually below the floor tile
- target_turf.place_on_top(/turf/open/floor/iron, flags = CHANGETURF_INHERIT_AIR)
- else //Build a hull plating without a floor tile.
- target_turf.place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
+ if(!do_after(src, 5 SECONDS, target = target_turf) && mode == BOT_REPAIRING)
+ go_idle()
+ return
- else
- var/turf/open/floor/F = target_turf
- var/success = FALSE
- var/was_replacing = replacetiles
+ if(!autotile)
+ target_turf.place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
+ go_idle()
+ return
- if(F.broken || F.burnt || isplatingturf(F))
- toggle_magnet()
- mode = BOT_REPAIRING
- visible_message(span_notice("[src] begins [(F.broken || F.burnt) ? "repairing the floor" : "placing a floor tile"]."))
- if(do_after(src, 5 SECONDS, target = F) && mode == BOT_REPAIRING)
- success = TRUE
+ if(replacetiles && tilestack)
+ target_turf.place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) //make sure a hull is actually below the floor tile
+ tilestack.place_tile(target_turf, src)
+ if(!tilestack)
+ speak("Requesting refill of custom floor tiles to continue replacing.")
+ else
+ target_turf.place_on_top(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR) //make sure a hull is actually below the floor tile
+ target_turf.place_on_top(/turf/open/floor/iron, flags = CHANGETURF_INHERIT_AIR)
+ go_idle()
+ return
- else if(replacetiles && tilestack && F.type != tilestack.turf_type)
- toggle_magnet()
- mode = BOT_REPAIRING
- visible_message(span_notice("[src] begins replacing the floor tiles."))
- if(do_after(src, 5 SECONDS, target = target_turf) && mode == BOT_REPAIRING && tilestack)
- success = TRUE
-
- if(success)
- var/area/is_this_maints = get_area(F)
- if(was_replacing && tilestack) //turn the tile into plating (if needed), then replace it
- F = F.make_plating(TRUE) || F
- tilestack.place_tile(F, src)
- if(!tilestack)
- speak("Requesting refill of custom floor tiles to continue replacing.")
- else if(F.broken || F.burnt) //repair the tile and reset it to be undamaged (rather than replacing it)
- F.broken = FALSE
- F.burnt = FALSE
- F.update_appearance()
- else if(istype(is_this_maints, /area/station/maintenance)) //place catwalk if it's plating and we're in maints
- F.place_on_top(/turf/open/floor/catwalk_floor, flags = CHANGETURF_INHERIT_AIR)
- else //place normal tile if it's plating anywhere else
- F = F.make_plating(TRUE) || F
- F.place_on_top(/turf/open/floor/iron, flags = CHANGETURF_INHERIT_AIR)
-
- if(!QDELETED(src))
+ var/turf/open/floor/floor = target_turf
+ var/was_replacing = replacetiles
+
+ if(floor.broken || floor.burnt || isplatingturf(floor))
+ toggle_magnet()
+ mode = BOT_REPAIRING
+ visible_message(span_notice("[src] begins [(floor.broken || floor.burnt) ? "repairing the floor" : "placing a floor tile"]."))
+ if(!do_after(src, 5 SECONDS, target = floor) && mode == BOT_REPAIRING)
+ go_idle()
+ return
+ else if(replacetiles && tilestack && floor.type != tilestack.turf_type)
+ toggle_magnet()
+ mode = BOT_REPAIRING
+ visible_message(span_notice("[src] begins replacing the floor tiles."))
+ if(do_after(src, 5 SECONDS, target = target_turf) && mode == BOT_REPAIRING && tilestack)
+ go_idle()
+ return
+
+ var/area/is_this_maints = get_area(floor)
+ if(was_replacing && tilestack) //turn the tile into plating (if needed), then replace it
+ floor = floor.make_plating(TRUE) || floor
+ tilestack.place_tile(floor, src)
+ if(!tilestack)
+ speak("Requesting refill of custom floor tiles to continue replacing.")
go_idle()
+ return
+
+ if(floor.broken || floor.burnt) //repair the tile and reset it to be undamaged (rather than replacing it)
+ floor.broken = FALSE
+ floor.burnt = FALSE
+ floor.update_appearance()
+ go_idle()
+ return
+
+ if(istype(is_this_maints, /area/station/maintenance)) //place catwalk if it's plating and we're in maints
+ floor.place_on_top(/turf/open/floor/catwalk_floor, flags = CHANGETURF_INHERIT_AIR)
+ go_idle()
+ return
+
+ //place normal tile if it's plating anywhere else
+ floor = floor.make_plating(TRUE) || floor
+ floor.place_on_top(/turf/open/floor/iron, flags = CHANGETURF_INHERIT_AIR)
+ go_idle()
/mob/living/simple_animal/bot/floorbot/update_icon_state()
. = ..()
@@ -396,13 +410,23 @@
new /obj/item/stack/tile/iron/base(Tsec, 1)
return ..()
-/mob/living/simple_animal/bot/floorbot/UnarmedAttack(atom/A, proximity_flag, list/modifiers)
+/mob/living/simple_animal/bot/floorbot/UnarmedAttack(atom/target, proximity_flag, list/modifiers)
if(!can_unarmed_attack())
return
- if(isturf(A))
- repair(A)
+
+ if (!isturf(target))
+ return ..()
+
+ if(!(bot_cover_flags & BOT_COVER_EMAGGED) || !isfloorturf(target))
+ repair(target)
+ return
+
+ var/turf/open/floor/floor = target
+ if(isplatingturf(floor))
+ floor.attempt_lattice_replacement()
else
- ..()
+ floor.ScrapeAway(flags = CHANGETURF_INHERIT_AIR)
+ audible_message(span_danger("[src] makes an excited booping sound."))
/**
* Checks a given turf to see if another floorbot is there, working as well.
diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm
index 39db78fdffb1d5..6b9b4aa77faeeb 100644
--- a/code/modules/mob/living/simple_animal/bot/mulebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm
@@ -48,9 +48,8 @@
///Number of times retried a blocked path
var/blockcount = 0
- var/auto_return = TRUE /// true if auto return to home beacon after unload
- var/auto_pickup = TRUE /// true if auto-pickup at beacon
- var/report_delivery = TRUE /// true if bot will announce an arrival to a location.
+ ///flags of mulebot mode
+ var/mulebot_delivery_flags = MULEBOT_RETURN_MODE | MULEBOT_AUTO_PICKUP_MODE | MULEBOT_REPORT_DELIVERY_MODE
var/obj/item/stock_parts/power_store/cell /// Internal Powercell
var/cell_move_power_usage = 1///How much power we use when we move.
@@ -113,7 +112,6 @@
/mob/living/simple_animal/bot/mulebot/Destroy()
UnregisterSignal(src, list(COMSIG_MOB_BOT_PRE_STEP, COMSIG_MOB_CLIENT_PRE_MOVE, COMSIG_MOB_BOT_STEP, COMSIG_MOB_CLIENT_MOVED))
unload(0)
- QDEL_NULL(wires)
QDEL_NULL(cell)
return ..()
@@ -262,7 +260,7 @@
/mob/living/simple_animal/bot/mulebot/ui_data(mob/user)
var/list/data = list()
- data["on"] = bot_mode_flags & BOT_MODE_ON
+ data["powerStatus"] = bot_mode_flags & BOT_MODE_ON
data["locked"] = bot_cover_flags & BOT_COVER_LOCKED
data["siliconUser"] = HAS_SILICON_ACCESS(user)
data["mode"] = mode ? "[mode]" : "Ready"
@@ -275,18 +273,17 @@
if(BOT_NO_ROUTE)
data["modeStatus"] = "bad"
data["load"] = get_load_name()
- data["destination"] = destination ? destination : null
- data["home"] = home_destination
- data["destinations"] = GLOB.deliverybeacontags
- data["cell"] = cell ? TRUE : FALSE
- data["cellPercent"] = cell ? cell.percent() : null
- data["autoReturn"] = auto_return
- data["autoPickup"] = auto_pickup
- data["reportDelivery"] = report_delivery
- data["id"] = id
- data["allow_possession"] = bot_mode_flags & BOT_MODE_CAN_BE_SAPIENT
- data["possession_enabled"] = can_be_possessed
- data["pai_inserted"] = !!paicard
+ data["destination"] = destination
+ data["homeDestination"] = home_destination
+ data["destinationsList"] = GLOB.deliverybeacontags
+ data["cellPercent"] = cell?.percent()
+ data["autoReturn"] = mulebot_delivery_flags & MULEBOT_RETURN_MODE
+ data["autoPickup"] = mulebot_delivery_flags & MULEBOT_AUTO_PICKUP_MODE
+ data["reportDelivery"] = mulebot_delivery_flags & MULEBOT_REPORT_DELIVERY_MODE
+ data["botId"] = id
+ data["allowPossession"] = bot_mode_flags & BOT_MODE_CAN_BE_SAPIENT
+ data["possessionEnabled"] = can_be_possessed
+ data["paiInserted"] = !!paicard
return data
/mob/living/simple_animal/bot/mulebot/ui_act(action, params)
@@ -352,11 +349,11 @@
else
unload(0)
if("autoret")
- auto_return = !auto_return
+ mulebot_delivery_flags ^= MULEBOT_RETURN_MODE
if("autopick")
- auto_pickup = !auto_pickup
+ mulebot_delivery_flags ^= MULEBOT_AUTO_PICKUP_MODE
if("report")
- report_delivery = !report_delivery
+ mulebot_delivery_flags ^= MULEBOT_REPORT_DELIVERY_MODE
/mob/living/simple_animal/bot/mulebot/proc/buzz(type)
switch(type)
@@ -433,8 +430,8 @@
return TRUE
/mob/living/simple_animal/bot/mulebot/post_unbuckle_mob(mob/living/M)
- load = null
- return ..()
+ load = null
+ return ..()
// called to unload the bot
// argument is optional direction to unload
@@ -637,12 +634,12 @@
radio_channel = RADIO_CHANNEL_AI_PRIVATE //Report on AI Private instead if the AI is controlling us.
if(load) // if loaded, unload at target
- if(report_delivery)
+ if(mulebot_delivery_flags & MULEBOT_REPORT_DELIVERY_MODE)
speak("Destination [RUNECHAT_BOLD("[destination]")] reached. Unloading [load].",radio_channel)
unload(loaddir)
else
// not loaded
- if(auto_pickup) // find a crate
+ if(mulebot_delivery_flags & MULEBOT_AUTO_PICKUP_MODE) // find a crate
var/atom/movable/AM
if(wires.is_cut(WIRE_LOADCHECK)) // if hacked, load first unanchored thing we find
for(var/atom/movable/A in get_step(loc, loaddir))
@@ -653,11 +650,11 @@
AM = locate(/obj/structure/closet/crate) in get_step(loc,loaddir)
if(AM?.Adjacent(src))
load(AM)
- if(report_delivery)
+ if(mulebot_delivery_flags & MULEBOT_REPORT_DELIVERY_MODE)
speak("Now loading [load] at [RUNECHAT_BOLD("[get_area_name(src)]")].", radio_channel)
// whatever happened, check to see if we return home
- if(auto_return && home_destination && destination != home_destination)
+ if((mulebot_delivery_flags & MULEBOT_RETURN_MODE) && home_destination && destination != home_destination)
// auto return set and not at home already
start_home()
mode = BOT_BLOCKED
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
index cf573c3a574792..7c68d760f43993 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
@@ -12,7 +12,7 @@
*
*It acts as a melee creature, chasing down and attacking its target while also using different attacks to augment its power that increase as it takes damage.
*
- *Whenever possible, the drake will breathe fire directly at it's target, igniting and heavily damaging anything caught in the blast.
+ *Whenever possible, the drake will breathe fire directly at its target, igniting and heavily damaging anything caught in the blast.
*It also often causes lava to pool from the ground around you - many nearby turfs will temporarily turn into lava, dealing damage to anything on the turfs.
*The drake also utilizes its wings to fly into the sky, flying after its target and attempting to slam down on them. Anything near when it slams down takes huge damage.
*Sometimes it will chain these swooping attacks over and over, making swiftness a necessity.
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm
index 2dcbbf74eb20d2..f892c7d05e9131 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm
@@ -8,7 +8,7 @@ Difficulty: Hard
/mob/living/simple_animal/hostile/megafauna/wendigo
name = "wendigo"
- desc = "A mythological man-eating legendary creature, the sockets of it's eyes track you with an unsatiated hunger."
+ desc = "A mythological man-eating legendary creature, the sockets of its eyes track you with an unsatiated hunger."
health = 2500
maxHealth = 2500
icon_state = "wendigo"
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm
index f7d86c350deef9..bb3b6874f043c4 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm
@@ -7,8 +7,8 @@
* # Goliath Broodmother
*
* A stronger, faster variation of the goliath. Has the ability to spawn baby goliaths, which it can later detonate at will.
- * When it's health is below half, tendrils will spawn randomly around it. When it is below a quarter of health, this effect is doubled.
- * It's attacks are as follows:
+ * When its health is below half, tendrils will spawn randomly around it. When it is below a quarter of health, this effect is doubled.
+ * Its attacks are as follows:
* - Spawns a 3x3/plus shape of tentacles on the target location
* - Spawns 2 baby goliaths on its tile, up to a max of 8. Children blow up when they die.
* - The broodmother lets out a noise, and is able to move faster for 6.5 seconds.
@@ -167,7 +167,7 @@
//The goliath's children. Pretty weak, simple mobs which are able to put a single tentacle under their target when at range.
/mob/living/simple_animal/hostile/asteroid/elite/broodmother_child
name = "baby goliath"
- desc = "A young goliath recently born from it's mother. While they hatch from eggs, said eggs are incubated in the mother until they are ready to be born."
+ desc = "A young goliath recently born from its mother. While they hatch from eggs, said eggs are incubated in the mother until they are ready to be born."
icon = 'icons/mob/simple/lavaland/lavaland_monsters.dmi'
icon_state = "goliath_baby"
icon_living = "goliath_baby"
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm
index 9f162e0cfdc771..b80a6af1778aff 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm
@@ -6,9 +6,9 @@
/**
* # Herald
*
- * A slow-moving projectile user with a few tricks up it's sleeve. Less unga-bunga than Colossus, with more cleverness in it's fighting style.
- * As it's health gets lower, the amount of projectiles fired per-attack increases.
- * It's attacks are as follows:
+ * A slow-moving projectile user with a few tricks up its sleeve. Less unga-bunga than Colossus, with more cleverness in its fighting style.
+ * As its health gets lower, the amount of projectiles fired per-attack increases.
+ * Its attacks are as follows:
* - Fires three projectiles in a given direction.
* - Fires a spread in every cardinal and diagonal direction at once, then does it again after a bit.
* - Shoots a single, golden bolt. Wherever it lands, the herald will be teleported to the location.
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm
index 1ec573dbd6c56e..ba9e8daa996216 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm
@@ -7,12 +7,12 @@
* # Legionnaire
*
* A towering skeleton, embodying the power of Legion.
- * As it's health gets lower, the head does more damage.
- * It's attacks are as follows:
+ * As its health gets lower, the head does more damage.
+ * Its attacks are as follows:
* - Charges at the target after a telegraph, throwing them across the arena should it connect.
- * - Legionnaire's head detaches, attacking as it's own entity. Has abilities of it's own later into the fight. Once dead, regenerates after a brief period. If the skill is used while the head is off, it will be killed.
+ * - Legionnaire's head detaches, attacking as its own entity. Has abilities of its own later into the fight. Once dead, regenerates after a brief period. If the skill is used while the head is off, it will be killed.
* - Leaves a pile of bones at your location. Upon using this skill again, you'll swap locations with the bone pile.
- * - Spews a cloud of smoke from it's maw, wherever said maw is.
+ * - Spews a cloud of smoke from its maw, wherever said maw is.
* A unique fight incorporating the head mechanic of legion into a whole new beast. Combatants will need to make sure the tag-team of head and body don't lure them into a deadly trap.
*/
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm
index a9babf2eccafa3..33bcb4dc9d7042 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm
@@ -7,8 +7,8 @@
* # Pandora
*
* A box with a similar design to the Hierophant which trades large, single attacks for more frequent smaller ones.
- * As it's health gets lower, the time between it's attacks decrease.
- * It's attacks are as follows:
+ * As its health gets lower, the time between its attacks decrease.
+ * Its attacks are as follows:
* - Fires hierophant blasts in a straight line. Can only fire in a straight line in 8 directions, being the diagonals and cardinals.
* - Creates a box of hierophant blasts around the target. If they try to run away to avoid it, they'll very likely get hit.
* - Teleports the pandora from one location to another, almost identical to Hierophant.
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm
index 936398478a3d3f..ba2752dd0e45e2 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm
@@ -1,6 +1,6 @@
/mob/living/simple_animal/hostile/asteroid/polarbear
name = "polar bear"
- desc = "An aggressive animal that defends it's territory with incredible power. These beasts don't run from their enemies."
+ desc = "An aggressive animal that defends its territory with incredible power. These beasts don't run from their enemies."
icon = 'icons/mob/simple/icemoon/icemoon_monsters.dmi'
icon_state = "polarbear"
icon_living = "polarbear"
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index a4964add6c8650..d017a2acca1be9 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -8,7 +8,7 @@
* * sets lastKnownIP
* * sets computer_id
* * logs the login
- * * tells the world to update it's status (for player count)
+ * * tells the world to update its status (for player count)
* * create mob huds for the mob if needed
* * reset next_move to 1
* * Set statobj to our mob
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index 5d46f3c0dc06a1..28de95ff94dd5d 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -17,7 +17,7 @@
//Make mob invisible and spawn animation
ADD_TRAIT(src, TRAIT_NO_TRANSFORM, TEMPORARY_TRANSFORMATION_TRAIT)
- Paralyze(TRANSFORMATION_DURATION, ignore_canstun = TRUE)
+ Stun(TRANSFORMATION_DURATION, ignore_canstun = TRUE)
icon = null
cut_overlays()
@@ -29,12 +29,12 @@
/mob/living/carbon/proc/finish_monkeyize()
transformation_timer = null
- to_chat(src, span_boldnotice("You are now a monkey."))
REMOVE_TRAIT(src, TRAIT_NO_TRANSFORM, TEMPORARY_TRANSFORMATION_TRAIT)
icon = initial(icon)
RemoveInvisibility(type)
set_species(/datum/species/monkey)
- name = "monkey"
+ to_chat(src, span_boldnotice("You are now \a [dna.species.name]."))
+ name = LOWER_TEXT(dna.species.name)
regenerate_icons()
set_name()
SEND_SIGNAL(src, COMSIG_HUMAN_MONKEYIZE)
@@ -57,7 +57,7 @@
//Make mob invisible and spawn animation
ADD_TRAIT(src, TRAIT_NO_TRANSFORM, TEMPORARY_TRANSFORMATION_TRAIT)
- Paralyze(TRANSFORMATION_DURATION, ignore_canstun = TRUE)
+ Stun(TRANSFORMATION_DURATION, ignore_canstun = TRUE)
icon = null
cut_overlays()
@@ -70,15 +70,15 @@
/mob/living/carbon/proc/finish_humanize(species = /datum/species/human)
transformation_timer = null
- to_chat(src, span_boldnotice("You are now a human."))
REMOVE_TRAIT(src, TRAIT_NO_TRANSFORM, TEMPORARY_TRANSFORMATION_TRAIT)
icon = initial(icon)
RemoveInvisibility(type)
set_species(species)
+ to_chat(src, span_boldnotice("You are now \a [dna.species.name]."))
SEND_SIGNAL(src, COMSIG_MONKEY_HUMANIZE)
return src
-/mob/living/carbon/human/finish_humanize(species = /datum/species/human, instant = FALSE)
+/mob/living/carbon/human/finish_humanize(species = /datum/species/human)
underwear = "Nude"
undershirt = "Nude"
socks = "Nude"
diff --git a/code/modules/mod/mod_construction.dm b/code/modules/mod/mod_construction.dm
index ca7be41ec426f1..16ce70df94563d 100644
--- a/code/modules/mod/mod_construction.dm
+++ b/code/modules/mod/mod_construction.dm
@@ -92,6 +92,9 @@
desc = "[desc] [used_theme.desc]"
icon_state = "[used_theme.default_skin]-plating"
+/obj/item/mod/construction/plating/civilian
+ theme = /datum/mod_theme/civilian
+
/obj/item/mod/construction/plating/engineering
theme = /datum/mod_theme/engineering
diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm
index 3cd8042582fe03..f62992a9557fc5 100644
--- a/code/modules/mod/mod_control.dm
+++ b/code/modules/mod/mod_control.dm
@@ -117,7 +117,6 @@
uninstall(module, deleting = TRUE)
if(core)
QDEL_NULL(core)
- QDEL_NULL(wires)
QDEL_NULL(mod_link)
for(var/datum/mod_part/part_datum as anything in get_part_datums(all = TRUE))
part_datum.part_item = null
@@ -333,6 +332,26 @@
return ITEM_INTERACT_BLOCKING
insert_pai(user, tool)
return ITEM_INTERACT_SUCCESS
+ if(istype(tool, /obj/item/mod/paint))
+ var/obj/item/mod/paint/paint_kit = tool
+ if(active || activating)
+ balloon_alert(user, "suit is active!")
+ return ITEM_INTERACT_BLOCKING
+ if(LAZYACCESS(modifiers, RIGHT_CLICK)) // Right click
+ if(paint_kit.editing_mod == src)
+ return ITEM_INTERACT_BLOCKING
+ paint_kit.editing_mod = src
+ paint_kit.proxy_view = new()
+ paint_kit.proxy_view.generate_view("color_matrix_proxy_[REF(user.client)]")
+
+ paint_kit.proxy_view.appearance = paint_kit.editing_mod.appearance
+ paint_kit.proxy_view.color = null
+ paint_kit.proxy_view.display_to(user)
+ paint_kit.ui_interact(user)
+ return ITEM_INTERACT_SUCCESS
+ else // Left click
+ paint_kit.paint_skin(src, user)
+ return ITEM_INTERACT_SUCCESS
if(istype(tool, /obj/item/mod/module))
if(!open)
balloon_alert(user, "open the cover first!")
@@ -456,6 +475,7 @@
SEND_SIGNAL(src, COMSIG_MOD_WEARER_SET, wearer)
RegisterSignal(wearer, COMSIG_ATOM_EXITED, PROC_REF(on_exit))
RegisterSignal(wearer, COMSIG_SPECIES_GAIN, PROC_REF(on_species_gain))
+ RegisterSignal(wearer, COMSIG_MOB_CLICKON, PROC_REF(click_on))
update_charge_alert()
for(var/obj/item/mod/module/module as anything in modules)
module.on_equip()
@@ -463,7 +483,7 @@
/obj/item/mod/control/proc/unset_wearer()
for(var/obj/item/mod/module/module as anything in modules)
module.on_unequip()
- UnregisterSignal(wearer, list(COMSIG_ATOM_EXITED, COMSIG_SPECIES_GAIN))
+ UnregisterSignal(wearer, list(COMSIG_ATOM_EXITED, COMSIG_SPECIES_GAIN, COMSIG_MOB_CLICKON))
SEND_SIGNAL(src, COMSIG_MOD_WEARER_UNSET, wearer)
wearer.update_spacesuit_hud_icon("0")
wearer = null
@@ -497,7 +517,14 @@
forceMove(drop_location())
return
-/obj/item/mod/control/proc/quick_module(mob/user)
+/obj/item/mod/control/proc/click_on(mob/source, atom/A, list/modifiers)
+ SIGNAL_HANDLER
+
+ if (LAZYACCESS(modifiers, CTRL_CLICK) && LAZYACCESS(modifiers, source.client?.prefs.read_preference(/datum/preference/choiced/mod_select) || MIDDLE_CLICK))
+ INVOKE_ASYNC(src, PROC_REF(quick_module), source, get_turf(A))
+ return COMSIG_MOB_CANCEL_CLICKON
+
+/obj/item/mod/control/proc/quick_module(mob/user, anchor_override = null)
if(!length(modules))
return
var/list/display_names = list()
@@ -519,7 +546,9 @@
var/radial_anchor = src
if(istype(user.loc, /obj/effect/dummy/phased_mob))
radial_anchor = get_turf(user.loc) //they're phased out via some module, anchor the radial on the turf so it may still display
- var/pick = show_radial_menu(user, radial_anchor, items, custom_check = FALSE, require_near = TRUE, tooltips = TRUE)
+ if (!isnull(anchor_override))
+ radial_anchor = anchor_override
+ var/pick = show_radial_menu(user, radial_anchor, items, custom_check = FALSE, require_near = isnull(anchor_override), tooltips = TRUE)
if(!pick)
return
var/module_reference = display_names[pick]
diff --git a/code/modules/mod/mod_link.dm b/code/modules/mod/mod_link.dm
index bcbf90ed442499..e5c7195bd8cb04 100644
--- a/code/modules/mod/mod_link.dm
+++ b/code/modules/mod/mod_link.dm
@@ -16,7 +16,7 @@
/proc/get_link_visual_generic(datum/mod_link/mod_link, atom/movable/visuals, proc_path)
var/mob/living/user = mod_link.get_user_callback.Invoke()
playsound(mod_link.holder, 'sound/machines/terminal_processing.ogg', 50, vary = TRUE)
- visuals.add_overlay(mutable_appearance('icons/effects/effects.dmi', "static_base", TURF_LAYER))
+ visuals.add_overlay(mutable_appearance('icons/effects/effects.dmi', "static_base", ABOVE_NORMAL_TURF_LAYER))
visuals.add_overlay(mutable_appearance('icons/effects/effects.dmi', "modlink", ABOVE_ALL_MOB_LAYER))
visuals.add_filter("crop_square", 1, alpha_mask_filter(icon = icon('icons/effects/effects.dmi', "modlink_filter")))
visuals.maptext_height = 6
diff --git a/code/modules/mod/mod_paint.dm b/code/modules/mod/mod_paint.dm
index fca758c3f5e124..b37be06cd2b7dd 100644
--- a/code/modules/mod/mod_paint.dm
+++ b/code/modules/mod/mod_paint.dm
@@ -23,34 +23,6 @@
. += span_notice("Left-click a MODsuit to change skin.")
. += span_notice("Right-click a MODsuit to recolor.")
-/obj/item/mod/paint/pre_attack(atom/attacked_atom, mob/living/user, params)
- if(!istype(attacked_atom, /obj/item/mod/control))
- return ..()
- var/obj/item/mod/control/mod = attacked_atom
- if(mod.active || mod.activating)
- balloon_alert(user, "suit is active!")
- return TRUE
- paint_skin(mod, user)
-
-/obj/item/mod/paint/pre_attack_secondary(atom/attacked_atom, mob/living/user, params)
- if(!istype(attacked_atom, /obj/item/mod/control))
- return ..()
- var/obj/item/mod/control/mod = attacked_atom
- if(mod.active || mod.activating)
- balloon_alert(user, "suit is active!")
- return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
- if(editing_mod)
- return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
- editing_mod = mod
- proxy_view = new()
- proxy_view.generate_view("color_matrix_proxy_[REF(user.client)]")
-
- proxy_view.appearance = editing_mod.appearance
- proxy_view.color = null
- proxy_view.display_to(user)
- ui_interact(user)
- return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
-
/obj/item/mod/paint/ui_interact(mob/user, datum/tgui/ui)
if(!editing_mod)
return
diff --git a/code/modules/mod/mod_theme.dm b/code/modules/mod/mod_theme.dm
index 0429958e43be1c..42925ad3111aac 100644
--- a/code/modules/mod/mod_theme.dm
+++ b/code/modules/mod/mod_theme.dm
@@ -83,37 +83,6 @@
SEALED_MESSAGE = BOOT_SEAL_MESSAGE,
),
),
- "civilian" = list(
- /obj/item/clothing/head/mod = list(
- UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL,
- SEALED_CLOTHING = STOPSPRESSUREDAMAGE|HEADINTERNALS,
- UNSEALED_INVISIBILITY = HIDEFACIALHAIR|HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT,
- UNSEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF,
- UNSEALED_MESSAGE = HELMET_UNSEAL_MESSAGE,
- SEALED_MESSAGE = HELMET_SEAL_MESSAGE,
- ),
- /obj/item/clothing/suit/mod = list(
- UNSEALED_CLOTHING = THICKMATERIAL,
- SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
- SEALED_INVISIBILITY = HIDEJUMPSUIT,
- UNSEALED_MESSAGE = CHESTPLATE_UNSEAL_MESSAGE,
- SEALED_MESSAGE = CHESTPLATE_SEAL_MESSAGE,
- ),
- /obj/item/clothing/gloves/mod = list(
- UNSEALED_CLOTHING = THICKMATERIAL,
- SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
- CAN_OVERSLOT = TRUE,
- UNSEALED_MESSAGE = GAUNTLET_UNSEAL_MESSAGE,
- SEALED_MESSAGE = GAUNTLET_SEAL_MESSAGE,
- ),
- /obj/item/clothing/shoes/mod = list(
- UNSEALED_CLOTHING = THICKMATERIAL,
- SEALED_CLOTHING = STOPSPRESSUREDAMAGE,
- CAN_OVERSLOT = TRUE,
- UNSEALED_MESSAGE = BOOT_UNSEAL_MESSAGE,
- SEALED_MESSAGE = BOOT_SEAL_MESSAGE,
- ),
- ),
)
#ifdef UNIT_TESTS
@@ -210,6 +179,58 @@
acid = 25
wound = 5
+/datum/mod_theme/civilian
+ name = "civilian"
+ desc = "A light-weight civilian suit that offers unmatched ease of movement but no protection from the vacuum of space."
+ extended_desc = "An experimental design by Nakamura Engineering, intended to be marketed towards planet-bound customers. \
+ This model sacrifices the protection from biological and chemical threats and the vacuum of space in exchange for \
+ vastly improved mobility. Due to the slimmed-down profile, it also has less capacity for modifications compared to \
+ mainline models."
+ default_skin = "civilian"
+ armor_type = /datum/armor/mod_theme_civilian
+ max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
+ min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
+ complexity_max = DEFAULT_MAX_COMPLEXITY - 3
+ slowdown_inactive = 0.5
+ slowdown_active = 0
+ variants = list(
+ "civilian" = list(
+ /obj/item/clothing/head/mod = list(
+ UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL,
+ UNSEALED_MESSAGE = HELMET_UNSEAL_MESSAGE,
+ SEALED_MESSAGE = HELMET_SEAL_MESSAGE,
+ ),
+ /obj/item/clothing/suit/mod = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ SEALED_INVISIBILITY = HIDEJUMPSUIT,
+ UNSEALED_MESSAGE = CHESTPLATE_UNSEAL_MESSAGE,
+ SEALED_MESSAGE = CHESTPLATE_SEAL_MESSAGE,
+ ),
+ /obj/item/clothing/gloves/mod = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ CAN_OVERSLOT = TRUE,
+ UNSEALED_MESSAGE = GAUNTLET_UNSEAL_MESSAGE,
+ SEALED_MESSAGE = GAUNTLET_SEAL_MESSAGE,
+ ),
+ /obj/item/clothing/shoes/mod = list(
+ UNSEALED_CLOTHING = THICKMATERIAL,
+ CAN_OVERSLOT = TRUE,
+ UNSEALED_MESSAGE = BOOT_UNSEAL_MESSAGE,
+ SEALED_MESSAGE = BOOT_SEAL_MESSAGE,
+ ),
+ ),
+ )
+
+/datum/armor/mod_theme_civilian
+ melee = 5
+ bullet = 5
+ laser = 5
+ energy = 5
+ bio = 50
+ fire = 25
+ acid = 25
+ wound = 5
+
/datum/mod_theme/engineering
name = "engineering"
desc = "An engineer-fit suit with heat and shock resistance. Nakamura Engineering's classic."
@@ -1866,7 +1887,7 @@
extended_desc = "A bulky and only legal by technicality suit, this ominous black and red MODsuit is only worn by \
Nanotrasen Black Ops teams. If you can see this suit, you fucked up. A collaborative joint effort between \
Apadyne and Nanotrasen the construction and modules gives the user robust protection against \
- anything that can be thrown at it, along with acute combat awareness tools for it's wearer. \
+ anything that can be thrown at it, along with acute combat awareness tools for its wearer. \
Whether the wearer uses it or not is up to them. \
There seems to be a little inscription on the wrist that reads; \'squiddie', d'aww."
default_skin = "apocryphal"
diff --git a/code/modules/mod/mod_types.dm b/code/modules/mod/mod_types.dm
index c6d0869c6e987d..5125b70a9a7ad3 100644
--- a/code/modules/mod/mod_types.dm
+++ b/code/modules/mod/mod_types.dm
@@ -46,6 +46,14 @@
/obj/item/mod/module/flashlight,
)
+/obj/item/mod/control/pre_equipped/civilian
+ theme = /datum/mod_theme/civilian
+ applied_modules = list(
+ /obj/item/mod/module/storage,
+ /obj/item/mod/module/welding,
+ /obj/item/mod/module/flashlight,
+ )
+
/obj/item/mod/control/pre_equipped/engineering
theme = /datum/mod_theme/engineering
applied_modules = list(
@@ -171,6 +179,9 @@
/obj/item/mod/module/quick_cuff,
/obj/item/mod/module/headprotector,
)
+ default_pins = list(
+ /obj/item/mod/module/jetpack,
+ )
/obj/item/mod/control/pre_equipped/safeguard
theme = /datum/mod_theme/safeguard
@@ -351,6 +362,9 @@
/obj/item/mod/module/quick_cuff,
)
+/obj/item/mod/control/pre_equipped/infiltrator/Initialize(mapload, new_theme, new_skin, new_core)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_CONTRABAND_BLOCKER, INNATE_TRAIT)
/obj/item/mod/control/pre_equipped/interdyne
theme = /datum/mod_theme/interdyne
diff --git a/code/modules/mod/modules/module_kinesis.dm b/code/modules/mod/modules/module_kinesis.dm
index 81a266f8ff41ab..9048701f1d0178 100644
--- a/code/modules/mod/modules/module_kinesis.dm
+++ b/code/modules/mod/modules/module_kinesis.dm
@@ -180,6 +180,7 @@
if(playsound)
playsound(grabbed_atom, 'sound/effects/empulse.ogg', 75, TRUE)
STOP_PROCESSING(SSfastprocess, src)
+ UnregisterSignal(grabbed_atom, list(COMSIG_MOB_STATCHANGE, COMSIG_MOVABLE_SET_ANCHORED))
kinesis_catcher = null
mod.wearer.clear_fullscreen("kinesis")
grabbed_atom.cut_overlay(kinesis_icon)
@@ -265,7 +266,7 @@
name = "MOD kinesis+ module"
desc = "A modular plug-in to the forearm, this module was recently redeveloped in secret. \
The bane of all ne'er-do-wells, the kinesis+ module is a powerful tool that allows the user \
- to manipulate the world around them. Like it's older counterpart, it's capable of manipulating \
+ to manipulate the world around them. Like its older counterpart, it's capable of manipulating \
structures, machinery, vehicles, and, thanks to the fruitful efforts of its creators - living beings."
complexity = 0
prebuilt = TRUE
diff --git a/code/modules/mod/modules/module_pathfinder.dm b/code/modules/mod/modules/module_pathfinder.dm
index 64790eacb3becc..f0a92e3a051539 100644
--- a/code/modules/mod/modules/module_pathfinder.dm
+++ b/code/modules/mod/modules/module_pathfinder.dm
@@ -11,6 +11,7 @@
Nakamura Engineering swears up and down there's airbrakes."
icon_state = "pathfinder"
complexity = 1
+ module_type = MODULE_USABLE
use_energy_cost = DEFAULT_CHARGE_DRAIN * 10
incompatible_modules = list(/obj/item/mod/module/pathfinder)
required_slots = list(ITEM_SLOT_BACK|ITEM_SLOT_BELT)
@@ -56,6 +57,21 @@
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()
+ . = ..()
+ if (!ishuman(mod.wearer) || !implant)
+ return
+ if(!implant.implant(mod.wearer, mod.wearer))
+ balloon_alert(mod.wearer, "can't implant!")
+ return
+ balloon_alert(mod.wearer, "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))
diff --git a/code/modules/mod/modules/modules_engineering.dm b/code/modules/mod/modules/modules_engineering.dm
index fc21937eef0493..40e1889efd968a 100644
--- a/code/modules/mod/modules/modules_engineering.dm
+++ b/code/modules/mod/modules/modules_engineering.dm
@@ -120,7 +120,7 @@
hitsound = 'sound/weapons/batonextend.ogg'
hitsound_wall = 'sound/weapons/batonextend.ogg'
suppressed = SUPPRESSED_VERY
- hit_threshhold = LATTICE_LAYER
+ hit_threshhold = ABOVE_NORMAL_TURF_LAYER
/// Reference to the beam following the projectile.
var/line
diff --git a/code/modules/mod/modules/modules_medical.dm b/code/modules/mod/modules/modules_medical.dm
index a0d58d721f3d4e..b828169e3bfa03 100644
--- a/code/modules/mod/modules/modules_medical.dm
+++ b/code/modules/mod/modules/modules_medical.dm
@@ -119,6 +119,12 @@
volume = 30
inject_flags = INJECT_CHECK_PENETRATE_THICK
+/obj/item/reagent_containers/syringe/mod/update_reagent_overlay()
+ if(reagents?.total_volume)
+ var/mutable_appearance/filling_overlay = mutable_appearance('icons/obj/medical/reagent_fillings.dmi', "mod[get_rounded_vol()]")
+ filling_overlay.color = mix_color_from_reagents(reagents.reagent_list)
+ . += filling_overlay
+
///Organizer - Lets you shoot organs, immediately replacing them if the target has the organ manipulation surgery.
/obj/item/mod/module/organizer
name = "MOD organizer module"
@@ -206,15 +212,20 @@
continue
succeed = TRUE
break
- if(succeed)
- var/list/organs_to_boot_out = organ_receiver.get_organ_slot(organ.slot)
- for(var/obj/item/organ/organ_evacced as anything in organs_to_boot_out)
- if(organ_evacced.organ_flags & ORGAN_UNREMOVABLE)
- continue
- organ_evacced.Remove(target)
- organ_evacced.forceMove(get_turf(target))
- organ.Insert(target)
- else
+
+ if(!succeed)
+ organ.forceMove(drop_location())
+ organ = null
+ return
+
+ var/list/organs_to_boot_out = organ_receiver.get_organ_slot(organ.slot)
+ for(var/obj/item/organ/organ_evacced as anything in organs_to_boot_out)
+ if(organ_evacced.organ_flags & ORGAN_UNREMOVABLE)
+ continue
+ organ_evacced.Remove(target, special = TRUE)
+ organ_evacced.forceMove(get_turf(target))
+
+ if (!organ.Insert(target))
organ.forceMove(drop_location())
organ = null
diff --git a/code/modules/mod/modules/modules_ninja.dm b/code/modules/mod/modules/modules_ninja.dm
index 0e0de691e030b8..518e3683abf722 100644
--- a/code/modules/mod/modules/modules_ninja.dm
+++ b/code/modules/mod/modules/modules_ninja.dm
@@ -177,10 +177,10 @@
var/accepted_type = /obj/item/energy_katana
/obj/item/mod/module/weapon_recall/on_suit_activation()
- ADD_TRAIT(mod.wearer, TRAIT_NOGUNS, MOD_TRAIT)
+ mod.wearer.add_traits(list(TRAIT_NOGUNS, TRAIT_TOSS_GUN_HARD), MOD_TRAIT)
/obj/item/mod/module/weapon_recall/on_suit_deactivation(deleting = FALSE)
- REMOVE_TRAIT(mod.wearer, TRAIT_NOGUNS, MOD_TRAIT)
+ mod.wearer.remove_traits(list(TRAIT_NOGUNS, TRAIT_TOSS_GUN_HARD), MOD_TRAIT)
/obj/item/mod/module/weapon_recall/on_use()
if(!linked_weapon)
diff --git a/code/modules/mod/modules/modules_supply.dm b/code/modules/mod/modules/modules_supply.dm
index 701861897dc5a0..87bbcfd88a48bc 100644
--- a/code/modules/mod/modules/modules_supply.dm
+++ b/code/modules/mod/modules/modules_supply.dm
@@ -499,6 +499,7 @@
mod.wearer.add_traits(user_traits, MOD_TRAIT)
mod.wearer.RemoveElement(/datum/element/footstep, FOOTSTEP_MOB_HUMAN, 1, -6)
mod.wearer.AddElement(/datum/element/footstep, FOOTSTEP_OBJ_ROBOT, 1, -6, sound_vary = TRUE)
+ mod.wearer.add_movespeed_mod_immunities(MOD_TRAIT, /datum/movespeed_modifier/damage_slowdown)
mod.wearer.add_movespeed_modifier(/datum/movespeed_modifier/sphere)
RegisterSignal(mod.wearer, COMSIG_MOB_STATCHANGE, PROC_REF(on_statchange))
@@ -560,6 +561,7 @@
light_power = 1
light_color = COLOR_LIGHT_ORANGE
embed_type = null
+ can_hit_turfs = TRUE
/obj/projectile/bullet/mining_bomb/Initialize(mapload)
. = ..()
diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm
index 034bfa8125850f..7f85ef0b80ea7c 100644
--- a/code/modules/modular_computers/computers/item/computer.dm
+++ b/code/modules/modular_computers/computers/item/computer.dm
@@ -80,8 +80,8 @@
var/base_idle_power_usage = 0.2 WATTS //SKYRAT EDIT CHANGE - ORIGINAL: 1 WATTS
// Modular computers can run on various devices. Each DEVICE (Laptop, Console & Tablet)
- // must have it's own DMI file. Icon states must be called exactly the same in all files, but may look differently
- // If you create a program which is limited to Laptops and Consoles you don't have to add it's icon_state overlay for Tablets too, for example.
+ // must have its own DMI file. Icon states must be called exactly the same in all files, but may look differently
+ // If you create a program which is limited to Laptops and Consoles you don't have to add its icon_state overlay for Tablets too, for example.
///If set, what the icon_state will be if the computer is unpowered.
var/icon_state_unpowered
diff --git a/code/modules/modular_computers/computers/item/pda.dm b/code/modules/modular_computers/computers/item/pda.dm
index f0ba52b076381f..ec67185314d982 100644
--- a/code/modules/modular_computers/computers/item/pda.dm
+++ b/code/modules/modular_computers/computers/item/pda.dm
@@ -144,6 +144,11 @@
return . || NONE
+/obj/item/modular_computer/pda/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ if(iscash(interacting_with))
+ return money_act(user,interacting_with)
+ return NONE
+
/obj/item/modular_computer/pda/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
. = ..()
if(.)
diff --git a/code/modules/modular_computers/computers/item/role_tablet_presets.dm b/code/modules/modular_computers/computers/item/role_tablet_presets.dm
index 200b0febe1aab5..2261f775ec89cf 100644
--- a/code/modules/modular_computers/computers/item/role_tablet_presets.dm
+++ b/code/modules/modular_computers/computers/item/role_tablet_presets.dm
@@ -5,6 +5,7 @@
/obj/item/modular_computer/pda/heads
greyscale_config = /datum/greyscale_config/tablet/head
greyscale_colors = "#67A364#a92323"
+ max_capacity = parent_type::max_capacity * 2
starting_programs = list(
/datum/computer_file/program/crew_manifest,
/datum/computer_file/program/status,
diff --git a/code/modules/modular_computers/file_system/programs/atmosscan.dm b/code/modules/modular_computers/file_system/programs/atmosscan.dm
index 7e260872859710..32819a358058c1 100644
--- a/code/modules/modular_computers/file_system/programs/atmosscan.dm
+++ b/code/modules/modular_computers/file_system/programs/atmosscan.dm
@@ -27,7 +27,7 @@
on_analyze(source=source, target=get_turf(computer))
return COMPONENT_CANCEL_ATTACK_CHAIN
-/// Keep this in sync with it's tool based counterpart [/obj/proc/analyzer_act] and [/atom/proc/tool_act]
+/// Keep this in sync with its tool based counterpart [/obj/proc/analyzer_act] and [/atom/proc/tool_act]
/datum/computer_file/program/atmosscan/tap(atom/A, mob/living/user, params)
if(atmozphere_mode != ATMOZPHERE_SCAN_CLICK)
return FALSE
diff --git a/code/modules/modular_computers/file_system/programs/powermonitor.dm b/code/modules/modular_computers/file_system/programs/powermonitor.dm
index 817cad275cd1e8..4dbd4ea467f51c 100644
--- a/code/modules/modular_computers/file_system/programs/powermonitor.dm
+++ b/code/modules/modular_computers/file_system/programs/powermonitor.dm
@@ -42,7 +42,7 @@
attached_wire_ref = WEAKREF(locate(/obj/structure/cable) in T)
if(attached_wire_ref)
return
- var/area/A = get_area(computer) //if the computer isn't directly connected to a wire, attempt to find the APC powering it to pull it's powernet instead
+ var/area/A = get_area(computer) //if the computer isn't directly connected to a wire, attempt to find the APC powering it to pull its powernet instead
if(!A)
return
var/obj/machinery/power/apc/local_apc = A.apc
diff --git a/code/modules/modular_computers/file_system/programs/robocontrol.dm b/code/modules/modular_computers/file_system/programs/robocontrol.dm
index 314048c5149586..694c84eaeea4df 100644
--- a/code/modules/modular_computers/file_system/programs/robocontrol.dm
+++ b/code/modules/modular_computers/file_system/programs/robocontrol.dm
@@ -53,9 +53,9 @@
"dest" = simple_mulebot.destination,
"power" = simple_mulebot.cell ? simple_mulebot.cell.percent() : 0,
"home" = simple_mulebot.home_destination,
- "autoReturn" = simple_mulebot.auto_return,
- "autoPickup" = simple_mulebot.auto_pickup,
- "reportDelivery" = simple_mulebot.report_delivery,
+ "autoReturn" = simple_mulebot.mulebot_delivery_flags & MULEBOT_RETURN_MODE,
+ "autoPickup" = simple_mulebot.mulebot_delivery_flags & MULEBOT_AUTO_PICKUP_MODE,
+ "reportDelivery" = simple_mulebot.mulebot_delivery_flags & MULEBOT_REPORT_DELIVERY_MODE,
"mule_ref" = REF(simple_mulebot),
"load" = simple_mulebot.get_load_name(),
))
diff --git a/code/modules/modular_computers/file_system/programs/secureye.dm b/code/modules/modular_computers/file_system/programs/secureye.dm
index a754c37d811e90..c7a24a6e8b7b9b 100644
--- a/code/modules/modular_computers/file_system/programs/secureye.dm
+++ b/code/modules/modular_computers/file_system/programs/secureye.dm
@@ -209,7 +209,7 @@
var/list/visible_turfs = list()
- // Get the camera's turf to correctly gather what's visible from it's turf, in case it's located in a moving object (borgs / mechs)
+ // Get the camera's turf to correctly gather what's visible from its turf, in case it's located in a moving object (borgs / mechs)
var/new_cam_turf = get_turf(active_camera)
// If we're not forcing an update for some reason and the cameras are in the same location,
diff --git a/code/modules/modular_computers/file_system/programs/statusdisplay.dm b/code/modules/modular_computers/file_system/programs/statusdisplay.dm
index 5dfdaae2c877e6..fa844215b93b9a 100644
--- a/code/modules/modular_computers/file_system/programs/statusdisplay.dm
+++ b/code/modules/modular_computers/file_system/programs/statusdisplay.dm
@@ -59,27 +59,7 @@
post_status(picture)
else
if(picture == "currentalert") // You cannot set Code Blue display during Code Red and similiar
- switch(SSsecurity_level.get_current_level_as_number())
- if(SEC_LEVEL_DELTA)
- post_status("alert", "deltaalert")
- if(SEC_LEVEL_RED)
- post_status("alert", "redalert")
- if(SEC_LEVEL_BLUE)
- post_status("alert", "bluealert")
- if(SEC_LEVEL_GREEN)
- post_status("alert", "greenalert")
- // SKYRAT EDIT ADD START - Alert Levels
- if(SEC_LEVEL_VIOLET)
- post_status("alert", "violetalert")
- if(SEC_LEVEL_ORANGE)
- post_status("alert", "orangealert")
- if(SEC_LEVEL_AMBER)
- post_status("alert", "amberalert")
- if(SEC_LEVEL_EPSILON)
- post_status("alert", "epsilonalert")
- if(SEC_LEVEL_GAMMA)
- post_status("alert", "gammaalert")
- // SKYRAT EDIT ADD END - Alert Levels
+ post_status("alert", SSsecurity_level?.current_security_level?.status_display_icon_state || "greenalert")
else
post_status("alert", picture)
diff --git a/code/modules/modular_computers/file_system/programs/techweb.dm b/code/modules/modular_computers/file_system/programs/techweb.dm
index 014e6a56727a3c..4e181370fe2add 100644
--- a/code/modules/modular_computers/file_system/programs/techweb.dm
+++ b/code/modules/modular_computers/file_system/programs/techweb.dm
@@ -50,6 +50,7 @@
return data
data += list(
"nodes" = list(),
+ "queue_nodes" = stored_research.research_queue_nodes,
"experiments" = list(),
"researched_designs" = stored_research.researched_designs,
"points" = stored_research.research_points,
@@ -64,6 +65,10 @@
// Serialize all nodes to display
for(var/tier in stored_research.tiers)
var/datum/techweb_node/node = SSresearch.techweb_node_by_id(tier)
+ var/enqueued_by_user = FALSE
+
+ if((tier in stored_research.research_queue_nodes) && stored_research.research_queue_nodes[tier] == user)
+ enqueued_by_user = TRUE
// Ensure node is supposed to be visible
if (stored_research.hidden_nodes[tier])
@@ -71,8 +76,11 @@
data["nodes"] += list(list(
"id" = node.id,
+ "is_free" = node.is_free(stored_research),
"can_unlock" = stored_research.can_unlock_node(node),
- "tier" = stored_research.tiers[node.id]
+ "have_experiments_done" = stored_research.have_experiments_for_node(node),
+ "tier" = stored_research.tiers[node.id],
+ "enqueued_by_user" = enqueued_by_user
))
// Get experiments and serialize them
@@ -111,6 +119,12 @@
if ("researchNode")
research_node(params["node_id"], usr)
return TRUE
+ if ("enqueueNode")
+ enqueue_node(params["node_id"], usr)
+ return TRUE
+ if ("dequeueNode")
+ dequeue_node(params["node_id"], usr)
+ return TRUE
/datum/computer_file/program/science/ui_static_data(mob/user)
. = list(
@@ -188,6 +202,20 @@
id_cache_seq += 1
return id_cache[id]
+/datum/computer_file/program/science/proc/enqueue_node(id, mob/user)
+ if(!stored_research || !stored_research.available_nodes[id] || stored_research.researched_nodes[id])
+ computer.say("Node enqueue failed: Either no techweb is found, node is already researched or is not available!")
+ return FALSE
+ stored_research.enqueue_node(id, user)
+ return TRUE
+
+/datum/computer_file/program/science/proc/dequeue_node(id, mob/user)
+ if(!stored_research || !stored_research.available_nodes[id] || stored_research.researched_nodes[id])
+ computer.say("Node dequeue failed: Either no techweb is found, node is already researched or is not available!")
+ return FALSE
+ stored_research.dequeue_node(id, user)
+ return TRUE
+
/datum/computer_file/program/science/proc/research_node(id, mob/user)
if(!stored_research || !stored_research.available_nodes[id] || stored_research.researched_nodes[id])
computer.say("Node unlock failed: Either no techweb is found, node is already researched or is not available!")
diff --git a/code/modules/modular_computers/file_system/programs/virtual_pet.dm b/code/modules/modular_computers/file_system/programs/virtual_pet.dm
index 7a0adba3cce6dd..78a9148b013fec 100644
--- a/code/modules/modular_computers/file_system/programs/virtual_pet.dm
+++ b/code/modules/modular_computers/file_system/programs/virtual_pet.dm
@@ -432,7 +432,7 @@ GLOBAL_LIST_EMPTY(virtual_pets_list)
/datum/emote/living/jump,
/datum/emote/living/shiver,
/datum/emote/spin,
- /datum/emote/living/beep,
+ /datum/emote/silicon/beep,
)
data["possible_emotes"] = list("none")
for(var/datum/emote/target_emote as anything in possible_emotes)
diff --git a/code/modules/movespeed/modifiers/innate.dm b/code/modules/movespeed/modifiers/innate.dm
index 83d8b3fb78d986..545d92d26b57b2 100644
--- a/code/modules/movespeed/modifiers/innate.dm
+++ b/code/modules/movespeed/modifiers/innate.dm
@@ -18,3 +18,8 @@
/datum/movespeed_modifier/dna_vault_speedup
blacklisted_movetypes = (FLYING|FLOATING)
multiplicative_slowdown = -0.4
+
+/// The movespeed modifier from the heavy fish trait when applied to mobs.
+/datum/movespeed_modifier/heavy_fish
+ multiplicative_slowdown = 0.4
+ flags = IGNORE_NOSLOW
diff --git a/code/modules/movespeed/modifiers/mobs.dm b/code/modules/movespeed/modifiers/mobs.dm
index 1624ce37bf6d99..aa8c8153e97f50 100644
--- a/code/modules/movespeed/modifiers/mobs.dm
+++ b/code/modules/movespeed/modifiers/mobs.dm
@@ -172,3 +172,6 @@
/datum/movespeed_modifier/basilisk_overheat
multiplicative_slowdown = -18
+
+/datum/movespeed_modifier/magic_ties
+ multiplicative_slowdown = 0.5
diff --git a/code/modules/movespeed/modifiers/status_effects.dm b/code/modules/movespeed/modifiers/status_effects.dm
index 4768f66a544f4f..8f4e59d65557be 100644
--- a/code/modules/movespeed/modifiers/status_effects.dm
+++ b/code/modules/movespeed/modifiers/status_effects.dm
@@ -38,6 +38,9 @@
/datum/movespeed_modifier/status_effect/tired_post_charge
multiplicative_slowdown = 3
+/datum/movespeed_modifier/status_effect/tired_post_charge/lesser
+ multiplicative_slowdown = 2
+
/// Get slower the more gold is in your system.
/datum/movespeed_modifier/status_effect/midas_blight
id = MOVESPEED_ID_MIDAS_BLIGHT
diff --git a/code/modules/paperwork/fax.dm b/code/modules/paperwork/fax.dm
index 0be6375ed17423..e652b92e97805d 100644
--- a/code/modules/paperwork/fax.dm
+++ b/code/modules/paperwork/fax.dm
@@ -78,7 +78,6 @@ GLOBAL_VAR_INIT(nt_fax_department, pick("NT HR Department", "NT Legal Department
/obj/machinery/fax/Destroy()
QDEL_NULL(loaded_item_ref)
- QDEL_NULL(wires)
return ..()
/obj/machinery/fax/update_overlays()
@@ -233,7 +232,7 @@ GLOBAL_VAR_INIT(nt_fax_department, pick("NT HR Department", "NT Legal Department
var/list/data = list()
//Record a list of all existing faxes.
for(var/obj/machinery/fax/FAX as anything in SSmachines.get_machines_by_type_and_subtypes(/obj/machinery/fax))
- if(FAX.fax_id == fax_id) //skip yourself
+ if(FAX.fax_id == fax_id || is_centcom_level(FAX.z)) //skip yourself and the centcom fax machine.
continue
var/list/fax_data = list()
fax_data["fax_name"] = FAX.fax_name
@@ -301,7 +300,7 @@ GLOBAL_VAR_INIT(nt_fax_department, pick("NT HR Department", "NT Legal Department
history_add("Send", params["name"])
GLOB.requests.fax_request(usr.client, "sent a fax message from [fax_name]/[fax_id] to [params["name"]]", fax_paper)
- to_chat(GLOB.admins, span_adminnotice("[icon2html(src.icon, GLOB.admins)]FAX REQUEST: [ADMIN_FULLMONTY(usr)]: [span_linkify("sent a fax message from [fax_name]/[fax_id][ADMIN_FLW(src)] to [html_encode(params["name"])]")] [ADMIN_SHOW_PAPER(fax_paper)]"), confidential = TRUE)
+ to_chat(GLOB.admins, span_adminnotice("[icon2html(src.icon, GLOB.admins)]FAX REQUEST: [ADMIN_FULLMONTY(usr)]: [span_linkify("sent a fax message from [fax_name]/[fax_id][ADMIN_FLW(src)] to [html_encode(params["name"])]")] [ADMIN_SHOW_PAPER(fax_paper)] [ADMIN_PRINT_FAX(fax_paper, fax_name)]"), confidential = TRUE)
for(var/client/staff as anything in GLOB.admins)
if(staff?.prefs.read_preference(/datum/preference/toggle/comms_notification))
SEND_SOUND(staff, sound('sound/misc/server-ready.ogg'))
diff --git a/code/modules/paperwork/paperwork.dm b/code/modules/paperwork/paperwork.dm
index 03f22177f9e715..cd26482bf6c8a3 100644
--- a/code/modules/paperwork/paperwork.dm
+++ b/code/modules/paperwork/paperwork.dm
@@ -166,7 +166,7 @@
detailed_desc += span_info(" The stack of documents appear to be a medical report from a nearby station, detailing the autopsy of an unknown xenofauna.")
detailed_desc += span_info(" Skipping to the end of the report reveals that the specimen was the station bartender's pet monkey.")
- detailed_desc += span_info(" The specimen had been exposed to radiation during an 'unrelated incident with the engine', leading to it's mutated form.")
+ detailed_desc += span_info(" The specimen had been exposed to radiation during an 'unrelated incident with the engine', leading to its mutated form.")
detailed_desc += span_info(" Regardless, the autopsy results look like they could be useful. You should probably stamp this.")
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index d37d97c1677927..7be0e3548ad2b0 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -363,8 +363,8 @@
var/datum/component/transforming/transform_comp = GetComponent(/datum/component/transforming)
.["damage"] = max(5, transform_comp.throwforce_on)
.["speed"] = max(0, transform_comp.throw_speed_on - 3)
- var/list/embed_params = .["embedding"]
- embed_params["embed_chance"] = 100
+ var/datum/embed_data/data = .["embedding"]
+ .["embedding"] = data.generate_with_values(embed_chance = 100)
/obj/item/pen/edagger/proc/on_containing_dart_fired(obj/projectile/source)
SIGNAL_HANDLER
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
index 72d3ecd85ba031..b72a2320170292 100644
--- a/code/modules/paperwork/photocopier.dm
+++ b/code/modules/paperwork/photocopier.dm
@@ -78,8 +78,6 @@ GLOBAL_LIST_INIT(paper_blanks, init_paper_blanks())
var/color_mode = PHOTO_COLOR
/// Indicates whether the printer is currently busy copying or not.
var/busy = FALSE
- /// Variable needed to determine the selected category of forms on Photocopier.js
- var/category
/// Variable that holds a reference to any object supported for photocopying inside the photocopier
var/obj/object_copy
/// Variable for the UI telling us how many copies are in the queue.
@@ -149,6 +147,8 @@ GLOBAL_LIST_INIT(paper_blanks, init_paper_blanks())
static_data["blanks"] = blank_infos
static_data["categories"] = category_names
+ static_data["max_paper_count"] = MAX_PAPER_CAPACITY
+ static_data["max_copies"] = MAX_COPIES_AT_ONCE
return static_data
@@ -156,8 +156,6 @@ GLOBAL_LIST_INIT(paper_blanks, init_paper_blanks())
var/list/data = list()
data["has_item"] = !copier_empty()
data["num_copies"] = num_copies
-
- data["category"] = category
data["copies_left"] = copies_left
if(istype(object_copy, /obj/item/photo))
@@ -265,10 +263,6 @@ GLOBAL_LIST_INIT(paper_blanks, init_paper_blanks())
if("set_copies")
num_copies = clamp(text2num(params["num_copies"]), 1, MAX_COPIES_AT_ONCE)
return TRUE
- // Changes the forms displayed on Photocopier.js when you switch categories
- if("choose_category")
- category = params["category"]
- return TRUE
// Called when you press print blank
if("print_blank")
if(check_busy(usr))
@@ -276,7 +270,7 @@ GLOBAL_LIST_INIT(paper_blanks, init_paper_blanks())
if(!(params["code"] in GLOB.paper_blanks))
return FALSE
var/list/blank = GLOB.paper_blanks[params["code"]]
- do_copies(CALLBACK(src, PROC_REF(make_blank_print), blank), usr, PAPER_PAPER_USE, PAPER_TONER_USE, 1)
+ do_copies(CALLBACK(src, PROC_REF(make_blank_print), blank), usr, PAPER_PAPER_USE, PAPER_TONER_USE, num_copies)
return TRUE
/// Returns the color used for the printing operation. If the color is below TONER_LOW_PERCENTAGE, it returns a gray color.
diff --git a/code/modules/photography/camera/camera_image_capturing.dm b/code/modules/photography/camera/camera_image_capturing.dm
index d928164ff014df..64eeb192a22862 100644
--- a/code/modules/photography/camera/camera_image_capturing.dm
+++ b/code/modules/photography/camera/camera_image_capturing.dm
@@ -10,11 +10,18 @@
step_y = AM.step_y
. = ..()
+#define PHYSICAL_POSITION(atom) ((atom.y * world.icon_size) + (atom.pixel_y))
+
/obj/item/camera/proc/camera_get_icon(list/turfs, turf/center, psize_x = 96, psize_y = 96, datum/turf_reservation/clone_area, size_x, size_y, total_x, total_y)
var/list/atoms = list()
+ var/list/lighting = list()
var/skip_normal = FALSE
var/wipe_atoms = FALSE
+ var/mutable_appearance/backdrop = mutable_appearance('icons/hud/screen_gen.dmi', "flash")
+ backdrop.blend_mode = BLEND_OVERLAY
+ backdrop.color = "#292319"
+
if(istype(clone_area) && total_x == clone_area.width && total_y == clone_area.height && size_x >= 0 && size_y > 0)
var/turf/bottom_left = clone_area.bottom_left_turfs[1]
var/cloned_center_x = round(bottom_left.x + ((total_x - 1) / 2))
@@ -29,6 +36,12 @@
atoms += new /obj/effect/appearance_clone(newT, T)
if(T.loc.icon_state)
atoms += new /obj/effect/appearance_clone(newT, T.loc)
+ if(T.lighting_object)
+ var/obj/effect/appearance_clone/lighting_overlay = new(newT)
+ lighting_overlay.appearance = T.lighting_object.current_underlay
+ lighting_overlay.underlays += backdrop
+ lighting_overlay.blend_mode = BLEND_MULTIPLY
+ lighting += lighting_overlay
for(var/i in T.contents)
var/atom/A = i
if(!A.invisibility || (see_ghosts && isobserver(A)))
@@ -41,6 +54,12 @@
for(var/i in turfs)
var/turf/T = i
atoms += T
+ if(T.lighting_object)
+ var/obj/effect/appearance_clone/lighting_overlay = new(T)
+ lighting_overlay.appearance = T.lighting_object.current_underlay
+ lighting_overlay.underlays += backdrop
+ lighting_overlay.blend_mode = BLEND_MULTIPLY
+ lighting += lighting_overlay
for(var/atom/movable/A in T)
if(A.invisibility)
if(!(see_ghosts && isobserver(A)))
@@ -50,6 +69,7 @@
var/icon/res = icon('icons/blanks/96x96.dmi', "nothing")
res.Scale(psize_x, psize_y)
+ atoms += lighting
var/list/sorted = list()
var/j
@@ -57,7 +77,19 @@
var/atom/c = atoms[i]
for(j = sorted.len, j > 0, --j)
var/atom/c2 = sorted[j]
- if((c2.plane <= c.plane) && (c2.layer <= c.layer))
+ if(c2.plane > c.plane)
+ continue
+ if(c2.plane < c.plane)
+ break
+ var/c_position = PHYSICAL_POSITION(c)
+ var/c2_position = PHYSICAL_POSITION(c2)
+ // If you are above me, I layer above you
+ if(c2_position - 32 >= c_position)
+ break
+ // If I am above you you will always layer above me
+ if(c2_position <= c_position - 32)
+ continue
+ if(c2.layer < c.layer)
break
sorted.Insert(j+1, c)
CHECK_TICK
@@ -80,32 +112,34 @@
for(var/X in sorted) //these are clones
var/obj/effect/appearance_clone/clone = X
var/icon/img = getFlatIcon(clone, no_anim = TRUE)
- if(img)
- // Center of the image in X
- var/xo = (clone.x - center.x) * world.icon_size + clone.pixel_x + xcomp + clone.step_x
- // Center of the image in Y
- var/yo = (clone.y - center.y) * world.icon_size + clone.pixel_y + ycomp + clone.step_y
-
- if(clone.transform) // getFlatIcon doesn't give a snot about transforms.
- var/datum/decompose_matrix/decompose = clone.transform.decompose()
- // Scale in X, Y
- if(decompose.scale_x != 1 || decompose.scale_y != 1)
- var/base_w = img.Width()
- var/base_h = img.Height()
- // scale_x can be negative
- img.Scale(base_w * abs(decompose.scale_x), base_h * decompose.scale_y)
- if(decompose.scale_x < 0)
- img.Flip(EAST)
- xo -= base_w * (decompose.scale_x - SIGN(decompose.scale_x)) / 2 * SIGN(decompose.scale_x)
- yo -= base_h * (decompose.scale_y - 1) / 2
- // Rotation
- if(decompose.rotation != 0)
- img.Turn(decompose.rotation)
- // Shift
- xo += decompose.shift_x
- yo += decompose.shift_y
-
- res.Blend(img, blendMode2iconMode(clone.blend_mode), xo, yo)
+ if(!img)
+ CHECK_TICK
+ continue
+ // Center of the image in X
+ var/xo = (clone.x - center.x) * world.icon_size + clone.pixel_x + xcomp + clone.step_x
+ // Center of the image in Y
+ var/yo = (clone.y - center.y) * world.icon_size + clone.pixel_y + ycomp + clone.step_y
+
+ if(clone.transform) // getFlatIcon doesn't give a snot about transforms.
+ var/datum/decompose_matrix/decompose = clone.transform.decompose()
+ // Scale in X, Y
+ if(decompose.scale_x != 1 || decompose.scale_y != 1)
+ var/base_w = img.Width()
+ var/base_h = img.Height()
+ // scale_x can be negative
+ img.Scale(base_w * abs(decompose.scale_x), base_h * decompose.scale_y)
+ if(decompose.scale_x < 0)
+ img.Flip(EAST)
+ xo -= base_w * (decompose.scale_x - SIGN(decompose.scale_x)) / 2 * SIGN(decompose.scale_x)
+ yo -= base_h * (decompose.scale_y - 1) / 2
+ // Rotation
+ if(decompose.rotation != 0)
+ img.Turn(decompose.rotation)
+ // Shift
+ xo += decompose.shift_x
+ yo += decompose.shift_y
+
+ res.Blend(img, blendMode2iconMode(clone.blend_mode), xo, yo)
CHECK_TICK
if(!silent)
@@ -116,5 +150,9 @@
if(wipe_atoms)
QDEL_LIST(atoms)
+ else
+ QDEL_LIST(lighting)
return res
+
+#undef PHYSICAL_POSITION
diff --git a/code/modules/plumbing/ducts.dm b/code/modules/plumbing/ducts.dm
index de4a900579219a..a7045567fa80d6 100644
--- a/code/modules/plumbing/ducts.dm
+++ b/code/modules/plumbing/ducts.dm
@@ -100,7 +100,7 @@ All the important duct code:
other.add_connects(opposite_dir)
other.update_appearance()
- return TRUE //tell the current pipe to also update it's sprite
+ return TRUE //tell the current pipe to also update its sprite
if(!(other in neighbours)) //we cool
if((duct_color != other.duct_color) && !(ignore_colors || other.ignore_colors))
return
@@ -339,7 +339,7 @@ All the important duct code:
/obj/item/stack/ducts/examine(mob/user)
. = ..()
- . += span_notice("It's current color and layer are [duct_color] and [duct_layer]. Use in-hand to change.")
+ . += span_notice("Its current color and layer are [duct_color] and [duct_layer]. Use in-hand to change.")
/obj/item/stack/ducts/attack_self(mob/user)
var/new_layer = tgui_input_list(user, "Select a layer", "Layer", GLOB.plumbing_layers, duct_layer)
diff --git a/code/modules/plumbing/plumbers/_plumb_machinery.dm b/code/modules/plumbing/plumbers/_plumb_machinery.dm
index c8564b15f12158..33c063bbfed20c 100644
--- a/code/modules/plumbing/plumbers/_plumb_machinery.dm
+++ b/code/modules/plumbing/plumbers/_plumb_machinery.dm
@@ -190,6 +190,8 @@
transfer_amount = reagent.volume * part
if(reagent.intercept_reagents_transfer(target_holder, amount))
+ update_total()
+ target_holder.update_total()
continue
transfered_amount = target_holder.add_reagent(reagent.type, transfer_amount, copy_data(reagent), chem_temp, reagent.purity, reagent.ph, no_react = TRUE, ignore_splitting = reagent.chemical_flags & REAGENT_DONOTSPLIT) //we only handle reaction after every reagent has been transferred.
diff --git a/code/modules/plumbing/plumbers/pill_press.dm b/code/modules/plumbing/plumbers/pill_press.dm
index dad5ad943b12f1..050402f79f5af2 100644
--- a/code/modules/plumbing/plumbers/pill_press.dm
+++ b/code/modules/plumbing/plumbers/pill_press.dm
@@ -63,7 +63,7 @@
. = ..()
. += span_notice("The [name] currently has [stored_products.len] stored. There needs to be less than [MAX_FLOOR_PRODUCTS] on the floor to continue dispensing.")
-/// decode product category from it's type path and returns the decoded typepath
+/// decode product category from its type path and returns the decoded typepath
/obj/machinery/plumbing/pill_press/proc/decode_category()
var/obj/item/reagent_containers/container = locate(packaging_type)
if(ispath(container, /obj/item/reagent_containers/pill/patch))
diff --git a/code/modules/plumbing/plumbers/reaction_chamber.dm b/code/modules/plumbing/plumbers/reaction_chamber.dm
index 59fcfaf7caf910..9828c9e697f859 100644
--- a/code/modules/plumbing/plumbers/reaction_chamber.dm
+++ b/code/modules/plumbing/plumbers/reaction_chamber.dm
@@ -180,8 +180,8 @@
/**
* figure out which buffer to transfer to restore balance
- * if solution is getting too basic(high ph) add some acid to lower it's value
- * else if solution is getting too acidic(low ph) add some base to increase it's value
+ * if solution is getting too basic(high ph) add some acid to lower its value
+ * else if solution is getting too acidic(low ph) add some base to increase its value
*/
var/datum/reagents/buffer = reagents.ph > alkaline_limit ? acidic_beaker.reagents : alkaline_beaker.reagents
if(!buffer.total_volume)
diff --git a/code/modules/power/apc/apc_main.dm b/code/modules/power/apc/apc_main.dm
index c0fedfa5b2240c..871906fe4b8f76 100644
--- a/code/modules/power/apc/apc_main.dm
+++ b/code/modules/power/apc/apc_main.dm
@@ -7,6 +7,12 @@
///Cap for how fast cells charge, as a percentage per second (.01 means cellcharge is capped to 1% per second)
#define CHARGELEVEL 0.01
+///Charge percentage at which the lights channel stops working
+#define APC_CHANNEL_LIGHT_TRESHOLD 10 //SKYRAT EDIT CHANGE - Original: 15
+///Charge percentage at which the equipment channel stops working
+#define APC_CHANNEL_EQUIP_TRESHOLD 20 //SKYRAT EDIT CHANGE - Original: 30
+///Charge percentage at which the APC icon indicates discharging
+#define APC_CHANNEL_ALARM_TRESHOLD 75
/obj/machinery/power/apc
name = "area power controller"
@@ -49,6 +55,8 @@
var/operating = TRUE
///State of the apc charging (not charging, charging, fully charged)
var/charging = APC_NOT_CHARGING
+ ///Previous state of charging, to detect the change
+ var/last_charging
///Can the APC charge?
var/chargemode = TRUE
///Is the apc interface locked?
@@ -67,6 +75,8 @@
var/lastused_environ = 0
///Total amount of power used by the three channels
var/lastused_total = 0
+ ///Total amount of power put into the battery
+ var/lastused_charge = 0
///State of the apc external power (no power, low power, has power)
var/main_status = APC_NO_POWER
powernet = FALSE // set so that APCs aren't found as powernet nodes //Hackish, Horrible, was like this before I changed it :(
@@ -146,8 +156,7 @@
//APCs get added to their own processing tasks for the machines subsystem.
if (!(datum_flags & DF_ISPROCESSING))
datum_flags |= DF_ISPROCESSING
- SSmachines.apc_early_processing += src
- SSmachines.apc_late_processing += src
+ SSmachines.processing_apcs += src
//Pixel offset its appearance based on its direction
dir = ndir
@@ -240,8 +249,6 @@
QDEL_NULL(alarm_manager)
if(occupier)
malfvacate(TRUE)
- if(wires)
- QDEL_NULL(wires)
if(cell)
QDEL_NULL(cell)
if(terminal)
@@ -362,7 +369,7 @@
"powerCellStatus" = cell ? cell.percent() : null,
"chargeMode" = chargemode,
"chargingStatus" = charging,
- "chargingPowerDisplay" = display_power(area.energy_usage[AREA_USAGE_APC_CHARGE]),
+ "chargingPowerDisplay" = display_power(lastused_charge),
"totalLoad" = display_power(lastused_total),
"coverLocked" = coverlocked,
"remoteAccess" = (user == remote_control_user),
@@ -516,15 +523,22 @@
disconnect_remote_access()
/**
- * APC early processing. This gets processed before any other machine does.
+ * APC early processing. This gets processed after any other machine on the powernet does.
* This adds up the total static power usage for the apc's area, then draw that power usage from the grid or APC cell.
- * This is done early so machines that use dynamic power get a more truthful surplus when accessing available energy.
*/
/obj/machinery/power/apc/proc/early_process()
+ if(cell && cell.charge < cell.maxcharge)
+ last_charging = charging
+ charging = APC_NOT_CHARGING
+ if(isnull(area))
+ return
+
var/total_static_energy_usage = 0
total_static_energy_usage += APC_CHANNEL_IS_ON(lighting) * area.energy_usage[AREA_USAGE_STATIC_LIGHT]
total_static_energy_usage += APC_CHANNEL_IS_ON(equipment) * area.energy_usage[AREA_USAGE_STATIC_EQUIP]
total_static_energy_usage += APC_CHANNEL_IS_ON(environ) * area.energy_usage[AREA_USAGE_STATIC_ENVIRON]
+ area.clear_usage()
+
if(total_static_energy_usage) //Use power from static power users.
draw_energy(total_static_energy_usage)
@@ -549,17 +563,14 @@
lastused_light = APC_CHANNEL_IS_ON(lighting) ? area.energy_usage[AREA_USAGE_LIGHT] + area.energy_usage[AREA_USAGE_STATIC_LIGHT] : 0
lastused_equip = APC_CHANNEL_IS_ON(equipment) ? area.energy_usage[AREA_USAGE_EQUIP] + area.energy_usage[AREA_USAGE_STATIC_EQUIP] : 0
lastused_environ = APC_CHANNEL_IS_ON(environ) ? area.energy_usage[AREA_USAGE_ENVIRON] + area.energy_usage[AREA_USAGE_STATIC_ENVIRON] : 0
- area.clear_usage()
-
- lastused_total = lastused_light + lastused_equip + lastused_environ
+ lastused_charge = charging == APC_CHARGING ? area.energy_usage[AREA_USAGE_APC_CHARGE] : 0
+ lastused_total = lastused_light + lastused_equip + lastused_environ + lastused_charge
//store states to update icon if any change
var/last_lt = lighting
var/last_eq = equipment
var/last_en = environ
- var/last_ch = charging
-
var/excess = surplus()
if(!avail())
@@ -579,7 +590,7 @@
if(!nightshift_lights || (nightshift_lights && !low_power_nightshift_lights))
low_power_nightshift_lights = TRUE
INVOKE_ASYNC(src, PROC_REF(set_nightshift), TRUE)
- else if(cell.percent() < 7) // SKYRAT EDIT CHANGE - ORIGINAL: cell.percent() < 15
+ else if(cell.percent() < APC_CHANNEL_LIGHT_TRESHOLD) // turn off lighting & equipment
equipment = autoset(equipment, AUTOSET_OFF)
lighting = autoset(lighting, AUTOSET_OFF)
environ = autoset(environ, AUTOSET_ON)
@@ -587,7 +598,7 @@
if(!nightshift_lights || (nightshift_lights && !low_power_nightshift_lights))
low_power_nightshift_lights = TRUE
INVOKE_ASYNC(src, PROC_REF(set_nightshift), TRUE)
- else if(cell.percent() < 17) // SKYRAT EDIT CHANGE - ORIGINAL: cell.percent() < 30
+ else if(cell.percent() < APC_CHANNEL_EQUIP_TRESHOLD)
equipment = autoset(equipment, AUTOSET_ON) // SKYRAT EDIT CHANGE - ORIGINAL: AUTOSET_OFF
lighting = autoset(lighting, AUTOSET_OFF) // SKYRAT EDIT CHANGE - ORIGINAL: AUTOSET_ON
environ = autoset(environ, AUTOSET_ON)
@@ -603,21 +614,8 @@
low_power_nightshift_lights = FALSE
if(!SSnightshift.nightshift_active)
INVOKE_ASYNC(src, PROC_REF(set_nightshift), FALSE)
- if(cell.percent() > 75)
+ if(cell.percent() > APC_CHANNEL_ALARM_TRESHOLD)
alarm_manager.clear_alarm(ALARM_POWER)
-
- charging = APC_NOT_CHARGING
- // now trickle-charge the cell
- if(chargemode && operating && excess && cell.used_charge())
- // Max charge is capped to % per second constant.
- lastused_total += charge_cell(min(cell.chargerate, cell.maxcharge * CHARGELEVEL) * seconds_per_tick, cell = cell, grid_only = TRUE, channel = AREA_USAGE_APC_CHARGE)
- charging = APC_CHARGING
-
- // show cell as fully charged if so
- if(cell.charge >= cell.maxcharge)
- cell.charge = cell.maxcharge
- charging = APC_FULLY_CHARGED
-
// SKYRAT ADDITION START - CLOCK CULT
if(integration_cog)
var/power_delta = clamp(cell.charge - 50, 0, 50)
@@ -634,16 +632,47 @@
lighting = autoset(lighting, AUTOSET_FORCE_OFF)
environ = autoset(environ, AUTOSET_FORCE_OFF)
alarm_manager.send_alarm(ALARM_POWER)
-
// update icon & area power if anything changed
-
if(last_lt != lighting || last_eq != equipment || last_en != environ || force_update)
force_update = FALSE
queue_icon_update()
update()
- else if(last_ch != charging)
+ else if(charging != last_charging)
queue_icon_update()
+// charge until the battery is full or to the treshold of the provided channel
+/obj/machinery/power/apc/proc/charge_channel(channel = null, seconds_per_tick)
+ if(!cell || shorted || !operating || !chargemode || !surplus() || !cell.used_charge())
+ return
+
+ // no overcharge past the next treshold
+ var/need_charge_for_channel
+ switch(channel)
+ if(SSMACHINES_APCS_ENVIRONMENT)
+ need_charge_for_channel = (cell.maxcharge * 0.05) - cell.charge
+ if(SSMACHINES_APCS_LIGHTS)
+ need_charge_for_channel = (cell.maxcharge * (APC_CHANNEL_LIGHT_TRESHOLD + 5) * 0.01) - cell.charge
+ if(SSMACHINES_APCS_EQUIPMENT)
+ need_charge_for_channel = (cell.maxcharge * (APC_CHANNEL_EQUIP_TRESHOLD + 5) * 0.01) - cell.charge
+ else
+ need_charge_for_channel = cell.used_charge()
+
+ var/charging_used = area ? area.energy_usage[AREA_USAGE_APC_CHARGE] : 0
+ var/remaining_charge_rate = min(cell.chargerate, cell.maxcharge * CHARGELEVEL) - charging_used
+ var/need_charge = min(need_charge_for_channel, remaining_charge_rate) * seconds_per_tick
+ //check if we can charge the battery
+ if(need_charge < 0)
+ return
+
+ charge_cell(need_charge, cell = cell, grid_only = TRUE, channel = AREA_USAGE_APC_CHARGE)
+
+ // show cell as fully charged if so
+ if(cell.charge >= cell.maxcharge)
+ cell.charge = cell.maxcharge
+ charging = APC_FULLY_CHARGED
+ else
+ charging = APC_CHARGING
+
/obj/machinery/power/apc/proc/reset(wire)
switch(wire)
if(WIRE_IDSCAN)
@@ -762,3 +791,6 @@
return null
#undef CHARGELEVEL
+#undef APC_CHANNEL_LIGHT_TRESHOLD
+#undef APC_CHANNEL_EQUIP_TRESHOLD
+#undef APC_CHANNEL_ALARM_TRESHOLD
diff --git a/code/modules/power/lighting/light.dm b/code/modules/power/lighting/light.dm
index 41b641e1393582..2914a9edec53f3 100644
--- a/code/modules/power/lighting/light.dm
+++ b/code/modules/power/lighting/light.dm
@@ -118,6 +118,7 @@
RegisterSignal(src, COMSIG_LIGHT_EATER_ACT, PROC_REF(on_light_eater))
RegisterSignal(src, COMSIG_HIT_BY_SABOTEUR, PROC_REF(on_saboteur))
AddElement(/datum/element/atmos_sensitive, mapload)
+ AddElement(/datum/element/contextual_screentip_bare_hands, rmb_text = "Remove bulb")
if(break_if_moved)
find_and_hang_on_wall(custom_drop_callback = CALLBACK(src, PROC_REF(knock_down)))
@@ -373,22 +374,20 @@
. = ..()
switch(status)
if(LIGHT_OK)
- . += "It is turned [on? "on" : "off"]."
+ . += span_notice("It is turned [on? "on" : "off"].")
if(LIGHT_EMPTY)
- . += "The [fitting] has been removed."
+ . += span_notice("The [fitting] has been removed.")
if(LIGHT_BURNED)
- . += "The [fitting] is burnt out."
+ . += span_danger("The [fitting] is burnt out.")
if(LIGHT_BROKEN)
- . += "The [fitting] has been smashed."
+ . += span_danger("The [fitting] has been smashed.")
if(cell || has_mock_cell)
- . += "Its backup power charge meter reads [has_mock_cell ? 100 : round((cell.charge / cell.maxcharge) * 100, 0.1)]%."
+ . += span_notice("Its backup power charge meter reads [has_mock_cell ? 100 : round((cell.charge / cell.maxcharge) * 100, 0.1)]%.")
//SKYRAT EDIT ADDITION
if(constant_flickering)
. += span_danger("The lighting ballast appears to be damaged, this could be fixed with a multitool.")
//SKYRAT EDIT END
-
-
// attack with item - insert light (if right type), otherwise try to break the light
/obj/machinery/light/attackby(obj/item/tool, mob/living/user, params)
@@ -577,9 +576,9 @@
// attack with hand - remove tube/bulb
// if hands aren't protected and the light is on, burn the player
-/obj/machinery/light/attack_hand(mob/living/carbon/human/user, list/modifiers)
+/obj/machinery/light/attack_hand_secondary(mob/living/carbon/human/user, list/modifiers)
. = ..()
- if(.)
+ if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN)
return
user.changeNext_move(CLICK_CD_MELEE)
add_fingerprint(user)
@@ -754,7 +753,10 @@
* All the effects that occur when a light falls off a wall that it was hung onto.
*/
/obj/machinery/light/proc/knock_down()
- new /obj/item/wallframe/light_fixture(drop_location())
+ if (fitting == "bulb")
+ new /obj/item/wallframe/light_fixture/small(drop_location())
+ else
+ new /obj/item/wallframe/light_fixture(drop_location())
new /obj/item/stack/cable_coil(drop_location(), 1, "red")
if(status != LIGHT_BROKEN)
break_light_tube(FALSE)
@@ -772,7 +774,7 @@
icon_state = "floor"
brightness = 4
light_angle = 360
- layer = LOW_OBJ_LAYER
+ layer = ABOVE_OPEN_TURF_LAYER
plane = FLOOR_PLANE
light_type = /obj/item/light/bulb
fitting = "bulb"
@@ -789,4 +791,6 @@
/obj/machinery/light/floor/transport
name = "transport light"
break_if_moved = FALSE
+ // has to render above tram things (trams are stupid)
layer = BELOW_OPEN_DOOR_LAYER
+ plane = GAME_PLANE
diff --git a/code/modules/power/lighting/light_construct.dm b/code/modules/power/lighting/light_construct.dm
index 2bca5e3b3f1572..ec09fdc26924f6 100644
--- a/code/modules/power/lighting/light_construct.dm
+++ b/code/modules/power/lighting/light_construct.dm
@@ -45,16 +45,16 @@
. = ..()
switch(stage)
if(LIGHT_CONSTRUCT_EMPTY)
- . += "It's an empty frame."
+ . += span_notice("It's an empty frame with no wires.")
if(LIGHT_CONSTRUCT_WIRED)
- . += "It's wired."
+ . += span_notice("It is wired, but the bolts are not screwed in.")
if(LIGHT_CONSTRUCT_CLOSED)
- . += "The casing is closed."
+ . += span_notice("The casing is closed.")
if(cell_connectors)
if(cell)
- . += "You see [cell] inside the casing."
+ . += span_notice("You see [cell] inside the casing.")
else
- . += "The casing has no power cell for backup power."
+ . += span_notice("The casing has no power cell for backup power.")
else
. += span_danger("This casing doesn't support power cells for backup power.")
diff --git a/code/modules/power/monitor.dm b/code/modules/power/monitor.dm
index 289b2d46fab386..1cff0f5f1a1bd1 100644
--- a/code/modules/power/monitor.dm
+++ b/code/modules/power/monitor.dm
@@ -19,11 +19,13 @@
/obj/machinery/computer/monitor/Initialize(mapload)
. = ..()
+ //Add to the late process queue to record the accurate power usage data
+ SSmachines.processing_late += src
search()
history["supply"] = list()
history["demand"] = list()
-/obj/machinery/computer/monitor/process()
+/obj/machinery/computer/monitor/process_late()
if(!get_powernet())
update_use_power(IDLE_POWER_USE)
search()
@@ -36,7 +38,7 @@
attached_wire_ref = WEAKREF(locate(/obj/structure/cable) in T)
if(attached_wire_ref)
return
- var/area/A = get_area(src) //if the computer isn't directly connected to a wire, attempt to find the APC powering it to pull it's powernet instead
+ var/area/A = get_area(src) //if the computer isn't directly connected to a wire, attempt to find the APC powering it to pull its powernet instead
if(!A)
return
var/obj/machinery/power/apc/local_apc = A.apc
diff --git a/code/modules/power/pipecleaners.dm b/code/modules/power/pipecleaners.dm
index 7f1ef8fc2e3a8d..4c91301978940f 100644
--- a/code/modules/power/pipecleaners.dm
+++ b/code/modules/power/pipecleaners.dm
@@ -29,6 +29,7 @@ By design, d1 is the smallest direction and d2 is the highest
icon = 'icons/obj/pipes_n_cables/pipe_cleaner.dmi'
icon_state = "0-1"
layer = WIRE_LAYER //Above hidden pipes, GAS_PIPE_HIDDEN_LAYER
+ plane = FLOOR_PLANE
anchored = TRUE
obj_flags = CAN_BE_HIT
color = CABLE_HEX_COLOR_RED
@@ -402,7 +403,7 @@ By design, d1 is the smallest direction and d2 is the highest
// exisiting pipe_cleaner doesn't point at our position or we have a supplied direction, so see if it's a stub
else if(C.d1 == 0)
- // if so, make it a full pipe_cleaner pointing from it's old direction to our dirn
+ // if so, make it a full pipe_cleaner pointing from its old direction to our dirn
var/nd1 = C.d2 // these will be the new directions
var/nd2 = dirn
diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm
index e4c1617c0f0b8a..c5353ce62d5375 100644
--- a/code/modules/power/port_gen.dm
+++ b/code/modules/power/port_gen.dm
@@ -1,4 +1,4 @@
-//Baseline portable generator. Has all the default handling. Not intended to be used on it's own (since it generates unlimited power).
+//Baseline portable generator. Has all the default handling. Not intended to be used on its own (since it generates unlimited power).
/obj/machinery/power/port_gen
name = "portable generator"
desc = "A portable generator for emergency backup power."
diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm
index 5cfeab92f06ca5..c31870f2ad080d 100644
--- a/code/modules/power/power.dm
+++ b/code/modules/power/power.dm
@@ -53,7 +53,7 @@
. += span_notice("It's operating on the [LOWER_TEXT(GLOB.cable_layer_to_name["[cable_layer]"])].")
else
. += span_warning("It's disconnected from the [LOWER_TEXT(GLOB.cable_layer_to_name["[cable_layer]"])].")
- . += span_notice("It's power line can be changed with a [EXAMINE_HINT("multitool")].")
+ . += span_notice("Its power line can be changed with a [EXAMINE_HINT("multitool")].")
/obj/machinery/power/multitool_act(mob/living/user, obj/item/tool)
if(can_change_cable_layer)
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 5cab751e6e7759..414baedec347e8 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -60,6 +60,8 @@
/obj/machinery/power/emitter/Initialize(mapload)
. = ..()
+ //Add to the early process queue to prioritize power draw
+ SSmachines.processing_early += src
RefreshParts()
set_wires(new /datum/wires/emitter(src))
if(welded)
@@ -187,7 +189,7 @@
togglelock(user)
return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN
-/obj/machinery/power/emitter/process(seconds_per_tick)
+/obj/machinery/power/emitter/process_early(seconds_per_tick)
var/power_usage = active_power_usage * seconds_per_tick
if(machine_stat & (BROKEN))
return
diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm
index eae49834499df9..73801e0d7d01ae 100644
--- a/code/modules/power/singularity/narsie.dm
+++ b/code/modules/power/singularity/narsie.dm
@@ -306,7 +306,7 @@
/**
* Selects cinematic to play as part of the cult end depending on the outcome then ends the round afterward
- * called either when narsie eats everyone, or when [/proc/begin_the_end()] reaches it's conclusion
+ * called either when narsie eats everyone, or when [/proc/begin_the_end()] reaches its conclusion
*/
/proc/cult_ending_helper(ending_type = CULT_VICTORY_NUKE)
switch(ending_type)
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index 0bb458ffce410d..b37e81574ff69a 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -69,7 +69,17 @@
var/max_charge = 0
var/new_charge = 0
for(var/datum/stock_part/capacitor/capacitor in component_parts)
- power_coefficient += capacitor.tier
+ // SKYRAT EDIT CHANGE START - Original: power_coefficient += capacitor.tier
+ switch(capacitor.tier)
+ if(1)
+ power_coefficient = 1
+ if(2)
+ power_coefficient = 2
+ if(3)
+ power_coefficient = 4
+ else
+ power_coefficient = 8
+ // SKYRAT EDIT CHANGE END
input_level_max = initial(input_level_max) * power_coefficient
output_level_max = initial(output_level_max) * power_coefficient
for(var/obj/item/stock_parts/power_store/power_cell in component_parts)
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index b86098e27a814e..eb359c78a90417 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -105,7 +105,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
var/external_power_immediate = 0
/// External damage that are added to the sm on next [/obj/machinery/power/supermatter_crystal/process_atmos] call.
- /// SM will not take damage if it's health is lower than emergency point.
+ /// SM will not take damage if its health is lower than emergency point.
var/external_damage_immediate = 0
///The cutoff for a bolt jumping, grows with heat, lowers with higher mol count,
@@ -239,6 +239,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
QDEL_NULL(radio)
QDEL_NULL(countdown)
if(is_main_engine && GLOB.main_supermatter_engine == src)
+ SSpersistence.reset_delam_counter() // NOVA EDIT ADDITION BEGIN - DELAM SCRAM
GLOB.main_supermatter_engine = null
QDEL_NULL(soundloop)
return ..()
diff --git a/code/modules/power/supermatter/supermatter_delamination/_sm_delam.dm b/code/modules/power/supermatter/supermatter_delamination/_sm_delam.dm
index eabb07d113792f..76249306571b9f 100644
--- a/code/modules/power/supermatter/supermatter_delamination/_sm_delam.dm
+++ b/code/modules/power/supermatter/supermatter_delamination/_sm_delam.dm
@@ -23,7 +23,7 @@ GLOBAL_LIST_INIT(sm_delam_list, list(
if (sm.is_main_engine)
SSpersistence.delam_highscore = SSpersistence.rounds_since_engine_exploded
SSpersistence.rounds_since_engine_exploded = ROUNDCOUNT_ENGINE_JUST_EXPLODED
- for (var/obj/machinery/incident_display/sign as anything in GLOB.map_delamination_counters)
+ for (var/obj/machinery/incident_display/sign as anything in GLOB.map_incident_displays)
sign.update_delam_count(ROUNDCOUNT_ENGINE_JUST_EXPLODED)
qdel(sm)
@@ -85,12 +85,12 @@ GLOBAL_LIST_INIT(sm_delam_list, list(
SEND_SIGNAL(sm, COMSIG_SUPERMATTER_DELAM_ALARM)
return TRUE
-/// Called when a supermatter switches it's strategy from another one to us.
+/// Called when a supermatter switches its strategy from another one to us.
/// [/obj/machinery/power/supermatter_crystal/proc/set_delam]
/datum/sm_delam/proc/on_select(obj/machinery/power/supermatter_crystal/sm)
return
-/// Called when a supermatter switches it's strategy from us to something else.
+/// Called when a supermatter switches its strategy from us to something else.
/// [/obj/machinery/power/supermatter_crystal/proc/set_delam]
/datum/sm_delam/proc/on_deselect(obj/machinery/power/supermatter_crystal/sm)
return
diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm
index b9313ae26ba780..a3bdd2b55bd793 100644
--- a/code/modules/power/tesla/coil.dm
+++ b/code/modules/power/tesla/coil.dm
@@ -129,6 +129,8 @@
density = TRUE
wants_powernet = FALSE
+ circuit = /obj/item/circuitboard/machine/grounding_rod
+
can_buckle = TRUE
buckle_lying = 0
buckle_requires_restraints = TRUE
diff --git a/code/modules/power/turbine/turbine.dm b/code/modules/power/turbine/turbine.dm
index 590b135ad9a31c..dbf5d1848dd481 100644
--- a/code/modules/power/turbine/turbine.dm
+++ b/code/modules/power/turbine/turbine.dm
@@ -292,7 +292,7 @@
input_turf = null
/**
- * transfer's gases from it's input turf to it's internal gas mix
+ * transfers gases from its input turf to its internal gas mix
* Returns temperature of the gas mix absorbed only if some work was done
*/
/obj/machinery/power/turbine/inlet_compressor/proc/compress_gases()
diff --git a/code/modules/procedural_mapping/README.md b/code/modules/procedural_mapping/README.md
index 6434b534bff101..5123f51ef18f81 100644
--- a/code/modules/procedural_mapping/README.md
+++ b/code/modules/procedural_mapping/README.md
@@ -63,7 +63,7 @@ Existing Calls: `initialiseModules(),generate(),generateOneTurf()`
### mapGeneratorModule
-Desc: a mapGeneratorModule has spawnableAtoms and spawnableTurfs lists which it will generate on turfs in it's mother's map based on cluster variables.
+Desc: a mapGeneratorModule has spawnableAtoms and spawnableTurfs lists which it will generate on turfs in its mother's map based on cluster variables.
### sync(var/datum/map_generator/mum)
@@ -77,7 +77,7 @@ Existing Calls: `mapGenerator/syncModules()`
Example: `generate()`
-Desc: Calls place(T) on all turfs in it's mother's map
+Desc: Calls place(T) on all turfs in its mother's map
Existing Calls: `mapGenerator/generate()`
@@ -104,9 +104,9 @@ Existing Calls: `place()`
Simple Workflow:
1. Define a/some mapGeneratorModule(s) to your liking, choosing atoms and turfs to spawn
-
+
* I chose to split Turfs and Atoms off into separate modules, but this is NOT required.
-* A mapGeneratorModule may have turfs AND atoms, so long as each is in it's appropriate list
+* A mapGeneratorModule may have turfs AND atoms, so long as each is in its appropriate list
2. Define a mapGenerator type who's modules list contains the typepath(s) of all the module(s) you wish to use
@@ -149,15 +149,15 @@ Variable Breakdown (For Mappers):
### mapGeneratorModule
* mother - INTERNAL, do not touch
-
+
* spawnableAtoms - A list of typepaths and their probability to spawn, eg: `spawnableAtoms = list(/obj/structure/flora/tree/pine = 30)`
-
+
* spawnableTurfs - A list of typepaths and their probability to spawn, eg: `spawnableTurfs = list(/turf/unsimulated/floor/grass = 100)`
-
+
* clusterMax - The max range to check for something being "too close" for this atom/turf to spawn, the true value is random between clusterMin and clusterMax
-
+
* clusterMin - The min range to check for something being "too close" for this atom/turf to spawn, the true value is random between clusterMin and clusterMax
-
+
* clusterCheckFlags - A Bitfield that controls how the cluster checks work, All based on clusterMin and clusterMax guides
* allowAtomsOnSpace - A Boolean for if we allow atoms to spawn on space tiles
diff --git a/code/modules/projectiles/ammunition/_firing.dm b/code/modules/projectiles/ammunition/_firing.dm
index 009c52b227ee38..23b2032b45daaa 100644
--- a/code/modules/projectiles/ammunition/_firing.dm
+++ b/code/modules/projectiles/ammunition/_firing.dm
@@ -82,9 +82,7 @@
var/direct_target
if(target && curloc.Adjacent(targloc, target=targloc, mover=src)) //if the target is right on our location or adjacent (including diagonally if reachable) we'll skip the travelling code in the proj's fire()
direct_target = target
- if(!direct_target)
- var/modifiers = params2list(params)
- loaded_projectile.preparePixelProjectile(target, fired_from, modifiers, spread)
+ loaded_projectile.preparePixelProjectile(target, fired_from, params2list(params), spread)
var/obj/projectile/loaded_projectile_cache = loaded_projectile
loaded_projectile = null
loaded_projectile_cache.fire(null, direct_target)
diff --git a/code/modules/projectiles/ammunition/ballistic/shotgun.dm b/code/modules/projectiles/ammunition/ballistic/shotgun.dm
index c3816608800e4f..2b445dba936765 100644
--- a/code/modules/projectiles/ammunition/ballistic/shotgun.dm
+++ b/code/modules/projectiles/ammunition/ballistic/shotgun.dm
@@ -160,7 +160,13 @@
/obj/item/ammo_casing/shotgun/dart/attackby()
return
+/obj/item/ammo_casing/shotgun/dart/large
+ name = "XL shotgun dart"
+ desc = "A dart for use in shotguns. Can be injected with up to 25 units of any chemical."
+ reagent_amount = 25
+
/obj/item/ammo_casing/shotgun/dart/bioterror
+ name = "bioterror dart"
desc = "An improved shotgun dart filled with deadly toxins. Can be injected with up to 30 units of any chemical."
reagent_amount = 30
diff --git a/code/modules/projectiles/boxes_magazines/external/shotgun.dm b/code/modules/projectiles/boxes_magazines/external/shotgun.dm
index dbf071f6aee6cb..6d90c54fc6927f 100644
--- a/code/modules/projectiles/boxes_magazines/external/shotgun.dm
+++ b/code/modules/projectiles/boxes_magazines/external/shotgun.dm
@@ -14,25 +14,30 @@
/obj/item/ammo_box/magazine/m12g/stun
name = "shotgun magazine (12g taser slugs)"
+ icon_state = "m12gs"
base_icon_state = "m12gs"
ammo_type = /obj/item/ammo_casing/shotgun/stunslug
/obj/item/ammo_box/magazine/m12g/slug
name = "shotgun magazine (12g slugs)"
+ icon_state = "m12gsl"
base_icon_state = "m12gsl"
ammo_type = /obj/item/ammo_casing/shotgun
/obj/item/ammo_box/magazine/m12g/dragon
name = "shotgun magazine (12g dragon's breath)"
+ icon_state = "m12gf"
base_icon_state = "m12gf"
ammo_type = /obj/item/ammo_casing/shotgun/dragonsbreath
/obj/item/ammo_box/magazine/m12g/bioterror
name = "shotgun magazine (12g bioterror)"
+ icon_state = "m12gt"
base_icon_state = "m12gt"
ammo_type = /obj/item/ammo_casing/shotgun/dart/bioterror
/obj/item/ammo_box/magazine/m12g/meteor
name = "shotgun magazine (12g meteor slugs)"
+ icon_state = "m12gbc"
base_icon_state = "m12gbc"
ammo_type = /obj/item/ammo_casing/shotgun/meteorslug
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index c5c9d9fbae2515..73c750f2175147 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -127,6 +127,21 @@
suppressed = null
update_appearance()
+/obj/item/gun/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
+ . = ..()
+ if(isliving(hit_atom))
+ var/mob/living/thrower = throwingdatum?.get_thrower()
+ toss_gun_hard(thrower, hit_atom)
+
+/obj/item/gun/proc/toss_gun_hard(mob/living/thrower, mob/living/target) //throw a gun at them. They don't expect it.
+ if(isnull(thrower))
+ return FALSE
+ if(!HAS_TRAIT(thrower, TRAIT_TOSS_GUN_HARD))
+ return FALSE
+ target.Knockdown(0.5 SECONDS)
+ target.apply_damage(damage = max(w_class * 5 - throwforce, 10), damagetype = BRUTE, def_zone = thrower.zone_selected, wound_bonus = CANT_WOUND, attacking_item = src)
+ return TRUE
+
/obj/item/gun/examine(mob/user)
. = ..()
if(!pinless)
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index 25fbdd1f6269cf..e4063d45200379 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -742,6 +742,24 @@ GLOBAL_LIST_INIT(gun_saw_types, typecacheof(list(
chamber_round()
update_appearance()
+/obj/item/gun/ballistic/toss_gun_hard(mob/living/carbon/thrower, mob/living/target)
+ . = ..()
+ if(!.)
+ return
+ switch(bolt_type)
+ if(BOLT_TYPE_NO_BOLT) //emptying the revolver cylinder
+ attack_self()
+ return
+ if(BOLT_TYPE_OPEN) //emptying the chamber of an automatic weapon, because rack() doesn't do this to it
+ handle_chamber(chamber_next_round = FALSE)
+ if(!internal_magazine && magazine) //if a magazine is attached to the weapon, we remove it and throw it aside
+ magazine.forceMove(drop_location())
+ magazine.throw_at(get_edge_target_turf(src, pick(GLOB.alldirs)), 1, 1)
+ magazine = null
+ update_icon() //updating the sprite of weapons without a magazine
+ if(!isnull(chambered)) //if there is a cartridge in the chamber, we remove it
+ rack()
+
/obj/item/suppressor
name = "suppressor"
desc = "A syndicate small-arms suppressor for maximum espionage."
diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm
index 8604e21b325031..f5f27274b07f00 100644
--- a/code/modules/projectiles/guns/ballistic/rifle.dm
+++ b/code/modules/projectiles/guns/ballistic/rifle.dm
@@ -273,13 +273,14 @@
obj_flags = UNIQUE_RENAME
can_be_sawn_off = FALSE
trigger_guard = TRIGGER_GUARD_ALLOW_ALL
+ pb_knockback = 3
SET_BASE_PIXEL(-8, 0)
/obj/item/gun/ballistic/rifle/boltaction/pipegun/add_bayonet_point()
AddComponent(/datum/component/bayonet_attachable, offset_x = 35, offset_y = 10)
-/obj/item/gun/ballistic/rifle/boltaction/pipegun/handle_chamber()
+/obj/item/gun/ballistic/rifle/boltaction/pipegun/handle_chamber(empty_chamber = TRUE, from_firing = TRUE, chamber_next_round = TRUE)
. = ..()
do_sparks(1, TRUE, src)
@@ -303,13 +304,16 @@
accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/pipegun/pistol
projectile_damage_multiplier = 0.50
spread = 15 //kinda inaccurate
+ burst_size = 3 //but it empties the entire magazine when it fires
+ fire_delay = 0.3 // and by empties, I mean it does it all at once
slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_NORMAL
weapon_weight = WEAPON_MEDIUM
+ semi_auto = TRUE
SET_BASE_PIXEL(0, 0)
-/obj/item/gun/ballistic/rifle/boltaction/pipegun/pipepistol/add_bayonet_point()
+/obj/item/gun/ballistic/rifle/boltaction/pipegun/pistol/add_bayonet_point()
return
/obj/item/gun/ballistic/rifle/boltaction/pipegun/prime
@@ -330,6 +334,7 @@
inhand_icon_state = "regal_pipepistol"
accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/pipegun/pistol/prime
projectile_damage_multiplier = 1
+ burst_size = 6 // WHOLE CLIP
spread = 0
/// MAGICAL BOLT ACTIONS ///
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index 7f8f6587bf03d2..5fceedfb395488 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -140,12 +140,15 @@
/obj/item/gun/ballistic/shotgun/bulldog
name = "\improper Bulldog Shotgun"
- desc = "A 2-round burst fire, mag-fed shotgun for combat in narrow corridors, nicknamed 'Bulldog' by boarding parties. Compatible only with specialized 8-round drum magazines. Can have a secondary magazine attached to quickly swap between ammo types, or just to keep shooting."
+ desc = "A 2-round burst fire, mag-fed shotgun for combat in narrow corridors, \
+ nicknamed 'Bulldog' by boarding parties. Compatible only with specialized 8-round drum magazines. \
+ Can have a secondary magazine attached to quickly swap between ammo types, or just to keep shooting."
icon_state = "bulldog"
- inhand_icon_state = "bulldog"
- worn_icon_state = "cshotgun"
lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
+ inhand_icon_state = "bulldog"
+ worn_icon = 'icons/mob/clothing/back.dmi'
+ worn_icon_state = "bulldog"
inhand_x_dimension = 32
inhand_y_dimension = 32
projectile_damage_multiplier = 1.2
@@ -166,9 +169,9 @@
internal_magazine = FALSE
tac_reloads = TRUE
burst_fire_selection = TRUE
- ///the type of secondary magazine for the bulldog
+ /// The type of secondary magazine for the bulldog
var/secondary_magazine_type
- ///the secondary magazine
+ /// The secondary magazine
var/obj/item/ammo_box/magazine/secondary_magazine
/obj/item/gun/ballistic/shotgun/bulldog/Initialize(mapload)
@@ -199,10 +202,8 @@
. += "[icon_state]_secondary_mag_[initial(secondary_magazine.icon_state)]"
if(!secondary_magazine.ammo_count())
. += "[icon_state]_secondary_mag_empty"
- else
- . += "[icon_state]_no_secondary_mag"
-/obj/item/gun/ballistic/shotgun/bulldog/handle_chamber()
+/obj/item/gun/ballistic/shotgun/bulldog/handle_chamber(empty_chamber = TRUE, from_firing = TRUE, chamber_next_round = TRUE)
if(!secondary_magazine)
return ..()
var/secondary_shells_left = LAZYLEN(secondary_magazine.stored_ammo)
diff --git a/code/modules/projectiles/guns/ballistic/toy.dm b/code/modules/projectiles/guns/ballistic/toy.dm
index 237d7cbbb10051..cb90438f56b4f6 100644
--- a/code/modules/projectiles/guns/ballistic/toy.dm
+++ b/code/modules/projectiles/guns/ballistic/toy.dm
@@ -47,7 +47,7 @@
pb_knockback = 0
gun_flags = TOY_FIREARM_OVERLAY | NOT_A_REAL_GUN
-/obj/item/gun/ballistic/shotgun/toy/handle_chamber()
+/obj/item/gun/ballistic/shotgun/toy/handle_chamber(empty_chamber = TRUE, from_firing = TRUE, chamber_next_round = TRUE)
. = ..()
if(chambered && !chambered.loaded_projectile)
qdel(chambered)
diff --git a/code/modules/projectiles/guns/bolt_types_explained.md b/code/modules/projectiles/guns/bolt_types_explained.md
index 63f6d6d4364f61..e1f638dceabda2 100644
--- a/code/modules/projectiles/guns/bolt_types_explained.md
+++ b/code/modules/projectiles/guns/bolt_types_explained.md
@@ -1,7 +1,7 @@
# Balistic gun icon states explained
-For a unknown period of time, `/obj/item/gun/ballistic` used the wrong icon state for it's `bolt_type` and so, if you tried to copy how it worked to make your own gun, you'd get a broken sprite. This documentation is intended to explain in detail what some of the variables and functions do, and how to make your own gun subtypes that work properly.
+For a unknown period of time, `/obj/item/gun/ballistic` used the wrong icon state for its `bolt_type` and so, if you tried to copy how it worked to make your own gun, you'd get a broken sprite. This documentation is intended to explain in detail what some of the variables and functions do, and how to make your own gun subtypes that work properly.
## Bolt Types
The easiest thing to screw up. For a long time, `/obj/item/gun/ballistic` had `bolt_type` set to `BOLT_TYPE_STANDARD` when the sprite was configured to use `BOLT_TYPE_LOCKING` sprites. Nobody noticed, because it wasn't obtainable through normal gameplay, and the Mosin which was broken by it only has like 3 pixels missing.
diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
index f4b4dc3785d823..4886cea60d457c 100644
--- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
@@ -84,6 +84,9 @@
else
to_chat(user, span_notice("There are no modifications currently installed."))
+/obj/item/gun/energy/recharge/kinetic_accelerator/try_fire_gun(atom/target, mob/living/user, params)
+ return fire_gun(target, user, user.Adjacent(target) && !isturf(target), params)
+
/obj/item/gun/energy/recharge/kinetic_accelerator/attack_hand_secondary(mob/user, list/modifiers)
. = ..()
if(. == SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN)
@@ -192,6 +195,7 @@
var/pressure_decrease = 0.25
var/obj/item/gun/energy/recharge/kinetic_accelerator/kinetic_gun
+
/obj/projectile/kinetic/Destroy()
kinetic_gun = null
return ..()
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index ea36ad633db66d..e35f7161686bfd 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -139,12 +139,14 @@
icon_state = "scatterlaser"
range = 255
damage = 6
+ var/size_per_tile = 0.1
+ var/max_scale = 4
/obj/projectile/beam/laser/accelerator/Range()
..()
damage += 7
transform = 0
- transform *= 1 + (((damage - 6)/7) * 0.2)//20% larger per tile
+ transform *= min(1 + (decayedRange - range) * size_per_tile, max_scale)
///X-ray gun
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 9b5aeb4ae0e773..b3b3935a86c7d1 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -169,6 +169,9 @@
else
. = ..(amount=1)
+/obj/item/gun/energy/plasmacutter/try_fire_gun(atom/target, mob/living/user, params)
+ return fire_gun(target, user, user.Adjacent(target) && !isturf(target), params)
+
#undef PLASMA_CUTTER_CHARGE_WELD
/obj/item/gun/energy/plasmacutter/adv
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index a7352645d8b930..6390fb2e1a933f 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -84,7 +84,8 @@
/// `speed` a modest value like 1 and set this to a low value like 0.2.
var/pixel_speed_multiplier = 1
- var/Angle = 0
+ /// The current angle of the projectile. Initially null, so if the arg is missing from [/fire()], we can calculate it from firer and target as fallback.
+ var/Angle
var/original_angle = 0 //Angle at firing
var/nondirectional_sprite = FALSE //Set TRUE to prevent projectiles from having their sprites rotated based on firing angle
var/spread = 0 //amount (in degrees) of projectile spread
@@ -583,7 +584,7 @@
*/
/obj/projectile/proc/select_target(turf/our_turf, atom/target, atom/bumped)
// 1. special bumped border object check
- if((bumped?.flags_1 & ON_BORDER_1) && can_hit_target(bumped, original == bumped, FALSE, TRUE))
+ if((bumped?.flags_1 & ON_BORDER_1) && can_hit_target(bumped, original == bumped, TRUE, TRUE))
return bumped
// 2. original
if(can_hit_target(original, TRUE, FALSE, original == bumped))
@@ -807,25 +808,23 @@
if(!log_override && firer && original && !do_not_log)
log_combat(firer, original, "fired at", src, "from [get_area_name(src, TRUE)]")
//note: mecha projectile logging is handled in /obj/item/mecha_parts/mecha_equipment/weapon/action(). try to keep these messages roughly the sameish just for consistency's sake.
- if(direct_target && (get_dist(direct_target, get_turf(fired_from)) <= 1)) // point blank shots // SKYRAT EDIT - ORIGINAL: if(direct_target && (get_dist(direct_target, get_turf(src)) <= 1))
+ if(direct_target && (get_dist(direct_target, get_turf(src)) <= 1)) // point blank shots
process_hit(get_turf(direct_target), direct_target)
if(QDELETED(src))
return
+ var/turf/starting = get_turf(src)
if(isnum(angle))
set_angle(angle)
- if(spread)
- set_angle(Angle + ((rand() - 0.5) * spread))
- var/turf/starting = get_turf(src)
- if(isnull(Angle)) //Try to resolve through offsets if there's no angle set.
+ else if(isnull(Angle)) //Try to resolve through offsets if there's no angle set.
if(isnull(xo) || isnull(yo))
stack_trace("WARNING: Projectile [type] deleted due to being unable to resolve a target after angle was null!")
qdel(src)
return
var/turf/target = locate(clamp(starting + xo, 1, world.maxx), clamp(starting + yo, 1, world.maxy), starting.z)
set_angle(get_angle(src, target))
+ if(spread)
+ set_angle(Angle + (rand() - 0.5) * spread)
original_angle = Angle
- if(!nondirectional_sprite)
- transform = transform.Turn(Angle)
trajectory_ignore_forcemove = TRUE
forceMove(starting)
trajectory_ignore_forcemove = FALSE
diff --git a/code/modules/projectiles/projectile/bullets/junk.dm b/code/modules/projectiles/projectile/bullets/junk.dm
index 285c3ea281509b..1c6ea89962e144 100644
--- a/code/modules/projectiles/projectile/bullets/junk.dm
+++ b/code/modules/projectiles/projectile/bullets/junk.dm
@@ -5,9 +5,28 @@
icon_state = "trashball"
damage = 30
embed_type = /datum/embed_data/bullet_junk
- var/bane_mob_biotypes = MOB_ROBOTIC
- var/bane_multiplier = 1.5
- var/bane_added_damage = 0
+ /// What biotype does our junk projectile especially harm?
+ var/extra_damage_mob_biotypes = MOB_ROBOTIC
+ /// How much do we multiply our total base damage?
+ var/extra_damage_multiplier = 1.5
+ /// How much extra damage do we do on top of this total damage? Separate from the multiplier and unaffected by it.
+ var/extra_damage_added_damage = 0
+ /// What damage type is our extra damage?
+ var/extra_damage_type = BRUTE
+
+/obj/projectile/bullet/junk/on_hit(atom/target, blocked = 0, pierce_hit)
+ . = ..()
+
+ if(!isliving(target))
+ return
+ var/mob/living/living_target = target
+
+ var/is_correct_biotype = living_target.mob_biotypes & extra_damage_mob_biotypes
+ if(extra_damage_mob_biotypes && is_correct_biotype)
+ var/multiplied_damage = extra_damage_multiplier ? ((damage * extra_damage_multiplier) - damage) : 0
+ var/finalized_damage = multiplied_damage + extra_damage_added_damage
+ if(finalized_damage)
+ living_target.apply_damage(finalized_damage, damagetype = extra_damage_type, def_zone = BODY_ZONE_CHEST, wound_bonus = wound_bonus)
/datum/embed_data/bullet_junk
embed_chance=15
@@ -19,10 +38,6 @@
jostle_pain_mult=6
rip_time=10
-/obj/projectile/bullet/junk/Initialize(mapload)
- . = ..()
- AddElement(/datum/element/bane, mob_biotypes = bane_mob_biotypes, target_type = /mob/living, damage_multiplier = bane_multiplier, added_damage = bane_added_damage, requires_combat_mode = FALSE)
-
/obj/projectile/bullet/incendiary/fire/junk
name = "burning oil"
damage = 30
@@ -40,7 +55,8 @@
damage = 15
embed_type = null
shrapnel_type = null
- bane_multiplier = 3
+ extra_damage_added_damage = 30
+ extra_damage_type = BURN
/obj/projectile/bullet/junk/shock/on_hit(atom/target, blocked = 0, pierce_hit)
. = ..()
@@ -51,9 +67,9 @@
/obj/projectile/bullet/junk/hunter
name = "junk hunter bullet"
icon_state = "gauss"
- bane_mob_biotypes = MOB_ROBOTIC | MOB_BEAST | MOB_SPECIAL
- bane_multiplier = 0
- bane_added_damage = 50
+ extra_damage_mob_biotypes = MOB_ROBOTIC | MOB_BEAST | MOB_SPECIAL
+ extra_damage_multiplier = 0
+ extra_damage_added_damage = 50
/obj/projectile/bullet/junk/ripper
name = "junk ripper bullet"
diff --git a/code/modules/projectiles/projectile/energy/photon.dm b/code/modules/projectiles/projectile/energy/photon.dm
index 7caac3e062e011..62b5770fb441e7 100644
--- a/code/modules/projectiles/projectile/energy/photon.dm
+++ b/code/modules/projectiles/projectile/energy/photon.dm
@@ -37,7 +37,7 @@
do_sparks(rand(1, 4), FALSE, src)
/**
- * When traveling to a new turf, throws a probability to generate a hotspot across it's path.
+ * When traveling to a new turf, throws a probability to generate a hotspot across its path.
*/
/obj/projectile/energy/photon/proc/scorch_earth(turf/open/floor/source, atom/movable/arrived, atom/old_loc, list/atom/old_locs)
SIGNAL_HANDLER
diff --git a/code/modules/projectiles/projectile/energy/stun.dm b/code/modules/projectiles/projectile/energy/stun.dm
index 40a5fc723cb814..5543b11d115b9f 100644
--- a/code/modules/projectiles/projectile/energy/stun.dm
+++ b/code/modules/projectiles/projectile/energy/stun.dm
@@ -22,7 +22,7 @@
C.adjust_confusion_up_to(15 SECONDS, 30 SECONDS) // SKYRAT EDIT ADDITION - Electrode jitteriness
C.add_mood_event("tased", /datum/mood_event/tased)
SEND_SIGNAL(C, COMSIG_LIVING_MINOR_SHOCK)
- if(C.dna && C.dna.check_mutation(/datum/mutation/human/hulk))
+ if(HAS_TRAIT(C, TRAIT_HULK))
C.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ), forced = "hulk")
else if(!C.check_stun_immunity(CANKNOCKDOWN))
addtimer(CALLBACK(C, TYPE_PROC_REF(/mob/living/carbon, do_jitter_animation), 20), 0.5 SECONDS)
diff --git a/code/modules/projectiles/projectile/special/temperature.dm b/code/modules/projectiles/projectile/special/temperature.dm
index 182bb715466d3a..43d7968b9ae72c 100644
--- a/code/modules/projectiles/projectile/special/temperature.dm
+++ b/code/modules/projectiles/projectile/special/temperature.dm
@@ -24,6 +24,13 @@
// the new body temperature is adjusted by the bullet's effect temperature
L.adjust_bodytemperature((1 - blocked) * temperature)
+ if(isobj(target))
+ var/obj/objectification = target
+
+ if(objectification.reagents)
+ var/datum/reagents/reagents = objectification.reagents
+ reagents?.expose_temperature(temperature)
+
/obj/projectile/temp/hot
name = "heat beam"
icon_state = "lava"
@@ -32,7 +39,14 @@
/obj/projectile/temp/cryo
name = "cryo beam"
range = 9
- temperature = -240 // Single slow shot reduces temp greatly
+ temperature = -350 // Single slow shot reduces temp greatly
+
+/obj/projectile/temp/cryo/on_hit(atom/target, blocked = 0, pierce_hit)
+ . = ..()
+
+ if(isliving(target))
+ var/mob/living/living_target = target
+ living_target.apply_status_effect(/datum/status_effect/freezing_blast)
/obj/projectile/temp/cryo/on_range()
var/turf/T = get_turf(src)
@@ -45,17 +59,27 @@
name = "hot beam"
icon_state = "firebeam" // sets on fire, diff sprite!
range = 9
- temperature = 240
+ temperature = 350
/obj/projectile/temp/pyro/on_hit(atom/target, blocked, pierce_hit)
. = ..()
if(!.)
return
- var/mob/living/living_target = target
- if(!istype(living_target))
+
+ if(isobj(target))
+ var/obj/objectification = target
+
+ if(objectification.resistance_flags & ON_FIRE) //Don't burn something already on fire
+ return
+
+ objectification.fire_act(temperature)
+
return
- living_target.adjust_fire_stacks(2)
- living_target.ignite_mob()
+
+ if(isliving(target))
+ var/mob/living/living_target = target
+ living_target.adjust_fire_stacks(2)
+ living_target.ignite_mob()
/obj/projectile/temp/pyro/on_range()
var/turf/location = get_turf(src)
diff --git a/code/modules/reagents/chemistry/chem_wiki_render.dm b/code/modules/reagents/chemistry/chem_wiki_render.dm
index 99116adc84b082..2bb6bd7175bdc6 100644
--- a/code/modules/reagents/chemistry/chem_wiki_render.dm
+++ b/code/modules/reagents/chemistry/chem_wiki_render.dm
@@ -9,7 +9,7 @@ ADMIN_VERB(generate_wikichem_list, R_DEBUG, "Parse Wikichems", "Parse and genera
|-
"}
- var/input_text = tgui_input_text(user, "Input a name of a reagent, or a series of reagents split with a comma (no spaces) to get it's wiki table entry", "Recipe") //95% of the time, the reagent type is a lowercase, no spaces / underscored version of the name
+ var/input_text = tgui_input_text(user, "Input a name of a reagent, or a series of reagents split with a comma (no spaces) to get its wiki table entry", "Recipe") //95% of the time, the reagent type is a lowercase, no spaces / underscored version of the name
if(!input_text)
to_chat(user, "Input was blank!")
return
diff --git a/code/modules/reagents/chemistry/equilibrium.dm b/code/modules/reagents/chemistry/equilibrium.dm
index 4ab88b3caa6747..435f4159ccbedb 100644
--- a/code/modules/reagents/chemistry/equilibrium.dm
+++ b/code/modules/reagents/chemistry/equilibrium.dm
@@ -87,10 +87,10 @@
PRIVATE_PROC(TRUE)
if(QDELETED(holder))
- stack_trace("an equilibrium is missing it's holder.")
+ stack_trace("an equilibrium is missing its holder.")
return FALSE
if(QDELETED(reaction))
- stack_trace("an equilibrium is missing it's reaction.")
+ stack_trace("an equilibrium is missing its reaction.")
return FALSE
if(!length(reaction.required_reagents))
stack_trace("an equilibrium is missing required reagents.")
diff --git a/code/modules/reagents/chemistry/fermi_readme.md b/code/modules/reagents/chemistry/fermi_readme.md
index ebb930e486fca0..0fc2ed76da1a96 100644
--- a/code/modules/reagents/chemistry/fermi_readme.md
+++ b/code/modules/reagents/chemistry/fermi_readme.md
@@ -82,11 +82,11 @@ Reaction rates are determined by the current temperature of the reagents holder.
The amount added is based off the recipies’ required_temp, optimal_temp, overheat_temp and temp_exponent_factor. See below:
-the y axis is the normalised value of growth, which is then muliplied by the rate_up_lim. You can see that temperatures below the required_temp produce no result (the reaction doesn't start, or if it is reacting, the reaction will stop). Between the required and optimal is a region that is defined by the temp_exponent_factor, so in this case the value is ^2, so we see exponential growth. Between the optimal_temp and the overheat_temp is the optimal phase - where the rate factor is 1. After that it continues to react, but will call overheated() per timestep. Presently the default for overheated() is to reduce the yield of the product (i.e. it's faster but you get less). The rate_up_lim is the maximum rate the reaction can go at optimal temperatures, so in this case a rate factor of 1 i.e. a temperature between 500+ will produce 10u, or a temperature of 400 will roughly produce 4u per step (independant of product ratio produced, if you put 10, it will only create 10 maximum regardless of how much product is defined in the results list).
+the y axis is the normalised value of growth, which is then muliplied by the rate_up_lim. You can see that temperatures below the required_temp produce no result (the reaction doesn't start, or if it is reacting, the reaction will stop). Between the required and optimal is a region that is defined by the temp_exponent_factor, so in this case the value is ^2, so we see exponential growth. Between the optimal_temp and the overheat_temp is the optimal phase - where the rate factor is 1. After that it continues to react, but will call overheated() per timestep. Presently the default for overheated() is to reduce the yield of the product (i.e. it's faster but you get less). The rate_up_lim is the maximum rate the reaction can go at optimal temperatures, so in this case a rate factor of 1 i.e. a temperature between 500+ will produce 10u, or a temperature of 400 will roughly produce 4u per step (independant of product ratio produced, if you put 10, it will only create 10 maximum regardless of how much product is defined in the results list).
### How pH ranges are set and what pH mechanics do
-Optimal pH ranges are set on a per recipe basis - though at the moment all recipes use a default recipe, so they all have the same window (except for the buffers). Hopefully either as a community effort/or in future PRs we can create unique profiles for the present reactions in the game.
+Optimal pH ranges are set on a per recipe basis - though at the moment all recipes use a default recipe, so they all have the same window (except for the buffers). Hopefully either as a community effort/or in future PRs we can create unique profiles for the present reactions in the game.
As for how you define the reaction variables for a reaction, there are a few new variables for the chemical_recipe datum. I'll go over specifically how pH works for the default reaction.
```dm
@@ -106,7 +106,7 @@ The y axis is the purity of the product made for that time step. This is recalcu
If you're designing a reaction you can define an optimal range between the OptimalpHMin to OptimalpHMax (5 - 7 in this case) and a deterministic region set by the ReactpHLim (5 - 4, 9 + 4 aka between 1 to 5 and 9 to 13). This deterministic region is exponential, so if you set it to 2 then it’ll exponentially grow, but since our CurveSharpph = 1, it’s linear (basically normalise the range in the determinsitic region, then put that to the power of CurveSharppH). Finally values outside of these ranges will prevent reactions from starting, but if a reaction drifts out during a reaction, the purity of volume created for each step will be 0 (It does not stop ongoing reactions). It’s entirely possible to design a reaction without a deterministic or optimal phase if you wanted.
-Though to note; if your purity dips below the PurityMin of a reaction it’ll call the overly_impure() function – which by default reduces the purity of all reagents in the beaker. Additionally, if the purity at the end of a reaction is below the PurityMin, it’ll convert into the failed chem defined by the product’s failed_chem defined in it's reagent datum. For default the PurityMin is 0.15, and is pretty difficult to fail. This is all customisable however, if you wanted to use these hooks to design a even more unique reaction, just don’t call the parent proc when using methods.
+Though to note; if your purity dips below the PurityMin of a reaction it’ll call the overly_impure() function – which by default reduces the purity of all reagents in the beaker. Additionally, if the purity at the end of a reaction is below the PurityMin, it’ll convert into the failed chem defined by the product’s failed_chem defined in its reagent datum. For default the PurityMin is 0.15, and is pretty difficult to fail. This is all customisable however, if you wanted to use these hooks to design a even more unique reaction, just don’t call the parent proc when using methods.
### Conditional changes in reagents datum per timestep
@@ -118,7 +118,7 @@ Though to note; if your purity dips below the PurityMin of a reaction it’ll ca
var/H_ion_release = 0.01 // pH change per 1u reaction
```
-The thermic_constant is how much the temperature changes per u created, so for 10u created the temperature will increase by 10K. The H_ion_release is how much the pH changes per u created, for 10u created the pH will increase by 0.1. During a reaction this is the only factor in pH changes - presently the addition/removal of reagents tie to the reaction won't affect this, though other reactions ongoing in the beaker will also affect pH, as well as the removal/addition of reagents outside of the reaction.
+The thermic_constant is how much the temperature changes per u created, so for 10u created the temperature will increase by 10K. The H_ion_release is how much the pH changes per u created, for 10u created the pH will increase by 0.1. During a reaction this is the only factor in pH changes - presently the addition/removal of reagents tie to the reaction won't affect this, though other reactions ongoing in the beaker will also affect pH, as well as the removal/addition of reagents outside of the reaction.
### Reaction flags
@@ -127,11 +127,11 @@ Reaction_flags can be used to set these defines:
```dm
#define REACTION_CLEAR_IMPURE //Convert into impure/pure on reaction completion in the datum/reagents holder instead of on consumption
#define REACTION_CLEAR_INVERSE //Convert into inverse on reaction completion when purity is low enough in the datum/reagents holder instead of on consumption
-#define REACTION_CLEAR_RETAIN //Clear converted chems retain their purities/inverted purities. Requires 1 or both of the above. This is so that it can split again after splitting from a reaction (i.e. if your impure_chem or inverse_chem has it's own impure_chem/inverse_chem and you want it to split again on consumption).
+#define REACTION_CLEAR_RETAIN //Clear converted chems retain their purities/inverted purities. Requires 1 or both of the above. This is so that it can split again after splitting from a reaction (i.e. if your impure_chem or inverse_chem has its own impure_chem/inverse_chem and you want it to split again on consumption).
#define REACTION_INSTANT //Used to create instant reactions
/datum/chemical_reaction
- var/reaction_flags
+ var/reaction_flags
```
For REACTION_CLEAR – this causes the purity mechanics to resolve in the beaker at the end of the reaction, instead of when added to a mob.
@@ -145,7 +145,7 @@ Eg:
...
var/required_temp = 300
var/optimal_temp = 200
- var/overheat_temp = 50
+ var/overheat_temp = 50
```
# Reagents
@@ -156,45 +156,45 @@ The new vars that are introduced are below:
var/ph = 7
///Purity of the reagent
var/purity = 1
- ///the purity of the reagent on creation (i.e. when it's added to a mob and it's purity split it into 2 chems; the purity of the resultant chems are kept as 1, this tracks what the purity was before that)
- var/creation_purity = 1
+ ///the purity of the reagent on creation (i.e. when it's added to a mob and its purity split it into 2 chems; the purity of the resultant chems are kept as 1, this tracks what the purity was before that)
+ var/creation_purity = 1
//impure chem values (see fermi_readme.dm for more details):
var/impure_chem = /datum/reagent/impurity // What chemical path is made when metabolised as a function of purity
var/inverse_chem_val = 0.2 // If the impurity is below 0.5, replace ALL of the chem with inverse_chem upon metabolising
var/inverse_chem = /datum/reagent/impurity/toxic // What chem is metabolised when purity is below inverse_chem_val
var/failed_chem = /datum/reagent/consumable/failed_reaction //what chem is made at the end of a reaction IF the purity is below the recipies purity_min
- var/chemical_flags
+ var/chemical_flags
```
- `pH` is the innate pH of the reagent and is used to calculate the pH of a reagents datum on addition/removal. This does not change and is a reference value. The reagents datum pH changes.
- `purity` is the INTERNAL value for splitting. This is set to 1 after splitting so that it doesn't infinite split
- `creation_purity` is the purity of the reagent on creation. This won't change. If you want to write code that checks the purity in any of the methods, use this.
-- `impure_chem` is the datum type that is created provided that it's `creation_purity` is above the `inverse_chem_val`. When the reagent is consumed it will split into this OR if the associated `datum/chemical_recipe` has a REACTION_CLEAR_IMPURE flag it will split at the end of the reaction in the `datum/reagents` holder
+- `impure_chem` is the datum type that is created provided that its `creation_purity` is above the `inverse_chem_val`. When the reagent is consumed it will split into this OR if the associated `datum/chemical_recipe` has a REACTION_CLEAR_IMPURE flag it will split at the end of the reaction in the `datum/reagents` holder
- `inverse_chem_val` if a reagent's purity is below this value it will 100% convert into `inverse_chem`. If above it will split into `impure_chem`. See the note on purity effects above
-- `inverse_chem` is the datum type that is created provided that it's `creation_purity` is below the `inverse_chem_val`. When the reagent is consumed it will 100% convert into this OR if the associated `datum/chemical_recipe` has a REACTION_CLEAR_INVERSE flag it will 100% convert at the end of the reaction in the `datum/reagents` holder
-- `failed_chem` is the chem that the product is 100% converted into if the purity is below the associated `datum/chemical_recipies`' `PurityMin` AT THE END OF A REACTION.
+- `inverse_chem` is the datum type that is created provided that its `creation_purity` is below the `inverse_chem_val`. When the reagent is consumed it will 100% convert into this OR if the associated `datum/chemical_recipe` has a REACTION_CLEAR_INVERSE flag it will 100% convert at the end of the reaction in the `datum/reagents` holder
+- `failed_chem` is the chem that the product is 100% converted into if the purity is below the associated `datum/chemical_recipies`' `PurityMin` AT THE END OF A REACTION.
When writing any reagent code ALWAYS use creation_purity. Purity is kept for internal mechanics only and won’t reflect the purity on creation.
See above for purity mechanics, but this is where you set the reagents that are created. If you’re making an impure reagent I recommend looking at impure_reagents.dm to see how they’re set up and consider using the `datum/reagents/impure` as a parent.
The flags you can set for `var/chemical_flags` are:
-```dm
+```dm
#define REAGENT_DEAD_PROCESS (1<<0) //allows on_mob_dead() if present in a dead body
#define REAGENT_DONOTSPLIT (1<<1) //Do not split the chem at all during processing - ignores all purity effects
#define REAGENT_INVISIBLE (1<<2) //Doesn't appear on handheld health analyzers.
#define REAGENT_SNEAKYNAME (1<<3) //When inverted, the inverted chem uses the name of the original chem
-#define REAGENT_SPLITRETAINVOL (1<<4) //Retains initial volume of chem when splitting for purity effects
+#define REAGENT_SPLITRETAINVOL (1<<4) //Retains initial volume of chem when splitting for purity effects
/datum/reagent
- var/chemical_flags
+ var/chemical_flags
```
While you might think reagent_flags is a more sensible name - it is already used for beakers. Hopefully this doesn't trip anyone up.
# Relivant vars from the holder.dm / reagents datum
-There are a few variables that are useful to know about
+There are a few variables that are useful to know about
```dm
/datum/reagents
/// Current temp of the holder volume
@@ -209,4 +209,4 @@ There are a few variables that are useful to know about
- chem_temp is the temperature used in the `datum/chemical_recipe`
- pH is a result of the sum of all reagents, as well as any changes from buffers and reactions. This is the pH used in `datum/chemical_recipe`.
- isReacting is a bool that can be used outside to ensure that you don't touch a reagents that is reacting.
-- previous_reagent_list is a list of the previous reagents (just the typepaths, not the objects) that was present on the last handle_reactions() method. This is to prevent pointless method calls.
\ No newline at end of file
+- previous_reagent_list is a list of the previous reagents (just the typepaths, not the objects) that was present on the last handle_reactions() method. This is to prevent pointless method calls.
diff --git a/code/modules/reagents/chemistry/holder/holder.dm b/code/modules/reagents/chemistry/holder/holder.dm
index 46d00e765a3437..11117142d70e55 100644
--- a/code/modules/reagents/chemistry/holder/holder.dm
+++ b/code/modules/reagents/chemistry/holder/holder.dm
@@ -249,7 +249,7 @@
cached_reagent.volume -= remove_amount
//record the changes
- removed_reagents += cached_reagent
+ removed_reagents[cached_reagent] = remove_amount
total_removed_amount += remove_amount
//if we reached here means we have found our specific reagent type so break
@@ -257,8 +257,8 @@
break
//inform others about our reagents being removed
- for(var/datum/reagent/removed_reagent as anything in cached_reagents)
- SEND_SIGNAL(src, COMSIG_REAGENTS_REM_REAGENT, removed_reagent, amount)
+ for(var/datum/reagent/removed_reagent as anything in removed_reagents)
+ SEND_SIGNAL(src, COMSIG_REAGENTS_REM_REAGENT, removed_reagent, removed_reagents[removed_reagent])
//update the holder & handle reactions
update_total()
@@ -476,6 +476,8 @@
if(preserve_data)
trans_data = copy_data(reagent)
if(reagent.intercept_reagents_transfer(target_holder, amount))
+ update_total()
+ target_holder.update_total()
continue
transfered_amount = target_holder.add_reagent(reagent.type, transfer_amount * multiplier, trans_data, chem_temp, reagent.purity, reagent.ph, no_react = TRUE, ignore_splitting = reagent.chemical_flags & REAGENT_DONOTSPLIT) //we only handle reaction after every reagent has been transferred.
if(!transfered_amount)
@@ -607,7 +609,7 @@
. = 0
//responsible for removing reagents and computing total ph & volume
- //all it's code was taken out of del_reagent() initially for efficiency purposes
+ //all its code was taken out of del_reagent() initially for efficiency purposes
while(chem_index <= num_reagents)
var/datum/reagent/reagent = cached_reagents[chem_index]
chem_index += 1
diff --git a/code/modules/reagents/chemistry/items.dm b/code/modules/reagents/chemistry/items.dm
index ad7f0413ce561b..0344971497b01e 100644
--- a/code/modules/reagents/chemistry/items.dm
+++ b/code/modules/reagents/chemistry/items.dm
@@ -109,7 +109,7 @@
to_chat(user, span_notice("You switch the chemical analyzer to provide a detailed description of each reagent."))
scanmode = DETAILED_CHEM_OUTPUT
else
- to_chat(user, span_notice("You switch the chemical analyzer to not include reagent descriptions in it's report."))
+ to_chat(user, span_notice("You switch the chemical analyzer to not include reagent descriptions in its report."))
scanmode = SHORTENED_CHEM_OUTPUT
/obj/item/ph_meter/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index f7aadf04b8cc7b..7065b10372509b 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -264,8 +264,8 @@
.["amount"] = amount
.["energy"] = cell.charge ? cell.charge : 0 //To prevent NaN in the UI.
.["maxEnergy"] = cell.maxcharge
- .["displayedEnergy"] = display_energy(cell.charge)
- .["displayedMaxEnergy"] = display_energy(cell.maxcharge)
+ .["displayedUnits"] = cell.charge ? (cell.charge / power_cost) : 0
+ .["displayedMaxUnits"] = cell.maxcharge / power_cost
.["showpH"] = isnull(recording_recipe) ? show_ph : FALSE //virtual beakers have no ph to compute & display
var/list/chemicals = list()
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index 8638bfdfecb5d8..93748a33043770 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -373,32 +373,18 @@
* Transfers a single reagent between buffer & beaker
* Arguments
*
- * * mob/user - the player who is attempting the transfer
* * datum/reagents/source - the holder we are transferring from
* * datum/reagents/target - the holder we are transferring to
* * datum/reagent/path - the reagent typepath we are transfering
- * * amount - volume to transfer -1 means custom amount
+ * * amount - volume to transfer
* * do_transfer - transfer the reagents else destroy them
*/
-/obj/machinery/chem_master/proc/transfer_reagent(mob/user, datum/reagents/source, datum/reagents/target, datum/reagent/path, amount, do_transfer)
+/obj/machinery/chem_master/proc/transfer_reagent(datum/reagents/source, datum/reagents/target, datum/reagent/path, amount, do_transfer)
PRIVATE_PROC(TRUE)
//sanity checks for transfer amount
- if(isnull(amount))
+ if(isnull(amount) || amount <= 0)
return FALSE
- amount = text2num(amount)
- if(isnull(amount))
- return FALSE
- if(amount == -1)
- var/target_amount = tgui_input_number(user, "Enter amount to transfer", "Transfer amount")
- if(!target_amount)
- return FALSE
- amount = text2num(target_amount)
- if(isnull(amount))
- return FALSE
- if(amount <= 0)
- return FALSE
-
//sanity checks for reagent path
var/datum/reagent/reagent = text2path(path)
if (!reagent)
@@ -433,18 +419,34 @@
if("transfer")
if(is_printing)
- say("buffer locked while printing!")
+ say("The buffer is locked while printing.")
return
var/reagent_ref = params["reagentRef"]
var/amount = params["amount"]
var/target = params["target"]
+ if(amount == -1) // Set custom amount
+ var/mob/user = ui.user //Hold a reference of the user if the UI is closed
+ amount = tgui_input_number(user, "Enter amount to transfer", "Transfer amount")
+ if(!amount || !user.can_perform_action(src))
+ return FALSE
+
+ var/should_transfer = is_transfering || (target == "buffer") // we should always transfer if target is the buffer
+ if(should_transfer && isnull(beaker)) // if there's no beaker, we cannot transfer
+ say("No reagent container is inserted.")
+ return FALSE
+
+ var/reagents_from
+ var/reagents_to = null
if(target == "buffer")
- return transfer_reagent(ui.user, beaker.reagents, reagents, reagent_ref, amount, TRUE)
+ reagents_from = beaker.reagents
+ reagents_to = reagents // buffer
else if(target == "beaker")
- return transfer_reagent(ui.user, reagents, beaker.reagents, reagent_ref, amount, is_transfering)
- return FALSE
+ reagents_from = reagents // buffer
+ if(should_transfer)
+ reagents_to = beaker.reagents
+ return transfer_reagent(reagents_from, reagents_to, reagent_ref, amount, should_transfer)
if("toggleTransferMode")
is_transfering = !is_transfering
diff --git a/code/modules/reagents/chemistry/machinery/chem_recipe_debug.dm b/code/modules/reagents/chemistry/machinery/chem_recipe_debug.dm
index 9d81188fb405e3..9b0773a8316b5e 100644
--- a/code/modules/reagents/chemistry/machinery/chem_recipe_debug.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_recipe_debug.dm
@@ -203,7 +203,7 @@
ui.send_update()
/**
- * Decodes the ui reaction var into it's original name
+ * Decodes the ui reaction var into its original name
* Arguments
*
* * variable - the name of the variable as seen in the UI
diff --git a/code/modules/reagents/chemistry/machinery/portable_chem_mixer.dm b/code/modules/reagents/chemistry/machinery/portable_chem_mixer.dm
index 016e55012c570d..9c92cc631be799 100644
--- a/code/modules/reagents/chemistry/machinery/portable_chem_mixer.dm
+++ b/code/modules/reagents/chemistry/machinery/portable_chem_mixer.dm
@@ -11,6 +11,7 @@
custom_premium_price = PAYCHECK_CREW * 14
interaction_flags_click = FORBID_TELEKINESIS_REACH
interaction_flags_mouse_drop = FORBID_TELEKINESIS_REACH
+ storage_type = /datum/storage/portable_chem_mixer
///Creating an empty slot for a beaker that can be added to dispense into
var/obj/item/reagent_containers/beaker
@@ -21,15 +22,7 @@
/obj/item/storage/portable_chem_mixer/Initialize(mapload)
. = ..()
- atom_storage.max_total_storage = 200
- atom_storage.max_slots = 50
- atom_storage.set_holdable(list(
- /obj/item/reagent_containers/cup/beaker,
- /obj/item/reagent_containers/cup/bottle,
- /obj/item/reagent_containers/cup/tube,
- /obj/item/reagent_containers/cup/glass/waterbottle,
- /obj/item/reagent_containers/condiment,
- ))
+
register_context()
/obj/item/storage/portable_chem_mixer/Destroy()
@@ -107,18 +100,18 @@
/obj/item/storage/portable_chem_mixer/ex_act(severity, target)
return severity > EXPLODE_LIGHT ? ..() : FALSE
-/obj/item/storage/portable_chem_mixer/item_interaction(mob/living/user, obj/item/weapon, list/modifiers)
+/obj/item/storage/portable_chem_mixer/storage_insert_on_interacted_with(datum/storage, obj/item/weapon, mob/living/user)
if (!atom_storage.locked || \
(weapon.item_flags & ABSTRACT) || \
(weapon.flags_1 & HOLOGRAM_1) || \
!is_reagent_container(weapon) || \
!weapon.is_open_container() \
)
- return NONE
+ return TRUE //continue with regular insertion
replace_beaker(user, weapon)
update_appearance()
- return ITEM_INTERACT_SUCCESS
+ return FALSE //block insertion cause we handled it ourselves
/**
* Replaces the beaker of the portable chemical mixer with another beaker, or simply adds the new beaker if none is in currently
@@ -267,7 +260,7 @@
SStgui.close_uis(src)
else
atom_storage.locked = STORAGE_FULLY_LOCKED
- atom_storage.hide_contents(usr)
+ atom_storage.hide_contents(user)
update_appearance()
return CLICK_ACTION_SUCCESS
diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
index a4fa10cb88c635..3b0272240b0df7 100644
--- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
@@ -204,7 +204,11 @@
if(weapon.w_class + total_weight > maximum_weight)
to_chat(user, span_warning("[weapon] is too big to fit into [src]."))
continue
- weapon.forceMove(src)
+
+ //try to remove the right way
+ if(!user.transferItemToLoc(weapon, src))
+ continue
+
total_weight += weapon.w_class
items_transfered += 1
to_chat(user, span_notice("[weapon] was loaded into [src]."))
@@ -212,8 +216,8 @@
return items_transfered
/obj/machinery/reagentgrinder/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
- if(user.combat_mode || (tool.item_flags & ABSTRACT) || (tool.flags_1 & HOLOGRAM_1) || !can_interact(user) || !user.can_perform_action(src, ALLOW_SILICON_REACH))
- return NONE
+ if(user.combat_mode || (tool.item_flags & ABSTRACT) || (tool.flags_1 & HOLOGRAM_1))
+ return ITEM_INTERACT_SKIP_TO_ATTACK
//add the beaker
if (is_reagent_container(tool) && tool.is_open_container())
diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm
index 576d62585f7a85..8edfb38abc397b 100644
--- a/code/modules/reagents/chemistry/reagents.dm
+++ b/code/modules/reagents/chemistry/reagents.dm
@@ -24,7 +24,7 @@
var/ph = 7
///Purity of the reagent - for use with internal reaction mechanics only. Use below (creation_purity) if you're writing purity effects into a reagent's use mechanics.
var/purity = 1
- ///the purity of the reagent on creation (i.e. when it's added to a mob and it's purity split it into 2 chems; the purity of the resultant chems are kept as 1, this tracks what the purity was before that)
+ ///the purity of the reagent on creation (i.e. when it's added to a mob and its purity split it into 2 chems; the purity of the resultant chems are kept as 1, this tracks what the purity was before that)
var/creation_purity = 1
///The molar mass of the reagent - if you're adding a reagent that doesn't have a recipe, just add a random number between 10 - 800. Higher numbers are "harder" but it's mostly arbitary.
var/mass
@@ -270,7 +270,7 @@ Primarily used in reagents/reaction_agents
return creation_purity / normalise_num_to
/**
- * Gets the inverse purity of this reagent. Mostly used when converting from a normal reagent to it's inverse one.
+ * Gets the inverse purity of this reagent. Mostly used when converting from a normal reagent to its inverse one.
*
* Arguments
* * purity - Overrides the purity used for determining the inverse purity.
diff --git a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
index 548b8e8a658dd4..f70ae995832b87 100644
--- a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
@@ -546,7 +546,7 @@
/*
*How this medicine works:
*Penthrite if you are not in crit only stabilizes your heart.
-*As soon as you pass crit threshold it's special effects kick in. Penthrite forces your heart to beat preventing you from entering
+*As soon as you pass crit threshold its special effects kick in. Penthrite forces your heart to beat preventing you from entering
*soft and hard crit, but there is a catch. During this you will be healed and you will sustain
*heart damage that will not imapct you as long as penthrite is in your system.
*If you reach the threshold of -60 HP penthrite stops working and you get a heart attack, penthrite is flushed from your system in that very moment,
diff --git a/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
index 38fb764a9555fe..7cffa996f2220c 100644
--- a/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
@@ -10,7 +10,7 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
creation_purity = 1 // impure base reagents are a big no-no
ph = 7.33
- burning_temperature = 2193//ethanol burns at 1970C (at it's peak)
+ burning_temperature = 2193//ethanol burns at 1970C (at its peak)
burning_volume = 0.1
default_container = /obj/item/reagent_containers/cup/glass/bottle/beer
fallback_icon = 'icons/obj/drinks/bottles.dmi'
@@ -1755,28 +1755,32 @@
quality = DRINK_GOOD
taste_description = "bitter, creamy cacao"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
- var/obj/item/shield/mighty_shield
+ var/datum/weakref/mighty_shield
/datum/reagent/consumable/ethanol/alexander/on_mob_metabolize(mob/living/drinker)
. = ..()
if(ishuman(drinker))
var/mob/living/carbon/human/the_human = drinker
for(var/obj/item/shield/the_shield in the_human.contents)
- mighty_shield = the_shield
- mighty_shield.block_chance += 10
+ mighty_shield = WEAKREF(the_shield)
+ the_shield.block_chance += 10
to_chat(the_human, span_notice("[the_shield] appears polished, although you don't recall polishing it."))
+ break
/datum/reagent/consumable/ethanol/alexander/on_mob_life(mob/living/drinker, seconds_per_tick, times_fired)
- if(mighty_shield && !(mighty_shield in drinker.contents)) //If you had a shield and lose it, you lose the reagent as well. Otherwise this is just a normal drink.
+ var/obj/item/shield/the_shield = mighty_shield?.resolve()
+ if(the_shield && !(the_shield in drinker.contents)) //If you had a shield and lose it, you lose the reagent as well. Otherwise this is just a normal drink.
holder.remove_reagent(type, volume)
return
return ..()
/datum/reagent/consumable/ethanol/alexander/on_mob_end_metabolize(mob/living/drinker)
. = ..()
- if(mighty_shield)
- mighty_shield.block_chance -= 10
- to_chat(drinker,span_notice("You notice [mighty_shield] looks worn again. Weird."))
+ var/obj/item/shield/the_shield = mighty_shield?.resolve()
+ if(the_shield)
+ the_shield.block_chance -= 10
+ to_chat(drinker,span_notice("You notice [the_shield] looks worn again. Weird."))
+ mighty_shield = null
/datum/reagent/consumable/ethanol/amaretto_alexander
name = "Amaretto Alexander"
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index 87fb4cbf2797a8..194ce35eebd374 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -6,14 +6,13 @@
// Part of the food code. Also is where all the food
// condiments, additives, and such go.
-
/datum/reagent/consumable
name = "Consumable"
taste_description = "generic food"
taste_mult = 4
inverse_chem_val = 0.1
inverse_chem = null
- creation_purity = 0.5 // 50% pure by default. Below - synthetic food. Above - natural food.
+ creation_purity = CONSUMABLE_STANDARD_PURITY
/// How much nutrition this reagent supplies
var/nutriment_factor = 1
/// affects mood, typically higher for mixed drinks with more complex recipes'
diff --git a/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm
index 3473db75d35720..8d48e3da78a89f 100644
--- a/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm
@@ -227,7 +227,7 @@ Basically, we fill the time between now and 2s from now with hands based off the
///Prevents message spam
var/spammer = 0
-//Just the removed itching mechanism - omage to it's origins.
+//Just the removed itching mechanism - omage to its origins.
/datum/reagent/inverse/ichiyuri/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired)
. = ..()
if(prob(resetting_probability) && !(HAS_TRAIT(affected_mob, TRAIT_RESTRAINED) || affected_mob.incapacitated()))
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index c9914b82e46187..d8b3ee254bc488 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -949,7 +949,7 @@
reagent_state = GAS
color = COLOR_GRAY
taste_mult = 0 // oderless and tasteless
- ph = 9.2//It's acutally a huge range and very dependant on the chemistry but ph is basically a made up var in it's implementation anyways
+ ph = 9.2//It's acutally a huge range and very dependant on the chemistry but ph is basically a made up var in its implementation anyways
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
@@ -2706,7 +2706,7 @@
/datum/reagent/metalgen
name = "Metalgen"
data = list("material"=null)
- description = "A purple metal morphic liquid, said to impose it's metallic properties on whatever it touches."
+ description = "A purple metal morphic liquid, said to impose its metallic properties on whatever it touches."
color = "#b000aa"
taste_mult = 0 // oderless and tasteless
chemical_flags = REAGENT_NO_RANDOM_RECIPE
diff --git a/code/modules/reagents/chemistry/reagents/reaction_agents_reagents.dm b/code/modules/reagents/chemistry/reagents/reaction_agents_reagents.dm
index d6c4f0009b4036..e7cb222ac58374 100644
--- a/code/modules/reagents/chemistry/reagents/reaction_agents_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/reaction_agents_reagents.dm
@@ -110,7 +110,7 @@
/datum/reagent/reaction_agent/speed_agent
name = "Tempomyocin"
- description = "This reagent will consume itself and speed up an ongoing reaction, modifying the current reaction's purity by it's own."
+ description = "This reagent will consume itself and speed up an ongoing reaction, modifying the current reaction's purity by its own."
ph = 10
color = "#e61f82"
diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
index 6695b0b9db15d9..5e553fce962c5f 100644
--- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
@@ -1275,14 +1275,14 @@
/datum/reagent/toxin/tetrodotoxin
name = "Tetrodotoxin"
- description = "A colorless, oderless, tasteless neurotoxin usually carried by livers of animals of the Tetraodontiformes order."
+ description = "A colorless, odorless, tasteless neurotoxin usually carried by livers of animals of the Tetraodontiformes order."
silent_toxin = TRUE
reagent_state = SOLID
color = COLOR_VERY_LIGHT_GRAY
metabolization_rate = 0.1 * REAGENTS_METABOLISM
toxpwr = 0
taste_mult = 0
- chemical_flags = REAGENT_NO_RANDOM_RECIPE
+ chemical_flags = REAGENT_NO_RANDOM_RECIPE|REAGENT_CAN_BE_SYNTHESIZED
var/list/traits_not_applied = list(
TRAIT_PARALYSIS_L_ARM = BODY_ZONE_L_ARM,
TRAIT_PARALYSIS_R_ARM = BODY_ZONE_R_ARM,
@@ -1302,7 +1302,7 @@
if(SPT_PROB(5, seconds_per_tick))
var/obj/item/organ/internal/tongue/tongue = affected_mob.get_organ_slot(ORGAN_SLOT_TONGUE)
if(tongue)
- to_chat(affected_mob, span_warning("your [tongue.name] feels numb..."))
+ to_chat(affected_mob, span_warning("Your [tongue.name] feels numb..."))
affected_mob.set_slurring_if_lower(5 SECONDS * REM * seconds_per_tick)
affected_mob.adjust_disgust(3.5 * REM * seconds_per_tick)
if(13 to 21)
@@ -1331,7 +1331,7 @@
affected_mob.adjust_disgust(3 * REM * seconds_per_tick)
affected_mob.set_slurring_if_lower(3 SECONDS * REM * seconds_per_tick)
if(SPT_PROB(5, seconds_per_tick))
- to_chat(affected_mob, span_danger("you feel horribly weak."))
+ to_chat(affected_mob, span_danger("You feel horribly weak."))
need_mob_update += affected_mob.adjustStaminaLoss(5 * REM * seconds_per_tick, updating_stamina = FALSE)
if(SPT_PROB(8, seconds_per_tick))
paralyze_limb(affected_mob)
@@ -1352,7 +1352,7 @@
if(current_cycle > 38 && !length(traits_not_applied) && SPT_PROB(5, seconds_per_tick) && !affected_mob.undergoing_cardiac_arrest())
affected_mob.set_heartattack(TRUE)
- to_chat(affected_mob, span_danger("you feel a burning pain spread throughout your chest, oh no..."))
+ to_chat(affected_mob, span_bolddanger("You feel a burning pain spread throughout your chest!"))
if(need_mob_update)
return UPDATE_MOB_HEALTH
@@ -1360,9 +1360,8 @@
/datum/reagent/toxin/tetrodotoxin/proc/paralyze_limb(mob/living/affected_mob)
if(!length(traits_not_applied))
return
- var/added_trait = pick(traits_not_applied)
+ var/added_trait = pick_n_take(traits_not_applied)
ADD_TRAIT(affected_mob, added_trait, REF(src))
- traits_not_applied -= added_trait
/datum/reagent/toxin/tetrodotoxin/on_mob_metabolize(mob/living/affected_mob)
. = ..()
diff --git a/code/modules/reagents/chemistry/recipes.dm b/code/modules/reagents/chemistry/recipes.dm
index f61c5eade1bb48..b61a4d4d67cbc3 100644
--- a/code/modules/reagents/chemistry/recipes.dm
+++ b/code/modules/reagents/chemistry/recipes.dm
@@ -157,7 +157,7 @@
return
/**
- * Occurs when a reation is overheated (i.e. past it's overheatTemp)
+ * Occurs when a reation is overheated (i.e. past its overheatTemp)
* Will be called every tick in the reaction that it is overheated
* If you want this to be a once only proc (i.e. the reaction is stopped after) set reaction.toDelete = TRUE
* The above is useful if you're writing an explosion
diff --git a/code/modules/reagents/chemistry/recipes/cat2_medicines.dm b/code/modules/reagents/chemistry/recipes/cat2_medicines.dm
index 28aeb5743faaae..ae6e616b20390b 100644
--- a/code/modules/reagents/chemistry/recipes/cat2_medicines.dm
+++ b/code/modules/reagents/chemistry/recipes/cat2_medicines.dm
@@ -155,7 +155,7 @@
if(off_cooldown(holder, equilibrium, 2, "hercuri_freeze"))
return
playsound(holder.my_atom, 'sound/magic/ethereal_exit.ogg', 50, 1)
- holder.my_atom.visible_message("The reaction frosts over, releasing it's chilly contents!")
+ holder.my_atom.visible_message("The reaction frosts over, releasing its chilly contents!")
var/radius = max((equilibrium.step_target_vol/50), 1)
freeze_radius(holder, equilibrium, 200, radius, 60 SECONDS) //drying agent exists
explode_shockwave(holder, equilibrium, sound_and_text = FALSE)
diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
index f02aaa3ab24733..62a14ddc794be1 100644
--- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
+++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
@@ -499,7 +499,7 @@
return ..()
var/turf/local_turf = get_turf(holder.my_atom)
playsound(local_turf, 'sound/magic/ethereal_exit.ogg', 50, 1)
- local_turf.visible_message("The reaction frosts over, releasing it's chilly contents!")
+ local_turf.visible_message("The reaction frosts over, releasing its chilly contents!")
freeze_radius(holder, null, holder.chem_temp*2, clamp(cryostylane.volume/30, 2, 6), 120 SECONDS, 2)
clear_reactants(holder, 15)
holder.chem_temp += 100
diff --git a/code/modules/reagents/chemistry/recipes/special.dm b/code/modules/reagents/chemistry/recipes/special.dm
index 592a281ed7301f..75a60ba49d53d6 100644
--- a/code/modules/reagents/chemistry/recipes/special.dm
+++ b/code/modules/reagents/chemistry/recipes/special.dm
@@ -345,9 +345,9 @@ GLOBAL_LIST_INIT(medicine_reagents, build_medicine_reagents())
dat += "
heating it above [recipe.required_temp] degrees"
dat += " but not above [recipe.overheat_temp] degrees"
if(recipe.thermic_constant > 0)
- dat += "
taking care of it's exothermic nature
"
+ dat += "
taking care of its exothermic nature
"
else if(recipe.thermic_constant < 0)
- dat += "
taking care of it's endothermic nature
"
+ dat += "
taking care of its endothermic nature
"
var/datum/chemical_reaction/randomized/random_recipe = recipe
if(random_recipe)
if(random_recipe.randomize_req_ph)
diff --git a/code/modules/reagents/reagent_containers/cups/bottle.dm b/code/modules/reagents/reagent_containers/cups/bottle.dm
index 97906b26240e59..fda39ed4877ba3 100644
--- a/code/modules/reagents/reagent_containers/cups/bottle.dm
+++ b/code/modules/reagents/reagent_containers/cups/bottle.dm
@@ -431,7 +431,7 @@
/obj/item/reagent_containers/cup/bottle/thermite
name = "thermite bottle"
- list_reagents = list(/datum/reagent/thermite = 30)
+ list_reagents = list(/datum/reagent/thermite = 50)
// Bottles for mail goodies.
diff --git a/code/modules/reagents/reagent_containers/cups/drinks.dm b/code/modules/reagents/reagent_containers/cups/drinks.dm
index 2f326accb90741..c124ccec6bb774 100644
--- a/code/modules/reagents/reagent_containers/cups/drinks.dm
+++ b/code/modules/reagents/reagent_containers/cups/drinks.dm
@@ -316,7 +316,7 @@
var/mob/living/thrower = throwingdatum?.get_thrower()
if(thrower)
thrower.add_mood_event("bottle_flip", /datum/mood_event/bottle_flip)
- else // landed on it's side
+ else // landed on its side
animate(src, transform = matrix(prob(50)? 90 : -90, MATRIX_ROTATE), time = 3, loop = 0)
/obj/item/reagent_containers/cup/glass/waterbottle/pickup(mob/user)
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index d561d0db48792c..629e0e96937db7 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -140,7 +140,7 @@
name = "mannitol pill"
desc = "Used to treat brain damage."
icon_state = "pill17"
- list_reagents = list(/datum/reagent/medicine/mannitol = 14)
+ list_reagents = list(/datum/reagent/medicine/mannitol = 15)
rename_with_volume = TRUE
/obj/item/reagent_containers/pill/sansufentanyl
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 9fffd5ccc7c107..06537e591c976f 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -316,6 +316,10 @@
name = "unlabeled syringe"
desc = "A syringe containing some sort of unknown chemical cocktail."
+/obj/item/reagent_containers/syringe/contraband/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_CONTRABAND, INNATE_TRAIT)
+
/obj/item/reagent_containers/syringe/contraband/space_drugs
list_reagents = list(/datum/reagent/drug/space_drugs = 15)
diff --git a/code/modules/recycling/conveyor.dm b/code/modules/recycling/conveyor.dm
index c5dfdc39d3e986..21c5aa7a1a9028 100644
--- a/code/modules/recycling/conveyor.dm
+++ b/code/modules/recycling/conveyor.dm
@@ -373,8 +373,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
/obj/machinery/conveyor_switch/Destroy()
LAZYREMOVE(GLOB.conveyors_by_id[id], src)
- QDEL_NULL(wires)
- . = ..()
+ return ..()
/obj/machinery/conveyor_switch/vv_edit_var(var_name, var_value)
if (var_name == NAMEOF(src, id))
diff --git a/code/modules/religion/sparring/sparring_datum.dm b/code/modules/religion/sparring/sparring_datum.dm
index 78de2bd3a0bb04..8e01403e5a64c0 100644
--- a/code/modules/religion/sparring/sparring_datum.dm
+++ b/code/modules/religion/sparring/sparring_datum.dm
@@ -60,7 +60,6 @@
UnregisterSignal(sparring, list(
COMSIG_MOB_FIRED_GUN,
COMSIG_MOB_GRENADE_ARMED,
- COMSIG_MOB_ITEM_ATTACK,
COMSIG_MOVABLE_MOVED,
COMSIG_MOVABLE_POST_TELEPORT,
COMSIG_MOB_STATCHANGE,
diff --git a/code/modules/requests/request_manager.dm b/code/modules/requests/request_manager.dm
index 74a40304f7aed1..99a9bba1cc84f7 100644
--- a/code/modules/requests/request_manager.dm
+++ b/code/modules/requests/request_manager.dm
@@ -243,12 +243,10 @@ GLOBAL_DATUM_INIT(requests, /datum/request_manager, new)
return TRUE
/datum/request_manager/ui_data(mob/user)
- . = list(
- "requests" = list()
- )
+ var/list/data = list()
for (var/ckey in requests)
for (var/datum/request/request as anything in requests[ckey])
- var/list/data = list(
+ data["requests"] += list(list(
"id" = request.id,
"req_type" = request.req_type,
"owner" = request.owner ? "[REF(request.owner)]" : null,
@@ -258,8 +256,8 @@ GLOBAL_DATUM_INIT(requests, /datum/request_manager, new)
"additional_info" = request.additional_information,
"timestamp" = request.timestamp,
"timestamp_str" = gameTimestamp(wtime = request.timestamp)
- )
- .["requests"] += list(data)
+ ))
+ return data
#undef REQUEST_PRAYER
#undef REQUEST_CENTCOM
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index b8b11e7b44f67c..53104494c820e3 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -582,6 +582,16 @@
)
departmental_flags = DEPARTMENT_BITFLAG_SERVICE
+/datum/design/board/dehydrator
+ name = "Dehydrator Board"
+ desc = "The circuit board for a dehydrator."
+ id = "dehydrator"
+ build_path = /obj/item/circuitboard/machine/dehydrator
+ category = list(
+ RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_KITCHEN
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_SERVICE
+
/datum/design/board/vatgrower
name = "Growing Vat Board"
desc = "The circuit board for a growing vat."
@@ -660,7 +670,7 @@
category = list(
RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_MEDICAL
)
- departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE
+ departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_SECURITY | DEPARTMENT_BITFLAG_CARGO | DEPARTMENT_BITFLAG_MEDICAL
/datum/design/board/holopad
name = "AI Holopad Board"
diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm
index 6cadccdf510570..ea13bf644fc133 100644
--- a/code/modules/research/designs/mechfabricator_designs.dm
+++ b/code/modules/research/designs/mechfabricator_designs.dm
@@ -1990,6 +1990,17 @@
var/datum/mod_theme/theme = GLOB.mod_themes[initial(armor_type.theme)]
desc = "External plating for a MODsuit. [theme.desc]"
+/datum/design/mod_plating/civilian
+ name = "MOD Civilian Plating"
+ id = "mod_plating_civilian"
+ build_path = /obj/item/mod/construction/plating/civilian
+ materials = list(
+ /datum/material/iron =SHEET_MATERIAL_AMOUNT*3,
+ /datum/material/glass =SHEET_MATERIAL_AMOUNT*1.5,
+ /datum/material/plasma =HALF_SHEET_MATERIAL_AMOUNT,
+ )
+ research_icon_state = "civilian-plating"
+
/datum/design/mod_plating/engineering
name = "MOD Engineering Plating"
id = "mod_plating_engineering"
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index cbd05593a3c119..27dbbca1d179c7 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -566,6 +566,24 @@
)
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL
+/datum/design/cyberimp_herculean
+ name = "Herculean Gravitronic Spinal Implant"
+ desc = "This gravitronic spinal interface allows the user to reduce the impact of gravity on their body, effectively improving athletic performance."
+ id = "ci-herculean"
+ build_type = PROTOLATHE | AWAY_LATHE | MECHFAB
+ construction_time = 4 SECONDS
+ materials = list(
+ /datum/material/iron =SMALL_MATERIAL_AMOUNT*5,
+ /datum/material/titanium=SMALL_MATERIAL_AMOUNT*3,
+ /datum/material/gold=SMALL_MATERIAL_AMOUNT*3,
+ /datum/material/diamond =SMALL_MATERIAL_AMOUNT*5,
+ )
+ build_path = /obj/item/organ/internal/cyberimp/chest/spine
+ category = list(
+ RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_HEALTH
+ )
+ departmental_flags = DEPARTMENT_BITFLAG_MEDICAL
+
/datum/design/cyberimp_nutriment
name = "Nutriment Pump Implant"
desc = "This implant will synthesize and pump into your bloodstream a small amount of nutriment when you are starving."
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index 1360c25a23c4aa..0c28fcab2bf6e2 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -17,7 +17,7 @@
#define EFFECT_PROB_VERYHIGH 95
#define FAIL 8
-/obj/machinery/rnd/experimentor//SKYRAT EDIT - ICON OVERRIDDEN BY AESTHETICS - SEE MODULE
+/obj/machinery/rnd/experimentor
name = "\improper E.X.P.E.R.I-MENTOR"
desc = "A \"replacement\" for the destructive analyzer with a slight tendency to catastrophically fail."
icon = 'icons/obj/machines/experimentator.dmi'
@@ -96,7 +96,6 @@
/obj/item/construction/rcd,
/obj/item/grenade,
/obj/item/aicard,
- /obj/item/storage/backpack/holding,
/obj/item/slime_extract,
/obj/item/transfer_valve))
@@ -254,16 +253,16 @@
visible_message(span_notice("[exp_on] is gripped in just the right way, enhancing its focus."))
malfunction_probability_coeff_modifier++
RefreshParts() //recalculate malfunction_probability_coeff
- else if(prob(EFFECT_PROB_VERYLOW-malfunction_probability_coeff))
+ else if(prob(EFFECT_PROB_VERYLOW * (100 - malfunction_probability_coeff) * 0.01))
visible_message(span_danger("[src] malfunctions and destroys [exp_on], lashing its arms out at nearby people!"))
for(var/mob/living/m in oview(1, src))
m.apply_damage(15, BRUTE, pick(BODY_ZONE_HEAD,BODY_ZONE_CHEST,BODY_ZONE_CHEST))
investigate_log("Experimentor dealt minor brute to [m].", INVESTIGATE_EXPERIMENTOR)
ejectItem(TRUE)
- else if(prob(EFFECT_PROB_LOW-malfunction_probability_coeff))
+ else if(prob(EFFECT_PROB_LOW * (100 - malfunction_probability_coeff) * 0.01))
visible_message(span_warning("[src] malfunctions!"))
exp = SCANTYPE_OBLITERATE
- else if(prob(EFFECT_PROB_MEDIUM-malfunction_probability_coeff))
+ else if(prob(EFFECT_PROB_MEDIUM * (100 - malfunction_probability_coeff) * 0.01))
visible_message(span_danger("[src] malfunctions, throwing the [exp_on]!"))
var/mob/living/target = locate(/mob/living) in oview(7,src)
if(target)
@@ -275,23 +274,23 @@
////////////////////////////////////////////////////////////////////////////////////////////////
if(exp == SCANTYPE_IRRADIATE)
visible_message(span_danger("[src] reflects radioactive rays at [exp_on]!"))
- if(prob(EFFECT_PROB_LOW) && criticalReaction)
+ if(prob(EFFECT_PROB_VERYLOW) && criticalReaction)
visible_message(span_notice("[exp_on] has activated an unknown subroutine!"))
cloneMode = TRUE
investigate_log("Experimentor has made a clone of [exp_on]", INVESTIGATE_EXPERIMENTOR)
ejectItem()
- else if(prob(EFFECT_PROB_VERYLOW-malfunction_probability_coeff))
+ else if(prob(EFFECT_PROB_VERYLOW * (100 - malfunction_probability_coeff) * 0.01))
visible_message(span_danger("[src] malfunctions, melting [exp_on] and leaking radiation!"))
radiation_pulse(src, max_range = 6, threshold = 0.3)
ejectItem(TRUE)
- else if(prob(EFFECT_PROB_LOW-malfunction_probability_coeff))
+ else if(prob(EFFECT_PROB_LOW * (100 - malfunction_probability_coeff) * 0.01))
visible_message(span_warning("[src] malfunctions, spewing toxic waste!"))
for(var/turf/T in oview(1, src))
if(!T.density)
if(prob(EFFECT_PROB_VERYHIGH) && !(locate(/obj/effect/decal/cleanable/greenglow) in T))
var/obj/effect/decal/cleanable/reagentdecal = new/obj/effect/decal/cleanable/greenglow(T)
reagentdecal.reagents.add_reagent(/datum/reagent/uranium/radium, 7)
- else if(prob(EFFECT_PROB_MEDIUM-malfunction_probability_coeff))
+ else if(prob(EFFECT_PROB_MEDIUM * (100 - malfunction_probability_coeff) * 0.01))
var/savedName = "[exp_on]"
ejectItem(TRUE)
var/newPath = text2path(pick_weight(valid_items()))
@@ -308,7 +307,7 @@
if(prob(EFFECT_PROB_LOW) && criticalReaction)
visible_message(span_notice("[exp_on] achieves the perfect mix!"))
new /obj/item/stack/sheet/mineral/plasma(get_turf(pick(oview(1,src))))
- else if(prob(EFFECT_PROB_VERYLOW-malfunction_probability_coeff))
+ else if(prob(EFFECT_PROB_VERYLOW * (100 - malfunction_probability_coeff) * 0.01))
visible_message(span_danger("[src] destroys [exp_on], leaking dangerous gas!"))
chosenchem = pick(/datum/reagent/carbon,/datum/reagent/uranium/radium,/datum/reagent/toxin,/datum/reagent/consumable/condensedcapsaicin,/datum/reagent/drug/mushroomhallucinogen,/datum/reagent/drug/space_drugs,/datum/reagent/consumable/ethanol,/datum/reagent/consumable/ethanol/beepsky_smash)
var/datum/reagents/tmp_holder = new/datum/reagents(50)
@@ -321,7 +320,7 @@
smoke.start()
qdel(tmp_holder)
ejectItem(TRUE)
- else if(prob(EFFECT_PROB_VERYLOW-malfunction_probability_coeff))
+ else if(prob(EFFECT_PROB_VERYLOW * (100 - malfunction_probability_coeff) * 0.01))
visible_message(span_danger("[src]'s chemical chamber has sprung a leak!"))
chosenchem = pick(/datum/reagent/mutationtoxin/classic,/datum/reagent/cyborg_mutation_nanomachines,/datum/reagent/toxin/acid)
var/datum/reagents/tmp_holder = new/datum/reagents(50)
@@ -335,10 +334,10 @@
ejectItem(TRUE)
warn_admins(usr, "[chosenchem] smoke")
investigate_log("Experimentor has released [chosenchem] smoke!", INVESTIGATE_EXPERIMENTOR)
- else if(prob(EFFECT_PROB_LOW-malfunction_probability_coeff))
+ else if(prob(EFFECT_PROB_LOW * (100 - malfunction_probability_coeff) * 0.01))
visible_message(span_warning("[src] malfunctions, spewing harmless gas."))
throwSmoke(loc)
- else if(prob(EFFECT_PROB_MEDIUM-malfunction_probability_coeff))
+ else if(prob(EFFECT_PROB_MEDIUM * (100 - malfunction_probability_coeff) * 0.01))
visible_message(span_warning("[src] melts [exp_on], ionizing the air around it!"))
empulse(loc, 4, 6)
investigate_log("Experimentor has generated an Electromagnetic Pulse.", INVESTIGATE_EXPERIMENTOR)
@@ -356,7 +355,7 @@
C.name = "Cup of Suspicious Liquid"
C.desc = "It has a large hazard symbol printed on the side in fading ink."
investigate_log("Experimentor has made a cup of [chosenchem] coffee.", INVESTIGATE_EXPERIMENTOR)
- else if(prob(EFFECT_PROB_VERYLOW-malfunction_probability_coeff))
+ else if(prob(EFFECT_PROB_VERYLOW * (100 - malfunction_probability_coeff) * 0.01))
var/turf/start = get_turf(src)
var/mob/M = locate(/mob/living) in view(src, 3)
var/turf/MT = get_turf(M)
@@ -366,12 +365,12 @@
var/obj/projectile/magic/fireball/FB = new /obj/projectile/magic/fireball(start)
FB.preparePixelProjectile(MT, start)
FB.fire()
- else if(prob(EFFECT_PROB_LOW-malfunction_probability_coeff))
+ else if(prob(EFFECT_PROB_LOW * (100 - malfunction_probability_coeff) * 0.01))
visible_message(span_danger("[src] malfunctions, melting [exp_on] and releasing a burst of flame!"))
explosion(src, devastation_range = -1, flame_range = 2, adminlog = FALSE)
investigate_log("Experimentor started a fire.", INVESTIGATE_EXPERIMENTOR)
ejectItem(TRUE)
- else if(prob(EFFECT_PROB_MEDIUM-malfunction_probability_coeff))
+ else if(prob(EFFECT_PROB_MEDIUM * (100 - malfunction_probability_coeff) * 0.01))
visible_message(span_warning("[src] malfunctions, melting [exp_on] and leaking hot air!"))
var/datum/gas_mixture/env = loc.return_air()
if(env)
@@ -380,7 +379,7 @@
air_update_turf(FALSE, FALSE)
investigate_log("Experimentor has released hot air.", INVESTIGATE_EXPERIMENTOR)
ejectItem(TRUE)
- else if(prob(EFFECT_PROB_MEDIUM-malfunction_probability_coeff))
+ else if(prob(EFFECT_PROB_MEDIUM * (100 - malfunction_probability_coeff) * 0.01))
visible_message(span_warning("[src] malfunctions, activating its emergency coolant systems!"))
throwSmoke(loc)
for(var/mob/living/m in oview(1, src))
@@ -400,7 +399,7 @@
C.name = "Cup of Suspicious Liquid"
C.desc = "It has a large hazard symbol printed on the side in fading ink."
investigate_log("Experimentor has made a cup of [chosenchem] coffee.", INVESTIGATE_EXPERIMENTOR)
- else if(prob(EFFECT_PROB_VERYLOW-malfunction_probability_coeff))
+ else if(prob(EFFECT_PROB_VERYLOW * (100 - malfunction_probability_coeff) * 0.01))
visible_message(span_danger("[src] malfunctions, shattering [exp_on] and releasing a dangerous cloud of coolant!"))
var/datum/reagents/tmp_holder = new/datum/reagents(50)
tmp_holder.my_atom = src
@@ -412,7 +411,7 @@
smoke.start()
qdel(tmp_holder)
ejectItem(TRUE)
- else if(prob(EFFECT_PROB_LOW-malfunction_probability_coeff))
+ else if(prob(EFFECT_PROB_LOW * (100 - malfunction_probability_coeff) * 0.01))
visible_message(span_warning("[src] malfunctions, shattering [exp_on] and leaking cold air!"))
var/datum/gas_mixture/env = loc.return_air()
if(env)
@@ -421,7 +420,7 @@
air_update_turf(FALSE, FALSE)
investigate_log("Experimentor has released cold air.", INVESTIGATE_EXPERIMENTOR)
ejectItem(TRUE)
- else if(prob(EFFECT_PROB_MEDIUM-malfunction_probability_coeff))
+ else if(prob(EFFECT_PROB_MEDIUM * (100 - malfunction_probability_coeff) * 0.01))
visible_message(span_warning("[src] malfunctions, releasing a flurry of chilly air as [exp_on] pops out!"))
var/datum/effect_system/fluid_spread/smoke/smoke = new
smoke.set_up(0, holder = src, location = loc)
@@ -433,14 +432,14 @@
if(prob(EFFECT_PROB_LOW) && criticalReaction)
visible_message(span_warning("[src]'s crushing mechanism slowly and smoothly descends, flattening the [exp_on]!"))
new /obj/item/stack/sheet/plasteel(get_turf(pick(oview(1,src))))
- else if(prob(EFFECT_PROB_VERYLOW-malfunction_probability_coeff))
+ else if(prob(EFFECT_PROB_VERYLOW * (100 - malfunction_probability_coeff) * 0.01))
visible_message(span_danger("[src]'s crusher goes way too many levels too high, crushing right through space-time!"))
playsound(src, 'sound/effects/supermatter.ogg', 50, TRUE, -3)
investigate_log("Experimentor has triggered the 'throw things' reaction.", INVESTIGATE_EXPERIMENTOR)
for(var/atom/movable/AM in oview(7,src))
if(!AM.anchored)
AM.throw_at(src,10,1)
- else if(prob(EFFECT_PROB_LOW-malfunction_probability_coeff))
+ else if(prob(EFFECT_PROB_LOW * (100 - malfunction_probability_coeff) * 0.01))
visible_message(span_danger("[src]'s crusher goes one level too high, crushing right into space-time!"))
playsound(src, 'sound/effects/supermatter.ogg', 50, TRUE, -3)
investigate_log("Experimentor has triggered the 'minor throw things' reaction.", INVESTIGATE_EXPERIMENTOR)
@@ -467,7 +466,7 @@
ejectItem()
//Global reactions
- if(prob(EFFECT_PROB_VERYLOW-malfunction_probability_coeff) && loaded_item)
+ if(prob(EFFECT_PROB_VERYLOW * (100 - malfunction_probability_coeff) * 0.01) && loaded_item)
var/globalMalf = rand(1,100)
if(globalMalf < 15)
visible_message(span_warning("[src]'s onboard detection system has malfunctioned!"))
@@ -575,11 +574,19 @@
COOLDOWN_DECLARE(cooldown)
//What visual theme this artefact has. Current possible choices: "prototype", "necrotech"
var/artifact_theme = "prototype"
+ var/datum/effect_system/spark_spread/sparks
/obj/item/relic/Initialize(mapload)
. = ..()
+ sparks = new()
+ sparks.set_up(5, 1, src)
+ sparks.attach(src)
random_themed_appearance()
+/obj/item/relic/Destroy(force)
+ QDEL_NULL(sparks)
+ . = ..()
+
/obj/item/relic/proc/random_themed_appearance()
var/themed_name_prefix
var/themed_name_suffix
@@ -617,6 +624,12 @@
PROC_REF(uncontrolled_teleport),
PROC_REF(heat_and_explode),
PROC_REF(rapid_self_dupe),
+ PROC_REF(drink_dispenser),
+ PROC_REF(tummy_ache),
+ PROC_REF(charger),
+ PROC_REF(hugger),
+ PROC_REF(dimensional_shift),
+ PROC_REF(disguiser),
)
/obj/item/relic/attack_self(mob/user)
@@ -715,12 +728,176 @@
/obj/item/relic/proc/do_the_teleport(mob/user)
var/turf/userturf = get_turf(user)
- if(loc == user && !is_centcom_level(userturf.z)) //Because Nuke Ops bringing this back on their shuttle, then looting the ERT area is 2fun4you!
- visible_message(span_notice("[src] twists and bends, relocating itself!"))
- throw_smoke(userturf)
- do_teleport(user, userturf, 8, asoundin = 'sound/effects/phasein.ogg', channel = TELEPORT_CHANNEL_BLUESPACE)
- throw_smoke(get_turf(user))
- warn_admins(user, "Teleport", 0)
+ //Because Nuke Ops bringing this back on their shuttle, then looting the ERT area is 2fun4you!
+ if(is_centcom_level(userturf.z))
+ return
+ var/to_teleport = ismovable(loc) ? loc : src
+ visible_message(span_notice("[to_teleport] twists and bends, relocating itself!"))
+ throw_smoke(get_turf(to_teleport))
+ do_teleport(to_teleport, userturf, 8, asoundin = 'sound/effects/phasein.ogg', channel = TELEPORT_CHANNEL_BLUESPACE)
+ throw_smoke(get_turf(to_teleport))
+ warn_admins(user, "Teleport", 0)
+
+// Creates a glass and fills it up with a drink.
+/obj/item/relic/proc/drink_dispenser(mob/user)
+ var/obj/item/reagent_containers/cup/glass/drinkingglass/freebie = new(get_step_rand(user))
+ playsound(freebie, SFX_SPARKS, rand(25,50), TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ sparks.start()
+ addtimer(CALLBACK(src, PROC_REF(dispense_drink), freebie), 0.5 SECONDS)
+
+/obj/item/relic/proc/dispense_drink(obj/item/reagent_containers/cup/glass/glasser)
+ playsound(glasser, 'sound/effects/phasein.ogg', rand(25,50), TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ glasser.reagents.add_reagent(get_random_drink_id(), rand(glasser.volume * 0.3, glasser.volume))
+ throw_smoke(get_turf(glasser))
+
+// Scrambles your organs. 33% chance to delete after use.
+/obj/item/relic/proc/tummy_ache(mob/user)
+ new /obj/effect/temp_visual/circle_wave/bioscrambler/light(get_turf(src))
+ to_chat(user, span_notice("Your stomach starts growling..."))
+ addtimer(CALLBACK(src, PROC_REF(scrambliticus), user), rand(1 SECONDS, 3 SECONDS)) // throw it away!
+
+/obj/item/relic/proc/scrambliticus(mob/user)
+ new /obj/effect/temp_visual/circle_wave/bioscrambler/light(get_turf(src))
+ playsound(src, 'sound/magic/cosmic_energy.ogg', vol = 50, vary = TRUE)
+ for(var/mob/living/carbon/nearby in range(2, get_turf(src))) //needs get_turf() to work
+ nearby.bioscramble(name)
+ playsound(nearby, SFX_SPARKS, rand(25,50), TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ throw_smoke(get_turf(nearby))
+ to_chat(nearby, span_notice("You feel weird."))
+ if(prob(33))
+ qdel(src)
+
+// Charges an item or two in your inventory. Also yourself.
+/obj/item/relic/proc/charger(mob/living/user)
+ to_chat(user, span_danger("You're recharged!"))
+ var/stunner = 1.25 SECONDS
+ if(iscarbon(user))
+ var/mob/living/carbon/carboner = user
+ carboner.electrocute_act(15, src, flags = SHOCK_NOGLOVES, stun_duration = stunner)
+ else
+ user.electrocute_act(15, src, flags = SHOCK_NOGLOVES)
+ playsound(user, SFX_SPARKS, rand(25,50), TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+
+ var/list/chargeable_batteries = list()
+ for(var/obj/item/stock_parts/power_store/C in user.get_all_contents())
+ if(C.charge < (C.maxcharge * 0.95)) // otherwise the PDA always gets recharged
+ chargeable_batteries |= C
+
+ lightning_fx(user, stunner)
+ var/recharges = rand(1, 2)
+ if(!length(chargeable_batteries))
+ to_chat(user, span_notice("You have a strange feeling for a moment, but then it passes."))
+ return
+ for(var/obj/item/stock_parts/power_store/to_charge as anything in chargeable_batteries)
+ if(!recharges)
+ return
+ recharges--
+ to_charge = pick(chargeable_batteries)
+ to_charge.charge = to_charge.maxcharge
+ // The device powered by the cell is assumed to be its location.
+ var/obj/device = to_charge.loc
+ // If it's not an object, or the loc's assigned power_store isn't the cell, undo.
+ if(!istype(device) || (device.get_cell() != to_charge))
+ device = to_charge
+ device.update_appearance(UPDATE_ICON|UPDATE_OVERLAYS)
+ to_chat(user, span_notice("[device] feels energized!"))
+ lightning_fx(device, 0.8 SECONDS)
+
+/obj/item/relic/proc/lightning_fx(atom/shocker, time)
+ var/lightning = mutable_appearance('icons/effects/effects.dmi', "electricity3", layer = ABOVE_MOB_LAYER)
+ shocker.add_overlay(lightning)
+ addtimer(CALLBACK(src, PROC_REF(cut_the_overlay), shocker, lightning), time)
+
+/obj/item/relic/proc/cut_the_overlay(atom/shocker, lightning)
+ shocker.cut_overlay(lightning)
+
+// Hugs/shakes everyone in range!
+/obj/item/relic/proc/hugger(mob/user)
+ var/list/mob/living/carbon/huggeds = oviewers(3, user)
+ for(var/mob/living/carbon/victim in huggeds)
+ victim.help_shake_act(user, force_friendly = TRUE)
+ new /obj/effect/temp_visual/heart(victim.loc)
+ if(length(huggeds))
+ to_chat(user, span_nicegreen("You feel friendly!"))
+ else
+ to_chat(user, pick(span_notice("You hug yourself, for some reason."), span_notice("You have a strange feeling for a moment, but then it passes.")))
+
+// Converts a 3x3 area into a random dimensional theme.
+/obj/item/relic/proc/dimensional_shift(mob/user)
+ var/new_theme_path = pick(subtypesof(/datum/dimension_theme))
+ var/datum/dimension_theme/shifter = SSmaterials.dimensional_themes[new_theme_path]
+ for(var/turf/shiftee in range(1, user))
+ shifter.apply_theme(shiftee, show_effect = TRUE)
+ qdel(shifter)
+ // prevent *total* spam conversion
+ min_cooldown += 2 SECONDS
+ max_cooldown += 2 SECONDS
+
+// Replaces your clothing with a random costume, and your ID with a cardboard one.
+// TODO: make them part of the same kit (lobster hat, lobster suit)
+/obj/item/relic/proc/disguiser(mob/user)
+ if(!iscarbon(user))
+ to_chat(user, span_notice("You have a strange feeling for a moment, but then it passes."))
+ return
+
+ if(prob(80)) // >:)
+ ADD_TRAIT(user, TRAIT_NO_JUMPSUIT, REF(src)) // prevent dropping pockets & belt
+
+ // magic trick!
+ playsound(user, SFX_SPARKS, rand(25,50), TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ throw_smoke(user)
+
+ // carbons always get a hat at least
+ var/mob/living/carbon/carbonius = user
+ //hat
+ var/obj/item/clothing/head/costume/disguise_hat = roll_costume(ITEM_SLOT_HEAD, HIDEMASK)
+ carbonius.dropItemToGround(carbonius.head)
+ carbonius.equip_to_slot_or_del(disguise_hat, ITEM_SLOT_HEAD)
+ if(!ishuman(carbonius))
+ to_chat(user, span_notice("You have a peculiar feeling for a moment, but then it passes."))
+ return
+
+ var/mob/living/carbon/human/humerus = carbonius
+ // uniform
+ var/obj/item/clothing/under/costume/disguise_uniform = roll_costume(ITEM_SLOT_ICLOTHING)
+ humerus.dropItemToGround(humerus.w_uniform)
+ humerus.equip_to_slot_or_del(disguise_uniform, ITEM_SLOT_ICLOTHING)
+ // suit
+ var/obj/item/clothing/suit/costume/disguise_suit = roll_costume(ITEM_SLOT_OCLOTHING)
+ humerus.dropItemToGround(humerus.wear_suit)
+ humerus.equip_to_slot_or_del(disguise_suit, ITEM_SLOT_OCLOTHING)
+ // id
+ var/obj/item/card/cardboard/card_id = new()
+ humerus.dropItemToGround(humerus.wear_id)
+ humerus.equip_to_slot_or_del(card_id, ITEM_SLOT_ID)
+
+ // edit the card to a random job & name
+ if(!card_id)
+ return
+ card_id.scribbled_name = "[pick(GLOB.first_names)] [pick(GLOB.last_names)]"
+ card_id.details_colors = list(ready_random_color(), ready_random_color(), ready_random_color())
+ card_id.item_flags |= DROPDEL
+
+ var/datum/id_trim/random_trim = pick(subtypesof(/datum/id_trim)) // this can pick silly things
+ random_trim = new random_trim()
+ if(random_trim.trim_state && random_trim.assignment)
+ card_id.scribbled_trim = replacetext(random_trim.trim_state, "trim_", "cardboard_")
+ card_id.scribbled_assignment = random_trim.assignment
+ card_id.update_appearance()
+ REMOVE_TRAIT(user, TRAIT_NO_JUMPSUIT, REF(src))
+
+/obj/item/relic/proc/roll_costume(slot, flagcheck)
+ var/list/candidates = list()
+ for(var/obj/item/costume as anything in GLOB.all_autodrobe_items)
+ if(flagcheck && !(initial(costume.flags_inv) & flagcheck))
+ continue
+ if(slot && !(initial(costume.slot_flags) & slot))
+ continue
+ candidates |= costume
+ var/obj/item/new_costume = pick(candidates)
+ new_costume = new new_costume()
+ new_costume.item_flags |= DROPDEL
+ return new_costume
//Admin Warning proc for relics
/obj/item/relic/proc/warn_admins(mob/user, relic_type, priority = 1)
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index cc8e842f18e9a4..91cf89582d369b 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -96,6 +96,20 @@ Nothing else in the console has ID requirements.
stored_research = tool.buffer
return TRUE
+/obj/machinery/computer/rdconsole/proc/enqueue_node(id, mob/user)
+ if(!stored_research || !stored_research.available_nodes[id] || stored_research.researched_nodes[id])
+ say("Node enqueue failed: Either no techweb is found, node is already researched or is not available!")
+ return FALSE
+ stored_research.enqueue_node(id, user)
+ return TRUE
+
+/obj/machinery/computer/rdconsole/proc/dequeue_node(id, mob/user)
+ if(!stored_research || !stored_research.available_nodes[id] || stored_research.researched_nodes[id])
+ say("Node dequeue failed: Either no techweb is found, node is already researched or is not available!")
+ return FALSE
+ stored_research.dequeue_node(id, user)
+ return TRUE
+
/obj/machinery/computer/rdconsole/proc/research_node(id, mob/user)
if(!stored_research || !stored_research.available_nodes[id] || stored_research.researched_nodes[id])
say("Node unlock failed: Either no techweb is found, node is already researched or is not available!")
@@ -171,6 +185,7 @@ Nothing else in the console has ID requirements.
return data
data += list(
"nodes" = list(),
+ "queue_nodes" = stored_research.research_queue_nodes,
"experiments" = list(),
"researched_designs" = stored_research.researched_designs,
"points" = stored_research.research_points,
@@ -194,6 +209,10 @@ Nothing else in the console has ID requirements.
// Serialize all nodes to display
for(var/v in stored_research.tiers)
var/datum/techweb_node/n = SSresearch.techweb_node_by_id(v)
+ var/enqueued_by_user = FALSE
+
+ if((v in stored_research.research_queue_nodes) && stored_research.research_queue_nodes[v] == user)
+ enqueued_by_user = TRUE
// Ensure node is supposed to be visible
if (stored_research.hidden_nodes[v])
@@ -201,8 +220,11 @@ Nothing else in the console has ID requirements.
data["nodes"] += list(list(
"id" = n.id,
+ "is_free" = n.is_free(stored_research),
"can_unlock" = stored_research.can_unlock_node(n),
+ "have_experiments_done" = stored_research.have_experiments_for_node(n),
"tier" = stored_research.tiers[n.id],
+ "enqueued_by_user" = enqueued_by_user
))
// Get experiments and serialize them
@@ -322,6 +344,12 @@ Nothing else in the console has ID requirements.
if ("researchNode")
research_node(params["node_id"], usr)
return TRUE
+ if ("enqueueNode")
+ enqueue_node(params["node_id"], usr)
+ return TRUE
+ if ("dequeueNode")
+ dequeue_node(params["node_id"], usr)
+ return TRUE
if ("ejectDisk")
eject_disk(params["type"])
return TRUE
diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm
index 0cfca236d24c3c..665dae0e243c95 100644
--- a/code/modules/research/rdmachines.dm
+++ b/code/modules/research/rdmachines.dm
@@ -35,7 +35,6 @@
if(stored_research)
log_research("[src] disconnected from techweb [stored_research] (destroyed).")
stored_research = null
- QDEL_NULL(wires)
return ..()
/obj/machinery/rnd/examine(mob/user)
diff --git a/code/modules/research/techweb/_techweb.dm b/code/modules/research/techweb/_techweb.dm
index 3c920f6b9a6fee..1a5a387551178e 100644
--- a/code/modules/research/techweb/_techweb.dm
+++ b/code/modules/research/techweb/_techweb.dm
@@ -70,6 +70,12 @@
* Filled with nulls on init, populated only on publication.
*/
var/list/published_papers
+ /**
+ * Assoc list of nodes queued for automatic research when there are enough points available
+ * research_queue_nodes[node_id] = user_enqueued
+ */
+ var/list/research_queue_nodes = list()
+
/datum/techweb/New()
SSresearch.techwebs += src
@@ -325,6 +331,40 @@
/datum/techweb/proc/printout_points()
return techweb_point_display_generic(research_points)
+/datum/techweb/proc/enqueue_node(id, mob/user)
+ var/queue_first = FALSE
+ if(istype(user, /mob/living/carbon/human))
+ var/mob/living/carbon/human/human_user = user
+ var/list/access = human_user.wear_id?.GetAccess()
+ if(ACCESS_RD in access)
+ queue_first = TRUE
+
+ if(id in research_queue_nodes)
+ if(queue_first)
+ research_queue_nodes.Remove(id) // Remove to be able to place first
+ else
+ return FALSE
+
+ for(var/node_id in research_queue_nodes)
+ if(research_queue_nodes[node_id] == user)
+ research_queue_nodes.Remove(node_id)
+
+ if (queue_first)
+ research_queue_nodes.Insert(1, id)
+ research_queue_nodes[id] = user
+
+ return TRUE
+
+/datum/techweb/proc/dequeue_node(id, mob/user)
+ if(!(id in research_queue_nodes))
+ return FALSE
+ if(research_queue_nodes[id] != user)
+ return FALSE
+
+ research_queue_nodes.Remove(id)
+
+ return TRUE
+
/datum/techweb/proc/research_node_id(id, force, auto_update_points, get_that_dosh_id)
return research_node(SSresearch.techweb_node_by_id(id), force, auto_update_points, get_that_dosh_id)
@@ -377,6 +417,10 @@
if (MC_RUNNING())
log_research(log_message)
+ // Dequeue
+ if(node.id in research_queue_nodes)
+ research_queue_nodes.Remove(node.id)
+
return TRUE
/datum/techweb/proc/unresearch_node_id(id)
diff --git a/code/modules/research/techweb/_techweb_node.dm b/code/modules/research/techweb/_techweb_node.dm
index 7714946a4d2902..9b26ca860d88d5 100644
--- a/code/modules/research/techweb/_techweb_node.dm
+++ b/code/modules/research/techweb/_techweb_node.dm
@@ -95,6 +95,17 @@
return actual_costs
+/datum/techweb_node/proc/is_free(datum/techweb/host)
+ var/list/costs = get_price(host)
+ var/total_points = 0
+
+ for(var/point_type in costs)
+ total_points += costs[point_type]
+
+ if(total_points == 0)
+ return TRUE
+ return FALSE
+
/datum/techweb_node/proc/price_display(datum/techweb/TN)
return techweb_point_display_generic(get_price(TN))
diff --git a/code/modules/research/techweb/nodes/cyborg_nodes.dm b/code/modules/research/techweb/nodes/cyborg_nodes.dm
index 447ee2dc7f3b95..5e0ad2f64e0e91 100644
--- a/code/modules/research/techweb/nodes/cyborg_nodes.dm
+++ b/code/modules/research/techweb/nodes/cyborg_nodes.dm
@@ -90,7 +90,7 @@
/datum/techweb_node/borg_utility
id = TECHWEB_NODE_BORG_UTILITY
- display_name = "Untility Cyborg Upgrades"
+ display_name = "Utility Cyborg Upgrades"
description = "Let them wipe our floors for us."
prereq_ids = list(TECHWEB_NODE_BORG_SERVICES, TECHWEB_NODE_SANITATION)
design_ids = list(
@@ -152,6 +152,7 @@
"ci-breather",
"ci-nutriment",
"ci-thrusters",
+ "ci-herculean",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
diff --git a/code/modules/research/techweb/nodes/engi_nodes.dm b/code/modules/research/techweb/nodes/engi_nodes.dm
index 626dd6981d0cee..0fe1b7bd75f336 100644
--- a/code/modules/research/techweb/nodes/engi_nodes.dm
+++ b/code/modules/research/techweb/nodes/engi_nodes.dm
@@ -104,7 +104,6 @@
"s_filter",
"s_transmitter",
"s_treatment",
- "gigabeacon",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_5_POINTS)
diff --git a/code/modules/research/techweb/nodes/mech_nodes.dm b/code/modules/research/techweb/nodes/mech_nodes.dm
index 6b7a9803ae495f..d6b7171d55b372 100644
--- a/code/modules/research/techweb/nodes/mech_nodes.dm
+++ b/code/modules/research/techweb/nodes/mech_nodes.dm
@@ -1,8 +1,8 @@
/datum/techweb_node/mech_assembly
id = TECHWEB_NODE_MECH_ASSEMBLY
starting_node = TRUE
- display_name = "Mech Assembly"
- description = "Development of mech designed to contend with artificial gravity while transporting cargo."
+ display_name = "Exosuit Assembly"
+ description = "Development of mechanical exosuits designed to contend with artificial gravity while transporting cargo."
prereq_ids = list(TECHWEB_NODE_ROBOTICS)
design_ids = list(
"mechapower",
@@ -21,7 +21,7 @@
/datum/techweb_node/mech_equipment
id = TECHWEB_NODE_MECH_EQUIPMENT
display_name = "Expedition Equipment"
- description = "Specialized mech gear tailored for navigating space and celestial bodies, ensuring durability and functionality in the harshest conditions."
+ description = "Specialized exosuit gear tailored for navigating space and celestial bodies, ensuring durability and functionality in the harshest conditions."
prereq_ids = list(TECHWEB_NODE_MECH_ASSEMBLY)
design_ids = list(
"mechacontrol",
@@ -63,7 +63,7 @@
/datum/techweb_node/mech_medical
id = TECHWEB_NODE_MECH_MEDICAL
- display_name = "Medical Mech"
+ display_name = "Medical Exosuit"
description = "Advanced robotic unit equipped with syringe guns and healing beams, revolutionizing medical assistance in hazardous environments."
prereq_ids = list(TECHWEB_NODE_MECH_ASSEMBLY, TECHWEB_NODE_CHEM_SYNTHESIS)
design_ids = list(
@@ -83,8 +83,8 @@
/datum/techweb_node/mech_mining
id = TECHWEB_NODE_MECH_MINING
- display_name = "Mining Mech"
- description = "Robust mech engineered to withstand lava and storms for continuous off-station mining operations."
+ display_name = "Mining Exosuit"
+ description = "Robust exosuit engineered to withstand lava and storms for continuous off-station mining operations."
prereq_ids = list(TECHWEB_NODE_MECH_EQUIPMENT, TECHWEB_NODE_MINING)
design_ids = list(
"clarke_chassis",
@@ -99,8 +99,8 @@
/datum/techweb_node/mech_combat
id = TECHWEB_NODE_MECH_COMBAT
- display_name = "Combat Mechs"
- description = "Modular armor upgrades and specialized equipment for security mechs."
+ display_name = "Combat Exosuits"
+ description = "Modular armor upgrades and specialized equipment for security exosuits."
prereq_ids = list(TECHWEB_NODE_MECH_EQUIPMENT)
design_ids = list(
"mech_ccw_armor",
@@ -115,8 +115,8 @@
/datum/techweb_node/mech_assault
id = TECHWEB_NODE_MECH_ASSAULT
- display_name = "Assault Mech"
- description = "Heavy battle mech boasting robust armor but sacrificing speed for enhanced durability."
+ display_name = "Assault Exosuits"
+ description = "Heavy battle exosuits boasting robust armor but sacrificing speed for enhanced durability."
prereq_ids = list(TECHWEB_NODE_MECH_COMBAT)
design_ids = list(
"durand_armor",
@@ -135,8 +135,8 @@
/datum/techweb_node/mech_light
id = TECHWEB_NODE_MECH_LIGHT
- display_name = "Light Combat Mech"
- description = "Agile combat mech equipped with overclocking capabilities for temporary speed boosts, prioritizing speed over durability on the battlefield."
+ display_name = "Light Combat Exosuits"
+ description = "Agile combat exosuits equipped with overclocking capabilities for temporary speed boosts, prioritizing speed over durability on the battlefield."
prereq_ids = list(TECHWEB_NODE_MECH_COMBAT)
design_ids = list(
"gygax_armor",
@@ -155,7 +155,7 @@
/datum/techweb_node/mech_heavy
id = TECHWEB_NODE_MECH_HEAVY
- display_name = "Heavy Mech"
+ display_name = "Heavy Exosuits"
description = "Advanced heavy mechanized unit with dual pilot capability, designed for robust battlefield performance and increased tactical versatility."
prereq_ids = list(TECHWEB_NODE_MECH_ASSAULT)
design_ids = list(
@@ -175,8 +175,8 @@
/datum/techweb_node/mech_infiltrator
id = TECHWEB_NODE_MECH_INFILTRATOR
- display_name = "Infiltration Mech"
- description = "Advanced mech with phasing capabilities, allowing it to move through walls and obstacles, ideal for covert and special operations."
+ display_name = "Infiltration Exosuits"
+ description = "Advanced exosuit with phasing capabilities, allowing it to move through walls and obstacles, ideal for covert and special operations."
prereq_ids = list(TECHWEB_NODE_MECH_LIGHT, TECHWEB_NODE_ANOMALY_RESEARCH)
design_ids = list(
"phazon_armor",
@@ -211,8 +211,8 @@
/datum/techweb_node/mech_energy_guns
id = TECHWEB_NODE_MECH_ENERGY_GUNS
- display_name = "Mech Energy Guns"
- description = "Scaled-up versions of electric weapons optimized for mech deployment."
+ display_name = "Exosuit Energy Guns"
+ description = "Scaled-up versions of electric weapons optimized for exosuit deployment."
prereq_ids = list(TECHWEB_NODE_MECH_COMBAT, TECHWEB_NODE_ELECTRIC_WEAPONS)
design_ids = list(
"mech_laser",
@@ -225,7 +225,7 @@
/datum/techweb_node/mech_firearms
id = TECHWEB_NODE_MECH_FIREARMS
- display_name = "Mech Firearms"
+ display_name = "Exosuit Firearms"
description = "Mounted ballistic weaponry, enhancing combat capabilities for mechanized units."
prereq_ids = list(TECHWEB_NODE_MECH_ENERGY_GUNS, TECHWEB_NODE_EXOTIC_AMMO)
design_ids = list(
@@ -240,7 +240,7 @@
/datum/techweb_node/mech_heavy_arms
id = TECHWEB_NODE_MECH_HEAVY_ARMS
- display_name = "Heavy Mech Firearms"
+ display_name = "Heavy Exosuit Firearms"
description = "High-impact weaponry integrated into mechs, optimized for maximum firepower."
prereq_ids = list(TECHWEB_NODE_MECH_HEAVY, TECHWEB_NODE_EXOTIC_AMMO)
design_ids = list(
@@ -255,7 +255,7 @@
/datum/techweb_node/mech_equip_bluespace
id = TECHWEB_NODE_BLUESPACE
- display_name = "Bluespace Mech Equipment"
+ display_name = "Bluespace Exosuit Equipment"
description = "An array of equipment empowered by bluespace, providing unmatched mobility and utility."
prereq_ids = list(TECHWEB_NODE_MECH_INFILTRATOR, TECHWEB_NODE_BLUESPACE_TRAVEL)
design_ids = list(
diff --git a/code/modules/research/techweb/nodes/medbay_nodes.dm b/code/modules/research/techweb/nodes/medbay_nodes.dm
index 7d6db08f584e7a..f5b122ccd287d4 100644
--- a/code/modules/research/techweb/nodes/medbay_nodes.dm
+++ b/code/modules/research/techweb/nodes/medbay_nodes.dm
@@ -28,6 +28,7 @@
"syringe",
"dropper",
"pillbottle",
+ "xlarge_beaker",
)
experiments_to_unlock = list(
/datum/experiment/autopsy/human,
@@ -43,7 +44,6 @@
description = "Synthesizing complex chemicals from electricity and thin air... Don't ask how..."
prereq_ids = list(TECHWEB_NODE_MEDBAY_EQUIP)
design_ids = list(
- "xlarge_beaker",
"med_spray_bottle",
"medigel",
"medipen_refiller",
@@ -53,29 +53,19 @@
"portable_chem_mixer",
"chem_heater",
"w-recycler",
- )
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS)
-
-/datum/techweb_node/plumbing
- id = TECHWEB_NODE_PLUMBING
- display_name = "Plumbing"
- description = "Essential infrastructure for building chemical factories. To scale up the production of happy pills to an industrial level."
- prereq_ids = list(TECHWEB_NODE_CHEM_SYNTHESIS)
- design_ids = list(
+ "meta_beaker",
"plumbing_rcd",
"plumbing_rcd_service",
"plunger",
"fluid_ducts",
- "meta_beaker",
- "piercesyringe",
)
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
+ research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_1_POINTS)
/datum/techweb_node/medbay_equip_adv
id = TECHWEB_NODE_MEDBAY_EQUIP_ADV
display_name = "Advanced Medbay Equipment"
description = "State-of-the-art medical gear for keeping the crew in one piece — mostly."
- prereq_ids = list(TECHWEB_NODE_PLUMBING)
+ prereq_ids = list(TECHWEB_NODE_CHEM_SYNTHESIS)
design_ids = list(
"smoke_machine",
"chem_mass_spec",
@@ -85,6 +75,7 @@
"defibrillator_compact",
"defibmount",
"medicalbed_emergency",
+ "piercesyringe",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
required_experiments = list(/datum/experiment/scanning/reagent/haloperidol)
diff --git a/code/modules/research/techweb/nodes/modsuit_nodes.dm b/code/modules/research/techweb/nodes/modsuit_nodes.dm
index d4e30e9cd5d8f0..955389f61aebac 100644
--- a/code/modules/research/techweb/nodes/modsuit_nodes.dm
+++ b/code/modules/research/techweb/nodes/modsuit_nodes.dm
@@ -1,7 +1,7 @@
/datum/techweb_node/mod_suit
id = TECHWEB_NODE_MOD_SUIT
starting_node = TRUE
- display_name = "Modular Exosuit"
+ display_name = "Modular Suit"
description = "Specialized back mounted power suits with various different modules."
prereq_ids = list(TECHWEB_NODE_ROBOTICS)
design_ids = list(
@@ -12,6 +12,7 @@
"mod_gauntlets",
"mod_boots",
"mod_plating_standard",
+ "mod_plating_civilian",
"mod_paint_kit",
"mod_storage",
"mod_plasma",
@@ -52,7 +53,7 @@
/datum/techweb_node/mod_medical
id = TECHWEB_NODE_MOD_MEDICAL
display_name = "Medical Modular Suit"
- description = "Medical exosuits for quick rescue purposes."
+ description = "Medical MODsuits for quick rescue purposes."
prereq_ids = list(TECHWEB_NODE_MOD_SUIT, TECHWEB_NODE_CHEM_SYNTHESIS)
design_ids = list(
"mod_plating_medical",
@@ -98,7 +99,7 @@
/datum/techweb_node/mod_medical_adv
id = TECHWEB_NODE_MOD_MEDICAL_ADV
display_name = "Field Surgery Modules"
- description = "Medical exosuit equipment designed for conducting surgical operations in field conditions."
+ description = "Medical MODsuit equipment designed for conducting surgical operations in field conditions."
prereq_ids = list(TECHWEB_NODE_MOD_MEDICAL, TECHWEB_NODE_SURGERY_ADV)
design_ids = list(
"mod_defib",
@@ -130,7 +131,7 @@
/datum/techweb_node/mod_anomaly
id = TECHWEB_NODE_MOD_ANOMALY
display_name = "Anomalock Modular Suit"
- description = "Modules for exosuits that require anomaly cores to function."
+ description = "Modules for MODsuits that require anomaly cores to function."
prereq_ids = list(TECHWEB_NODE_MOD_ENGI_ADV, TECHWEB_NODE_ANOMALY_RESEARCH)
design_ids = list(
"mod_antigrav",
diff --git a/code/modules/research/techweb/nodes/research_nodes.dm b/code/modules/research/techweb/nodes/research_nodes.dm
index 0a37fb19868a31..b70d9582681ce2 100644
--- a/code/modules/research/techweb/nodes/research_nodes.dm
+++ b/code/modules/research/techweb/nodes/research_nodes.dm
@@ -45,6 +45,7 @@
"blutrash",
"light_replacer_blue",
"bluespacebodybag",
+ "gigabeacon",
)
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
required_experiments = list(/datum/experiment/scanning/points/bluespace_crystal)
diff --git a/code/modules/research/techweb/nodes/service_nodes.dm b/code/modules/research/techweb/nodes/service_nodes.dm
index 1553f3a0c20d82..591308947b23fe 100644
--- a/code/modules/research/techweb/nodes/service_nodes.dm
+++ b/code/modules/research/techweb/nodes/service_nodes.dm
@@ -138,6 +138,7 @@
"reagentgrinder",
"microwave_engineering",
"smartfridge",
+ "dehydrator",
"sheetifier",
"fat_sucker",
"dish_drive",
diff --git a/code/modules/research/techweb/nodes/syndicate_nodes.dm b/code/modules/research/techweb/nodes/syndicate_nodes.dm
index 377ac392f938f3..7743b9442f8291 100644
--- a/code/modules/research/techweb/nodes/syndicate_nodes.dm
+++ b/code/modules/research/techweb/nodes/syndicate_nodes.dm
@@ -33,7 +33,7 @@
required_items_to_unlock = list()
for(var/datum/uplink_item/item_path as anything in SStraitor.uplink_items_by_type)
var/datum/uplink_item/item = SStraitor.uplink_items_by_type[item_path]
- if(!item.item || !item.illegal_tech)
+ if(!item.item || !(item.uplink_item_flags & SYNDIE_ILLEGAL_TECH))
continue
required_items_to_unlock |= item.item //allows deconning to unlock.
diff --git a/code/modules/research/xenobiology/crossbreeding/consuming.dm b/code/modules/research/xenobiology/crossbreeding/consuming.dm
index 5a23d30671f545..be8bba7ec66fa1 100644
--- a/code/modules/research/xenobiology/crossbreeding/consuming.dm
+++ b/code/modules/research/xenobiology/crossbreeding/consuming.dm
@@ -226,30 +226,40 @@ Consuming extracts:
icon_state = "bluespace"
taste = "sugar and starlight"
-/obj/item/slime_cookie/bluespace/do_effect(mob/living/M, mob/user)
- var/list/L = get_area_turfs(get_area(get_turf(M)))
+/obj/item/slime_cookie/bluespace/do_effect(mob/living/eater, mob/user)
+ var/area/eater_area = get_area(eater)
+ if (eater_area.area_flags & NOTELEPORT)
+ fail_effect(eater)
+ return
+
+ var/list/area_turfs = get_area_turfs(get_area(get_turf(eater)))
var/turf/target
- while (L.len && !target)
- var/I = rand(1, L.len)
- var/turf/T = L[I]
- if (is_centcom_level(T.z))
- L.Cut(I,I+1)
+
+ while (length(area_turfs))
+ var/turf/check_turf = pick_n_take(area_turfs)
+ if (is_centcom_level(check_turf.z))
+ continue // Probably already filtered out by NOTELEPORT but let's just be careful
+ if (check_turf.is_blocked_turf())
continue
- if(!T.density)
- var/clear = TRUE
- for(var/obj/O in T)
- if(O.density)
- clear = FALSE
- break
- if(clear)
- target = T
- if (!target)
- L.Cut(I,I+1)
-
- if(target)
- do_teleport(M, target, 0, asoundin = 'sound/effects/phasein.ogg', channel = TELEPORT_CHANNEL_BLUESPACE)
- new /obj/effect/particle_effect/sparks(get_turf(M))
- playsound(get_turf(M), SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ target = check_turf
+ break
+
+ if (isnull(target))
+ fail_effect(eater)
+ return
+ if (!do_teleport(eater, target, 0, asoundin = 'sound/effects/phasein.ogg', channel = TELEPORT_CHANNEL_BLUESPACE))
+ fail_effect(eater)
+ return
+ new /obj/effect/particle_effect/sparks(target)
+ playsound(target, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+
+/obj/item/slime_cookie/bluespace/proc/fail_effect(mob/living/eater)
+ eater.visible_message(
+ message = span_warning("[eater] briefly vanishes... then slams forcefully into the ground"),
+ self_message = span_warning("You briefly vanish... and are returned forcefully to the ground.")
+ )
+ eater.Knockdown(0.1 SECONDS)
+ new /obj/effect/particle_effect/sparks(get_turf(eater))
/obj/item/slimecross/consuming/sepia
colour = SLIME_TYPE_SEPIA
diff --git a/code/modules/research/xenobiology/crossbreeding/regenerative.dm b/code/modules/research/xenobiology/crossbreeding/regenerative.dm
index 82beed78e439cb..d04838f79ec0df 100644
--- a/code/modules/research/xenobiology/crossbreeding/regenerative.dm
+++ b/code/modules/research/xenobiology/crossbreeding/regenerative.dm
@@ -8,6 +8,7 @@ Regenerative extracts:
desc = "It's filled with a milky substance, and pulses like a heartbeat."
effect = "regenerative"
icon_state = "regenerative"
+ effect_desc = "Completely heals your injuries, with no extra effects."
/obj/item/slimecross/regenerative/proc/core_effect(mob/living/carbon/human/target, mob/user)
return
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index 9f22520d6ab104..be805ae9da82f3 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -799,7 +799,7 @@
user.do_attack_animation(interacting_with)
prompted = 1
- if(tgui_alert(usr,"This will permanently transfer your consciousness to [switchy_mob]. Are you sure you want to do this?",,list("Yes","No")) == "No")
+ if(tgui_alert(usr,"This will permanently transfer your consciousness to [switchy_mob]. Are you sure you want to do this?",,list("Yes","No")) != "Yes")
prompted = 0
return ITEM_INTERACT_BLOCKING
diff --git a/code/modules/security_levels/security_level_datums.dm b/code/modules/security_levels/security_level_datums.dm
index b3402f643c6bfd..d5a2e74e8080ed 100644
--- a/code/modules/security_levels/security_level_datums.dm
+++ b/code/modules/security_levels/security_level_datums.dm
@@ -13,6 +13,10 @@
var/announcement_color = "default"
/// The numerical level of this security level, see defines for more information.
var/number_level = -1
+ /// Icon state that will be displayed on displays during this security level
+ var/status_display_icon_state
+ /// The color of the fire alarm light set when changed to this security level
+ var/fire_alarm_light_color
/// The sound that we will play when this security level is set
var/sound
/// The looping sound that will be played while the security level is set
@@ -47,6 +51,8 @@
announcement_color = "green"
sound = 'sound/misc/notice2.ogg' // Friendly beep
number_level = SEC_LEVEL_GREEN
+ status_display_icon_state = "greenalert"
+ fire_alarm_light_color = LIGHT_COLOR_BLUEGREEN
lowering_to_configuration_key = /datum/config_entry/string/alert_green
shuttle_call_time_mod = ALERT_COEFF_GREEN
@@ -60,6 +66,8 @@
announcement_color = "blue"
sound = 'sound/misc/notice1.ogg' // Angry alarm
number_level = SEC_LEVEL_BLUE
+ status_display_icon_state = "bluealert"
+ fire_alarm_light_color = LIGHT_COLOR_ELECTRIC_CYAN
lowering_to_configuration_key = /datum/config_entry/string/alert_blue_downto
elevating_to_configuration_key = /datum/config_entry/string/alert_blue_upto
shuttle_call_time_mod = ALERT_COEFF_BLUE
@@ -74,6 +82,8 @@
announcement_color = "red"
sound = 'sound/misc/notice3.ogg' // More angry alarm
number_level = SEC_LEVEL_RED
+ status_display_icon_state = "redalert"
+ fire_alarm_light_color = LIGHT_COLOR_FLARE
lowering_to_configuration_key = /datum/config_entry/string/alert_red_downto
elevating_to_configuration_key = /datum/config_entry/string/alert_red_upto
shuttle_call_time_mod = ALERT_COEFF_RED
@@ -88,5 +98,7 @@
announcement_color = "purple"
sound = 'sound/misc/airraid.ogg' // Air alarm to signify importance
number_level = SEC_LEVEL_DELTA
+ status_display_icon_state = "deltaalert"
+ fire_alarm_light_color = LIGHT_COLOR_INTENSE_RED
elevating_to_configuration_key = /datum/config_entry/string/alert_delta
shuttle_call_time_mod = ALERT_COEFF_DELTA
diff --git a/code/modules/shuttle/shuttle_events/_shuttle_events.dm b/code/modules/shuttle/shuttle_events/_shuttle_events.dm
index 35b00ac3e790ae..f809e274dc601d 100644
--- a/code/modules/shuttle/shuttle_events/_shuttle_events.dm
+++ b/code/modules/shuttle/shuttle_events/_shuttle_events.dm
@@ -69,6 +69,11 @@
var/list/target_corner //Top left or bottom right corner
var/list/spawn_offset //bounding_coords is ONLY the shuttle, not the space around it, so offset spawn_tiles or stuff spawns on the walls of the shuttle
+ // Bounding coords sticky to either the top right or bottom left corner of the template, depending on proximity to docking port
+ // If we sticky to the bottom right corner, then [1] and [2] will be the bottom right corner, so we need to invert it
+ if(bounding_coords[1] > bounding_coords[3])
+ bounding_coords = list(bounding_coords[3], bounding_coords[4], bounding_coords[1], bounding_coords[2])
+
switch(direction)
if(NORTH) //we're travelling north (so people get pushed south)
step_dir = list(1, 0)
@@ -101,7 +106,6 @@
//Get the corner tile, but jump over the shuttle and then continue unto the cordon
spawning_turfs_miss.Add(locate(target_corner[1] + corner_delta[1] * step_dir[1] + step_dir[1] * i + spawn_offset[1], target_corner[2] + corner_delta[2] * step_dir[2] + step_dir[2] * i + spawn_offset[2], port.z))
-
/datum/shuttle_event/simple_spawner/event_process()
. = ..()
diff --git a/code/modules/shuttle/special.dm b/code/modules/shuttle/special.dm
index e5b4b0eb02439a..484fa32ac87778 100644
--- a/code/modules/shuttle/special.dm
+++ b/code/modules/shuttle/special.dm
@@ -403,7 +403,6 @@
desc = "Communism powerful force."
icon = 'icons/effects/96x96.dmi'
icon_state = "communist"
- layer = ABOVE_OPEN_TURF_LAYER
pixel_x = -32
pixel_y = -32
diff --git a/code/modules/spells/spell.dm b/code/modules/spells/spell.dm
index f76ecb104e72b1..b72abea937ed68 100644
--- a/code/modules/spells/spell.dm
+++ b/code/modules/spells/spell.dm
@@ -248,7 +248,7 @@
if(HAS_TRAIT(cast_loc, TRAIT_CASTABLE_LOC))
if(HAS_TRAIT(cast_loc, TRAIT_SPELLS_TRANSFER_TO_LOC) && ismob(cast_loc.loc))
return cast_loc.loc
- else
+ else
return cast_loc
// They're in an atom which allows casting, so redirect the caster to loc
diff --git a/code/modules/spells/spell_types/pointed/terrorize.dm b/code/modules/spells/spell_types/pointed/terrorize.dm
index 33465b1d35348e..699410b9a3c6b1 100644
--- a/code/modules/spells/spell_types/pointed/terrorize.dm
+++ b/code/modules/spells/spell_types/pointed/terrorize.dm
@@ -1,6 +1,6 @@
/datum/action/cooldown/spell/pointed/terrorize
name = "Terrorize"
- desc = "Project yourself into a victim's mind, inflictng them with terror buildup. \
+ desc = "Project yourself into a victim's mind, inflicting them with terror buildup. \
Prey will become increasingly terrified. Swatting terrified prey with an open hand will \
scare and disorient them."
button_icon_state = "terrify"
diff --git a/code/modules/spells/spell_types/pointed/tie_shoes.dm b/code/modules/spells/spell_types/pointed/tie_shoes.dm
new file mode 100644
index 00000000000000..5783717d0e72b7
--- /dev/null
+++ b/code/modules/spells/spell_types/pointed/tie_shoes.dm
@@ -0,0 +1,137 @@
+
+/datum/action/cooldown/spell/pointed/untie_shoes
+ name = "Untie Shoes"
+ desc = "This unassuming spell unties and then knots the target's shoes."
+ ranged_mousepointer = 'icons/effects/mouse_pointers/lace.dmi'
+ button_icon_state = "lace"
+
+ school = SCHOOL_CONJURATION
+ cooldown_time = 3 SECONDS
+ cooldown_reduction_per_rank = 0.2 SECONDS
+
+ spell_max_level = 4
+ invocation = "Acetato!"
+ invocation_type = INVOCATION_SHOUT
+ spell_requirements = NONE
+ antimagic_flags = MAGIC_RESISTANCE|MAGIC_RESISTANCE_HOLY
+
+ cast_range = INFINITY
+ active_msg = "You prepare to tie your target's shoes!"
+
+ /// Ignores inability to tie laces, such as jackboots, magboots, or sandals.
+ var/bypass_tie_status = FALSE
+ /// Summons shoes to untie if the target has none.
+ var/summons_shoes = FALSE
+
+/datum/action/cooldown/spell/pointed/untie_shoes/New(Target)
+ . = ..()
+ // tgs first spell with multiple invocations!!!!!!
+ invocation = pick("Acetato!", "Agaletto!")
+
+/datum/action/cooldown/spell/pointed/untie_shoes/level_spell(bypass_cap)
+ . = ..()
+ if(spell_level == 2)
+ bypass_tie_status = TRUE
+ to_chat(owner, span_notice("You will now summon laces on laceless shoes, such as jackboots."))
+
+ if(spell_level == 3)
+ summons_shoes = TRUE
+ to_chat(owner, span_notice("You will now summon shoes if your target has none."))
+
+ if(spell_level == 4)
+ invocation_type = INVOCATION_NONE
+ to_chat(owner, span_boldnotice("Your invocations are now silent!"))
+
+/datum/action/cooldown/spell/pointed/untie_shoes/is_valid_target(atom/cast_on)
+ return isliving(cast_on)
+
+// We need to override this, as trying to change next_use_time in cast() will just result in it being overridden.
+/datum/action/cooldown/spell/touch/before_cast(atom/cast_on)
+ return ..() | SPELL_NO_IMMEDIATE_COOLDOWN
+
+/datum/action/cooldown/spell/pointed/untie_shoes/cast(mob/living/carbon/cast_on)
+ . = ..()
+ if(cast_on.can_block_magic(antimagic_flags))
+ to_chat(owner, span_warning("The spell had no effect!"))
+ return FALSE
+
+ if(isanimal_or_basicmob(cast_on))
+ cast_on.add_movespeed_modifier(/datum/movespeed_modifier/magic_ties)
+ addtimer(CALLBACK(cast_on, TYPE_PROC_REF(/mob/living, remove_movespeed_modifier), /datum/movespeed_modifier/magic_ties), 3 SECONDS * spell_level, TIMER_UNIQUE|TIMER_OVERRIDE)
+ to_chat(owner, span_warning("You tie [cast_on] with weak, magic laces!"))
+ if(invocation_type != INVOCATION_NONE) // extra feedback since it's weird for them
+ cast_on.balloon_alert_to_viewers("magically tied!")
+ else
+ cast_on.balloon_alert(owner, "magically tied!")
+ playsound(cast_on, 'sound/magic/summonitems_generic.ogg', 50, TRUE)
+ return TRUE
+
+ var/shoe_to_cast = /obj/item/clothing/shoes/sneakers/random
+
+ if(HAS_TRAIT(owner, TRAIT_CHUUNIBYOU))
+ shoe_to_cast = /obj/item/clothing/shoes/sneakers/marisa
+ if(HAS_TRAIT(owner, TRAIT_SPLATTERCASTER))
+ shoe_to_cast = /obj/item/clothing/shoes/laceup
+
+ var/obj/item/clothing/shoes/shoes_to_tie = cast_on.shoes
+
+ if(isnull(shoes_to_tie))
+ if(!summons_shoes)
+ to_chat(owner, span_warning("[cast_on] isn't wearing any shoes!"))
+ return FALSE
+
+ shoes_to_tie = new shoe_to_cast(cast_on)
+ if(!cast_on.equip_to_slot_or_del(shoes_to_tie, ITEM_SLOT_FEET))
+ to_chat(owner, span_warning("Couldn't equip shoes on [cast_on]!"))
+ return FALSE
+
+ if(invocation_type != INVOCATION_NONE)
+ playsound(cast_on, 'sound/magic/summonitems_generic.ogg', 50, TRUE)
+
+ switch(shoes_to_tie.tied)
+ if(SHOES_TIED)
+ if(!shoes_to_tie.can_be_tied)
+ if(bypass_tie_status)
+ to_chat(owner, span_warning("You magically grant laces to [cast_on]'s shoes!"))
+ cast_on.balloon_alert(owner, "laced!")
+ shoes_to_tie.can_be_tied = TRUE
+ if(invocation_type != INVOCATION_NONE)
+ playsound(cast_on, 'sound/magic/summonitems_generic.ogg', 50, TRUE)
+ return TRUE
+ else
+ to_chat(owner, span_warning("[cast_on] is wearing laceless shoes!"))
+ cast_on.balloon_alert(owner, "laceless!")
+ return FALSE
+
+ to_chat(owner, span_warning("You untie [cast_on]'s shoes!"))
+ cast_on.balloon_alert(owner, "untied!")
+ shoes_to_tie.adjust_laces(SHOES_UNTIED, force_lacing = TRUE)
+ if(SHOES_UNTIED)
+ to_chat(owner, span_warning("You knot [cast_on]'s laces!"))
+ cast_on.balloon_alert(owner, "knotted!")
+ shoes_to_tie.adjust_laces(SHOES_KNOTTED, force_lacing = TRUE)
+ if(SHOES_KNOTTED)
+ to_chat(owner, span_warning("[cast_on]'s laces are already knotted!"))
+ return FALSE
+
+// We need to override this, as trying to change next_use_time in cast() will just result in it being overridden.
+/datum/action/cooldown/spell/pointed/untie_shoes/after_cast(atom/cast_on)
+ . = ..()
+ var/extra_time = 0 SECONDS
+ if((cast_on.z != owner.z) || get_dist(cast_on, owner) > 7)
+ extra_time += cooldown_time * 10 // :)
+
+ StartCooldown(cooldown_time + extra_time)
+
+/datum/action/cooldown/spell/pointed/untie_shoes/get_spell_title()
+ switch(spell_level)
+ if(2)
+ return "Laceless "
+ if(3)
+ return "Prankster's "
+ if(4)
+ return "Sneakerly "
+ if(5)
+ return "Clown's Own "
+
+ return ""
diff --git a/code/modules/spells/spell_types/self/rod_form.dm b/code/modules/spells/spell_types/self/rod_form.dm
index 5336036cd2c51f..9989c4420c0868 100644
--- a/code/modules/spells/spell_types/self/rod_form.dm
+++ b/code/modules/spells/spell_types/self/rod_form.dm
@@ -122,7 +122,7 @@
return TRUE
/**
- * Called when the wizard rod reaches it's maximum distance
+ * Called when the wizard rod reaches its maximum distance
* or is otherwise stopped by something.
* Dumps out the wizard, and deletes.
*/
diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm
index dbb50db944bb5c..d69635ec09fcf8 100644
--- a/code/modules/surgery/bodyparts/_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/_bodyparts.dm
@@ -115,6 +115,8 @@
///the type of damage overlay (if any) to use when this bodypart is bruised/burned.
var/dmg_overlay_type = "human"
+ ///a color (optionally matrix) for the damage overlays to give the limb
+ var/damage_overlay_color
/// If we're bleeding, which icon are we displaying on this part
var/bleed_overlay_icon
@@ -199,6 +201,12 @@
var/any_existing_wound_can_mangle_our_interior
/// get_damage() / total_damage must surpass this to allow our limb to be disabled, even temporarily, by an EMP.
var/robotic_emp_paralyze_damage_percent_threshold = 0.3
+ /// A potential texturing overlay to put on the limb
+ var/datum/bodypart_overlay/texture/texture_bodypart_overlay
+ // SKYRAT EDIT BEGIN
+ /// If we even wanna try and handle icons/overlays of the limb (Taurs don't, f.e.). See update_body_parts
+ var/show_icon = TRUE
+ // SKYRAT EDIT END
/obj/item/bodypart/apply_fantasy_bonuses(bonus)
. = ..()
@@ -224,6 +232,10 @@
RegisterSignal(src, COMSIG_ATOM_RESTYLE, PROC_REF(on_attempt_feature_restyle))
+ if(texture_bodypart_overlay)
+ texture_bodypart_overlay = new texture_bodypart_overlay()
+ add_bodypart_overlay(texture_bodypart_overlay)
+
if(!IS_ORGANIC_LIMB(src))
grind_results = null
@@ -1095,7 +1107,8 @@
for(var/external_layer in overlay.all_layers)
if(overlay.layers & external_layer)
. += overlay.get_overlay(external_layer, src)
-
+ for(var/datum/layer in .)
+ overlay.modify_bodypart_appearance(layer)
// SKYRAT EDIT ADDITION BEGIN - MARKINGS CODE
var/override_color
var/atom/offset_spokesman = owner || src
@@ -1152,7 +1165,6 @@
if (emissive)
. += emissive
// SKYRAT EDIT END - MARKINGS CODE END
-
return .
/obj/item/bodypart/proc/huskify_image(image/thing_to_husk, draw_blood = TRUE)
@@ -1232,7 +1244,7 @@
refresh_bleed_rate()
/// Refresh the cache of our rate of bleeding sans any modifiers
-/// ANYTHING ADDED TO THIS PROC NEEDS TO CALL IT WHEN IT'S EFFECT CHANGES
+/// ANYTHING ADDED TO THIS PROC NEEDS TO CALL IT WHEN ITS EFFECT CHANGES
/obj/item/bodypart/proc/refresh_bleed_rate()
SHOULD_NOT_OVERRIDE(TRUE)
diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm
index 914611a845eff2..7bf180306c73c7 100644
--- a/code/modules/surgery/bodyparts/dismemberment.dm
+++ b/code/modules/surgery/bodyparts/dismemberment.dm
@@ -4,7 +4,7 @@
return FALSE
return TRUE
-///Remove target limb from it's owner, with side effects.
+///Remove target limb from its owner, with side effects.
/obj/item/bodypart/proc/dismember(dam_type = BRUTE, silent=TRUE, wounding_type)
if(!owner || (bodypart_flags & BODYPART_UNREMOVABLE))
return FALSE
diff --git a/code/modules/surgery/bodyparts/helpers.dm b/code/modules/surgery/bodyparts/helpers.dm
index a0955af4e46c8d..8833f87e28ee89 100644
--- a/code/modules/surgery/bodyparts/helpers.dm
+++ b/code/modules/surgery/bodyparts/helpers.dm
@@ -178,7 +178,7 @@
if(new_bodypart)
new_bodypart.update_limb(is_creating = TRUE)
-/// Makes sure that the owner's bodytype flags match the flags of all of it's parts and organs
+/// Makes sure that the owner's bodytype flags match the flags of all of its parts and organs
/mob/living/carbon/proc/synchronize_bodytypes()
var/all_limb_flags = NONE
for(var/obj/item/bodypart/limb as anything in bodyparts)
@@ -188,7 +188,7 @@
bodytype = all_limb_flags
-/// Makes sure that the owner's bodyshape flags match the flags of all of it's parts and organs
+/// Makes sure that the owner's bodyshape flags match the flags of all of its parts and organs
/mob/living/carbon/proc/synchronize_bodyshapes()
var/all_limb_flags = NONE
for(var/obj/item/bodypart/limb as anything in bodyparts)
diff --git a/code/modules/surgery/bodyparts/parts.dm b/code/modules/surgery/bodyparts/parts.dm
index 6e3b5ca921bc4b..992d60142bdcfe 100644
--- a/code/modules/surgery/bodyparts/parts.dm
+++ b/code/modules/surgery/bodyparts/parts.dm
@@ -182,7 +182,7 @@
return
var/atom/movable/screen/inventory/hand/hand = new_owner.hud_used.hand_slots["[held_index]"]
- hand.update_appearance()
+ hand?.update_appearance()
/obj/item/bodypart/arm/left
name = "left arm"
@@ -210,12 +210,12 @@
..()
/obj/item/bodypart/arm/left/clear_ownership(mob/living/carbon/old_owner)
+ . = ..()
if(HAS_TRAIT(old_owner, TRAIT_PARALYSIS_L_ARM))
UnregisterSignal(old_owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_ARM))
REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_L_ARM)
else
UnregisterSignal(old_owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_ARM))
- ..()
///Proc to react to the owner gaining the TRAIT_PARALYSIS_L_ARM trait.
/obj/item/bodypart/arm/left/proc/on_owner_paralysis_gain(mob/living/carbon/source)
@@ -308,12 +308,12 @@
..()
/obj/item/bodypart/arm/right/clear_ownership(mob/living/carbon/old_owner)
+ . = ..()
if(HAS_TRAIT(old_owner, TRAIT_PARALYSIS_R_ARM))
UnregisterSignal(old_owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_ARM))
REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_R_ARM)
else
UnregisterSignal(old_owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_ARM))
- ..()
///Proc to react to the owner gaining the TRAIT_PARALYSIS_R_ARM trait.
/obj/item/bodypart/arm/right/proc/on_owner_paralysis_gain(mob/living/carbon/source)
@@ -429,12 +429,12 @@
..()
/obj/item/bodypart/leg/left/clear_ownership(mob/living/carbon/old_owner)
+ . = ..()
if(HAS_TRAIT(old_owner, TRAIT_PARALYSIS_L_LEG))
UnregisterSignal(old_owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_LEG))
REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_L_LEG)
else
UnregisterSignal(old_owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_LEG))
- ..()
///Proc to react to the owner gaining the TRAIT_PARALYSIS_L_ARM trait.
/obj/item/bodypart/leg/left/proc/on_owner_paralysis_gain(mob/living/carbon/source)
@@ -518,12 +518,12 @@
..()
/obj/item/bodypart/leg/right/clear_ownership(mob/living/carbon/old_owner)
+ . = ..()
if(HAS_TRAIT(old_owner, TRAIT_PARALYSIS_R_LEG))
UnregisterSignal(old_owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_LEG))
REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_R_LEG)
else
UnregisterSignal(old_owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_LEG))
- ..()
///Proc to react to the owner gaining the TRAIT_PARALYSIS_R_LEG trait.
/obj/item/bodypart/leg/right/proc/on_owner_paralysis_gain(mob/living/carbon/source)
diff --git a/code/modules/surgery/bodyparts/worn_feature_offset.dm b/code/modules/surgery/bodyparts/worn_feature_offset.dm
index ec2b7ddefddf48..8d33e5478ebb5c 100644
--- a/code/modules/surgery/bodyparts/worn_feature_offset.dm
+++ b/code/modules/surgery/bodyparts/worn_feature_offset.dm
@@ -64,4 +64,5 @@
/// When we change direction, re-apply the offset
/datum/worn_feature_offset/proc/on_dir_change(mob/living/carbon/owner, olddir, newdir)
SIGNAL_HANDLER
- owner.update_features(feature_key)
+ if(olddir != newdir)
+ owner.update_features(feature_key)
diff --git a/code/modules/surgery/core_removal.dm b/code/modules/surgery/core_removal.dm
index deda90bdd6e9a1..4c7382f3daee4b 100644
--- a/code/modules/surgery/core_removal.dm
+++ b/code/modules/surgery/core_removal.dm
@@ -37,23 +37,15 @@
/datum/surgery_step/extract_core/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE)
var/mob/living/basic/slime/target_slime = target
- if(target_slime.cores > 0)
- target_slime.cores--
+ var/core_count = target_slime.cores
+ if(core_count && target_slime.try_extract_cores(count = core_count))
display_results(
user,
target,
- span_notice("You successfully extract a core from [target]. [target_slime.cores] core\s remaining."),
- span_notice("[user] successfully extracts a core from [target]!"),
- span_notice("[user] successfully extracts a core from [target]!"),
+ span_notice("You successfully extract [core_count] core\s from [target]."),
+ span_notice("[user] successfully extracts [core_count] core\s from [target]!"),
+ span_notice("[user] successfully extracts [core_count] core\s from [target]!"),
)
-
- new target_slime.slime_type.core_type(target_slime.loc)
-
- if(target_slime.cores <= 0)
- target_slime.icon_state = "[target_slime.slime_type.colour] baby slime dead-nocore"
- return ..()
- else
- return FALSE
- else
- to_chat(user, span_warning("There aren't any cores left in [target]!"))
- return ..()
+ return TRUE
+ to_chat(user, span_warning("There aren't any cores left in [target]!"))
+ return ..()
diff --git a/code/modules/surgery/organ_manipulation.dm b/code/modules/surgery/organ_manipulation.dm
index 1da7f59426cce1..a1eac882ae5f56 100644
--- a/code/modules/surgery/organ_manipulation.dm
+++ b/code/modules/surgery/organ_manipulation.dm
@@ -128,7 +128,7 @@
/datum/surgery_step/mechanic_close,
)
-///Organ manipulation base class. Do not use, it wont work. Use it's subtypes
+///Organ manipulation base class. Do not use, it wont work. Use its subtypes
/datum/surgery_step/manipulate_organs
name = "manipulate organs"
repeatable = TRUE
diff --git a/code/modules/surgery/organs/autosurgeon.dm b/code/modules/surgery/organs/autosurgeon.dm
index 6e3d9a0ee7ccba..0bb8afc6ced52a 100644
--- a/code/modules/surgery/organs/autosurgeon.dm
+++ b/code/modules/surgery/organs/autosurgeon.dm
@@ -149,6 +149,10 @@
surgery_speed = 0.75
loaded_overlay = "autosurgeon_syndicate_loaded_overlay"
+/obj/item/autosurgeon/syndicate/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_CONTRABAND, INNATE_TRAIT)
+
/obj/item/autosurgeon/syndicate/laser_arm
desc = "A single use autosurgeon that contains a combat arms-up laser augment. A screwdriver can be used to remove it, but implants can't be placed back in."
uses = 1
diff --git a/code/modules/surgery/organs/external/_external_organ.dm b/code/modules/surgery/organs/external/_external_organ.dm
index 129be7d241aef5..d7673eac767455 100644
--- a/code/modules/surgery/organs/external/_external_organ.dm
+++ b/code/modules/surgery/organs/external/_external_organ.dm
@@ -21,11 +21,11 @@
var/dna_block
///Set to EXTERNAL_BEHIND, EXTERNAL_FRONT or EXTERNAL_ADJACENT if you want to draw one of those layers as the object sprite. FALSE to use your own
- ///This will not work if it doesn't have a limb to generate it's icon with
+ ///This will not work if it doesn't have a limb to generate its icon with
var/use_mob_sprite_as_obj_sprite = FALSE
- ///Does this organ have any bodytypes to pass to it's bodypart_owner?
+ ///Does this organ have any bodytypes to pass to its bodypart_owner?
var/external_bodytypes = NONE
- ///Does this organ have any bodyshapes to pass to it's bodypart_owner?
+ ///Does this organ have any bodyshapes to pass to its bodypart_owner?
var/external_bodyshapes = NONE
///Which flags does a 'modification tool' need to have to restyle us, if it all possible (located in code/_DEFINES/mobs)
var/restyle_flags = NONE
diff --git a/code/modules/surgery/organs/external/wings/functional_wings.dm b/code/modules/surgery/organs/external/wings/functional_wings.dm
index 2a6757596c4603..680226b859b0ac 100644
--- a/code/modules/surgery/organs/external/wings/functional_wings.dm
+++ b/code/modules/surgery/organs/external/wings/functional_wings.dm
@@ -25,6 +25,8 @@
///Are our wings open or closed?
var/wings_open = FALSE
+ ///We cant hide this wings in suit
+ var/cant_hide = FALSE
// grind_results = list(/datum/reagent/flightpotion = 5)
food_reagents = list(/datum/reagent/flightpotion = 5)
@@ -66,7 +68,7 @@
if(human.stat || human.body_position == LYING_DOWN)
return FALSE
//Jumpsuits have tail holes, so it makes sense they have wing holes too
- if(human.wear_suit && ((human.wear_suit.flags_inv & HIDEJUMPSUIT) && (!human.wear_suit.species_exception || !is_type_in_list(src, human.wear_suit.species_exception))))
+ 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!"))
return FALSE
var/turf/location = get_turf(human)
diff --git a/code/modules/surgery/organs/internal/cyberimp/augments_arms.dm b/code/modules/surgery/organs/internal/cyberimp/augments_arms.dm
index a2eeb4eac32cab..5632688cb476b8 100644
--- a/code/modules/surgery/organs/internal/cyberimp/augments_arms.dm
+++ b/code/modules/surgery/organs/internal/cyberimp/augments_arms.dm
@@ -137,6 +137,7 @@
/obj/item/organ/internal/cyberimp/arm/proc/Retract()
if(!active_item || (active_item in src))
return FALSE
+ active_item.resistance_flags = active_item::resistance_flags
if(owner)
owner.visible_message(
span_notice("[owner] retracts [active_item] back into [owner.p_their()] [zone == BODY_ZONE_R_ARM ? "right" : "left"] arm."),
@@ -422,8 +423,7 @@
return NONE
if(!isliving(target))
return NONE
- var/datum/dna/dna = source.has_dna()
- if(dna?.check_mutation(/datum/mutation/human/hulk)) //NO HULK
+ if(HAS_TRAIT(source, TRAIT_HULK)) //NO HULK
return NONE
if(!source.can_unarmed_attack())
return COMPONENT_SKIP_ATTACK
diff --git a/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm b/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm
index 24aadfeca14f64..046c84200d1ebc 100644
--- a/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm
+++ b/code/modules/surgery/organs/internal/cyberimp/augments_chest.dm
@@ -260,3 +260,60 @@
deactivate(silent = TRUE)
return FALSE
+
+/obj/item/organ/internal/cyberimp/chest/spine
+ name = "\improper Herculean gravitronic spinal implant"
+ desc = "This gravitronic spinal interface is able to improve the athletics of a user, allowing them greater physical ability. \
+ Contains a slot which can be upgraded with a gravity anomaly core, improving its performance."
+ implant_color = "#15704c"
+ slot = ORGAN_SLOT_SPINE
+ /// How much faster does the spinal implant improve our lifting speed, workout ability, reducing falling damage and improving climbing and standing speed
+ var/athletics_boost_multiplier = 0.8
+ /// How much additional throwing range does our spinal implant grant us.
+ var/added_throw_range = 2
+ /// How much additional boxing damage and tackling power do we add?
+ var/strength_bonus = 4
+ /// Whether or not a gravity anomaly core has been installed, improving the effectiveness of the spinal implant.
+ var/core_applied = FALSE
+ /// The overlay for our implant to indicate that, yes, this person has an implant inserted.
+ var/mutable_appearance/stone_overlay
+
+/obj/item/organ/internal/cyberimp/chest/spine/emp_act(severity)
+ . = ..()
+ if(!owner || . & EMP_PROTECT_SELF)
+ return
+ to_chat(owner, span_warning("You feel sheering pain as your body is crushed like a soda can!"))
+ owner.apply_damage(20/severity, BRUTE, def_zone = BODY_ZONE_CHEST)
+
+/obj/item/organ/internal/cyberimp/chest/spine/on_mob_insert(mob/living/carbon/organ_owner, special, movement_flags)
+ . = ..()
+ stone_overlay = mutable_appearance(icon = 'icons/effects/effects.dmi', icon_state = "stone")
+ organ_owner.add_overlay(stone_overlay)
+ if(core_applied)
+ organ_owner.AddElement(/datum/element/forced_gravity, 1)
+
+/obj/item/organ/internal/cyberimp/chest/spine/on_mob_remove(mob/living/carbon/organ_owner, special)
+ . = ..()
+ if(stone_overlay)
+ organ_owner.cut_overlay(stone_overlay)
+ stone_overlay = null
+ if(core_applied)
+ organ_owner.RemoveElement(/datum/element/forced_gravity, 1)
+
+/obj/item/organ/internal/cyberimp/chest/spine/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+ . = ..()
+ if(core_applied)
+ user.balloon_alert(user, "core already installed!")
+ return ITEM_INTERACT_BLOCKING
+
+ if(istype(tool, /obj/item/assembly/signaler/anomaly/grav))
+ user.balloon_alert(user, "core installed.")
+ athletics_boost_multiplier = 0.25
+ added_throw_range += 2
+ strength_bonus += 4
+ core_applied = TRUE
+ name = "\improper Atlas gravitonic spinal implant"
+ desc = "This gravitronic spinal interface is able to improve the athletics of a user, allowing them greater physical ability. \
+ This one has been improved through the installation of a gravity anomaly core, allowing for personal gravity manipulation."
+ qdel(tool)
+ return ITEM_INTERACT_SUCCESS
diff --git a/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm b/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm
index a50912416ef87d..f36c6cfe838b8b 100644
--- a/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm
+++ b/code/modules/surgery/organs/internal/cyberimp/augments_internal.dm
@@ -120,6 +120,7 @@
. = ..()
UnregisterSignal(implant_owner, signalCache)
UnregisterSignal(implant_owner, COMSIG_LIVING_ENTER_STAMCRIT)
+ remove_stun_buffs(implant_owner)
/obj/item/organ/internal/cyberimp/brain/anti_stun/on_mob_insert(mob/living/carbon/receiver)
. = ..()
@@ -151,10 +152,8 @@
sparks.set_up(5, 1, src)
sparks.start()
- owner.add_traits(list(TRAIT_IGNOREDAMAGESLOWDOWN, TRAIT_BATON_RESISTANCE, TRAIT_STUNIMMUNE), REF(src))
- addtimer(TRAIT_CALLBACK_REMOVE(owner, TRAIT_IGNOREDAMAGESLOWDOWN, REF(src)), stun_resistance_time)
- addtimer(TRAIT_CALLBACK_REMOVE(owner, TRAIT_BATON_RESISTANCE, REF(src)), stun_resistance_time)
- addtimer(TRAIT_CALLBACK_REMOVE(owner, TRAIT_STUNIMMUNE, REF(src)), stun_resistance_time)
+ give_stun_buffs(owner)
+ addtimer(CALLBACK(src, PROC_REF(remove_stun_buffs), owner), stun_resistance_time)
COOLDOWN_START(src, implant_cooldown, 60 SECONDS)
addtimer(CALLBACK(src, PROC_REF(implant_ready)),60 SECONDS)
@@ -163,6 +162,14 @@
if(owner)
to_chat(owner, span_purple("Your rebooter implant is ready."))
+/obj/item/organ/internal/cyberimp/brain/anti_stun/proc/give_stun_buffs(mob/living/give_to = owner)
+ give_to.add_traits(list(TRAIT_STUNIMMUNE, TRAIT_BATON_RESISTANCE), REF(src))
+ give_to.add_movespeed_mod_immunities(REF(src), /datum/movespeed_modifier/damage_slowdown)
+
+/obj/item/organ/internal/cyberimp/brain/anti_stun/proc/remove_stun_buffs(mob/living/remove_from = owner)
+ remove_from.remove_traits(list(TRAIT_STUNIMMUNE, TRAIT_BATON_RESISTANCE), REF(src))
+ remove_from.remove_movespeed_mod_immunities(REF(src), /datum/movespeed_modifier/damage_slowdown)
+
/obj/item/organ/internal/cyberimp/brain/anti_stun/emp_act(severity)
. = ..()
if((organ_flags & ORGAN_FAILING) || . & EMP_PROTECT_SELF)
diff --git a/code/modules/surgery/organs/internal/heart/_heart.dm b/code/modules/surgery/organs/internal/heart/_heart.dm
index 2773f588b24da4..b0fac316ad3e35 100644
--- a/code/modules/surgery/organs/internal/heart/_heart.dm
+++ b/code/modules/surgery/organs/internal/heart/_heart.dm
@@ -18,6 +18,9 @@
attack_verb_continuous = list("beats", "thumps")
attack_verb_simple = list("beat", "thump")
+ // Love is stored in the heart.
+ food_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/love = 2.5)
+
// Heart attack code is in code/modules/mob/living/carbon/human/life.dm
/// Whether the heart is currently beating.
@@ -162,13 +165,23 @@
icon_state = "heart-c-on"
base_icon_state = "heart-c"
organ_flags = ORGAN_ROBOTIC
- maxHealth = STANDARD_ORGAN_THRESHOLD*0.75 //This also hits defib timer, so a bit higher than its less important counterparts
+ maxHealth = STANDARD_ORGAN_THRESHOLD * 0.75 //This also hits defib timer, so a bit higher than its less important counterparts
failing_desc = "seems to be broken."
- var/dose_available = FALSE
- var/rid = /datum/reagent/medicine/epinephrine
- var/ramount = 10
- var/emp_vulnerability = 80 //Chance of permanent effects if emp-ed.
+ /// Whether or not we have a stabilization available. This prevents our owner from entering softcrit for an amount of time.
+ var/stabilization_available = FALSE
+
+ /// How long our stabilization lasts for.
+ var/stabilization_duration = 10 SECONDS
+
+ /// Whether our heart suppresses bleeders and restores blood automatically.
+ var/bleed_prevention = FALSE
+
+ /// The probability that our blood replication causes toxin damage.
+ var/toxification_probability = 20
+
+ /// Chance of permanent effects if emp-ed.
+ var/emp_vulnerability = 80
/obj/item/organ/internal/heart/cybernetic/emp_act(severity)
. = ..()
@@ -194,35 +207,63 @@
/obj/item/organ/internal/heart/cybernetic/on_life(seconds_per_tick, times_fired)
. = ..()
- if(dose_available && owner.health <= owner.crit_threshold && !owner.reagents.has_reagent(rid))
- used_dose()
-/obj/item/organ/internal/heart/cybernetic/proc/used_dose()
- owner.reagents.add_reagent(rid, ramount)
- dose_available = FALSE
+ if(organ_flags & ORGAN_EMP)
+ return
+
+ if(stabilization_available && owner.health <= owner.crit_threshold)
+ stabilize_heart()
+
+ if(bleed_prevention && ishuman(owner) && owner.blood_volume < BLOOD_VOLUME_NORMAL)
+ var/mob/living/carbon/human/wounded_owner = owner
+ wounded_owner.blood_volume += 2 * seconds_per_tick
+ if(toxification_probability && prob(toxification_probability))
+ wounded_owner.adjustToxLoss(1 * seconds_per_tick, updating_health = FALSE)
+
+ var/datum/wound/bloodiest_wound
+
+ for(var/datum/wound/iter_wound as anything in wounded_owner.all_wounds)
+ if(iter_wound.blood_flow && iter_wound.blood_flow > bloodiest_wound?.blood_flow)
+ bloodiest_wound = iter_wound
+
+ if(bloodiest_wound)
+ bloodiest_wound.adjust_blood_flow(-1 * seconds_per_tick)
+
+/obj/item/organ/internal/heart/cybernetic/proc/stabilize_heart()
+ ADD_TRAIT(owner, TRAIT_NOSOFTCRIT, ORGAN_TRAIT)
+ stabilization_available = FALSE
+
+ addtimer(TRAIT_CALLBACK_REMOVE(owner, TRAIT_NOSOFTCRIT, ORGAN_TRAIT), stabilization_duration)
+
+ addtimer(VARSET_CALLBACK(src, stabilization_available, TRUE), 5 MINUTES, TIMER_DELETE_ME)
+
+// Largely a sanity check
+/obj/item/organ/internal/heart/cybernetic/on_mob_remove(mob/living/carbon/heart_owner, special = FALSE)
+ . = ..()
+ if(HAS_TRAIT_FROM(heart_owner, TRAIT_NOSOFTCRIT, ORGAN_TRAIT))
+ REMOVE_TRAIT(heart_owner, TRAIT_NOSOFTCRIT, ORGAN_TRAIT)
/obj/item/organ/internal/heart/cybernetic/tier2
name = "cybernetic heart"
- desc = "An electronic device designed to mimic the functions of an organic human heart. Also holds an emergency dose of epinephrine, used automatically after facing severe trauma."
+ desc = "An electronic device designed to mimic the functions of an organic human heart. In case of lacerations or haemorrhaging, the heart rapidly begins self-replicating \
+ artificial blood. However, this can cause toxins to build up in the bloodstream to the imperfect replication process."
icon_state = "heart-c-u-on"
base_icon_state = "heart-c-u"
maxHealth = 1.5 * STANDARD_ORGAN_THRESHOLD
- dose_available = TRUE
+ bleed_prevention = TRUE
emp_vulnerability = 40
/obj/item/organ/internal/heart/cybernetic/tier3
name = "upgraded cybernetic heart"
- desc = "An electronic device designed to mimic the functions of an organic human heart. Also holds an emergency dose of epinephrine, used automatically after facing severe trauma. This upgraded model can regenerate its dose after use."
+ desc = "An electronic device designed to mimic the functions of an organic human heart. In case of physical trauma, the heart has temporary failsafes to maintain patient stability \
+ and mobility for a brief moment. In addition, the heart is able to safely self-replicate blood without risk of toxin buildup."
icon_state = "heart-c-u2-on"
base_icon_state = "heart-c-u2"
maxHealth = 2 * STANDARD_ORGAN_THRESHOLD
- dose_available = TRUE
+ stabilization_available = TRUE
+ toxification_probability = 0
emp_vulnerability = 20
-/obj/item/organ/internal/heart/cybernetic/tier3/used_dose()
- . = ..()
- addtimer(VARSET_CALLBACK(src, dose_available, TRUE), 5 MINUTES)
-
/obj/item/organ/internal/heart/cybernetic/surplus
name = "surplus prosthetic heart"
desc = "A fragile mockery of a human heart that resembles a water pump more than an actual heart. \
diff --git a/code/modules/surgery/organs/internal/heart/heart_anomalock.dm b/code/modules/surgery/organs/internal/heart/heart_anomalock.dm
index e9da6197ed2739..5cdb27942358b4 100644
--- a/code/modules/surgery/organs/internal/heart/heart_anomalock.dm
+++ b/code/modules/surgery/organs/internal/heart/heart_anomalock.dm
@@ -7,6 +7,8 @@
name = "Voltaic Combat Cyberheart"
desc = "A cutting-edge cyberheart, originally designed for Nanotrasen killsquad usage but later declassified for normal research. Voltaic technology allows the heart to keep the body upright in dire circumstances, alongside redirecting anomalous flux energy to fully shield the user from shocks and electro-magnetic pulses. Requires a refined Flux core as a power source."
icon_state = "anomalock_heart"
+ bleed_prevention = TRUE
+ toxification_probability = 0
COOLDOWN_DECLARE(survival_cooldown)
///Cooldown for the activation of the organ
diff --git a/code/modules/surgery/organs/internal/liver/_liver.dm b/code/modules/surgery/organs/internal/liver/_liver.dm
index 5c6eaf9b38f274..9f933b6a2a859f 100644
--- a/code/modules/surgery/organs/internal/liver/_liver.dm
+++ b/code/modules/surgery/organs/internal/liver/_liver.dm
@@ -132,6 +132,7 @@
. = ..()
//If your liver is failing, then we use the liverless version of metabolize
if((organ_flags & ORGAN_FAILING) || HAS_TRAIT(owner, TRAIT_LIVERLESS_METABOLISM))
+ owner.reagents.end_metabolization(keep_liverless = TRUE)
owner.reagents.metabolize(owner, seconds_per_tick, times_fired, can_overdose = TRUE, liverless = TRUE)
return
diff --git a/code/modules/surgery/organs/internal/lungs/_lungs.dm b/code/modules/surgery/organs/internal/lungs/_lungs.dm
index b3427db9291ba5..47078bfc8038e6 100644
--- a/code/modules/surgery/organs/internal/lungs/_lungs.dm
+++ b/code/modules/surgery/organs/internal/lungs/_lungs.dm
@@ -537,7 +537,7 @@
n2o_euphoria = EUPHORIA_INACTIVE
breather.clear_alert(ALERT_TOO_MUCH_N2O)
-// Breath in nitrium. It's helpful, but has nasty side effects
+// Breathe in nitrium. It's helpful, but has nasty side effects
/obj/item/organ/internal/lungs/proc/too_much_nitrium(mob/living/carbon/breather, datum/gas_mixture/breath, nitrium_pp, old_nitrium_pp)
breathe_gas_volume(breath, /datum/gas/nitrium)
diff --git a/code/modules/surgery/organs/internal/tongue/_tongue.dm b/code/modules/surgery/organs/internal/tongue/_tongue.dm
index a47639fe0e673c..6467beac078de0 100644
--- a/code/modules/surgery/organs/internal/tongue/_tongue.dm
+++ b/code/modules/surgery/organs/internal/tongue/_tongue.dm
@@ -94,11 +94,15 @@
/obj/item/organ/internal/tongue/proc/handle_speech(datum/source, list/speech_args)
SIGNAL_HANDLER
+ if(should_modify_speech(source, speech_args))
+ modify_speech(source, speech_args)
+
+/obj/item/organ/internal/tongue/proc/should_modify_speech(datum/source, list/speech_args)
if(speech_args[SPEECH_LANGUAGE] in languages_native) // Speaking a native language?
return FALSE // Don't modify speech
if(HAS_TRAIT(source, TRAIT_SIGN_LANG)) // No modifiers for signers - I hate this but I simply cannot get these to combine into one statement
return FALSE // Don't modify speech
- modify_speech(source, speech_args)
+ return TRUE
/obj/item/organ/internal/tongue/proc/modify_speech(datum/source, list/speech_args)
return speech_args[SPEECH_MESSAGE]
@@ -187,38 +191,36 @@
liked_foodtypes = GORE | MEAT | SEAFOOD | NUTS | BUGS
disliked_foodtypes = GRAIN | DAIRY | CLOTH | GROSS
voice_filter = @{"[0:a] asplit [out0][out2]; [out0] asetrate=%SAMPLE_RATE%*0.9,aresample=%SAMPLE_RATE%,atempo=1/0.9,aformat=channel_layouts=mono,volume=0.2 [p0]; [out2] asetrate=%SAMPLE_RATE%*1.1,aresample=%SAMPLE_RATE%,atempo=1/1.1,aformat=channel_layouts=mono,volume=0.2[p2]; [p0][0][p2] amix=inputs=3"}
+ var/static/list/speech_replacements = list(
+ new /regex("s+", "g") = "sss",
+ new /regex("S+", "g") = "SSS",
+ new /regex(@"(\w)x", "g") = "$1kss",
+ //new /regex(@"(\w)X", "g") = "$1KSSS", // SKYRAT EDIT REMOVAL
+ new /regex(@"\bx([\-|r|R]|\b)", "g") = "ecks$1",
+ new /regex(@"\bX([\-|r|R]|\b)", "g") = "ECKS$1",
+ )
+ // SKYRAT EDIT ADDITION START - Russian version
+ var/static/list/russian_speech_replacements = list(
+ new /regex("s+", "g") = "sss",
+ new /regex("S+", "g") = "SSS",
+ new /regex(@"(\w)x", "g") = "$1kss",
+ new /regex(@"\bx([\-|r|R]|\b)", "g") = "ecks$1",
+ new /regex(@"\bX([\-|r|R]|\b)", "g") = "ECKS$1",
+ new /regex(@"(\w)x", "g") = "$1kss",
+ new /regex(@"\bx([\-|r|R]|\b)", "g") = "ecks$1",
+ new /regex(@"\bX([\-|r|R]|\b)", "g") = "ECKS$1",
+ new /regex("с+", "g") = "ссс",
+ new /regex("С+", "g") = "ССС",
+ "з" = "с",
+ "З" = "С",
+ "ж" = "ш",
+ "Ж" = "Ш",
+ )
+ // SKYRAT EDIT ADDITION END
-/obj/item/organ/internal/tongue/lizard/modify_speech(datum/source, list/speech_args)
- var/static/regex/lizard_hiss = new("s+", "g")
- var/static/regex/lizard_hiSS = new("S+", "g")
- var/static/regex/lizard_kss = new(@"(\w)x", "g")
- /* // SKYRAT EDIT: REMOVAL
- var/static/regex/lizard_kSS = new(@"(\w)X", "g")
- */
- var/static/regex/lizard_ecks = new(@"\bx([\-|r|R]|\b)", "g")
- var/static/regex/lizard_eckS = new(@"\bX([\-|r|R]|\b)", "g")
- var/message = speech_args[SPEECH_MESSAGE]
- if(message[1] != "*")
- message = lizard_hiss.Replace(message, "sss")
- message = lizard_hiSS.Replace(message, "SSS")
- message = lizard_kss.Replace(message, "$1kss")
- /* // SKYRAT EDIT: REMOVAL
- message = lizard_kSS.Replace(message, "$1KSS")
- */
- message = lizard_ecks.Replace(message, "ecks$1")
- message = lizard_eckS.Replace(message, "ECKS$1")
- //SKYRAT EDIT START: Adding russian version to autohiss
- if(CONFIG_GET(flag/russian_text_formation))
- var/static/regex/lizard_hiss_ru = new("с+", "g")
- var/static/regex/lizard_hiSS_ru = new("С+", "g")
- message = replacetext(message, "з", "с")
- message = replacetext(message, "З", "С")
- message = replacetext(message, "ж", "ш")
- message = replacetext(message, "Ж", "Ш")
- message = lizard_hiss_ru.Replace(message, "ссс")
- message = lizard_hiSS_ru.Replace(message, "ССС")
- //SKYRAT EDIT END: Adding russian version to autohiss
- speech_args[SPEECH_MESSAGE] = message
+/obj/item/organ/internal/tongue/lizard/New(class, timer, datum/mutation/human/copymut)
+ . = ..()
+ AddComponent(/datum/component/speechmod, replacements = CONFIG_GET(flag/russian_text_formation) ? russian_speech_replacements : speech_replacements, should_modify_speech = CALLBACK(src, PROC_REF(should_modify_speech))) // SKYRAT EDIT CHANGE - ORIGINAL: AddComponent(/datum/component/speechmod, replacements = speech_replacements, should_modify_speech = CALLBACK(src, PROC_REF(should_modify_speech)))
/obj/item/organ/internal/tongue/lizard/silver
name = "silver tongue"
@@ -565,6 +567,7 @@ GLOBAL_LIST_INIT(english_to_zombie, list())
attack_verb_simple = list("beep", "boop")
modifies_speech = TRUE
taste_sensitivity = 25 // not as good as an organic tongue
+ organ_traits = list(TRAIT_SILICON_EMOTES_ALLOWED)
voice_filter = "alimiter=0.9,acompressor=threshold=0.2:ratio=20:attack=10:release=50:makeup=2,highpass=f=1000"
/obj/item/organ/internal/tongue/robot/could_speak_language(datum/language/language_path)
diff --git a/code/modules/surgery/surgery_step.dm b/code/modules/surgery/surgery_step.dm
index 5172900fcc3950..4058348b179ed5 100644
--- a/code/modules/surgery/surgery_step.dm
+++ b/code/modules/surgery/surgery_step.dm
@@ -194,7 +194,7 @@
return
if(target.stat >= UNCONSCIOUS)
var/datum/mood_event/surgery/target_mood_event = target.mob_mood.mood_events[SURGERY_MOOD_CATEGORY]
- if(target_mood_event?.surgery_completed) //don't give sleeping mobs trauma. that said, if they fell asleep mid-surgery after already getting the bad mood, lets make sure they wake up to a (hopefully) happy memory.
+ if(!target_mood_event || target_mood_event.surgery_completed) //don't give sleeping mobs trauma. that said, if they fell asleep mid-surgery after already getting the bad mood, lets make sure they wake up to a (hopefully) happy memory.
return
switch(surgery_state)
if(SURGERY_STATE_STARTED)
diff --git a/code/modules/tgs/README.md b/code/modules/tgs/README.md
index 6319028d8106db..35ca73d7e9a8ec 100644
--- a/code/modules/tgs/README.md
+++ b/code/modules/tgs/README.md
@@ -1,6 +1,6 @@
# DMAPI Internals
-This folder should be placed on it's own inside a codebase that wishes to use the TGS DMAPI. Warranty void if modified.
+This folder should be placed on its own inside a codebase that wishes to use the TGS DMAPI. Warranty void if modified.
- [includes.dm](./includes.dm) is the file that should be included by DM code, it handles including the rest.
- The [core](./core) folder includes all code not directly part of any API version.
diff --git a/code/modules/tgs/v5/api.dm b/code/modules/tgs/v5/api.dm
index 95b8edd3ee5c2e..05d0dee25b3c2e 100644
--- a/code/modules/tgs/v5/api.dm
+++ b/code/modules/tgs/v5/api.dm
@@ -50,7 +50,9 @@
version = null // we want this to be the TGS version, not the interop version
// sleep once to prevent an issue where world.Export on the first tick can hang indefinitely
+ TGS_DEBUG_LOG("Starting Export bug prevention sleep tick. time:[world.time] sleep_offline:[world.sleep_offline]")
sleep(world.tick_lag)
+ TGS_DEBUG_LOG("Export bug prevention sleep complete")
var/list/bridge_response = Bridge(DMAPI5_BRIDGE_COMMAND_STARTUP, list(DMAPI5_BRIDGE_PARAMETER_MINIMUM_SECURITY_LEVEL = minimum_required_security_level, DMAPI5_BRIDGE_PARAMETER_VERSION = api_version.raw_parameter, DMAPI5_PARAMETER_CUSTOM_COMMANDS = ListCustomCommands(), DMAPI5_PARAMETER_TOPIC_PORT = GetTopicPort()))
if(!istype(bridge_response))
diff --git a/code/modules/transport/elevator/elev_controller.dm b/code/modules/transport/elevator/elev_controller.dm
index aae79cfe0f14b3..870211ecb56d93 100644
--- a/code/modules/transport/elevator/elev_controller.dm
+++ b/code/modules/transport/elevator/elev_controller.dm
@@ -122,7 +122,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/button/elevator, 32)
return FALSE
// We can't call an elevator that's moving. You may say "you totally can do that", but that's not modelled
- if(lift.controls_locked == LIFT_PLATFORM_LOCKED)
+ if(lift.controller_status & CONTROLS_LOCKED)
loc.balloon_alert(activator, "elevator is moving!")
return FALSE
diff --git a/code/modules/transport/elevator/elev_music_zone.dm b/code/modules/transport/elevator/elev_music_zone.dm
index 045407fe7819a8..8379e742caea5c 100644
--- a/code/modules/transport/elevator/elev_music_zone.dm
+++ b/code/modules/transport/elevator/elev_music_zone.dm
@@ -83,8 +83,6 @@ GLOBAL_LIST_EMPTY(elevator_music)
/datum/proximity_monitor/advanced/elevator_music_area/field_turf_uncrossed(mob/exited, turf/old_location, turf/new_location)
if (!(exited in tracked_mobs))
return
- if (exited.z == host.z && get_dist(exited, host) <= current_range)
- return
qdel(tracked_mobs[exited])
tracked_mobs -= exited
UnregisterSignal(exited, COMSIG_QDELETING)
diff --git a/code/modules/transport/elevator/elev_panel.dm b/code/modules/transport/elevator/elev_panel.dm
index 76b95922dfe66d..0b5e99bdbb059b 100644
--- a/code/modules/transport/elevator/elev_panel.dm
+++ b/code/modules/transport/elevator/elev_panel.dm
@@ -276,7 +276,7 @@
var/datum/transport_controller/linear/lift = lift_weakref?.resolve()
if(lift)
data["lift_exists"] = TRUE
- data["currently_moving"] = lift.controls_locked == LIFT_PLATFORM_LOCKED
+ data["currently_moving"] = lift.controller_status & CONTROLS_LOCKED
data["currently_moving_to_floor"] = last_move_target
data["current_floor"] = lift.transport_modules[1].z
@@ -319,7 +319,7 @@
return TRUE // Something is inaccurate, update UI
var/datum/transport_controller/linear/lift = lift_weakref?.resolve()
- if(!lift || lift.controls_locked == LIFT_PLATFORM_LOCKED)
+ if(!lift || lift.controller_status & CONTROLS_LOCKED)
return TRUE // We shouldn't be moving anything, update UI
INVOKE_ASYNC(lift, TYPE_PROC_REF(/datum/transport_controller/linear, move_to_zlevel), desired_z, CALLBACK(src, PROC_REF(check_panel)), usr)
diff --git a/code/modules/transport/linear_controller.dm b/code/modules/transport/linear_controller.dm
index 80c161c32918d3..1b3ffd30c148f9 100644
--- a/code/modules/transport/linear_controller.dm
+++ b/code/modules/transport/linear_controller.dm
@@ -1,3 +1,6 @@
+/// If anyone changes the hydraulic sound effect I sure hope they update this...
+#define HYDRAULIC_SFX_DURATION (2 SECONDS)
+
///coordinate and control movement across linked transport_controllers. allows moving large single multitile platforms and many 1 tile platforms.
///also is capable of linking platforms across linked z levels
/datum/transport_controller/linear
@@ -10,6 +13,7 @@
/obj/machinery/power/supermatter_crystal,
/obj/structure/holosign,
/obj/machinery/field,
+ /obj/structure/fluff/tram_rail,
)
///whether the lift handled by this transport_controller datum is multitile as opposed to nxm platforms per z level
@@ -32,9 +36,6 @@
///bitfield of various transport states
var/controller_status = NONE
- ///if true, the platform cannot be manually moved.
- var/controls_locked = FALSE
-
/// probability of being thrown hard during an emergency stop
var/throw_chance = 17.5
@@ -343,10 +344,8 @@
// Get the lowest or highest platform according to which direction we're moving
var/obj/structure/transport/linear/prime_lift = return_closest_platform_to_z(direction == UP ? world.maxz : 0)
- // If anyone changes the hydraulic sound effect I sure hope they update this variable...
- var/hydraulic_sfx_duration = 2 SECONDS
// ...because we use the duration of the sound effect to make it last for roughly the duration of the lift travel
- playsound(prime_lift, 'sound/mecha/hydraulic.ogg', 25, vary = TRUE, frequency = clamp(hydraulic_sfx_duration / lift_move_duration, 0.33, 3))
+ playsound(prime_lift, 'sound/mecha/hydraulic.ogg', 25, vary = TRUE, frequency = clamp(HYDRAULIC_SFX_DURATION / lift_move_duration, 0.33, 3))
// Move the platform after a timer
addtimer(CALLBACK(src, PROC_REF(move_lift_vertically), direction, user), lift_move_duration, TIMER_UNIQUE)
@@ -465,6 +464,7 @@
// Close all lift doors
update_lift_doors(action = CYCLE_CLOSED)
+ sleep(1.1 SECONDS)
// Approach the desired z-level one step at a time
for(var/i in 1 to z_difference)
if(!Check_lift_move(direction))
@@ -482,7 +482,7 @@
if(QDELETED(src) || QDELETED(prime_lift))
return
- addtimer(CALLBACK(src, PROC_REF(open_lift_doors_callback)), 2 SECONDS)
+ update_lift_doors(get_zs_we_are_on(), action = CYCLE_OPEN)
SEND_SIGNAL(src, COMSIG_LIFT_SET_DIRECTION, 0)
controls_lock(FALSE)
return TRUE
@@ -636,3 +636,5 @@
lift_to_reset.reset_contents(consider_anything_past, foreign_objects, foreign_non_player_mobs, consider_player_mobs)
return TRUE
+
+#undef HYDRAULIC_SFX_DURATION
diff --git a/code/modules/transport/tram/tram_floors.dm b/code/modules/transport/tram/tram_floors.dm
index 9f0b6907fe9c19..f267ccf5cdc847 100644
--- a/code/modules/transport/tram/tram_floors.dm
+++ b/code/modules/transport/tram/tram_floors.dm
@@ -183,7 +183,7 @@
integrity_failure = 0.75
armor_type = /datum/armor/tram_floor
layer = TRAM_FLOOR_LAYER
- plane = FLOOR_PLANE
+ plane = GAME_PLANE
obj_flags = BLOCK_Z_OUT_DOWN | BLOCK_Z_OUT_UP
appearance_flags = PIXEL_SCALE|KEEP_TOGETHER
var/secured = TRUE
diff --git a/code/modules/transport/tram/tram_signals.dm b/code/modules/transport/tram/tram_signals.dm
index db8aa17ddcb3ec..faf4a46e11e286 100644
--- a/code/modules/transport/tram/tram_signals.dm
+++ b/code/modules/transport/tram/tram_signals.dm
@@ -473,6 +473,7 @@
icon_state = "sensor-base"
desc = "Uses an infrared beam to detect passing trams. Works when paired with a sensor on the other side of the track."
layer = TRAM_RAIL_LAYER
+ plane = FLOOR_PLANE
use_power = NO_POWER_USE
circuit = /obj/item/circuitboard/machine/guideway_sensor
/// Sensors work in a married pair
diff --git a/code/modules/transport/transport_module.dm b/code/modules/transport/transport_module.dm
index 268452743e7b24..af8f4199438db3 100644
--- a/code/modules/transport/transport_module.dm
+++ b/code/modules/transport/transport_module.dm
@@ -14,7 +14,7 @@
armor_type = /datum/armor/transport_module
max_integrity = 50
layer = TRAM_FLOOR_LAYER
- plane = FLOOR_PLANE
+ plane = GAME_PLANE
smoothing_flags = SMOOTH_BITMASK
smoothing_groups = SMOOTH_GROUP_INDUSTRIAL_LIFT
canSmoothWith = SMOOTH_GROUP_INDUSTRIAL_LIFT
@@ -378,19 +378,19 @@
for(var/obj/structure/victim_structure in dest_turf.contents)
if(QDELING(victim_structure))
continue
- if(!is_type_in_typecache(victim_structure, transport_controller_datum.ignored_smashthroughs) && victim_structure.layer >= LOW_OBJ_LAYER)
-
- if(victim_structure.anchored && initial(victim_structure.anchored) == TRUE)
- visible_message(span_danger("[src] smashes through [victim_structure]!"))
- victim_structure.deconstruct(FALSE)
-
- else
- if(!throw_target)
- throw_target = get_edge_target_turf(src, turn(travel_direction, pick(45, -45)))
- visible_message(span_danger("[src] violently rams [victim_structure] out of the way!"))
- victim_structure.anchored = FALSE
- victim_structure.take_damage(rand(20, 25) * collision_lethality)
- victim_structure.throw_at(throw_target, 200 * collision_lethality, 4 * collision_lethality)
+ if(!is_type_in_typecache(victim_structure, transport_controller_datum.ignored_smashthroughs))
+ if((victim_structure.plane == FLOOR_PLANE && victim_structure.layer > TRAM_RAIL_LAYER) || (victim_structure.plane == GAME_PLANE && victim_structure.layer > LOW_OBJ_LAYER) )
+ if(victim_structure.anchored && initial(victim_structure.anchored) == TRUE)
+ visible_message(span_danger("[src] smashes through [victim_structure]!"))
+ victim_structure.deconstruct(FALSE)
+
+ else
+ if(!throw_target)
+ throw_target = get_edge_target_turf(src, turn(travel_direction, pick(45, -45)))
+ visible_message(span_danger("[src] violently rams [victim_structure] out of the way!"))
+ victim_structure.anchored = FALSE
+ victim_structure.take_damage(rand(20, 25) * collision_lethality)
+ victim_structure.throw_at(throw_target, 200 * collision_lethality, 4 * collision_lethality)
for(var/obj/machinery/victim_machine in dest_turf.contents)
if(QDELING(victim_machine))
diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm
index 48efd14e44ee81..a3e1680a0a6a8d 100644
--- a/code/modules/unit_tests/_unit_tests.dm
+++ b/code/modules/unit_tests/_unit_tests.dm
@@ -96,6 +96,7 @@
#include "armor_verification.dm"
#include "atmospherics_sanity.dm"
#include "autowiki.dm"
+#include "bake_a_cake.dm"
#include "barsigns.dm"
#include "baseturfs.dm"
#include "bespoke_id.dm"
@@ -138,6 +139,7 @@
#include "dummy_spawn.dm"
#include "dynamic_ruleset_sanity.dm"
#include "egg_glands.dm"
+#include "embedding.dm"
#include "emoting.dm"
#include "ensure_subtree_operational_datum.dm"
#include "explosion_action.dm"
@@ -214,6 +216,7 @@
#include "pills.dm"
#include "plane_double_transform.dm"
#include "plane_dupe_detector.dm"
+#include "plane_sanity.dm"
#include "plantgrowth_tests.dm"
#include "preference_species.dm"
#include "preferences.dm"
diff --git a/code/modules/unit_tests/bake_a_cake.dm b/code/modules/unit_tests/bake_a_cake.dm
new file mode 100644
index 00000000000000..a4013d1c137941
--- /dev/null
+++ b/code/modules/unit_tests/bake_a_cake.dm
@@ -0,0 +1,77 @@
+/**
+ * Confirm that it is possible to bake a cake, get the food buff from a hand-made food and confirm that the reagents are consistent throughout the process
+ */
+/datum/unit_test/bake_a_cake/Run()
+ var/turf/table_loc = run_loc_floor_bottom_left
+ var/turf/oven_loc = get_step(run_loc_floor_bottom_left, EAST)
+ var/turf/human_loc = get_step(run_loc_floor_bottom_left, NORTHEAST)
+ var/mob/living/carbon/human/human = allocate(/mob/living/carbon/human/consistent, human_loc)
+ var/obj/machinery/oven/the_oven = allocate(/obj/machinery/oven, oven_loc)
+ var/obj/structure/table/the_table = allocate(/obj/structure/table, table_loc)
+ var/obj/item/knife/kitchen/a_knife = allocate(/obj/item/knife/kitchen, table_loc)
+ var/obj/item/reagent_containers/cup/beaker/beaker = allocate(/obj/item/reagent_containers/cup/beaker, table_loc)
+ var/obj/item/reagent_containers/condiment/flour/flour_bag = allocate(/obj/item/reagent_containers/condiment/flour, table_loc)
+ var/obj/item/reagent_containers/condiment/sugar/sugar_bag = allocate(/obj/item/reagent_containers/condiment/sugar, table_loc)
+ var/obj/item/storage/fancy/egg_box/egg_box = allocate(/obj/item/storage/fancy/egg_box, table_loc)
+ var/obj/item/food/egg/sample_egg = egg_box.contents[1]
+
+ var/datum/chemical_reaction/recipe = GLOB.chemical_reactions_list[/datum/chemical_reaction/food/cakebatter]
+ var/sugar_required = recipe.required_reagents[/datum/reagent/consumable/sugar]
+ var/flour_required = recipe.required_reagents[/datum/reagent/consumable/flour]
+ var/eggyolk_required = recipe.required_reagents[/datum/reagent/consumable/eggyolk]
+ var/eggwhite_required = recipe.required_reagents[/datum/reagent/consumable/eggwhite]
+ var/total_volume = sugar_required + flour_required + eggyolk_required + eggwhite_required
+
+ var/sugar_purity = sugar_bag.reagents.get_average_purity()
+ TEST_ASSERT_EQUAL(sugar_purity, 1, "Incorrect sugar purity!")
+ var/flour_purity = flour_bag.reagents.get_average_purity()
+ TEST_ASSERT_EQUAL(flour_purity, CONSUMABLE_STANDARD_PURITY, "Incorrect flour purity!")
+ var/egg_purity = sample_egg.reagents.get_average_purity()
+ TEST_ASSERT_EQUAL(egg_purity, CONSUMABLE_STANDARD_PURITY, "Incorrect egg reagents purity!")
+
+ human.mind = new /datum/mind(null) // Add brain for the food buff
+
+ // It's a piece of cake to bake a pretty cake
+ while(beaker.reagents.get_reagent_amount(/datum/reagent/consumable/sugar) < sugar_required && beaker.reagents.total_volume < total_volume)
+ sugar_bag.melee_attack_chain(human, beaker)
+ while(beaker.reagents.get_reagent_amount(/datum/reagent/consumable/flour) < flour_required && beaker.reagents.total_volume < total_volume)
+ flour_bag.melee_attack_chain(human, beaker)
+ while((beaker.reagents.get_reagent_amount(/datum/reagent/consumable/eggyolk) < eggyolk_required \
+ || beaker.reagents.get_reagent_amount(/datum/reagent/consumable/eggwhite) < eggwhite_required) \
+ && beaker.reagents.total_volume < total_volume \
+ && beaker.reagents.total_volume >= (sugar_required + flour_required)) // Make sure that we won't miss the reaction
+ var/obj/item/egg = egg_box.contents[1]
+ egg.melee_attack_chain(human, beaker, RIGHT_CLICK)
+ var/obj/item/food/cake_batter = locate(/obj/item/food/cakebatter) in table_loc
+ TEST_ASSERT_NOTNULL(cake_batter, "Failed making cake batter!")
+ TEST_ASSERT_EQUAL(beaker.reagents.total_volume, 0, "Cake batter did not consume all beaker reagents!")
+
+ var/batter_purity = cake_batter.reagents.get_average_purity()
+ var/batter_purity_expected = (sugar_required * sugar_purity + flour_required * flour_purity + (eggyolk_required + eggwhite_required) * egg_purity) / total_volume
+ TEST_ASSERT_EQUAL(batter_purity, batter_purity_expected, "Incorrect average purity of the cake batter reagents!")
+
+ the_oven.add_tray_to_oven(new /obj/item/plate/oven_tray(the_oven)) // Doesn't have one unless maploaded
+ the_oven.attack_hand(human)
+ var/obj/item/plate/oven_tray/oven_tray = locate(/obj/item/plate/oven_tray) in the_oven.contents
+ TEST_ASSERT_NOTNULL(oven_tray, "The oven doesn't have a tray!")
+ cake_batter.melee_attack_chain(human, oven_tray, list2params(list(ICON_X = 0, ICON_Y = 0)))
+ the_oven.attack_hand(human)
+ the_oven.process(90 SECONDS) // Bake it
+ the_oven.attack_hand(human)
+ var/obj/item/food/cake/plain/cake = locate(/obj/item/food/cake/plain) in oven_tray.contents
+ TEST_ASSERT_NOTNULL(cake, "Didn't manage to bake a cake!")
+
+ cake.melee_attack_chain(human, the_table, list2params(list(ICON_X = 0, ICON_Y = 0)))
+ a_knife.melee_attack_chain(human, cake)
+ var/obj/item/food/cakeslice/plain/cake_slice = locate(/obj/item/food/cakeslice/plain) in table_loc
+ TEST_ASSERT_NOTNULL(cake_slice, "Didn't manage to cut the cake!")
+
+ var/cake_slice_purity = cake_slice.reagents.get_average_purity()
+ TEST_ASSERT_EQUAL(cake_slice_purity, batter_purity_expected, "Incorrect average purity of the cake slice reagents!")
+
+ cake_slice.attack_hand(human) // Pick it up
+ var/datum/component/edible/edible_comp = cake_slice.GetComponent(/datum/component/edible)
+ edible_comp.eat_time = 0
+ cake_slice.attack(human, human) // Eat it
+ var/datum/status_effect/food/effect = locate(/datum/status_effect/food) in human.status_effects
+ TEST_ASSERT_NOTNULL(effect, "Eating the cake had no effect!")
diff --git a/code/modules/unit_tests/embedding.dm b/code/modules/unit_tests/embedding.dm
new file mode 100644
index 00000000000000..a163a55c364795
--- /dev/null
+++ b/code/modules/unit_tests/embedding.dm
@@ -0,0 +1,16 @@
+/datum/unit_test/embedding
+
+/datum/unit_test/embedding/Run()
+ var/mob/living/carbon/human/victim = allocate(/mob/living/carbon/human/consistent)
+ var/mob/living/carbon/human/firer = allocate(/mob/living/carbon/human/consistent)
+ var/obj/projectile/bullet/c38/bullet = new(get_turf(firer))
+ bullet.set_embed(bullet.get_embed().generate_with_values(embed_chance = 100))
+ TEST_ASSERT_EQUAL(bullet.get_embed().embed_chance, 100, "embed_chance failed to modify")
+ bullet.preparePixelProjectile(victim, firer)
+ bullet.fire(get_angle(firer, victim), victim)
+ // SKYRAT EDIT REMOVAL START - TODO - Figure out why it's not embedding during the unit test and fix it.
+ var/list/components = victim.GetComponents(/datum/component/embedded)
+ TEST_ASSERT_EQUAL(components.len, 1, "Projectile with 100% embed chance didn't embed, or embedded multiple times")
+ var/datum/component/embedded/comp = components[1]
+ TEST_ASSERT_EQUAL(comp.weapon.get_embed().embed_chance, 100, "embed_chance modification did not transfer to shrapnel")
+ // SKYRATEDIT REMOVAL END
diff --git a/code/modules/unit_tests/fish_unit_tests.dm b/code/modules/unit_tests/fish_unit_tests.dm
index d0d39227f43b73..1db534c5e076cb 100644
--- a/code/modules/unit_tests/fish_unit_tests.dm
+++ b/code/modules/unit_tests/fish_unit_tests.dm
@@ -96,6 +96,12 @@
cloner = new(src)
sterile = new(src)
+/obj/structure/aquarium/traits/Destroy()
+ crossbreeder = null
+ cloner = null
+ sterile = null
+ return ..()
+
/obj/item/fish/testdummy/crossbreeder
fish_traits = list(/datum/fish_trait/crossbreeder)
@@ -115,6 +121,11 @@
evolve = new(src)
evolve_two = new(src)
+/obj/structure/aquarium/evolution/Destroy()
+ evolve = null
+ evolve_two = null
+ return ..()
+
/obj/item/fish/testdummy/evolve
compatible_types = list(/obj/item/fish/testdummy/evolve_two)
evolution_types = list(/datum/fish_evolution/dummy)
@@ -210,5 +221,53 @@
run_loc_floor_bottom_left.ChangeTurf(original_turf_type, original_turf_baseturfs)
return ..()
+///Check that you can actually raise a chasm crab without errors.
+/datum/unit_test/raise_a_chasm_crab
+
+/datum/unit_test/raise_a_chasm_crab/Run()
+ var/obj/structure/aquarium/crab/aquarium = allocate(/obj/structure/aquarium/crab)
+ var/mob/living/basic/mining/lobstrosity/juvenile/lobster = aquarium.crabbie.grow_up(1) //one stands for a second
+ TEST_ASSERT(lobster, "The test aquarium's chasm crab didn't grow up into a lobstrosity.[aquarium.crabbie ? " The aquarium crab is still here and at about [aquarium.crabbie.maturation]% maturation" : ""]")
+ allocated |= lobster //make sure it's allocated and thus properly deleted when the test is over
+ TEST_ASSERT_EQUAL(lobster.loc, get_turf(aquarium), "The lobstrosity didn't spawn on the aquarium's turf")
+ //While ideally impossible to have all traits because of incompatible ones, I want to be sure they don't error out.
+ for(var/trait_type in GLOB.fish_traits)
+ var/datum/fish_trait/trait = GLOB.fish_traits[trait_type]
+ trait.apply_to_mob(lobster)
+
+/obj/structure/aquarium/crab
+ allow_breeding = TRUE //needed for growing up
+ ///Our test subject
+ var/obj/item/fish/chasm_crab/instant_growth/crabbie
+
+/obj/structure/aquarium/crab/Initialize(mapload)
+ . = ..()
+ crabbie = new(src)
+
+/obj/structure/aquarium/crab/Exited(atom/movable/gone)
+ . = ..()
+ if(gone == crabbie) //the fish item is deleted once it grows up
+ crabbie = null
+
+/obj/item/fish/chasm_crab/instant_growth
+ growth_rate = 100
+ fish_traits = list() //We don't want to end up applying traits twice on the resulting lobstrosity
+
+/datum/unit_test/explosive_fishing
+
+/datum/unit_test/explosive_fishing/Run()
+ var/datum/fish_source/source = GLOB.preset_fish_sources[/datum/fish_source/unit_test]
+ source.spawn_reward_from_explosion(run_loc_floor_bottom_left, 1)
+ if(length(source.fish_table))
+ TEST_FAIL("The unit test item wasn't removed/spawned from fish_table during 'spawn_reward_from_explosion'.")
+
+/datum/fish_source/unit_test
+ fish_table = list(
+ /obj/item/wrench = 1,
+ )
+ fish_counts = list(
+ /obj/item/wrench = 1,
+ )
+
#undef TRAIT_FISH_TESTING
diff --git a/code/modules/unit_tests/focus_only_tests.dm b/code/modules/unit_tests/focus_only_tests.dm
index 15d04ee8852334..31f34d9f2fb948 100644
--- a/code/modules/unit_tests/focus_only_tests.dm
+++ b/code/modules/unit_tests/focus_only_tests.dm
@@ -47,3 +47,6 @@
/// Checks that maploaded mobs with either the `atmos_requirements` or `body_temp_sensitive`
/datum/unit_test/focus_only/atmos_and_temp_requirements
+
+/// Ensures only whitelisted planes can have TOPDOWN_LAYERing, and vis versa
+/datum/unit_test/focus_only/topdown_filtering
diff --git a/code/modules/unit_tests/inhands.dm b/code/modules/unit_tests/inhands.dm
index 7edda7858f87c7..863bbca65636a7 100644
--- a/code/modules/unit_tests/inhands.dm
+++ b/code/modules/unit_tests/inhands.dm
@@ -32,7 +32,7 @@
var/skip_left
var/skip_right
- if(initial(item_path.greyscale_colors)) //greyscale stuff has it's own unit test.
+ if(initial(item_path.greyscale_colors)) //greyscale stuff has its own unit test.
skip_left = initial(item_path.greyscale_config_inhand_left)
skip_right = initial(item_path.greyscale_config_inhand_right)
if(skip_left && skip_right)
diff --git a/code/modules/unit_tests/knockoff_component.dm b/code/modules/unit_tests/knockoff_component.dm
index 20990a755cd24e..60dd9c2225b001 100644
--- a/code/modules/unit_tests/knockoff_component.dm
+++ b/code/modules/unit_tests/knockoff_component.dm
@@ -79,7 +79,7 @@
shoves_the_guy.disarm(wears_the_glasses)
TEST_ASSERT(wears_the_glasses.glasses != glasses, "Dummy kept their glasses, even though were disarm shoved into a wall.")
-/// Helper to reset the glasses dummy back to it's original position, clear knockdown, and return glasses (if gone)
+/// Helper to reset the glasses dummy back to its original position, clear knockdown, and return glasses (if gone)
/datum/unit_test/knockoff_component/proc/set_glasses_wearer(mob/living/carbon/human/wearer, turf/reset_to, obj/item/clothing/glasses/reset_worn)
wearer.forceMove(reset_to)
wearer.SetKnockdown(0 SECONDS)
diff --git a/code/modules/unit_tests/plane_sanity.dm b/code/modules/unit_tests/plane_sanity.dm
new file mode 100644
index 00000000000000..890a0531908a44
--- /dev/null
+++ b/code/modules/unit_tests/plane_sanity.dm
@@ -0,0 +1,10 @@
+/// Ensures we have no invalid plane/layer combos post init
+/datum/unit_test/plane_layer_sanity
+ priority = TEST_LONGER
+
+/datum/unit_test/plane_layer_sanity/Run()
+ // This fucker's gonna be slow, I'm sorry
+ for(var/mutable_appearance/appearance)
+ check_topdown_validity(appearance)
+ for(var/atom/thing)
+ check_topdown_validity(thing)
diff --git a/code/modules/unit_tests/say.dm b/code/modules/unit_tests/say.dm
index 6fde4de9dbc2dc..375857459258b2 100644
--- a/code/modules/unit_tests/say.dm
+++ b/code/modules/unit_tests/say.dm
@@ -22,6 +22,46 @@
TEST_ASSERT(!expected_mods.len,
"Some message mods were expected, but were not returned by get_message_mods: [json_encode(expected_mods)]. Message: [message]")
+/// Test to ensure native tongue languages properly impact speech
+/datum/unit_test/speech_modifiers
+ var/mob/living/carbon/human/talking_lizard
+ var/list/handle_speech_result = null
+
+/datum/unit_test/speech_modifiers/proc/handle_speech(datum/source, list/speech_args)
+ SIGNAL_HANDLER
+
+ TEST_ASSERT(speech_args[SPEECH_MESSAGE], "Handle speech signal does not have a message arg")
+ TEST_ASSERT(speech_args[SPEECH_LANGUAGE], "Handle speech signal does not have a language arg")
+
+ // saving hearing_args directly via handle_speech_result = speech_args won't work since the arg list
+ // is a temporary variable that gets garbage collected after it's done being used by procs
+ // therefore we need to create a new list and transfer the args
+ handle_speech_result = list()
+ handle_speech_result += speech_args
+
+/datum/unit_test/speech_modifiers/Run()
+ talking_lizard = allocate(/mob/living/carbon/human/consistent)
+ talking_lizard.set_species(/datum/species/lizard)
+ var/hissed_quote = "SSShe isss ssso sssasssy"
+ var/unhissed_quote = "She is so sassy"
+
+ RegisterSignal(talking_lizard, COMSIG_MOB_SAY, PROC_REF(handle_speech))
+
+ // lizard's forked tongue causes hissing when speaking common
+ talking_lizard.set_active_language(/datum/language/common)
+ talking_lizard.say(unhissed_quote)
+ TEST_ASSERT(handle_speech_result, "Handle speech signal was not fired")
+ TEST_ASSERT_EQUAL(hissed_quote, handle_speech_result[SPEECH_MESSAGE], "Speech modifier test failed: [handle_speech_result[SPEECH_LANGUAGE]] did not equal [hissed_quote] when spoken by a lizard in language [handle_speech_result[SPEECH_LANGUAGE]]")
+
+ handle_speech_result = null
+
+ // lizard's forked tongue does not cause hissing when speaking native draconic
+ talking_lizard.set_active_language(/datum/language/draconic)
+ talking_lizard.say(unhissed_quote)
+ TEST_ASSERT(handle_speech_result, "Handle speech signal was not fired")
+ TEST_ASSERT_EQUAL(unhissed_quote, handle_speech_result[SPEECH_MESSAGE], "Speech modifier test failed: [handle_speech_result[SPEECH_LANGUAGE]] did not equal [unhissed_quote] when spoken by a lizard in language [handle_speech_result[SPEECH_LANGUAGE]]")
+
+
/// Test to verify COMSIG_MOB_SAY is sent the exact same list as the message args, as they're operated on
/datum/unit_test/say_signal
@@ -76,7 +116,7 @@
TEST_ASSERT(speech_args[SPEECH_LANGUAGE], "Handle speech signal does not have a language arg")
TEST_ASSERT(speech_args[SPEECH_RANGE], "Handle speech signal does not have a range arg")
- // saving hearing_args directly via handle_speech_result = speech_args won't work since the arg list
+ // saving speech_args directly via handle_speech_result = speech_args won't work since the arg list
// is a temporary variable that gets garbage collected after it's done being used by procs
// therefore we need to create a new list and transfer the args
handle_speech_result = list()
@@ -126,7 +166,7 @@
var/datum/client_interface/mock_client = new()
listener.mock_client = mock_client
- RegisterSignal(speaker, COMSIG_MOB_SAY, PROC_REF(handle_speech))
+ RegisterSignal(speaker, COMSIG_MOB_SAY, PROC_REF(handle_speech)) //
RegisterSignal(speaker_radio, COMSIG_RADIO_NEW_MESSAGE, PROC_REF(handle_radio_hearing))
RegisterSignal(listener, COMSIG_MOVABLE_HEAR, PROC_REF(handle_hearing))
diff --git a/code/modules/unit_tests/screenshots/cardboard_cutouts_nukie_cutout.png b/code/modules/unit_tests/screenshots/cardboard_cutouts_nukie_cutout.png
index 6af26b48f78bd6..47061552e62a8d 100644
Binary files a/code/modules/unit_tests/screenshots/cardboard_cutouts_nukie_cutout.png and b/code/modules/unit_tests/screenshots/cardboard_cutouts_nukie_cutout.png differ
diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_voidwalker.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_voidwalker.png
new file mode 100644
index 00000000000000..08ff8c889d2fe0
Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_antag_icons_voidwalker.png differ
diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_voidwalker.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_voidwalker.png
new file mode 100644
index 00000000000000..78962671d11928
Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_voidwalker.png differ
diff --git a/code/modules/unit_tests/turf_icons.dm b/code/modules/unit_tests/turf_icons.dm
index e7b7d722ffb4a2..f9d8296419edd0 100644
--- a/code/modules/unit_tests/turf_icons.dm
+++ b/code/modules/unit_tests/turf_icons.dm
@@ -30,7 +30,7 @@
//ignored_types += typesof(YOUR_DOWNSTREAM_TYPEPATH(s)_HERE) //MODULARITY SUPPORT. If you have snowflake typepaths that are blacklisted in, for example, create & destroy unit test because they require certain SS's being init, use this to blacklist them.
//SKYRAT EDIT START
ignored_types += typesof(/turf/open/openspace/ocean)
- ignored_types += typesof(/turf/open/floor/plating/ocean)
+ ignored_types += typesof(/turf/open/misc/ocean)
// SKYRAT EDIT END
diff --git a/code/modules/unit_tests/worn_icons.dm b/code/modules/unit_tests/worn_icons.dm
index 32c0b2e8fe6d9a..5b308d9a4ff25d 100644
--- a/code/modules/unit_tests/worn_icons.dm
+++ b/code/modules/unit_tests/worn_icons.dm
@@ -53,65 +53,51 @@
continue
var/icon_file //checks against all the default icon locations if one isn't defined.
- var/fail_reasons
- var/spacer
if(cached_slot_flags & ITEM_SLOT_BACK)
icon_file = 'icons/mob/clothing/back.dmi'
if(!(icon_state in icon_states(icon_file, 1)))
already_warned_icons += icon_state
- fail_reasons += "[item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]"
- spacer = "\n\t"
+ TEST_FAIL("[item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]")
if(cached_slot_flags & ITEM_SLOT_ID)
icon_file = 'icons/mob/clothing/id.dmi'
if(!(icon_state in icon_states(icon_file, 1)))
already_warned_icons += icon_state
- fail_reasons += "[spacer][item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]"
- spacer = "\n\t"
+ TEST_FAIL("[item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]")
if(cached_slot_flags & ITEM_SLOT_GLOVES)
icon_file = 'icons/mob/clothing/hands.dmi'
if(!(icon_state in icon_states(icon_file, 1)))
already_warned_icons += icon_state
- fail_reasons += "[spacer][item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]"
- spacer = "\n\t"
+ TEST_FAIL("[item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]")
if(cached_slot_flags & ITEM_SLOT_EYES)
icon_file = 'icons/mob/clothing/eyes.dmi'
if(!(icon_state in icon_states(icon_file, 1)))
already_warned_icons += icon_state
- fail_reasons += "[spacer][item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]"
- spacer = "\n\t"
+ TEST_FAIL("[item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]")
if(cached_slot_flags & ITEM_SLOT_EARS)
icon_file = 'icons/mob/clothing/ears.dmi'
if(!(icon_state in icon_states(icon_file, 1)))
already_warned_icons += icon_state
- fail_reasons += "[spacer][item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]"
- spacer = "\n\t"
+ TEST_FAIL("[item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]")
if(cached_slot_flags & ITEM_SLOT_NECK)
icon_file = 'icons/mob/clothing/neck.dmi'
if(!(icon_state in icon_states(icon_file, 1)))
already_warned_icons += icon_state
- fail_reasons += "[spacer][item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]"
- spacer = "\n\t"
+ TEST_FAIL("[item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]")
if(cached_slot_flags & ITEM_SLOT_MASK)
icon_file = 'icons/mob/clothing/mask.dmi'
if(!(icon_state in icon_states(icon_file, 1)))
already_warned_icons += icon_state
- fail_reasons += "[spacer][item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]"
- spacer = "\n\t"
+ TEST_FAIL("[item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]")
if(cached_slot_flags & ITEM_SLOT_BELT)
icon_file = 'icons/mob/clothing/belt.dmi'
if(!(icon_state in icon_states(icon_file, 1)))
already_warned_icons += icon_state
- fail_reasons += "[spacer][item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]"
- spacer = "\n\t"
-
- if(fail_reasons)
- TEST_FAIL(fail_reasons)
-
+ TEST_FAIL("[item_path] using invalid [worn_icon_state ? "worn_icon_state" : "icon_state"], \"[icon_state]\" in '[icon_file]'[match_message]")
diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
index e17488bc96a6d5..bf963587ae1ccd 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -78,8 +78,8 @@
var/purchase_log_vis = TRUE // Visible in the purchase log?
/// Whether this purchase is restricted or not (VR/Events related)
var/restricted = FALSE
- /// Can this item be deconstructed to unlock certain techweb research nodes?
- var/illegal_tech = TRUE
+ /// Flags related to if an item will provide illegal tech, or trips contraband detectors once spawned in as an item.
+ var/uplink_item_flags = SYNDIE_ILLEGAL_TECH | SYNDIE_TRIPS_CONTRABAND
/// String to be shown instead of the price, e.g for the Random item.
var/cost_override_string = ""
/// Whether this item locks all other items from being purchased. Used by syndicate balloon and a few other purchases.
@@ -142,6 +142,12 @@
spawned_item = spawn_path
if(refundable)
spawned_item.AddElement(/datum/element/uplink_reimburse, (refund_amount ? refund_amount : cost))
+
+
+ if(uplink_item_flags & SYNDIE_TRIPS_CONTRABAND) // Ignore things that shouldn't be detectable as contraband on the station.
+ ADD_TRAIT(spawned_item, TRAIT_CONTRABAND, INNATE_TRAIT)
+ for(var/obj/contained as anything in spawned_item.get_all_contents())
+ ADD_TRAIT(contained, TRAIT_CONTRABAND, INNATE_TRAIT)
var/mob/living/carbon/human/human_user = user
if(istype(human_user) && isitem(spawned_item) && human_user.put_in_hands(spawned_item))
to_chat(human_user, span_boldnotice("[spawned_item] materializes into your hands!"))
@@ -154,8 +160,10 @@
/// Can be used to "de-restrict" some items, such as Nukie guns spawning with Syndicate pins
/datum/uplink_item/proc/spawn_item_for_generic_use(mob/user)
var/atom/movable/created = new item(user.loc)
-
- if(isgun(created))
+ if(uplink_item_flags & SYNDIE_TRIPS_CONTRABAND) // Things that shouldn't be detectable as contraband on the station.
+ ADD_TRAIT(created, TRAIT_CONTRABAND, INNATE_TRAIT)
+ for(var/obj/contained as anything in created.get_all_contents())
+ ADD_TRAIT(contained, TRAIT_CONTRABAND, INNATE_TRAIT)
replace_pin(created)
else if(istype(created, /obj/item/storage/toolbox/guncase))
for(var/obj/item/gun/gun in created)
@@ -205,7 +213,7 @@
name = "Objective-Specific Equipment"
desc = "Equipment necessary for accomplishing specific objectives. If you are seeing this, something has gone wrong."
limited_stock = 1
- illegal_tech = FALSE
+ uplink_item_flags = SYNDIE_TRIPS_CONTRABAND
purchasable_from = parent_type::purchasable_from & ~UPLINK_SPY // Ditto
/datum/uplink_item/special_equipment/purchase(mob/user, datum/component/uplink/U)
diff --git a/code/modules/uplink/uplink_items/ammunition.dm b/code/modules/uplink/uplink_items/ammunition.dm
index 705204f98a15b2..2276485a2b7b5e 100644
--- a/code/modules/uplink/uplink_items/ammunition.dm
+++ b/code/modules/uplink/uplink_items/ammunition.dm
@@ -12,7 +12,7 @@
item = /obj/item/ammo_box/foambox/riot
cost = 2
surplus = 0
- illegal_tech = FALSE
+ uplink_item_flags = SYNDIE_TRIPS_CONTRABAND
purchasable_from = ~UPLINK_SERIOUS_OPS
/datum/uplink_item/ammo/pistol
@@ -21,7 +21,7 @@
item = /obj/item/ammo_box/magazine/m9mm
cost = 1
purchasable_from = ~UPLINK_ALL_SYNDIE_OPS
- illegal_tech = FALSE
+ uplink_item_flags = SYNDIE_TRIPS_CONTRABAND
/datum/uplink_item/ammo/pistolap
name = "9mm Armour Piercing Magazine"
@@ -54,4 +54,4 @@
item = /obj/item/ammo_box/a357
cost = 4
purchasable_from = ~(UPLINK_ALL_SYNDIE_OPS | UPLINK_SPY) //nukies get their own version
- illegal_tech = FALSE
+ uplink_item_flags = SYNDIE_TRIPS_CONTRABAND
diff --git a/code/modules/uplink/uplink_items/badass.dm b/code/modules/uplink/uplink_items/badass.dm
index da7212ee8fc5b2..08cf3affe07410 100644
--- a/code/modules/uplink/uplink_items/badass.dm
+++ b/code/modules/uplink/uplink_items/badass.dm
@@ -14,7 +14,7 @@
cost = 20
lock_other_purchases = TRUE
cant_discount = TRUE
- illegal_tech = FALSE
+ uplink_item_flags = SYNDIE_TRIPS_CONTRABAND
/datum/uplink_item/badass/balloon/spawn_item(spawn_path, mob/user, datum/uplink_handler/uplink_handler, atom/movable/source)
. = ..()
@@ -36,14 +36,14 @@
item = /obj/item/toy/cards/deck/syndicate
cost = 1
surplus = 40
- illegal_tech = FALSE
+ uplink_item_flags = SYNDIE_TRIPS_CONTRABAND
/datum/uplink_item/badass/syndiecigs
name = "Syndicate Smokes"
desc = "Strong flavor, dense smoke, infused with omnizine."
item = /obj/item/storage/fancy/cigarettes/cigpack_syndicate
cost = 2
- illegal_tech = FALSE
+ uplink_item_flags = SYNDIE_TRIPS_CONTRABAND
/datum/uplink_item/badass/syndiecash
name = "Syndicate Briefcase Full of Cash"
@@ -53,7 +53,7 @@
item = /obj/item/storage/briefcase/secure/syndie
cost = 3
restricted = TRUE
- illegal_tech = FALSE
+ uplink_item_flags = SYNDIE_TRIPS_CONTRABAND
/datum/uplink_item/badass/costumes/clown
name = "Clown Costume"
diff --git a/code/modules/uplink/uplink_items/clownops.dm b/code/modules/uplink/uplink_items/clownops.dm
index 8d607cb0d5cc01..a5b4b0ec1df96f 100644
--- a/code/modules/uplink/uplink_items/clownops.dm
+++ b/code/modules/uplink/uplink_items/clownops.dm
@@ -35,7 +35,7 @@
cost = 1 //much cheaper for clown ops than for clowns
item = /obj/item/firing_pin/clown/ultra
purchasable_from = UPLINK_CLOWN_OPS
- illegal_tech = FALSE
+ uplink_item_flags = SYNDIE_TRIPS_CONTRABAND
/datum/uplink_item/weapon_kits/clownopsuperpin
name = "Super Ultra Hilarious Firing Pin"
@@ -43,7 +43,7 @@
cost = 4 //much cheaper for clown ops than for clowns
item = /obj/item/firing_pin/clown/ultra/selfdestruct
purchasable_from = UPLINK_CLOWN_OPS
- illegal_tech = FALSE
+ uplink_item_flags = SYNDIE_TRIPS_CONTRABAND
/datum/uplink_item/weapon_kits/foamsmg
name = "Toy Submachine Gun"
@@ -159,4 +159,4 @@
item = /obj/item/dnainjector/clumsymut
cost = 1
purchasable_from = UPLINK_CLOWN_OPS
- illegal_tech = FALSE
+ uplink_item_flags = SYNDIE_TRIPS_CONTRABAND
diff --git a/code/modules/uplink/uplink_items/dangerous.dm b/code/modules/uplink/uplink_items/dangerous.dm
index 11cca6c442661d..691f4f2c8f37fa 100644
--- a/code/modules/uplink/uplink_items/dangerous.dm
+++ b/code/modules/uplink/uplink_items/dangerous.dm
@@ -29,7 +29,7 @@
throwing weapons. The bolas can knock a target down and the shurikens will embed into limbs."
item = /obj/item/storage/box/syndie_kit/throwing_weapons
cost = 3
- illegal_tech = FALSE
+ uplink_item_flags = SYNDIE_TRIPS_CONTRABAND
/datum/uplink_item/dangerous/sword
name = "Energy Sword"
diff --git a/code/modules/uplink/uplink_items/device_tools.dm b/code/modules/uplink/uplink_items/device_tools.dm
index 05252f8a1af3da..567d359e82efd1 100644
--- a/code/modules/uplink/uplink_items/device_tools.dm
+++ b/code/modules/uplink/uplink_items/device_tools.dm
@@ -12,7 +12,7 @@
item = /obj/item/soap/syndie
cost = 1
surplus = 50
- illegal_tech = FALSE
+ uplink_item_flags = SYNDIE_TRIPS_CONTRABAND
/datum/uplink_item/device_tools/surgerybag
name = "Syndicate Surgery Duffel Bag"
@@ -113,7 +113,7 @@
item = /obj/item/disk/nuclear/fake
cost = 1
surplus = 1
- illegal_tech = FALSE
+ uplink_item_flags = NONE
/datum/uplink_item/device_tools/frame
name = "F.R.A.M.E. disk"
@@ -165,7 +165,7 @@
multitool and combat gloves that are resistant to shocks and heat."
item = /obj/item/storage/toolbox/syndicate
cost = 1
- illegal_tech = FALSE
+ uplink_item_flags = SYNDIE_TRIPS_CONTRABAND
/datum/uplink_item/device_tools/rad_laser
name = "Radioactive Microlaser"
diff --git a/code/modules/uplink/uplink_items/job.dm b/code/modules/uplink/uplink_items/job.dm
index 626e5ca385bae3..f908b10fa205b3 100644
--- a/code/modules/uplink/uplink_items/job.dm
+++ b/code/modules/uplink/uplink_items/job.dm
@@ -21,7 +21,7 @@
desc = "A box of five (5) counterfeit devices. Each single-use device can hold one normal sized object, and impersonate an ordinary postal envelope addressed to whoever you choose. Optionally, can be rigged to activate held items - great for if you want to surprise someone with a primed grenade!"
item = /obj/item/storage/box/syndie_kit/mail_counterfeit
cost = 2
- illegal_tech = FALSE
+ uplink_item_flags = SYNDIE_TRIPS_CONTRABAND
restricted_roles = list(JOB_CARGO_TECHNICIAN, JOB_QUARTERMASTER)
surplus = 5
@@ -45,7 +45,7 @@
item = /obj/item/dnainjector/clumsymut
cost = 1
restricted_roles = list(JOB_CLOWN)
- illegal_tech = FALSE
+ uplink_item_flags = SYNDIE_TRIPS_CONTRABAND
surplus = 25
/datum/uplink_item/role_restricted/ancient_jumpsuit
@@ -70,7 +70,7 @@
cost = 4
item = /obj/item/firing_pin/clown/ultra
restricted_roles = list(JOB_CLOWN)
- illegal_tech = FALSE
+ uplink_item_flags = SYNDIE_TRIPS_CONTRABAND
surplus = 25
/datum/uplink_item/role_restricted/clownsuperpin
@@ -79,7 +79,7 @@
cost = 7
item = /obj/item/firing_pin/clown/ultra/selfdestruct
restricted_roles = list(JOB_CLOWN)
- illegal_tech = FALSE
+ uplink_item_flags = SYNDIE_TRIPS_CONTRABAND
surplus = 25
/datum/uplink_item/role_restricted/syndimmi
@@ -148,7 +148,7 @@
/datum/uplink_item/role_restricted/rebarxbowsyndie
name = "Syndicate Rebar Crossbow"
- desc = "A much more proffessional version of the engineer's bootleg rebar crossbow. 3 shot mag, quicker loading, and better ammo. Owners manual included."
+ desc = "A much more professional version of the engineer's bootleg rebar crossbow. 3 shot mag, quicker loading, and better ammo. Owners manual included."
item = /obj/item/storage/box/syndie_kit/rebarxbowsyndie
cost = 10
restricted_roles = list(JOB_STATION_ENGINEER, JOB_CHIEF_ENGINEER, JOB_ATMOSPHERIC_TECHNICIAN)
@@ -339,7 +339,7 @@
desc = "A highly specialized weapon, the Blast Cannon is actually relatively simple. It contains an attachment for a tank transfer valve mounted to an angled pipe specially constructed \
withstand extreme pressure and temperatures, and has a mechanical trigger for triggering the transfer valve. Essentially, it turns the explosive force of a bomb into a narrow-angle \
blast wave \"projectile\". Aspiring scientists may find this highly useful, as forcing the pressure shockwave into a narrow angle seems to be able to bypass whatever quirk of physics \
- disallows explosive ranges above a certain distance, allowing for the device to use the theoretical yield of a transfer valve bomb, instead of the factual yield. It's simple design makes it easy to conceal."
+ disallows explosive ranges above a certain distance, allowing for the device to use the theoretical yield of a transfer valve bomb, instead of the factual yield. Its simple design makes it easy to conceal."
progression_minimum = 30 MINUTES
item = /obj/item/gun/blastcannon
cost = 14 //High cost because of the potential for extreme damage in the hands of a skilled scientist.
diff --git a/code/modules/uplink/uplink_items/nukeops.dm b/code/modules/uplink/uplink_items/nukeops.dm
index 94a5e3b3de4fae..b20f3bfee17407 100644
--- a/code/modules/uplink/uplink_items/nukeops.dm
+++ b/code/modules/uplink/uplink_items/nukeops.dm
@@ -385,7 +385,7 @@
item = /obj/item/ammo_box/magazine/plastikov9mm
cost = 1
purchasable_from = UPLINK_SERIOUS_OPS
- illegal_tech = FALSE
+ uplink_item_flags = SYNDIE_TRIPS_CONTRABAND
// Explosives and Grenades
// ~~ Grenades ~~
@@ -394,6 +394,7 @@
cost = 15
surplus = 35
purchasable_from = UPLINK_ALL_SYNDIE_OPS
+
/datum/uplink_item/explosives/grenades/buzzkill
name = "Buzzkill Grenade Box"
desc = "A box with three grenades that release a swarm of angry bees upon activation. These bees indiscriminately attack friend or foe \
diff --git a/code/modules/uplink/uplink_items/spy_unique.dm b/code/modules/uplink/uplink_items/spy_unique.dm
index b53cf60cefdebb..7d2f5fb34cb84a 100644
--- a/code/modules/uplink/uplink_items/spy_unique.dm
+++ b/code/modules/uplink/uplink_items/spy_unique.dm
@@ -10,12 +10,14 @@
// Cost doesn't really matter since it's free, but it determines which loot pool it falls into.
// By default, these fall into easy-medium spy bounty loot pool
cost = SPY_LOWER_COST_THRESHOLD
+ uplink_item_flags = NONE
/datum/uplink_item/spy_unique/syndie_bowman
name = "Syndicate Bowman"
desc = "A bowman headset for members of the Syndicate. Not very conspicuous."
item = /obj/item/radio/headset/syndicate/alt
cost = 1
+ uplink_item_flags = SYNDIE_ILLEGAL_TECH
/datum/uplink_item/spy_unique/megaphone
name = "Megaphone"
@@ -43,6 +45,7 @@
name = "Kudzu"
desc = "A packet of Kudzu - plant and forget, a great distraction."
item = /obj/item/seeds/kudzu
+ uplink_item_flags = SYNDIE_TRIPS_CONTRABAND
/datum/uplink_item/spy_unique/big_knife
name = "Combat Knife"
@@ -53,6 +56,7 @@
name = "Switchblade"
desc = "A switchblade. Switches between not sharp and sharp."
item = /obj/item/switchblade
+ uplink_item_flags = SYNDIE_TRIPS_CONTRABAND
/datum/uplink_item/spy_unique/sechud_implant
name = "SecHUD Implant"
@@ -64,30 +68,35 @@
desc = "A bolt-action rifle, with a scope. Won't jam, either."
item = /obj/item/gun/ballistic/rifle/boltaction/prime
cost = SPY_UPPER_COST_THRESHOLD
+ uplink_item_flags = SYNDIE_ILLEGAL_TECH | SYNDIE_TRIPS_CONTRABAND
/datum/uplink_item/spy_unique/cycler_shotgun
name = "Cycler Shotgun"
desc = "A cycler shotgun. It's a shotgun that cycles between two barrels."
item = /obj/item/gun/ballistic/shotgun/automatic/dual_tube/deadly
cost = SPY_UPPER_COST_THRESHOLD
+ uplink_item_flags = SYNDIE_ILLEGAL_TECH | SYNDIE_TRIPS_CONTRABAND
/datum/uplink_item/spy_unique/bulldog_shotgun
name = "Bulldog Shotgun"
desc = "A bulldog shotgun. It's a shotgun that shoots bulldogs."
item = /obj/item/gun/ballistic/shotgun/bulldog/unrestricted
cost = SPY_UPPER_COST_THRESHOLD
+ uplink_item_flags = SYNDIE_ILLEGAL_TECH | SYNDIE_TRIPS_CONTRABAND
/datum/uplink_item/spy_unique/ansem_pistol
name = "Ansem Pistol"
desc = "A pistol that's really good at making people sleep."
item = /obj/item/gun/ballistic/automatic/pistol/clandestine
cost = SPY_UPPER_COST_THRESHOLD
+ uplink_item_flags = SYNDIE_ILLEGAL_TECH | SYNDIE_TRIPS_CONTRABAND
/datum/uplink_item/spy_unique/rocket_launcher
name = "Rocket Launcher"
desc = "A rocket launcher. I would recommend against jumping with it."
item = /obj/item/gun/ballistic/rocketlauncher
cost = SPY_UPPER_COST_THRESHOLD - 1 // It's a meme item
+ uplink_item_flags = SYNDIE_ILLEGAL_TECH | SYNDIE_TRIPS_CONTRABAND
/datum/uplink_item/spy_unique/shotgun_ammo
name = "Box of Buckshot"
@@ -110,17 +119,20 @@
desc = "A stealth belt that lets you sneak behind enemy lines."
item = /obj/item/shadowcloak/weaker
cost = SPY_UPPER_COST_THRESHOLD
+ uplink_item_flags = SYNDIE_ILLEGAL_TECH
/datum/uplink_item/spy_unique/katana
name = "Katana"
desc = "A really sharp Katana. Did I mention it's sharp?"
item = /obj/item/katana
cost = /datum/uplink_item/dangerous/doublesword::cost // Puts it in the same pool as Desword
+ uplink_item_flags = SYNDIE_ILLEGAL_TECH | SYNDIE_TRIPS_CONTRABAND
/datum/uplink_item/spy_unique/medkit_lite
name = "Syndicate First Medic Kit"
desc = "A syndicate tactical combat medkit, but only stocked enough to do basic first aid."
item = /obj/item/storage/medkit/tactical_lite
+ uplink_item_flags = SYNDIE_TRIPS_CONTRABAND
/datum/uplink_item/spy_unique/antistun
name = /datum/uplink_item/implants/nuclear/antistun::name
diff --git a/code/modules/uplink/uplink_items/stealthy.dm b/code/modules/uplink/uplink_items/stealthy.dm
index 898b82d1b6ad2d..e4c4de412fb445 100644
--- a/code/modules/uplink/uplink_items/stealthy.dm
+++ b/code/modules/uplink/uplink_items/stealthy.dm
@@ -4,6 +4,7 @@
/datum/uplink_item/stealthy_weapons
category = /datum/uplink_category/stealthy
+ uplink_item_flags = SYNDIE_ILLEGAL_TECH
/datum/uplink_item/stealthy_weapons/dart_pistol
diff --git a/code/modules/uplink/uplink_items/stealthy_tools.dm b/code/modules/uplink/uplink_items/stealthy_tools.dm
index a225d04d6674ec..40e5df8febdf9c 100644
--- a/code/modules/uplink/uplink_items/stealthy_tools.dm
+++ b/code/modules/uplink/uplink_items/stealthy_tools.dm
@@ -4,6 +4,7 @@
/datum/uplink_item/stealthy_tools
category = /datum/uplink_category/stealthy_tools
+ uplink_item_flags = SYNDIE_ILLEGAL_TECH
/datum/uplink_item/stealthy_tools/agent_card
@@ -86,11 +87,11 @@
/datum/uplink_item/stealthy_tools/smugglersatchel
name = "Smuggler's Satchel"
desc = "This satchel is thin enough to be hidden in the gap between plating and tiling; great for stashing \
- your stolen goods. Comes with a crowbar, a floor tile and some contraband inside."
+ your stolen goods. Comes with a crowbar, a floor tile and some contraband inside. Its contents cannot be detected by contraband scanners."
item = /obj/item/storage/backpack/satchel/flat/with_tools
cost = 1
surplus = 30
- illegal_tech = FALSE
+ uplink_item_flags = NONE
/datum/uplink_item/stealthy_tools/mail_counterfeit
name = "GLA Brand Mail Counterfeit Device"
diff --git a/code/modules/vehicles/cars/clowncar.dm b/code/modules/vehicles/cars/clowncar.dm
index 30e01b3219edc7..2cd85f786fc48c 100644
--- a/code/modules/vehicles/cars/clowncar.dm
+++ b/code/modules/vehicles/cars/clowncar.dm
@@ -49,7 +49,7 @@
initialize_controller_action_type(/datum/action/vehicle/sealed/thank, VEHICLE_CONTROL_KIDNAPPED)
/obj/vehicle/sealed/car/clowncar/auto_assign_occupant_flags(mob/M)
- if(ishuman(M))
+ if(ishuman(M) && driver_amount() < max_drivers)
var/mob/living/carbon/human/H = M
if(is_clown_job(H.mind?.assigned_role) || !enforce_clown_role) //Ensures only clowns can drive the car. (Including more at once)
add_control_flags(H, VEHICLE_CONTROL_DRIVE)
diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm
index d35df3126636ef..d28b510328a980 100644
--- a/code/modules/vehicles/mecha/_mecha.dm
+++ b/code/modules/vehicles/mecha/_mecha.dm
@@ -304,7 +304,6 @@
QDEL_NULL(ui_view)
QDEL_NULL(trackers)
QDEL_NULL(chassis_camera)
- QDEL_NULL(wires)
GLOB.mechas_list -= src //global mech list
for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
diff --git a/code/modules/vehicles/mecha/combat/honker.dm b/code/modules/vehicles/mecha/combat/honker.dm
index 83934244638aab..39c5ef1d0e8c42 100644
--- a/code/modules/vehicles/mecha/combat/honker.dm
+++ b/code/modules/vehicles/mecha/combat/honker.dm
@@ -29,6 +29,10 @@
fire = 100
acid = 100
+/obj/vehicle/sealed/mecha/honker/Initialize(mapload, built_manually)
+ . = ..()
+ AddElementTrait(TRAIT_WADDLING, REF(src), /datum/element/waddling)
+
/obj/vehicle/sealed/mecha/honker/play_stepsound()
if(squeak)
playsound(src, SFX_CLOWN_STEP, 70, 1)
diff --git a/code/modules/vehicles/mecha/combat/justice.dm b/code/modules/vehicles/mecha/combat/justice.dm
index babdb8af17b992..e99632394a1b78 100644
--- a/code/modules/vehicles/mecha/combat/justice.dm
+++ b/code/modules/vehicles/mecha/combat/justice.dm
@@ -57,8 +57,9 @@
/obj/vehicle/sealed/mecha/justice/update_icon_state()
. = ..()
- if(LAZYLEN(occupants))
- icon_state = weapons_safety ? "[base_icon_state]" : "[base_icon_state]-angry"
+ if(!LAZYLEN(occupants))
+ return
+ icon_state = weapons_safety ? "[base_icon_state]" : "[base_icon_state]-angry"
if(!has_gravity())
icon_state = "[icon_state]-fly"
diff --git a/code/modules/vehicles/mecha/equipment/mecha_equipment.dm b/code/modules/vehicles/mecha/equipment/mecha_equipment.dm
index 755f45d52b4bec..b32e26be94a4ea 100644
--- a/code/modules/vehicles/mecha/equipment/mecha_equipment.dm
+++ b/code/modules/vehicles/mecha/equipment/mecha_equipment.dm
@@ -148,11 +148,12 @@
return FALSE
if(equipment_slot == MECHA_WEAPON)
if(attach_right)
- if(mech.equip_by_category[MECHA_R_ARM] && (!special_attaching_interaction(attach_right, mech, user, checkonly = TRUE)))
+ // We need to check for length in case a mech doesn't support any arm attachments at all
+ if((mech.equip_by_category[MECHA_R_ARM] == mech.max_equip_by_category[MECHA_R_ARM]) && (!special_attaching_interaction(attach_right, mech, user, checkonly = TRUE)))
to_chat(user, span_warning("\The [mech]'s right arm is full![mech.equip_by_category[MECHA_L_ARM] ? "" : " Try left arm!"]"))
return FALSE
else
- if(mech.equip_by_category[MECHA_L_ARM] && (!special_attaching_interaction(attach_right, mech, user, checkonly = TRUE)))
+ if((mech.equip_by_category[MECHA_L_ARM] == mech.max_equip_by_category[MECHA_L_ARM]) && (!special_attaching_interaction(attach_right, mech, user, checkonly = TRUE)))
to_chat(user, span_warning("\The [mech]'s left arm is full![mech.equip_by_category[MECHA_R_ARM] ? "" : " Try right arm!"]"))
return FALSE
return TRUE
diff --git a/code/modules/vehicles/mecha/equipment/tools/mining_tools.dm b/code/modules/vehicles/mecha/equipment/tools/mining_tools.dm
index f7a866bdffe90e..95def3ef9b07c6 100644
--- a/code/modules/vehicles/mecha/equipment/tools/mining_tools.dm
+++ b/code/modules/vehicles/mecha/equipment/tools/mining_tools.dm
@@ -117,12 +117,12 @@
drill_mob(target, source)
playsound(src,'sound/weapons/drill.ogg',40,TRUE)
else if(isobj(target))
- var/obj/O = target
- if(istype(O, /obj/item/boulder))
- var/obj/item/boulder/nu_boulder = O
+ var/obj/obj_target = target
+ if(istype(obj_target, /obj/item/boulder))
+ var/obj/item/boulder/nu_boulder = obj_target
nu_boulder.manual_process(src, source)
else
- O.take_damage(15, BRUTE, 0, FALSE, get_dir(chassis, target))
+ obj_target.take_damage(15, BRUTE, 0, FALSE, get_dir(chassis, target))
playsound(src,'sound/weapons/drill.ogg', 40, TRUE)
// If we caused a qdel drilling the target, we can stop drilling them.
@@ -149,24 +149,21 @@
to_chat(user, "[icon2html(src, user)][span_danger("[src] is too durable to drill through.")]")
/turf/closed/mineral/drill_act(obj/item/mecha_parts/mecha_equipment/drill/drill, mob/user)
- for(var/turf/closed/mineral/M in range(drill.chassis,1))
- if(get_dir(drill.chassis,M)&drill.chassis.dir)
- M.gets_drilled()
+ for(var/turf/closed/mineral/wall in range(drill.chassis, 1))
+ if(get_dir(drill.chassis, wall) & drill.chassis.dir)
+ wall.gets_drilled()
drill.log_message("[user] drilled through [src]", LOG_MECHA)
drill.move_ores()
/turf/open/misc/asteroid/drill_act(obj/item/mecha_parts/mecha_equipment/drill/drill)
- for(var/turf/open/misc/asteroid/M in range(1, drill.chassis))
- if((get_dir(drill.chassis,M) & drill.chassis.dir) && !M.dug)
- M.getDug()
+ for(var/turf/open/misc/asteroid/floor in range(1, drill.chassis))
+ if((get_dir(drill.chassis, floor) & drill.chassis.dir) && !floor.dug)
+ floor.getDug()
drill.log_message("Drilled through [src]", LOG_MECHA)
drill.move_ores()
-
/obj/item/mecha_parts/mecha_equipment/drill/proc/move_ores()
- if(istype(chassis, /obj/vehicle/sealed/mecha/ripley) && (locate(/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp) in chassis.flat_equipment))
- var/obj/vehicle/sealed/mecha/ripley/R = chassis //we could assume that it's a ripley because it has a clamp, but that's ~unsafe~ and ~bad practice~
- R.collect_ore()
+ chassis.collect_ore()
/obj/item/mecha_parts/mecha_equipment/drill/proc/drill_mob(mob/living/target, mob/living/user)
target.visible_message(span_danger("[chassis] is drilling [target] with [src]!"), \
@@ -179,21 +176,24 @@
else
target.investigate_log("has been gibbed by [src] (attached to [chassis]).", INVESTIGATE_DEATHS)
target.gib(DROP_ALL_REMAINS)
+ return
+
+ //drill makes a hole
+ var/def_zone = target.get_random_valid_zone(BODY_ZONE_CHEST)
+ var/obj/item/bodypart/target_part = target.get_bodypart(def_zone)
+ var/blocked = target.run_armor_check(def_zone, MELEE)
+ target.apply_damage(10, BRUTE, def_zone, blocked)
+
+ //blood splatters
+ var/splatter_dir = get_dir(chassis, target)
+ if(isalien(target))
+ new /obj/effect/temp_visual/dir_setting/bloodsplatter/xenosplatter(target.drop_location(), splatter_dir)
else
- //drill makes a hole
- var/obj/item/bodypart/target_part = target.get_bodypart(target.get_random_valid_zone(BODY_ZONE_CHEST))
- target.apply_damage(10, BRUTE, BODY_ZONE_CHEST, target.run_armor_check(target_part, MELEE))
-
- //blood splatters
- var/splatter_dir = get_dir(chassis, target)
- if(isalien(target))
- new /obj/effect/temp_visual/dir_setting/bloodsplatter/xenosplatter(target.drop_location(), splatter_dir)
- else
- new /obj/effect/temp_visual/dir_setting/bloodsplatter(target.drop_location(), splatter_dir)
+ new /obj/effect/temp_visual/dir_setting/bloodsplatter(target.drop_location(), splatter_dir)
- //organs go everywhere
- if(target_part && prob(10 * drill_level))
- target_part.dismember(BRUTE)
+ //organs go everywhere
+ if(target_part && blocked < 100 && prob(10 * drill_level))
+ target_part.dismember(BRUTE)
/obj/item/mecha_parts/mecha_equipment/drill/diamonddrill
name = "diamond-tipped exosuit drill"
@@ -205,7 +205,6 @@
force = 15
toolspeed = 0.7
-
/obj/item/mecha_parts/mecha_equipment/mining_scanner
name = "exosuit mining scanner"
desc = "Equipment for working exosuits. It will automatically check surrounding rock for useful minerals."
diff --git a/code/modules/vehicles/mecha/mech_melee_attack.dm b/code/modules/vehicles/mecha/mech_melee_attack.dm
index 655a2f3533936c..6fe64c879fa716 100644
--- a/code/modules/vehicles/mecha/mech_melee_attack.dm
+++ b/code/modules/vehicles/mecha/mech_melee_attack.dm
@@ -12,11 +12,11 @@
SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_MECH, mecha_attacker, user)
if(!isnull(user))
log_combat(user, src, "attacked", mecha_attacker, "(COMBAT MODE: [uppertext(user?.combat_mode)] (DAMTYPE: [uppertext(mecha_attacker.damtype)])")
- return 0
+ return
/turf/closed/wall/mech_melee_attack(obj/vehicle/sealed/mecha/mecha_attacker, mob/living/user)
if(!user.combat_mode)
- return 0
+ return
mecha_attacker.do_attack_animation(src)
switch(mecha_attacker.damtype)
@@ -25,7 +25,7 @@
if(BURN)
playsound(src, mecha_attacker.burn_attack_sound, 50, TRUE)
else
- return 0
+ return
mecha_attacker.visible_message(span_danger("[mecha_attacker] hits [src]!"), span_danger("You hit [src]!"), null, COMBAT_MESSAGE_RANGE)
if(prob(hardness + mecha_attacker.force) && mecha_attacker.force > 20)
dismantle_wall(1)
@@ -46,14 +46,14 @@
if(BURN)
playsound(src, 'sound/items/welder.ogg', 50, TRUE)
else
- return 0
+ return
mecha_attacker.visible_message(span_danger("[mecha_attacker] hits [src]!"), span_danger("You hit [src]!"), null, COMBAT_MESSAGE_RANGE)
..()
return take_damage(mecha_attacker.force * 3, mecha_attacker.damtype, "melee", FALSE, get_dir(src, mecha_attacker)) // multiplied by 3 so we can hit objs hard but not be overpowered against mobs.
/obj/machinery/mech_melee_attack(obj/vehicle/sealed/mecha/mecha_attacker, mob/living/user)
if(!user.combat_mode)
- return 0
+ return
mecha_attacker.do_attack_animation(src)
switch(mecha_attacker.damtype)
@@ -62,14 +62,14 @@
if(BURN)
playsound(src, mecha_attacker.burn_attack_sound, 50, TRUE)
else
- return 0
+ return
mecha_attacker.visible_message(span_danger("[mecha_attacker] hits [src]!"), span_danger("You hit [src]!"), null, COMBAT_MESSAGE_RANGE)
..()
return take_damage(mecha_attacker.force * 3, mecha_attacker.damtype, "melee", FALSE, get_dir(src, mecha_attacker)) // multiplied by 3 so we can hit objs hard but not be overpowered against mobs.
/obj/structure/window/mech_melee_attack(obj/vehicle/sealed/mecha/mecha_attacker, mob/living/user)
if(!can_be_reached())
- return 0
+ return
return ..()
/mob/living/mech_melee_attack(obj/vehicle/sealed/mecha/mecha_attacker, mob/living/user)
@@ -79,43 +79,46 @@
visible_message(span_warning("[mecha_attacker] pushes [src] out of the way."), \
span_warning("[mecha_attacker] pushes you out of the way."), span_hear("You hear aggressive shuffling!"), 5, list(mecha_attacker))
to_chat(mecha_attacker, span_danger("You push [src] out of the way."))
- return 0
+ return
if(!isnull(user) && HAS_TRAIT(user, TRAIT_PACIFISM))
to_chat(user, span_warning("You don't want to harm other living beings!"))
- return 0
+ return
mecha_attacker.do_attack_animation(src)
if(mecha_attacker.damtype == BRUTE)
step_away(src, mecha_attacker, 15)
- var/obj/item/bodypart/selected_zone = get_bodypart(pick(BODY_ZONE_CHEST, BODY_ZONE_CHEST, BODY_ZONE_CHEST, BODY_ZONE_HEAD))
- var/dmg = rand(mecha_attacker.force * 0.5, mecha_attacker.force)
switch(mecha_attacker.damtype)
if(BRUTE)
if(mecha_attacker.force > 35) // durand and other heavy mechas
mecha_attacker.melee_attack_effect(src, heavy = TRUE)
else if(mecha_attacker.force > 20 && !IsKnockdown()) // lightweight mechas like gygax
mecha_attacker.melee_attack_effect(src, heavy = FALSE)
- if(selected_zone)
- selected_zone.receive_damage(dmg, 0, updating_health = TRUE)
- else
- apply_damage(dmg, BRUTE)
playsound(src, mecha_attacker.brute_attack_sound, 50, TRUE)
if(FIRE)
- if(selected_zone)
- selected_zone.receive_damage(0, dmg, updating_health = TRUE)
- else
- apply_damage(dmg, BURN)
playsound(src, mecha_attacker.burn_attack_sound, 50, TRUE)
if(TOX)
playsound(src, mecha_attacker.tox_attack_sound, 50, TRUE)
- if((reagents.get_reagent_amount(/datum/reagent/cryptobiolin) + mecha_attacker.force) < mecha_attacker.force*2)
- reagents.add_reagent(/datum/reagent/cryptobiolin, mecha_attacker.force/2)
- if((reagents.get_reagent_amount(/datum/reagent/toxin) + mecha_attacker.force) < mecha_attacker.force*2)
- reagents.add_reagent(/datum/reagent/toxin, mecha_attacker.force/2.5)
+ var/bio_armor = (100 - run_armor_check(attack_flag = BIO, silent = TRUE)) / 100
+ if((reagents.get_reagent_amount(/datum/reagent/cryptobiolin) + mecha_attacker.force) < mecha_attacker.force * 2)
+ reagents.add_reagent(/datum/reagent/cryptobiolin, mecha_attacker.force / 2 * bio_armor)
+ if((reagents.get_reagent_amount(/datum/reagent/toxin) + mecha_attacker.force) < mecha_attacker.force * 2)
+ reagents.add_reagent(/datum/reagent/toxin, mecha_attacker.force / 2.5 * bio_armor)
else
- return 0
- . = dmg
+ return
+
+ var/damage = rand(mecha_attacker.force * 0.5, mecha_attacker.force)
+ if (mecha_attacker.damtype == BRUTE || mecha_attacker.damtype == FIRE)
+ var/def_zone = get_random_valid_zone(user.zone_selected, even_weights = TRUE)
+ var/zone_readable = parse_zone_with_bodypart(def_zone)
+ apply_damage(damage, mecha_attacker.damtype, def_zone, run_armor_check(
+ def_zone = def_zone,
+ attack_flag = MELEE,
+ absorb_text = span_notice("Your armor has protected your [zone_readable]!"),
+ soften_text = span_warning("Your armor has softened a hit to your [zone_readable]!")
+ ))
+
visible_message(span_danger("[mecha_attacker.name] [mecha_attacker.attack_verbs[1]] [src]!"), \
span_userdanger("[mecha_attacker.name] [mecha_attacker.attack_verbs[2]] you!"), span_hear("You hear a sickening sound of flesh [mecha_attacker.attack_verbs[3]] flesh!"), COMBAT_MESSAGE_RANGE, list(mecha_attacker))
to_chat(mecha_attacker, span_danger("You [mecha_attacker.attack_verbs[1]] [src]!"))
..()
+ return damage
diff --git a/code/modules/vehicles/mecha/mecha_mob_interaction.dm b/code/modules/vehicles/mecha/mecha_mob_interaction.dm
index e72d5505cb6fcd..7a9141e80c1a78 100644
--- a/code/modules/vehicles/mecha/mecha_mob_interaction.dm
+++ b/code/modules/vehicles/mecha/mecha_mob_interaction.dm
@@ -41,7 +41,6 @@
return FALSE
if(ishuman(newoccupant) && !Adjacent(newoccupant))
return FALSE
- add_occupant(newoccupant)
mecha_flags &= ~PANEL_OPEN //Close panel if open
newoccupant.forceMove(src)
newoccupant.update_mouse_pointer()
diff --git a/code/modules/vehicles/pimpin_ride.dm b/code/modules/vehicles/pimpin_ride.dm
index 7ef79cb89cf04c..441a1263a3ea00 100644
--- a/code/modules/vehicles/pimpin_ride.dm
+++ b/code/modules/vehicles/pimpin_ride.dm
@@ -64,7 +64,7 @@
installed_upgrade = null
update_appearance()
else if(trash_bag && (!is_key(I) || is_key(inserted_key))) // don't put a key in the trash when we need it
- trash_bag.attackby(I, user)
+ trash_bag.atom_storage.attempt_insert(I, user)
else
return ..()
diff --git a/code/modules/vehicles/scooter.dm b/code/modules/vehicles/scooter.dm
index 08edbf78867998..82146976ad1f80 100644
--- a/code/modules/vehicles/scooter.dm
+++ b/code/modules/vehicles/scooter.dm
@@ -212,14 +212,13 @@
board_item_type = /obj/item/melee/skateboard/holyboard
instability = 3
icon_state = "hoverboard_holy"
-/obj/vehicle/ridden/scooter/skateboard/hoverboard/holyboarded/post_buckle_mob(mob/living/M)
- M.AddComponent(/datum/component/anti_magic, MAGIC_RESISTANCE|MAGIC_RESISTANCE_HOLY)
- return ..()
-/obj/vehicle/ridden/scooter/skateboard/hoverboard/holyboarded/post_unbuckle_mob(mob/living/M)
- if(!has_buckled_mobs())
- qdel (M.GetComponent(/datum/component/anti_magic, MAGIC_RESISTANCE|MAGIC_RESISTANCE_HOLY))
- return ..()
+/obj/vehicle/ridden/scooter/skateboard/hoverboard/make_ridable()
+ AddElement(/datum/element/ridable, /datum/component/riding/vehicle/scooter/skateboard/hover/holy)
+
+/obj/vehicle/ridden/scooter/skateboard/hoverboard/holyboarded/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/anti_magic, MAGIC_RESISTANCE|MAGIC_RESISTANCE_HOLY)
/obj/vehicle/ridden/scooter/skateboard/hoverboard/admin
name = "\improper Board Of Directors"
diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm
index 30b9ed537153f4..99df961c5ad346 100644
--- a/code/modules/vending/_vending.dm
+++ b/code/modules/vending/_vending.dm
@@ -283,7 +283,6 @@ GLOBAL_LIST_EMPTY(vending_machines_to_restock)
register_context()
/obj/machinery/vending/Destroy()
- QDEL_NULL(wires)
QDEL_NULL(coin)
QDEL_NULL(bill)
QDEL_NULL(sec_radio)
@@ -397,7 +396,7 @@ GLOBAL_LIST_EMPTY(vending_machines_to_restock)
return
/**
- * Build the inventory of the vending machine from it's product and record lists
+ * Build the inventory of the vending machine from its product and record lists
*
* This builds up a full set of /datum/data/vending_products from the product list of the vending machine type
* Arguments:
@@ -833,7 +832,7 @@ GLOBAL_LIST_EMPTY(vending_machines_to_restock)
* * turf/target: The turf to fall onto. Cannot be null.
* * damage: The raw numerical damage to do by default.
* * chance_to_crit: The percent chance of a critical hit occuring. Default: 0
- * * forced_crit_case: If given a value from crushing.dm, [target] and it's contents will always be hit with that specific critical hit. Default: null
+ * * forced_crit_case: If given a value from crushing.dm, [target] and its contents will always be hit with that specific critical hit. Default: null
* * paralyze_time: The time, in deciseconds, a given mob/living will be paralyzed for if crushed.
* * crush_dir: The direction the crush is coming from. Default: dir of src to [target].
* * damage_type: The type of damage to do. Default: BRUTE
@@ -1257,6 +1256,15 @@ GLOBAL_LIST_EMPTY(vending_machines_to_restock)
ref = REF(record),
)
+ var/atom/printed = record.product_path
+ // If it's not GAGS and has no innate colors we have to care about, we use DMIcon
+ if(ispath(printed, /atom) \
+ && (!initial(printed.greyscale_config) || !initial(printed.greyscale_colors)) \
+ && !initial(printed.color) \
+ )
+ static_record["icon"] = initial(printed.icon)
+ static_record["icon_state"] = initial(printed.icon_state)
+
var/list/category = record.category || default_category
if (!isnull(category))
if (!(category["name"] in categories))
@@ -1445,6 +1453,8 @@ GLOBAL_LIST_EMPTY(vending_machines_to_restock)
var/obj/item/vended_item
if(!LAZYLEN(item_record.returned_products)) //always give out free returned stuff first, e.g. to avoid walling a traitor objective in a bag behind paid items
vended_item = new item_record.product_path(get_turf(src))
+ if(vended_item.type in contraband)
+ ADD_TRAIT(vended_item, TRAIT_CONTRABAND, INNATE_TRAIT)
on_dispense(vended_item)
else
vended_item = LAZYACCESS(item_record.returned_products, LAZYLEN(item_record.returned_products)) //first in, last out
diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm
index 17555e66a879b4..8b9f7045695450 100644
--- a/code/modules/vending/autodrobe.dm
+++ b/code/modules/vending/autodrobe.dm
@@ -1,3 +1,222 @@
+
+GLOBAL_LIST_INIT(autodrobe_costumes_items, list(
+ /obj/item/clothing/under/costume/gladiator = 3,
+ /obj/item/clothing/head/helmet/gladiator = 3,
+ /obj/item/clothing/suit/toggle/labcoat/mad = 3,
+ /obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 3,
+ /obj/item/clothing/head/bio_hood/plague = 3,
+ /obj/item/clothing/mask/gas/plaguedoctor = 3,
+ /obj/item/clothing/under/rank/medical/doctor/nurse = 3,
+ /obj/item/clothing/suit/toggle/owlwings = 1,
+ /obj/item/clothing/under/costume/owl = 1,
+ /obj/item/clothing/mask/gas/owl_mask = 1,
+ /obj/item/clothing/suit/toggle/owlwings/griffinwings = 1,
+ /obj/item/clothing/under/costume/griffin = 1,
+ /obj/item/clothing/shoes/griffin = 1,
+ /obj/item/clothing/head/costume/griffin = 1,
+ /obj/item/clothing/under/costume/pirate = 3,
+ /obj/item/clothing/suit/costume/pirate = 3,
+ /obj/item/clothing/head/costume/pirate = 3,
+ /obj/item/clothing/head/costume/pirate/bandana = 3,
+ /obj/item/clothing/shoes/pirate = 3,
+ /obj/item/clothing/under/costume/soviet = 3,
+ /obj/item/clothing/head/costume/ushanka = 3,
+ /obj/item/clothing/accessory/vest_sheriff = 1,
+ /obj/item/clothing/head/cowboy/brown = 3,
+ /obj/item/clothing/head/cowboy/red = 3,
+ /obj/item/clothing/head/cowboy/black = 3,
+ /obj/item/clothing/head/costume/sombrero/green = 3,
+ /obj/item/clothing/suit/costume/poncho = 3,
+ /obj/item/clothing/suit/costume/poncho/green = 3,
+ /obj/item/clothing/suit/costume/poncho/red = 3,
+ /obj/item/clothing/suit/costume/snowman = 3,
+ /obj/item/clothing/head/costume/snowman = 3,
+ /obj/item/clothing/under/costume/referee = 1,
+ /obj/item/clothing/mask/whistle = 1,
+ /obj/item/storage/backpack/henchmen = 5,
+ /obj/item/clothing/under/costume/henchmen = 5,
+ /obj/item/clothing/head/costume/jackbros = 5,
+ /obj/item/clothing/under/costume/jackbros = 5,
+ /obj/item/clothing/under/costume/deckers = 5,
+ /obj/item/clothing/under/costume/sailor = 3,
+ /obj/item/clothing/head/costume/delinquent = 1,
+ /obj/item/clothing/suit/costume/dracula = 3,
+ /obj/item/clothing/under/costume/draculass = 3,
+ /obj/item/clothing/suit/costume/gothcoat = 3,
+ /obj/item/clothing/glasses/eyepatch = 3,
+ /obj/item/clothing/glasses/eyepatch/medical = 3,
+ /obj/item/clothing/under/costume/gi = 4,
+ /obj/item/clothing/head/soft/propeller_hat = 3,
+ /obj/item/clothing/neck/bowtie/rainbow = 3,
+))
+
+GLOBAL_LIST_INIT(autodrobe_supernatural_items, list(
+ /obj/item/clothing/suit/costume/imperium_monk = 3,
+ /obj/item/clothing/suit/chaplainsuit/holidaypriest = 3,
+ /obj/item/clothing/suit/chaplainsuit/habit = 3,
+ /obj/item/clothing/head/chaplain/habit_veil = 3,
+ /obj/item/clothing/suit/chaplainsuit/whiterobe = 3,
+ /obj/item/clothing/head/wizard/marisa/fake = 3,
+ /obj/item/clothing/suit/wizrobe/marisa/fake = 3,
+ /obj/item/clothing/head/costume/witchwig = 3,
+ /obj/item/staff/broom = 3,
+ /obj/item/clothing/suit/wizrobe/fake = 3,
+ /obj/item/clothing/head/wizard/fake = 3,
+ /obj/item/staff = 3,
+ /obj/item/clothing/head/costume/shrine_wig = 1,
+ /obj/item/clothing/suit/costume/shrine_maiden = 1,
+ /obj/item/gohei = 3,
+))
+
+GLOBAL_LIST_INIT(autodrobe_entretainers_items, list(
+ /obj/item/clothing/under/rank/civilian/clown/blue = 3,
+ /obj/item/clothing/under/rank/civilian/clown/green = 3,
+ /obj/item/clothing/under/rank/civilian/clown/yellow = 3,
+ /obj/item/clothing/under/rank/civilian/clown/orange = 3,
+ /obj/item/clothing/under/rank/civilian/clown/purple = 3,
+ /obj/item/clothing/mask/gas/sexyclown = 3,
+ /obj/item/clothing/under/rank/civilian/clown/sexy = 3,
+ /obj/item/clothing/head/beret = 6,
+ /obj/item/clothing/mask/gas/sexymime = 3,
+ /obj/item/clothing/under/rank/civilian/mime/sexy = 3,
+ /obj/item/clothing/under/rank/civilian/mime/skirt = 3,
+ /obj/item/clothing/under/rank/civilian/clown/jester = 3,
+ /obj/item/clothing/head/costume/jester = 3,
+ /obj/item/clothing/shoes/jester_shoes = 3,
+ /obj/item/clothing/under/costume/villain = 3,
+ /obj/item/clothing/suit/costume/joker = 3,
+ /obj/item/clothing/under/costume/joker = 3,
+ /obj/item/clothing/shoes/singery = 1,
+ /obj/item/clothing/under/costume/singer/yellow = 1,
+ /obj/item/clothing/shoes/singerb = 1,
+ /obj/item/clothing/under/costume/singer/blue = 1,
+ /obj/item/clothing/head/costume/cueball = 1,
+))
+
+GLOBAL_LIST_INIT(autodrobe_fancy_items, list(
+ /obj/item/clothing/under/rank/captain/suit = 1,
+ /obj/item/clothing/under/rank/captain/suit/skirt = 1,
+ /obj/item/clothing/under/costume/schoolgirl = 3,
+ /obj/item/clothing/under/costume/schoolgirl/red = 3,
+ /obj/item/clothing/under/costume/schoolgirl/green = 3,
+ /obj/item/clothing/under/costume/schoolgirl/orange = 3,
+ /obj/item/clothing/under/dress/skirt = 3,
+ /obj/item/clothing/neck/tie = 3,
+ /obj/item/clothing/head/hats/tophat = 3,
+ /obj/item/clothing/under/costume/kilt = 3,
+ /obj/item/clothing/glasses/monocle = 3,
+ /obj/item/clothing/head/hats/bowler = 3,
+ /obj/item/cane = 3,
+ /obj/item/clothing/under/dress/sundress = 3,
+ /obj/item/clothing/suit/costume/whitedress = 3,
+ /obj/item/clothing/suit/costume/changshan_red = 3,
+ /obj/item/clothing/suit/costume/changshan_blue = 3,
+ /obj/item/clothing/suit/costume/cheongsam_red = 3,
+ /obj/item/clothing/suit/costume/cheongsam_blue = 3,
+))
+
+GLOBAL_LIST_INIT(autodrobe_animal_items, list(
+ /obj/item/clothing/head/costume/kitty = 3,
+ /obj/item/clothing/head/costume/rabbitears = 3,
+ /obj/item/clothing/suit/costume/chickensuit = 3,
+ /obj/item/clothing/head/costume/chicken = 3,
+ /obj/item/clothing/suit/hooded/carp_costume = 3,
+ /obj/item/clothing/suit/hooded/ian_costume = 3,
+ /obj/item/clothing/suit/hooded/bee_costume = 3,
+ /obj/item/clothing/mask/animal/small/bat = 3,
+ /obj/item/clothing/mask/animal/small/bee = 3,
+ /obj/item/clothing/mask/animal/small/bear = 3,
+ /obj/item/clothing/mask/animal/small/raven = 3,
+ /obj/item/clothing/mask/animal/small/jackal = 3,
+ /obj/item/clothing/mask/animal/small/fox = 3,
+ /obj/item/clothing/mask/animal/frog = 3,
+ /obj/item/clothing/mask/animal/small/rat = 3,
+ /obj/item/clothing/mask/animal/pig = 3,
+ /obj/item/clothing/mask/animal/cowmask = 3,
+ /obj/item/clothing/mask/animal/horsehead = 3,
+))
+
+GLOBAL_LIST_INIT(autodrobe_service_items, list(
+ /obj/item/clothing/under/costume/buttondown/slacks/service = 3,
+ /obj/item/clothing/under/costume/buttondown/skirt/service = 3,
+ /obj/item/clothing/neck/bowtie = 6,
+ /obj/item/clothing/accessory/waistcoat = 4,
+ /obj/item/clothing/under/suit/waiter = 4,
+ /obj/item/clothing/suit/apron = 3,
+ /obj/item/clothing/suit/apron/overalls = 3,
+ /obj/item/clothing/head/costume/maidheadband = 3,
+ /obj/item/clothing/under/costume/maid = 3,
+ /obj/item/clothing/gloves/maid = 3,
+ /obj/item/clothing/neck/maid = 3,
+ /obj/item/clothing/under/rank/civilian/janitor/maid = 3,
+ /obj/item/clothing/accessory/maidapron = 3,
+))
+
+GLOBAL_LIST_INIT(autodrobe_other_items, list(
+ /obj/item/clothing/head/wig/random = 6,
+ /obj/item/clothing/head/flatcap = 3,
+ /obj/item/clothing/suit/jacket/miljacket = 3,
+ /obj/item/clothing/shoes/jackboots = 3,
+ /obj/item/clothing/mask/fakemoustache = 3,
+ /obj/item/clothing/glasses/cold= 3,
+ /obj/item/clothing/glasses/heat= 3,
+ /obj/item/clothing/mask/gas/cyborg = 3,
+ /obj/item/clothing/mask/joy = 3,
+ /obj/item/clothing/mask/gas/prop = 4,
+ /obj/item/clothing/mask/gas/atmosprop = 3,
+ /obj/item/clothing/mask/animal/small/tribal = 1,
+))
+
+GLOBAL_LIST_INIT(autodrobe_premium_items, list(
+ /obj/item/clothing/suit/costume/pirate/captain = 2,
+ /obj/item/clothing/head/costume/pirate/captain = 2,
+ /obj/item/clothing/under/rank/civilian/clown/rainbow = 1,
+ /obj/item/clothing/head/helmet/roman/fake = 3,
+ /obj/item/clothing/head/helmet/roman/legionnaire/fake = 3,
+ /obj/item/clothing/under/costume/roman = 3,
+ /obj/item/clothing/shoes/roman = 3,
+ /obj/item/shield/roman/fake = 3,
+ /obj/item/clothing/suit/chaplainsuit/clownpriest = 1,
+ /obj/item/clothing/head/chaplain/clownmitre = 1,
+ /obj/item/skub = 1,
+ /obj/item/clothing/suit/hooded/mysticrobe = 1,
+ /obj/item/clothing/under/dress/wedding_dress = 1,
+ /obj/item/clothing/under/suit/tuxedo = 1,
+ /obj/item/clothing/head/costume/weddingveil = 1,
+ /obj/item/storage/belt/fannypack/cummerbund = 1,
+ /obj/item/clothing/suit/costume/drfreeze_coat = 1,
+ /obj/item/clothing/under/costume/drfreeze = 1,
+ /obj/item/clothing/head/costume/drfreezehat = 1,
+))
+
+GLOBAL_LIST_INIT(autodrobe_contraband_items, list(
+ /obj/item/clothing/glasses/blindfold = 1,
+ /obj/item/clothing/glasses/sunglasses/gar = 2,
+ /obj/item/clothing/head/costume/powdered_wig = 1,
+ /obj/item/clothing/head/costume/tv_head = 1,
+ /obj/item/clothing/mask/muzzle = 2,
+ /obj/item/clothing/shoes/ducky_shoes = 1,
+ /obj/item/clothing/shoes/clown_shoes/meown_shoes = 1,
+ /obj/item/clothing/shoes/clown_shoes/moffers = 1,
+ /obj/item/clothing/suit/costume/judgerobe = 1,
+ /obj/item/clothing/head/costume/lobsterhat = 1,
+ /obj/item/clothing/under/costume/lobster = 1,
+ /obj/item/gun/magic/wand/nothing = 2,
+ /obj/item/storage/box/tape_wizard = 1,
+))
+
+GLOBAL_VAR_INIT(all_autodrobe_items, (autodrobe_costumes_items +\
+ autodrobe_costumes_items +\
+ autodrobe_supernatural_items +\
+ autodrobe_entretainers_items +\
+ autodrobe_fancy_items +\
+ autodrobe_animal_items +\
+ autodrobe_service_items +\
+ autodrobe_other_items +\
+ autodrobe_premium_items +\
+ autodrobe_contraband_items \
+))
+
/obj/machinery/vending/autodrobe
name = "\improper AutoDrobe"
desc = "A vending machine for costumes."
@@ -7,244 +226,63 @@
req_access = list(ACCESS_THEATRE)
product_slogans = "Dress for success!;Suited and booted!;It's show time!;Why leave style up to fate? Use AutoDrobe!"
vend_reply = "Thank you for using AutoDrobe!"
+
+ /**
+ * Categories are filled in Initialize!
+ */
+
+ refill_canister = /obj/item/vending_refill/autodrobe
+ default_price = PAYCHECK_CREW * 0.8 //Default of 40.
+ extra_price = PAYCHECK_COMMAND
+ payment_department = ACCOUNT_SRV
+ light_mask="theater-light-mask"
+
+/obj/machinery/vending/autodrobe/Initialize(mapload)
product_categories = list(
list(
"name" = "Costumes",
"icon" = "mask",
- "products" = list(
- /obj/item/clothing/under/costume/gladiator = 1,
- /obj/item/clothing/head/helmet/gladiator = 1,
- /obj/item/clothing/suit/toggle/labcoat/mad = 1,
- /obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 1,
- /obj/item/clothing/head/bio_hood/plague = 1,
- /obj/item/clothing/mask/gas/plaguedoctor = 1,
- /obj/item/clothing/under/rank/medical/doctor/nurse = 1,
- /obj/item/clothing/suit/toggle/owlwings = 1,
- /obj/item/clothing/under/costume/owl = 1,
- /obj/item/clothing/mask/gas/owl_mask = 1,
- /obj/item/clothing/suit/toggle/owlwings/griffinwings = 1,
- /obj/item/clothing/under/costume/griffin = 1,
- /obj/item/clothing/shoes/griffin = 1,
- /obj/item/clothing/head/costume/griffin = 1,
- /obj/item/clothing/under/costume/pirate = 1,
- /obj/item/clothing/suit/costume/pirate = 1,
- /obj/item/clothing/head/costume/pirate = 1,
- /obj/item/clothing/head/costume/pirate/bandana = 1,
- /obj/item/clothing/shoes/pirate = 1,
- /obj/item/clothing/under/costume/soviet = 1,
- /obj/item/clothing/head/costume/ushanka = 1,
- /obj/item/clothing/accessory/vest_sheriff =1,
- /obj/item/clothing/head/cowboy/brown =1,
- /obj/item/clothing/head/cowboy/red =1,
- /obj/item/clothing/head/cowboy/black =1,
- /obj/item/clothing/head/costume/sombrero/green = 1,
- /obj/item/clothing/suit/costume/poncho = 1,
- /obj/item/clothing/suit/costume/poncho/green = 1,
- /obj/item/clothing/suit/costume/poncho/red = 1,
- /obj/item/clothing/suit/costume/snowman = 1,
- /obj/item/clothing/head/costume/snowman = 1,
- /obj/item/clothing/under/costume/referee = 1,
- /obj/item/clothing/mask/whistle = 1,
- /obj/item/storage/backpack/henchmen = 5,
- /obj/item/clothing/under/costume/henchmen = 5,
- /obj/item/clothing/head/costume/jackbros = 5,
- /obj/item/clothing/under/costume/jackbros = 5,
- /obj/item/clothing/under/costume/deckers = 5,
- /obj/item/clothing/under/costume/sailor = 1,
- /obj/item/clothing/head/costume/delinquent = 1,
- /obj/item/clothing/suit/costume/dracula = 1,
- /obj/item/clothing/under/costume/draculass = 1,
- /obj/item/clothing/suit/costume/gothcoat = 1,
- /obj/item/clothing/glasses/eyepatch = 1,
- /obj/item/clothing/glasses/eyepatch/medical = 1,
- /obj/item/clothing/under/costume/gi = 4,
- /obj/item/clothing/head/soft/propeller_hat = 1,
- /obj/item/clothing/neck/bowtie/rainbow = 1,
- ),
+ "products" = GLOB.autodrobe_costumes_items
),
list(
"name" = "Supernatural",
"icon" = "hand-sparkles",
- "products" = list(
- /obj/item/clothing/suit/costume/imperium_monk = 1,
- /obj/item/clothing/suit/chaplainsuit/holidaypriest = 1,
- /obj/item/clothing/suit/chaplainsuit/habit = 1,
- /obj/item/clothing/head/chaplain/habit_veil = 1,
- /obj/item/clothing/suit/chaplainsuit/whiterobe = 1,
- /obj/item/clothing/head/wizard/marisa/fake = 1,
- /obj/item/clothing/suit/wizrobe/marisa/fake = 1,
- /obj/item/clothing/head/costume/witchwig = 1,
- /obj/item/staff/broom = 1,
- /obj/item/clothing/suit/wizrobe/fake = 1,
- /obj/item/clothing/head/wizard/fake = 1,
- /obj/item/staff = 3,
- /obj/item/clothing/head/costume/shrine_wig = 1,
- /obj/item/clothing/suit/costume/shrine_maiden = 1,
- /obj/item/gohei = 1,
- ),
+ "products" = GLOB.autodrobe_supernatural_items
),
list(
"name" = "Entertainers",
"icon" = "masks-theater",
- "products" = list(
- /obj/item/clothing/under/rank/civilian/clown/blue = 1,
- /obj/item/clothing/under/rank/civilian/clown/green = 1,
- /obj/item/clothing/under/rank/civilian/clown/yellow = 1,
- /obj/item/clothing/under/rank/civilian/clown/orange = 1,
- /obj/item/clothing/under/rank/civilian/clown/purple = 1,
- /obj/item/clothing/mask/gas/sexyclown = 1,
- /obj/item/clothing/under/rank/civilian/clown/sexy = 1,
- /obj/item/clothing/head/beret = 6,
- /obj/item/clothing/mask/gas/sexymime = 1,
- /obj/item/clothing/under/rank/civilian/mime/sexy = 1,
- /obj/item/clothing/under/rank/civilian/mime/skirt = 1,
- /obj/item/clothing/under/rank/civilian/clown/jester = 1,
- /obj/item/clothing/head/costume/jester = 1,
- /obj/item/clothing/shoes/jester_shoes = 1,
- /obj/item/clothing/under/costume/villain = 1,
- /obj/item/clothing/suit/costume/joker = 1,
- /obj/item/clothing/under/costume/joker = 1,
- /obj/item/clothing/shoes/singery = 1,
- /obj/item/clothing/under/costume/singer/yellow = 1,
- /obj/item/clothing/shoes/singerb = 1,
- /obj/item/clothing/under/costume/singer/blue = 1,
- /obj/item/clothing/head/costume/cueball = 1,
- ),
+ "products" = GLOB.autodrobe_entretainers_items
),
list(
"name" = "Fancy",
"icon" = "user-tie",
- "products" = list(
- /obj/item/clothing/under/rank/captain/suit = 1,
- /obj/item/clothing/under/rank/captain/suit/skirt = 1,
- /obj/item/clothing/under/costume/schoolgirl = 1,
- /obj/item/clothing/under/costume/schoolgirl/red = 1,
- /obj/item/clothing/under/costume/schoolgirl/green = 1,
- /obj/item/clothing/under/costume/schoolgirl/orange = 1,
- /obj/item/clothing/under/dress/skirt = 1,
- /obj/item/clothing/neck/tie = 3,
- /obj/item/clothing/head/hats/tophat = 1,
- /obj/item/clothing/under/costume/kilt = 1,
- /obj/item/clothing/glasses/monocle =1,
- /obj/item/clothing/head/hats/bowler = 1,
- /obj/item/cane = 1,
- /obj/item/clothing/under/dress/sundress = 1,
- /obj/item/clothing/suit/costume/whitedress = 1,
- /obj/item/clothing/suit/costume/changshan_red = 1,
- /obj/item/clothing/suit/costume/changshan_blue = 1,
- /obj/item/clothing/suit/costume/cheongsam_red = 1,
- /obj/item/clothing/suit/costume/cheongsam_blue = 1,
- ),
+ "products" = GLOB.autodrobe_fancy_items
),
list(
"name" = "Animals",
"icon" = "paw",
- "products" = list(
- /obj/item/clothing/head/costume/kitty = 1,
- /obj/item/clothing/head/costume/rabbitears =1,
- /obj/item/clothing/suit/costume/chickensuit = 1,
- /obj/item/clothing/head/costume/chicken = 1,
- /obj/item/clothing/suit/hooded/carp_costume = 1,
- /obj/item/clothing/suit/hooded/ian_costume = 1,
- /obj/item/clothing/suit/hooded/bee_costume = 1,
- /obj/item/clothing/mask/animal/small/bat = 1,
- /obj/item/clothing/mask/animal/small/bee = 1,
- /obj/item/clothing/mask/animal/small/bear = 1,
- /obj/item/clothing/mask/animal/small/raven = 1,
- /obj/item/clothing/mask/animal/small/jackal = 1,
- /obj/item/clothing/mask/animal/small/fox = 1,
- /obj/item/clothing/mask/animal/frog = 1,
- /obj/item/clothing/mask/animal/small/rat = 1,
- /obj/item/clothing/mask/animal/pig = 1,
- /obj/item/clothing/mask/animal/cowmask = 1,
- /obj/item/clothing/mask/animal/horsehead = 1,
- ),
+ "products" = GLOB.autodrobe_animal_items
),
list(
"name" = "Service",
"icon" = "kitchen-set",
- "products" = list(
- /obj/item/clothing/under/costume/buttondown/slacks/service = 1,
- /obj/item/clothing/under/costume/buttondown/skirt/service = 1,
- /obj/item/clothing/neck/bowtie = 2,
- /obj/item/clothing/accessory/waistcoat = 1,
- /obj/item/clothing/under/suit/waiter = 1,
- /obj/item/clothing/suit/apron = 1,
- /obj/item/clothing/suit/apron/overalls = 1,
- /obj/item/clothing/head/costume/maidheadband = 1,
- /obj/item/clothing/under/costume/maid = 1,
- /obj/item/clothing/gloves/maid = 1,
- /obj/item/clothing/neck/maid = 1,
- /obj/item/clothing/under/rank/civilian/janitor/maid = 1,
- /obj/item/clothing/accessory/maidapron = 1,
- ),
+ "products" = GLOB.autodrobe_service_items
),
list(
"name" = "Other",
"icon" = "star",
- "products" = list(
- /obj/item/clothing/head/wig/random = 3,
- /obj/item/clothing/head/flatcap = 1,
- /obj/item/clothing/suit/jacket/miljacket = 1,
- /obj/item/clothing/shoes/jackboots = 1,
- /obj/item/clothing/mask/fakemoustache = 1,
- /obj/item/clothing/glasses/cold=1,
- /obj/item/clothing/glasses/heat=1,
- /obj/item/clothing/mask/gas/cyborg = 1,
- /obj/item/clothing/mask/joy = 1,
- /obj/item/clothing/mask/gas/prop = 4,
- /obj/item/clothing/mask/gas/atmosprop = 3,
- /obj/item/clothing/mask/animal/small/tribal = 1,
- ),
+ "products" = GLOB.autodrobe_other_items
),
)
+ premium = GLOB.autodrobe_premium_items
+ contraband = GLOB.autodrobe_contraband_items
- contraband = list(
- /obj/item/clothing/glasses/blindfold = 1,
- /obj/item/clothing/glasses/sunglasses/gar = 2,
- /obj/item/clothing/head/costume/powdered_wig = 1,
- /obj/item/clothing/head/costume/tv_head = 1,
- /obj/item/clothing/mask/muzzle = 2,
- /obj/item/clothing/shoes/ducky_shoes = 1,
- /obj/item/clothing/shoes/clown_shoes/meown_shoes = 1,
- /obj/item/clothing/shoes/clown_shoes/moffers = 1,
- /obj/item/clothing/suit/costume/judgerobe = 1,
- /obj/item/clothing/head/costume/lobsterhat = 1,
- /obj/item/clothing/under/costume/lobster = 1,
- /obj/item/gun/magic/wand/nothing = 2,
- /obj/item/storage/box/tape_wizard = 1,
- )
- premium = list(
- /obj/item/clothing/suit/costume/pirate/captain = 2,
- /obj/item/clothing/head/costume/pirate/captain = 2,
- /obj/item/clothing/under/rank/civilian/clown/rainbow = 1,
- /obj/item/clothing/head/helmet/roman/fake = 1,
- /obj/item/clothing/head/helmet/roman/legionnaire/fake = 1,
- /obj/item/clothing/under/costume/roman = 1,
- /obj/item/clothing/shoes/roman = 1,
- /obj/item/shield/roman/fake = 1,
- /obj/item/clothing/suit/chaplainsuit/clownpriest = 1,
- /obj/item/clothing/head/chaplain/clownmitre = 1,
- /obj/item/skub = 1,
- /obj/item/clothing/suit/hooded/mysticrobe = 1,
- /obj/item/clothing/under/dress/wedding_dress = 1,
- /obj/item/clothing/under/suit/tuxedo = 1,
- /obj/item/clothing/head/costume/weddingveil = 1,
- /obj/item/storage/belt/fannypack/cummerbund = 1,
- /obj/item/clothing/suit/costume/drfreeze_coat = 1,
- /obj/item/clothing/under/costume/drfreeze = 1,
- /obj/item/clothing/head/costume/drfreezehat = 1,
- )
- refill_canister = /obj/item/vending_refill/autodrobe
- default_price = PAYCHECK_CREW * 0.8 //Default of 40.
- extra_price = PAYCHECK_COMMAND
- payment_department = ACCOUNT_SRV
- light_mask="theater-light-mask"
+ . = ..()
/obj/machinery/vending/autodrobe/all_access
desc = "A vending machine for costumes. This model appears to have no access restrictions."
req_access = null
-
/obj/item/vending_refill/autodrobe
machine_name = "AutoDrobe"
icon_state = "refill_costume"
diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm
index bf260ab76bc44b..738ba83e15819e 100644
--- a/code/modules/vending/clothesmate.dm
+++ b/code/modules/vending/clothesmate.dm
@@ -33,11 +33,11 @@
/obj/item/clothing/head/hats/tophat = 3,
/obj/item/clothing/head/fedora = 3,
/obj/item/clothing/head/hats/bowler = 3,
- /obj/item/clothing/head/cowboy/white = 1,
- /obj/item/clothing/head/cowboy/grey = 1,
- /obj/item/clothing/head/costume/sombrero/green = 1,
- /obj/item/clothing/head/costume/nightcap/blue = 2,
- /obj/item/clothing/head/costume/nightcap/red = 2,
+ /obj/item/clothing/head/cowboy/white = 3,
+ /obj/item/clothing/head/cowboy/grey = 3,
+ /obj/item/clothing/head/costume/sombrero/green = 3,
+ /obj/item/clothing/head/costume/nightcap/blue = 3,
+ /obj/item/clothing/head/costume/nightcap/red = 3,
),
),
@@ -49,12 +49,12 @@
/obj/item/clothing/accessory/waistcoat = 4,
/obj/item/clothing/suit/toggle/suspenders = 4,
/obj/item/clothing/neck/tie/horrible = 3,
- /obj/item/clothing/glasses/regular = 2,
- /obj/item/clothing/glasses/regular/jamjar = 1,
- /obj/item/clothing/glasses/orange = 1,
- /obj/item/clothing/glasses/red = 1,
- /obj/item/clothing/glasses/monocle = 1,
- /obj/item/clothing/gloves/fingerless = 2,
+ /obj/item/clothing/glasses/regular = 3,
+ /obj/item/clothing/glasses/regular/jamjar = 3,
+ /obj/item/clothing/glasses/orange = 3,
+ /obj/item/clothing/glasses/red = 3,
+ /obj/item/clothing/glasses/monocle = 3,
+ /obj/item/clothing/gloves/fingerless = 3,
/obj/item/storage/belt/fannypack = 3,
/obj/item/storage/belt/fannypack/blue = 3,
/obj/item/storage/belt/fannypack/red = 3,
@@ -72,19 +72,19 @@
/obj/item/clothing/under/costume/buttondown/slacks = 4,
/obj/item/clothing/under/costume/buttondown/shorts = 4,
/obj/item/clothing/under/costume/buttondown/skirt = 4,
- /obj/item/clothing/under/dress/sundress = 2,
- /obj/item/clothing/under/dress/tango = 2,
+ /obj/item/clothing/under/dress/sundress = 3,
+ /obj/item/clothing/under/dress/tango = 3,
/obj/item/clothing/under/dress/skirt/plaid = 4,
/obj/item/clothing/under/dress/skirt/turtleskirt = 4,
- /obj/item/clothing/under/misc/overalls = 2,
- /obj/item/clothing/under/pants/camo = 2,
- /obj/item/clothing/under/pants/track = 2,
- /obj/item/clothing/under/costume/kilt = 1,
- /obj/item/clothing/under/dress/striped = 1,
- /obj/item/clothing/under/dress/sailor = 1,
- /obj/item/clothing/under/dress/eveninggown = 1,
- /obj/item/clothing/under/misc/pj/blue = 2,
- /obj/item/clothing/under/misc/pj/red = 2,
+ /obj/item/clothing/under/misc/overalls = 3,
+ /obj/item/clothing/under/pants/camo = 3,
+ /obj/item/clothing/under/pants/track = 3,
+ /obj/item/clothing/under/costume/kilt = 3,
+ /obj/item/clothing/under/dress/striped = 3,
+ /obj/item/clothing/under/dress/sailor = 3,
+ /obj/item/clothing/under/dress/eveninggown = 3,
+ /obj/item/clothing/under/misc/pj/blue = 3,
+ /obj/item/clothing/under/misc/pj/red = 3,
),
),
@@ -96,29 +96,29 @@
/obj/item/clothing/suit/jacket/oversized = 4,
/obj/item/clothing/suit/jacket/fancy = 4,
/obj/item/clothing/suit/toggle/lawyer/greyscale = 4,
- /obj/item/clothing/suit/hooded/wintercoat/custom = 2,
- /obj/item/clothing/suit/hooded/wintercoat = 2,
- /obj/item/clothing/under/suit/navy = 1,
- /obj/item/clothing/under/suit/black_really = 1,
- /obj/item/clothing/under/suit/burgundy = 1,
- /obj/item/clothing/under/suit/charcoal = 1,
- /obj/item/clothing/under/suit/white = 1,
+ /obj/item/clothing/suit/hooded/wintercoat/custom = 3,
+ /obj/item/clothing/suit/hooded/wintercoat = 3,
+ /obj/item/clothing/under/suit/navy = 3,
+ /obj/item/clothing/under/suit/black_really = 3,
+ /obj/item/clothing/under/suit/burgundy = 3,
+ /obj/item/clothing/under/suit/charcoal = 3,
+ /obj/item/clothing/under/suit/white = 3,
/obj/item/clothing/under/costume/buttondown/slacks/service = 4,
/obj/item/clothing/under/costume/buttondown/skirt/service = 4,
- /obj/item/clothing/suit/jacket/bomber = 2,
- /obj/item/clothing/suit/jacket/puffer/vest = 2,
- /obj/item/clothing/suit/jacket/puffer = 2,
- /obj/item/clothing/suit/jacket/letterman = 2,
- /obj/item/clothing/suit/jacket/letterman_red = 2,
+ /obj/item/clothing/suit/jacket/bomber = 3,
+ /obj/item/clothing/suit/jacket/puffer/vest = 3,
+ /obj/item/clothing/suit/jacket/puffer = 3,
+ /obj/item/clothing/suit/jacket/letterman = 3,
+ /obj/item/clothing/suit/jacket/letterman_red = 3,
/obj/item/clothing/suit/costume/hawaiian = 4,
- /obj/item/clothing/suit/costume/poncho = 1,
- /obj/item/clothing/under/dress/skirt = 2,
- /obj/item/clothing/under/suit/white/skirt = 2,
+ /obj/item/clothing/suit/costume/poncho = 3,
+ /obj/item/clothing/under/dress/skirt = 3,
+ /obj/item/clothing/under/suit/white/skirt = 3,
/obj/item/clothing/under/rank/captain/suit/skirt = 2,
/obj/item/clothing/under/rank/civilian/head_of_personnel/suit/skirt = 2,
/obj/item/clothing/under/rank/civilian/purple_bartender = 2,
- /obj/item/clothing/suit/jacket/miljacket = 1,
- /obj/item/clothing/suit/apron/overalls = 2,
+ /obj/item/clothing/suit/jacket/miljacket = 3,
+ /obj/item/clothing/suit/apron/overalls = 3,
/obj/item/clothing/suit/costume/wellworn_shirt = 2,
/obj/item/clothing/suit/costume/wellworn_shirt/graphic = 2,
/obj/item/clothing/suit/costume/wellworn_shirt/graphic/ian = 2,
@@ -137,13 +137,13 @@
"products" = list(
/obj/item/clothing/shoes/sneakers/black = 4,
/obj/item/clothing/shoes/sneakers/white = 4,
- /obj/item/clothing/shoes/sandal = 2,
- /obj/item/clothing/shoes/laceup = 2,
+ /obj/item/clothing/shoes/sandal = 3,
+ /obj/item/clothing/shoes/laceup = 3,
/obj/item/clothing/shoes/winterboots = 2,
/obj/item/clothing/shoes/glow = 2,
- /obj/item/clothing/shoes/cowboy = 2,
- /obj/item/clothing/shoes/cowboy/white = 2,
- /obj/item/clothing/shoes/cowboy/black = 2,
+ /obj/item/clothing/shoes/cowboy = 3,
+ /obj/item/clothing/shoes/cowboy/white = 3,
+ /obj/item/clothing/shoes/cowboy/black = 3,
),
),
@@ -165,6 +165,14 @@
/obj/item/clothing/mask/kitsune = 3,
/obj/item/clothing/mask/rebellion = 6,
/obj/item/clothing/suit/costume/wellworn_shirt/graphic/ian = 1,
+ /obj/item/clothing/head/costume/hairpin = 2,
+ /obj/item/clothing/under/costume/yukata = 2,
+ /obj/item/clothing/under/costume/yukata/green = 2,
+ /obj/item/clothing/under/costume/yukata/white = 2,
+ /obj/item/clothing/under/costume/kimono = 2,
+ /obj/item/clothing/under/costume/kimono/red = 2,
+ /obj/item/clothing/under/costume/kimono/purple = 2,
+ /obj/item/clothing/shoes/sandal/alt = 4,
/obj/item/clothing/suit/costume/irs = 20,
/obj/item/clothing/head/costume/irs = 20,
/obj/item/clothing/head/costume/tmc = 20,
@@ -190,25 +198,25 @@
)
contraband = list(
- /obj/item/clothing/under/syndicate/tacticool = 1,
- /obj/item/clothing/under/syndicate/tacticool/skirt = 1,
- /obj/item/clothing/mask/balaclava = 1,
- /obj/item/clothing/head/costume/ushanka = 1,
- /obj/item/clothing/under/costume/soviet = 1,
+ /obj/item/clothing/under/syndicate/tacticool = 2,
+ /obj/item/clothing/under/syndicate/tacticool/skirt = 2,
+ /obj/item/clothing/mask/balaclava = 3,
+ /obj/item/clothing/head/costume/ushanka = 3,
+ /obj/item/clothing/under/costume/soviet = 3,
/obj/item/storage/belt/fannypack/black = 2,
- /obj/item/clothing/suit/jacket/letterman_syndie = 1,
- /obj/item/clothing/under/costume/jabroni = 1,
- /obj/item/clothing/under/costume/geisha = 1,
- /obj/item/clothing/under/rank/centcom/officer/replica = 1,
- /obj/item/clothing/under/rank/centcom/officer_skirt/replica = 1,
+ /obj/item/clothing/suit/jacket/letterman_syndie = 3,
+ /obj/item/clothing/under/costume/jabroni = 3,
+ /obj/item/clothing/under/costume/geisha = 3,
+ /obj/item/clothing/under/rank/centcom/officer/replica = 2,
+ /obj/item/clothing/under/rank/centcom/officer_skirt/replica = 2,
)
- premium = list(/obj/item/clothing/under/suit/checkered = 1,
- /obj/item/clothing/head/costume/mailman = 1,
- /obj/item/clothing/under/misc/mailman = 1,
- /obj/item/clothing/suit/jacket/leather = 1,
- /obj/item/clothing/suit/jacket/leather/biker = 1,
+ premium = list(/obj/item/clothing/under/suit/checkered = 3,
+ /obj/item/clothing/head/costume/mailman = 3,
+ /obj/item/clothing/under/misc/mailman = 3,
+ /obj/item/clothing/suit/jacket/leather = 3,
+ /obj/item/clothing/suit/jacket/leather/biker = 3,
/obj/item/clothing/neck/necklace/dope = 3,
- /obj/item/clothing/suit/jacket/letterman_nanotrasen = 1,
+ /obj/item/clothing/suit/jacket/letterman_nanotrasen = 3,
/obj/item/clothing/under/costume/swagoutfit = 1,
/obj/item/clothing/shoes/swagshoes = 1,
/obj/item/instrument/piano_synth/headphones/spacepods = 1,
diff --git a/code/modules/vending/magivend.dm b/code/modules/vending/magivend.dm
index ef89e916bf30b5..51aac98fdfa8e0 100644
--- a/code/modules/vending/magivend.dm
+++ b/code/modules/vending/magivend.dm
@@ -21,7 +21,7 @@
contraband = list(/obj/item/reagent_containers/cup/bottle/wizarditis = 1) //No one can get to the machine to hack it anyways; for the lulz - Microwave
armor_type = /datum/armor/vending_magivend
resistance_flags = FIRE_PROOF
- default_price = 0 //Just in case, since it's primary use is storage.
+ default_price = 0 //Just in case, since its primary use is storage.
extra_price = PAYCHECK_COMMAND
payment_department = ACCOUNT_SRV
light_mask = "magivend-light-mask"
diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm
index ebecb03e1302ca..7bed3ccec06452 100644
--- a/code/modules/vending/security.dm
+++ b/code/modules/vending/security.dm
@@ -17,6 +17,7 @@
/obj/item/flashlight/seclite = 4,
/obj/item/restraints/legcuffs/bola/energy = 7,
/obj/item/clothing/gloves/tackler = 5,
+ /obj/item/holosign_creator/security = 2,
)
contraband = list(
/obj/item/clothing/glasses/sunglasses = 2,
@@ -26,6 +27,7 @@
/obj/item/storage/belt/security/webbing = 5,
/obj/item/coin/antagtoken = 1,
/obj/item/clothing/head/helmet/blueshirt = 1,
+ /obj/item/clothing/gloves/color/black/security/blu = 1,
/obj/item/clothing/suit/armor/vest/blueshirt = 1,
/obj/item/grenade/stingbang = 1,
/obj/item/watertank/pepperspray = 2,
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index 44892713926c0c..0ab72e1f24a2cd 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -51,10 +51,11 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
/obj/item/clothing/under/rank/security/officer/grey = 3,
/obj/item/clothing/under/pants/slacks = 3,
/obj/item/clothing/under/rank/security/officer/blueshirt = 3,
+ /obj/item/clothing/gloves/color/black/security/blu = 3,
/obj/item/clothing/suit/armor/vest/secjacket = 3,
/obj/item/clothing/suit/hooded/wintercoat/security = 3,
/obj/item/clothing/suit/armor/vest = 3,
- /obj/item/clothing/gloves/color/black = 3,
+ /obj/item/clothing/gloves/color/black/security = 3,
/obj/item/clothing/shoes/jackboots/sec = 3,
/obj/item/storage/backpack/security = 3,
/obj/item/storage/backpack/satchel/sec = 3,
@@ -185,12 +186,14 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
/obj/item/clothing/head/beret/cargo = 3,
/obj/item/clothing/mask/bandana/striped/cargo = 3,
/obj/item/clothing/head/soft = 3,
+ /obj/item/clothing/head/utility/hardhat/orange = 3,
/obj/item/clothing/under/rank/cargo/tech = 3,
/obj/item/clothing/under/rank/cargo/tech/skirt = 3,
/obj/item/clothing/under/rank/cargo/tech/alt = 3,
/obj/item/clothing/under/rank/cargo/tech/skirt/alt = 3,
/obj/item/clothing/suit/toggle/cargo_tech = 3,
/obj/item/clothing/suit/hooded/wintercoat/cargo = 3,
+ /obj/item/clothing/suit/hazardvest = 3,
/obj/item/clothing/gloves/fingerless = 3,
/obj/item/clothing/shoes/sneakers/black = 3,
/obj/item/storage/backpack = 3,
@@ -201,13 +204,13 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
/obj/item/storage/bag/mail = 3,
/obj/item/radio/headset/headset_cargo = 3,
/obj/item/clothing/accessory/pocketprotector = 3,
- /obj/item/clothing/head/utility/hardhat/orange = 3,
- /obj/item/clothing/suit/hazardvest = 3,
)
premium = list(
/obj/item/clothing/head/costume/mailman = 1,
/obj/item/clothing/under/misc/mailman = 1,
/obj/item/clothing/under/rank/cargo/miner = 3,
+ /obj/item/clothing/under/rank/cargo/miner/lavaland = 3,
+ /obj/item/clothing/under/rank/cargo/bitrunner = 3,
)
refill_canister = /obj/item/vending_refill/wardrobe/cargo_wardrobe
payment_department = ACCOUNT_CAR
@@ -345,19 +348,18 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
product_ads = "Any day above ground is a good one!;My day starts when yours ends!;And they call this a dying business!;See you when you're dead!"
vend_reply = "Don't forget your \"Buy one get one free\" burial deal!"
products = list(
- /obj/item/cautery/cruel = 1,
- /obj/item/clothing/gloves/latex/coroner = 1,
/obj/item/clothing/head/utility/surgerycap/black = 1,
/obj/item/clothing/mask/surgical = 1,
- /obj/item/clothing/shoes/sneakers/black = 1,
/obj/item/clothing/suit/apron/surgical = 1,
/obj/item/clothing/suit/hooded/wintercoat/medical/coroner = 1,
/obj/item/clothing/suit/toggle/labcoat/coroner = 1,
/obj/item/clothing/under/rank/medical/coroner = 1,
/obj/item/clothing/under/rank/medical/coroner/skirt = 1,
/obj/item/clothing/under/rank/medical/scrubs/coroner = 1,
+ /obj/item/clothing/shoes/sneakers/black = 1,
+ /obj/item/clothing/gloves/latex/coroner = 1,
+ /obj/item/cautery/cruel = 1,
/obj/item/hemostat/cruel = 1,
- /obj/item/radio/headset/headset_srvmed = 2,
/obj/item/retractor/cruel = 1,
/obj/item/scalpel/cruel = 1,
/obj/item/storage/backpack/coroner = 1,
@@ -365,6 +367,7 @@ GLOBAL_VAR_INIT(roaches_deployed, FALSE)
/obj/item/storage/backpack/messenger/coroner = 1,
/obj/item/storage/backpack/satchel/coroner = 1,
/obj/item/storage/box/bodybags = 3,
+ /obj/item/radio/headset/headset_srvmed = 2,
/obj/item/toy/crayon/white = 2,
)
contraband = list(
diff --git a/config/game_options.txt b/config/game_options.txt
index ca32f1b8128713..4dab6213e10b0a 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -100,6 +100,11 @@ TRAITOR_SCALING_COEFF 6
BROTHER_SCALING_COEFF 6
CHANGELING_SCALING_COEFF 6
+## Global scaling for traitor progression.
+## Higher values will accelerate traitor progression, while lower values will decrease it.
+## Bypasses an upper limit of 1 MINUTE
+#TRAITOR_SCALING_MULTIPLIER 1
+
## Variables calculate how number of open security officer positions will scale to population.
## Used as (Officers = Population / Coeff)
## Set to 0 to disable scaling and use default numbers instead.
diff --git a/cutter_templates/bitmask/cardinal_32x32.toml b/cutter_templates/bitmask/cardinal_32x32.toml
index 9d3d4097e78ce1..987e9126b2d8b1 100644
--- a/cutter_templates/bitmask/cardinal_32x32.toml
+++ b/cutter_templates/bitmask/cardinal_32x32.toml
@@ -10,7 +10,7 @@ smooth_diagonally = false
x = 32
y = 32
-# Output our stuff at the same level as it's input
+# Output our stuff at the same level as its input
[output_icon_pos]
x = 0
y = 0
diff --git a/html/changelogs/AutoChangeLog-pr-28694.yml b/html/changelogs/AutoChangeLog-pr-28694.yml
deleted file mode 100644
index 4136ea2985b559..00000000000000
--- a/html/changelogs/AutoChangeLog-pr-28694.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "SkyratBot"
-delete-after: True
-changes:
- - rscadd: "Added the designer EVA suit, a unique pirate hardsuit for Silverscales."
- - balance: "Increased the equipment available to Silverscales"
- - image: "Sprites for the designer EVA suit"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-28722.yml b/html/changelogs/AutoChangeLog-pr-28722.yml
deleted file mode 100644
index 44d2f9a2c7ea3e..00000000000000
--- a/html/changelogs/AutoChangeLog-pr-28722.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "LT3"
-delete-after: True
-changes:
- - qol: "Hypospray and flashlight can be put in labcoat pockets"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-28723.yml b/html/changelogs/AutoChangeLog-pr-28723.yml
deleted file mode 100644
index fef556a0e2c1d2..00000000000000
--- a/html/changelogs/AutoChangeLog-pr-28723.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SkyratBot"
-delete-after: True
-changes:
- - sound: "Added audible zipping to winter coats."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-28724.yml b/html/changelogs/AutoChangeLog-pr-28724.yml
deleted file mode 100644
index 6c04987de95732..00000000000000
--- a/html/changelogs/AutoChangeLog-pr-28724.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SkyratBot"
-delete-after: True
-changes:
- - bugfix: "Embedding now properly changes its values."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-28726.yml b/html/changelogs/AutoChangeLog-pr-28726.yml
deleted file mode 100644
index 2a986833ee470d..00000000000000
--- a/html/changelogs/AutoChangeLog-pr-28726.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Jolly"
-delete-after: True
-changes:
- - code_imp: "Behind the scenes, atmos machines (freezers/mixers) in maps were tweaked a bit. If you see them no longer connected to specific pipenets, please make an issue report, this is not intended behavior!!"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-28727.yml b/html/changelogs/AutoChangeLog-pr-28727.yml
deleted file mode 100644
index 0f0910439c6173..00000000000000
--- a/html/changelogs/AutoChangeLog-pr-28727.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "grungussuss"
-delete-after: True
-changes:
- - sound: "pen click now has a proper sound"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-28728.yml b/html/changelogs/AutoChangeLog-pr-28728.yml
deleted file mode 100644
index 28683638f3b8dd..00000000000000
--- a/html/changelogs/AutoChangeLog-pr-28728.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "SkyratBot"
-delete-after: True
-changes:
- - balance: "Jetpacks are now briefly disabled by EMP."
- - balance: "Mirage module has been removed from Sec modsuits."
- - balance: "Security modsuits now spawn with a better cell and the jetpack module preinstalled."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-28729.yml b/html/changelogs/AutoChangeLog-pr-28729.yml
deleted file mode 100644
index 718c16b995d0c5..00000000000000
--- a/html/changelogs/AutoChangeLog-pr-28729.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "grungussuss"
-delete-after: True
-changes:
- - bugfix: "fixed an unrestricted airlock in metastation brig maints"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-28730.yml b/html/changelogs/AutoChangeLog-pr-28730.yml
deleted file mode 100644
index 86a2687c8ebf40..00000000000000
--- a/html/changelogs/AutoChangeLog-pr-28730.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SkyratBot"
-delete-after: True
-changes:
- - bugfix: "Welding helmet and hardhat will now properly protect against pepperspray while its down"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-28731.yml b/html/changelogs/AutoChangeLog-pr-28731.yml
deleted file mode 100644
index d992d4a2697393..00000000000000
--- a/html/changelogs/AutoChangeLog-pr-28731.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "SkyratBot"
-delete-after: True
-changes:
- - bugfix: "hydroponic trays take in all reagents \"proportionally\" from plumbing ducts without leaving any behind"
- - bugfix: "plumbing bottler pumps out all reagents \"proportionally\" into output beakers"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-28732.yml b/html/changelogs/AutoChangeLog-pr-28732.yml
deleted file mode 100644
index b3e79c12a2db24..00000000000000
--- a/html/changelogs/AutoChangeLog-pr-28732.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SkyratBot"
-delete-after: True
-changes:
- - bugfix: "Ore vents that are caught in the cross-fire of a lavaland tendril collapsing will now spare the ore vent and it's associated turf."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-28734.yml b/html/changelogs/AutoChangeLog-pr-28734.yml
deleted file mode 100644
index 0cbfdd2ea2b3b7..00000000000000
--- a/html/changelogs/AutoChangeLog-pr-28734.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SkyratBot"
-delete-after: True
-changes:
- - bugfix: "fixed CNS rebooter/Changeling adrenaline not preventing/fixing stamina crit"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-28735.yml b/html/changelogs/AutoChangeLog-pr-28735.yml
deleted file mode 100644
index 211d4a1cb830b2..00000000000000
--- a/html/changelogs/AutoChangeLog-pr-28735.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SkyratBot"
-delete-after: True
-changes:
- - qol: "Using a multitool inhand tells you where the area APC is"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-28736.yml b/html/changelogs/AutoChangeLog-pr-28736.yml
deleted file mode 100644
index f483d2b4736244..00000000000000
--- a/html/changelogs/AutoChangeLog-pr-28736.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Rhials"
-delete-after: True
-changes:
- - bugfix: "Certain items can no longer be purchased or be offered with a discount on a loneop uplink. This is stuff like base cards (functionally useless) or Overwatch Intel Agents (which break the role)."
- - balance: "Loneops may now purchase chameleon noslips, station blackout triggers, and station comms failure triggers."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-28737.yml b/html/changelogs/AutoChangeLog-pr-28737.yml
deleted file mode 100644
index df025fd5a00a1a..00000000000000
--- a/html/changelogs/AutoChangeLog-pr-28737.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SkyratBot"
-delete-after: True
-changes:
- - bugfix: "Bloody footprints no longer bloody your shoes even more when walked over."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-28738.yml b/html/changelogs/AutoChangeLog-pr-28738.yml
deleted file mode 100644
index f116d9f946fab3..00000000000000
--- a/html/changelogs/AutoChangeLog-pr-28738.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SkyratBot"
-delete-after: True
-changes:
- - qol: "You can now use a spoon or ladle on an ice cream vat to spill a reagent, ridding the machine of all reagent of that type."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-28741.yml b/html/changelogs/AutoChangeLog-pr-28741.yml
deleted file mode 100644
index 9411b837550a52..00000000000000
--- a/html/changelogs/AutoChangeLog-pr-28741.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SkyratBot"
-delete-after: True
-changes:
- - bugfix: "Blood filters should filter out reagents completely now instead of leaving a small amount no matter what."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-28742.yml b/html/changelogs/AutoChangeLog-pr-28742.yml
deleted file mode 100644
index 2f87874c8c96de..00000000000000
--- a/html/changelogs/AutoChangeLog-pr-28742.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "grungussuss, ported from Beestation"
-delete-after: True
-changes:
- - sound: "abductee, hypnotized and brainwashed now have sound when becoming one."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-28744.yml b/html/changelogs/AutoChangeLog-pr-28744.yml
deleted file mode 100644
index 7de08648c020f6..00000000000000
--- a/html/changelogs/AutoChangeLog-pr-28744.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SkyratBot"
-delete-after: True
-changes:
- - bugfix: "Missing janitor access restrictions have been added to Birdshot's custodial closet doors."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-28745.yml b/html/changelogs/AutoChangeLog-pr-28745.yml
deleted file mode 100644
index addcde4c376220..00000000000000
--- a/html/changelogs/AutoChangeLog-pr-28745.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "SkyratBot"
-delete-after: True
-changes:
- - qol: "the disposal unit has been added to the cargo bay and miner's office."
- - bugfix: "missed disposal pipe returned at QM's office"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-28747.yml b/html/changelogs/AutoChangeLog-pr-28747.yml
deleted file mode 100644
index 6ce4e9f4c8c02f..00000000000000
--- a/html/changelogs/AutoChangeLog-pr-28747.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SkyratBot"
-delete-after: True
-changes:
- - bugfix: "Exosuit Stress Failure experiment now works"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-28748.yml b/html/changelogs/AutoChangeLog-pr-28748.yml
deleted file mode 100644
index 8f71ff39204f85..00000000000000
--- a/html/changelogs/AutoChangeLog-pr-28748.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "grungussuss"
-delete-after: True
-changes:
- - sound: "Zippos, Lighters and cigarettes now have sound"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-28750.yml b/html/changelogs/AutoChangeLog-pr-28750.yml
deleted file mode 100644
index 325df3be80d16a..00000000000000
--- a/html/changelogs/AutoChangeLog-pr-28750.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SkyratBot"
-delete-after: True
-changes:
- - bugfix: "fixed dubious chem dispenser feedback when the beaker is full"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-28751.yml b/html/changelogs/AutoChangeLog-pr-28751.yml
deleted file mode 100644
index f3e86e6b0900f0..00000000000000
--- a/html/changelogs/AutoChangeLog-pr-28751.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "SkyratBot"
-delete-after: True
-changes:
- - rscdel: "Removed the shuttle manipulator entries for the following shuttles: Northstar ferry, Omegastation arrivals shuttle, and Donutstation cargo ferry. (These shuttles didn't actually exist but they still had entries in the manipulator.)"
- - bugfix: "Fixed the following shuttles flying in unexpected directions: Basic CC Ferry, Meat Ferry, Lighthouse Ferry, ERT bounty shuttle, Kilo cargo shuttle, Pubby cargo shuttle, and Delta cargo shuttle."
- - bugfix: "Fixed the ERT bounty shuttle having incorrect offsets in the shuttle navigation console."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-28753.yml b/html/changelogs/AutoChangeLog-pr-28753.yml
deleted file mode 100644
index c50c5e98678706..00000000000000
--- a/html/changelogs/AutoChangeLog-pr-28753.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "SpaceLove"
-delete-after: True
-changes:
- - rscadd: "Prybar is possible to be bought again!"
- - rscadd: "Colony Fabricator can be bought from company imports now!"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-28754.yml b/html/changelogs/AutoChangeLog-pr-28754.yml
deleted file mode 100644
index ff2433aa56dbf1..00000000000000
--- a/html/changelogs/AutoChangeLog-pr-28754.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SkyratBot"
-delete-after: True
-changes:
- - rscadd: "Living flesh arms have a chance to actually touch the thing they're targeting instead of pulling it. Careful with supermatter!"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-29041.yml b/html/changelogs/AutoChangeLog-pr-29041.yml
new file mode 100644
index 00000000000000..387d68ad94f5ab
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-29041.yml
@@ -0,0 +1,5 @@
+author: "theselfish"
+delete-after: True
+changes:
+ - rscadd: "New laughs and screams! Be gendered no more!"
+ - bugfix: "Missing screams were added."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-29044.yml b/html/changelogs/AutoChangeLog-pr-29044.yml
new file mode 100644
index 00000000000000..1cf10852d05984
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-29044.yml
@@ -0,0 +1,4 @@
+author: "SkyratBot"
+delete-after: True
+changes:
+ - bugfix: "Xenomorphs and door pryer basic mobs can now attack airlocks in combat mode"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-29045.yml b/html/changelogs/AutoChangeLog-pr-29045.yml
new file mode 100644
index 00000000000000..09c2078fd7e0ac
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-29045.yml
@@ -0,0 +1,4 @@
+author: "SkyratBot"
+delete-after: True
+changes:
+ - bugfix: "Borgs now unequip their equipment upon module change like they should"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-29046.yml b/html/changelogs/AutoChangeLog-pr-29046.yml
new file mode 100644
index 00000000000000..9b6ead1445ecdd
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-29046.yml
@@ -0,0 +1,5 @@
+author: "LT3"
+delete-after: True
+changes:
+ - bugfix: "Fixed elevator panel allowing conflicting inputs"
+ - bugfix: "Fixed elevator sound being out of sync with movement"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-28743.yml b/html/changelogs/AutoChangeLog-pr-29048.yml
similarity index 52%
rename from html/changelogs/AutoChangeLog-pr-28743.yml
rename to html/changelogs/AutoChangeLog-pr-29048.yml
index bd4c53c9e5baa1..601336db472fbb 100644
--- a/html/changelogs/AutoChangeLog-pr-28743.yml
+++ b/html/changelogs/AutoChangeLog-pr-29048.yml
@@ -1,4 +1,4 @@
author: "SkyratBot"
delete-after: True
changes:
- - bugfix: "no more xenobio active turfs"
\ No newline at end of file
+ - image: "Updated gas flow meter sprites"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-29050.yml b/html/changelogs/AutoChangeLog-pr-29050.yml
new file mode 100644
index 00000000000000..09bf7dc1d9727c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-29050.yml
@@ -0,0 +1,4 @@
+author: "Thlumyn"
+delete-after: True
+changes:
+ - bugfix: "self-resp viruses don't spam messages as often"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-29051.yml b/html/changelogs/AutoChangeLog-pr-29051.yml
new file mode 100644
index 00000000000000..7d7fb126928448
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-29051.yml
@@ -0,0 +1,4 @@
+author: "SkyratBot"
+delete-after: True
+changes:
+ - bugfix: "Fixes borgs not being able to place apparatus-held items on tables. As a side-effect, they can now combat mode right click splash containers as normal instead of having their own right-click floor splash."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-29052.yml b/html/changelogs/AutoChangeLog-pr-29052.yml
new file mode 100644
index 00000000000000..62f9c64c5066be
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-29052.yml
@@ -0,0 +1,4 @@
+author: "LT3"
+delete-after: True
+changes:
+ - bugfix: "Fixed disease outbreak announcement sometimes missing the disease name"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-29053.yml b/html/changelogs/AutoChangeLog-pr-29053.yml
new file mode 100644
index 00000000000000..61a3ea84506bdc
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-29053.yml
@@ -0,0 +1,4 @@
+author: "LT3"
+delete-after: True
+changes:
+ - bugfix: "Tram will no longer eat its own rails as it travels"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-29054.yml b/html/changelogs/AutoChangeLog-pr-29054.yml
new file mode 100644
index 00000000000000..158caf8e0417c7
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-29054.yml
@@ -0,0 +1,4 @@
+author: "LT3"
+delete-after: True
+changes:
+ - bugfix: "False supermatter surge announcements are now identical to real ones"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-29055.yml b/html/changelogs/AutoChangeLog-pr-29055.yml
new file mode 100644
index 00000000000000..7ec30cb8ab1f6e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-29055.yml
@@ -0,0 +1,4 @@
+author: "SkyratBot"
+delete-after: True
+changes:
+ - bugfix: "Janicart inserts items into the attached trash bag again (manual and vacuumed)"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-29056.yml b/html/changelogs/AutoChangeLog-pr-29056.yml
new file mode 100644
index 00000000000000..9cfc9ad9a4b6e9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-29056.yml
@@ -0,0 +1,4 @@
+author: "SkyratBot"
+delete-after: True
+changes:
+ - bugfix: "wawastation engineering water tanks are now highcap"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-29057.yml b/html/changelogs/AutoChangeLog-pr-29057.yml
new file mode 100644
index 00000000000000..1b8a75ee2f530f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-29057.yml
@@ -0,0 +1,4 @@
+author: "SkyratBot"
+delete-after: True
+changes:
+ - bugfix: "Fixes projectiles facing north if ricocheting, deflected or homing"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-29058.yml b/html/changelogs/AutoChangeLog-pr-29058.yml
new file mode 100644
index 00000000000000..4b43465ca8faaf
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-29058.yml
@@ -0,0 +1,4 @@
+author: "LT3"
+delete-after: True
+changes:
+ - bugfix: "Fixed delam counter stuck in window near Ice Box bridge"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-29059.yml b/html/changelogs/AutoChangeLog-pr-29059.yml
new file mode 100644
index 00000000000000..ead55083703dfe
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-29059.yml
@@ -0,0 +1,4 @@
+author: "SkyratBot"
+delete-after: True
+changes:
+ - bugfix: "Tram's Tool Storage now has proper lighting"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-29060.yml b/html/changelogs/AutoChangeLog-pr-29060.yml
new file mode 100644
index 00000000000000..d60a974b22c969
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-29060.yml
@@ -0,0 +1,4 @@
+author: "SkyratBot"
+delete-after: True
+changes:
+ - bugfix: "Firelocks will once again respect fire alarm's thermal sensors being disabled."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-29061.yml b/html/changelogs/AutoChangeLog-pr-29061.yml
new file mode 100644
index 00000000000000..1f4a07754f9818
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-29061.yml
@@ -0,0 +1,6 @@
+author: "SkyratBot"
+delete-after: True
+changes:
+ - rscdel: "Removed a janky fish bounty"
+ - rscadd: "introduced exporting fish through cargo."
+ - balance: "reduced the average weight of the jumpercable. Conversely, eased up the requirements for the bone fish evolution."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-29064.yml b/html/changelogs/AutoChangeLog-pr-29064.yml
new file mode 100644
index 00000000000000..0780b825d974bb
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-29064.yml
@@ -0,0 +1,4 @@
+author: "SkyratBot"
+delete-after: True
+changes:
+ - balance: "If a bluespace cookie fails to teleport you then you will trip over."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-29066.yml b/html/changelogs/AutoChangeLog-pr-29066.yml
new file mode 100644
index 00000000000000..61d811bb864b9f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-29066.yml
@@ -0,0 +1,4 @@
+author: "theselfish"
+delete-after: True
+changes:
+ - bugfix: "Fixes the Cloth Foot Wraps"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-29067.yml b/html/changelogs/AutoChangeLog-pr-29067.yml
new file mode 100644
index 00000000000000..db83f186ba1dfc
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-29067.yml
@@ -0,0 +1,5 @@
+author: "SkyratBot"
+delete-after: True
+changes:
+ - bugfix: "Fixed possessed blades being broken"
+ - code_imp: "If testing is enabled everyone is polled in ghost polls."
\ No newline at end of file
diff --git a/html/changelogs/archive/2024-07.yml b/html/changelogs/archive/2024-07.yml
index 8964787bfa399c..643ff56b97e859 100644
--- a/html/changelogs/archive/2024-07.yml
+++ b/html/changelogs/archive/2024-07.yml
@@ -527,3 +527,687 @@
- bugfix: Donator Item loadout was fixed.
xXPawnStarrXx:
- bugfix: fixed my medical tools not being printable.
+2024-07-10:
+ Jolly:
+ - code_imp: Behind the scenes, atmos machines (freezers/mixers) in maps were tweaked
+ a bit. If you see them no longer connected to specific pipenets, please make
+ an issue report, this is not intended behavior!!
+ LT3:
+ - qol: Hypospray and flashlight can be put in labcoat pockets
+ Rhials:
+ - bugfix: Certain items can no longer be purchased or be offered with a discount
+ on a loneop uplink. This is stuff like base cards (functionally useless) or
+ Overwatch Intel Agents (which break the role).
+ - balance: Loneops may now purchase chameleon noslips, station blackout triggers,
+ and station comms failure triggers.
+ SkyratBot:
+ - bugfix: Missing janitor access restrictions have been added to Birdshot's custodial
+ closet doors.
+ - sound: Added audible zipping to winter coats.
+ - bugfix: Exosuit Stress Failure experiment now works
+ - bugfix: Blood filters should filter out reagents completely now instead of leaving
+ a small amount no matter what.
+ - bugfix: Ore vents that are caught in the cross-fire of a lavaland tendril collapsing
+ will now spare the ore vent and it's associated turf.
+ - bugfix: hydroponic trays take in all reagents "proportionally" from plumbing ducts
+ without leaving any behind
+ - bugfix: plumbing bottler pumps out all reagents "proportionally" into output beakers
+ - rscadd: Added the designer EVA suit, a unique pirate hardsuit for Silverscales.
+ - balance: Increased the equipment available to Silverscales
+ - image: Sprites for the designer EVA suit
+ - qol: You can now use a spoon or ladle on an ice cream vat to spill a reagent,
+ ridding the machine of all reagent of that type.
+ - balance: Jetpacks are now briefly disabled by EMP.
+ - balance: Mirage module has been removed from Sec modsuits.
+ - balance: Security modsuits now spawn with a better cell and the jetpack module
+ preinstalled.
+ - bugfix: fixed CNS rebooter/Changeling adrenaline not preventing/fixing stamina
+ crit
+ - rscdel: 'Removed the shuttle manipulator entries for the following shuttles: Northstar
+ ferry, Omegastation arrivals shuttle, and Donutstation cargo ferry. (These shuttles
+ didn''t actually exist but they still had entries in the manipulator.)'
+ - bugfix: 'Fixed the following shuttles flying in unexpected directions: Basic CC
+ Ferry, Meat Ferry, Lighthouse Ferry, ERT bounty shuttle, Kilo cargo shuttle,
+ Pubby cargo shuttle, and Delta cargo shuttle.'
+ - bugfix: Fixed the ERT bounty shuttle having incorrect offsets in the shuttle navigation
+ console.
+ - qol: the disposal unit has been added to the cargo bay and miner's office.
+ - bugfix: missed disposal pipe returned at QM's office
+ - rscadd: Living flesh arms have a chance to actually touch the thing they're targeting
+ instead of pulling it. Careful with supermatter!
+ - bugfix: Welding helmet and hardhat will now properly protect against pepperspray
+ while its down
+ - bugfix: fixed dubious chem dispenser feedback when the beaker is full
+ - bugfix: no more xenobio active turfs
+ - bugfix: Embedding now properly changes its values.
+ - bugfix: Bloody footprints no longer bloody your shoes even more when walked over.
+ - qol: Using a multitool inhand tells you where the area APC is
+ SpaceLove:
+ - rscadd: Prybar is possible to be bought again!
+ - rscadd: Colony Fabricator can be bought from company imports now!
+ grungussuss:
+ - bugfix: fixed an unrestricted airlock in metastation brig maints
+ - sound: pen click now has a proper sound
+ - sound: Zippos, Lighters and cigarettes now have sound
+ grungussuss, ported from Beestation:
+ - sound: abductee, hypnotized and brainwashed now have sound when becoming one.
+2024-07-11:
+ LT3, distributivgesetz, unit0016:
+ - bugfix: Several liquids rendering issues have been tackled.
+ SkyratBot:
+ - bugfix: stacking machines can be linked with its console via multitool
+ - bugfix: Fixed a whoopsie with bait-related calculations for fishing.
+ - qol: Docked emergency shuttles will always reset their departure timer when a
+ hostile environment is stopped, regardless of if the timer displays ETD or ERR.
+ - bugfix: Amputating a paraplegic's leg no longer miraculously allows them to walk.
+ - bugfix: Fixed lights stopping emitting light in some situations
+2024-07-12:
+ Jolly:
+ - bugfix: '[Birdshot] The Ordnance freezer chamber is now linked to an APC, much
+ like the burn chamber.'
+ - bugfix: '[Birdshot] The Janitors quarters no longer uses `/area/station/commons`,
+ instead, it uses the janitors regular area.'
+ - bugfix: '[Birdshot] The entertainment center now has an APC.'
+ - bugfix: '[Birdshot] A handful of smaller areas have received air alarms.'
+ Melbert:
+ - rscadd: 'Bot Language station trait split into two: One that affects bots (retains
+ the old weight and cost) and one that affects machine (half weight, double the
+ cost)'
+ - rscdel: Bot Language station trait and (new) Machine Language station trait no
+ longer affect newly created machines or bots, just those present at game start
+ - rscdel: Machine Language station trait cannot affect the Automated Announcer in
+ telecomms
+ SkyratBot:
+ - refactor: move `status_display_bottom_text` and `fire_alarm_light_color` to security
+ level prototypes
+ - bugfix: Mapped in grounding rods can be upgraded again (not that upgraded parts
+ do anything for it) and don't disappear when deconstructed anymore.
+ - bugfix: Fixed an oversight that caused knockdown vomits to stun instead.
+ - bugfix: Using a dual wielded deck to add another card to a single card bases the
+ position of the resulting hand of cards on the position of the card.
+ - qol: Clothing now tells you if it is pressure-proof and insulated enough for spacewalking
+ when examining it.
+ - bugfix: Vapes use correct fill level overlays
+ - qol: TV helmet no longer has gas mask FOV, nor does it give you flash sensitivity.
+ - qol: Since those are gone, removed pepper proof from it as well.
+ - bugfix: You no longer try to pull out someones eyes in combat mode if they have
+ cranial fissure
+ - rscadd: You can emag grapple gun to use it on station.
+ - code_imp: added a crash report and removes an arg
+ - refactor: Refactored a lot of speech modifiers to use a component instead of copied
+ over code.
+ - bugfix: humanoid species featured are randomized correctly once again
+ - rscadd: Most door animations now better line up with when they are/are not passable.
+ - bugfix: Fixed being unable to cauterise wounds with improvised cautery tools such
+ as welders.
+ - bugfix: fixes the rightmost wawastation cryo cell
+ - bugfix: gave tram's primary tool storage functional disposals
+ - bugfix: Steaks and meatpacks no longer have an absurd amount of blood stored inside
+ of them.
+ - balance: Buffed the matrix flip skillchip duration. Lowered the stamina cost very,
+ very slightly.
+ - qol: You can now longer matrix-flip yourself into exhaustion, unless the emote
+ is unintentional.
+ - balance: bluespace navigation gigabeacons are now unlocked with Applied Bluespace
+ Research
+2024-07-13:
+ LT3:
+ - image: Incident displays got a makeover
+ - balance: Using the delam panic button will now reset the incident display counter
+ to 0
+ Melbert:
+ - qol: Roundstart Mannitol pills are 15u (up from 14u)
+ SkyratBot:
+ - balance: If you remove a security officer's mindshield, then you can flash them
+ to make them your blood brother.
+ - balance: Experimentor's reduction chance is multiplicative, and chance to copy
+ an object has been slightly lowered.
+ - qol: adds an oxygen chamber for wawastation ordnance
+ - qol: adds some missing critical items needed to do ordnance and xenobiology
+ - balance: Experimentor will no longer duplicate Bags of Holding
+ - balance: War declaration gives 600 research points to the station
+ - balance: Cryokinesis and pyrokinesis more severely adjust temperature.
+ - balance: Cryokinesis forces a target to slow down on hit for a few seconds.
+ - balance: Pyrokinesis can ignite objects.
+ - balance: Temperature projectiles change the temperature of the target's contained
+ reagents.
+ - bugfix: french berets will no longer force the user to speak spanish
+ - balance: Tetrodotoxin can now be synthesized (bees, the odysseus mech, strange
+ seeds...)
+ - balance: Upped the amount of tetrodotoxin you can harvest from pufferfishes (or
+ any fish with the trait).
+ - spellcheck: Fixed some typos with the toxin.
+ - image: re-sprited Catwalk Floor Tiles to fit with TG floor tiles
+ - image: MOD hyposprays no longer use syringe fill sprites
+ - bugfix: password doors and shutters will now play their sound effects again instead
+ of just silently opening/closing
+ - bugfix: Fixed a bluescreen in the heretic research ui
+ - bugfix: Added a Mechbay power console to the Metastation cargo warehouse so that
+ the cargo ripley is able to be charged.
+ - qol: Heads of staff PDAs start with twice as much disk space
+ - bugfix: H.A.R.S. will no longer disable your skillchips or show you text reserved
+ for total brain removal.
+ - bugfix: The modsuit paint kit is no longer broken.
+ - bugfix: Other mobs no longer hear your breathing
+ - bugfix: makes outpost45 cause less lag
+ - balance: Moves XL beaker from Chemical Synthesis to Medbay Equipment
+ - balance: Removes Plumbing node and moves most items to Chemical synthesis node
+ - balance: Moves piercing syringe from Plumbing node to Advanced Medbay Equipment
+ - rscadd: Add the National Ice Cream Day holiday, which falls on the third Sunday
+ of July.
+ - bugfix: all icons in the crafting menu (some that you missed) are now fixed permanently
+2024-07-14:
+ SkyratBot:
+ - rscadd: Changed the layout of birdshot engineering atmos and SM, added a proper
+ engineering storage area.
+ - bugfix: Fixes Icemoon syndie listening station APC's from being affected by station-side
+ events
+ - refactor: request managers have been refactored to typescript
+ - bugfix: request manager type filter now works
+ - image: the smoking pipe's directional looks have been altered to make it less
+ ugly
+ - qol: Using ctrl + your quick MOD button now opens module selector on your mouse
+ position
+ - bugfix: Grass turfs will render properly now. Reworked how floors render, please
+ report any bugs!
+ - bugfix: Cameras now properly capture lighting
+ - bugfix: The layering seen in photos should better match the actual game
+ - bugfix: Fixed tables and racks being climbable from half a mile away
+ - rscadd: Adds the Herculean Gravitronic Spinal Implant; an implant that makes you
+ better at athletics. You can upgrade it into an Atlas implant using a gravity
+ anomaly core.
+ - balance: Gravity anomaly cores have had their max number of cores reduces from
+ 8 to 6.
+ - balance: Your athletic ability allows you to climb faster.
+ - rscadd: Added airlock pump atmos device to create cycling airlocks
+ - rscadd: Cytology Lab has been added to Icebox
+ - rscadd: Delta now has soy seeds on the Cytology Lab
+ - bugfix: Cytology is playable again on Icebox
+ - bugfix: Fixed dead slime icon not showing when cores are extracted
+ - qol: Slime core removal surgery extracts all cores on completion
+ - rscadd: A new ork mutation which can be acquired by mixing hulk and clumsy.
+ SpaceLoveSs13:
+ - bugfix: fixed RSD, BSRPD, Affection Module, Spray perfume bottles etc. Report
+ further issues.
+ Vishenka0704:
+ - qol: With voting turned off for the dead, you can now understand why you can't
+ vote (being dead).
+ - admin: Voting switch for the dead players
+ thegrb93:
+ - bugfix: Fix laugh not being your selected laugh
+ theselfish:
+ - rscadd: Multiple new pets in the carrier.
+ - bugfix: A few masks are more easily clickable now.
+ - bugfix: Certain stock issues have been fixed. Kilts and Tactical Outfits are back
+ in the vendors.
+2024-07-15:
+ StrangeWeirdKitten:
+ - rscdel: Removed the nuke code from spawning on the Interlink.
+ thegrb93:
+ - code_imp: Anthro borg can use affection module
+ - refactor: Refactors borg affection module
+2024-07-16:
+ Melbert:
+ - qol: Lattices now make the same footstep sound as catwalks
+ - qol: If you're in oxycrit (>50 oxy damage) or otherwise made unconscious through
+ other means, blood loss will only kill you if you're *actually* missing a lethal
+ amount of blood.
+ MrDas:
+ - bugfix: Clown operative reinforcements' uplink no longer break the syndicates'
+ economy by creating TC from nothingness.
+ SkyratBot:
+ - bugfix: Attachment points on toolset implants have been improved, to prevent against
+ recycler related decouplings.
+ - bugfix: Fixes overwatch glasses not adding HUDs
+ - bugfix: Destroying the jungle grass tiles in Tramstation's science wing should
+ no longer open a chasm.
+ - qol: Research nodes can be queued, one per player. RDs can place their node at
+ the beginning of the queue.
+ - sound: added pickup, dropping and opening sound for pill bottle
+ - admin: Ghosts can no longer create deathmatch lobbies or join existing ones when
+ admins disable minigames
+ - bugfix: borgs have alt right click functionality
+ - qol: Pathfinder MODule can now be triggered while wearing the MODsuit to implant
+ yourself without having to pull it out of the suit.
+ - bugfix: You can no longer cause a bluescreen by attempting to recolor non-recolorable
+ loadout items.
+ - spellcheck: Firelocks no longer output their full name in their balloon alert.
+ - spellcheck: Failure message when a xenomorph tries to force open a welded firelock
+ is now a balloon alert.
+ - bugfix: mothroaches will no longer be crawling out of bags every minute
+ - bugfix: Accelerator cannon projectiles no longer grow to absurd sizes after a
+ bit of travel.
+ - admin: Outfit manager UI no longer harddels after closing and thus is usable more
+ than once
+ Thedragmeme:
+ - bugfix: Fixes the Plague hat having what the Plague mask should have
+ nikothedude:
+ - bugfix: Naga constrict no longer resets pixel x to 0 if you cosntrict someone
+ being pulled
+ theselfish:
+ - rscdel: Deleted some unused icons.
+ - bugfix: Even more OBJ fixes.
+2024-07-17:
+ Hardly3D:
+ - bugfix: Added a preview assistant outfit, allowing assistant jumpskirts to be
+ previewed again on character preferences.
+ SkyratBot:
+ - bugfix: ACTUALLY fixed hoverboards being able to be used in space.
+ - balance: However, you can soar space with the holy skateboard. at a slower speed.
+ - balance: Grinding fish no longer gives you uselessly high amount of blood and
+ gibs (unless they're very big)
+ - balance: tweaked the Linked Closets station trait.
+ - bugfix: You can't attach guns/drills/etc. to the Justice traitor mech anymore.
+ - bugfix: Correct emote plays when a human scream. Should have sound now.
+ - rscadd: Love is now stored in the heart.
+ - balance: Characters with the Friendly quirk now have physically bigger hearts.
+ - rscadd: new wizard spells category - perks.
+ - rscadd: adds 9 wizard perks.
+ - rscadd: Pipe pistols now magdump their entire magazine when fired.
+ - rscadd: Pipeguns and their subtypes have a knockback effect.
+ - bugfix: Pipe pistols cannot be bayoneted, as intended.
+ - bugfix: Junk rounds now actually do their extra damage effects against certain
+ mob types. Borgs across the Spinward tremble at the knowledge that these junk
+ weapons can obliterate them with ease.
+ - qol: removed a redundant, annoying reach check that prevents casting a fishing
+ rod before the projectile is generated.
+ - qol: You can now unhook the currently hooked item of a fishing rod with right-click.
+ - bugfix: Fixes dead raptors getting excited when petted or groomed
+ - rscadd: Megaphones now affect text-to-speech.
+ - bugfix: fixing speech modifiers being applied to a tongue's native languages.
+ - bugfix: Atmosphere can no longer flow through closed necropolis gates.
+ - rscadd: If you can't shoot a gun, then... JUST TOSS IT AT THEM (for 0.5 seconds
+ of knockdown and 10-20 an additional brute damage)
+ - bugfix: The Icebox ordnance lab is now once again a habitable temperature.
+ - bugfix: Icebox cytology now has cameras in it.
+ - sound: all materials now have a sound for picking up and dropping
+ - code_imp: items now have pitch vary sound support for dropping and picking up
+ items
+ - bugfix: Wawastation xenobio is no longer filled with BZ
+ - rscadd: Examining high-value paintings now can give a positive moodlet.
+ - qol: Observers can now zoom paintings in and out in the UI.
+ - bugfix: You can no longer fit an infinite amount of drivers into a clown car -
+ making spy-acquired clown cars usable!
+ theselfish:
+ - rscadd: Pirates speak pirate, Felinids speak Neko and you can return to ape. The
+ age of oppression is just about done.
+2024-07-18:
+ LT3:
+ - balance: Adjusted price of DeForest medical duffels and satchels
+ - balance: DeForest medical kit crates come with one unit instead of two
+ Melbert:
+ - bugfix: Using hulk (and a myriad of similar effects) now properly updates your
+ movespeed to ignore the damage movespeed penalty
+ - bugfix: Some things which temporarily make you fly don't make you fly forever
+ - bugfix: MODsuit ball module now properly makes you immune to damage movespeed
+ penalty when in ball form
+ - bugfix: Adding Hulk via VV dropdown doesn't default to adding the strongest hulk
+ available (that which is used by the medieval pirates)
+ Rhials:
+ - bugfix: Xenos have a "resist" ui element now. Cool!
+ SkyratBot:
+ - qol: made fish better quality when butchered, smushy koibeans and useable gunner
+ jellyfish.
+ - bugfix: malf ai voice changer no longer accepts dangerous inputs
+ - bugfix: Style meter text is no longer blurry and doesnt overlap with UI anymore.
+ - bugfix: Fixes hulks being able to activate dualsabers despite not being able to
+ actually do anything with them
+ - rscadd: standing on a closed crate now gives loud mode
+ - qol: Stopping orbiting now automatically breaks you out of autoobserve
+ - bugfix: Fixes space heater cell relative consumption inadvertently being changed
+ from the introduction of megacells.
+ - qol: The improvised chemical heater gives a more accurate description of its heating
+ power on examine.
+ - qol: Improved feedback when attempting to turn on a space heater that is lacking
+ a cell, has no charge or is broken.
+ - code_imp: Space heater relative cell consumption is consistent regardless of the
+ cell charge scale.
+ - bugfix: borgs can't put their integrated tools into the reagent grinder
+ - bugfix: Removed bitrunning beach brawl fax machine
+ - qol: You can properly aim mining bombs at turfs now
+ - bugfix: added a missing cable to Wawastation perma
+ grungussuss:
+ - rscadd: You can now buckle to bar stools
+ grungususs:
+ - spellcheck: fixed a typo for carrot sword description
+ theselfish:
+ - bugfix: Fixes even more stuff with the balaclavas
+2024-07-19:
+ SkyratBot:
+ - bugfix: fixes sentient firebots mauling things from a distance
+ - bugfix: acid/base buffers should update your target & source holder
+ - bugfix: remove reagent operations won't trigger excessive workload
+ - bugfix: deleting reagents from the chemmaster buffer works without a beaker inserted
+ - spellcheck: Removed an unnecessary apostrophe in DeltaStation's genetics monkey
+ pen door.
+ - bugfix: Plague Doctor Mask can now be used with internals again, and is no longer
+ unintentionally pepperproof.
+ - bugfix: Justice mech invisibility fix
+ - spellcheck: fixed a typo in borg research
+ - bugfix: fixes runtime in storage datums when hiding the ui
+ - bugfix: you can insert the withdrawal beaker into the portable chem mixer when
+ locked
+ - bugfix: Free items in research queue will now correctly be researched automatically.
+ - qol: Ghost orbit menu now always displays person's real name and their roundstart
+ job and cannot be fooled by disguises.
+ - bugfix: Point blank piercing shots no longer fly directly north after hitting
+ their intended target
+ SmArtKar, Kapu:
+ - balance: Projectiles now can hit border objects on other turfs instead of passing
+ through them
+ plsleavemealon:
+ - bugfix: Hemophages can now drink Velvet Kiss without vomiting
+ - balance: Velvet Kiss is now a race drink for Hemophages (in addition to the other
+ races that were already present!)
+ - balance: Velvet Kiss now restores blood at the same rate that Bloody Mary does
+ - balance: made hemophages able to drink several different blood-based drinks
+ theselfish:
+ - rscadd: Certain Security Clothes can be reskinned. Rejoice.
+ xXPawnStarrXx:
+ - bugfix: fixed my oversight of the exosuit fabricator.
+2024-07-20:
+ Melbert:
+ - qol: Monkeys that pray are given bonana
+ - bugfix: Fixes xenos being able to do that one mechanic that involves mouse-dragging
+ people to you
+ - bugfix: When Monkified or Humanified, you are no longer knocked down.
+ - bugfix: When cured of Monkified, you get the cure text now.
+ - bugfix: The text shown when cured / given Monkification now has color.
+ - bugfix: Being humanified now tells you what species you become rather than assuming
+ you are a human.
+ SkyratBot:
+ - bugfix: cold- & heat protection no longer have decimal precision issues.
+ - bugfix: fixed a table in the mining office at the metastation
+ - qol: Holofan and two thermomachine and emitter boards in lavaland syndicate base.
+ - bugfix: Revenge of the Pun Pun no longer runtimes on init
+ - bugfix: Elevator music no longer haunts you endlessly if you step off mid-transit
+ - image: the smoking pipe east/west sprites are now more consistent
+ - qol: Tweaked the colour of orange atmos pipes to be more distinct from the red
+ pipes, especially in darkness.
+ - bugfix: Fixed kinesis runtime due to un-unregistered signals
+ - bugfix: fixed a hard del with soapboxes
+ - qol: secmods jetpacks are now pinned by default
+ - bugfix: Removed some rogue decals and added a wall to Birdshot atmos storage,
+ and added cycling to upload/telecommunication entrances.
+ - rscadd: Having a robotic voicebox installed now lets you use silicon emotes.
+ - balance: MMI'd brains/posibrains can now use silicon emotes.
+ - balance: Simple and basic bots can actually beep.
+ - bugfix: MMI'd brains/posibrains are no longer both allowed AND blocked from beeping,
+ now just being allowed to beep.
+ - qol: Moths that pray get a moffin
+2024-07-21:
+ 00-Steven:
+ - bugfix: You can see runechat above fullscreen overlays on lower multi-z levels
+ again. Rejoice, blind players. Please report any weird rendering layering issues.
+ ArcaneMusic:
+ - rscadd: Items spawned via traitor uplinks or are known illegal contraband on the
+ station can now be scanned and identified as such by the N-spect scanners in
+ security. These only applies to overt traitor or antagonist items, and "stealth"
+ items will not be seen as such.
+ - rscadd: Scanner gates can now be upgraded by using an N-spect scanner on it to
+ unlock "contraband scanning" mode.
+ - rscadd: Security officers can now be offered a bounty to turn in pieces of contraband.
+ - rscadd: Some stealthy storage items like storage implants, smuggler's satchels,
+ void cloaks, the infiltrator modsuit, and the chameleon backpack will block
+ the presence of contraband on your person when placed inside.
+ - qol: N-spect scanner contextual screentips.
+ - balance: Recharger security bounties ask for a quantity of 1, down from 3.
+ - qol: security, cargo, and medbay have access to scanner gate boards.
+ DrDiasyl aka DrTuxedo:
+ - rscadd: Security and Engineering holosigns can now be opened with their projector
+ by clicking them from afar
+ - rscadd: SecVendor starts with 2 Security holosigns
+ - qol: Holosigns don't block projectiles anymore
+ - qol: Security holosigns now take 2 seconds to create instead of 3
+ - image: Janitor, Security, Medical, and Engineering holosigns now have cleaner
+ sprites
+ - code_imp: Holosigns now use proper cooldowns instead of the world.time
+ - spellcheck: Holosigns and holosign creators' descriptions give more information
+ now
+ GPeckman:
+ - spellcheck: The techweb no longer erroneously refers to MODsuits as exosuits.
+ Hardly3D:
+ - rscadd: 'Added new hairstyle: Short Bangs 2'
+ JohnFulpWillard:
+ - balance: Human AIs no longer have a teleport blocking implant or borg costume,
+ but now has a portable crew monitor.
+ Majkl-J:
+ - qol: Borer crawling inside people now works without a tgui menu
+ - bugfix: Fixed borer organs not properly cleaning up and linking to the borer
+ - refactor: Borer ability code refactor. Report any issues on the github or to @waterpig
+ on Discord
+ Melbert:
+ - qol: Random player characters now look less like rainbow vomit and more like some
+ of the most average people you know.
+ - bugfix: Non-humans should look less transparent while in space
+ - bugfix: Fixed roundstart monkeys not having monkified
+ - bugfix: Fixed being "de-monkified" while dead making it difficult to actually
+ de-monkey you going forward
+ - bugfix: Fixed genetic scanner showing dead mobs as "transforming"
+ SkyratBot:
+ - image: New deep fryer sprite
+ - admin: Ticking "Job Playtime Exempt" on a player's Job Playtime Tracker panel
+ will also exempt them from BYOND Account Age restrictions now. It previously
+ only exempted them from actual living playtime minutes - this is for the BYOND
+ Account Age in days.
+ - qol: chem dispenser displays units instead of kilowatts
+ - bugfix: Fixed new charger power not working fior strange objects
+ - bugfix: Fixed emitters, shield gens and other wired machinery having lower power
+ consumption priority than APCs
+ - qol: Made APCs charge more evenly to ensure that environment and lights are working
+ everywhere before giving the power for equipment
+ - bugfix: fixed megaphone tts filter.
+ - image: Added new unique sprites for cyborg upgrade modules
+ - rscadd: Bitrunning and (spawn) Miner jumpsuits are now in their drobe.
+ - qol: The Coroner Drobe got sorted into less 'shove everything in' and more 'in
+ a sane format'.
+ - image: Changed some default options in the character creator.
+ - rscadd: Added the civilian modsuit module as a standalone model. It offers no
+ slowdown while activated but does NOT protect you from the void of space. You
+ can print the plating from an exosuit fabricator and build it like a normal
+ modsuit.
+ - rscdel: Removed the civilian skin from the standard modsuit, as it is now a standalone
+ model.
+ - image: Tweaked the sprites for the civilian modsuit head, both in-hand and on
+ the mob. Also added a civilian mod plating sprite.
+ - image: Brainwashing victims now have smoothed out brain sprites without those
+ pesky wrinkles
+ - balance: reduced the prices of some blackmarket items across the board.
+ - balance: the thermite bottle (from the contraband spawner and the blackmarket),
+ now spawns with 50u of thermite vs 30, enough to melt one reinforced wall.
+ - rscadd: Replaced the science googles from the blackmarket with a security + health
+ scanner HUD.
+ - rscadd: Replaced the single shotgun dart from the blackmarket with a box of XL
+ shotgun darts.
+ - rscadd: The donk pocket box from the blackmarket now comes in different flavors.
+ - bugfix: Fixed null description in cerulean regenerative extract
+ - qol: Allow custom borg hat placement for custom borg skins
+ - bugfix: Fixes organizer sometimes deleting brains
+ - bugfix: Context maptext now properly dynamically adjusts itself instead of using
+ hardcoded pixel values
+ - bugfix: Announcement subheader will no longer overlap the header if the second
+ one is very long
+ - bugfix: Blob victory no longer spams spore zombie notifications to ghosts
+ - bugfix: Fixed sometimes obtaining the nodrop highlander kilt with relics
+ - bugfix: Fixed bioscramble function not working for strange objects unless dropped
+ - bugfix: Fixed the disguiser cardboard ID not overlaying properly
+ - qol: Moving the light bulb removal function from the left mouse button to the
+ right one.
+ - qol: Added & improved tips related to the light fixture
+ - bugfix: APC icon properly turns green on full charge
+ - bugfix: APC shows correct charging rate in UI
+ - code_imp: Added early machine process for shield generators and emitters to prioritize
+ power draw
+ - code_imp: Added late machine process for power monitors to gather accurate powernet
+ load
+ - bugfix: Fixed a signal reg error caused by add_occupant being called twice
+ - bugfix: Sentient floorbots can now rip up tiles when emagged
+ - code_imp: Slight cleanup in floorbot code
+ SmArtKar:
+ - bugfix: Ghosts can no longer move chairs
+ - bugfix: You can attack bookshelves in a variety of states once more
+ - qol: You can fire PKAs/plasma cutters point blank at turfs.
+ SpaceLove:
+ - bugfix: Towels can be used to mop up and Lustwish constructions can be deconstructed
+ Thedragmeme:
+ - qol: re-maps the raptor barn to not stick out like a sore thumb
+ - bugfix: Miners and the public both can access the raptor barn without having to
+ make a bridge themselves
+ carlarctg:
+ - rscadd: Adds six new strange object powers! Drink dispenser, bioscrambler, recharger,
+ hugger, dimensional, disguiser.
+ - code_imp: 'Removed some unused code and items, and added a proc that returns a
+ random #colorstring.'
+ thegrb93:
+ - bugfix: Fixes hat offsets on quadruped borgs
+ theselfish:
+ - bugfix: another clothing file fixed
+ - rscadd: Added admin spawnable Redsec varients to the override file
+2024-07-22:
+ DrDiasyl aka DrTuxedo:
+ - rscadd: Scanner gates now blare into the chat the reason why it got triggered
+ - rscadd: Scanner gates now can have false positives/negatives, and the chance of
+ them being reduced when they are upgraded
+ - rscadd: Brig entrances now have scanner gates preset to detect GUNS
+ - rscadd: You can now scan people with N-Spector for contraband
+ - image: Scanner gates now have a better sprite with dirs
+ - qol: Scanner gates description now tells to what mode they are set
+ - bugfix: You no longer can remove N-Spector from scanner gates without unlocking
+ them first
+ SkyratBot:
+ - qol: Mod UI is narrow again
+ - bugfix: Closing mind transfer popup does not transfer your mind anymore
+ - bugfix: Fixed beyblade *flipping.
+ - bugfix: Recalling lantern wisp now properly removes its effects from you
+ - spellcheck: Fixed a typo in the description for the Syndicate Rebar Crossbow in
+ the Uplink.
+2024-07-23:
+ LT3:
+ - balance: APCs are no longer arc shielded by default
+ - balance: SMES throughput is now a multiplier based on capacitor tier
+ Melbert:
+ - refactor: Refactored how vending machine icons are displayed, please report if
+ you see any broken icons. Also if all the icons look like missing file icons
+ for you, you gotta update byond man, you're like a year out of date.
+ - rscadd: Fox infusion has more content related to it now
+ SkyratBot:
+ - rscadd: Gives voidwalker telepathy
+ - bugfix: Fixes the Unsettle ability ignoring line of sight (which was it's sole
+ gimmick, im just dumb)
+ - balance: Voidwalkers cannot break windows anymore or throw objects
+ - balance: Voidwalkers can no longer harm people in crit
+ - balance: Voidwalkers can only pull mobs
+ - balance: Voidwalkers' space dive enter has been increased by 1 seconds, but dive
+ exit decreased by 1 second
+ - balance: Void eater becomes blunt during use. Kidnap people to refresh it
+ - balance: Removes voidwalker glasses slot
+ - balance: Gives voidwalkers chunky fingers
+ - balance: Voidwalker applies NODEATH on hit
+ - balance: Voided victims get dumped in safer places
+ - rscadd: Adds Untie Shoes, a 1-point wizard spell. It can be upgraded to untie
+ jackboots, summon shoes to untie, and become completely silent!
+ - bugfix: Fixes fishing rods not working on adjacent targets.
+ - refactor: refactored global set_basalt_light proc into object proc
+ - bugfix: Holopads no longer suck in unsuspecting people when crowbared
+ - code_imp: Removed 8 cases of double indentation
+ - bugfix: HONK mech now waddles
+ - rscadd: 'Charlie: Replaced external cycling airlocks with airlock pumps'
+ - bugfix: Shuttle events meteors now dont sometimes kill everyone
+ - admin: 'Nanotrasen has brought Central Command kicking and screaming into the
+ 20th Century by providing them with a real fax machine.
+
+ :cl:'
+ - bugfix: Surgical tape and edagger's embedding values have been fixed
+ - refactor: Refactored table item interactions, please report any issues.
+ - bugfix: Fixed being unable to use decks to draw cards directly onto tables.
+ - qol: Right clicking a table with a tray puts it down regardless of it having contents.
+ - bugfix: general bitrunning fixes and 102% faster loading times
+ - bugfix: bitrunning domains are no longer affected by nebulas in the real world
+ - refactor: mulebot UI has been refactored
+ - qol: Self-respiration no longer sends misleading messages and instead tells about
+ lack of need to breathe once it actually gives you the effect
+ - rscadd: You can now fish with explosives.
+ - bugfix: Fixed an inconsistency with examining fishing spots with sufficiently
+ high fishing skill (or skillchip).
+ - qol: There is a larger stock of roundstart clothing availalbe in the clothing
+ vendors. Now you can get your entire gang in matching outfits!
+ - qol: Updated smart fridge UI
+ Thedragmeme:
+ - image: Adds a series of traditional yukata's and kimono's
+ - image: Adds in black sandals and a traditional hairpin for the back of the hair
+2024-07-24:
+ Majkl-J:
+ - bugfix: Collars can be locked again
+ - bugfix: Taur legs can no longer create bloody floating sprites
+ - code_imp: Taur legs no longer take overlay slots
+ SkyratBot:
+ - bugfix: Alexander no longer causes harddels
+ - bugfix: Removed a theoretical infinite block exploit from alexander
+ - bugfix: Fixes bulldog shotgun unique mag display not working on the sprite
+ - image: resprites the bulldog shotgun along with inhands and new worn sprites
+ - code_imp: cleans up a little of the code surrounding the bulldog
+ theselfish:
+ - rscadd: Clown, Tiger and Mime Cats now have unique voice lines!
+ - bugfix: Toddlers beware, you're in for a scare! At a Nanotrasen Finance meeting
+ held by famed comedian Ian Fidance, the choice between the Lustwish and the
+ Pitbull-Toddler-Eating suppression system was made. Pitbulls will now murder
+ small animals if left unattended.
+2024-07-25:
+ SkyratBot:
+ - bugfix: Borgs and AI can now use research queue
+ - bugfix: You can no longer dupe metal by breaking walls under small light fixtures
+ - bugfix: Animal/people skin is no longer metallic sounding
+ - bugfix: Fixed fishing.
+ - spellcheck: Renamed the Crimson Focus to the Crimson Medallion
+ - bugfix: Fixed harvesters not being properly bound to their master, nor dying when
+ they do
+ - bugfix: Fixed heads totally overriding cultist sacrifice rewards
+ - rscadd: Heretic blade now converts to a nullblade
+ - rscadd: Added wooshing, shaking, and glowing to flinging around with the heretic
+ blade
+ - balance: Removed the probability to not gain a reward when sacrificing a cultist
+ - bugfix: Restores some of the items accidentally lost in the autodrobe.
+ - bugfix: You can now put dead mice into mortars/grinders properly
+ - qol: Now IDs and PDAs have money-reader module for picking some cash into your
+ bank by swiping on money.
+ - qol: fish analyzers now have a UI
+ - bugfix: Fixes Hereditary Manifold Sickness's 4th stage not updating health when
+ it should
+ - config: Added an entry for TRAITOR_SCALING_MULTIPLIER, disabled by default
+ - rscadd: You can raise lobstrosities from chasm chrabs inside an aquarium with
+ the 'allow breeding' setting on. Keep the fish well fed, healthy and not lonely
+ if you don't want an hostile one.
+ - rscadd: Juveline lobstrosities (from chasms, plasma rivers, or aquariums, xenobio
+ too) can be tamed with arms and lavaloop fishes.
+ - rscadd: For lobstrosities grown from aquariums, they can have additional effects
+ based on the fish traits they had in the aquarium, like being venomous or even
+ flying.
+ - qol: Chat notifications are now at the top
+ - balance: Mechs now take armor into consideration when calculating punch damage
+ - bugfix: Mechs no longer deal direct limb damage
+ - bugfix: Drills automatically pick up ore on non-ripley mechs now without having
+ to move
+ - bugfix: Drills no longer dismember people immune to melee damage
+ - bugfix: Drills now take armor from correct bodyparts when attacking
+ - code_imp: Cleaned up one-letter variables in mech drill code
+ - bugfix: You can no longer microwave kisses, slappers, and other abstract items
+ - bugfix: fixes bitrunning breaking upon repeatedly climbing in and out the pod
+ - qol: Photocopier updated their UI
+ - bugfix: Stacking machine consoles link to machinery now
+ - rscadd: Dehydrator, a machine version of drying rack, with a circuit board and
+ available on some kitchens roundstart.
+ - image: Updated the color palette of Smart Fridge
+ - bugfix: Having your liver fail no longer keeps drug traits active without metabolizing
+ them
+ Vekter:
+ - spellcheck: Reworded Voidwalker's objectives to be more descriptive of their actual
+ goals as opposed to just fluff.
+ theselfish:
+ - rscadd: Clowns now have a beret. A rainbow one, too.
+2024-07-26:
+ SkyratBot:
+ - balance: Quality cybernetic hearts combat bleeds and restore blood, rather than
+ inject you with epinephrine when you enter crit. This can result in mild toxin
+ buildup, however.
+ - balance: Upgraded cybernetic hearts give an extremely brief amount of action when
+ you enter softcrit (but not hardcrit).
diff --git a/icons/area/areas_centcom.dmi b/icons/area/areas_centcom.dmi
index a3e8aafb72fb72..a33055722ffc47 100644
Binary files a/icons/area/areas_centcom.dmi and b/icons/area/areas_centcom.dmi differ
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index efbe4989c64283..dc1c2b121b6163 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/effects/holosigns.dmi b/icons/effects/holosigns.dmi
new file mode 100644
index 00000000000000..9d951114b773d4
Binary files /dev/null and b/icons/effects/holosigns.dmi differ
diff --git a/icons/effects/mapping_helpers.dmi b/icons/effects/mapping_helpers.dmi
index 47684f4664e89e..c415d4dcff1f4d 100644
Binary files a/icons/effects/mapping_helpers.dmi and b/icons/effects/mapping_helpers.dmi differ
diff --git a/icons/effects/mouse_pointers/lace.dmi b/icons/effects/mouse_pointers/lace.dmi
new file mode 100644
index 00000000000000..68aad755c627ef
Binary files /dev/null and b/icons/effects/mouse_pointers/lace.dmi differ
diff --git a/icons/effects/particles/voidwalker.dmi b/icons/effects/particles/voidwalker.dmi
new file mode 100644
index 00000000000000..d7f94c987979ac
Binary files /dev/null and b/icons/effects/particles/voidwalker.dmi differ
diff --git a/icons/mob/actions/actions_spells.dmi b/icons/mob/actions/actions_spells.dmi
index b8d3c3ce34b544..335229641fa826 100644
Binary files a/icons/mob/actions/actions_spells.dmi and b/icons/mob/actions/actions_spells.dmi differ
diff --git a/icons/mob/actions/actions_voidwalker.dmi b/icons/mob/actions/actions_voidwalker.dmi
new file mode 100644
index 00000000000000..fd0825994d089a
Binary files /dev/null and b/icons/mob/actions/actions_voidwalker.dmi differ
diff --git a/icons/mob/actions/backgrounds.dmi b/icons/mob/actions/backgrounds.dmi
index c9aa1534538804..c8f8b723f9e964 100644
Binary files a/icons/mob/actions/backgrounds.dmi and b/icons/mob/actions/backgrounds.dmi differ
diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi
index be83d83d4228c6..aa2cbe3a756fc3 100644
Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ
diff --git a/icons/mob/clothing/feet.dmi b/icons/mob/clothing/feet.dmi
index 3ae1eb68e865f3..95a3790ac7331a 100644
Binary files a/icons/mob/clothing/feet.dmi and b/icons/mob/clothing/feet.dmi differ
diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi
index ded01542e31b6b..b62b6a0a8ee583 100644
Binary files a/icons/mob/clothing/hands.dmi and b/icons/mob/clothing/hands.dmi differ
diff --git a/icons/mob/clothing/head/costume.dmi b/icons/mob/clothing/head/costume.dmi
index 1f4f12ff8c8c8a..1de2281271f801 100644
Binary files a/icons/mob/clothing/head/costume.dmi and b/icons/mob/clothing/head/costume.dmi differ
diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi
index c877c2fcb8826d..5f577c7e255d96 100644
Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ
diff --git a/icons/mob/clothing/modsuit/mod_clothing.dmi b/icons/mob/clothing/modsuit/mod_clothing.dmi
index 64affedb2de4c1..3a567eac4e724b 100644
Binary files a/icons/mob/clothing/modsuit/mod_clothing.dmi and b/icons/mob/clothing/modsuit/mod_clothing.dmi differ
diff --git a/icons/mob/clothing/neck.dmi b/icons/mob/clothing/neck.dmi
index ed0bb34b46449a..3467f752ac3a5b 100644
Binary files a/icons/mob/clothing/neck.dmi and b/icons/mob/clothing/neck.dmi differ
diff --git a/icons/mob/clothing/under/costume.dmi b/icons/mob/clothing/under/costume.dmi
index 34703c070589d1..34612120ea6308 100644
Binary files a/icons/mob/clothing/under/costume.dmi and b/icons/mob/clothing/under/costume.dmi differ
diff --git a/icons/mob/human/human_face.dmi b/icons/mob/human/human_face.dmi
index d96800c3a8bb8b..886094ec495738 100644
Binary files a/icons/mob/human/human_face.dmi and b/icons/mob/human/human_face.dmi differ
diff --git a/icons/mob/human/species/voidwalker.dmi b/icons/mob/human/species/voidwalker.dmi
new file mode 100644
index 00000000000000..f7e616864f1a1d
Binary files /dev/null and b/icons/mob/human/species/voidwalker.dmi differ
diff --git a/icons/mob/human/textures.dmi b/icons/mob/human/textures.dmi
new file mode 100644
index 00000000000000..c5f420c7de866d
Binary files /dev/null and b/icons/mob/human/textures.dmi differ
diff --git a/icons/mob/inhands/antag/voidwalker_lefthand.dmi b/icons/mob/inhands/antag/voidwalker_lefthand.dmi
new file mode 100644
index 00000000000000..5cd8b8817ec319
Binary files /dev/null and b/icons/mob/inhands/antag/voidwalker_lefthand.dmi differ
diff --git a/icons/mob/inhands/antag/voidwalker_righthand.dmi b/icons/mob/inhands/antag/voidwalker_righthand.dmi
new file mode 100644
index 00000000000000..f227c6105ad1e5
Binary files /dev/null and b/icons/mob/inhands/antag/voidwalker_righthand.dmi differ
diff --git a/icons/mob/inhands/clothing/hats_lefthand.dmi b/icons/mob/inhands/clothing/hats_lefthand.dmi
index 1d6461fb39dc94..4fa05fa6cd6911 100644
Binary files a/icons/mob/inhands/clothing/hats_lefthand.dmi and b/icons/mob/inhands/clothing/hats_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing/hats_righthand.dmi b/icons/mob/inhands/clothing/hats_righthand.dmi
index 4d9710bf901592..dfb0b71ef4bdcb 100644
Binary files a/icons/mob/inhands/clothing/hats_righthand.dmi and b/icons/mob/inhands/clothing/hats_righthand.dmi differ
diff --git a/icons/mob/inhands/clothing/shoes_lefthand.dmi b/icons/mob/inhands/clothing/shoes_lefthand.dmi
index a5fd6d3318cff0..9a8e008e483432 100644
Binary files a/icons/mob/inhands/clothing/shoes_lefthand.dmi and b/icons/mob/inhands/clothing/shoes_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing/shoes_righthand.dmi b/icons/mob/inhands/clothing/shoes_righthand.dmi
index 8f5a3c374ca08d..bdc82c0530df2a 100644
Binary files a/icons/mob/inhands/clothing/shoes_righthand.dmi and b/icons/mob/inhands/clothing/shoes_righthand.dmi differ
diff --git a/icons/mob/inhands/clothing/suits_lefthand.dmi b/icons/mob/inhands/clothing/suits_lefthand.dmi
index 02b1e2cbff266a..9c15bb18c7b671 100644
Binary files a/icons/mob/inhands/clothing/suits_lefthand.dmi and b/icons/mob/inhands/clothing/suits_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing/suits_righthand.dmi b/icons/mob/inhands/clothing/suits_righthand.dmi
index 7dd047b7345d7b..87187225fdc609 100644
Binary files a/icons/mob/inhands/clothing/suits_righthand.dmi and b/icons/mob/inhands/clothing/suits_righthand.dmi differ
diff --git a/icons/mob/inhands/weapons/guns_lefthand.dmi b/icons/mob/inhands/weapons/guns_lefthand.dmi
index c1bcd197278b55..6a29758cb99e86 100644
Binary files a/icons/mob/inhands/weapons/guns_lefthand.dmi and b/icons/mob/inhands/weapons/guns_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/guns_righthand.dmi b/icons/mob/inhands/weapons/guns_righthand.dmi
index 98788d73711359..4f91839205c9a7 100644
Binary files a/icons/mob/inhands/weapons/guns_righthand.dmi and b/icons/mob/inhands/weapons/guns_righthand.dmi differ
diff --git a/icons/mob/nonhuman-player/eldritch_mobs.dmi b/icons/mob/nonhuman-player/eldritch_mobs.dmi
index 18e50d727aee53..3f2aa454f0eb44 100644
Binary files a/icons/mob/nonhuman-player/eldritch_mobs.dmi and b/icons/mob/nonhuman-player/eldritch_mobs.dmi differ
diff --git a/icons/mob/silicon/robot_items.dmi b/icons/mob/silicon/robot_items.dmi
index 00c813ace7f48c..2cb809fe2724b1 100644
Binary files a/icons/mob/silicon/robot_items.dmi and b/icons/mob/silicon/robot_items.dmi differ
diff --git a/icons/mob/simple/icemoon/icemoon_monsters.dmi b/icons/mob/simple/icemoon/icemoon_monsters.dmi
index 3e53c0a9712289..739092d63ad62c 100644
Binary files a/icons/mob/simple/icemoon/icemoon_monsters.dmi and b/icons/mob/simple/icemoon/icemoon_monsters.dmi differ
diff --git a/icons/mob/simple/mob.dmi b/icons/mob/simple/mob.dmi
index e8fb3c59b8fbee..142481e08e9a7a 100644
Binary files a/icons/mob/simple/mob.dmi and b/icons/mob/simple/mob.dmi differ
diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi
index 465340870dd480..4739498c16426a 100644
Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ
diff --git a/icons/obj/clothing/head/costume.dmi b/icons/obj/clothing/head/costume.dmi
index 25bc62a5314ee7..7ece76ca5a7e6d 100644
Binary files a/icons/obj/clothing/head/costume.dmi and b/icons/obj/clothing/head/costume.dmi differ
diff --git a/icons/obj/clothing/modsuit/mod_clothing.dmi b/icons/obj/clothing/modsuit/mod_clothing.dmi
index 3de713477b696a..85dd82449709f3 100644
Binary files a/icons/obj/clothing/modsuit/mod_clothing.dmi and b/icons/obj/clothing/modsuit/mod_clothing.dmi differ
diff --git a/icons/obj/clothing/modsuit/mod_construction.dmi b/icons/obj/clothing/modsuit/mod_construction.dmi
index dedcb3f838d649..1080b89650772e 100644
Binary files a/icons/obj/clothing/modsuit/mod_construction.dmi and b/icons/obj/clothing/modsuit/mod_construction.dmi differ
diff --git a/icons/obj/clothing/neck.dmi b/icons/obj/clothing/neck.dmi
index e8726cfcb73a5b..ca90eb8a3291bf 100644
Binary files a/icons/obj/clothing/neck.dmi and b/icons/obj/clothing/neck.dmi differ
diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi
index ec2a128a865f2f..8c91be43d4ad00 100644
Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ
diff --git a/icons/obj/clothing/under/costume.dmi b/icons/obj/clothing/under/costume.dmi
index 85a49d1b3300ca..42aa61e66b83c4 100644
Binary files a/icons/obj/clothing/under/costume.dmi and b/icons/obj/clothing/under/costume.dmi differ
diff --git a/icons/obj/doors/blastdoor.dmi b/icons/obj/doors/blastdoor.dmi
index 9457690cda365a..9c7bec103cefa1 100644
Binary files a/icons/obj/doors/blastdoor.dmi and b/icons/obj/doors/blastdoor.dmi differ
diff --git a/icons/obj/doors/doorfireglass.dmi b/icons/obj/doors/doorfireglass.dmi
index 250b5ca833a89c..83156ae4351e1b 100644
Binary files a/icons/obj/doors/doorfireglass.dmi and b/icons/obj/doors/doorfireglass.dmi differ
diff --git a/icons/obj/doors/doormorgue.dmi b/icons/obj/doors/doormorgue.dmi
index c0ed1147325ce7..381e5c3385ef3a 100644
Binary files a/icons/obj/doors/doormorgue.dmi and b/icons/obj/doors/doormorgue.dmi differ
diff --git a/icons/obj/doors/puzzledoor/danger.dmi b/icons/obj/doors/puzzledoor/danger.dmi
index 89d19131cc189e..ed78272037e37c 100644
Binary files a/icons/obj/doors/puzzledoor/danger.dmi and b/icons/obj/doors/puzzledoor/danger.dmi differ
diff --git a/icons/obj/doors/puzzledoor/default.dmi b/icons/obj/doors/puzzledoor/default.dmi
index 49a92061395800..685fc448bdee0a 100644
Binary files a/icons/obj/doors/puzzledoor/default.dmi and b/icons/obj/doors/puzzledoor/default.dmi differ
diff --git a/icons/obj/doors/puzzledoor/wood.dmi b/icons/obj/doors/puzzledoor/wood.dmi
index f2b53e857393b8..58717aacf1e651 100644
Binary files a/icons/obj/doors/puzzledoor/wood.dmi and b/icons/obj/doors/puzzledoor/wood.dmi differ
diff --git a/icons/obj/doors/shutters.dmi b/icons/obj/doors/shutters.dmi
index 1cc727cdbf7a4d..5fd2b2a8213d5f 100644
Binary files a/icons/obj/doors/shutters.dmi and b/icons/obj/doors/shutters.dmi differ
diff --git a/icons/obj/doors/shutters_radiation.dmi b/icons/obj/doors/shutters_radiation.dmi
index 2e70b24a4aa2aa..37b8cf72cbca0a 100644
Binary files a/icons/obj/doors/shutters_radiation.dmi and b/icons/obj/doors/shutters_radiation.dmi differ
diff --git a/icons/obj/doors/shutters_window.dmi b/icons/obj/doors/shutters_window.dmi
index fcf8af5b94fd79..b86fe675366c13 100644
Binary files a/icons/obj/doors/shutters_window.dmi and b/icons/obj/doors/shutters_window.dmi differ
diff --git a/icons/obj/doors/windoor.dmi b/icons/obj/doors/windoor.dmi
index 86893eb9c453cc..117cd78e1348b4 100644
Binary files a/icons/obj/doors/windoor.dmi and b/icons/obj/doors/windoor.dmi differ
diff --git a/icons/obj/food/meat.dmi b/icons/obj/food/meat.dmi
index 66761ee20298d0..bf0b1df4f4cd2b 100644
Binary files a/icons/obj/food/meat.dmi and b/icons/obj/food/meat.dmi differ
diff --git a/icons/obj/machines/atmospherics/unary_devices.dmi b/icons/obj/machines/atmospherics/unary_devices.dmi
index 47acf3c29c9c47..73da54768b1cb7 100644
Binary files a/icons/obj/machines/atmospherics/unary_devices.dmi and b/icons/obj/machines/atmospherics/unary_devices.dmi differ
diff --git a/icons/obj/machines/incident_display.dmi b/icons/obj/machines/incident_display.dmi
index 80d63134f1d023..863a5001315252 100644
Binary files a/icons/obj/machines/incident_display.dmi and b/icons/obj/machines/incident_display.dmi differ
diff --git a/icons/obj/machines/kitchen.dmi b/icons/obj/machines/kitchen.dmi
index 2142125c5aa5cd..1bd254942b2e02 100644
Binary files a/icons/obj/machines/kitchen.dmi and b/icons/obj/machines/kitchen.dmi differ
diff --git a/icons/obj/machines/scangate.dmi b/icons/obj/machines/scangate.dmi
index 6af8750414adeb..9dacefab3539c9 100644
Binary files a/icons/obj/machines/scangate.dmi and b/icons/obj/machines/scangate.dmi differ
diff --git a/icons/obj/machines/smartfridge.dmi b/icons/obj/machines/smartfridge.dmi
index 18f3ccedd9bde1..df5a163b803af4 100644
Binary files a/icons/obj/machines/smartfridge.dmi and b/icons/obj/machines/smartfridge.dmi differ
diff --git a/icons/obj/machines/vending.dmi b/icons/obj/machines/vending.dmi
index bf3c42bde16a16..c6c9fc17e720ba 100644
Binary files a/icons/obj/machines/vending.dmi and b/icons/obj/machines/vending.dmi differ
diff --git a/icons/obj/medical/organs/organs.dmi b/icons/obj/medical/organs/organs.dmi
index 62a45426e186e4..fd1f5af2ddefcf 100644
Binary files a/icons/obj/medical/organs/organs.dmi and b/icons/obj/medical/organs/organs.dmi differ
diff --git a/icons/obj/medical/organs/shadow_organs.dmi b/icons/obj/medical/organs/shadow_organs.dmi
index 61721330e53611..402e3fc8eccfc0 100644
Binary files a/icons/obj/medical/organs/shadow_organs.dmi and b/icons/obj/medical/organs/shadow_organs.dmi differ
diff --git a/icons/obj/medical/reagent_fillings.dmi b/icons/obj/medical/reagent_fillings.dmi
index 0d535c6cac2b3f..0da57e714a5280 100644
Binary files a/icons/obj/medical/reagent_fillings.dmi and b/icons/obj/medical/reagent_fillings.dmi differ
diff --git a/icons/obj/pipes_n_cables/meter.dmi b/icons/obj/pipes_n_cables/meter.dmi
index 2aed35e065f493..0535fda8010bdd 100644
Binary files a/icons/obj/pipes_n_cables/meter.dmi and b/icons/obj/pipes_n_cables/meter.dmi differ
diff --git a/icons/obj/pipes_n_cables/pipe_item.dmi b/icons/obj/pipes_n_cables/pipe_item.dmi
index 54dac81793975b..ea2f9f71eb58d0 100644
Binary files a/icons/obj/pipes_n_cables/pipe_item.dmi and b/icons/obj/pipes_n_cables/pipe_item.dmi differ
diff --git a/icons/obj/service/hydroponics/equipment.dmi b/icons/obj/service/hydroponics/equipment.dmi
index 0fcebb3c519882..be9d9d4eeaf0dc 100644
Binary files a/icons/obj/service/hydroponics/equipment.dmi and b/icons/obj/service/hydroponics/equipment.dmi differ
diff --git a/icons/obj/storage/box.dmi b/icons/obj/storage/box.dmi
index c0a327d7df6694..01588bd050f744 100644
Binary files a/icons/obj/storage/box.dmi and b/icons/obj/storage/box.dmi differ
diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi
index 2c2aae54de3c2f..85d4b82a498c06 100644
Binary files a/icons/obj/tiles.dmi and b/icons/obj/tiles.dmi differ
diff --git a/icons/obj/weapons/guns/ballistic.dmi b/icons/obj/weapons/guns/ballistic.dmi
index abbb7743b01403..51eda227432e95 100644
Binary files a/icons/obj/weapons/guns/ballistic.dmi and b/icons/obj/weapons/guns/ballistic.dmi differ
diff --git a/icons/obj/weapons/voidwalker_items.dmi b/icons/obj/weapons/voidwalker_items.dmi
new file mode 100644
index 00000000000000..1179d1953003f4
Binary files /dev/null and b/icons/obj/weapons/voidwalker_items.dmi differ
diff --git a/icons/turf/floors/catwalk_plating.dmi b/icons/turf/floors/catwalk_plating.dmi
index b49c46564de508..800d0c8dfffcdb 100644
Binary files a/icons/turf/floors/catwalk_plating.dmi and b/icons/turf/floors/catwalk_plating.dmi differ
diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm
index 37f85e24dab56b..b18f723f0ae436 100644
--- a/interface/stylesheet.dm
+++ b/interface/stylesheet.dm
@@ -134,6 +134,7 @@ h1.alert, h2.alert {color: #000000;}
.robot {font-family: "Courier New", cursive, sans-serif;}
.command_headset {font-weight: bold; font-size: 3;}
+.soapbox {font-weight: bold; font-size: 3;}
.small {font-size: 1;}
.big {font-size: 3;}
.reallybig {font-size: 4;}
diff --git a/modular_skyrat/master_files/code/game/machinery/doors/firedoor.dm b/modular_skyrat/master_files/code/game/machinery/doors/firedoor.dm
index dceae8cbbce7cb..aec87f38b92dd7 100644
--- a/modular_skyrat/master_files/code/game/machinery/doors/firedoor.dm
+++ b/modular_skyrat/master_files/code/game/machinery/doors/firedoor.dm
@@ -1,5 +1,6 @@
/obj/machinery/door/firedoor/click_alt(mob/user)
try_manual_override(user)
+ return CLICK_ACTION_SUCCESS
/obj/machinery/door/firedoor/examine(mob/user)
. = ..()
diff --git a/modular_skyrat/master_files/code/game/objects/items/RCD.dm b/modular_skyrat/master_files/code/game/objects/items/RCD.dm
index 543fcd1ee52997..3450c7a0fd2c76 100644
--- a/modular_skyrat/master_files/code/game/objects/items/RCD.dm
+++ b/modular_skyrat/master_files/code/game/objects/items/RCD.dm
@@ -20,16 +20,15 @@
return ..()
// Drain deconstruction
-/obj/item/construction/plumbing/afterattack(atom/target, mob/user, proximity)
- if(!proximity)
- return
- if(istype(target, /obj/structure/drain))
- var/obj/structure/drain/drain_target = target
- if(do_after(user, 2 SECONDS, target = target))
- drain_target.deconstruct() //Let's not substract matter
- playsound(get_turf(src), 'sound/machines/click.ogg', 50, TRUE)
- else
+/obj/item/construction/plumbing/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ if(!istype(interacting_with, /obj/structure/drain))
return ..()
+ var/obj/structure/drain/drain_target = interacting_with
+ if(do_after(user, 2 SECONDS, target = interacting_with))
+ drain_target.deconstruct() //Let's not substract matter
+ playsound(get_turf(src), 'sound/machines/click.ogg', 50, TRUE)
+ return ITEM_INTERACT_SUCCESS
+ return ITEM_INTERACT_BLOCKING
/obj/item/construction/plumbing/mining
name = "mining plumbing constructor"
diff --git a/modular_skyrat/master_files/code/modules/client/preferences/clothing.dm b/modular_skyrat/master_files/code/modules/client/preferences/clothing.dm
index 827ec90b6ac2ec..0f525313f00181 100644
--- a/modular_skyrat/master_files/code/modules/client/preferences/clothing.dm
+++ b/modular_skyrat/master_files/code/modules/client/preferences/clothing.dm
@@ -82,3 +82,8 @@
var/species_type = preferences.read_preference(/datum/preference/choiced/species)
var/datum/species/species = new species_type
return !(TRAIT_NO_UNDERWEAR in species.inherent_traits)
+
+/datum/preference/choiced/bra/create_informed_default_value(datum/preferences/preferences)
+ if(preferences.read_preference(/datum/preference/choiced/gender) == FEMALE)
+ return /datum/sprite_accessory/bra/sports_bra::name
+ return /datum/sprite_accessory/bra/nude::name
diff --git a/modular_skyrat/master_files/code/modules/clothing/towels.dm b/modular_skyrat/master_files/code/modules/clothing/towels.dm
index 6ff0fa3af228e0..16ae2c3ca30f3c 100644
--- a/modular_skyrat/master_files/code/modules/clothing/towels.dm
+++ b/modular_skyrat/master_files/code/modules/clothing/towels.dm
@@ -250,18 +250,13 @@
// No need to display the different message if they're not wearing it.
if(!worn)
- return
+ return CLICK_ACTION_SUCCESS
to_chat(user, span_notice(shape == TOWEL_FULL ? "You raise \the [src] over your [shape]." : "You lower \the [src] down to your [shape]."))
return CLICK_ACTION_SUCCESS
/obj/item/towel/item_ctrl_click(mob/user)
- . = ..()
-
- if(. == FALSE)
- return
-
if(!wet && shape == TOWEL_FOLDED) // You can't fold a wet towel, so you can't get a folded towel that's also wet. And you can't fold what's already folded, obviously.
to_chat(user, span_warning("You can't fold a towel that's already folded!"))
return
diff --git a/modular_skyrat/master_files/code/modules/loadout/categories/heads.dm b/modular_skyrat/master_files/code/modules/loadout/categories/heads.dm
index 16781c9f072c5b..b56546f225e193 100644
--- a/modular_skyrat/master_files/code/modules/loadout/categories/heads.dm
+++ b/modular_skyrat/master_files/code/modules/loadout/categories/heads.dm
@@ -18,6 +18,14 @@
name = "Greyscale Beret with Badge"
item_path = /obj/item/clothing/head/beret/badge
+/datum/loadout_item/head/beret/clown //Left unlocked to show you're a Clown Enjoyer, essentially.
+ name = "Clown Beret"
+ item_path = /obj/item/clothing/head/beret/clown
+
+/datum/loadout_item/head/beret/rainbow
+ name = "Rainbow Beret"
+ item_path = /obj/item/clothing/head/beret/clown/rainbow
+
/*
* CAPS
*/
diff --git a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/cat/fennec.dm b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/cat/fennec.dm
new file mode 100644
index 00000000000000..73880c8d92fd9e
--- /dev/null
+++ b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/cat/fennec.dm
@@ -0,0 +1,62 @@
+/mob/living/basic/pet/cat/fennec
+ name = "fennec fox"
+ desc = "Vulpes Zerda. Also known as a Goob or a Dingler."
+ icon = 'modular_skyrat/master_files/icons/mob/pets.dmi'
+ icon_state = "fennec"
+ icon_living = "fennec"
+ icon_dead = "fennec_dead"
+ held_lh = 'modular_skyrat/master_files/icons/mob/inhands/pets_held_lh.dmi'
+ held_rh = 'modular_skyrat/master_files/icons/mob/inhands/pets_held_rh.dmi'
+ head_icon = 'modular_skyrat/master_files/icons/mob/clothing/head/pets_head.dmi'
+ speak_emote = list("screms", "squeaks", "rrrfs")
+ butcher_results = list(
+ /obj/item/food/meat/slab = 1,
+ )
+ collar_icon_state = null
+ has_collar_resting_icon_state = FALSE
+ can_be_held = TRUE
+ worn_slot_flags = ITEM_SLOT_HEAD
+ held_state = "fennec"
+ ai_controller = /datum/ai_controller/basic_controller/cat/fennec
+
+/mob/living/basic/pet/cat/fennec/update_overlays()
+ . = ..()
+ if(stat == DEAD || resting || !held_food)
+ return
+ if(istype(held_food, /obj/item/fish))
+ held_item_overlay = mutable_appearance(icon, "fennec_fish_overlay")
+ if(istype(held_food, /obj/item/food/deadmouse))
+ held_item_overlay = mutable_appearance(icon, "fennec_mouse_overlay")
+ . += held_item_overlay
+
+/datum/ai_planning_subtree/random_speech/fennecs
+ speech_chance = 5
+ speak = list(
+ "screm!",
+ "rrrrf!",
+ "screech!",
+ "aaaaaa!",
+ "squeak!",
+ "yip!",
+ "squee!",
+ )
+
+/datum/ai_controller/basic_controller/cat/fennec
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/reside_in_home,
+ /datum/ai_planning_subtree/flee_target/from_flee_key/cat_struggle,
+ /datum/ai_planning_subtree/find_and_hunt_target/hunt_mice,
+ /datum/ai_planning_subtree/find_and_hunt_target/find_cat_food,
+ /datum/ai_planning_subtree/simple_find_target,
+ /datum/ai_planning_subtree/haul_food_to_young,
+ /datum/ai_planning_subtree/territorial_struggle,
+ /datum/ai_planning_subtree/make_babies,
+ /datum/ai_planning_subtree/random_speech/fennecs,
+ )
+
+/mob/living/basic/pet/cat/fennec/add_breeding_component()
+ AddComponent(\
+ /datum/component/breed,\
+ can_breed_with = typecacheof(list(/mob/living/basic/pet/cat/fennec)),\
+ baby_path = /mob/living/basic/pet/cat/fennec,\
+ )
diff --git a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm
index ba370f99d6b28f..bbc1aa7b916a15 100644
--- a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm
+++ b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm
@@ -341,4 +341,39 @@
icon_state = "dobber"
icon_dead = "dobbydead"
icon_living = "dobber"
- gender = MALE
+
+/mob/living/basic/pet/dog/pitbull
+ name = "\improper pitbull"
+ desc = "Lover of Blood. Hater of Toddlers"
+ icon = 'modular_skyrat/master_files/icons/mob/pets.dmi'
+ icon_state = "pitbull"
+ icon_dead = "pitbull_dead"
+ icon_living = "pitbull"
+ ai_controller = /datum/ai_controller/basic_controller/pitbull
+ can_be_held = FALSE //He's too big.
+
+/datum/ai_controller/basic_controller/pitbull
+ blackboard = list(
+ BB_ALWAYS_IGNORE_FACTION = TRUE,
+ BB_TARGETING_STRATEGY = /datum/targeting_strategy/basic/of_size/smaller,
+ BB_FLEE_TARGETING_STRATEGY = /datum/targeting_strategy/basic,
+ )
+
+ ai_movement = /datum/ai_movement/dumb
+ idle_behavior = /datum/idle_behavior/idle_dog
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/target_retaliate/to_flee,
+ /datum/ai_planning_subtree/flee_target/from_flee_key,
+ /datum/ai_planning_subtree/dog_harassment,
+ /datum/ai_planning_subtree/simple_find_target,
+ /datum/ai_planning_subtree/basic_melee_attack_subtree,
+ /datum/ai_planning_subtree/random_speech/dog,
+ )
+
+
+/mob/living/basic/pet/dog/pitbull/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/tiny_mob_hunter, MOB_SIZE_SMALL) //He eats anything that he sees as a toddler.
+ AddElement(/datum/element/footstep, footstep_type = FOOTSTEP_MOB_CLAW)
+
+
diff --git a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/pets.dm b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/pets.dm
new file mode 100644
index 00000000000000..084f62c4c4fe2f
--- /dev/null
+++ b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/pets.dm
@@ -0,0 +1,168 @@
+/mob/living/basic/pet/cat/clown
+ name = "clown cat"
+ desc = "A funny little creature imported to Clown Planet, beloved by millions."
+ icon = 'modular_skyrat/master_files/icons/mob/pets.dmi'
+ icon_state = "clowncat"
+ icon_living = "clowncat"
+ icon_dead = "clowncat_dead"
+ speak_emote = list("purrs", "honks", "meows")
+ pass_flags = PASSTABLE
+ mob_size = MOB_SIZE_SMALL
+ mob_biotypes = MOB_ORGANIC|MOB_BEAST
+ unsuitable_atmos_damage = 0.5
+ butcher_results = list(
+ /obj/item/food/meat/slab = 1,
+ /obj/item/organ/internal/ears/cat = 1,
+ /obj/item/organ/external/tail/cat = 1,
+ /obj/item/clothing/mask/gas/clown_hat = 1,
+
+ )
+ response_help_continuous = "pets"
+ response_help_simple = "pet"
+ response_disarm_continuous = "asks to not joke about that"
+ response_disarm_simple = "ask not to joke about that"
+ response_harm_continuous = "throws tomatos"
+ response_harm_simple = "throws tomato"
+ mobility_flags = MOBILITY_FLAGS_REST_CAPABLE_DEFAULT
+ gold_core_spawnable = FRIENDLY_SPAWN
+ collar_icon_state = "clowncat"
+ has_collar_resting_icon_state = FALSE
+ can_be_held = TRUE
+ ai_controller = /datum/ai_controller/basic_controller/cat/clown
+ held_state = "cat2"
+ attack_verb_continuous = "honks"
+ attack_verb_simple = "honk"
+ attack_sound = 'sound/items/bikehorn.ogg'
+ attack_vis_effect = ATTACK_EFFECT_CLAW
+
+/datum/ai_controller/basic_controller/cat/clown
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/random_speech/catclown,
+ )
+
+/datum/ai_planning_subtree/random_speech/catclown
+ speech_chance = 10
+ sound = list('sound/effects/footstep/clownstep1.ogg', 'sound/effects/footstep/clownstep2.ogg', 'sound/items/bikehorn.ogg',)
+ speak = list(
+ "hoooonk!",
+ "meow!",
+ "honk!",
+ "mrow!",
+ "henk!",
+ emote_see = list("plays tricks.", "slips.", "honks a tiny horn.")
+ )
+
+/mob/living/basic/pet/cat/mime
+ name = "mime cat"
+ desc = "Almost invisible, this little fella eats mice you can't even see!"
+ icon = 'modular_skyrat/master_files/icons/mob/pets.dmi'
+ icon_state = "catmime"
+ icon_living = "catmime"
+ icon_dead = "catmime_dead"
+ ai_controller = /datum/ai_controller/basic_controller/cat/mime
+ speak_emote = list("...",)
+ pass_flags = PASSTABLE
+ mob_size = MOB_SIZE_SMALL
+ mob_biotypes = MOB_ORGANIC|MOB_BEAST
+ unsuitable_atmos_damage = 0.5
+ butcher_results = list(
+ /obj/item/food/meat/slab = 1,
+ /obj/item/organ/internal/ears/cat = 1,
+ /obj/item/organ/external/tail/cat = 1,
+ /obj/item/clothing/mask/gas/mime = 1,
+ )
+
+/datum/ai_controller/basic_controller/cat/mime
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/random_speech/catmime,
+ )
+
+/datum/ai_planning_subtree/random_speech/catmime
+ speech_chance = 1
+ speak = list(
+ "...",
+ "....",
+ emote_see = list("cowers in fear.", "surrenders.", "plays dead.","looks as though there is a tiny cat shaped wall in front of them.")
+ )
+
+/mob/living/basic/pet/cat/tiger
+ name = "tiger cat"
+ desc = "A tiger made of paper."
+ icon = 'modular_skyrat/master_files/icons/mob/pets.dmi'
+ ai_controller = /datum/ai_controller/basic_controller/cat/tiger
+ icon_state = "tiger"
+ icon_living = "tiger"
+ icon_dead = "tiger_dead"
+ speak_emote = list("roar","roars", "purrs", "meows",)
+ pass_flags = PASSTABLE
+ mob_size = MOB_SIZE_SMALL
+ mob_biotypes = MOB_ORGANIC|MOB_BEAST
+ unsuitable_atmos_damage = 0.5
+ butcher_results = list(
+ /obj/item/food/meat/slab = 1,
+ /obj/item/organ/internal/ears/cat = 1,
+ /obj/item/organ/external/tail/cat = 1,
+ /obj/item/clothing/head/pelt/tiger = 1,
+ )
+
+/datum/ai_controller/basic_controller/cat/tiger
+ planning_subtrees = list(
+ /datum/ai_planning_subtree/random_speech/cattiger,
+ )
+
+/datum/ai_planning_subtree/random_speech/cattiger
+ speech_chance = 10
+ speak = list(
+ "roar!",
+ "meow!",
+ "grrr!",
+ )
+
+/mob/living/basic/carp/clarp
+ name = "clarp"
+ desc = "A Space Dragon ate a Clown Station, it tasted funny. This was the result."
+ faction = list(FACTION_NEUTRAL)
+ icon = 'modular_skyrat/master_files/icons/mob/pets.dmi'
+ icon_dead = "clarp_dead"
+ icon_gib = "clarp_gib"
+ icon_living = "clarp"
+ icon_state = "clarp"
+ greyscale_config = NONE
+
+/mob/living/basic/carp/petcarp
+ faction = list(FACTION_NEUTRAL)
+
+/mob/living/basic/pet/fox/redpanda
+ name = "red panda"
+ desc = "Wah't a dork."
+ icon = 'modular_skyrat/master_files/icons/mob/pets.dmi'
+ icon_state = "red_panda"
+ icon_living = "red_panda"
+ icon_dead = "dead_panda"
+ speak_emote = list("chirps", "huff-quacks")
+ butcher_results = list(/obj/item/food/meat/slab = 3)
+ gold_core_spawnable = FRIENDLY_SPAWN
+ can_be_held = TRUE
+ held_state = "fox"
+ melee_damage_lower = 5
+ melee_damage_upper = 5
+ attack_verb_continuous = "bites"
+ attack_verb_simple = "bite"
+ attack_sound = 'sound/weapons/bite.ogg'
+ attack_vis_effect = ATTACK_EFFECT_BITE
+ ai_controller = /datum/ai_controller/basic_controller/fox/docile //he's a nice boy
+
+
+/mob/living/basic/pet/dog/corgi/robocorgo
+ name = "\improper robocorgi"
+ real_name = "corgi"
+ desc = "They're a corgi with various mechanical modifications. The first stage in an E-N's life cycle."
+ icon = 'modular_skyrat/master_files/icons/mob/pets.dmi'
+ icon_state = "robocorgi"
+ icon_living = "robocorgi"
+ icon_dead = "robocorgi_dead"
+ held_state = "corgi"
+ butcher_results = list(/obj/item/food/meat/slab/corgi = 3, /obj/item/stack/sheet/animalhide/corgi = 1)
+ gold_core_spawnable = FRIENDLY_SPAWN
+ collar_icon_state = "robocorgi"
+
diff --git a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/hostile/grabbagmob.dm b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/hostile/grabbagmob.dm
index aae6f80843967b..530a91cc6af1e0 100644
--- a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/hostile/grabbagmob.dm
+++ b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/hostile/grabbagmob.dm
@@ -941,3 +941,12 @@
projectiletype = /obj/projectile/beam/laser
projectilesound = 'sound/weapons/laser3.ogg'
+
+/mob/living/basic/gorilla/pitbull
+ name = "\improper pitbull"
+ desc = "Lover of Blood. Hater of Toddlers. Doesn't look too happy to see you."
+ icon = 'modular_skyrat/master_files/icons/mob/pets.dmi'
+ icon_state = "pitbull"
+ icon_dead = "pitbull_dead"
+ icon_living = "pitbull"
+
diff --git a/modular_skyrat/master_files/code/modules/power/smes.dm b/modular_skyrat/master_files/code/modules/power/smes.dm
deleted file mode 100644
index d4a504000c3827..00000000000000
--- a/modular_skyrat/master_files/code/modules/power/smes.dm
+++ /dev/null
@@ -1,8 +0,0 @@
-// TG power bad, SMES power update good
-// Doubles output ability for input/output to allow for higher power generation passthrough without needing to build more SMES or hotwire
-/obj/machinery/power/smes
- capacity = 75 * STANDARD_BATTERY_CHARGE
- input_level = 75 KILO WATTS
- input_level_max = 400 KILO WATTS
- output_level = 75 KILO WATTS
- output_level_max = 400 KILO WATTS
diff --git a/modular_skyrat/master_files/code/modules/reagents/reagent_containers.dm b/modular_skyrat/master_files/code/modules/reagents/reagent_containers.dm
index eb187857d7bd3a..0945a17b8b32e7 100644
--- a/modular_skyrat/master_files/code/modules/reagents/reagent_containers.dm
+++ b/modular_skyrat/master_files/code/modules/reagents/reagent_containers.dm
@@ -1,10 +1,10 @@
/obj/item/reagent_containers/click_alt(mob/living/user)
if(length(possible_transfer_amounts) <= 2) // If there's only two choices, just swap between them.
change_transfer_amount(user, FORWARD)
- return
+ return CLICK_ACTION_SUCCESS
var/transfer_amount = tgui_input_list(user, "Amount per transfer from this:", "[src]", possible_transfer_amounts, amount_per_transfer_from_this)
if(isnull(transfer_amount))
- return
+ return NONE
amount_per_transfer_from_this = transfer_amount
to_chat(user, span_notice("[src]'s transfer amount is now [amount_per_transfer_from_this] unit\s."))
- return
+ return CLICK_ACTION_SUCCESS
diff --git a/modular_skyrat/master_files/icons/donator/obj/clothing/hats.dmi b/modular_skyrat/master_files/icons/donator/obj/clothing/hats.dmi
index 7fa259c07e89e3..70ceb87f00c82c 100644
Binary files a/modular_skyrat/master_files/icons/donator/obj/clothing/hats.dmi and b/modular_skyrat/master_files/icons/donator/obj/clothing/hats.dmi differ
diff --git a/modular_skyrat/master_files/icons/donator/obj/clothing/suits.dmi b/modular_skyrat/master_files/icons/donator/obj/clothing/suits.dmi
index 140bd772f44f98..5a208f91837549 100644
Binary files a/modular_skyrat/master_files/icons/donator/obj/clothing/suits.dmi and b/modular_skyrat/master_files/icons/donator/obj/clothing/suits.dmi differ
diff --git a/modular_skyrat/master_files/icons/donator/obj/clothing/uniform.dmi b/modular_skyrat/master_files/icons/donator/obj/clothing/uniform.dmi
index 8375633d3543d0..367afce725bf32 100644
Binary files a/modular_skyrat/master_files/icons/donator/obj/clothing/uniform.dmi and b/modular_skyrat/master_files/icons/donator/obj/clothing/uniform.dmi differ
diff --git a/modular_skyrat/master_files/icons/mob/clothing/head.dmi b/modular_skyrat/master_files/icons/mob/clothing/head.dmi
index e59edd6bbbf828..4d6d020d8e1f72 100644
Binary files a/modular_skyrat/master_files/icons/mob/clothing/head.dmi and b/modular_skyrat/master_files/icons/mob/clothing/head.dmi differ
diff --git a/modular_skyrat/master_files/icons/mob/clothing/head/pets_head.dmi b/modular_skyrat/master_files/icons/mob/clothing/head/pets_head.dmi
new file mode 100644
index 00000000000000..7f9371683fd88f
Binary files /dev/null and b/modular_skyrat/master_files/icons/mob/clothing/head/pets_head.dmi differ
diff --git a/modular_skyrat/master_files/icons/mob/clothing/mask.dmi b/modular_skyrat/master_files/icons/mob/clothing/mask.dmi
index bc28e022e0c318..07e227bf73d91c 100644
Binary files a/modular_skyrat/master_files/icons/mob/clothing/mask.dmi and b/modular_skyrat/master_files/icons/mob/clothing/mask.dmi differ
diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/security.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/security.dmi
index 9b766d068642d2..88bad96b8fd4c7 100644
Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/security.dmi and b/modular_skyrat/master_files/icons/mob/clothing/under/security.dmi differ
diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/security_digi.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/security_digi.dmi
index b7816d0ac6f4ff..1397a272e0584b 100644
Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/security_digi.dmi and b/modular_skyrat/master_files/icons/mob/clothing/under/security_digi.dmi differ
diff --git a/modular_skyrat/master_files/icons/mob/inhands/pets_held_lh.dmi b/modular_skyrat/master_files/icons/mob/inhands/pets_held_lh.dmi
index a144c1439dda47..67197ce1d3b00a 100644
Binary files a/modular_skyrat/master_files/icons/mob/inhands/pets_held_lh.dmi and b/modular_skyrat/master_files/icons/mob/inhands/pets_held_lh.dmi differ
diff --git a/modular_skyrat/master_files/icons/mob/inhands/pets_held_rh.dmi b/modular_skyrat/master_files/icons/mob/inhands/pets_held_rh.dmi
index 1686efd5abd462..d0b99f06e7a76b 100644
Binary files a/modular_skyrat/master_files/icons/mob/inhands/pets_held_rh.dmi and b/modular_skyrat/master_files/icons/mob/inhands/pets_held_rh.dmi differ
diff --git a/modular_skyrat/master_files/icons/mob/pets.dmi b/modular_skyrat/master_files/icons/mob/pets.dmi
index 8fba90c03a19d8..2eb554d4d80f20 100644
Binary files a/modular_skyrat/master_files/icons/mob/pets.dmi and b/modular_skyrat/master_files/icons/mob/pets.dmi differ
diff --git a/modular_skyrat/master_files/icons/obj/clothing/gloves.dmi b/modular_skyrat/master_files/icons/obj/clothing/gloves.dmi
index b157b4f7fa3e00..0b03bfe3f3ad8e 100644
Binary files a/modular_skyrat/master_files/icons/obj/clothing/gloves.dmi and b/modular_skyrat/master_files/icons/obj/clothing/gloves.dmi differ
diff --git a/modular_skyrat/master_files/icons/obj/clothing/hats.dmi b/modular_skyrat/master_files/icons/obj/clothing/hats.dmi
index 790edbed3d6490..767624985d4373 100644
Binary files a/modular_skyrat/master_files/icons/obj/clothing/hats.dmi and b/modular_skyrat/master_files/icons/obj/clothing/hats.dmi differ
diff --git a/modular_skyrat/master_files/icons/obj/clothing/masks.dmi b/modular_skyrat/master_files/icons/obj/clothing/masks.dmi
index 57e85ce1f745c7..aca292e639fe91 100644
Binary files a/modular_skyrat/master_files/icons/obj/clothing/masks.dmi and b/modular_skyrat/master_files/icons/obj/clothing/masks.dmi differ
diff --git a/modular_skyrat/master_files/icons/obj/clothing/suits.dmi b/modular_skyrat/master_files/icons/obj/clothing/suits.dmi
index 2c42362565b9e7..942684640f837e 100644
Binary files a/modular_skyrat/master_files/icons/obj/clothing/suits.dmi and b/modular_skyrat/master_files/icons/obj/clothing/suits.dmi differ
diff --git a/modular_skyrat/master_files/icons/obj/clothing/under/security.dmi b/modular_skyrat/master_files/icons/obj/clothing/under/security.dmi
index 129201a0373c11..6739759a13bf56 100644
Binary files a/modular_skyrat/master_files/icons/obj/clothing/under/security.dmi and b/modular_skyrat/master_files/icons/obj/clothing/under/security.dmi differ
diff --git a/modular_skyrat/modules/GAGS/greyscale_configs.dm b/modular_skyrat/modules/GAGS/greyscale_configs.dm
index 35154bd0b3bb26..00d646c1afc8ce 100644
--- a/modular_skyrat/modules/GAGS/greyscale_configs.dm
+++ b/modular_skyrat/modules/GAGS/greyscale_configs.dm
@@ -1304,6 +1304,7 @@ digi
/datum/greyscale_config/clothwraps/worn/digi
name = "Cloth Wraps (Worn, Digi)"
+ json_config = 'modular_skyrat/modules/GAGS/json_configs/wraps/wraps_worn_digi.json'
/datum/greyscale_config/legwraps
name = "Leg Wraps"
diff --git a/modular_skyrat/modules/GAGS/json_configs/wraps/wraps_worn.json b/modular_skyrat/modules/GAGS/json_configs/wraps/wraps_worn.json
index 34977271ab2cc3..4d9f6d4a1d553c 100644
--- a/modular_skyrat/modules/GAGS/json_configs/wraps/wraps_worn.json
+++ b/modular_skyrat/modules/GAGS/json_configs/wraps/wraps_worn.json
@@ -5,12 +5,6 @@
"icon_state": "wrap_mob",
"blend_mode": "overlay",
"color_ids": [ 1 ]
- },
- {
- "type": "icon_state",
- "icon_state": "wrap_mob_digi",
- "blend_mode": "overlay",
- "color_ids": [ 1 ]
}
]
}
diff --git a/modular_skyrat/modules/GAGS/json_configs/wraps/wraps_worn_digi.json b/modular_skyrat/modules/GAGS/json_configs/wraps/wraps_worn_digi.json
new file mode 100644
index 00000000000000..1ff2d8a656b1a7
--- /dev/null
+++ b/modular_skyrat/modules/GAGS/json_configs/wraps/wraps_worn_digi.json
@@ -0,0 +1,10 @@
+{
+ "clothwrap": [
+ {
+ "type": "icon_state",
+ "icon_state": "wrap_mob_digi",
+ "blend_mode": "overlay",
+ "color_ids": [ 1 ]
+ }
+ ]
+}
diff --git a/modular_skyrat/modules/advanced_shuttles/code/turfs.dm b/modular_skyrat/modules/advanced_shuttles/code/turfs.dm
index 1c5e9c53c30fff..0f05c141bbe066 100644
--- a/modular_skyrat/modules/advanced_shuttles/code/turfs.dm
+++ b/modular_skyrat/modules/advanced_shuttles/code/turfs.dm
@@ -33,8 +33,8 @@
initial(underturf_path.icon),
initial(underturf_path.icon_state),
offset_spokesman = src,
- layer = TURF_LAYER - 0.02,
- plane = initial(underturf_path.plane))
+ layer = LOW_FLOOR_LAYER - 0.02,
+ plane = FLOOR_PLANE)
underlay_appearance.appearance_flags = RESET_ALPHA | RESET_COLOR
underlays += underlay_appearance
diff --git a/modular_skyrat/modules/aesthetics/blast_door/code/blast_door.dm b/modular_skyrat/modules/aesthetics/blast_door/code/blast_door.dm
index 8684c6b8908ca5..cf903ed6e9c958 100644
--- a/modular_skyrat/modules/aesthetics/blast_door/code/blast_door.dm
+++ b/modular_skyrat/modules/aesthetics/blast_door/code/blast_door.dm
@@ -6,11 +6,9 @@
var/door_open_sound = 'modular_skyrat/modules/aesthetics/blast_door/sound/shutters_open.ogg'
var/door_close_sound = 'modular_skyrat/modules/aesthetics/blast_door/sound/shutters_close.ogg'
-/obj/machinery/door/poddoor/shutters/do_animate(animation)
+/obj/machinery/door/poddoor/shutters/run_animation(animation)
switch(animation)
- if("opening")
- flick("opening", src)
+ if(DOOR_OPENING_ANIMATION)
playsound(src, door_open_sound, 30, TRUE)
- if("closing")
- flick("closing", src)
+ if(DOOR_OPENING_ANIMATION)
playsound(src, door_close_sound, 30, TRUE)
diff --git a/modular_skyrat/modules/aesthetics/floors/code/floors.dm b/modular_skyrat/modules/aesthetics/floors/code/floors.dm
index e2a797a297050a..3096e8c93188fa 100644
--- a/modular_skyrat/modules/aesthetics/floors/code/floors.dm
+++ b/modular_skyrat/modules/aesthetics/floors/code/floors.dm
@@ -1,6 +1,9 @@
/turf/open/floor
icon = 'modular_skyrat/modules/aesthetics/floors/icons/floors.dmi'
+/turf/open/floor/catwalk_floor
+ icon = 'modular_skyrat/modules/aesthetics/floors/icons/catwalk_plating.dmi'
+
//Removes redundant textured stuff from this radial, as all of ours are textured by default
/obj/item/stack/tile/iron
tile_reskin_types = list(
diff --git a/modular_skyrat/modules/aesthetics/floors/icons/catwalk_plating.dmi b/modular_skyrat/modules/aesthetics/floors/icons/catwalk_plating.dmi
new file mode 100644
index 00000000000000..bbd021d16d4234
Binary files /dev/null and b/modular_skyrat/modules/aesthetics/floors/icons/catwalk_plating.dmi differ
diff --git a/modular_skyrat/modules/aesthetics/storage/storage.dm b/modular_skyrat/modules/aesthetics/storage/storage.dm
index 01b7b5d56b929a..888ca9e1eae082 100644
--- a/modular_skyrat/modules/aesthetics/storage/storage.dm
+++ b/modular_skyrat/modules/aesthetics/storage/storage.dm
@@ -3,6 +3,7 @@
/obj/item/borg/upgrade/rped
icon = 'modular_skyrat/modules/aesthetics/storage/storage.dmi'
+ icon_state = "borgrped"
/obj/item/storage/part_replacer
icon = 'modular_skyrat/modules/aesthetics/storage/storage.dmi'
@@ -120,6 +121,10 @@
icon_state = "secbox_xl"
illustration = "breacherslug"
+/obj/item/storage/box/large_dart
+ icon_state = "secbox_xl"
+ illustration = "shotdart"
+
/obj/item/storage/box/evidence
icon_state = "secbox"
illustration = "evidence"
diff --git a/modular_skyrat/modules/aesthetics/storage/storage.dmi b/modular_skyrat/modules/aesthetics/storage/storage.dmi
index 8a7e15587e63d7..4bcf087cdb828f 100644
Binary files a/modular_skyrat/modules/aesthetics/storage/storage.dmi and b/modular_skyrat/modules/aesthetics/storage/storage.dmi differ
diff --git a/modular_skyrat/modules/airlock_override/code/airlock_override.dm b/modular_skyrat/modules/airlock_override/code/airlock_override.dm
index c6fea81df843c9..0d05ae18082022 100644
--- a/modular_skyrat/modules/airlock_override/code/airlock_override.dm
+++ b/modular_skyrat/modules/airlock_override/code/airlock_override.dm
@@ -132,7 +132,7 @@
switch(wire)
if(WIRE_IDSCAN)
if(airlock.hasPower() && airlock.density)
- airlock.do_animate("deny")
+ airlock.run_animation(DOOR_DENY_ANIMATION)
if(airlock.emergency)
airlock.emergency = FALSE
airlock.update_appearance()
diff --git a/modular_skyrat/modules/alerts/code/security_level_datums.dm b/modular_skyrat/modules/alerts/code/security_level_datums.dm
index afa355df55aa79..ffafca44e14181 100644
--- a/modular_skyrat/modules/alerts/code/security_level_datums.dm
+++ b/modular_skyrat/modules/alerts/code/security_level_datums.dm
@@ -29,6 +29,8 @@
name = "violet"
announcement_color = "purple"
number_level = SEC_LEVEL_VIOLET
+ status_display_icon_state = "violetalert"
+ fire_alarm_light_color = COLOR_VIOLET
lowering_to_configuration_key = /datum/config_entry/string/alert_violet_downto
elevating_to_configuration_key = /datum/config_entry/string/alert_violet_upto
sound = 'modular_skyrat/modules/alerts/sound/security_levels/violet.ogg'
@@ -43,6 +45,8 @@
name = "orange"
announcement_color = "orange"
number_level = SEC_LEVEL_ORANGE
+ status_display_icon_state = "orangealert"
+ fire_alarm_light_color = LIGHT_COLOR_ORANGE
lowering_to_configuration_key = /datum/config_entry/string/alert_orange_downto
elevating_to_configuration_key = /datum/config_entry/string/alert_orange_upto
sound = 'modular_skyrat/modules/alerts/sound/security_levels/orange.ogg'
@@ -58,6 +62,8 @@
name = "amber"
announcement_color = "yellow"
number_level = SEC_LEVEL_AMBER
+ status_display_icon_state = "amberalert"
+ fire_alarm_light_color = LIGHT_COLOR_DIM_YELLOW
lowering_to_configuration_key = /datum/config_entry/string/alert_amber_downto
elevating_to_configuration_key = /datum/config_entry/string/alert_amber_upto
sound = 'modular_skyrat/modules/alerts/sound/security_levels/amber.ogg'
@@ -72,6 +78,8 @@
name = "epsilon"
announcement_color = "grey"
number_level = SEC_LEVEL_EPSILON
+ status_display_icon_state = "epsilonalert"
+ fire_alarm_light_color = COLOR_ASSEMBLY_WHITE
lowering_to_configuration_key = /datum/config_entry/string/alert_epsilon_downto
elevating_to_configuration_key = /datum/config_entry/string/alert_epsilon_upto
sound = 'modular_skyrat/modules/alerts/sound/security_levels/epsilon.ogg'
@@ -81,12 +89,14 @@
/**
* Gamma
*
- * XK-Class EOW Event
+ * XK-Class EOR Event
*/
/datum/security_level/gamma
name = "gamma"
announcement_color = "pink"
number_level = SEC_LEVEL_GAMMA
+ status_display_icon_state = "gammaalert"
+ fire_alarm_light_color = COLOR_ASSEMBLY_PURPLE
elevating_to_configuration_key = /datum/config_entry/string/alert_gamma
shuttle_call_time_mod = 0.25
sound = 'modular_skyrat/modules/alerts/sound/security_levels/gamma_alert.ogg'
diff --git a/modular_skyrat/modules/apc_arcing/code/apc.dm b/modular_skyrat/modules/apc_arcing/code/apc.dm
index e1e3aca619f465..6b6fd71404bfbb 100644
--- a/modular_skyrat/modules/apc_arcing/code/apc.dm
+++ b/modular_skyrat/modules/apc_arcing/code/apc.dm
@@ -1,6 +1,6 @@
/obj/machinery/power/apc
/// Has the APC been protected against arcing?
- var/arc_shielded = TRUE
+ var/arc_shielded = FALSE
/// Should we be forcing arcing, assuming there isn't arc shielding?
var/force_arcing = FALSE
diff --git a/modular_skyrat/modules/ashwalkers/code/buildings/railroad.dm b/modular_skyrat/modules/ashwalkers/code/buildings/railroad.dm
index b0b821d7668f34..50dec900cf1b0e 100644
--- a/modular_skyrat/modules/ashwalkers/code/buildings/railroad.dm
+++ b/modular_skyrat/modules/ashwalkers/code/buildings/railroad.dm
@@ -12,15 +12,16 @@
/obj/item/stack/rail_track/fifty
amount = 50
-/obj/item/stack/rail_track/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
- if(!isopenturf(target) || !proximity_flag)
- return ..()
- var/turf/target_turf = get_turf(target)
+/obj/item/stack/rail_track/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ if(!isopenturf(interacting_with))
+ return NONE
+ var/turf/open/target_turf = get_turf(interacting_with)
var/obj/structure/railroad/check_rail = locate() in target_turf
if(check_rail || !use(1))
- return ..()
+ return NONE
to_chat(user, span_notice("You place [src] on [target_turf]."))
- new /obj/structure/railroad(get_turf(target))
+ new /obj/structure/railroad(target_turf)
+ return ITEM_INTERACT_SUCCESS
/obj/structure/railroad
name = "railroad track"
diff --git a/modular_skyrat/modules/ashwalkers/code/items/ashwalker_shaman.dm b/modular_skyrat/modules/ashwalkers/code/items/ashwalker_shaman.dm
index 670f8f72a3b7a1..bcac6a17418a63 100644
--- a/modular_skyrat/modules/ashwalkers/code/items/ashwalker_shaman.dm
+++ b/modular_skyrat/modules/ashwalkers/code/items/ashwalker_shaman.dm
@@ -9,35 +9,41 @@
icon_state = "staffofanimation"
inhand_icon_state = "staffofanimation"
-/obj/item/ash_staff/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
- if(!proximity_flag)
- return ..()
+ ///If the world.time is above this, it wont work. Charging requires whacking the necropolis nest
+ var/staff_time = 0
+/obj/item/ash_staff/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
if(!user.mind.has_antag_datum(/datum/antagonist/ashwalker))
- return ..()
-
- if(istype(target, /obj/structure/lavaland/ash_walker))
- return
-
- if(isopenturf(target))
- var/turf/target_turf = target
- if(istype(target, /turf/open/misc/asteroid/basalt/lava_land_surface))
- to_chat(user, span_warning("You begin to corrupt the land even further..."))
- if(!do_after(user, 4 SECONDS, target = target_turf))
- to_chat(user, span_warning("[src] had their casting cut short!"))
- return
-
- target_turf.ChangeTurf(/turf/open/lava/smooth/lava_land_surface)
- to_chat(user, span_notice("[src] sparks, corrupting the area too far!"))
- return
-
- if(!do_after(user, 2 SECONDS, target = target_turf))
+ return NONE
+ if(istype(interacting_with, /obj/structure/lavaland/ash_walker))
+ return NONE
+ if(!isopenturf(interacting_with))
+ return NONE
+ var/turf/target_turf = interacting_with
+ if(istype(interacting_with, /turf/open/misc/asteroid/basalt/lava_land_surface))
+ to_chat(user, span_warning("You begin to corrupt the land even further..."))
+ if(!do_after(user, 4 SECONDS, target = target_turf))
to_chat(user, span_warning("[src] had their casting cut short!"))
- return
-
- target_turf.ChangeTurf(/turf/open/misc/asteroid/basalt/lava_land_surface)
+ return ITEM_INTERACT_BLOCKING
+ target_turf.ChangeTurf(/turf/open/lava/smooth/lava_land_surface)
+ to_chat(user, span_notice("[src] sparks, corrupting the area too far!"))
+ return
+ if(world.time > staff_time)
+ to_chat(user, span_warning("[src] has had its permission expire from the necropolis!"))
+ return ITEM_INTERACT_BLOCKING
+ if(!do_after(user, 2 SECONDS, target = target_turf))
+ to_chat(user, span_warning("[src] had their casting cut short!"))
+ return ITEM_INTERACT_BLOCKING
+ target_turf.ChangeTurf(/turf/open/misc/asteroid/basalt/lava_land_surface)
+ return ITEM_INTERACT_SUCCESS
+
+/obj/structure/lavaland/ash_walker/attackby(obj/item/I, mob/living/user, params)
+ if(istype(I, /obj/item/ash_staff) && user.mind.has_antag_datum(/datum/antagonist/ashwalker))
+ var/obj/item/ash_staff/target_staff = I
+ target_staff.staff_time = world.time + 5 MINUTES
+ playsound(src, 'sound/magic/demon_consume.ogg', 50, TRUE)
+ to_chat(user, span_notice("The tendril permits you to have more time to corrupt the world with ashes."))
return
-
return ..()
//generic ash item recipe
diff --git a/modular_skyrat/modules/bodyparts/code/taur_bodyparts.dm b/modular_skyrat/modules/bodyparts/code/taur_bodyparts.dm
index 8fe1a86cfeb387..5e731ad69e0c63 100644
--- a/modular_skyrat/modules/bodyparts/code/taur_bodyparts.dm
+++ b/modular_skyrat/modules/bodyparts/code/taur_bodyparts.dm
@@ -4,11 +4,7 @@
bodypart_flags = BODYPART_UNREMOVABLE
can_be_surgically_removed = FALSE
bodyshape = parent_type::bodyshape | BODYSHAPE_TAUR
-
-/obj/item/bodypart/leg/right/taur/generate_icon_key()
- RETURN_TYPE(/list)
- // We don't want more than one icon for all of the taur legs, because they're going to be invisible.
- return list("taur")
+ show_icon = FALSE
/obj/item/bodypart/leg/left/taur
icon_greyscale = BODYPART_ICON_TAUR
@@ -16,11 +12,7 @@
bodypart_flags = BODYPART_UNREMOVABLE
can_be_surgically_removed = FALSE
bodyshape = parent_type::bodyshape | BODYSHAPE_TAUR
-
-/obj/item/bodypart/leg/left/taur/generate_icon_key()
- RETURN_TYPE(/list)
- // We don't want more than one icon for all of the taur legs, because they're going to be invisible.
- return list("taur")
+ show_icon = FALSE
/obj/item/bodypart/leg/right/robot/synth/taur
icon_greyscale = BODYPART_ICON_TAUR
@@ -29,11 +21,7 @@
can_be_surgically_removed = FALSE
bodyshape = parent_type::bodyshape | BODYSHAPE_TAUR
damage_examines = list(BRUTE = ROBOTIC_BRUTE_EXAMINE_TEXT, BURN = ROBOTIC_BURN_EXAMINE_TEXT)
-
-/obj/item/bodypart/leg/right/robot/synth/taur/generate_icon_key()
- RETURN_TYPE(/list)
- // We don't want more than one icon for all of the taur legs, because they're going to be invisible.
- return list("taur")
+ show_icon = FALSE
/obj/item/bodypart/leg/left/robot/synth/taur
icon_greyscale = BODYPART_ICON_TAUR
@@ -42,8 +30,4 @@
can_be_surgically_removed = FALSE
bodyshape = parent_type::bodyshape | BODYSHAPE_TAUR
damage_examines = list(BRUTE = ROBOTIC_BRUTE_EXAMINE_TEXT, BURN = ROBOTIC_BURN_EXAMINE_TEXT)
-
-/obj/item/bodypart/leg/left/robot/synth/taur/generate_icon_key()
- RETURN_TYPE(/list)
- // We don't want more than one icon for all of the taur legs, because they're going to be invisible.
- return list("taur")
+ show_icon = FALSE
diff --git a/modular_skyrat/modules/borg_buffs/code/robot.dm b/modular_skyrat/modules/borg_buffs/code/robot.dm
index fdffd040e4ecb1..8c34486cb7fc50 100644
--- a/modular_skyrat/modules/borg_buffs/code/robot.dm
+++ b/modular_skyrat/modules/borg_buffs/code/robot.dm
@@ -130,7 +130,7 @@
/obj/item/borg/upgrade/wirebrush
name = "janitor cyborg wire-brush"
desc = "A tool to remove rust from walls."
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_janitor"
require_model = TRUE
model_type = list(/obj/item/robot_model/janitor)
model_flags = BORG_MODEL_JANITOR
diff --git a/modular_skyrat/modules/borg_buffs/code/snack_dispensor.dm b/modular_skyrat/modules/borg_buffs/code/snack_dispensor.dm
index d55eb7ae2112d1..ea2799589090d0 100644
--- a/modular_skyrat/modules/borg_buffs/code/snack_dispensor.dm
+++ b/modular_skyrat/modules/borg_buffs/code/snack_dispensor.dm
@@ -88,52 +88,59 @@
var/snack_name = initial(selected_snack.name)
to_chat(user, span_notice("[src] is now dispensing [snack_name]."))
-/obj/item/borg_snack_dispenser/attack(mob/living/patron, mob/living/silicon/robot/user, params)
+/obj/item/borg_snack_dispenser/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ var/mob/living/patron = interacting_with
+ if(!istype(patron))
+ return NONE
var/empty_hand = LAZYACCESS(patron.get_empty_held_indexes(), 1)
if(!empty_hand)
to_chat(user, span_warning("[patron] has no free hands!"))
- return
+ return ITEM_INTERACT_BLOCKING
if(!selected_snack)
to_chat(user, span_warning("No snack selected."))
- return
- if(!istype(user))
- CRASH("[src] being used by non borg [user]")
- if(user.cell.charge < borg_charge_cutoff)
- to_chat(user, span_danger("Automated Safety Measures restrict the operation of [src] while under [borg_charge_cutoff]!"))
- return
- if(!user.cell.use(borg_charge_usage))
- to_chat(user, span_danger("Failure printing snack: power failure!"))
- return
+ return ITEM_INTERACT_BLOCKING
+ var/mob/living/silicon/robot/borg = user
+ if(!istype(borg))
+ CRASH("[src] being used by non borg [borg]")
+ if(borg.cell.charge < borg_charge_cutoff)
+ to_chat(borg, span_danger("Automated Safety Measures restrict the operation of [src] while under [borg_charge_cutoff]!"))
+ return ITEM_INTERACT_BLOCKING
+ if(!borg.cell.use(borg_charge_usage))
+ to_chat(borg, span_danger("Failure printing snack: power failure!"))
+ return ITEM_INTERACT_BLOCKING
var/atom/snack = new selected_snack(src)
patron.put_in_hand(snack, empty_hand)
- user.do_item_attack_animation(patron, null, snack)
+ borg.do_item_attack_animation(patron, null, snack)
playsound(loc, 'sound/machines/click.ogg', 10, TRUE)
- to_chat(patron, span_notice("[user] dispenses [snack] into your empty hand and you reflexively grasp it."))
- to_chat(user, span_notice("You dispense [snack] into the hand of [user]."))
+ to_chat(patron, span_notice("[borg] dispenses [snack] into your empty hand and you reflexively grasp it."))
+ to_chat(borg, span_notice("You dispense [snack] into the hand of [borg]."))
+ return ITEM_INTERACT_SUCCESS
/obj/item/borg_snack_dispenser/click_alt(mob/user)
launch_mode = !launch_mode
to_chat(user, span_notice("[src] is [(launch_mode ? "now" : "no longer")] launching snacks at a distance."))
return CLICK_ACTION_SUCCESS
-/obj/item/borg_snack_dispenser/afterattack(atom/target, mob/living/silicon/robot/user, proximity_flag, click_parameters)
- if(Adjacent(target) || !launch_mode)
- return ..()
+/obj/item/borg_snack_dispenser/ranged_interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ if(!launch_mode)
+ return NONE
if(!selected_snack)
to_chat(user, span_warning("No snack selected."))
- return
- if(!istype(user))
- CRASH("[src] being used by non borg [user]")
- if(user.cell.charge < borg_charge_cutoff)
- to_chat(user, span_danger("Automated Safety Measures restrict the operation of [src] while under [borg_charge_cutoff]!"))
- return
- if(!user.cell.use(borg_charge_usage))
- to_chat(user, span_danger("Failure printing snack: power failure!"))
- return
+ return ITEM_INTERACT_BLOCKING
+ var/mob/living/silicon/robot/borg = user
+ if(!istype(borg))
+ CRASH("[src] being used by non borg [borg]")
+ if(borg.cell.charge < borg_charge_cutoff)
+ to_chat(borg, span_danger("Automated Safety Measures restrict the operation of [src] while under [borg_charge_cutoff]!"))
+ return ITEM_INTERACT_BLOCKING
+ if(!borg.cell.use(borg_charge_usage))
+ to_chat(borg, span_danger("Failure printing snack: power failure!"))
+ return ITEM_INTERACT_BLOCKING
var/atom/movable/snack = new selected_snack(get_turf(src))
- snack.throw_at(target, 7, 2, user, TRUE, FALSE)
+ snack.throw_at(interacting_with, 7, 2, borg, TRUE, FALSE)
playsound(loc, 'sound/machines/click.ogg', 10, TRUE)
- user.visible_message(span_notice("[src] launches [snack] at [target]!"))
+ borg.visible_message(span_notice("[src] launches [snack] at [interacting_with]!"))
+ return ITEM_INTERACT_SUCCESS
/obj/item/food/cookie/bacon
name = "strip of bacon"
diff --git a/modular_skyrat/modules/borgs/code/robot.dm b/modular_skyrat/modules/borgs/code/robot.dm
index 8bddf039f4d4a8..4bc9cdf1e2dc86 100644
--- a/modular_skyrat/modules/borgs/code/robot.dm
+++ b/modular_skyrat/modules/borgs/code/robot.dm
@@ -92,6 +92,20 @@
robot_resting = FALSE
update_icons()
+/mob/living/silicon/robot/update_worn_icons()
+ if(!hat_overlay)
+ return
+ cut_overlay(hat_overlay)
+
+ var/list/offset_list = ((robot_resting && model.rest_hat_offset) ? model.rest_hat_offset : model.hat_offset)
+ if(islist(offset_list))
+ var/list/offset = offset_list[ISDIAGONALDIR(dir) ? dir2text(dir & (WEST|EAST)) : dir2text(dir)]
+ if(offset)
+ hat_overlay.pixel_w = offset[1]
+ hat_overlay.pixel_z = offset[2]
+
+ add_overlay(hat_overlay)
+
/mob/living/silicon/robot/update_module_innate()
..()
if(hands)
diff --git a/modular_skyrat/modules/borgs/code/robot_items.dm b/modular_skyrat/modules/borgs/code/robot_items.dm
index 9a84ad39a5626b..dc7c7cc032e2dc 100644
--- a/modular_skyrat/modules/borgs/code/robot_items.dm
+++ b/modular_skyrat/modules/borgs/code/robot_items.dm
@@ -355,12 +355,12 @@
/// A proc for shooting a projectile at the target, it's just that simple, really.
-/obj/item/borg/paperplane_crossbow/proc/shoot(atom/target, mob/living/user, params)
+/obj/item/borg/paperplane_crossbow/proc/shoot(atom/target, mob/living/user)
if(!COOLDOWN_FINISHED(src, shooting_cooldown))
- return
+ return ITEM_INTERACT_BLOCKING
if(planes <= 0)
to_chat(user, span_warning("Not enough paper planes left!"))
- return FALSE
+ return ITEM_INTERACT_BLOCKING
planes--
var/obj/item/paperplane/syndicate/hardlight/plane_to_fire = new /obj/item/paperplane/syndicate/hardlight(get_turf(src.loc))
@@ -370,18 +370,19 @@
COOLDOWN_START(src, shooting_cooldown, shooting_delay)
user.visible_message(span_warning("[user] shoots a paper plane at [target]!"))
check_amount()
+ return ITEM_INTERACT_SUCCESS
-/obj/item/borg/paperplane_crossbow/afterattack(atom/target, mob/living/user, proximity, click_params)
- . = ..()
+/obj/item/borg/paperplane_crossbow/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
check_amount()
- if(iscyborg(user))
- var/mob/living/silicon/robot/robot_user = user
- if(!robot_user.cell.use(STANDARD_CELL_CHARGE * 0.1))
- to_chat(user, span_warning("Not enough power."))
- return FALSE
- shoot(target, user, click_params)
+ if(!iscyborg(user))
+ return ITEM_INTERACT_BLOCKING
+ var/mob/living/silicon/robot/robot_user = user
+ if(!robot_user.cell.use(10))
+ to_chat(user, span_warning("Not enough power."))
+ return ITEM_INTERACT_BLOCKING
+ return shoot(interacting_with, user)
/// Holders for the package wrap and the wrapping paper synthetizers.
diff --git a/modular_skyrat/modules/borgs/code/robot_model.dm b/modular_skyrat/modules/borgs/code/robot_model.dm
index 3f660d87956cba..157211cfc99237 100644
--- a/modular_skyrat/modules/borgs/code/robot_model.dm
+++ b/modular_skyrat/modules/borgs/code/robot_model.dm
@@ -3,6 +3,7 @@
var/sleeper_overlay
var/cyborg_pixel_offset
var/model_select_alternate_icon
+ var/rest_hat_offset
/// Traits unique to this model, i.e. having a unique dead sprite, being wide or being small enough to reject shrinker modules. Leverages defines in code\__DEFINES\~skyrat_defines\robot_defines.dm
/// If a sprite overlaps above the standard height, ensure it is not overlapping icons in the selector wheel.
var/list/model_features = list()
@@ -34,7 +35,6 @@
if (!istype(robot))
return
if (model_features && (TRAIT_R_WIDE in model_features))
- hat_offset = INFINITY
cyborg.set_base_pixel_x(-16)
add_verb(cyborg, /mob/living/silicon/robot/proc/robot_lay_down)
add_verb(cyborg, /mob/living/silicon/robot/proc/rest_style)
@@ -43,6 +43,34 @@
remove_verb(cyborg, /mob/living/silicon/robot/proc/robot_lay_down)
remove_verb(cyborg, /mob/living/silicon/robot/proc/rest_style)
+#define TALL_HAT_OFFSET \
+ SKIN_HAT_OFFSET = list("north" = list(0, 15), "south" = list(0, 15), "east" = list(2, 15), "west" = list(-2, 15)), \
+ SKIN_HAT_REST_OFFSET = list("north" = list(0, 1), "south" = list(0, 1), "east" = list(2, 1), "west" = list(-2, 1))
+#define ZOOMBA_HAT_OFFSET \
+ SKIN_HAT_OFFSET = list("north" = list(0, -13), "south" = list(0, -13), "east" = list(0, -13), "west" = list(0, -13))
+#define DROID_HAT_OFFSET \
+ SKIN_HAT_OFFSET = list("north" = list(0, 4), "south" = list(0, 4), "east" = list(0, 4), "west" = list(0, 4))
+
+#define BORGI_HAT_OFFSET \
+ SKIN_HAT_OFFSET = list("north" = list(16, -7), "south" = list(16, -7), "east" = list(24, -7), "west" = list(8, -7))
+#define PUP_HAT_OFFSET \
+ SKIN_HAT_OFFSET = list("north" = list(16, 3), "south" = list(16, 3), "east" = list(29, 3), "west" = list(3, 3))
+#define BLADE_HAT_OFFSET \
+ SKIN_HAT_OFFSET = list("north" = list(16, -2), "south" = list(16, -2), "east" = list(31, -2), "west" = list(1, -2))
+#define VALE_HAT_OFFSET \
+ SKIN_HAT_OFFSET = list("north" = list(16, 3), "south" = list(16, 3), "east" = list(28, 4), "west" = list(4, 4)), \
+ SKIN_HAT_REST_OFFSET = list("north" = list(16, -3), "south" = list(16, -3), "east" = list(28, -6), "west" = list(4, -6))
+#define DRAKE_HAT_OFFSET \
+ SKIN_HAT_OFFSET = list("north" = list(16, 0), "south" = list(16, 0), "east" = list(36, 0), "west" = list(-4, 0)), \
+ SKIN_HAT_REST_OFFSET = list("north" = list(16, -6), "south" = list(16, -7), "east" = list(36, -6), "west" = list(-4, -6))
+#define HOUND_HAT_OFFSET \
+ SKIN_HAT_OFFSET = list("north" = list(16, 2), "south" = list(16, 2), "east" = list(28, 2), "west" = list(4, 2)), \
+ SKIN_HAT_REST_OFFSET = list("north" = list(16, -5), "south" = list(16, -5), "east" = list(31, -6), "west" = list(1, -6))
+#define OTIE_HAT_OFFSET \
+ SKIN_HAT_OFFSET = list("north" = list(16, 4), "south" = list(16, 4), "east" = list(30, 4), "west" = list(2, 4))
+#define ALINA_HAT_OFFSET \
+ SKIN_HAT_OFFSET = list("north" = list(16, -2), "south" = list(16, -2), "east" = list(26, -2), "west" = list(6, -2))
+
//STANDARD
/obj/item/robot_model/standard
name = "Standard"
@@ -56,7 +84,7 @@
"Male Bootyborg" = list(SKIN_ICON_STATE = "male_bootysd", SKIN_ICON = CYBORG_ICON_STANDARD),
"Protectron" = list(SKIN_ICON_STATE = "protectron_standard", SKIN_ICON = CYBORG_ICON_STANDARD),
"Miss M" = list(SKIN_ICON_STATE = "missm_sd", SKIN_ICON = CYBORG_ICON_STANDARD),
- "Partyhound" = list(SKIN_ICON_STATE = "k69", SKIN_ICON = CYBORG_ICON_SERVICE_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE))
+ "Partyhound" = list(SKIN_ICON_STATE = "k69", SKIN_ICON = CYBORG_ICON_SERVICE_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), HOUND_HAT_OFFSET)
)
//SERVICE
@@ -70,9 +98,9 @@
"Tophat" = list(SKIN_ICON_STATE = "tophat", SKIN_HAT_OFFSET = INFINITY),
"Sleek" = list(SKIN_ICON_STATE = "sleekserv", SKIN_ICON = CYBORG_ICON_SERVICE),
"Heavy" = list(SKIN_ICON_STATE = "heavyserv", SKIN_ICON = CYBORG_ICON_SERVICE),
- "Kent" = list(SKIN_ICON_STATE = "kent", SKIN_LIGHT_KEY = "medical", SKIN_HAT_OFFSET = 3),
- "Can" = list(SKIN_ICON_STATE = "kent", SKIN_LIGHT_KEY = "medical", SKIN_HAT_OFFSET = 3),
- "Zoomba" = list(SKIN_ICON_STATE = "zoomba_green", SKIN_ICON = CYBORG_ICON_SERVICE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL), SKIN_HAT_OFFSET = -13),
+ "Kent" = list(SKIN_ICON_STATE = "kent", SKIN_LIGHT_KEY = "medical", SKIN_HAT_OFFSET = list("north" = list(0, 3), "south" = list(0, 3), "east" = list(0, 3), "west" = list(0, 3))),
+ "Can" = list(SKIN_ICON_STATE = "kent", SKIN_LIGHT_KEY = "medical", SKIN_HAT_OFFSET = list("north" = list(0, 3), "south" = list(0, 3), "east" = list(0, 3), "west" = list(0, 3))),
+ "Zoomba" = list(SKIN_ICON_STATE = "zoomba_green", SKIN_ICON = CYBORG_ICON_SERVICE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL), ZOOMBA_HAT_OFFSET),
"ARACHNE" = list(SKIN_ICON_STATE = "arachne_service", SKIN_ICON = CYBORG_ICON_SERVICE),
"Slipper" = list(SKIN_ICON_STATE = "slipper_service", SKIN_ICON = CYBORG_ICON_SERVICE),
"Bootyborg" = list(SKIN_ICON_STATE = "bootyservice", SKIN_ICON = CYBORG_ICON_SERVICE),
@@ -83,20 +111,20 @@
"Mech" = list(SKIN_ICON_STATE = "lloyd", SKIN_ICON = CYBORG_ICON_SERVICE),
"Handy" = list(SKIN_ICON_STATE = "handy-service", SKIN_ICON = CYBORG_ICON_SERVICE),
/// 64x32 skins
- "Borgi" = list(SKIN_ICON_STATE = "borgi-serv", SKIN_ICON = CYBORG_ICON_SERVICE_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL)),
- "Drake" = list(SKIN_ICON_STATE = "drakeserv", SKIN_ICON = CYBORG_ICON_SERVICE_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
- "Vale" = list(SKIN_ICON_STATE = "valeserv", SKIN_ICON = CYBORG_ICON_SERVICE_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
- "ValeDark" = list(SKIN_ICON_STATE = "valeservdark", SKIN_ICON = CYBORG_ICON_SERVICE_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
- "Darkhound" = list(SKIN_ICON_STATE = "k50", SKIN_ICON = CYBORG_ICON_SERVICE_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
- "Partyhound" = list(SKIN_ICON_STATE = "k69", SKIN_ICON = CYBORG_ICON_SERVICE_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
+ "Borgi" = list(SKIN_ICON_STATE = "borgi-serv", SKIN_ICON = CYBORG_ICON_SERVICE_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL), BORGI_HAT_OFFSET),
+ "Drake" = list(SKIN_ICON_STATE = "drakeserv", SKIN_ICON = CYBORG_ICON_SERVICE_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), DRAKE_HAT_OFFSET),
+ "Vale" = list(SKIN_ICON_STATE = "valeserv", SKIN_ICON = CYBORG_ICON_SERVICE_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), VALE_HAT_OFFSET),
+ "ValeDark" = list(SKIN_ICON_STATE = "valeservdark", SKIN_ICON = CYBORG_ICON_SERVICE_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), VALE_HAT_OFFSET),
+ "Darkhound" = list(SKIN_ICON_STATE = "k50", SKIN_ICON = CYBORG_ICON_SERVICE_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), HOUND_HAT_OFFSET),
+ "Partyhound" = list(SKIN_ICON_STATE = "k69", SKIN_ICON = CYBORG_ICON_SERVICE_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), HOUND_HAT_OFFSET),
/// 32x64 skins
- "Meka" = list(SKIN_ICON_STATE = "mekaserve", SKIN_ICON = CYBORG_ICON_SERVICE_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "Meka (Alt)" = list(SKIN_ICON_STATE = "mekaserve_alt", SKIN_LIGHT_KEY = "mekaserve", SKIN_ICON = CYBORG_ICON_SERVICE_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "NiKA" = list(SKIN_ICON_STATE = "fmekaserv", SKIN_ICON = CYBORG_ICON_SERVICE_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "NiKO" = list(SKIN_ICON_STATE = "mmekaserv", SKIN_ICON = CYBORG_ICON_SERVICE_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "K4T (Barista)" = list(SKIN_ICON_STATE = "k4tserve", SKIN_ICON = CYBORG_ICON_SERVICE_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "K4T (80s)" = list(SKIN_ICON_STATE = "k4tserve_alt1", SKIN_ICON = CYBORG_ICON_SERVICE_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "K4T (Dispenser)" = list(SKIN_ICON_STATE = "k4tserve_alt2", SKIN_ICON = CYBORG_ICON_SERVICE_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15)
+ "Meka" = list(SKIN_ICON_STATE = "mekaserve", SKIN_ICON = CYBORG_ICON_SERVICE_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "Meka (Alt)" = list(SKIN_ICON_STATE = "mekaserve_alt", SKIN_LIGHT_KEY = "mekaserve", SKIN_ICON = CYBORG_ICON_SERVICE_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "NiKA" = list(SKIN_ICON_STATE = "fmekaserv", SKIN_ICON = CYBORG_ICON_SERVICE_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "NiKO" = list(SKIN_ICON_STATE = "mmekaserv", SKIN_ICON = CYBORG_ICON_SERVICE_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "K4T (Barista)" = list(SKIN_ICON_STATE = "k4tserve", SKIN_ICON = CYBORG_ICON_SERVICE_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "K4T (80s)" = list(SKIN_ICON_STATE = "k4tserve_alt1", SKIN_ICON = CYBORG_ICON_SERVICE_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "K4T (Dispenser)" = list(SKIN_ICON_STATE = "k4tserve_alt2", SKIN_ICON = CYBORG_ICON_SERVICE_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET)
)
//MINING
@@ -107,10 +135,10 @@
"Lavaland" = list(SKIN_ICON_STATE = "miner", SKIN_LIGHT_KEY = "miner"),
"Asteroid" = list(SKIN_ICON_STATE = "minerOLD", SKIN_LIGHT_KEY = "miner"),
"Drone" = list(SKIN_ICON_STATE = "miningdrone", SKIN_ICON = CYBORG_ICON_MINING, SKIN_FEATURES = list(TRAIT_R_SMALL)),
- "Zoomba" = list(SKIN_ICON_STATE = "zoomba_miner", SKIN_ICON = CYBORG_ICON_MINING, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL), SKIN_HAT_OFFSET = -13),
+ "Zoomba" = list(SKIN_ICON_STATE = "zoomba_miner", SKIN_ICON = CYBORG_ICON_MINING, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL), ZOOMBA_HAT_OFFSET),
"Slipper" = list(SKIN_ICON_STATE = "slipper_mine", SKIN_ICON = CYBORG_ICON_MINING),
"Spider Miner" = list(SKIN_ICON_STATE = "spidermin", SKIN_LIGHT_KEY = "miner"),
- "Droid" = list(SKIN_ICON_STATE = "miner", SKIN_ICON = CYBORG_ICON_MINING, SKIN_HAT_OFFSET = 4),
+ "Droid" = list(SKIN_ICON_STATE = "miner", SKIN_ICON = CYBORG_ICON_MINING, DROID_HAT_OFFSET),
"Sleek" = list(SKIN_ICON_STATE = "sleekmin", SKIN_ICON = CYBORG_ICON_MINING),
"Can" = list(SKIN_ICON_STATE = "canmin", SKIN_ICON = CYBORG_ICON_MINING),
"Marina" = list(SKIN_ICON_STATE = "marinamin", SKIN_ICON = CYBORG_ICON_MINING),
@@ -123,18 +151,18 @@
"Miss M" = list(SKIN_ICON_STATE = "missm_miner", SKIN_ICON = CYBORG_ICON_MINING),
"Mech" = list(SKIN_ICON_STATE = "ishimura", SKIN_ICON = CYBORG_ICON_MINING),
/// 64x32 skins
- "Blade" = list(SKIN_ICON_STATE = "blade", SKIN_ICON = CYBORG_ICON_MINING_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
- "Vale" = list(SKIN_ICON_STATE = "valemine", SKIN_ICON = CYBORG_ICON_MINING_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
- "Drake" = list(SKIN_ICON_STATE = "drakemine", SKIN_ICON = CYBORG_ICON_MINING_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
- "Hound" = list(SKIN_ICON_STATE = "cargohound", SKIN_ICON = CYBORG_ICON_MINING_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
- "Darkhound" = list(SKIN_ICON_STATE = "cargohounddark", SKIN_ICON = CYBORG_ICON_MINING_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
- "Otie" = list(SKIN_ICON_STATE = "otiec", SKIN_ICON = CYBORG_ICON_MINING_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
+ "Blade" = list(SKIN_ICON_STATE = "blade", SKIN_ICON = CYBORG_ICON_MINING_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), BLADE_HAT_OFFSET),
+ "Vale" = list(SKIN_ICON_STATE = "valemine", SKIN_ICON = CYBORG_ICON_MINING_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), VALE_HAT_OFFSET),
+ "Drake" = list(SKIN_ICON_STATE = "drakemine", SKIN_ICON = CYBORG_ICON_MINING_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), DRAKE_HAT_OFFSET),
+ "Hound" = list(SKIN_ICON_STATE = "cargohound", SKIN_ICON = CYBORG_ICON_MINING_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), HOUND_HAT_OFFSET),
+ "Darkhound" = list(SKIN_ICON_STATE = "cargohounddark", SKIN_ICON = CYBORG_ICON_MINING_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), HOUND_HAT_OFFSET),
+ "Otie" = list(SKIN_ICON_STATE = "otiec", SKIN_ICON = CYBORG_ICON_MINING_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), OTIE_HAT_OFFSET),
/// 32x64 skins
- "Meka" = list(SKIN_ICON_STATE = "mekamine", SKIN_ICON = CYBORG_ICON_MINING_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "K4T (Rookie)" = list(SKIN_ICON_STATE = "k4tmine", SKIN_ICON = CYBORG_ICON_MINING_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "K4T (Veteran)" = list(SKIN_ICON_STATE = "k4tmine_alt1", SKIN_ICON = CYBORG_ICON_MINING_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "NiKA" = list(SKIN_ICON_STATE = "fmekamine", SKIN_ICON = CYBORG_ICON_MINING_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "NiKO" = list(SKIN_ICON_STATE = "mmekamine", SKIN_ICON = CYBORG_ICON_MINING_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15)
+ "Meka" = list(SKIN_ICON_STATE = "mekamine", SKIN_ICON = CYBORG_ICON_MINING_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "K4T (Rookie)" = list(SKIN_ICON_STATE = "k4tmine", SKIN_ICON = CYBORG_ICON_MINING_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "K4T (Veteran)" = list(SKIN_ICON_STATE = "k4tmine_alt1", SKIN_ICON = CYBORG_ICON_MINING_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "NiKA" = list(SKIN_ICON_STATE = "fmekamine", SKIN_ICON = CYBORG_ICON_MINING_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "NiKO" = list(SKIN_ICON_STATE = "mmekamine", SKIN_ICON = CYBORG_ICON_MINING_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET)
)
//CLOWN
@@ -150,7 +178,7 @@
"Robot" = list(SKIN_ICON_STATE = "clownbot", SKIN_ICON = 'modular_skyrat/modules/borgs/icons/robots_clown.dmi'),
"Sleek" = list(SKIN_ICON_STATE = "clownman", SKIN_ICON = 'modular_skyrat/modules/borgs/icons/robots_clown.dmi', SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK)),
/// 32x64 skins
- "K4T" = list(SKIN_ICON_STATE = "k4tclown", SKIN_ICON = CYBORG_ICON_CLOWN_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15)
+ "K4T" = list(SKIN_ICON_STATE = "k4tclown", SKIN_ICON = CYBORG_ICON_CLOWN_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET)
)
//ENGINEERING
@@ -158,7 +186,7 @@
borg_skins = list(
/// 32x32 Skins
"Default" = list(SKIN_ICON_STATE = "engineer", SKIN_FEATURES = list(TRAIT_R_SMALL)),
- "Zoomba" = list(SKIN_ICON_STATE = "zoomba_engi", SKIN_ICON = CYBORG_ICON_ENG, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL), SKIN_HAT_OFFSET = -13),
+ "Zoomba" = list(SKIN_ICON_STATE = "zoomba_engi", SKIN_ICON = CYBORG_ICON_ENG, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL), ZOOMBA_HAT_OFFSET),
"Default - Treads" = list(SKIN_ICON_STATE = "engi-tread", SKIN_LIGHT_KEY = "engineer", SKIN_ICON = CYBORG_ICON_ENG),
"Loader" = list(SKIN_ICON_STATE = "loaderborg", SKIN_ICON = CYBORG_ICON_ENG, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK)),
"Handy" = list(SKIN_ICON_STATE = "handyeng", SKIN_ICON = CYBORG_ICON_ENG),
@@ -176,22 +204,22 @@
"Wide" = list(SKIN_ICON_STATE = "wide-engi", SKIN_ICON = CYBORG_ICON_ENG),
"ARACHNE" = list(SKIN_ICON_STATE = "arachne_engi", SKIN_ICON = CYBORG_ICON_ENG),
"Slipper" = list(SKIN_ICON_STATE = "slipper_engi", SKIN_ICON = CYBORG_ICON_ENG),
- "Alina" = list(SKIN_ICON_STATE = "alina-eng", SKIN_LIGHT_KEY = "alina", SKIN_ICON = CYBORG_ICON_ENG_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
+ "Alina" = list(SKIN_ICON_STATE = "alina-eng", SKIN_LIGHT_KEY = "alina", SKIN_ICON = CYBORG_ICON_ENG_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), ALINA_HAT_OFFSET),
"Eyebot" = list(SKIN_ICON_STATE = "eyeboteng", SKIN_ICON = CYBORG_ICON_ENG, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL)),
/// 64x32 Skins
- "Borgi" = list(SKIN_ICON_STATE = "borgi-eng", SKIN_ICON = CYBORG_ICON_ENG_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL)),
- "Otie" = list(SKIN_ICON_STATE = "otiee", SKIN_ICON = CYBORG_ICON_ENG_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
- "Pup Dozer" = list(SKIN_ICON_STATE = "pupdozer", SKIN_ICON = CYBORG_ICON_ENG_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
- "Vale" = list(SKIN_ICON_STATE = "valeeng", SKIN_ICON = CYBORG_ICON_ENG_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
- "Hound" = list(SKIN_ICON_STATE = "engihound", SKIN_ICON = CYBORG_ICON_ENG_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
- "Darkhound" = list(SKIN_ICON_STATE = "engihounddark", SKIN_ICON = CYBORG_ICON_ENG_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
- "Drake" = list(SKIN_ICON_STATE = "drakeeng", SKIN_ICON = CYBORG_ICON_ENG_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
+ "Borgi" = list(SKIN_ICON_STATE = "borgi-eng", SKIN_ICON = CYBORG_ICON_ENG_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL), BORGI_HAT_OFFSET),
+ "Otie" = list(SKIN_ICON_STATE = "otiee", SKIN_ICON = CYBORG_ICON_ENG_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), OTIE_HAT_OFFSET),
+ "Pup Dozer" = list(SKIN_ICON_STATE = "pupdozer", SKIN_ICON = CYBORG_ICON_ENG_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), PUP_HAT_OFFSET),
+ "Vale" = list(SKIN_ICON_STATE = "valeeng", SKIN_ICON = CYBORG_ICON_ENG_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), VALE_HAT_OFFSET),
+ "Hound" = list(SKIN_ICON_STATE = "engihound", SKIN_ICON = CYBORG_ICON_ENG_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), HOUND_HAT_OFFSET),
+ "Darkhound" = list(SKIN_ICON_STATE = "engihounddark", SKIN_ICON = CYBORG_ICON_ENG_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), HOUND_HAT_OFFSET),
+ "Drake" = list(SKIN_ICON_STATE = "drakeeng", SKIN_ICON = CYBORG_ICON_ENG_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), DRAKE_HAT_OFFSET),
/// 32x64 Skins
- "Meka" = list(SKIN_ICON_STATE = "mekaengi", SKIN_ICON = CYBORG_ICON_ENG_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "K4T (Technician)" = list(SKIN_ICON_STATE = "k4tengi", SKIN_ICON = CYBORG_ICON_ENG_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "K4T (Hazard)" = list(SKIN_ICON_STATE = "k4tengi_alt1", SKIN_ICON = CYBORG_ICON_ENG_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "NiKA" = list(SKIN_ICON_STATE = "fmekaeng", SKIN_ICON = CYBORG_ICON_ENG_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "NiKO" = list(SKIN_ICON_STATE = "mmekaeng", SKIN_ICON = CYBORG_ICON_ENG_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15)
+ "Meka" = list(SKIN_ICON_STATE = "mekaengi", SKIN_ICON = CYBORG_ICON_ENG_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "K4T (Technician)" = list(SKIN_ICON_STATE = "k4tengi", SKIN_ICON = CYBORG_ICON_ENG_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "K4T (Hazard)" = list(SKIN_ICON_STATE = "k4tengi_alt1", SKIN_ICON = CYBORG_ICON_ENG_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "NiKA" = list(SKIN_ICON_STATE = "fmekaeng", SKIN_ICON = CYBORG_ICON_ENG_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "NiKO" = list(SKIN_ICON_STATE = "mmekaeng", SKIN_ICON = CYBORG_ICON_ENG_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET)
)
/obj/item/robot_model/janitor
@@ -200,7 +228,7 @@
"Default" = list(SKIN_ICON_STATE = "janitor"),
"ARACHNE" = list(SKIN_ICON_STATE = "arachne_jani", SKIN_ICON = CYBORG_ICON_JANI),
"Slipper" = list(SKIN_ICON_STATE = "slipper_janitor", SKIN_ICON = CYBORG_ICON_JANI),
- "Zoomba" = list(SKIN_ICON_STATE = "zoomba_jani", SKIN_ICON = CYBORG_ICON_JANI, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL), SKIN_HAT_OFFSET = -13),
+ "Zoomba" = list(SKIN_ICON_STATE = "zoomba_jani", SKIN_ICON = CYBORG_ICON_JANI, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL), ZOOMBA_HAT_OFFSET),
"Marina" = list(SKIN_ICON_STATE = "marinajan", SKIN_ICON = CYBORG_ICON_JANI),
"Sleek" = list(SKIN_ICON_STATE = "sleekjan", SKIN_ICON = CYBORG_ICON_JANI),
"Can" = list(SKIN_ICON_STATE = "canjan", SKIN_ICON = CYBORG_ICON_JANI),
@@ -216,17 +244,17 @@
"Wide" = list(SKIN_ICON_STATE = "wide-jani", SKIN_ICON = CYBORG_ICON_JANI),
"Spider" = list(SKIN_ICON_STATE = "spidersci", SKIN_ICON = CYBORG_ICON_JANI),
/// 64x32 Skins
- "Borgi" = list(SKIN_ICON_STATE = "borgi-jani", SKIN_ICON = CYBORG_ICON_JANI_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL)),
- "Scrubpuppy" = list(SKIN_ICON_STATE = "scrubpup", SKIN_ICON = CYBORG_ICON_JANI_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
- "Drake" = list(SKIN_ICON_STATE = "drakejanit", SKIN_ICON = CYBORG_ICON_JANI_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
- "Vale" = list(SKIN_ICON_STATE = "J9", SKIN_ICON = CYBORG_ICON_JANI_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
- "Otie" = list(SKIN_ICON_STATE = "otiej", SKIN_ICON = CYBORG_ICON_JANI_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
+ "Borgi" = list(SKIN_ICON_STATE = "borgi-jani", SKIN_ICON = CYBORG_ICON_JANI_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL), BORGI_HAT_OFFSET),
+ "Scrubpuppy" = list(SKIN_ICON_STATE = "scrubpup", SKIN_ICON = CYBORG_ICON_JANI_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), PUP_HAT_OFFSET),
+ "Drake" = list(SKIN_ICON_STATE = "drakejanit", SKIN_ICON = CYBORG_ICON_JANI_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), DRAKE_HAT_OFFSET),
+ "Vale" = list(SKIN_ICON_STATE = "J9", SKIN_ICON = CYBORG_ICON_JANI_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), VALE_HAT_OFFSET),
+ "Otie" = list(SKIN_ICON_STATE = "otiej", SKIN_ICON = CYBORG_ICON_JANI_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), OTIE_HAT_OFFSET),
/// 32x64 Skins
- "Meka" = list(SKIN_ICON_STATE = "mekajani", SKIN_ICON = CYBORG_ICON_JANI_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "K4T (Viscera)" = list(SKIN_ICON_STATE = "k4tjani", SKIN_ICON = CYBORG_ICON_JANI_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "K4T (Domestic)" = list(SKIN_ICON_STATE = "k4tjani_alt1", SKIN_ICON = CYBORG_ICON_JANI_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "NiKA" = list(SKIN_ICON_STATE = "fmekajani", SKIN_ICON = CYBORG_ICON_JANI_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "NiKO" = list(SKIN_ICON_STATE = "mmekajani", SKIN_ICON = CYBORG_ICON_JANI_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15)
+ "Meka" = list(SKIN_ICON_STATE = "mekajani", SKIN_ICON = CYBORG_ICON_JANI_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "K4T (Viscera)" = list(SKIN_ICON_STATE = "k4tjani", SKIN_ICON = CYBORG_ICON_JANI_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "K4T (Domestic)" = list(SKIN_ICON_STATE = "k4tjani_alt1", SKIN_ICON = CYBORG_ICON_JANI_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "NiKA" = list(SKIN_ICON_STATE = "fmekajani", SKIN_ICON = CYBORG_ICON_JANI_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "NiKO" = list(SKIN_ICON_STATE = "mmekajani", SKIN_ICON = CYBORG_ICON_JANI_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET)
)
//MEDICAL
@@ -237,8 +265,8 @@
"Qualified Doctor" = list(SKIN_ICON_STATE = "qualified_doctor"),
"ARACHNE" = list(SKIN_ICON = CYBORG_ICON_MED, SKIN_ICON_STATE = "arachne_med"),
"Slipper" = list(SKIN_ICON = CYBORG_ICON_MED, SKIN_ICON_STATE = "slipper_med"),
- "Zoomba" = list(SKIN_ICON = CYBORG_ICON_MED, SKIN_ICON_STATE = "zoomba_med", SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL), SKIN_HAT_OFFSET = -13),
- "Droid" = list(SKIN_ICON = CYBORG_ICON_MED, SKIN_ICON_STATE = "medical", SKIN_HAT_OFFSET = 4),
+ "Zoomba" = list(SKIN_ICON = CYBORG_ICON_MED, SKIN_ICON_STATE = "zoomba_med", SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL), ZOOMBA_HAT_OFFSET),
+ "Droid" = list(SKIN_ICON = CYBORG_ICON_MED, SKIN_ICON_STATE = "medical", DROID_HAT_OFFSET),
"Sleek" = list(SKIN_ICON = CYBORG_ICON_MED, SKIN_ICON_STATE = "sleekmed"),
"Marina" = list(SKIN_ICON = CYBORG_ICON_MED, SKIN_ICON_STATE = "marinamed"),
"Eyebot" = list(SKIN_ICON = CYBORG_ICON_MED, SKIN_ICON_STATE = "eyebotmed", SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL)),
@@ -251,18 +279,18 @@
"Insekt" = list(SKIN_ICON = CYBORG_ICON_MED, SKIN_ICON_STATE = "insekt-Med"),
"Mech" = list(SKIN_ICON = CYBORG_ICON_MED, SKIN_ICON_STATE = "gibbs"),
/// 64x32 Skins
- "Borgi" = list(SKIN_ICON = CYBORG_ICON_MED_WIDE, SKIN_ICON_STATE = "borgi-medi", SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
- "Drake" = list(SKIN_ICON = CYBORG_ICON_MED_WIDE, SKIN_ICON_STATE = "drakemed", SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
- "Hound" = list(SKIN_ICON = CYBORG_ICON_MED_WIDE, SKIN_ICON_STATE = "medihound", SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
- "DarkHound" = list(SKIN_ICON = CYBORG_ICON_MED_WIDE, SKIN_ICON_STATE = "medihounddark", SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
- "Vale" = list(SKIN_ICON = CYBORG_ICON_MED_WIDE, SKIN_ICON_STATE = "valemed", SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
- "Alina" = list(SKIN_ICON = CYBORG_ICON_MED_WIDE, SKIN_ICON_STATE = "alina-med", SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
+ "Borgi" = list(SKIN_ICON = CYBORG_ICON_MED_WIDE, SKIN_ICON_STATE = "borgi-medi", SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), BORGI_HAT_OFFSET),
+ "Drake" = list(SKIN_ICON = CYBORG_ICON_MED_WIDE, SKIN_ICON_STATE = "drakemed", SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), DRAKE_HAT_OFFSET),
+ "Hound" = list(SKIN_ICON = CYBORG_ICON_MED_WIDE, SKIN_ICON_STATE = "medihound", SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), HOUND_HAT_OFFSET),
+ "DarkHound" = list(SKIN_ICON = CYBORG_ICON_MED_WIDE, SKIN_ICON_STATE = "medihounddark", SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), HOUND_HAT_OFFSET),
+ "Vale" = list(SKIN_ICON = CYBORG_ICON_MED_WIDE, SKIN_ICON_STATE = "valemed", SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), VALE_HAT_OFFSET),
+ "Alina" = list(SKIN_ICON = CYBORG_ICON_MED_WIDE, SKIN_ICON_STATE = "alina-med", SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), ALINA_HAT_OFFSET),
/// 32x64 Skins
- "Meka" = list(SKIN_ICON_STATE = "mekamed", SKIN_ICON = CYBORG_ICON_MED_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "K4T (Doc)" = list(SKIN_ICON_STATE = "k4tmed", SKIN_ICON = CYBORG_ICON_MED_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "K4T (Field Medic)" = list(SKIN_ICON_STATE = "k4tmed_alt1", SKIN_ICON = CYBORG_ICON_MED_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "NiKA" = list(SKIN_ICON_STATE = "fmekamed", SKIN_ICON = CYBORG_ICON_MED_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "NiKO" = list(SKIN_ICON_STATE = "mmekamed", SKIN_ICON = CYBORG_ICON_MED_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15)
+ "Meka" = list(SKIN_ICON_STATE = "mekamed", SKIN_ICON = CYBORG_ICON_MED_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "K4T (Doc)" = list(SKIN_ICON_STATE = "k4tmed", SKIN_ICON = CYBORG_ICON_MED_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "K4T (Field Medic)" = list(SKIN_ICON_STATE = "k4tmed_alt1", SKIN_ICON = CYBORG_ICON_MED_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "NiKA" = list(SKIN_ICON_STATE = "fmekamed", SKIN_ICON = CYBORG_ICON_MED_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "NiKO" = list(SKIN_ICON_STATE = "mmekamed", SKIN_ICON = CYBORG_ICON_MED_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET)
)
//PEACEKEEPER
@@ -270,7 +298,7 @@
borg_skins = list(
/// 32x32 Skins
"Default" = list(SKIN_ICON_STATE = "peace"),
- "Zoomba" = list(SKIN_ICON_STATE = "zoomba_peace", SKIN_ICON = CYBORG_ICON_PEACEKEEPER, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL), SKIN_HAT_OFFSET = -13),
+ "Zoomba" = list(SKIN_ICON_STATE = "zoomba_peace", SKIN_ICON = CYBORG_ICON_PEACEKEEPER, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL), ZOOMBA_HAT_OFFSET),
"ARACHNE" = list(SKIN_ICON_STATE = "arachne_peacekeeper", SKIN_ICON = CYBORG_ICON_PEACEKEEPER),
"Sleek" = list(SKIN_ICON_STATE = "sleekpeace", SKIN_ICON = CYBORG_ICON_PEACEKEEPER, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK)),
"Spider" = list(SKIN_ICON_STATE = "whitespider", SKIN_ICON = CYBORG_ICON_PEACEKEEPER, SKIN_FEATURES = list(TRAIT_R_SMALL)),
@@ -282,21 +310,21 @@
"Insekt" = list(SKIN_ICON_STATE = "insekt-Default", SKIN_ICON = CYBORG_ICON_PEACEKEEPER),
"Omni" = list(SKIN_ICON_STATE = "omoikane", SKIN_ICON = CYBORG_ICON_PEACEKEEPER, SKIN_FEATURES = list(TRAIT_R_SMALL)),
/// 64x32 Skins
- "Drake" = list(SKIN_ICON_STATE = "drakepeace", SKIN_ICON = CYBORG_ICON_PEACEKEEPER_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
- "Borgi" = list(SKIN_ICON_STATE = "borgi", SKIN_ICON = CYBORG_ICON_PEACEKEEPER_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL)),
- "Vale" = list(SKIN_ICON_STATE = "valepeace", SKIN_ICON = CYBORG_ICON_PEACEKEEPER_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
+ "Drake" = list(SKIN_ICON_STATE = "drakepeace", SKIN_ICON = CYBORG_ICON_PEACEKEEPER_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), DRAKE_HAT_OFFSET),
+ "Borgi" = list(SKIN_ICON_STATE = "borgi", SKIN_ICON = CYBORG_ICON_PEACEKEEPER_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL), BORGI_HAT_OFFSET),
+ "Vale" = list(SKIN_ICON_STATE = "valepeace", SKIN_ICON = CYBORG_ICON_PEACEKEEPER_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), VALE_HAT_OFFSET),
/// 32x64 Skins
- "Meka" = list(SKIN_ICON_STATE = "mekapeace", SKIN_ICON = CYBORG_ICON_PEACEKEEPER_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "K4T" = list(SKIN_ICON_STATE = "k4tpeace", SKIN_ICON = CYBORG_ICON_PEACEKEEPER_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "NiKA" = list(SKIN_ICON_STATE = "fmekapeace", SKIN_ICON = CYBORG_ICON_PEACEKEEPER_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "NiKO" = list(SKIN_ICON_STATE = "mmekapeace", SKIN_ICON = CYBORG_ICON_PEACEKEEPER_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15)
+ "Meka" = list(SKIN_ICON_STATE = "mekapeace", SKIN_ICON = CYBORG_ICON_PEACEKEEPER_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "K4T" = list(SKIN_ICON_STATE = "k4tpeace", SKIN_ICON = CYBORG_ICON_PEACEKEEPER_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "NiKA" = list(SKIN_ICON_STATE = "fmekapeace", SKIN_ICON = CYBORG_ICON_PEACEKEEPER_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "NiKO" = list(SKIN_ICON_STATE = "mmekapeace", SKIN_ICON = CYBORG_ICON_PEACEKEEPER_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET)
)
/obj/item/robot_model/security
borg_skins = list(
/// 32x32 Skins
"Default" = list(SKIN_ICON_STATE = "sec"),
- "Zoomba" = list(SKIN_ICON_STATE = "zoomba_sec", SKIN_ICON = CYBORG_ICON_SEC, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL), SKIN_HAT_OFFSET = -13),
+ "Zoomba" = list(SKIN_ICON_STATE = "zoomba_sec", SKIN_ICON = CYBORG_ICON_SEC, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL), ZOOMBA_HAT_OFFSET),
"Default - Treads" = list(SKIN_ICON_STATE = "sec-tread", SKIN_LIGHT_KEY = "sec", SKIN_ICON = CYBORG_ICON_SEC),
"Sleek" = list(SKIN_ICON_STATE = "sleeksec", SKIN_ICON = CYBORG_ICON_SEC),
"Marina" = list(SKIN_ICON_STATE = "marinasec", SKIN_ICON = CYBORG_ICON_SEC),
@@ -311,18 +339,18 @@
"Insekt" = list(SKIN_ICON_STATE = "insekt-Sec", SKIN_ICON = CYBORG_ICON_SEC),
"Mech" = list(SKIN_ICON_STATE = "woody", SKIN_ICON = CYBORG_ICON_SEC),
/// 64x32 Skins
- "Borgi" = list(SKIN_ICON_STATE = "borgi-sec", SKIN_ICON = CYBORG_ICON_SEC_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL)),
- "Hound" = list(SKIN_ICON_STATE = "k9", SKIN_ICON = CYBORG_ICON_SEC_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
- "Darkhound" = list(SKIN_ICON_STATE = "k9dark", SKIN_ICON = CYBORG_ICON_SEC_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
- "Drake" = list(SKIN_ICON_STATE = "drakesec", SKIN_ICON = CYBORG_ICON_SEC_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
- "Otie" = list(SKIN_ICON_STATE = "oties", SKIN_ICON = CYBORG_ICON_SEC_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
- "Alina" = list(SKIN_ICON_STATE = "alina-sec", SKIN_LIGHT_KEY = "alina", SKIN_ICON = CYBORG_ICON_SEC_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
- "Vale" = list(SKIN_ICON_STATE = "valesec", SKIN_ICON = CYBORG_ICON_SEC_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
+ "Borgi" = list(SKIN_ICON_STATE = "borgi-sec", SKIN_ICON = CYBORG_ICON_SEC_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL), BORGI_HAT_OFFSET),
+ "Hound" = list(SKIN_ICON_STATE = "k9", SKIN_ICON = CYBORG_ICON_SEC_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), HOUND_HAT_OFFSET),
+ "Darkhound" = list(SKIN_ICON_STATE = "k9dark", SKIN_ICON = CYBORG_ICON_SEC_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), HOUND_HAT_OFFSET),
+ "Drake" = list(SKIN_ICON_STATE = "drakesec", SKIN_ICON = CYBORG_ICON_SEC_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), DRAKE_HAT_OFFSET),
+ "Otie" = list(SKIN_ICON_STATE = "oties", SKIN_ICON = CYBORG_ICON_SEC_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), OTIE_HAT_OFFSET),
+ "Alina" = list(SKIN_ICON_STATE = "alina-sec", SKIN_LIGHT_KEY = "alina", SKIN_ICON = CYBORG_ICON_SEC_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), ALINA_HAT_OFFSET),
+ "Vale" = list(SKIN_ICON_STATE = "valesec", SKIN_ICON = CYBORG_ICON_SEC_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), VALE_HAT_OFFSET),
/// 32x64 Skins
- "Meka" = list(SKIN_ICON_STATE = "mekasec", SKIN_ICON = CYBORG_ICON_SEC_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "K4T" = list(SKIN_ICON_STATE = "k4tsec", SKIN_ICON = CYBORG_ICON_SEC_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "NiKA" = list(SKIN_ICON_STATE = "fmekasec", SKIN_ICON = CYBORG_ICON_SEC_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "NiKO" = list(SKIN_ICON_STATE = "mmekasec", SKIN_ICON = CYBORG_ICON_SEC_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15)
+ "Meka" = list(SKIN_ICON_STATE = "mekasec", SKIN_ICON = CYBORG_ICON_SEC_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "K4T" = list(SKIN_ICON_STATE = "k4tsec", SKIN_ICON = CYBORG_ICON_SEC_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "NiKA" = list(SKIN_ICON_STATE = "fmekasec", SKIN_ICON = CYBORG_ICON_SEC_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "NiKO" = list(SKIN_ICON_STATE = "mmekasec", SKIN_ICON = CYBORG_ICON_SEC_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET)
)
// CARGO
@@ -350,7 +378,7 @@
/obj/item/stamp/chameleon,
/obj/item/borg/paperplane_crossbow,
)
- hat_offset = 0
+ hat_offset = list("north" = list(0, 0), "south" = list(0, 0), "east" = list(0, 0), "west" = list(0, 0))
cyborg_base_icon = "cargo"
model_select_icon = "cargo"
canDispose = TRUE
@@ -358,20 +386,20 @@
/// 32x32 Skins
"Technician" = list(SKIN_ICON_STATE = "cargoborg", SKIN_ICON = CYBORG_ICON_CARGO),
"Miss M" = list(SKIN_ICON_STATE = "missm_cargo", SKIN_ICON = CYBORG_ICON_CARGO),
- "Zoomba" = list(SKIN_ICON_STATE = "zoomba_cargo", SKIN_ICON = CYBORG_ICON_CARGO, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL), SKIN_HAT_OFFSET = -13),
+ "Zoomba" = list(SKIN_ICON_STATE = "zoomba_cargo", SKIN_ICON = CYBORG_ICON_CARGO, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_SMALL), ZOOMBA_HAT_OFFSET),
"Birdborg" = list(SKIN_ICON_STATE = "bird_cargo", SKIN_ICON = CYBORG_ICON_CARGO),
/// 64x32 Skins
- "Borgi" = list(SKIN_ICON_STATE = "borgi-cargo", SKIN_ICON = CYBORG_ICON_CARGO_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL)),
- "Drake" = list(SKIN_ICON_STATE = "drakecargo", SKIN_ICON = CYBORG_ICON_CARGO_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
- "Hound" = list(SKIN_ICON_STATE = "cargohound", SKIN_ICON = CYBORG_ICON_CARGO_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
- "Darkhound" = list(SKIN_ICON_STATE = "cargohounddark", SKIN_ICON = CYBORG_ICON_CARGO_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
- "Vale" = list(SKIN_ICON_STATE = "valecargo", SKIN_ICON = CYBORG_ICON_CARGO_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE)),
+ "Borgi" = list(SKIN_ICON_STATE = "borgi-cargo", SKIN_ICON = CYBORG_ICON_CARGO_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE, TRAIT_R_SMALL), BORGI_HAT_OFFSET),
+ "Drake" = list(SKIN_ICON_STATE = "drakecargo", SKIN_ICON = CYBORG_ICON_CARGO_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), DRAKE_HAT_OFFSET),
+ "Hound" = list(SKIN_ICON_STATE = "cargohound", SKIN_ICON = CYBORG_ICON_CARGO_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), HOUND_HAT_OFFSET),
+ "Darkhound" = list(SKIN_ICON_STATE = "cargohounddark", SKIN_ICON = CYBORG_ICON_CARGO_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), HOUND_HAT_OFFSET),
+ "Vale" = list(SKIN_ICON_STATE = "valecargo", SKIN_ICON = CYBORG_ICON_CARGO_WIDE, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_WIDE), VALE_HAT_OFFSET),
/// 32x64 Skins
- "Meka" = list(SKIN_ICON_STATE = "mekacargo", SKIN_ICON = CYBORG_ICON_CARGO_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "K4T (Loader)" = list(SKIN_ICON_STATE = "k4tcargo", SKIN_ICON = CYBORG_ICON_CARGO_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "K4T (Turtleneck)" = list(SKIN_ICON_STATE = "k4tcargo_alt1", SKIN_ICON = CYBORG_ICON_CARGO_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "NiKA" = list(SKIN_ICON_STATE = "fmekacargo", SKIN_ICON = CYBORG_ICON_CARGO_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "NiKO" = list(SKIN_ICON_STATE = "mmekacargo", SKIN_ICON = CYBORG_ICON_CARGO_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15)
+ "Meka" = list(SKIN_ICON_STATE = "mekacargo", SKIN_ICON = CYBORG_ICON_CARGO_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "K4T (Loader)" = list(SKIN_ICON_STATE = "k4tcargo", SKIN_ICON = CYBORG_ICON_CARGO_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "K4T (Turtleneck)" = list(SKIN_ICON_STATE = "k4tcargo_alt1", SKIN_ICON = CYBORG_ICON_CARGO_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "NiKA" = list(SKIN_ICON_STATE = "fmekacargo", SKIN_ICON = CYBORG_ICON_CARGO_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "NiKO" = list(SKIN_ICON_STATE = "mmekacargo", SKIN_ICON = CYBORG_ICON_CARGO_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET)
)
@@ -430,10 +458,10 @@
"Male Booty Syndicate" = list(SKIN_ICON_STATE = "male_bootysyndie", SKIN_ICON = CYBORG_ICON_SYNDIE),
"Mech" = list(SKIN_ICON_STATE = "chesty", SKIN_ICON = CYBORG_ICON_SYNDIE),
/// 32x64 Skins
- "Meka" = list(SKIN_ICON_STATE = "mekasyndi", SKIN_ICON = CYBORG_ICON_SYNDIE_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "K4T" = list(SKIN_ICON_STATE = "k4tsyndi", SKIN_ICON = CYBORG_ICON_SYNDIE_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "NiKA" = list(SKIN_ICON_STATE = "fmekasyndi", SKIN_ICON = CYBORG_ICON_SYNDIE_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "NiKO" = list(SKIN_ICON_STATE = "mmekasyndi", SKIN_ICON = CYBORG_ICON_SYNDIE_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15)
+ "Meka" = list(SKIN_ICON_STATE = "mekasyndi", SKIN_ICON = CYBORG_ICON_SYNDIE_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "K4T" = list(SKIN_ICON_STATE = "k4tsyndi", SKIN_ICON = CYBORG_ICON_SYNDIE_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "NiKA" = list(SKIN_ICON_STATE = "fmekasyndi", SKIN_ICON = CYBORG_ICON_SYNDIE_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "NiKO" = list(SKIN_ICON_STATE = "mmekasyndi", SKIN_ICON = CYBORG_ICON_SYNDIE_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET)
)
/obj/item/robot_model/syndicatejack/rebuild_modules()
@@ -463,7 +491,7 @@
model_select_icon = "ninjaborg"
model_select_alternate_icon = 'modular_skyrat/modules/borgs/icons/screen_cyborg.dmi'
model_traits = list(TRAIT_PUSHIMMUNE, TRAIT_NOFLASH) //No more charging them with a flash and thinking it is a good idea
- hat_offset = 3
+ hat_offset = list("north" = list(0, 3), "south" = list(0, 3), "east" = list(0, 3), "west" = list(0, 3))
borg_skins = list(
/// 32x32 Skins
"Saboteur" = list(SKIN_ICON_STATE = "ninja_engi", SKIN_ICON = CYBORG_ICON_NINJA),
@@ -475,10 +503,10 @@
"BootyBorg" = list(SKIN_ICON_STATE = "bootyninja", SKIN_ICON = CYBORG_ICON_NINJA),
"Male Bootyborg" = list(SKIN_ICON_STATE = "male_bootyninja", SKIN_ICON = CYBORG_ICON_NINJA),
/// 32x64 Skins
- "Meka" = list(SKIN_ICON_STATE = "mekaninja", SKIN_ICON = CYBORG_ICON_NINJA_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "K4T" = list(SKIN_ICON_STATE = "k4tninja", SKIN_ICON = CYBORG_ICON_NINJA_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "NiKA" = list(SKIN_ICON_STATE = "fmekaninja", SKIN_ICON = CYBORG_ICON_NINJA_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "NiKO" = list(SKIN_ICON_STATE = "mmekaninja", SKIN_ICON = CYBORG_ICON_NINJA_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15)
+ "Meka" = list(SKIN_ICON_STATE = "mekaninja", SKIN_ICON = CYBORG_ICON_NINJA_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "K4T" = list(SKIN_ICON_STATE = "k4tninja", SKIN_ICON = CYBORG_ICON_NINJA_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "NiKA" = list(SKIN_ICON_STATE = "fmekaninja", SKIN_ICON = CYBORG_ICON_NINJA_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "NiKO" = list(SKIN_ICON_STATE = "mmekaninja", SKIN_ICON = CYBORG_ICON_NINJA_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET)
)
/obj/item/robot_model/ninja/rebuild_modules()
@@ -547,7 +575,7 @@
model_select_alternate_icon = 'modular_skyrat/modules/borgs/icons/screen_cyborg.dmi'
model_traits = list(TRAIT_PUSHIMMUNE, TRAIT_NOFLASH)
model_traits = list(TRAIT_NEGATES_GRAVITY)
- hat_offset = -4
+ hat_offset = list("north" = list(0, -4), "south" = list(0, -4), "east" = list(0, -4), "west" = list(0, -4))
canDispose = TRUE
borg_skins = list(
"Saboteur" = list(SKIN_ICON_STATE = "ninja_engi", SKIN_ICON = CYBORG_ICON_NINJA),
@@ -559,12 +587,24 @@
"BootyBorg" = list(SKIN_ICON_STATE = "bootyninja", SKIN_ICON = CYBORG_ICON_NINJA),
"Male Bootyborg" = list(SKIN_ICON_STATE = "male_bootyninja", SKIN_ICON = CYBORG_ICON_NINJA),
/// 32x64 Skins
- "Meka" = list(SKIN_ICON_STATE = "mekaninja", SKIN_ICON = CYBORG_ICON_NINJA_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "K4T" = list(SKIN_ICON_STATE = "k4tninja", SKIN_ICON = CYBORG_ICON_NINJA_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "NiKA" = list(SKIN_ICON_STATE = "fmekaninja", SKIN_ICON = CYBORG_ICON_NINJA_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15),
- "NiKO" = list(SKIN_ICON_STATE = "mmekaninja", SKIN_ICON = CYBORG_ICON_NINJA_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), SKIN_HAT_OFFSET = 15)
+ "Meka" = list(SKIN_ICON_STATE = "mekaninja", SKIN_ICON = CYBORG_ICON_NINJA_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "K4T" = list(SKIN_ICON_STATE = "k4tninja", SKIN_ICON = CYBORG_ICON_NINJA_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "NiKA" = list(SKIN_ICON_STATE = "fmekaninja", SKIN_ICON = CYBORG_ICON_NINJA_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET),
+ "NiKO" = list(SKIN_ICON_STATE = "mmekaninja", SKIN_ICON = CYBORG_ICON_NINJA_TALL, SKIN_FEATURES = list(TRAIT_R_UNIQUEWRECK, TRAIT_R_UNIQUETIP, TRAIT_R_TALL), TALL_HAT_OFFSET)
)
/obj/item/robot_model/ninja_saboteur/do_transform_animation()
. = ..()
to_chat(loc, span_userdanger("While you have picked the saboteur model, that doesn't mean you are allowed to sabotage the station by delaminating the supermatter or opening all the doors to the armory, you should still ahelp to ask the permission to do that and the reason for it."))
+
+#undef TALL_HAT_OFFSET
+#undef ZOOMBA_HAT_OFFSET
+#undef DROID_HAT_OFFSET
+#undef BORGI_HAT_OFFSET
+#undef PUP_HAT_OFFSET
+#undef BLADE_HAT_OFFSET
+#undef VALE_HAT_OFFSET
+#undef DRAKE_HAT_OFFSET
+#undef HOUND_HAT_OFFSET
+#undef OTIE_HAT_OFFSET
+#undef ALINA_HAT_OFFSET
diff --git a/modular_skyrat/modules/borgs/code/robot_upgrade.dm b/modular_skyrat/modules/borgs/code/robot_upgrade.dm
index ba7103a4750c4b..3b61fd70535582 100644
--- a/modular_skyrat/modules/borgs/code/robot_upgrade.dm
+++ b/modular_skyrat/modules/borgs/code/robot_upgrade.dm
@@ -8,7 +8,7 @@
/obj/item/borg/upgrade/surgerytools
name = "medical cyborg advanced surgery tools"
desc = "An upgrade to the Medical model cyborg's surgery loadout, replacing non-advanced tools with their advanced counterpart."
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_medical"
require_model = TRUE
model_type = list(/obj/item/robot_model/medical)
model_flags = BORG_MODEL_MEDICAL
@@ -56,7 +56,7 @@
/obj/item/borg/upgrade/advanced_materials
name = "engineering advanced materials processor"
desc = "allows a cyborg to synthesize and store advanced materials"
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_engineer"
model_type = list(/obj/item/robot_model/engineering)
model_flags = BORG_MODEL_ENGINEERING
@@ -79,7 +79,7 @@
/obj/item/borg/upgrade/welder
name = "mining cyborg welder upgrade"
desc = "A normal welder with a larger tank for cyborgs."
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_engineer"
require_model = TRUE
model_type = list(/obj/item/robot_model/miner)
model_flags = BORG_MODEL_MINER
@@ -106,7 +106,8 @@
/obj/item/borg/upgrade/better_clamp
name = "improved integrated hydraulic clamp"
desc = "An improved hydraulic clamp to allow for bigger packages to be picked up as well!"
- icon_state = "cyborg_upgrade3"
+ icon = 'modular_skyrat/modules/borgs/icons/robot_items.dmi'
+ icon_state = "module_cargo"
require_model = TRUE
model_type = list(/obj/item/robot_model/cargo)
model_flags = BORG_MODEL_CARGO
@@ -127,7 +128,8 @@
/obj/item/borg/upgrade/cargo_tele
name = "cargo teleporter module"
desc = "Allows you to upgrade a cargo cyborg with the cargo teleporter"
- icon_state = "cyborg_upgrade3"
+ icon = 'modular_skyrat/modules/borgs/icons/robot_items.dmi'
+ icon_state = "module_cargo"
require_model = TRUE
model_type = list(/obj/item/robot_model/cargo)
model_flags = BORG_MODEL_CARGO
@@ -148,7 +150,8 @@
/obj/item/borg/upgrade/forging
name = "cyborg forging module"
desc = "Allows you to upgrade a cargo cyborg with forging gear"
- icon_state = "cyborg_upgrade3"
+ icon = 'modular_skyrat/modules/borgs/icons/robot_items.dmi'
+ icon_state = "module_cargo"
require_model = TRUE
model_type = list(/obj/item/robot_model/cargo)
model_flags = BORG_MODEL_CARGO
@@ -178,7 +181,7 @@
/obj/item/borg/upgrade/artistic
name = "borg artistic module"
desc = "Allows you to upgrade a cyborg with tools for creating art."
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_general"
items_to_add = list(
/obj/item/pen,
/obj/item/toy/crayon/spraycan/borg,
@@ -202,7 +205,7 @@
/obj/item/borg/upgrade/botany
name = "botanical operator upgrade"
desc = "Provides an assortement of tools for dealing with plants."
- icon_state = "cyborg_upgrade2"
+ icon_state = "module_service"
require_model = TRUE
model_type = list(/obj/item/robot_model/service)
model_flags = BORG_MODEL_SERVICE
@@ -223,7 +226,7 @@
/obj/item/borg/upgrade/borg_shapeshifter
name = "cyborg shapeshifter module"
desc = "An experimental device which allows a cyborg to disguise themself into another type of cyborg."
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_general"
items_to_add = list(/obj/item/borg_shapeshifter)
@@ -231,17 +234,34 @@
/obj/item/borg/upgrade/affectionmodule
name = "borg affection module"
desc = "A module that upgrades the ability of borgs to display affection."
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_peace"
items_to_add = list(/obj/item/quadborg_tongue,
/obj/item/quadborg_nose)
-/obj/item/borg/upgrade/affectionmodule/action(mob/living/silicon/robot/borg)
- if(!(TRAIT_R_WIDE in borg.model.model_features))
- to_chat(usr, span_warning("This unit's chassis does not support this module."))
- return FALSE
- . = ..()
-
+/obj/item/quadborg_tongue/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ var/mob/living/silicon/robot/borg = user
+ var/mob/living/mob = interacting_with
+ if(!istype(mob))
+ return ITEM_INTERACT_BLOCKING
+ if(HAS_TRAIT(interacting_with, TRAIT_AFFECTION_AVERSION)) // Checks for Affection Aversion trait
+ to_chat(user, span_warning("ERROR: [interacting_with] is on the Do Not Lick registry!"))
+ return ITEM_INTERACT_BLOCKING
+ if(check_zone(borg.zone_selected) == "head")
+ borg.visible_message(span_warning("\the [borg] affectionally licks \the [mob]'s face!"), span_notice("You affectionally lick \the [mob]'s face!"))
+ else
+ borg.visible_message(span_warning("\the [borg] affectionally licks \the [mob]!"), span_notice("You affectionally lick \the [mob]!"))
+ playsound(borg, 'sound/effects/attackblob.ogg', 50, 1)
+ return ITEM_INTERACT_SUCCESS
+
+/obj/item/quadborg_nose/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ if(HAS_TRAIT(interacting_with, TRAIT_AFFECTION_AVERSION)) // Checks for Affection Aversion trait
+ to_chat(user, span_warning("ERROR: [interacting_with] is on the No Nosing registry!"))
+ return ITEM_INTERACT_BLOCKING
+
+ do_attack_animation(interacting_with, null, src)
+ user.visible_message(span_notice("[user] [pick("nuzzles", "pushes", "boops")] \the [interacting_with.name] with their nose!"))
+ return ITEM_INTERACT_SUCCESS
/// The Shrinkening
/mob/living/silicon/robot
@@ -250,7 +270,7 @@
/obj/item/borg/upgrade/shrink
name = "borg shrinker"
desc = "A cyborg resizer, it makes a cyborg small."
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_general"
/obj/item/borg/upgrade/shrink/action(mob/living/silicon/robot/borg, user = usr)
. = ..()
@@ -292,7 +312,7 @@
/obj/item/borg/upgrade/transform/syndicatejack
name = "borg module picker (Syndicate)"
desc = "Allows you to to turn a cyborg into a experimental syndicate cyborg."
- icon_state = "cyborg_upgrade3"
+ icon_state = "module_illegal"
new_model = /obj/item/robot_model/syndicatejack
/obj/item/borg/upgrade/transform/syndicatejack/action(mob/living/silicon/robot/cyborg, user = usr) // Only usable on emagged cyborgs. In exchange. makes you unable to get locked down or detonated.
@@ -303,7 +323,8 @@
/obj/item/borg/upgrade/dominatrixmodule
name = "borg dominatrix module"
desc = "A module that greatly upgrades the ability of borgs to display affection."
- icon_state = "cyborg_upgrade3"
+ icon = 'modular_skyrat/modules/borgs/icons/robot_items.dmi'
+ icon_state = "module_lust"
custom_price = 0
items_to_add = list(/obj/item/kinky_shocker,
diff --git a/modular_skyrat/modules/borgs/code/update_icons.dm b/modular_skyrat/modules/borgs/code/update_icons.dm
index 704ac198a47daf..de19f1de878ba5 100644
--- a/modular_skyrat/modules/borgs/code/update_icons.dm
+++ b/modular_skyrat/modules/borgs/code/update_icons.dm
@@ -50,10 +50,8 @@
icon_state = "[model.cyborg_base_icon]"
cut_overlays()
- if(hat) // Don't forget your hat
- var/mutable_appearance/head_overlay = hat.build_worn_icon(default_layer = 20)
- head_overlay.pixel_y += (hat_offset - 14)
- add_overlay(head_overlay)
+ if(hat_overlay) // Don't forget your hat
+ add_overlay(hat_overlay)
else
icon_state = "[model.cyborg_base_icon]"
diff --git a/modular_skyrat/modules/borgs/icons/robot_items.dmi b/modular_skyrat/modules/borgs/icons/robot_items.dmi
index 2293dae78b32f2..31c6eff46c5e16 100644
Binary files a/modular_skyrat/modules/borgs/icons/robot_items.dmi and b/modular_skyrat/modules/borgs/icons/robot_items.dmi differ
diff --git a/modular_skyrat/modules/bsrpd/code/bsrpd.dm b/modular_skyrat/modules/bsrpd/code/bsrpd.dm
index 23daac59efa954..ee88f7719158db 100644
--- a/modular_skyrat/modules/bsrpd/code/bsrpd.dm
+++ b/modular_skyrat/modules/bsrpd/code/bsrpd.dm
@@ -54,21 +54,21 @@
playsound(get_turf(src), 'sound/machines/click.ogg', 50, TRUE)
return CLICK_ACTION_SUCCESS
-/obj/item/pipe_dispenser/bluespace/afterattack(atom/target, mob/user, prox)
- if(prox || !remote_piping_toggle) // If we are in proximity to the target or have our safety on, don't use charge and don't call this shitcode.
- return ..()
+/obj/item/pipe_dispenser/bluespace/ranged_interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ if(!remote_piping_toggle) // If we are in proximity to the target or have our safety on, don't use charge and don't call this shitcode.
+ return NONE
if(current_capacity < ranged_use_cost)
to_chat(user, span_warning("The [src] lacks the charge to do that."))
- return FALSE
+ return ITEM_INTERACT_BLOCKING
if(!in_use)
- user.Beam(target, icon_state = "rped_upgrade", time = 1 SECONDS)
+ user.Beam(interacting_with, icon_state = "rped_upgrade", time = 1 SECONDS)
in_use = TRUE // So people can't just spam click and get more uses
addtimer(VARSET_CALLBACK(src, in_use, FALSE), 1 SECONDS, TIMER_UNIQUE)
- if(pre_attack(target, user))
+ if(pre_attack(interacting_with, user))
current_capacity -= ranged_use_cost
- return TRUE
+ return ITEM_INTERACT_SUCCESS
- return FALSE
+ return ITEM_INTERACT_BLOCKING
#undef BSRPD_CAPACITY_MAX
#undef BSRPD_CAPACITY_USE
diff --git a/modular_skyrat/modules/cargo/code/packs.dm b/modular_skyrat/modules/cargo/code/packs.dm
index 1d9513a85c9c14..423ffec0c2d618 100644
--- a/modular_skyrat/modules/cargo/code/packs.dm
+++ b/modular_skyrat/modules/cargo/code/packs.dm
@@ -42,6 +42,54 @@
for(var/i in 1 to 3)
new /mob/living/basic/pet/chinchilla(.)
+
+/datum/supply_pack/critter/fennec
+ name = "Fennec Crate"
+ desc = "For when you need someone that can really listen to you. \
+ Contains two fennecs. \
+ Warning, does not mean the fennecs will actually listen to you."
+ cost = CARGO_CRATE_VALUE * 7
+ contains = list(/mob/living/basic/pet/cat/fennec = 2)
+ crate_name = "fennec crate"
+
+/datum/supply_pack/critter/pitbull
+ name = "Pitbull Crate"
+ desc = "Contains three pitbulls. WARNING: These are NOT pedigree studs, and thus may be less than friendly."
+ cost = CARGO_CRATE_VALUE * 7
+ contains = list(
+ /mob/living/basic/gorilla/pitbull,
+ )
+ crate_name = "pitbull crate"
+
+/datum/supply_pack/critter/pitbull/generate()
+ . = ..()
+ for(var/i in 1 to 3)
+ new /mob/living/basic/gorilla/pitbull(.)
+
+/datum/supply_pack/critter/pitbull/pimpy
+ name = "Pedigree Stud Pitbull Crate"
+ desc = "Contains three pitbulls. Verified at the top of Mount Bullmore to be Pedigree Studs.."
+ cost = CARGO_CRATE_VALUE * 9
+ contains = list(
+ /mob/living/basic/pet/dog/pitbull,
+ )
+ crate_name = "pedigree stud pitbull crate"
+
+/datum/supply_pack/critter/pitbull/generate()
+ . = ..()
+ for(var/i in 1 to 3)
+ new /mob/living/basic/pet/dog/pitbull(.)
+
+/datum/supply_pack/critter/redpanda
+ name = "Red Panda Crate"
+ desc = "Your station needs a little more Wah? Some more red tails? Order this. You'll never escape your sadness."
+ cost = CARGO_CRATE_VALUE * 4
+ contains = list(
+ /mob/living/basic/pet/fox/redpanda,
+ /mob/living/basic/pet/fox/redpanda,
+ )
+ crate_name = "wah crate"
+
/*
* MEDICAL
*/
diff --git a/modular_skyrat/modules/cargo_teleporter/code/cargo_teleporter.dm b/modular_skyrat/modules/cargo_teleporter/code/cargo_teleporter.dm
index 409ddb63eb94cf..6107aa9fdfdb6e 100644
--- a/modular_skyrat/modules/cargo_teleporter/code/cargo_teleporter.dm
+++ b/modular_skyrat/modules/cargo_teleporter/code/cargo_teleporter.dm
@@ -38,21 +38,17 @@ GLOBAL_LIST_EMPTY(cargo_marks)
qdel(destroy_children)
return CLICK_ACTION_SUCCESS
-/obj/item/cargo_teleporter/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
- if(!proximity_flag)
- return ..()
- if(target == src)
- return ..()
+/obj/item/cargo_teleporter/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
if(!COOLDOWN_FINISHED(src, use_cooldown))
to_chat(user, span_warning("[src] is still on cooldown!"))
- return
+ return ITEM_INTERACT_BLOCKING
var/choice = tgui_input_list(user, "Select which cargo mark to teleport the items to?", "Cargo Mark Selection", GLOB.cargo_marks)
if(!choice)
- return ..()
- if(get_dist(user, target) > 1)
- return
+ return ITEM_INTERACT_BLOCKING
+ if(get_dist(user, interacting_with) > 1)
+ return ITEM_INTERACT_BLOCKING
var/turf/moving_turf = get_turf(choice)
- var/turf/target_turf = get_turf(target)
+ var/turf/target_turf = get_turf(interacting_with)
for(var/check_content in target_turf.contents)
if(isobserver(check_content))
continue
@@ -68,6 +64,7 @@ GLOBAL_LIST_EMPTY(cargo_marks)
do_teleport(movable_content, moving_turf, asoundout = 'sound/magic/Disable_Tech.ogg')
new /obj/effect/decal/cleanable/ash(target_turf)
COOLDOWN_START(src, use_cooldown, 8 SECONDS)
+ return ITEM_INTERACT_SUCCESS
/datum/design/cargo_teleporter
name = "Cargo Teleporter"
diff --git a/modular_skyrat/modules/clock_cult/code/items/replica_fabricator.dm b/modular_skyrat/modules/clock_cult/code/items/replica_fabricator.dm
index cffb660d9bc74d..1a0a53e83b00d7 100644
--- a/modular_skyrat/modules/clock_cult/code/items/replica_fabricator.dm
+++ b/modular_skyrat/modules/clock_cult/code/items/replica_fabricator.dm
@@ -46,45 +46,45 @@
. += span_brass("Right Click in-hand to fabricate bronze sheets.")
-/obj/item/clockwork/replica_fabricator/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
- . = ..()
- if(!proximity_flag || !IS_CLOCK(user))
- return
+/obj/item/clockwork/replica_fabricator/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ if(!IS_CLOCK(user))
+ return NONE
- if(istype(target, /obj/item/stack/sheet)) // If it's an item, handle it seperately
- attempt_convert_materials(target, user)
- return
+ if(istype(interacting_with, /obj/item/stack/sheet)) // If it's an item, handle it seperately
+ attempt_convert_materials(interacting_with, user)
+ return ITEM_INTERACT_SUCCESS
- if(!selected_output || !isopenturf(target)) // Now we handle objects
- return
+ if(!selected_output || !isopenturf(interacting_with)) // Now we handle objects
+ return ITEM_INTERACT_BLOCKING
- var/turf/creation_turf = get_turf(target)
+ var/turf/creation_turf = get_turf(interacting_with)
if(locate(selected_output.to_create_path) in creation_turf)
to_chat(user, span_clockyellow("There is already one of these on this tile!"))
- return
+ return ITEM_INTERACT_BLOCKING
if(power < selected_output.cost)
- to_chat(user, span_clockyellow("[src] needs at least [display_energy(selected_output.cost)] of power to create this."))
- return
+ to_chat(user, span_clockyellow("[src] needs at least [selected_output.cost]W of power to create this."))
+ return ITEM_INTERACT_BLOCKING
var/obj/effect/temp_visual/ratvar/constructing_effect/effect = new(creation_turf, selected_output.creation_delay)
- if(!do_after(user, selected_output.creation_delay, target))
+ if(!do_after(user, selected_output.creation_delay, interacting_with))
qdel(effect)
- return
+ return ITEM_INTERACT_BLOCKING
if(power < selected_output.cost) // Just in case
- return
+ return ITEM_INTERACT_BLOCKING
power -= selected_output.cost
var/atom/created
if(selected_output.to_create_path)
- created = new selected_output.to_create_path(get_turf(target))
+ created = new selected_output.to_create_path(get_turf(interacting_with))
selected_output.on_create(created, creation_turf, user)
+ return ITEM_INTERACT_SUCCESS
/obj/item/clockwork/replica_fabricator/attackby(obj/item/attacking_item, mob/user, params)
diff --git a/modular_skyrat/modules/clock_cult/code/items/weaponry.dm b/modular_skyrat/modules/clock_cult/code/items/weaponry.dm
index 1f40edc610195e..cd36dc95846899 100644
--- a/modular_skyrat/modules/clock_cult/code/items/weaponry.dm
+++ b/modular_skyrat/modules/clock_cult/code/items/weaponry.dm
@@ -171,11 +171,10 @@
AddElement(/datum/element/clockwork_description, "Firing from brass tiles will halve the time that it takes to recharge a bolt.")
AddElement(/datum/element/clockwork_pickup)
-/obj/item/gun/ballistic/bow/clockwork/afterattack(atom/target, mob/living/user, flag, params, passthrough)
+/obj/item/gun/ballistic/bow/clockwork/try_fire_gun(atom/target, mob/living/user, params)
if(!drawn || !chambered)
to_chat(user, span_notice("[src] must be drawn to fire a shot!"))
- return
-
+ return FALSE
return ..()
/obj/item/gun/ballistic/bow/clockwork/shoot_live_shot(mob/living/user, pointblank, atom/pbtarget, message)
diff --git a/modular_skyrat/modules/clock_cult/code/structures/traps/trap.dm b/modular_skyrat/modules/clock_cult/code/structures/traps/trap.dm
index aec6c553653be0..dc6aa45b3cdc63 100644
--- a/modular_skyrat/modules/clock_cult/code/structures/traps/trap.dm
+++ b/modular_skyrat/modules/clock_cult/code/structures/traps/trap.dm
@@ -18,12 +18,12 @@
place_trap(get_turf(src), user)
-/obj/item/clockwork/trap_placer/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
- . = ..()
- if(!IS_CLOCK(user) || !isturf(target) || !proximity_flag)
- return
+/obj/item/clockwork/trap_placer/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ if(!IS_CLOCK(user) || !isturf(interacting_with))
+ return NONE
- place_trap(target, user)
+ place_trap(interacting_with, user)
+ return ITEM_INTERACT_SUCCESS
/obj/item/clockwork/trap_placer/proc/place_trap(atom/target, mob/user)
diff --git a/modular_skyrat/modules/colony_fabricator/code/construction/doors.dm b/modular_skyrat/modules/colony_fabricator/code/construction/doors.dm
index 3d123341a577e9..b6055221f2f12b 100644
--- a/modular_skyrat/modules/colony_fabricator/code/construction/doors.dm
+++ b/modular_skyrat/modules/colony_fabricator/code/construction/doors.dm
@@ -9,15 +9,11 @@
density = FALSE
opacity = FALSE
-/obj/machinery/door/poddoor/shutters/colony_fabricator/do_animate(animation)
+/obj/machinery/door/poddoor/shutters/colony_fabricator/animation_effects(animation)
switch(animation)
- if("opening")
- flick("opening", src)
- icon_state = "open"
+ if(DOOR_OPENING_ANIMATION)
playsound(src, animation_sound, 30, TRUE)
- if("closing")
- flick("closing", src)
- icon_state = "closed"
+ if(DOOR_CLOSING_ANIMATION)
playsound(src, animation_sound, 30, TRUE)
/obj/item/flatpacked_machine/shutter_kit
diff --git a/modular_skyrat/modules/colony_fabricator/code/construction/turfs.dm b/modular_skyrat/modules/colony_fabricator/code/construction/turfs.dm
index 536b3c81b47174..8548ead050237f 100644
--- a/modular_skyrat/modules/colony_fabricator/code/construction/turfs.dm
+++ b/modular_skyrat/modules/colony_fabricator/code/construction/turfs.dm
@@ -43,10 +43,8 @@ GLOBAL_LIST_INIT(plastic_wall_panel_recipes, list(
/obj/item/stack/sheet/plastic_wall_panel/interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers)
if(!isopenturf(interacting_with))
- return ITEM_INTERACT_SKIP_TO_ATTACK
+ return NONE
var/turf/open/build_on = interacting_with
- if(!user.Adjacent(build_on))
- return ITEM_INTERACT_BLOCKING
if(isgroundlessturf(build_on))
user.balloon_alert(user, "can't place it here!")
return ITEM_INTERACT_BLOCKING
@@ -65,7 +63,7 @@ GLOBAL_LIST_INIT(plastic_wall_panel_recipes, list(
user.balloon_alert(user, "not enough material!")
return ITEM_INTERACT_BLOCKING
build_on.place_on_top(walltype, flags = CHANGETURF_INHERIT_AIR)
- return ITEM_INTERACT_BLOCKING
+ return ITEM_INTERACT_SUCCESS
/obj/item/stack/sheet/plastic_wall_panel/get_main_recipes()
. = ..()
diff --git a/modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm b/modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm
index 1b086604ec862c..58c091d1a90a5b 100644
--- a/modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm
+++ b/modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm
@@ -29,15 +29,15 @@
/datum/armament_entry/company_import/deforest/first_aid_kit/first_responder
item_type = /obj/item/storage/backpack/duffelbag/deforest_surgical/stocked
- cost = PAYCHECK_COMMAND * 6
+ cost = PAYCHECK_COMMAND * 10.5
/datum/armament_entry/company_import/deforest/first_aid_kit/orange_satchel
item_type = /obj/item/storage/backpack/duffelbag/deforest_medkit/stocked
- cost = PAYCHECK_COMMAND * 8
+ cost = PAYCHECK_COMMAND * 9.5
/datum/armament_entry/company_import/deforest/first_aid_kit/technician_satchel
item_type = /obj/item/storage/backpack/duffelbag/deforest_paramedic/stocked
- cost = PAYCHECK_COMMAND * 7
+ cost = PAYCHECK_COMMAND * 11.75
// Basic first aid supplies like gauze, sutures, mesh, so on
diff --git a/modular_skyrat/modules/company_imports/code/objects/hud_glasses.dm b/modular_skyrat/modules/company_imports/code/objects/hud_glasses.dm
index fdb9df70e32850..406c96326b67b5 100644
--- a/modular_skyrat/modules/company_imports/code/objects/hud_glasses.dm
+++ b/modular_skyrat/modules/company_imports/code/objects/hud_glasses.dm
@@ -4,7 +4,7 @@
icon = 'modular_skyrat/modules/company_imports/icons/hud_goggles.dmi'
worn_icon = 'modular_skyrat/modules/company_imports/icons/hud_goggles_worn.dmi'
icon_state = "permithud"
- hud_type = DATA_HUD_PERMIT
+ hud_types = list(DATA_HUD_PERMIT)
/obj/item/clothing/glasses/hud/gun_permit/sunglasses
name = "permit HUD sunglasses"
diff --git a/modular_skyrat/modules/company_imports/code/objects/nakamura_modsuits/plate_compression_tech.dm b/modular_skyrat/modules/company_imports/code/objects/nakamura_modsuits/plate_compression_tech.dm
index ff9ab5becd5f63..7a6b808374ea9c 100644
--- a/modular_skyrat/modules/company_imports/code/objects/nakamura_modsuits/plate_compression_tech.dm
+++ b/modular_skyrat/modules/company_imports/code/objects/nakamura_modsuits/plate_compression_tech.dm
@@ -1,2 +1,2 @@
/datum/uplink_item/suits/plate_compression
- illegal_tech = FALSE
+ uplink_item_flags = NONE
diff --git a/modular_skyrat/modules/conveyor_sorter/code/conveyor_sorter.dm b/modular_skyrat/modules/conveyor_sorter/code/conveyor_sorter.dm
index 00236472960d80..495de7ff9f19ce 100644
--- a/modular_skyrat/modules/conveyor_sorter/code/conveyor_sorter.dm
+++ b/modular_skyrat/modules/conveyor_sorter/code/conveyor_sorter.dm
@@ -35,23 +35,20 @@
new_cs.sorting_list = current_sort
spawned_sorters += new_cs
-/obj/item/conveyor_sorter/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
- if(target == src)
- return ..()
- if(!proximity_flag)
- return ..()
- if(!ismovable(target))
- return ..()
- if(istype(target, /obj/effect/decal/conveyor_sorter))
- return
- if(is_type_in_list(target, current_sort))
- to_chat(user, span_warning("[target] is already in [src]'s sorting list!"))
- return
+/obj/item/conveyor_sorter/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ if(!ismovable(interacting_with))
+ return NONE
+ if(istype(interacting_with, /obj/effect/decal/conveyor_sorter))
+ return NONE
+ if(is_type_in_list(interacting_with, current_sort))
+ to_chat(user, span_warning("[interacting_with] is already in [src]'s sorting list!"))
+ return ITEM_INTERACT_BLOCKING
if(length(current_sort) >= max_items)
to_chat(user, span_warning("[src] already has [max_items] things within the sorting list!"))
- return
- current_sort += target.type
- to_chat(user, span_notice("[target] has been added to [src]'s sorting list."))
+ return ITEM_INTERACT_BLOCKING
+ current_sort += interacting_with.type
+ to_chat(user, span_notice("[interacting_with] has been added to [src]'s sorting list."))
+ return ITEM_INTERACT_SUCCESS
/obj/item/conveyor_sorter/click_alt(mob/user)
visible_message("[src] pings, resetting its sorting list!")
diff --git a/modular_skyrat/modules/cortical_borer/code/cortical_borer_abilities.dm b/modular_skyrat/modules/cortical_borer/code/abilities/_borer_abilities.dm
similarity index 77%
rename from modular_skyrat/modules/cortical_borer/code/cortical_borer_abilities.dm
rename to modular_skyrat/modules/cortical_borer/code/abilities/_borer_abilities.dm
index 8badbebfca4271..2ee3889f715420 100644
--- a/modular_skyrat/modules/cortical_borer/code/cortical_borer_abilities.dm
+++ b/modular_skyrat/modules/cortical_borer/code/abilities/_borer_abilities.dm
@@ -4,9 +4,10 @@
#define BLOOD_CHEM_OBJECTIVE 3
// Parent of all borer actions
-/datum/action/cooldown/borer
+/datum/action/cooldown/mob_cooldown/borer
button_icon = 'modular_skyrat/modules/cortical_borer/icons/actions.dmi'
cooldown_time = 0
+ shared_cooldown = NONE
/// How many chemicals this costs
var/chemical_cost = 0
/// How many chem evo points are needed to use this ability
@@ -14,7 +15,7 @@
/// How many stat evo points are needed to use this ability
var/stat_evo_points = 0
-/datum/action/cooldown/borer/New(Target, original)
+/datum/action/cooldown/mob_cooldown/borer/New(Target, original)
. = ..()
var/compiled_string = ""
if(chemical_cost)
@@ -25,7 +26,7 @@
compiled_string += " ([stat_evo_points] stat point[stat_evo_points == 1 ? "" : "s"])"
name = "[initial(name)][compiled_string]"
-/datum/action/cooldown/borer/Trigger(trigger_flags, atom/target)
+/datum/action/cooldown/mob_cooldown/borer/Trigger(trigger_flags, atom/target)
. = ..()
if(!iscorticalborer(owner))
to_chat(owner, span_warning("You must be a cortical borer to use this action!"))
@@ -46,11 +47,12 @@
return . == FALSE ? FALSE : TRUE //. can be null, true, or false. There's a difference between null and false here
//inject chemicals into your host
-/datum/action/cooldown/borer/inject_chemical
+/datum/action/cooldown/mob_cooldown/borer/inject_chemical
name = "Open Chemical Injector"
button_icon_state = "chemical"
+ click_to_activate = FALSE
-/datum/action/cooldown/borer/inject_chemical/Trigger(trigger_flags, atom/target)
+/datum/action/cooldown/mob_cooldown/borer/inject_chemical/Trigger(trigger_flags, atom/target)
. = ..()
if(!.)
return FALSE
@@ -63,13 +65,13 @@
return
ui_interact(owner)
-/datum/action/cooldown/borer/inject_chemical/ui_interact(mob/user, datum/tgui/ui)
+/datum/action/cooldown/mob_cooldown/borer/inject_chemical/ui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
ui = new(user, src, "BorerChem", name)
ui.open()
-/datum/action/cooldown/borer/inject_chemical/ui_data(mob/user)
+/datum/action/cooldown/mob_cooldown/borer/inject_chemical/ui_data(mob/user)
var/list/data = list()
var/mob/living/basic/cortical_borer/cortical_owner = owner
data["amount"] = cortical_owner.injection_rate_current
@@ -89,7 +91,7 @@
return data
-/datum/action/cooldown/borer/inject_chemical/ui_act(action, params)
+/datum/action/cooldown/mob_cooldown/borer/inject_chemical/ui_act(action, params)
. = ..()
if(.)
return
@@ -124,10 +126,10 @@
cortical_owner.human_host.log_message(logging_text, LOG_GAME)
. = TRUE
-/datum/action/cooldown/borer/inject_chemical/ui_state(mob/user)
+/datum/action/cooldown/mob_cooldown/borer/inject_chemical/ui_state(mob/user)
return GLOB.always_state
-/datum/action/cooldown/borer/inject_chemical/ui_status(mob/user, datum/ui_state/state)
+/datum/action/cooldown/mob_cooldown/borer/inject_chemical/ui_status(mob/user, datum/ui_state/state)
if(!iscorticalborer(user))
return UI_CLOSE
@@ -137,23 +139,24 @@
return UI_CLOSE
return ..()
-/datum/action/cooldown/borer/evolution_tree
+/datum/action/cooldown/mob_cooldown/borer/evolution_tree
name = "Open Evolution Tree"
button_icon_state = "newability"
+ click_to_activate = FALSE
-/datum/action/cooldown/borer/evolution_tree/Trigger(trigger_flags, atom/target)
+/datum/action/cooldown/mob_cooldown/borer/evolution_tree/Trigger(trigger_flags, atom/target)
. = ..()
if(!.)
return FALSE
ui_interact(owner)
-/datum/action/cooldown/borer/evolution_tree/ui_interact(mob/user, datum/tgui/ui)
+/datum/action/cooldown/mob_cooldown/borer/evolution_tree/ui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
ui = new(user, src, "BorerEvolution", name)
ui.open()
-/datum/action/cooldown/borer/evolution_tree/ui_data(mob/user)
+/datum/action/cooldown/mob_cooldown/borer/evolution_tree/ui_data(mob/user)
var/list/data = list()
var/static/list/path_to_color = list(
@@ -201,7 +204,7 @@
data["learnedEvolution"] += list(evo_data)
return data
-/datum/action/cooldown/borer/evolution_tree/ui_act(action, params)
+/datum/action/cooldown/mob_cooldown/borer/evolution_tree/ui_act(action, params)
. = ..()
if(.)
return
@@ -223,14 +226,15 @@
cortical_owner.stat_evolution -= initial(to_evolve_path.evo_cost)
return TRUE
-/datum/action/cooldown/borer/evolution_tree/ui_state(mob/user)
+/datum/action/cooldown/mob_cooldown/borer/evolution_tree/ui_state(mob/user)
return GLOB.always_state
-/datum/action/cooldown/borer/learn_focus
+/datum/action/cooldown/mob_cooldown/borer/learn_focus
name = "Learn Focus"
button_icon_state = "getfocus"
+ click_to_activate = FALSE
-/datum/action/cooldown/borer/learn_focus/Trigger(trigger_flags, atom/target)
+/datum/action/cooldown/mob_cooldown/borer/learn_focus/Trigger(trigger_flags, atom/target)
. = ..()
if(!.)
return FALSE
@@ -263,12 +267,13 @@
owner.balloon_alert(owner, "focus learned successfully")
StartCooldown()
-/datum/action/cooldown/borer/learn_bloodchemical
+/datum/action/cooldown/mob_cooldown/borer/learn_bloodchemical
name = "Learn Chemical from Blood"
button_icon_state = "bloodchem"
chemical_evo_points = 5
+ click_to_activate = FALSE
-/datum/action/cooldown/borer/learn_bloodchemical/Trigger(trigger_flags, atom/target)
+/datum/action/cooldown/mob_cooldown/borer/learn_bloodchemical/Trigger(trigger_flags, atom/target)
. = ..()
if(!.)
return FALSE
@@ -309,12 +314,13 @@
StartCooldown()
//become stronger by learning new chemicals
-/datum/action/cooldown/borer/upgrade_chemical
+/datum/action/cooldown/mob_cooldown/borer/upgrade_chemical
name = "Learn New Chemical"
button_icon_state = "bloodlevel"
chemical_evo_points = 1
+ click_to_activate = FALSE
-/datum/action/cooldown/borer/upgrade_chemical/Trigger(trigger_flags, atom/target)
+/datum/action/cooldown/mob_cooldown/borer/upgrade_chemical/Trigger(trigger_flags, atom/target)
. = ..()
if(!.)
return FALSE
@@ -344,12 +350,13 @@
StartCooldown()
//become stronger by affecting the stats
-/datum/action/cooldown/borer/upgrade_stat
+/datum/action/cooldown/mob_cooldown/borer/upgrade_stat
name = "Become Stronger"
button_icon_state = "level"
stat_evo_points = 1
+ click_to_activate = FALSE
-/datum/action/cooldown/borer/upgrade_stat/Trigger(trigger_flags, atom/target)
+/datum/action/cooldown/mob_cooldown/borer/upgrade_stat/Trigger(trigger_flags, atom/target)
. = ..()
if(!.)
return FALSE
@@ -375,11 +382,12 @@
StartCooldown()
//go between either hiding behind tables or behind mobs
-/datum/action/cooldown/borer/toggle_hiding
+/datum/action/cooldown/mob_cooldown/borer/toggle_hiding
name = "Toggle Hiding"
button_icon_state = "hide"
+ click_to_activate = FALSE
-/datum/action/cooldown/borer/toggle_hiding/Trigger(trigger_flags, atom/target)
+/datum/action/cooldown/mob_cooldown/borer/toggle_hiding/Trigger(trigger_flags, atom/target)
. = ..()
if(!.)
return FALSE
@@ -396,12 +404,12 @@
StartCooldown()
//to paralyze people
-/datum/action/cooldown/borer/fear_human
+/datum/action/cooldown/mob_cooldown/borer/fear_human
name = "Incite Fear"
cooldown_time = 12 SECONDS
button_icon_state = "fear"
-/datum/action/cooldown/borer/fear_human/Trigger(trigger_flags, atom/target)
+/datum/action/cooldown/mob_cooldown/borer/fear_human/Trigger(trigger_flags, atom/target)
. = ..()
if(!.)
return FALSE
@@ -435,7 +443,7 @@
incite_fear(choose_fear)
StartCooldown()
-/datum/action/cooldown/borer/fear_human/proc/incite_fear(mob/living/carbon/human/singular_fear)
+/datum/action/cooldown/mob_cooldown/borer/fear_human/proc/incite_fear(mob/living/carbon/human/singular_fear)
var/mob/living/basic/cortical_borer/cortical_owner = owner
to_chat(singular_fear, span_warning("Something glares menacingly at you!"))
singular_fear.Paralyze(7 SECONDS)
@@ -446,7 +454,7 @@
cortical_owner.log_message(logging_text, LOG_GAME)
singular_fear.log_message(logging_text, LOG_GAME)
-/datum/action/cooldown/borer/fear_human/proc/incite_internal_fear()
+/datum/action/cooldown/mob_cooldown/borer/fear_human/proc/incite_internal_fear()
var/mob/living/basic/cortical_borer/cortical_owner = owner
owner.balloon_alert(owner, "fear incited into host")
cortical_owner.human_host.Paralyze(10 SECONDS)
@@ -459,12 +467,13 @@
cortical_owner.human_host.log_message(logging_text, LOG_GAME)
//to check the health of the human
-/datum/action/cooldown/borer/check_blood
+/datum/action/cooldown/mob_cooldown/borer/check_blood
name = "Check Blood"
cooldown_time = 5 SECONDS
button_icon_state = "blood"
+ click_to_activate = FALSE
-/datum/action/cooldown/borer/check_blood/Trigger(trigger_flags, atom/target)
+/datum/action/cooldown/mob_cooldown/borer/check_blood/Trigger(trigger_flags, atom/target)
. = ..()
if(!.)
return FALSE
@@ -479,121 +488,14 @@
chemscan(owner, cortical_owner.human_host)
StartCooldown()
-//to either get inside, or out, of a host
-/datum/action/cooldown/borer/choosing_host
- name = "Inhabit/Uninhabit Host"
- cooldown_time = 10 SECONDS
- button_icon_state = "host"
-
-/datum/action/cooldown/borer/choosing_host/Trigger(trigger_flags, atom/target)
- . = ..()
- if(!.)
- return FALSE
- var/mob/living/basic/cortical_borer/cortical_owner = owner
-
- //having a host means we need to leave them then
- if(cortical_owner.human_host)
- if(cortical_owner.host_sugar())
- owner.balloon_alert(owner, "cannot function with sugar in host")
- return
- owner.balloon_alert(owner, "detached from host")
- if(!(cortical_owner.upgrade_flags & BORER_STEALTH_MODE))
- to_chat(cortical_owner.human_host, span_notice("Something carefully tickles your inner ear..."))
- var/obj/item/organ/internal/borer_body/borer_organ = locate() in cortical_owner.human_host.organs
- //log the interaction
- var/turf/human_turfone = get_turf(cortical_owner.human_host)
- var/logging_text = "[key_name(cortical_owner)] left [key_name(cortical_owner.human_host)] at [loc_name(human_turfone)]"
- cortical_owner.log_message(logging_text, LOG_GAME)
- cortical_owner.human_host.log_message(logging_text, LOG_GAME)
- if(borer_organ)
- borer_organ.Remove(cortical_owner.human_host)
- cortical_owner.forceMove(human_turfone)
- cortical_owner.human_host = null
- REMOVE_TRAIT(cortical_owner, TRAIT_WEATHER_IMMUNE, "borer_in_host")
- StartCooldown()
- return
-
- //we dont have a host so lets inhabit one
- var/list/usable_hosts = list()
- for(var/mob/living/carbon/human/listed_human in range(1, cortical_owner))
- // no non-human hosts
- if(!ishuman(listed_human) || ismonkey(listed_human))
- continue
- // cannot have multiple borers (for now)
- if(listed_human.has_borer())
- continue
- // hosts need to be organic
- if(!(listed_human.dna.species.inherent_biotypes & MOB_ORGANIC) && cortical_owner.organic_restricted)
- continue
- // hosts need to be organic
- if(!(listed_human.mob_biotypes & MOB_ORGANIC) && cortical_owner.organic_restricted)
- continue
- //hosts cannot be changelings
- if(IS_CHANGELING(listed_human) && cortical_owner.changeling_restricted)
- continue
- usable_hosts += listed_human
-
- //if the list of possible hosts is one, just go straight in, no choosing
- if(length(usable_hosts) == 1)
- enter_host(usable_hosts[1])
- return
-
- //if the list of possible host is more than one, allow choosing a host
- var/choose_host = tgui_input_list(cortical_owner, "Choose your host!", "Host Choice", usable_hosts)
- if(!choose_host)
- owner.balloon_alert(owner, "no target selected")
- return
- enter_host(choose_host)
-
-/datum/action/cooldown/borer/choosing_host/proc/enter_host(mob/living/carbon/human/singular_host)
- var/mob/living/basic/cortical_borer/cortical_owner = owner
- if(check_for_bio_protection(singular_host))
- owner.balloon_alert(owner, "target head too protected!")
- return
- if(singular_host.has_borer())
- owner.balloon_alert(owner, "target already occupied")
- return
- if(!do_after(cortical_owner, (((cortical_owner.upgrade_flags & BORER_FAST_BORING) && !(cortical_owner.upgrade_flags & BORER_HIDING)) ? 3 SECONDS : 6 SECONDS), target = singular_host))
- owner.balloon_alert(owner, "you and target must be still")
- return
- if(get_dist(singular_host, cortical_owner) > 1)
- owner.balloon_alert(owner, "target too far away")
- return
- cortical_owner.human_host = singular_host
- cortical_owner.forceMove(cortical_owner.human_host)
- if(!(cortical_owner.upgrade_flags & BORER_STEALTH_MODE))
- to_chat(cortical_owner.human_host, span_notice("A chilling sensation goes down your spine..."))
- cortical_owner.copy_languages(cortical_owner.human_host)
- var/obj/item/organ/internal/borer_body/borer_organ = new(cortical_owner.human_host)
- borer_organ.borer = owner
- borer_organ.Insert(cortical_owner.human_host)
- var/turf/human_turftwo = get_turf(cortical_owner.human_host)
- var/logging_text = "[key_name(cortical_owner)] went into [key_name(cortical_owner.human_host)] at [loc_name(human_turftwo)]"
- cortical_owner.log_message(logging_text, LOG_GAME)
- cortical_owner.human_host.log_message(logging_text, LOG_GAME)
- ADD_TRAIT(cortical_owner, TRAIT_WEATHER_IMMUNE, "borer_in_host")
- StartCooldown()
-
-/// Checks if the target's head is bio protected, returns true if this is the case
-/datum/action/cooldown/borer/choosing_host/proc/check_for_bio_protection(mob/living/carbon/human/target)
- if(isobj(target.head))
- if(target.head.get_armor_rating(BIO) >= 100)
- return TRUE
- if(isobj(target.wear_mask))
- if(target.wear_mask.get_armor_rating(BIO) >= 100)
- return TRUE
- if(isobj(target.wear_neck))
- if(target.wear_neck.get_armor_rating(BIO) >= 100)
- return TRUE
- return FALSE
-
//you can force your host to speak... dont abuse this
-/datum/action/cooldown/borer/force_speak
+/datum/action/cooldown/mob_cooldown/borer/force_speak
name = "Force Host Speak"
cooldown_time = 30 SECONDS
button_icon_state = "speak"
+ click_to_activate = FALSE
-/datum/action/cooldown/borer/force_speak/Trigger(trigger_flags, atom/target)
+/datum/action/cooldown/mob_cooldown/borer/force_speak/Trigger(trigger_flags, atom/target)
. = ..()
if(!.)
return FALSE
@@ -622,13 +524,14 @@
StartCooldown()
//we need a way to produce offspring
-/datum/action/cooldown/borer/produce_offspring
+/datum/action/cooldown/mob_cooldown/borer/produce_offspring
name = "Produce Offspring"
cooldown_time = 1 MINUTES
button_icon_state = "reproduce"
chemical_cost = 100
+ click_to_activate = FALSE
-/datum/action/cooldown/borer/produce_offspring/Trigger(trigger_flags, atom/target)
+/datum/action/cooldown/mob_cooldown/borer/produce_offspring/Trigger(trigger_flags, atom/target)
. = ..()
if(!.)
return FALSE
@@ -665,7 +568,7 @@
owner.balloon_alert(owner, "egg laid")
StartCooldown()
-/datum/action/cooldown/borer/produce_offspring/proc/no_host_egg()
+/datum/action/cooldown/mob_cooldown/borer/produce_offspring/proc/no_host_egg()
var/mob/living/basic/cortical_borer/cortical_owner = owner
cortical_owner.health = max(cortical_owner.health, 1, cortical_owner.health -= OUT_OF_HOST_EGG_COST)
produce_egg()
@@ -676,7 +579,7 @@
cortical_owner.log_message(logging_text, LOG_GAME)
owner.balloon_alert(owner, "egg laid")
-/datum/action/cooldown/borer/produce_offspring/proc/produce_egg()
+/datum/action/cooldown/mob_cooldown/borer/produce_offspring/proc/produce_egg()
var/mob/living/basic/cortical_borer/cortical_owner = owner
var/turf/borer_turf = get_turf(cortical_owner)
var/obj/effect/mob_spawn/ghost_role/borer_egg/spawned_egg = new /obj/effect/mob_spawn/ghost_role/borer_egg(borer_turf)
@@ -686,13 +589,14 @@
GLOB.successful_egg_number += 1
//revive your host
-/datum/action/cooldown/borer/revive_host
+/datum/action/cooldown/mob_cooldown/borer/revive_host
name = "Revive Host"
cooldown_time = 2 MINUTES
button_icon_state = "revive"
chemical_cost = 200
+ click_to_activate = FALSE
-/datum/action/cooldown/borer/revive_host/Trigger(trigger_flags, atom/target)
+/datum/action/cooldown/mob_cooldown/borer/revive_host/Trigger(trigger_flags, atom/target)
. = ..()
if(!.)
return FALSE
@@ -726,13 +630,14 @@
StartCooldown()
//to ask if a host is willing
-/datum/action/cooldown/borer/willing_host
+/datum/action/cooldown/mob_cooldown/borer/willing_host
name = "Willing Host"
cooldown_time = 2 MINUTES
button_icon_state = "willing"
chemical_cost = 150
+ click_to_activate = FALSE
-/datum/action/cooldown/borer/willing_host/Trigger(trigger_flags, atom/target)
+/datum/action/cooldown/mob_cooldown/borer/willing_host/Trigger(trigger_flags, atom/target)
. = ..()
if(!.)
return FALSE
@@ -759,13 +664,14 @@
GLOB.willing_hosts += cortical_owner.human_host.ckey
StartCooldown()
-/datum/action/cooldown/borer/stealth_mode
+/datum/action/cooldown/mob_cooldown/borer/stealth_mode
name = "Stealth Mode"
cooldown_time = 2 MINUTES
button_icon_state = "hiding"
chemical_cost = 100
+ click_to_activate = FALSE
-/datum/action/cooldown/borer/stealth_mode/Trigger(trigger_flags, atom/target)
+/datum/action/cooldown/mob_cooldown/borer/stealth_mode/Trigger(trigger_flags, atom/target)
var/mob/living/basic/cortical_borer/cortical_owner = owner
var/in_stealth = (cortical_owner.upgrade_flags & BORER_STEALTH_MODE)
if(in_stealth)
@@ -788,13 +694,14 @@
StartCooldown()
-/datum/action/cooldown/borer/empowered_offspring
+/datum/action/cooldown/mob_cooldown/borer/empowered_offspring
name = "Produce Empowered Offspring"
cooldown_time = 1 MINUTES
button_icon_state = "reproduce"
chemical_cost = 150
+ click_to_activate = FALSE
-/datum/action/cooldown/borer/empowered_offspring/Trigger(trigger_flags, atom/target)
+/datum/action/cooldown/mob_cooldown/borer/empowered_offspring/Trigger(trigger_flags, atom/target)
. = ..()
if(!.)
return FALSE
diff --git a/modular_skyrat/modules/cortical_borer/code/abilities/host_movement.dm b/modular_skyrat/modules/cortical_borer/code/abilities/host_movement.dm
new file mode 100644
index 00000000000000..30c9b435b9603b
--- /dev/null
+++ b/modular_skyrat/modules/cortical_borer/code/abilities/host_movement.dm
@@ -0,0 +1,31 @@
+//to either get inside, or out, of a host
+/datum/action/cooldown/mob_cooldown/borer/choosing_host
+ name = "Inhabit/Uninhabit Host"
+ cooldown_time = 10 SECONDS
+ button_icon_state = "host"
+ click_to_activate = TRUE
+
+/datum/action/cooldown/mob_cooldown/borer/choosing_host/Activate(atom/target)
+ if(get_dist(owner, target) > 1)
+ owner.balloon_alert(owner, "too far")
+ return
+ if(!ishuman(target))
+ owner.balloon_alert(owner, "not human")
+ return
+ var/mob/living/basic/cortical_borer/cortical_owner = owner
+ if(!cortical_owner.try_enter_host(target))
+ return
+ . = ..()
+ return TRUE
+
+/datum/action/cooldown/mob_cooldown/borer/choosing_host/Trigger(trigger_flags, atom/target)
+ . = ..()
+ if(!.)
+ return FALSE
+ // Check if we already have a human_host
+ var/mob/living/basic/cortical_borer/cortical_owner = owner
+ if(!cortical_owner.human_host)
+ return
+ if(cortical_owner.try_leave_host())
+ StartCooldown()
+ return .
diff --git a/modular_skyrat/modules/cortical_borer/code/cortical_borer.dm b/modular_skyrat/modules/cortical_borer/code/cortical_borer.dm
index 2106fd628e0796..fda5692a028c09 100644
--- a/modular_skyrat/modules/cortical_borer/code/cortical_borer.dm
+++ b/modular_skyrat/modules/cortical_borer/code/cortical_borer.dm
@@ -31,13 +31,6 @@ GLOBAL_LIST_EMPTY(cortical_borers)
return check_content
return FALSE
-//so if a person is debrained, the borer is removed
-/obj/item/organ/internal/brain/Remove(mob/living/carbon/target, special = 0, movement_flags)
- . = ..()
- var/mob/living/basic/cortical_borer/cb_inside = target.has_borer()
- if(cb_inside)
- cb_inside.leave_host()
-
//borers also create an organ, so you dont need to debrain someone
/obj/item/organ/internal/borer_body
name = "engorged cortical borer"
@@ -50,14 +43,14 @@ GLOBAL_LIST_EMPTY(cortical_borers)
borer = null
return ..()
-/obj/item/organ/internal/borer_body/Insert(mob/living/carbon/carbon_target, special, movement_flags)
+/obj/item/organ/internal/borer_body/on_mob_insert(mob/living/carbon/carbon_target, special, movement_flags)
. = ..()
for(var/datum/borer_focus/body_focus as anything in borer.body_focuses)
body_focus.on_add()
carbon_target.apply_status_effect(/datum/status_effect/grouped/screwy_hud/fake_healthy, type)
//on removal, force the borer out
-/obj/item/organ/internal/borer_body/Remove(mob/living/carbon/carbon_target, special)
+/obj/item/organ/internal/borer_body/on_mob_remove(mob/living/carbon/carbon_target, special)
. = ..()
var/mob/living/basic/cortical_borer/cb_inside = carbon_target.has_borer()
for(var/datum/borer_focus/body_focus as anything in cb_inside.body_focuses)
@@ -141,19 +134,21 @@ GLOBAL_LIST_EMPTY(cortical_borers)
/// How many times you've levelled up over all
var/level = 0
///the list of actions that the borer has
- var/list/known_abilities = list(/datum/action/cooldown/borer/toggle_hiding,
- /datum/action/cooldown/borer/choosing_host,
- /datum/action/cooldown/borer/evolution_tree,
- /datum/action/cooldown/borer/inject_chemical,
- /datum/action/cooldown/borer/upgrade_chemical,
- /datum/action/cooldown/borer/learn_focus,
- /datum/action/cooldown/borer/upgrade_stat,
- /datum/action/cooldown/borer/force_speak,
- /datum/action/cooldown/borer/fear_human,
- /datum/action/cooldown/borer/check_blood,
+ var/list/known_abilities = list(/datum/action/cooldown/mob_cooldown/borer/toggle_hiding,
+ /datum/action/cooldown/mob_cooldown/borer/choosing_host,
+ /datum/action/cooldown/mob_cooldown/borer/evolution_tree,
+ /datum/action/cooldown/mob_cooldown/borer/inject_chemical,
+ /datum/action/cooldown/mob_cooldown/borer/upgrade_chemical,
+ /datum/action/cooldown/mob_cooldown/borer/learn_focus,
+ /datum/action/cooldown/mob_cooldown/borer/upgrade_stat,
+ /datum/action/cooldown/mob_cooldown/borer/force_speak,
+ /datum/action/cooldown/mob_cooldown/borer/fear_human,
+ /datum/action/cooldown/mob_cooldown/borer/check_blood,
)
- ///the host
+ /// The human we are hosted in
var/mob/living/carbon/human/human_host
+ /// The brain we are currently hooked to
+ var/obj/item/organ/internal/brain/brain_host
//what the host gains or loses with the borer
var/list/hosts_abilities = list()
//just a little "timer" to compare to world.time
@@ -245,7 +240,8 @@ GLOBAL_LIST_EMPTY(cortical_borers)
do_evolution(/datum/borer_evolution/base)
/mob/living/basic/cortical_borer/Destroy()
- human_host = null
+ if(human_host)
+ leave_host_clean()
GLOB.cortical_borers -= src
QDEL_NULL(reagent_holder)
return ..()
@@ -364,17 +360,6 @@ GLOBAL_LIST_EMPTY(cortical_borers)
else // this is a hot place
adjust_bodytemperature(min(min(temp_delta / BODYTEMP_DIVISOR, BODYTEMP_HEATING_MAX) * seconds_per_tick, temp_delta))
-//leave the host, forced or not
-/mob/living/basic/cortical_borer/proc/leave_host()
- if(!human_host)
- return
- var/obj/item/organ/internal/borer_body/borer_organ = locate() in human_host.organs
- if(borer_organ)
- borer_organ.Remove(human_host)
- var/turf/human_turf = get_turf(human_host)
- forceMove(human_turf)
- human_host = null
-
//borers shouldnt be able to whisper...
/mob/living/basic/cortical_borer/whisper(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language, ignore_spam = FALSE, forced, filterproof)
to_chat(src, span_warning("You are not able to whisper!"))
diff --git a/modular_skyrat/modules/cortical_borer/code/cortical_borer_movement.dm b/modular_skyrat/modules/cortical_borer/code/cortical_borer_movement.dm
new file mode 100644
index 00000000000000..8e967b43e7c5af
--- /dev/null
+++ b/modular_skyrat/modules/cortical_borer/code/cortical_borer_movement.dm
@@ -0,0 +1,88 @@
+
+/// Checks if the target's head is bio protected, returns true if this is the case
+/mob/living/basic/cortical_borer/proc/check_for_target_bio_protection(mob/living/carbon/human/target)
+ if(isobj(target.head))
+ if(target.head.get_armor_rating(BIO) >= 100)
+ return TRUE
+ if(isobj(target.wear_mask))
+ if(target.wear_mask.get_armor_rating(BIO) >= 100)
+ return TRUE
+ if(isobj(target.wear_neck))
+ if(target.wear_neck.get_armor_rating(BIO) >= 100)
+ return TRUE
+ return FALSE
+
+/mob/living/basic/cortical_borer/proc/try_enter_host(mob/living/carbon/human/victim)
+ if(check_for_target_bio_protection(victim))
+ balloon_alert(src, "head too protected!")
+ return FALSE
+ if(victim.has_borer())
+ balloon_alert(src, "already occupied")
+ return FALSE
+ if(!do_after(src, (((upgrade_flags & BORER_FAST_BORING) && !(upgrade_flags & BORER_HIDING)) ? 3 SECONDS : 6 SECONDS), target = victim))
+ balloon_alert(src, "keep still")
+ return FALSE
+ if(get_dist(victim, src) > 1)
+ balloon_alert(src, "too far")
+ return FALSE
+ var/obj/item/organ/internal/brain/brain = victim.get_organ_slot(ORGAN_SLOT_BRAIN)
+ if(!istype(brain))
+ balloon_alert(src, "no brain")
+ return FALSE
+
+ return enter_host(victim, brain)
+
+/mob/living/basic/cortical_borer/proc/enter_host(mob/living/carbon/human/victim, obj/item/organ/internal/brain/brain)
+ human_host = victim
+ forceMove(human_host)
+
+ if(!(upgrade_flags & BORER_STEALTH_MODE))
+ to_chat(human_host, span_notice("A chilling sensation goes down your spine..."))
+ copy_languages(human_host)
+
+ var/obj/item/organ/internal/borer_body/borer_organ = new()
+ borer_organ.borer = src
+ borer_organ.Insert(human_host)
+
+ log_message("[key_name(src)] went into [key_name(human_host)] at [loc_name(get_turf(human_host))]", LOG_GAME)
+
+ ADD_TRAIT(src, TRAIT_WEATHER_IMMUNE, "borer_in_host")
+
+ RegisterSignal(brain, COMSIG_ORGAN_REMOVED, PROC_REF(on_brain_removed))
+ brain_host = brain
+ return TRUE
+
+/mob/living/basic/cortical_borer/proc/try_leave_host()
+ if(host_sugar())
+ balloon_alert(src, "cannot function with sugar in host")
+ return TRUE // We force a cooldown over sugar
+ balloon_alert(src, "left host")
+ if(!(upgrade_flags & BORER_STEALTH_MODE))
+ to_chat(human_host, span_notice("Something carefully tickles your inner ear..."))
+ return leave_host()
+
+/mob/living/basic/cortical_borer/proc/leave_host()
+ var/turf/dropoff_turf = get_turf(human_host)
+ log_message("[key_name(src)] left [key_name(human_host)] at [loc_name(dropoff_turf)]", LOG_GAME)
+
+ leave_host_clean()
+ forceMove(dropoff_turf)
+
+ REMOVE_TRAIT(src, TRAIT_WEATHER_IMMUNE, "borer_in_host")
+ return TRUE
+
+///This is the version for correctly cleaning up the borer when qdeling/moving out. Don't call this directly
+/mob/living/basic/cortical_borer/proc/leave_host_clean()
+ var/obj/item/organ/internal/borer_body/borer_organ = locate() in human_host.organs
+ if(borer_organ)
+ borer_organ.Remove(human_host)
+ if(brain_host)
+ UnregisterSignal(brain_host, COMSIG_ORGAN_REMOVED)
+ human_host = null
+ brain_host = null
+
+
+///If a person is debrained, the borer is removed with this
+/mob/living/basic/cortical_borer/proc/on_brain_removed(atom/source, mob/living/carbon/target)
+ SIGNAL_HANDLER
+ leave_host()
diff --git a/modular_skyrat/modules/cortical_borer/code/evolution/evolution_diveworm.dm b/modular_skyrat/modules/cortical_borer/code/evolution/evolution_diveworm.dm
index b04370d6c29bde..b34bd8e1389aef 100644
--- a/modular_skyrat/modules/cortical_borer/code/evolution/evolution_diveworm.dm
+++ b/modular_skyrat/modules/cortical_borer/code/evolution/evolution_diveworm.dm
@@ -107,5 +107,5 @@
/datum/borer_evolution/diveworm/empowered_offspring/on_evolve(mob/living/basic/cortical_borer/cortical_owner)
. = ..()
- var/datum/action/cooldown/borer/empowered_offspring/attack_action = new(cortical_owner)
+ var/datum/action/cooldown/mob_cooldown/borer/empowered_offspring/attack_action = new(cortical_owner)
attack_action.Grant(cortical_owner)
diff --git a/modular_skyrat/modules/cortical_borer/code/evolution/evolution_hivelord.dm b/modular_skyrat/modules/cortical_borer/code/evolution/evolution_hivelord.dm
index be06cc5d7f4154..a48ece68699706 100644
--- a/modular_skyrat/modules/cortical_borer/code/evolution/evolution_hivelord.dm
+++ b/modular_skyrat/modules/cortical_borer/code/evolution/evolution_hivelord.dm
@@ -12,7 +12,7 @@
/datum/borer_evolution/hivelord/produce_offspring/on_evolve(mob/living/basic/cortical_borer/cortical_owner)
. = ..()
- var/datum/action/cooldown/borer/produce_offspring/attack_action = new(cortical_owner)
+ var/datum/action/cooldown/mob_cooldown/borer/produce_offspring/attack_action = new(cortical_owner)
attack_action.Grant(cortical_owner)
// T2
@@ -25,7 +25,7 @@
/datum/borer_evolution/hivelord/blood_chemical/on_evolve(mob/living/basic/cortical_borer/cortical_owner)
. = ..()
- var/datum/action/cooldown/borer/learn_bloodchemical/attack_action = new(cortical_owner)
+ var/datum/action/cooldown/mob_cooldown/borer/learn_bloodchemical/attack_action = new(cortical_owner)
attack_action.Grant(cortical_owner)
// T3
@@ -51,7 +51,7 @@
/datum/borer_evolution/hivelord/stealth_mode/on_evolve(mob/living/basic/cortical_borer/cortical_owner)
. = ..()
- var/datum/action/cooldown/borer/stealth_mode/attack_action = new(cortical_owner)
+ var/datum/action/cooldown/mob_cooldown/borer/stealth_mode/attack_action = new(cortical_owner)
attack_action.Grant(cortical_owner)
// T5
diff --git a/modular_skyrat/modules/cortical_borer/code/evolution/evolution_symbiote.dm b/modular_skyrat/modules/cortical_borer/code/evolution/evolution_symbiote.dm
index 4eb5005883711b..85669e0a466213 100644
--- a/modular_skyrat/modules/cortical_borer/code/evolution/evolution_symbiote.dm
+++ b/modular_skyrat/modules/cortical_borer/code/evolution/evolution_symbiote.dm
@@ -12,7 +12,7 @@
/datum/borer_evolution/symbiote/willing_host/on_evolve(mob/living/basic/cortical_borer/cortical_owner)
. = ..()
- var/datum/action/cooldown/borer/willing_host/attack_action = new(cortical_owner)
+ var/datum/action/cooldown/mob_cooldown/borer/willing_host/attack_action = new(cortical_owner)
attack_action.Grant(cortical_owner)
// T2
@@ -107,6 +107,6 @@
/datum/borer_evolution/symbiote/revive_host/on_evolve(mob/living/basic/cortical_borer/cortical_owner)
. = ..()
- var/datum/action/cooldown/borer/revive_host/attack_action = new(cortical_owner)
+ var/datum/action/cooldown/mob_cooldown/borer/revive_host/attack_action = new(cortical_owner)
attack_action.Grant(cortical_owner)
diff --git a/modular_skyrat/modules/customization/game/objects/items/conversion_kits.dm b/modular_skyrat/modules/customization/game/objects/items/conversion_kits.dm
index ca791924b2a652..78659bc2813e57 100644
--- a/modular_skyrat/modules/customization/game/objects/items/conversion_kits.dm
+++ b/modular_skyrat/modules/customization/game/objects/items/conversion_kits.dm
@@ -8,21 +8,20 @@
/// The object to turn it into.
var/obj/item/to_obj
-/obj/item/device/custom_kit/afterattack(obj/target_obj, mob/user, proximity_flag)
- if(!proximity_flag) //Gotta be adjacent to your target
- return
- if(isturf(target_obj)) //This shouldn't be needed, but apparently it throws runtimes otherwise.
- return
- else if(target_obj.type == from_obj) //Checks whether the item is eligible to be converted
- if(!pre_convert_check(target_obj, user))
- return FALSE
- var/obj/item/converted_item = new to_obj(get_turf(src))
- user.put_in_hands(converted_item)
- user.visible_message(span_notice("[user] modifies [target_obj] into [converted_item]."), span_notice("You modify [target_obj] into [converted_item]."))
- qdel(target_obj)
- qdel(src)
- else
- to_chat(user, span_warning("It looks like this kit won't work on [target_obj]..."))
+/obj/item/device/custom_kit/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ if(isturf(interacting_with)) //This shouldn't be needed, but apparently it throws runtimes otherwise.
+ return NONE
+ if(interacting_with.type != from_obj) //Checks whether the item is eligible to be converted
+ to_chat(user, span_warning("It looks like this kit won't work on [interacting_with]..."))
+ return ITEM_INTERACT_BLOCKING
+ if(!pre_convert_check(interacting_with, user))
+ return ITEM_INTERACT_BLOCKING
+ var/obj/item/converted_item = new to_obj
+ user.visible_message(span_notice("[user] modifies [interacting_with] into [converted_item]."), span_notice("You modify [interacting_with] into [converted_item]."))
+ qdel(interacting_with)
+ qdel(src)
+ user.put_in_hands(converted_item)
+ return ITEM_INTERACT_SUCCESS
/// Override this if you have some condition you want fulfilled before allowing the conversion. Return TRUE to allow it to convert, return FALSE to prevent it.
/obj/item/device/custom_kit/proc/pre_convert_check(obj/target_obj, mob/user)
diff --git a/modular_skyrat/modules/customization/modules/clothing/glasses/hud.dm b/modular_skyrat/modules/customization/modules/clothing/glasses/hud.dm
index 69df3d6539c19d..d31c443940d26b 100644
--- a/modular_skyrat/modules/customization/modules/clothing/glasses/hud.dm
+++ b/modular_skyrat/modules/customization/modules/clothing/glasses/hud.dm
@@ -20,7 +20,7 @@
/obj/item/clothing/glasses/hud/eyepatch/sec
name = "security eyepatch HUD"
desc = "Lost your eye beating an innocent clown? Thankfully your corporate overlords have made something to make up for this. May not do well against flashes."
- hud_type = DATA_HUD_SECURITY_ADVANCED
+ hud_types = list(DATA_HUD_SECURITY_ADVANCED)
clothing_traits = list(TRAIT_SECURITY_HUD)
glass_colour_type = /datum/client_colour/glass_colour/blue
@@ -39,7 +39,7 @@
desc = "Do no harm, maybe harm has befell to you, or your poor eyeball, thankfully there's a way to continue your oath, thankfully it didn't mention sleepdarts or monkey men."
icon_state = "medpatch"
base_icon_state = "medpatch"
- hud_type = DATA_HUD_MEDICAL_ADVANCED
+ hud_types = list(DATA_HUD_MEDICAL_ADVANCED)
clothing_traits = list(TRAIT_MEDICAL_HUD)
glass_colour_type = /datum/client_colour/glass_colour/lightblue
@@ -81,7 +81,7 @@
desc = "Lost your eyeball to a rogue borg? Dare to tell a Dogborg to do it's job? Got bored? Whatever the reason, this bit of tech will help you still repair borgs, they'll never need it since they usually do it themselves, but its the thought that counts."
icon_state = "robopatch"
base_icon_state = "robopatch"
- hud_type = DATA_HUD_DIAGNOSTIC_BASIC
+ hud_types = list(DATA_HUD_DIAGNOSTIC_BASIC)
clothing_traits = list(TRAIT_DIAGNOSTIC_HUD)
glass_colour_type = /datum/client_colour/glass_colour/lightorange
diff --git a/modular_skyrat/modules/customization/modules/clothing/head/jobs.dm b/modular_skyrat/modules/customization/modules/clothing/head/jobs.dm
index b10aa3d0f9b330..7e5c6936c1dd74 100644
--- a/modular_skyrat/modules/customization/modules/clothing/head/jobs.dm
+++ b/modular_skyrat/modules/customization/modules/clothing/head/jobs.dm
@@ -151,3 +151,18 @@
name = "head of personnel's beret"
desc = "A fancy beret designed by NT's Personnel division for their favorite head's head. This one is made out of white fabric. Fancy"
greyscale_colors = "#FFFFFF#88242D"
+
+/obj/item/clothing/head/beret/clown
+ name = "H.O.N.K tactical beret"
+ desc = "A tactical berret to be used during the enacting of the most dangerous of pranks."
+ icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
+ worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
+ icon_state = "beret_clown"
+ greyscale_colors = null
+ greyscale_config = null
+ greyscale_config_worn = null
+
+/obj/item/clothing/head/beret/clown/rainbow
+ name = "rainbow beret"
+ desc = "You see, when a Mime loves a Clown very much..."
+ icon_state = "beret_rainbow"
diff --git a/modular_skyrat/modules/customization/modules/clothing/neck/collars.dm b/modular_skyrat/modules/customization/modules/clothing/neck/collars.dm
index 21d514c2bc7683..ae5cd17053efc3 100644
--- a/modular_skyrat/modules/customization/modules/clothing/neck/collars.dm
+++ b/modular_skyrat/modules/customization/modules/clothing/neck/collars.dm
@@ -73,14 +73,14 @@
/obj/item/clothing/neck/human_petcollar/locked/Initialize(mapload)
. = ..()
-
+ RegisterSignal(src, COMSIG_ATOM_ITEM_INTERACTION, PROC_REF(try_lock))
create_storage(storage_type = /datum/storage/pockets/small/collar/locked)
-/obj/item/clothing/neck/human_petcollar/locked/attackby(obj/item/attacking_item, mob/user, params)
+/obj/item/clothing/neck/human_petcollar/locked/proc/try_lock(atom/source, mob/user, obj/item/attacking_item, params)
if(istype(attacking_item, /obj/item/key/collar))
to_chat(user, span_warning("With a click, the collar [locked ? "unlocks" : "locks"]!"))
locked = !locked
- return
+ return TRUE
/obj/item/clothing/neck/human_petcollar/locked/attack_hand(mob/user)
if(loc == user && user.get_item_by_slot(ITEM_SLOT_NECK) && locked)
diff --git a/modular_skyrat/modules/customization/modules/clothing/toggle_base.dm b/modular_skyrat/modules/customization/modules/clothing/toggle_base.dm
index b445b9a86da04b..c67acf51d79c18 100644
--- a/modular_skyrat/modules/customization/modules/clothing/toggle_base.dm
+++ b/modular_skyrat/modules/customization/modules/clothing/toggle_base.dm
@@ -24,4 +24,7 @@
toggled = !toggled
source.icon_state = (toggled ? toggled_icon_state : initial(source.icon_state))
to_chat(clicker, "You toggle \the [source]!")
- clicker.update_appearance()
+ if(source.loc == clicker)
+ clicker.update_clothing(source.slot_flags)
+ source.update_appearance(UPDATE_ICON)
+ return CLICK_ACTION_SUCCESS
diff --git a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm
index 18a145b124b06f..2e7a478627a6d5 100644
--- a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm
+++ b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm
@@ -1776,9 +1776,9 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/korpstech, 32)
/obj/item/clothing/head/anubite
name = "\improper Anubite headpiece"
desc = "A dark coloured headpiece with golden accents. Its features seem reminiscent of the god Anubis."
- icon = 'modular_skyrat/master_files/icons/donator/mob/clothing/head.dmi'
+ icon = 'modular_skyrat/master_files/icons/donator/obj/clothing/hats.dmi'
icon_state = "anubite_headpiece"
- worn_icon = 'modular_skyrat/master_files/icons/donator/obj/clothing/hats.dmi'
+ worn_icon = 'modular_skyrat/master_files/icons/donator/mob/clothing/head.dmi'
worn_y_offset = 4
// Donator reward Smol42
diff --git a/modular_skyrat/modules/customization/modules/language/_language_holder.dm b/modular_skyrat/modules/customization/modules/language/_language_holder.dm
index 149901e5852e82..099da051fe6e81 100644
--- a/modular_skyrat/modules/customization/modules/language/_language_holder.dm
+++ b/modular_skyrat/modules/customization/modules/language/_language_holder.dm
@@ -1,31 +1,37 @@
/datum/language_holder/felinid
understood_languages = list(
/datum/language/common = list(LANGUAGE_ATOM),
- /datum/language/yangyu = list(LANGUAGE_ATOM)
+ /datum/language/yangyu = list(LANGUAGE_ATOM),
+ /datum/language/nekomimetic = list(LANGUAGE_ATOM),
)
spoken_languages = list(
/datum/language/common = list(LANGUAGE_ATOM),
- /datum/language/yangyu = list(LANGUAGE_ATOM)
+ /datum/language/yangyu = list(LANGUAGE_ATOM),
+ /datum/language/nekomimetic = list(LANGUAGE_ATOM),
)
/datum/language_holder/golem/bone
understood_languages = list(
/datum/language/common = list(LANGUAGE_ATOM),
- /datum/language/terrum = list(LANGUAGE_ATOM)
+ /datum/language/terrum = list(LANGUAGE_ATOM),
+ /datum/language/calcic = list(LANGUAGE_ATOM),
)
spoken_languages = list(
/datum/language/common = list(LANGUAGE_ATOM),
- /datum/language/terrum = list(LANGUAGE_ATOM)
+ /datum/language/terrum = list(LANGUAGE_ATOM),
+ /datum/language/calcic = list(LANGUAGE_ATOM),
)
/datum/language_holder/mushroom
understood_languages = list(
/datum/language/common = list(LANGUAGE_ATOM),
- /datum/language/sylvan = list(LANGUAGE_ATOM)
+ /datum/language/sylvan = list(LANGUAGE_ATOM),
+ /datum/language/mushroom = list(LANGUAGE_ATOM),
)
spoken_languages = list(
/datum/language/common = list(LANGUAGE_ATOM),
- /datum/language/sylvan = list(LANGUAGE_ATOM)
+ /datum/language/sylvan = list(LANGUAGE_ATOM),
+ /datum/language/mushroom = list(LANGUAGE_ATOM),
)
/datum/language_holder/shadowpeople
@@ -41,11 +47,13 @@
/datum/language_holder/skeleton
understood_languages = list(
/datum/language/common = list(LANGUAGE_ATOM),
- /datum/language/terrum = list(LANGUAGE_ATOM)
+ /datum/language/piratespeak = list(LANGUAGE_ATOM),
+ /datum/language/calcic = list(LANGUAGE_ATOM),
)
spoken_languages = list(
/datum/language/common = list(LANGUAGE_ATOM),
- /datum/language/terrum = list(LANGUAGE_ATOM)
+ /datum/language/piratespeak = list(LANGUAGE_ATOM),
+ /datum/language/calcic = list(LANGUAGE_ATOM),
)
/datum/language_holder/skrell
diff --git a/modular_skyrat/modules/customization/modules/language/buzzwords.dm b/modular_skyrat/modules/customization/modules/language/buzzwords.dm
deleted file mode 100644
index a8c21866b5c81d..00000000000000
--- a/modular_skyrat/modules/customization/modules/language/buzzwords.dm
+++ /dev/null
@@ -1,2 +0,0 @@
-/datum/language/buzzwords
- secret = TRUE
diff --git a/modular_skyrat/modules/customization/modules/language/calcic.dm b/modular_skyrat/modules/customization/modules/language/calcic.dm
deleted file mode 100644
index bff172c425d418..00000000000000
--- a/modular_skyrat/modules/customization/modules/language/calcic.dm
+++ /dev/null
@@ -1,2 +0,0 @@
-/datum/language/calcic
- secret = TRUE
diff --git a/modular_skyrat/modules/customization/modules/language/monkey.dm b/modular_skyrat/modules/customization/modules/language/monkey.dm
deleted file mode 100644
index ceff547fe79e96..00000000000000
--- a/modular_skyrat/modules/customization/modules/language/monkey.dm
+++ /dev/null
@@ -1,2 +0,0 @@
-/datum/language/monkey
- secret = TRUE
diff --git a/modular_skyrat/modules/customization/modules/language/mushroom.dm b/modular_skyrat/modules/customization/modules/language/mushroom.dm
deleted file mode 100644
index 342ccc9cb3ca52..00000000000000
--- a/modular_skyrat/modules/customization/modules/language/mushroom.dm
+++ /dev/null
@@ -1,2 +0,0 @@
-/datum/language/mushroom
- secret = TRUE
diff --git a/modular_skyrat/modules/customization/modules/language/nekomimetic.dm b/modular_skyrat/modules/customization/modules/language/nekomimetic.dm
deleted file mode 100644
index 8c38ca60e73028..00000000000000
--- a/modular_skyrat/modules/customization/modules/language/nekomimetic.dm
+++ /dev/null
@@ -1,3 +0,0 @@
-// Nekomimetic, my beloved
-/datum/language/nekomimetic
- secret = TRUE
diff --git a/modular_skyrat/modules/customization/modules/language/piratespeak.dm b/modular_skyrat/modules/customization/modules/language/piratespeak.dm
index 3ae1f43f8eb971..d2d7b3c7a0c002 100644
--- a/modular_skyrat/modules/customization/modules/language/piratespeak.dm
+++ b/modular_skyrat/modules/customization/modules/language/piratespeak.dm
@@ -1,9 +1,2 @@
/datum/language/piratespeak
- name = "Spatial Sea-tongue"
- desc = "The language of Space Pirates. It's rough, convoluted, and tough to decipher on purpose."
- space_chance = 60
- syllables = list(
- "yaye", "alya", "chirka", "tikat", "bazar", "oi", "yo", "meit", "grok", "ken", "berk", "cohon", "pendeo", "mark",
- "ho", "take", "yeer", "cur", "yoro", "armn", "tirta", "ren", "wap", "wop", "ran", "cro", "woh"
- )
secret = TRUE
diff --git a/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/alcohol_reagents.dm
index d1eb5cbc3f1b0a..97bdd205ff1ecf 100644
--- a/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/modular_skyrat/modules/customization/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -8,6 +8,28 @@
chemical_flags_skyrat = REAGENT_BLOOD_REGENERATING
+//Drinks from tg that are made with blood, thus hemophages are able to drink them without suffering ill effects
+
+/datum/reagent/consumable/ethanol/demonsblood
+ chemical_flags_skyrat = REAGENT_BLOOD_REGENERATING
+
+/datum/reagent/consumable/ethanol/devilskiss
+ chemical_flags_skyrat = REAGENT_BLOOD_REGENERATING
+
+/datum/reagent/consumable/ethanol/narsour
+ chemical_flags_skyrat = REAGENT_BLOOD_REGENERATING
+
+/datum/reagent/consumable/ethanol/protein_blend
+ chemical_flags_skyrat = REAGENT_BLOOD_REGENERATING
+
+/datum/reagent/consumable/ethanol/red_mead
+ chemical_flags_skyrat = REAGENT_BLOOD_REGENERATING
+
+//End of tg blood-based drinks
+
+
+
+
// ROBOT ALCOHOL PAST THIS POINT
// WOOO!
@@ -173,6 +195,7 @@
boozepwr = 66
quality = DRINK_FANTASTIC
taste_description = "overpowering sweetness with a touch of sourness, followed by iron and the sensation of a warm summer breeze"
+ chemical_flags_skyrat = REAGENT_BLOOD_REGENERATING //component drink is demon's blood, thus this drink is made with blood so hemophages can comfortably drink it
/datum/glass_style/drinking_glass/sins_delight
required_drink_type = /datum/reagent/consumable/ethanol/sins_delight
@@ -407,6 +430,7 @@
description = "Strong mead mixed with more honey and ethanol. Beloved by its human patrons."
boozepwr = 50 //strong!
taste_description = "honey and red wine"
+ chemical_flags_skyrat = REAGENT_BLOOD_REGENERATING //component drink is red mead, thus this drink is made with blood so hemophages can comfortably drink it
/datum/glass_style/drinking_glass/nord_king
required_drink_type = /datum/reagent/consumable/ethanol/nord_king
@@ -428,6 +452,8 @@
description = "A bloody drink mixed with wine."
boozepwr = 10 //weak
taste_description = "iron with grapejuice"
+ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
+ chemical_flags_skyrat = REAGENT_BLOOD_REGENERATING
/datum/glass_style/drinking_glass/velvet_kiss
required_drink_type = /datum/reagent/consumable/ethanol/velvet_kiss
@@ -437,12 +463,17 @@
desc = "Red and white drink for the upper classes or undead."
/datum/reagent/consumable/ethanol/velvet_kiss/expose_mob(mob/living/exposed_mob, methods, reac_volume)
- if(iszombie(exposed_mob) || isvampire(exposed_mob) || isdullahan(exposed_mob)) //Rare races!
+ if(iszombie(exposed_mob) || isvampire(exposed_mob) || isdullahan(exposed_mob) || ishemophage(exposed_mob)) //Rare races!
quality = RACE_DRINK
else
quality = DRINK_GOOD
return ..()
+/datum/reagent/consumable/ethanol/velvet_kiss/on_mob_life(mob/living/carbon/drinker, seconds_per_tick, times_fired)
+ . = ..()
+ if(drinker.blood_volume < BLOOD_VOLUME_NORMAL)
+ drinker.blood_volume = min(drinker.blood_volume + (1 * REM * seconds_per_tick), BLOOD_VOLUME_NORMAL) //Same as Bloody Mary, as it is roughly the same difficulty to make. Gives hemophages a bit more choices to supplant their blood levels.
+
/datum/reagent/consumable/ethanol/abduction_fruit
name = "Abduction Fruit"
color = "#DEFACD" //(222, 250, 205)
diff --git a/modular_skyrat/modules/deforest_medical_items/code/cargo_packs.dm b/modular_skyrat/modules/deforest_medical_items/code/cargo_packs.dm
index 9e3493142b54ed..895d1c5f507317 100644
--- a/modular_skyrat/modules/deforest_medical_items/code/cargo_packs.dm
+++ b/modular_skyrat/modules/deforest_medical_items/code/cargo_packs.dm
@@ -19,36 +19,33 @@
/obj/item/storage/medkit/combat_surgeon/stocked = 3,
)
-/datum/supply_pack/medical/kit_medical_surgical
- name = "Heavy Duty Medical Kit Crate - Medical/Surgical"
- crate_name = "heavy duty medical kit crate"
- desc = "Contains a large satchel medical kit, and a first responder surgical kit."
+/datum/supply_pack/medical/kit_technician
+ name = "Heavy Duty Medical Kit Crate - Technician"
+ crate_name = "technician kit crate"
+ desc = "Contains a pink medical technician kit."
access = ACCESS_MEDICAL
- cost = CARGO_CRATE_VALUE * 10
+ cost = CARGO_CRATE_VALUE * 5.5
contains = list(
- /obj/item/storage/backpack/duffelbag/deforest_medkit/stocked,
- /obj/item/storage/backpack/duffelbag/deforest_surgical/stocked,
+ /obj/item/storage/backpack/duffelbag/deforest_paramedic/stocked,
)
-/datum/supply_pack/medical/kit_surgical_technician
- name = "Heavy Duty Medical Kit Crate - Surgical/Technician"
- crate_name = "heavy duty medical kit crate"
- desc = "Contains a first responder surgical kit, and a medical technician kit."
+/datum/supply_pack/medical/kit_surgical
+ name = "Heavy Duty Medical Kit Crate - Surgical"
+ crate_name = "surgical kit crate"
+ desc = "Contains a grey first responder surgical kit."
access = ACCESS_MEDICAL
- cost = CARGO_CRATE_VALUE * 10
+ cost = CARGO_CRATE_VALUE * 5
contains = list(
- /obj/item/storage/backpack/duffelbag/deforest_paramedic/stocked,
/obj/item/storage/backpack/duffelbag/deforest_surgical/stocked,
)
-/datum/supply_pack/medical/kit_medical_technician
- name = "Heavy Duty Medical Kit Crate - Medical/Technician"
- crate_name = "heavy duty medical kit crate"
- desc = "Contains a large satchel medical kit, and a medical technician kit."
+/datum/supply_pack/medical/kit_medical
+ name = "Heavy Duty Medical Kit Crate - Medical"
+ crate_name = "medical kit crate"
+ desc = "Contains an orange satchel medical kit."
access = ACCESS_MEDICAL
- cost = CARGO_CRATE_VALUE * 10
+ cost = CARGO_CRATE_VALUE * 4.5
contains = list(
- /obj/item/storage/backpack/duffelbag/deforest_paramedic/stocked,
/obj/item/storage/backpack/duffelbag/deforest_medkit/stocked,
)
diff --git a/modular_skyrat/modules/delam_emergency_stop/code/scram.dm b/modular_skyrat/modules/delam_emergency_stop/code/scram.dm
index 2d5481b27470b7..781fc49579c787 100644
--- a/modular_skyrat/modules/delam_emergency_stop/code/scram.dm
+++ b/modular_skyrat/modules/delam_emergency_stop/code/scram.dm
@@ -189,6 +189,7 @@
// Fire bell close, that nice 'are we gonna die?' rumble out far
on = TRUE
+ SSpersistence.reset_delam_counter()
alert_sound_to_playing('sound/misc/earth_rumble_distant3.ogg', override_volume = TRUE)
update_appearance()
@@ -461,6 +462,13 @@
return ..()
+/// Resets the safety incident display internal counter back to -1 (delam event happened)
+/datum/controller/subsystem/persistence/proc/reset_delam_counter()
+ delam_highscore = rounds_since_engine_exploded
+ rounds_since_engine_exploded = -1
+ for(var/obj/machinery/incident_display/sign as anything in GLOB.map_incident_displays)
+ sign.update_delam_count(rounds_since_engine_exploded)
+
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/atmospherics/components/unary/delam_scram, 0)
MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/delam_procedure, 32)
diff --git a/modular_skyrat/modules/emote_panel/code/emote_panel.dm b/modular_skyrat/modules/emote_panel/code/emote_panel.dm
index f06a7ba2df8549..dc83d823ded9e8 100644
--- a/modular_skyrat/modules/emote_panel/code/emote_panel.dm
+++ b/modular_skyrat/modules/emote_panel/code/emote_panel.dm
@@ -231,7 +231,7 @@
available_emotes += human_emotes
// Checking if should apply Synth emotes
var/mob/living/carbon/human/current_mob = src
- if(current_mob.dna.species.type in allowed_species_synth)
+ if(!HAS_TRAIT(current_mob, TRAIT_SILICON_EMOTES_ALLOWED))
available_emotes += synth_emotes
// Checking if can wag tail
var/obj/item/organ/external/tail/tail = current_mob.get_organ_slot(ORGAN_SLOT_EXTERNAL_TAIL)
diff --git a/modular_skyrat/modules/emotes/code/laugh_datums.dm b/modular_skyrat/modules/emotes/code/laugh_datums.dm
index 715738537e9437..310c6ce63bcdf2 100644
--- a/modular_skyrat/modules/emotes/code/laugh_datums.dm
+++ b/modular_skyrat/modules/emotes/code/laugh_datums.dm
@@ -12,10 +12,35 @@ GLOBAL_LIST_EMPTY(laugh_types)
/datum/laugh_type/human
name = "Human Laugh"
- male_laughsounds = list('sound/voice/human/manlaugh1.ogg',
- 'sound/voice/human/manlaugh2.ogg')
- female_laughsounds = list('modular_skyrat/modules/emotes/sound/emotes/female/female_giggle_1.ogg',
- 'modular_skyrat/modules/emotes/sound/emotes/female/female_giggle_2.ogg')
+ male_laughsounds = list(
+ 'sound/voice/human/manlaugh1.ogg',
+ 'sound/voice/human/manlaugh2.ogg',
+ )
+ female_laughsounds = list(
+ 'modular_skyrat/modules/emotes/sound/emotes/female/female_giggle_1.ogg',
+ 'modular_skyrat/modules/emotes/sound/emotes/female/female_giggle_2.ogg',
+ )
+
+/datum/laugh_type/humanmasc
+ name = "Masculine Human Laugh"
+ male_laughsounds = list(
+ 'sound/voice/human/manlaugh1.ogg',
+ 'sound/voice/human/manlaugh2.ogg',
+ )
+ female_laughsounds = null
+
+/datum/laugh_type/humanfemme
+ name = "Feminine Human Laugh"
+ male_laughsounds = list(
+ 'modular_skyrat/modules/emotes/sound/emotes/female/female_giggle_1.ogg',
+ 'modular_skyrat/modules/emotes/sound/emotes/female/female_giggle_2.ogg',
+ )
+ female_laughsounds = null
+
+/datum/laugh_type/lizard
+ name = "Lizard Laugh"
+ male_laughsounds = list('sound/voice/lizard/lizard_laugh1.ogg',)
+ female_laughsounds = null
/datum/laugh_type/felinid
name = "Felinid Laugh"
@@ -25,12 +50,15 @@ GLOBAL_LIST_EMPTY(laugh_types)
'modular_skyrat/modules/emotes/sound/emotes/nyahehe.ogg')
female_laughsounds = null
-/datum/laugh_type/moth
- name = "Moth Laugh"
- male_laughsounds = list('modular_skyrat/modules/emotes/sound/emotes/mothlaugh.ogg')
+/datum/laugh_type/clown
+ name = "Clown Laugh"
+ male_laughsounds = list(
+ 'sound/creatures/clown/hohoho.ogg',
+ 'sound/creatures/clown/hehe.ogg',
+ )
female_laughsounds = null
-/datum/laugh_type/insect
- name = "Insect Laugh"
+/datum/laugh_type/moth
+ name = "Moth and Insect Laugh"
male_laughsounds = list('modular_skyrat/modules/emotes/sound/emotes/mothlaugh.ogg')
female_laughsounds = null
diff --git a/modular_skyrat/modules/emotes/code/laugh_emotes.dm b/modular_skyrat/modules/emotes/code/laugh_emotes.dm
index 0c003d1138fb8e..5c202afeaadadf 100644
--- a/modular_skyrat/modules/emotes/code/laugh_emotes.dm
+++ b/modular_skyrat/modules/emotes/code/laugh_emotes.dm
@@ -1,47 +1,25 @@
-/datum/emote/living/scream
+/datum/emote/living/laugh
+ key = "laugh"
+ key_third_person = "laughs"
+ message = "laughs."
+ message_mime = "laughs silently!"
+ emote_type = EMOTE_AUDIBLE
+ audio_cooldown = 5 SECONDS
vary = TRUE
- mob_type_blacklist_typecache = list(/mob/living/carbon/human, /mob/living/basic/slime, /mob/living/brain) //Humans get specialized scream.
+ mob_type_allowed_typecache = list(/mob/living/carbon, /mob/living/silicon/pai)
-/datum/emote/living/scream/get_sound(mob/living/user)
- if(issilicon(user))
- var/mob/living/silicon/silicon_user = user
- var/datum/scream_type/selected_scream = silicon_user.selected_scream
- if(isnull(selected_scream))
- return 'modular_skyrat/modules/emotes/sound/voice/scream_silicon.ogg'
- if(user.gender == FEMALE && LAZYLEN(selected_scream.female_screamsounds))
- return pick(selected_scream.female_screamsounds)
+/datum/emote/living/laugh/get_sound(mob/living/user)
+ if(iscarbon(user))
+ var/mob/living/carbon/human/H = user
+ if(isnull(H.selected_laugh)) //For things that don't have a selected laugh(npcs)
+ if(user.gender == MALE)
+ return pick('sound/voice/human/manlaugh1.ogg',
+ 'sound/voice/human/manlaugh2.ogg')
+ else
+ return pick('modular_skyrat/modules/emotes/sound/emotes/female/female_giggle_1.ogg',
+ 'modular_skyrat/modules/emotes/sound/emotes/female/female_giggle_2.ogg')
+ if(user.gender == MALE || !LAZYLEN(H.selected_laugh.female_laughsounds))
+ return pick(H.selected_laugh.male_laughsounds)
else
- return pick(selected_scream.male_screamsounds)
- if(issilicon(user))
- return 'modular_skyrat/modules/emotes/sound/voice/scream_silicon.ogg'
- if(ismonkey(user))
- return 'modular_skyrat/modules/emotes/sound/voice/scream_monkey.ogg'
- if(istype(user, /mob/living/basic/gorilla))
- return 'sound/creatures/gorilla.ogg'
- if(isalien(user))
- return 'sound/voice/hiss6.ogg'
-
-/datum/emote/living/scream/can_run_emote(mob/living/user, status_check, intentional)
- if(iscyborg(user))
- var/mob/living/silicon/robot/robot_user = user
-
- if(robot_user.cell?.charge < 200)
- to_chat(robot_user , span_warning("Scream module deactivated. Please recharge."))
- return FALSE
- robot_user.cell.use(200)
- return ..()
-
-/datum/emote/living/carbon/human/scream
- only_forced_audio = FALSE
-
-/datum/emote/living/carbon/human/scream/get_sound(mob/living/carbon/human/user)
- if(!istype(user))
- return
- if(isnull(user.selected_scream) || (LAZYLEN(user.selected_scream.male_screamsounds) && LAZYLEN(user.selected_scream.female_screamsounds))) //For things that don't have a selected scream(npcs)
- if(prob(1))
- return 'sound/voice/human/wilhelm_scream.ogg'
- return user.dna.species.get_scream_sound(user)
- if(user.gender == FEMALE && LAZYLEN(user.selected_scream.female_screamsounds))
- return pick(user.selected_scream.female_screamsounds)
- else
- return pick(user.selected_scream.male_screamsounds)
+ return pick(H.selected_laugh.female_laughsounds)
+ return
diff --git a/modular_skyrat/modules/emotes/code/scream_datums.dm b/modular_skyrat/modules/emotes/code/scream_datums.dm
index 8c1d32bdbe936c..370a48894ba4e5 100644
--- a/modular_skyrat/modules/emotes/code/scream_datums.dm
+++ b/modular_skyrat/modules/emotes/code/scream_datums.dm
@@ -39,11 +39,44 @@ GLOBAL_LIST_EMPTY(scream_types)
'sound/voice/human/femalescream_5.ogg',
)
+
+/datum/scream_type/human_masc
+ name = "Masculine Human Scream"
+ male_screamsounds = list(
+ 'modular_skyrat/modules/emotes/sound/voice/scream_m1.ogg',
+ 'modular_skyrat/modules/emotes/sound/voice/scream_m2.ogg',
+ 'sound/voice/human/malescream_1.ogg',
+ 'sound/voice/human/malescream_2.ogg',
+ 'sound/voice/human/malescream_3.ogg',
+ 'sound/voice/human/malescream_4.ogg',
+ 'sound/voice/human/malescream_5.ogg',
+ 'sound/voice/human/malescream_6.ogg',
+ )
+ female_screamsounds = null
+
+/datum/scream_type/human_femme
+ name = "Feminine Human Scream"
+ male_screamsounds = list(
+ 'sound/voice/human/femalescream_1.ogg',
+ 'sound/voice/human/femalescream_2.ogg',
+ 'sound/voice/human/femalescream_3.ogg',
+ 'sound/voice/human/femalescream_4.ogg',
+ 'sound/voice/human/femalescream_5.ogg',
+ 'modular_skyrat/modules/emotes/sound/voice/scream_f1.ogg',
+ 'modular_skyrat/modules/emotes/sound/voice/scream_f2.ogg',
+ )
+ female_screamsounds = null
+
/datum/scream_type/robotic
name = "Robotic Scream"
male_screamsounds = list('modular_skyrat/modules/emotes/sound/voice/scream_silicon.ogg')
female_screamsounds = null
+/datum/scream_type/wilhelm
+ name = "Classic Scream"
+ male_screamsounds = list('sound/voice/human/wilhelm_scream.ogg')
+ female_screamsounds = null
+
/datum/scream_type/lizard
name = "Lizard Scream"
male_screamsounds = list(
@@ -65,12 +98,10 @@ GLOBAL_LIST_EMPTY(scream_types)
/datum/scream_type/moth
name = "Moth Scream"
- male_screamsounds = list('modular_skyrat/modules/emotes/sound/voice/scream_moth.ogg')
- female_screamsounds = null
-
-/datum/scream_type/moth_two
- name = "Moth Scream 2"
- male_screamsounds = list('sound/voice/moth/scream_moth.ogg')
+ male_screamsounds = list(
+ 'modular_skyrat/modules/emotes/sound/voice/scream_moth.ogg',
+ 'sound/voice/moth/scream_moth.ogg',
+ )
female_screamsounds = null
/datum/scream_type/jelly
@@ -85,7 +116,11 @@ GLOBAL_LIST_EMPTY(scream_types)
/datum/scream_type/xeno
name = "Xeno Scream"
- male_screamsounds = list('sound/voice/hiss6.ogg')
+ male_screamsounds = list(
+ 'sound/voice/hiss6.ogg',
+ 'modular_skyrat/modules/xenos_skyrat_redo/sound/alien_roar1.ogg',
+ 'modular_skyrat/modules/xenos_skyrat_redo/sound/alien_roar2.ogg',
+ )
female_screamsounds = null
/datum/scream_type/raptor //This is the Teshari scream ported from CitRP which was a cockatoo scream edited by BlackMajor.
@@ -98,12 +133,21 @@ GLOBAL_LIST_EMPTY(scream_types)
male_screamsounds = list('modular_skyrat/modules/emotes/sound/emotes/rodentscream.ogg')
female_screamsounds = null
+/datum/scream_type/chicken
+ name = "Chicken Scream"
+ male_screamsounds = list('sound/creatures/bagawk.ogg')
+ female_screamsounds = null
+
/datum/scream_type/ethereal
name = "Ethereal Scream"
male_screamsounds = list(
'sound/voice/ethereal/ethereal_scream_1.ogg',
'sound/voice/ethereal/ethereal_scream_2.ogg',
- 'sound/voice/ethereal/ethereal_scream_3.ogg')
+ 'sound/voice/ethereal/ethereal_scream_3.ogg',
+ 'sound/voice/ethereal/lustrous_scream_1.ogg',
+ 'sound/voice/ethereal/lustrous_scream_2.ogg',
+ 'sound/voice/ethereal/lustrous_scream_3.ogg',
+ )
female_screamsounds = null
//DONATOR SCREAMS
@@ -114,7 +158,16 @@ GLOBAL_LIST_EMPTY(scream_types)
/datum/scream_type/monkey
name = "Monkey Scream"
- male_screamsounds = list('modular_skyrat/modules/emotes/sound/voice/scream_monkey.ogg')
+ male_screamsounds = list(
+ 'modular_skyrat/modules/emotes/sound/voice/scream_monkey.ogg',
+ 'sound/creatures/monkey/monkey_screech_1.ogg',
+ 'sound/creatures/monkey/monkey_screech_2.ogg',
+ 'sound/creatures/monkey/monkey_screech_3.ogg',
+ 'sound/creatures/monkey/monkey_screech_4.ogg',
+ 'sound/creatures/monkey/monkey_screech_5.ogg',
+ 'sound/creatures/monkey/monkey_screech_6.ogg',
+ 'sound/creatures/monkey/monkey_screech_7.ogg',
+ )
female_screamsounds = null
/datum/scream_type/gorilla
diff --git a/modular_skyrat/modules/emotes/code/synth_emotes.dm b/modular_skyrat/modules/emotes/code/synth_emotes.dm
index 464d9f4e541821..63f96c0ca33352 100644
--- a/modular_skyrat/modules/emotes/code/synth_emotes.dm
+++ b/modular_skyrat/modules/emotes/code/synth_emotes.dm
@@ -1,57 +1,28 @@
-/datum/emote/living/human
- mob_type_allowed_typecache = list(/mob/living/carbon/human, /mob/living/silicon)
-
-/datum/emote/living/human/dwoop
- key = "dwoop"
- key_third_person = "dwoops"
- message = "chirps happily!"
- vary = TRUE
- sound = 'modular_skyrat/modules/emotes/sound/emotes/dwoop.ogg'
- allowed_species = list(/datum/species/synthetic)
+/datum/emote/silicon
cooldown = 2 SECONDS
-/datum/emote/living/human/yes
+/datum/emote/living/human/dwoop
+ key = "dwoop"
+ key_third_person = "dwoops"
+ message = "chirps happily!"
+ vary = TRUE
+ sound = 'modular_skyrat/modules/emotes/sound/emotes/dwoop.ogg'
+ allowed_species = list(/datum/species/synthetic)
+ cooldown = 2 SECONDS
+
+/datum/emote/silicon/yes
key = "yes"
message = "emits an affirmative blip."
vary = TRUE
sound = 'modular_skyrat/modules/emotes/sound/emotes/synth_yes.ogg'
- allowed_species = list(/datum/species/synthetic)
- cooldown = 2 SECONDS
-/datum/emote/living/human/no
+/datum/emote/silicon/no
key = "no"
message = "emits a negative blip."
vary = TRUE
sound = 'modular_skyrat/modules/emotes/sound/emotes/synth_no.ogg'
- allowed_species = list(/datum/species/synthetic)
- cooldown = 2 SECONDS
-
-/datum/emote/living/human/boop
- key = "boop"
- key_third_person = "boops"
- message = "boops."
- allowed_species = list(/datum/species/synthetic)
- cooldown = 2 SECONDS
-/datum/emote/living/human/buzz
- key = "buzz"
- key_third_person = "buzzes"
- message = "buzzes."
- message_param = "buzzes at %t."
- emote_type = EMOTE_AUDIBLE
- sound = 'sound/machines/buzz-sigh.ogg'
- allowed_species = list(/datum/species/synthetic)
- cooldown = 2 SECONDS
-
-// This one is special, since it comes from TG and can be used by some basic mobs too. Handle it modularly.
-/datum/emote/living/beep
- allowed_species = list(/datum/species/synthetic)
-
-/datum/emote/living/beep/New()
- mob_type_allowed_typecache += list(/mob/living/carbon/human)
- return ..()
-
-/datum/emote/living/human/beep2
+/datum/emote/silicon/beep2
key = "beep2"
key_third_person = "beeps sharply"
message = "beeps sharply."
@@ -59,74 +30,9 @@
emote_type = EMOTE_AUDIBLE
vary = TRUE
sound = 'modular_skyrat/modules/emotes/sound/emotes/twobeep.ogg'
- allowed_species = list(/datum/species/synthetic)
- cooldown = 2 SECONDS
-/datum/emote/living/human/buzz2
- key = "buzz2"
- message = "buzzes twice."
- emote_type = EMOTE_AUDIBLE
- sound = 'sound/machines/buzz-two.ogg'
- allowed_species = list(/datum/species/synthetic)
- cooldown = 2 SECONDS
-
-/datum/emote/living/human/chime
- key = "chime"
- key_third_person = "chimes"
- message = "chimes."
- emote_type = EMOTE_AUDIBLE
- sound = 'sound/machines/chime.ogg'
- allowed_species = list(/datum/species/synthetic)
- cooldown = 2 SECONDS
-
-/datum/emote/living/human/honk
- key = "honk"
- key_third_person = "honks"
- message = "honks."
- emote_type = EMOTE_AUDIBLE
- vary = TRUE
- sound = 'sound/items/bikehorn.ogg'
- allowed_species = list(/datum/species/synthetic)
- cooldown = 2 SECONDS
-
-/datum/emote/living/human/ping
- key = "ping"
- key_third_person = "pings"
- message = "pings."
- message_param = "pings at %t."
- emote_type = EMOTE_AUDIBLE
- sound = 'sound/machines/ping.ogg'
- allowed_species = list(/datum/species/synthetic)
- cooldown = 2 SECONDS
-
-/datum/emote/living/human/sad
- key = "sad"
- message = "plays a sad trombone..."
- emote_type = EMOTE_AUDIBLE
- sound = 'sound/misc/sadtrombone.ogg'
- allowed_species = list(/datum/species/synthetic)
- cooldown = 2 SECONDS
-
-/datum/emote/living/human/warn
- key = "warn"
- message = "blares an alarm!"
- emote_type = EMOTE_AUDIBLE
- sound = 'sound/machines/warning-buzzer.ogg'
- allowed_species = list(/datum/species/synthetic)
- cooldown = 2 SECONDS
-
-/datum/emote/living/human/slowclaps
- key = "slowclap"
- message = "activates their slow clap processor."
- emote_type = EMOTE_AUDIBLE
- sound = 'sound/machines/slowclap.ogg'
- allowed_species = list(/datum/species/synthetic)
- cooldown = 2 SECONDS
-
-/datum/emote/living/human/laughtrack
+/datum/emote/silicon/laughtrack
key = "laughtrack"
message = "plays a laughtrack."
emote_type = EMOTE_AUDIBLE
sound = 'sound/items/sitcomlaugh2.ogg'
- allowed_species = list(/datum/species/synthetic)
- cooldown = 2 SECONDS
diff --git a/modular_skyrat/modules/faction/code/id.dm b/modular_skyrat/modules/faction/code/id.dm
index c7b858989d09da..26fed12142128e 100644
--- a/modular_skyrat/modules/faction/code/id.dm
+++ b/modular_skyrat/modules/faction/code/id.dm
@@ -18,15 +18,16 @@
icon_state = "data_1"
var/list/extra_access
-/obj/item/card/faction_access/afterattack(atom/movable/AM, mob/user, proximity)
- . = ..()
- if(istype(AM, /obj/item/card/id) && proximity)
- var/obj/item/card/id/I = AM
- if(extra_access)
- for(var/acs in extra_access)
- I.access |= acs
- to_chat(user, span_notice("You upgrade [I] with extra access."))
- qdel(src)
+/obj/item/card/faction_access/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ var/obj/item/card/id/id = interacting_with
+ if(!istype(id))
+ return NONE
+ if(extra_access)
+ for(var/acs in extra_access)
+ id.access |= acs
+ to_chat(user, span_notice("You upgrade [id] with extra access."))
+ qdel(src)
+ return ITEM_INTERACT_SUCCESS
/obj/item/card/faction_access/guest
name = "faction guest access card"
diff --git a/modular_skyrat/modules/filtersandsetters/code/filtersandsetters.dm b/modular_skyrat/modules/filtersandsetters/code/filtersandsetters.dm
index 858342a9166a4d..a4a97b93a98947 100644
--- a/modular_skyrat/modules/filtersandsetters/code/filtersandsetters.dm
+++ b/modular_skyrat/modules/filtersandsetters/code/filtersandsetters.dm
@@ -80,7 +80,7 @@
desc = "An abomination of reverse engineered tech, designed by a madman."
id = "alien_bonesetter"
build_path = /obj/item/bonesetter/alien
- build_type = PROTOLATHE | AWAY_LATHE
+ build_type = PROTOLATHE | AWAY_LATHE | MECHFAB
materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/plasma =SMALL_MATERIAL_AMOUNT*5, /datum/material/titanium =HALF_SHEET_MATERIAL_AMOUNT * 1.5)
category = list(
RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL_ALIEN
@@ -99,7 +99,7 @@
desc = "An abomination of reverse engineered tech, designed by a madman."
id = "alien_bloodfilter"
build_path = /obj/item/blood_filter/alien
- build_type = PROTOLATHE | AWAY_LATHE
+ build_type = PROTOLATHE | AWAY_LATHE | MECHFAB
materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT, /datum/material/silver =HALF_SHEET_MATERIAL_AMOUNT * 1.5, /datum/material/plasma =SMALL_MATERIAL_AMOUNT*5, /datum/material/titanium =HALF_SHEET_MATERIAL_AMOUNT * 1.5)
category = list(
RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL_ALIEN
@@ -155,7 +155,7 @@
desc = "This tool can be either used as bloodfilter or bonesetter."
id = "combitool"
build_path = /obj/item/blood_filter/advanced
- build_type = PROTOLATHE | AWAY_LATHE
+ build_type = PROTOLATHE | AWAY_LATHE | MECHFAB
materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*6, /datum/material/glass = SHEET_MATERIAL_AMOUNT*2, /datum/material/silver = SHEET_MATERIAL_AMOUNT*2, /datum/material/titanium =SHEET_MATERIAL_AMOUNT * 2.5)
category = list(
RND_CATEGORY_TOOLS + RND_SUBCATEGORY_TOOLS_MEDICAL_ADVANCED
diff --git a/modular_skyrat/modules/ghostcafe/code/robot_ghostcafe.dm b/modular_skyrat/modules/ghostcafe/code/robot_ghostcafe.dm
index c066c155ef619b..1d39e50105dbed 100644
--- a/modular_skyrat/modules/ghostcafe/code/robot_ghostcafe.dm
+++ b/modular_skyrat/modules/ghostcafe/code/robot_ghostcafe.dm
@@ -64,7 +64,7 @@
/obj/item/quadborg_tongue,
/obj/item/reagent_containers/borghypo,
/obj/item/borg_shapeshifter/stable)
- hat_offset = -3
+ hat_offset = list("north" = list(0, -3), "south" = list(0, -3), "east" = list(0, -3), "west" = list(0, -3))
/obj/item/borg_shapeshifter/stable
signalCache = list()
diff --git a/modular_skyrat/modules/gladiator/code/game/objects/items/gladiator_items.dm b/modular_skyrat/modules/gladiator/code/game/objects/items/gladiator_items.dm
index 0115aebdd0f993..a7f49026ffd69c 100644
--- a/modular_skyrat/modules/gladiator/code/game/objects/items/gladiator_items.dm
+++ b/modular_skyrat/modules/gladiator/code/game/objects/items/gladiator_items.dm
@@ -154,9 +154,9 @@
if(is_nemesis_faction)
force -= faction_bonus_force
-/obj/item/claymore/dragonslayer/interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers)
+/obj/item/claymore/dragonslayer/ranged_interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers)
if(user.IsImmobilized()) // no free dodgerolls
- return
+ return NONE
var/turf/where_to = get_turf(interacting_with)
user.apply_damage(damage = roll_stamcost, damagetype = STAMINA)
user.Immobilize(0.1 SECONDS) // you dont get to adjust your roll
@@ -164,7 +164,7 @@
user.apply_status_effect(/datum/status_effect/dodgeroll_iframes)
playsound(user, SFX_BODYFALL, 50, TRUE)
playsound(user, SFX_RUSTLE, 50, TRUE)
- return ..()
+ return ITEM_INTERACT_SUCCESS
/datum/status_effect/dodgeroll_iframes
id = "dodgeroll_dodging"
diff --git a/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm b/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm
index 4dfa844165656c..bffa18dd99e40b 100644
--- a/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm
+++ b/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm
@@ -33,16 +33,15 @@
/*
* ACCESSORIES
*/
-/obj/item/clothing/accessory/armband/deputy
- icon = 'modular_skyrat/master_files/icons/obj/clothing/accessories.dmi'
- worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/accessories.dmi'
- icon_state = "armband_lopland"
/obj/item/clothing/accessory/armband/deputy/lopland/nonsec
name = "blue armband"
desc = "An armband, worn to signify proficiency in a skill or association with a department. This one is blue."
/obj/item/clothing/accessory/armband/deputy/lopland
+ icon = 'modular_skyrat/master_files/icons/obj/clothing/accessories.dmi'
+ worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/accessories.dmi'
+ icon_state = "armband_lopland"
desc = "A Peacekeeper-blue armband, showing the wearer to be certified by Lopland as a top-of-their-class Security Officer."
/*
@@ -305,8 +304,42 @@
RESKIN_ICON_STATE = "security_cap_white",
RESKIN_WORN_ICON_STATE = "security_cap_white"
),
+ "Sol Variant" = list(
+ RESKIN_ICON_STATE = "policesoft",
+ RESKIN_WORN_ICON_STATE = "policesoft"
+ ),
+ "Sillitoe Variant" = list(
+ RESKIN_ICON_STATE = "policetrafficsoft",
+ RESKIN_WORN_ICON_STATE = "policetrafficsoft"
+ ),
+ "Cadet Variant" = list(
+ RESKIN_ICON_STATE = "policecadetsoft",
+ RESKIN_WORN_ICON_STATE = "policecadetsoft"
+ ),
)
+/obj/item/clothing/head/hats/warden
+ icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
+ worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
+ icon_state = "policehelm"
+ uses_advanced_reskins = TRUE
+ unique_reskin = list(
+ "Blue Cap" = list(
+ RESKIN_ICON_STATE = "policehelm",
+ RESKIN_WORN_ICON_STATE = "policehelm"
+ ),
+ "Sol Cap" = list(
+ RESKIN_ICON_STATE = "policewardencap",
+ RESKIN_WORN_ICON_STATE = "policewardencap"
+ ),
+ )
+
+/obj/item/clothing/head/hats/warden/red
+ unique_reskin = null
+
+/obj/item/clothing/head/hats/warden/drill
+ unique_reskin = null
+
/obj/item/clothing/head/hats/hos/cap
icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi'
@@ -432,6 +465,10 @@
),
)
+/obj/item/clothing/gloves/color/black/security/blu // Wait why these a subtype of black?!? Who did this
+ icon = 'icons/obj/clothing/gloves.dmi'
+ worn_icon = 'icons/mob/clothing/hands.dmi'
+
/obj/item/clothing/gloves/tackler/security //Can't just overwrite tackler, as there's a ton of subtypes that we'd then need to account for. This is easier. MUCH easier.
icon = 'modular_skyrat/master_files/icons/obj/clothing/gloves.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/hands.dmi'
@@ -565,6 +602,14 @@
RESKIN_ICON_STATE = "security_white",
RESKIN_WORN_ICON_STATE = "security_white"
),
+ "Sol Variant" = list(
+ RESKIN_ICON_STATE = "policealt",
+ RESKIN_WORN_ICON_STATE = "policealt"
+ ),
+ "Cadet Variant" = list(
+ RESKIN_ICON_STATE = "policecadetalt",
+ RESKIN_WORN_ICON_STATE = "policecadetalt"
+ ),
)
/obj/item/clothing/under/rank/security/officer/formal
@@ -595,24 +640,60 @@
icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi'
icon_state = "warden_black"
+ uses_advanced_reskins = TRUE
+ unique_reskin = list(
+ "Black Variant" = list(
+ RESKIN_ICON_STATE = "warden_black",
+ RESKIN_WORN_ICON_STATE = "warden_black"
+ ),
+ "Blue Variant" = list(
+ RESKIN_ICON_STATE = "peacekeeper_warden",
+ RESKIN_WORN_ICON_STATE = "peacekeeper_warden"
+ ),
+ "Sol Varient" = list(
+ RESKIN_ICON_STATE = "policewardenalt",
+ RESKIN_WORN_ICON_STATE = "policewardenalt"
+ ),
+ )
//HoS
/obj/item/clothing/under/rank/security/head_of_security
icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi'
worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi'
icon_state = "hos_black"
+ uses_advanced_reskins = TRUE
+ unique_reskin = list(
+ "Black Variant" = list(
+ RESKIN_ICON_STATE = "hos_black",
+ RESKIN_WORN_ICON_STATE = "hos_black"
+ ),
+ "Blue Varient" = list(
+ RESKIN_ICON_STATE = "peacekeeper_hos",
+ RESKIN_WORN_ICON_STATE = "peacekeeper_hos"
+ ),
+ "Sol Varient" = list(
+ RESKIN_ICON_STATE = "policechiefalt",
+ RESKIN_WORN_ICON_STATE = "policechiefalt"
+ ),
+ )
/obj/item/clothing/under/rank/security/head_of_security/parade
icon_state = "hos_parade_male_blue"
+ unique_reskin = null
/obj/item/clothing/under/rank/security/head_of_security/parade/female
icon_state = "hos_parade_fem_blue"
+ unique_reskin = null
+
/obj/item/clothing/under/rank/security/head_of_security/alt
icon_state = "hosalt_blue"
+ unique_reskin = null
/obj/item/clothing/under/rank/security/head_of_security/alt/skirt
icon_state = "hosalt_skirt_blue"
+ unique_reskin = null
+
/*
* FEET
@@ -830,35 +911,56 @@
flags_cover = HEADCOVERSEYES
flags_inv = HIDEHAIR
+/obj/item/clothing/head/hats/hos/cap/red
+ icon = 'icons/obj/clothing/head/hats.dmi'
+ worn_icon = 'icons/mob/clothing/head/hats.dmi'
+ icon_state = "hoscap"
+ base_icon_state = "hoscap"
+ unique_reskin = null
+
/*
* UNIFORM
*/
/obj/item/clothing/under/rank/security/officer/redsec
- icon = 'icons/obj/clothing/under/security.dmi'
- worn_icon = 'icons/mob/clothing/under/security.dmi'
icon_state = "rsecurity"
current_skin = "rsecurity" //prevents reskinning
+/obj/item/clothing/under/rank/security/officer/skirt/redsec
+ icon_state = "secskirt"
+ current_skin = "secskirt"
+
/obj/item/clothing/under/rank/security/warden/redsec
- icon = 'icons/obj/clothing/under/security.dmi'
- worn_icon = 'icons/mob/clothing/under/security.dmi'
icon_state = "rwarden"
+ unique_reskin = null
+
+/obj/item/clothing/under/rank/security/warden/skirt/redsec
+ icon_state = "rwarden_skirt"
+ unique_reskin = null
/obj/item/clothing/under/rank/security/head_of_security/redsec
- icon = 'icons/obj/clothing/under/security.dmi'
- worn_icon = 'icons/mob/clothing/under/security.dmi'
icon_state = "rhos"
+ unique_reskin = null
+
+/obj/item/clothing/under/rank/security/head_of_security/skirt/redsec
+ icon_state = "rhos_skirt"
+ unique_reskin = null
/obj/item/clothing/under/rank/security/head_of_security/parade/redsec
- icon = 'icons/obj/clothing/under/security.dmi'
- worn_icon = 'icons/mob/clothing/under/security.dmi'
icon_state = "hos_parade_male"
+ unique_reskin = null
/obj/item/clothing/under/rank/security/head_of_security/parade/female/redsec
- icon = 'icons/obj/clothing/under/security.dmi'
- worn_icon = 'icons/mob/clothing/under/security.dmi'
icon_state = "hos_parade_fem"
+ unique_reskin = null
+
+/obj/item/clothing/under/rank/security/head_of_security/alt/redsec
+ icon_state = "hosalt"
+ unique_reskin = null
+
+/obj/item/clothing/under/rank/security/head_of_security/alt/skirt/redsec
+ icon_state = "hosalt_skirt"
+ unique_reskin = null
/*
* WINTER COAT
@@ -889,6 +991,13 @@
icon_state = "armor_sec"
current_skin = "armor_sec" //prevents reskinning
+/obj/item/clothing/suit/armor/hos/hos_formal/redsec
+ icon = 'icons/obj/clothing/suits/armor.dmi'
+ worn_icon = 'icons/mob/clothing/suits/armor.dmi'
+ icon_state = "hosformal"
+ current_skin = "hosformal" //prevents reskinning (but not toggling!)
+ supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION
+
/*
* FEET
*/
diff --git a/modular_skyrat/modules/gunpoint/code/gunpoint_datum.dm b/modular_skyrat/modules/gunpoint/code/gunpoint_datum.dm
index ca8c9c2f7c2be3..a10cf315529e7a 100644
--- a/modular_skyrat/modules/gunpoint/code/gunpoint_datum.dm
+++ b/modular_skyrat/modules/gunpoint/code/gunpoint_datum.dm
@@ -76,7 +76,7 @@
/datum/gunpoint/Destroy()
UnregisterSignal(aimed_gun, list(COMSIG_ITEM_DROPPED, COMSIG_ITEM_EQUIPPED))
- UnregisterSignal(target, list(COMSIG_QDELETING, COMSIG_ITEM_INTERACTING_WITH_ATOM, COMSIG_ITEM_ATTACK_SELF, COMSIG_LIVING_UNARMED_ATTACK, COMSIG_ITEM_ATTACK_SELF, COMSIG_MOVABLE_RADIO_TALK_INTO, COMSIG_MOB_FIRED_GUN, COMSIG_MOVABLE_MOVED))
+ UnregisterSignal(target, list(COMSIG_QDELETING, COMSIG_ITEM_ATTACK_SELF, COMSIG_LIVING_UNARMED_ATTACK, COMSIG_ITEM_ATTACK_SELF, COMSIG_MOVABLE_RADIO_TALK_INTO, COMSIG_MOB_FIRED_GUN, COMSIG_MOVABLE_MOVED))
UnregisterSignal(source, list(COMSIG_QDELETING, COMSIG_MOVABLE_MOVED, COMSIG_LIVING_STATUS_STUN, COMSIG_LIVING_STATUS_KNOCKDOWN, COMSIG_LIVING_STATUS_PARALYZE, COMSIG_LIVING_UPDATED_RESTING))
REMOVE_TRAIT(source, TRAIT_NORUNNING, "gunpoint")
diff --git a/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm b/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm
index 58cb9b8723dba6..86bf66e3435eca 100644
--- a/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm
+++ b/modular_skyrat/modules/hyposprays/code/hyposprays_II.dm
@@ -97,7 +97,7 @@
icon_state = "bighypo2"
gags_bodystate = "hypo2_deluxe"
desc = "The deluxe variant of the Hypospray Mk. II, able to take both 100u and 50u vials."
- small_only = FALSE
+ allowed_containers = list(/obj/item/reagent_containers/cup/vial/small, /obj/item/reagent_containers/cup/vial/large)
/obj/item/hypospray/mkii/deluxe/cmo
name = "hypospray Mk.II deluxe: CMO edition"
@@ -139,7 +139,7 @@
return
if(vial.reagents.total_volume)
var/vial_spritetype = "chem-color"
- if(!small_only)
+ if(istype(vial, /obj/item/reagent_containers/cup/vial/large))
vial_spritetype += "[vial.type_suffix]"
else
vial_spritetype += "-s"
diff --git a/modular_skyrat/modules/kahraman_equipment/code/clothing/clothing.dm b/modular_skyrat/modules/kahraman_equipment/code/clothing/clothing.dm
index aa4aaaacde61cd..110f462703b1c9 100644
--- a/modular_skyrat/modules/kahraman_equipment/code/clothing/clothing.dm
+++ b/modular_skyrat/modules/kahraman_equipment/code/clothing/clothing.dm
@@ -10,7 +10,7 @@
worn_icon_digi = 'modular_skyrat/modules/kahraman_equipment/icons/clothes/clothing_worn_digi.dmi'
worn_icon_teshari = 'modular_skyrat/modules/kahraman_equipment/icons/clothes/clothing_worn_teshari.dmi'
worn_icon_state = "jumpsuit"
- has_sensor = SENSOR_COORDS
+ sensor_mode = SENSOR_COORDS
random_sensor = FALSE
/obj/item/clothing/under/frontier_colonist/Initialize(mapload)
diff --git a/modular_skyrat/modules/liquids/code/cleaning/drains.dm b/modular_skyrat/modules/liquids/code/cleaning/drains.dm
index c9b15660056d96..4c98b1931d830b 100644
--- a/modular_skyrat/modules/liquids/code/cleaning/drains.dm
+++ b/modular_skyrat/modules/liquids/code/cleaning/drains.dm
@@ -6,7 +6,6 @@
desc = "Drainage inlet embedded in the floor to prevent flooding."
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
density = FALSE
- plane = FLOOR_PLANE
layer = GAS_SCRUBBER_LAYER
anchored = TRUE
var/processing = FALSE
diff --git a/modular_skyrat/modules/liquids/code/cleaning/mop.dm b/modular_skyrat/modules/liquids/code/cleaning/mop.dm
index 799065054d67b6..2634018f315839 100644
--- a/modular_skyrat/modules/liquids/code/cleaning/mop.dm
+++ b/modular_skyrat/modules/liquids/code/cleaning/mop.dm
@@ -8,7 +8,7 @@
// Disable normal cleaning if there are liquids.
if(isturf(atom_to_clean) && turf_to_clean.liquids)
- return CLEAN_BLOCKED
+ return CLEAN_BLOCKED|CLEAN_DONT_BLOCK_INTERACTION
return ..()
diff --git a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_controller.dm b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_controller.dm
index b53cbc3bf04b37..14a0173c723ecd 100644
--- a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_controller.dm
+++ b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_controller.dm
@@ -17,15 +17,22 @@ SUBSYSTEM_DEF(liquids)
var/list/processing_fire = list()
var/fire_counter = 0 //Only process fires on intervals
+ // format: list[path, list[str, instance]]
var/list/singleton_immutables = list()
var/run_type = SSLIQUIDS_RUN_TYPE_TURFS
-/datum/controller/subsystem/liquids/proc/get_immutable(type)
- if(!singleton_immutables[type])
- var/obj/effect/abstract/liquid_turf/immutable/new_one = new type()
- singleton_immutables[type] = new_one
- return singleton_immutables[type]
+/datum/controller/subsystem/liquids/proc/get_immutable(type, turf/reference_turf)
+ if(isnull(singleton_immutables[type]))
+ singleton_immutables[type] = list()
+
+ var/offset = GET_TURF_PLANE_OFFSET(reference_turf)
+
+ if(!("[offset]" in singleton_immutables[type]))
+ var/obj/effect/abstract/liquid_turf/immutable/new_one = new type(null, offset)
+ singleton_immutables[type]["[offset]"] = new_one
+
+ return singleton_immutables[type]["[offset]"]
/datum/controller/subsystem/liquids/stat_entry(msg)
diff --git a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_effect.dm b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_effect.dm
index 443fa8bd35d059..94680daf3d3cd3 100644
--- a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_effect.dm
+++ b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_effect.dm
@@ -6,6 +6,7 @@
anchored = TRUE
plane = FLOOR_PLANE
layer = ABOVE_OPEN_TURF_LAYER
+ appearance_flags = TILE_BOUND
color = "#DDF"
//For being on fire
@@ -222,15 +223,17 @@
/obj/effect/abstract/liquid_turf/proc/make_state_layer(state, has_top)
PRIVATE_PROC(TRUE)
- . = list(make_liquid_overlay("stage[state]_bottom", ABOVE_MOB_LAYER, ABOVE_GAME_PLANE))
+ . = list(make_liquid_overlay("stage[state]_bottom", ABOVE_MOB_LAYER, GAME_PLANE))
if(!has_top)
return
- . += make_liquid_overlay("stage[state]_top", BELOW_OBJ_LAYER, GAME_PLANE)
+ . += make_liquid_overlay("stage[state]_top", TABLE_LAYER + 0.05, GAME_PLANE)
/obj/effect/abstract/liquid_turf/proc/set_new_liquid_state(new_state)
liquid_state = new_state
+ if(!isnull(my_turf))
+ my_turf.liquids_change(new_state)
update_icon(UPDATE_OVERLAYS)
/obj/effect/abstract/liquid_turf/update_overlays()
@@ -651,8 +654,8 @@
smoothing_flags = NONE
icon_state = "ocean"
base_icon_state = "ocean"
- plane = DEFAULT_PLANE //Same as weather, etc.
- layer = ABOVE_MOB_LAYER
+ layer = FLY_LAYER
+ plane = ABOVE_GAME_PLANE
starting_temp = T20C-150
no_effects = TRUE
vis_flags = NONE
@@ -660,8 +663,9 @@
/obj/effect/abstract/liquid_turf/immutable/ocean/warm
starting_temp = T20C+20
-/obj/effect/abstract/liquid_turf/immutable/Initialize(mapload)
+/obj/effect/abstract/liquid_turf/immutable/Initialize(mapload, plane_offset)
. = ..()
+ SET_PLANE_W_SCALAR(src, initial(plane), plane_offset)
reagent_list = starting_mixture.Copy()
total_reagents = 0
for(var/key in reagent_list)
@@ -669,5 +673,3 @@
temp = starting_temp
calculate_height()
set_reagent_color_for_liquid()
-
-
diff --git a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_interaction.dm b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_interaction.dm
index 1ec199f890cc58..ccabef3654f22e 100644
--- a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_interaction.dm
+++ b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_interaction.dm
@@ -12,16 +12,17 @@
interaction_callback = CALLBACK(parent, on_interaction_callback)
/datum/component/liquids_interaction/RegisterWithParent()
- RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, PROC_REF(AfterAttack)) //The only signal allowing item -> turf interaction
+ RegisterSignal(parent, COMSIG_ITEM_INTERACTING_WITH_ATOM, PROC_REF(item_interaction)) //The only signal allowing item -> turf interaction
/datum/component/liquids_interaction/UnregisterFromParent()
- UnregisterSignal(parent, COMSIG_ITEM_AFTERATTACK)
+ UnregisterSignal(parent, COMSIG_ITEM_INTERACTING_WITH_ATOM)
-/datum/component/liquids_interaction/proc/AfterAttack(obj/item/target, turf/turf_target, mob/user)
+/datum/component/liquids_interaction/proc/item_interaction(datum/source, mob/living/user, atom/target, modifiers)
SIGNAL_HANDLER
- if(!isturf(turf_target) || !turf_target.liquids)
+ var/turf/turf_target = target
+ if(!isturf(target) || !turf_target.liquids)
return NONE
if(interaction_callback.Invoke(turf_target, user, turf_target.liquids))
- return COMPONENT_CANCEL_ATTACK_CHAIN
+ return ITEM_INTERACT_SUCCESS
diff --git a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_plumbers.dm b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_plumbers.dm
index dd764e2c564968..c04676a7e377e6 100644
--- a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_plumbers.dm
+++ b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_plumbers.dm
@@ -40,7 +40,7 @@
/obj/machinery/plumbing/floor_pump/update_appearance(updates)
. = ..()
layer = tile_placed ? GAS_SCRUBBER_LAYER : BELOW_OBJ_LAYER
- plane = tile_placed ? FLOOR_PLANE : GAME_PLANE
+ SET_PLANE_IMPLICIT(src, tile_placed ? FLOOR_PLANE : GAME_PLANE)
/obj/machinery/plumbing/floor_pump/update_icon_state()
. = ..()
@@ -294,6 +294,12 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/plumbing/floor_pump/output/on, 0)
MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/plumbing/floor_pump/output/on/supply, 0)
+// Stops at 30 height - perfect for automatically refilling pools and other water fixtures.
+/obj/machinery/plumbing/floor_pump/output/on/supply/waist_deep
+ height_regulator = 30
+
+MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/plumbing/floor_pump/output/on/supply/waist_deep, 0)
+
/obj/item/construction/plumbing/engineering
name = "engineering plumbing constructor"
desc = "A type of plumbing constructor designed to rapidly deploy the machines needed for logistics regarding fluids."
@@ -335,9 +341,25 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/plumbing/floor_pump/output/on/supply,
// Helpers for maps
/obj/machinery/duct/supply
+ color = COLOR_CYAN
duct_color = COLOR_CYAN
duct_layer = FOURTH_DUCT_LAYER
+ pixel_x = 5
+ pixel_y = 5
+
+/obj/machinery/duct/supply/Initialize(mapload)
+ pixel_x = 0
+ pixel_y = 0
+ . = ..()
/obj/machinery/duct/waste
+ color = COLOR_BROWN
duct_color = COLOR_BROWN
duct_layer = SECOND_DUCT_LAYER
+ pixel_x = -5
+ pixel_y = -5
+
+/obj/machinery/duct/waste/Initialize(mapload)
+ pixel_x = 0
+ pixel_y = 0
+ . = ..()
diff --git a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_turf.dm b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_turf.dm
index b23574e40ceb57..91fd436b217414 100644
--- a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_turf.dm
+++ b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_turf.dm
@@ -22,6 +22,10 @@
lgroup.remove_from_group(src)
SSliquids.add_active_turf(src)
+/// Called when liquids flow or otherwise update - intercept COMSIG_TURF_LIQUIDS_CHANGE to react.
+/turf/proc/liquids_change(new_state)
+ SEND_SIGNAL(src, COMSIG_TURF_LIQUIDS_CHANGE, new_state)
+
/obj/effect/abstract/liquid_turf/proc/liquid_simple_delete_flat(flat_amount)
if(flat_amount >= total_reagents)
qdel(src, TRUE)
diff --git a/modular_skyrat/modules/liquids/code/ocean_areas.dm b/modular_skyrat/modules/liquids/code/ocean_areas.dm
index 47e5289c71d673..ce9a64463c5920 100644
--- a/modular_skyrat/modules/liquids/code/ocean_areas.dm
+++ b/modular_skyrat/modules/liquids/code/ocean_areas.dm
@@ -1,6 +1,7 @@
/area/ocean
name = "Ocean"
- icon_state = "space"
+ icon = 'icons/area/areas_station.dmi'
+ icon_state = "explored"
requires_power = TRUE
always_unpowered = TRUE
power_light = FALSE
@@ -12,6 +13,7 @@
sound_environment = SOUND_AREA_SPACE
/area/ocean/generated
+ icon_state = "unexplored"
map_generator = /datum/map_generator/ocean_generator
/area/ocean/trench
@@ -19,6 +21,7 @@
name = "The Trench"
/area/ocean/trench/generated
+ icon_state = "unexplored"
map_generator = /datum/map_generator/cave_generator/trench
/area/ruin/ocean
diff --git a/modular_skyrat/modules/liquids/code/ocean_biomes.dm b/modular_skyrat/modules/liquids/code/ocean_biomes.dm
index 28e1c47d8f8c29..d49698f6caf36e 100644
--- a/modular_skyrat/modules/liquids/code/ocean_biomes.dm
+++ b/modular_skyrat/modules/liquids/code/ocean_biomes.dm
@@ -1,34 +1,34 @@
/datum/biome/ocean_sand
- turf_type = /turf/open/floor/plating/ocean
+ turf_type = /turf/open/misc/ocean
flora_types = list(/obj/effect/spawner/ocean_curio, /obj/structure/flora/rock, /obj/structure/flora/rock/pile, /obj/structure/flora/ocean/glowweed, /obj/structure/flora/ocean/seaweed, /obj/structure/flora/ocean/longseaweed)
flora_density = 10
/datum/biome/ocean_sand_flora
- turf_type = /turf/open/floor/plating/ocean
+ turf_type = /turf/open/misc/ocean
flora_types = list(/obj/effect/spawner/ocean_curio, /obj/structure/flora/rock/pile, /obj/structure/flora/ocean/glowweed, /obj/structure/flora/ocean/seaweed, /obj/structure/flora/ocean/longseaweed, /obj/structure/flora/ocean/coral)
flora_density = 25
fauna_density = 0.03
fauna_types = list(/mob/living/basic/carp)
/datum/biome/ocean_redsand
- turf_type = /turf/open/floor/plating/ocean/ironsand
+ turf_type = /turf/open/misc/ironsand/ocean
flora_types = list(/obj/effect/spawner/ocean_curio, /obj/structure/flora/rock/pile, /obj/structure/flora/ocean/glowweed, /obj/structure/flora/ocean/seaweed, /obj/structure/flora/ocean/longseaweed, /obj/structure/flora/ocean/coral)
flora_density = 40
fauna_density = 0.06
fauna_types = list(/mob/living/basic/carp)
/datum/biome/ocean_rocklight
- turf_type = /turf/open/floor/plating/ocean/rock
+ turf_type = /turf/open/misc/ocean/rock
flora_types = list(/obj/effect/spawner/ocean_curio/rock, /obj/structure/flora/rock, /obj/structure/flora/rock/pile)
flora_density = 3
/datum/biome/ocean_rockmed
- turf_type = /turf/open/floor/plating/ocean/rock/medium
+ turf_type = /turf/open/misc/ocean/rock/medium
flora_types = list(/obj/effect/spawner/ocean_curio/rock, /obj/structure/flora/rock, /obj/structure/flora/rock/pile)
flora_density = 5
/datum/biome/ocean_rockheavy
- turf_type = /turf/open/floor/plating/ocean/rock/heavy
+ turf_type = /turf/open/misc/ocean/rock/heavy
flora_types = list(/obj/effect/spawner/ocean_curio/rock, /obj/structure/flora/rock, /obj/structure/flora/rock/pile)
flora_density = 7
diff --git a/modular_skyrat/modules/liquids/code/ocean_flora.dm b/modular_skyrat/modules/liquids/code/ocean_flora.dm
index a3f93496cfd5e5..3cd2af2fa0a57d 100644
--- a/modular_skyrat/modules/liquids/code/ocean_flora.dm
+++ b/modular_skyrat/modules/liquids/code/ocean_flora.dm
@@ -81,7 +81,10 @@
#undef SCRAP_METAL_YIELD_HIGH
/obj/effect/spawner/liquids_spawner
- name = "Liquids Spawner"
+ name = "Liquids Spawner (Water, Waist-Deep)"
+ icon = 'modular_skyrat/modules/liquids/icons/obj/effects/liquid.dmi'
+ icon_state = "spawner"
+ color = "#AAAAAA77"
var/reagent_list = list(/datum/reagent/water = ONE_LIQUIDS_HEIGHT*LIQUID_WAIST_LEVEL_HEIGHT)
var/temp = T20C
@@ -93,11 +96,21 @@
var/turf/T = loc
T.add_liquid_list(reagent_list, FALSE, temp)
-/obj/effect/spawner/liquids_spawner/acid_puddle
- reagent_list = list(/datum/reagent/toxin/acid = ONE_LIQUIDS_HEIGHT)
+/obj/effect/spawner/liquids_spawner/puddle
+ name = "Liquids Spawner (Water, Puddle)"
+ reagent_list = list(/datum/reagent/water = ONE_LIQUIDS_HEIGHT)
-/obj/effect/spawner/liquids_spawner/acid_waist
- reagent_list = list(/datum/reagent/toxin/acid = ONE_LIQUIDS_HEIGHT*LIQUID_WAIST_LEVEL_HEIGHT)
+/obj/effect/spawner/liquids_spawner/ankles
+ name = "Liquids Spawner (Water, Ankle-Deep)"
+ reagent_list = list(/datum/reagent/water = ONE_LIQUIDS_HEIGHT*LIQUID_ANKLES_LEVEL_HEIGHT)
+
+/obj/effect/spawner/liquids_spawner/shoulders
+ name = "Liquids Spawner (Water, Shoulder-Deep)"
+ reagent_list = list(/datum/reagent/water = ONE_LIQUIDS_HEIGHT*LIQUID_SHOULDERS_LEVEL_HEIGHT)
+
+/obj/effect/spawner/liquids_spawner/fulltile
+ name = "Liquids Spawner (Water, Fulltile)"
+ reagent_list = list(/datum/reagent/water = ONE_LIQUIDS_HEIGHT*LIQUID_FULLTILE_LEVEL_HEIGHT)
/obj/effect/spawner/ocean_curio
name = "Ocean Curio Spawner"
diff --git a/modular_skyrat/modules/liquids/code/ocean_mapgen.dm b/modular_skyrat/modules/liquids/code/ocean_mapgen.dm
index aaaef881cced79..4f72a4a1b5ac0f 100644
--- a/modular_skyrat/modules/liquids/code/ocean_mapgen.dm
+++ b/modular_skyrat/modules/liquids/code/ocean_mapgen.dm
@@ -42,7 +42,7 @@
for(var/t in turfs) //Go through all the turfs and generate them
var/turf/gen_turf = t
- if(istype(gen_turf, /turf/open/space/mirage) || istype(gen_turf, /turf/open/openspace/ocean))
+ if(istype(gen_turf, /turf/open/openspace/ocean))
continue
var/drift_x = (gen_turf.x + rand(-BIOME_RANDOM_SQUARE_DRIFT, BIOME_RANDOM_SQUARE_DRIFT)) / perlin_zoom
@@ -85,15 +85,25 @@
/datum/map_generator/cave_generator/trench
name = "Trench Generator"
- open_turf_types = list(/turf/open/floor/plating/ocean/rock/heavy = 1)
- closed_turf_types = list(/turf/closed/mineral/random/ocean = 1)
+ weighted_open_turf_types = list(/turf/open/misc/ocean/rock/heavy = 1)
+ weighted_closed_turf_types = list(/turf/closed/mineral/random/ocean = 1)
- feature_spawn_list = null
-
- mob_spawn_list = list(/mob/living/basic/carp = 1)
+ weighted_mob_spawn_list = list(/mob/living/basic/carp = 1)
mob_spawn_chance = 1
+ ///Note that this spawn list is also in the lavaland generator
+ weighted_feature_spawn_list = list(
+ /obj/structure/geyser/hollowwater = 10, \
+ /obj/structure/geyser/plasma_oxide = 10, \
+ /obj/structure/geyser/protozine = 10, \
+ /obj/structure/geyser/random = 2, \
+ /obj/structure/geyser/wittel = 10, \
+ )
+
flora_spawn_chance = 4
- flora_spawn_list = list(/obj/structure/flora/rock = 1, /obj/structure/flora/rock/pile = 1)
+ weighted_flora_spawn_list = list(
+ /obj/structure/flora/rock = 1, \
+ /obj/structure/flora/rock/pile = 1, \
+ )
#undef BIOME_RANDOM_SQUARE_DRIFT
diff --git a/modular_skyrat/modules/liquids/code/ocean_turfs.dm b/modular_skyrat/modules/liquids/code/ocean_turfs.dm
index 356cda189a14ed..e0b94156f50792 100644
--- a/modular_skyrat/modules/liquids/code/ocean_turfs.dm
+++ b/modular_skyrat/modules/liquids/code/ocean_turfs.dm
@@ -2,7 +2,7 @@
name = "ocean"
planetary_atmos = TRUE
baseturfs = /turf/open/openspace/ocean
- var/replacement_turf = /turf/open/floor/plating/ocean
+ var/replacement_turf = /turf/open/misc/ocean
/turf/open/openspace/ocean/Initialize(mapload)
. = ..()
@@ -10,16 +10,20 @@
for(var/obj/structure/flora/plant in contents)
qdel(plant)
var/turf/T = GET_TURF_BELOW(src)
- if(T)
- if(T.turf_flags & NO_RUINS)
- ChangeTurf(replacement_turf, null, CHANGETURF_IGNORE_AIR)
- return
- if(!ismineralturf(T))
- return
- var/turf/closed/mineral/M = T
- M.mineralAmt = 0
- M.gets_drilled()
- baseturfs = /turf/open/openspace/ocean //This is to ensure that IF random turf generation produces a openturf, there won't be other turfs assigned other than openspace.
+ //I wonder if I should error here
+ if(!T)
+ return
+ if(T.turf_flags & NO_RUINS)
+ var/turf/newturf = ChangeTurf(replacement_turf, null, CHANGETURF_IGNORE_AIR)
+ if(!isopenspaceturf(newturf)) // only openspace turfs should be returning INITIALIZE_HINT_LATELOAD
+ return INITIALIZE_HINT_NORMAL
+ return
+ if(!ismineralturf(T))
+ return
+ var/turf/closed/mineral/M = T
+ M.mineralAmt = 0
+ M.gets_drilled()
+ baseturfs = /turf/open/openspace/ocean //This is to ensure that IF random turf generation produces a openturf, there won't be other turfs assigned other than openspace.
/turf/open/openspace/ocean/Initialize(mapload)
. = ..()
@@ -31,26 +35,36 @@
var/obj/effect/abstract/liquid_turf/immutable/new_immmutable = SSliquids.get_immutable(/obj/effect/abstract/liquid_turf/immutable/ocean)
new_immmutable.add_turf(src)
-/turf/open/floor/plating/ocean/ironsand
- baseturfs = /turf/open/floor/plating/ocean/ironsand
- icon_state = "ironsand1"
- base_icon_state = "ironsand"
- rand_variants = 15
- rand_chance = 100
+/turf/open/misc/ironsand/ocean
+ planetary_atmos = TRUE
+ baseturfs = /turf/open/misc/ocean
+
+/turf/open/misc/ironsand/ocean/Initialize(mapload)
+ . = ..()
+ if(liquids)
+ if(liquids.immutable)
+ liquids.remove_turf(src)
+ else
+ qdel(liquids, TRUE)
+ var/obj/effect/abstract/liquid_turf/immutable/new_immmutable = SSliquids.get_immutable(/obj/effect/abstract/liquid_turf/immutable/ocean, src)
+ new_immmutable.add_turf(src)
-/turf/open/floor/plating/ocean/rock
+
+/turf/open/misc/ocean/rock
name = "rock"
- baseturfs = /turf/open/floor/plating/ocean/rock
+ desc = "Polished over centuries of undersea weather conditions and a distinct lack of light."
+ baseturfs = /turf/open/misc/ocean/rock
icon = 'modular_skyrat/modules/liquids/icons/turf/seafloor.dmi'
icon_state = "seafloor"
base_icon_state = "seafloor"
rand_variants = 0
-/turf/open/floor/plating/ocean/rock/warm
+/turf/open/misc/ocean/rock/warm
liquid_type = /obj/effect/abstract/liquid_turf/immutable/ocean/warm
-/turf/open/floor/plating/ocean/rock/warm/fissure
+/turf/open/misc/ocean/rock/warm/fissure
name = "fissure"
+ desc = "A comfortable, warm tempature eminates from these - followed immediately after by toxic chemicals in liquid or gaseous forms; but warmth all the same!"
icon = 'modular_skyrat/modules/liquids/icons/turf/fissure.dmi'
icon_state = "fissure-0"
base_icon_state = "fissure"
@@ -60,20 +74,21 @@
light_range = 3
light_color = LIGHT_COLOR_LAVA
-/turf/open/floor/plating/ocean/rock/medium
+/turf/open/misc/ocean/rock/medium
icon_state = "seafloor_med"
base_icon_state = "seafloor_med"
- baseturfs = /turf/open/floor/plating/ocean/rock/medium
+ baseturfs = /turf/open/misc/ocean/rock/medium
-/turf/open/floor/plating/ocean/rock/heavy
+/turf/open/misc/ocean/rock/heavy
icon_state = "seafloor_heavy"
base_icon_state = "seafloor_heavy"
- baseturfs = /turf/open/floor/plating/ocean/rock/heavy
+ baseturfs = /turf/open/misc/ocean/rock/heavy
-/turf/open/floor/plating/ocean
+/turf/open/misc/ocean
gender = PLURAL
name = "ocean sand"
- baseturfs = /turf/open/floor/plating/ocean
+ desc = "If you can't escape sandstorms underwater, is anywhere safe?"
+ baseturfs = /turf/open/misc/ocean
icon = 'icons/turf/floors.dmi'
icon_state = "asteroid"
base_icon_state = "asteroid"
@@ -86,24 +101,24 @@
var/rand_chance = 30
var/liquid_type = /obj/effect/abstract/liquid_turf/immutable/ocean
-/turf/open/floor/plating/ocean/Initialize(mapload)
+/turf/open/misc/ocean/Initialize(mapload)
. = ..()
if(liquids)
if(liquids.immutable)
liquids.remove_turf(src)
else
qdel(liquids, TRUE)
- var/obj/effect/abstract/liquid_turf/immutable/new_immmutable = SSliquids.get_immutable(liquid_type)
+ var/obj/effect/abstract/liquid_turf/immutable/new_immmutable = SSliquids.get_immutable(liquid_type, src)
new_immmutable.add_turf(src)
if(rand_variants && prob(rand_chance))
var/random = rand(1,rand_variants)
- icon_state = "[base_icon_state][random]"
- base_icon_state = "[base_icon_state][random]"
+ icon_state = "[icon_state][random]"
+ base_icon_state = "[icon_state][random]"
/turf/open/floor/plating/ocean_plating
planetary_atmos = TRUE
- baseturfs = /turf/open/floor/plating/ocean_plating
+ baseturfs = /turf/open/misc/ocean
/turf/open/floor/plating/ocean_plating/Initialize(mapload)
. = ..()
@@ -112,12 +127,12 @@
liquids.remove_turf(src)
else
qdel(liquids, TRUE)
- var/obj/effect/abstract/liquid_turf/immutable/new_immmutable = SSliquids.get_immutable(/obj/effect/abstract/liquid_turf/immutable/ocean)
+ var/obj/effect/abstract/liquid_turf/immutable/new_immmutable = SSliquids.get_immutable(/obj/effect/abstract/liquid_turf/immutable/ocean, src)
new_immmutable.add_turf(src)
/turf/open/floor/iron/ocean
planetary_atmos = TRUE
- baseturfs = /turf/open/floor/iron/ocean
+ baseturfs = /turf/open/floor/plating/ocean_plating
/turf/open/floor/iron/ocean/Initialize(mapload)
. = ..()
@@ -126,36 +141,109 @@
liquids.remove_turf(src)
else
qdel(liquids, TRUE)
- var/obj/effect/abstract/liquid_turf/immutable/new_immmutable = SSliquids.get_immutable(/obj/effect/abstract/liquid_turf/immutable/ocean)
+ var/obj/effect/abstract/liquid_turf/immutable/new_immmutable = SSliquids.get_immutable(/obj/effect/abstract/liquid_turf/immutable/ocean, src)
+ new_immmutable.add_turf(src)
+
+/turf/open/floor/iron/solarpanel/ocean
+ planetary_atmos = TRUE
+ baseturfs = /turf/open/floor/plating/ocean_plating
+
+/turf/open/floor/iron/solarpanel/ocean/Initialize(mapload)
+ . = ..()
+ if(liquids)
+ if(liquids.immutable)
+ liquids.remove_turf(src)
+ else
+ qdel(liquids, TRUE)
+ var/obj/effect/abstract/liquid_turf/immutable/new_immmutable = SSliquids.get_immutable(/obj/effect/abstract/liquid_turf/immutable/ocean, src)
+ new_immmutable.add_turf(src)
+
+/turf/open/floor/engine/hull/reinforced/ocean
+ initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+ temperature = T20C
+ planetary_atmos = TRUE
+ baseturfs = /turf/open/misc/ocean
+
+/turf/open/floor/engine/hull/reinforced/ocean/Initialize(mapload)
+ . = ..()
+ if(liquids)
+ if(liquids.immutable)
+ liquids.remove_turf(src)
+ else
+ qdel(liquids, TRUE)
+ var/obj/effect/abstract/liquid_turf/immutable/new_immmutable = SSliquids.get_immutable(/obj/effect/abstract/liquid_turf/immutable/ocean, src)
+ new_immmutable.add_turf(src)
+
+/turf/open/floor/glass/reinforced/ocean
+ planetary_atmos = TRUE
+ baseturfs = /turf/open/floor/plating/ocean_plating
+
+/turf/open/floor/glass/reinforced/ocean/Initialize(mapload)
+ . = ..()
+ if(liquids)
+ if(liquids.immutable)
+ liquids.remove_turf(src)
+ else
+ qdel(liquids, TRUE)
+ var/obj/effect/abstract/liquid_turf/immutable/new_immmutable = SSliquids.get_immutable(/obj/effect/abstract/liquid_turf/immutable/ocean, src)
+ new_immmutable.add_turf(src)
+
+/turf/open/floor/glass/plasma/ocean
+ planetary_atmos = TRUE
+ baseturfs = /turf/open/floor/plating/ocean_plating
+
+/turf/open/floor/glass/plasma/ocean/Initialize(mapload)
+ . = ..()
+ if(liquids)
+ if(liquids.immutable)
+ liquids.remove_turf(src)
+ else
+ qdel(liquids, TRUE)
+ var/obj/effect/abstract/liquid_turf/immutable/new_immmutable = SSliquids.get_immutable(/obj/effect/abstract/liquid_turf/immutable/ocean, src)
+ new_immmutable.add_turf(src)
+
+/turf/open/floor/glass/reinforced/plasma/ocean
+ planetary_atmos = TRUE
+ baseturfs = /turf/open/floor/plating/ocean_plating
+
+/turf/open/floor/glass/reinforced/plasma/ocean/Initialize(mapload)
+ . = ..()
+ if(liquids)
+ if(liquids.immutable)
+ liquids.remove_turf(src)
+ else
+ qdel(liquids, TRUE)
+ var/obj/effect/abstract/liquid_turf/immutable/new_immmutable = SSliquids.get_immutable(/obj/effect/abstract/liquid_turf/immutable/ocean, src)
new_immmutable.add_turf(src)
/turf/closed/mineral/random/ocean
- baseturfs = /turf/open/floor/plating/ocean/rock/heavy
- turf_type = /turf/open/floor/plating/ocean/rock/heavy
+ baseturfs = /turf/open/misc/ocean/rock/heavy
+ turf_type = /turf/open/misc/ocean/rock/heavy
color = "#58606b"
/turf/closed/mineral/random/high_chance/ocean
- baseturfs = /turf/open/floor/plating/ocean/rock/heavy
- turf_type = /turf/open/floor/plating/ocean/rock/heavy
+ baseturfs = /turf/open/misc/ocean/rock/heavy
+ turf_type = /turf/open/misc/ocean/rock/heavy
color = "#58606b"
/turf/closed/mineral/random/low_chance/ocean
- baseturfs = /turf/open/floor/plating/ocean/rock/heavy
- turf_type = /turf/open/floor/plating/ocean/rock/heavy
+ baseturfs = /turf/open/misc/ocean/rock/heavy
+ turf_type = /turf/open/misc/ocean/rock/heavy
color = "#58606b"
/turf/closed/mineral/random/stationside/ocean
- baseturfs = /turf/open/floor/plating/ocean/rock/heavy
- turf_type = /turf/open/floor/plating/ocean/rock/heavy
+ baseturfs = /turf/open/misc/ocean/rock/heavy
+ turf_type = /turf/open/misc/ocean/rock/heavy
color = "#58606b"
/obj/effect/abstract/liquid_turf/immutable/canal
starting_mixture = list(/datum/reagent/water = 100)
-/turf/open/floor/plating/canal
+/turf/open/misc/canal
gender = PLURAL
name = "canal"
- baseturfs = /turf/open/floor/plating/canal
+ desc = "A section of the earth given way to form a natural aqueduct."
+ baseturfs = /turf/open/misc/canal
icon = 'icons/turf/floors.dmi'
icon_state = "asteroid"
base_icon_state = "asteroid"
@@ -166,20 +254,21 @@
liquid_height = -30
turf_height = -30
-/turf/open/floor/plating/canal/Initialize(mapload)
+/turf/open/misc/canal/Initialize(mapload)
. = ..()
if(liquids)
if(liquids.immutable)
liquids.remove_turf(src)
else
qdel(liquids, TRUE)
- var/obj/effect/abstract/liquid_turf/immutable/new_immmutable = SSliquids.get_immutable(/obj/effect/abstract/liquid_turf/immutable/canal)
+ var/obj/effect/abstract/liquid_turf/immutable/new_immmutable = SSliquids.get_immutable(/obj/effect/abstract/liquid_turf/immutable/canal, src)
new_immmutable.add_turf(src)
-/turf/open/floor/plating/canal_mutable
+/turf/open/misc/canal_mutable
gender = PLURAL
name = "canal"
- baseturfs = /turf/open/floor/plating/canal_mutable
+ desc = "A section of the earth given way to form a natural aqueduct."
+ baseturfs = /turf/open/misc/canal_mutable
icon = 'icons/turf/floors.dmi'
icon_state = "asteroid"
base_icon_state = "asteroid"
diff --git a/modular_skyrat/modules/liquids/icons/obj/effects/liquid.dmi b/modular_skyrat/modules/liquids/icons/obj/effects/liquid.dmi
index 35ae915a4bff39..6babb35b68ee39 100644
Binary files a/modular_skyrat/modules/liquids/icons/obj/effects/liquid.dmi and b/modular_skyrat/modules/liquids/icons/obj/effects/liquid.dmi differ
diff --git a/modular_skyrat/modules/mapping/code/turf.dm b/modular_skyrat/modules/mapping/code/turf.dm
index ab8aa19dfe84d0..a9b1f35802ab28 100644
--- a/modular_skyrat/modules/mapping/code/turf.dm
+++ b/modular_skyrat/modules/mapping/code/turf.dm
@@ -5,7 +5,7 @@
desc = "A patch of fertile soil that you can plant stuff in."
icon = 'icons/turf/floors.dmi' // This makes it look like the dirt floor
icon_state = "dirt"
- layer = 2.0001
+ layer = LOW_FLOOR_LAYER
plane = FLOOR_PLANE
self_sustaining = 1
pixel_z = 0
diff --git a/modular_skyrat/modules/marines/code/gear.dm b/modular_skyrat/modules/marines/code/gear.dm
index 7f5b6478a84019..c98610cab1d2f9 100644
--- a/modular_skyrat/modules/marines/code/gear.dm
+++ b/modular_skyrat/modules/marines/code/gear.dm
@@ -93,16 +93,18 @@
QDEL_NULL(underbarrel)
return ..()
-/obj/item/gun/ballistic/automatic/ar/modular/m44a/shotgun/item_interaction_secondary(mob/living/user, obj/item/tool, list/modifiers)
- underbarrel.item_interaction(user, tool, modifiers)
- return ITEM_INTERACT_SUCCESS
+/obj/item/gun/ballistic/automatic/ar/modular/m44a/shotgun/try_fire_gun(atom/target, mob/living/user, params)
+ if(LAZYACCESS(params2list(params), RIGHT_CLICK))
+ return underbarrel.try_fire_gun(target, user, params)
+ return ..()
-/obj/item/gun/ballistic/automatic/ar/modular/m44a/shotgun/attackby(obj/item/attacking_item, mob/user, params)
- if(!istype(attacking_item, /obj/item/ammo_casing))
- ..()
- if(istype(attacking_item, underbarrel.magazine.ammo_type))
- underbarrel.attack_self(user)
- underbarrel.attackby(attacking_item, user, params)
+/obj/item/gun/ballistic/automatic/ar/modular/m44a/shotgun/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+ if(isammocasing(tool))
+ if(istype(tool, underbarrel.magazine.ammo_type))
+ underbarrel.attackby(tool, user, list2params(modifiers))
+ underbarrel.attack_self(user)
+ return ITEM_INTERACT_BLOCKING
+ return ..()
/obj/item/gun/ballistic/automatic/ar/modular/m44a/grenadelauncher
name = "\improper NT M44AGL Pulse Rifle"
@@ -121,13 +123,15 @@
QDEL_NULL(underbarrel)
return ..()
-/obj/item/gun/ballistic/automatic/ar/modular/m44a/grenadelauncher/interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers)
- underbarrel.interact_with_atom(interacting_with, user, modifiers)
- return ITEM_INTERACT_SUCCESS
+/obj/item/gun/ballistic/automatic/ar/modular/m44a/grenadelauncher/try_fire_gun(atom/target, mob/living/user, params)
+ if(LAZYACCESS(params2list(params), RIGHT_CLICK))
+ return underbarrel.try_fire_gun(target, user, params)
+ return ..()
-/obj/item/gun/ballistic/automatic/ar/modular/m44a/grenadelauncher/attackby(obj/item/attacking_item, mob/user, params)
- if(!istype(attacking_item, /obj/item/ammo_casing))
- ..()
- if(istype(attacking_item, underbarrel.magazine.ammo_type))
- underbarrel.attack_self(user)
- underbarrel.attackby(attacking_item, user, params)
+/obj/item/gun/ballistic/automatic/ar/modular/m44a/grenadelauncher/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+ if(isammocasing(tool))
+ if(istype(tool, underbarrel.magazine.ammo_type))
+ underbarrel.attackby(tool, user, list2params(modifiers))
+ underbarrel.attack_self(user)
+ return ITEM_INTERACT_BLOCKING
+ return ..()
diff --git a/modular_skyrat/modules/medical/code/smartdarts.dm b/modular_skyrat/modules/medical/code/smartdarts.dm
index cf329b64daaaa1..142f00c6b97aec 100644
--- a/modular_skyrat/modules/medical/code/smartdarts.dm
+++ b/modular_skyrat/modules/medical/code/smartdarts.dm
@@ -10,32 +10,31 @@
//Code that handles the base interactions involving smartdarts
/obj/item/reagent_containers/syringe/smartdart/interact_with_atom(atom/target, mob/living/user, list/modifiers)
- if(isliving(target))
+ if(target.reagents)
to_chat(user, span_warning("The [src] is unable to manually inject chemicals."))
- return
-
+ return NONE
//A majority of this code is from the original syringes.dm file.
-/obj/item/reagent_containers/syringe/smartdart/interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers)
- if(!try_syringe(interacting_with, user))
+/obj/item/reagent_containers/syringe/smartdart/interact_with_atom_secondary(atom/target, mob/living/user, list/modifiers)
+ if(!try_syringe(target, user))
return ITEM_INTERACT_BLOCKING
if(reagents.total_volume >= reagents.maximum_volume)
to_chat(user, span_notice("[src] is full."))
return ITEM_INTERACT_BLOCKING
- if(isliving(interacting_with))
+ if(isliving(target))
to_chat(user, span_warning("The [src] is unable to take blood."))
return ITEM_INTERACT_BLOCKING
- if(!interacting_with.reagents.total_volume)
- to_chat(user, span_warning("[interacting_with] is empty!"))
+ if(!target.reagents.total_volume)
+ to_chat(user, span_warning("[target] is empty!"))
return ITEM_INTERACT_BLOCKING
- if(!interacting_with.is_drawable(user))
- to_chat(user, span_warning("You cannot directly remove reagents from [interacting_with]!"))
+ if(!target.is_drawable(user))
+ to_chat(user, span_warning("You cannot directly remove reagents from [target]!"))
return ITEM_INTERACT_BLOCKING
- var/trans = interacting_with.reagents.trans_to(src, amount_per_transfer_from_this, transferred_by = user) // transfer from, transfer to - who cares?
+ var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this, transferred_by = user) // transfer from, transfer to - who cares?
to_chat(user, span_notice("You fill [src] with [trans] units of the solution. It now contains [reagents.total_volume] units."))
return ITEM_INTERACT_SUCCESS
@@ -57,12 +56,11 @@
/obj/item/gun/syringe/smartdart/give_gun_safeties()
return
-/obj/item/gun/syringe/smartdart/attackby(obj/item/container, mob/user, params, show_msg = TRUE)
- if(istype(container, /obj/item/reagent_containers/syringe/smartdart))
- ..()
- else
- to_chat(user, span_notice("The [container] is unable to fit inside of the [src]! Try using a SmartDart instead."))
- return FALSE
+/obj/item/gun/syringe/smartdart/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+ if(istype(tool, /obj/item/reagent_containers/syringe/smartdart))
+ return ..()
+ to_chat(user, span_notice("The [tool] is unable to fit inside of the [src]! Try using a SmartDart instead."))
+ return ITEM_INTERACT_BLOCKING
/obj/item/gun/syringe/smartdart/examine(mob/user)
. = ..()
diff --git a/modular_skyrat/modules/modular_implants/code/misc_devices.dm b/modular_skyrat/modules/modular_implants/code/misc_devices.dm
index 2582d06a95912f..8f097a34d33200 100644
--- a/modular_skyrat/modules/modular_implants/code/misc_devices.dm
+++ b/modular_skyrat/modules/modular_implants/code/misc_devices.dm
@@ -144,18 +144,15 @@
return .
-/obj/item/nif_hud_adapter/afterattack(obj/item/clothing/glasses/target_glasses, mob/user, proximity_flag, click_parameters)
- . = ..()
- if(!proximity_flag || !istype(target_glasses))
- return FALSE
-
- if(!is_type_in_list(target_glasses, glasses_whitelist))
- balloon_alert("incompatible!")
- return FALSE
+/obj/item/nif_hud_adapter/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ var/obj/item/clothing/glasses/target_glasses = interacting_with
+ if(!istype(target_glasses) || !is_type_in_list(target_glasses, glasses_whitelist))
+ balloon_alert(user, "incompatible!")
+ return NONE
if(HAS_TRAIT(target_glasses, TRAIT_NIFSOFT_HUD_GRANTER))
- balloon_alert("already upgraded!")
- return FALSE
+ balloon_alert(user, "already upgraded!")
+ return ITEM_INTERACT_BLOCKING
user.visible_message(span_notice("[user] upgrades [target_glasses] with [src]."), span_notice("You upgrade [target_glasses] to be NIF HUD compatible."))
target_glasses.name = "\improper HUD-upgraded " + target_glasses.name
@@ -164,4 +161,5 @@
if(!multiple_uses)
qdel(src)
+ return ITEM_INTERACT_SUCCESS
diff --git a/modular_skyrat/modules/modular_implants/code/soulcatcher/attachable_soulcatcher.dm b/modular_skyrat/modules/modular_implants/code/soulcatcher/attachable_soulcatcher.dm
index 0d2de8f71218ca..7840d312dfb665 100644
--- a/modular_skyrat/modules/modular_implants/code/soulcatcher/attachable_soulcatcher.dm
+++ b/modular_skyrat/modules/modular_implants/code/soulcatcher/attachable_soulcatcher.dm
@@ -80,21 +80,17 @@
/obj/item/attachable_soulcatcher/attack_self(mob/user, modifiers)
linked_soulcatcher.ui_interact(user)
-/obj/item/attachable_soulcatcher/afterattack(obj/item/target_item, mob/user, proximity_flag, click_parameters)
- . = ..()
- if(!proximity_flag || !istype(target_item))
- return FALSE
+/obj/item/attachable_soulcatcher/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ if(!isitem(interacting_with) || is_type_in_list(interacting_with, blacklisted_items))
+ balloon_alert(user, "incompatible!")
+ return NONE
- if(target_item.GetComponent(/datum/component/carrier))
+ if(interacting_with.GetComponent(/datum/component/carrier/soulcatcher))
balloon_alert(user, "already attached!")
- return FALSE
-
- if(is_type_in_list(target_item, blacklisted_items))
- balloon_alert(user, "incompatible!")
- return FALSE
+ return ITEM_INTERACT_BLOCKING
- var/datum/component/carrier/soulcatcher/attachable/new_soulcatcher = target_item.AddComponent(/datum/component/carrier/soulcatcher/attachable)
- playsound(target_item.loc, 'sound/weapons/circsawhit.ogg', 50, vary = TRUE)
+ var/datum/component/carrier/soulcatcher/new_soulcatcher = interacting_with.AddComponent(/datum/component/carrier/soulcatcher/attachable)
+ playsound(interacting_with.loc, 'sound/weapons/circsawhit.ogg', 50, vary = TRUE)
var/datum/carrier_room/target_room = new_soulcatcher.carrier_rooms[1]
var/list/current_mobs = linked_soulcatcher.get_current_mobs()
diff --git a/modular_skyrat/modules/modular_items/code/modular_glasses.dm b/modular_skyrat/modules/modular_items/code/modular_glasses.dm
index 96272393a1fd25..e39aa32e5526d2 100644
--- a/modular_skyrat/modules/modular_items/code/modular_glasses.dm
+++ b/modular_skyrat/modules/modular_items/code/modular_glasses.dm
@@ -88,7 +88,7 @@
if(ishuman(user)) // Make sure they're a human wearing the glasses first
var/mob/living/carbon/human/human = user
if(human.glasses == src)
- var/datum/atom_hud/our_hud = GLOB.huds[initial(glasses_type.hud_type)]
+ var/datum/atom_hud/our_hud = GLOB.huds[initial(glasses_type.hud_types)]
our_hud.show_to(human)
for(var/trait in initial(glasses_type.clothing_traits))
ADD_TRAIT(human, trait, GLASSES_TRAIT)
@@ -97,7 +97,7 @@
if(ishuman(user)) // Make sure they're a human wearing the glasses first
var/mob/living/carbon/human/human = user
if(human.glasses == src)
- var/datum/atom_hud/our_hud = GLOB.huds[initial(glasses_type.hud_type)]
+ var/datum/atom_hud/our_hud = GLOB.huds[initial(glasses_type.hud_types)]
our_hud.hide_from(human)
for(var/trait in initial(glasses_type.clothing_traits))
REMOVE_TRAIT(human, trait, GLASSES_TRAIT)
@@ -109,17 +109,17 @@
tint = initial(glasses_type.tint)
color_cutoffs = initial(glasses_type.color_cutoffs)
vision_flags = initial(glasses_type.vision_flags)
- hud_type = initial(glasses_type.hud_type)
//initial does not currently work on lists so we must do this
var/obj/item/clothing/glasses/hud/ar/glasses_object = new glasses_type // make a temporary glasses obj
clothing_traits = glasses_object.clothing_traits // pull the list from the created obj
+ hud_types = glasses_object.hud_types // same here
qdel(glasses_object) // delete the object
/obj/item/clothing/glasses/hud/ar/proc/disable_vars(mob/user)
vision_flags = 0 /// Sets vision_flags to 0 to disable meson view mainly
color_cutoffs = null // Resets lighting_alpha to user's default one
clothing_traits = null /// also disables the options for Science functionality
- hud_type = null
+ hud_types = null
/// Create new icon and worn_icon, with only the first frame of every state and setting that as icon.
/// this practically freezes the animation :)
@@ -164,7 +164,7 @@
icon_state = "aviator_sec"
off_state = "aviator_sec_flash"
flash_protect = FLASH_PROTECTION_NONE
- hud_type = DATA_HUD_SECURITY_ADVANCED
+ hud_types = list(DATA_HUD_SECURITY_ADVANCED)
clothing_traits = list(TRAIT_SECURITY_HUD)
glass_colour_type = /datum/client_colour/glass_colour/red
modes = list(MODE_OFF_FLASH_PROTECTION, MODE_ON)
@@ -176,7 +176,7 @@
desc = "A heads-up display that scans the humanoids in view and provides accurate data about their health status. This HUD has been fitted inside of a pair of sunglasses."
icon_state = "aviator_med"
flash_protect = FLASH_PROTECTION_NONE
- hud_type = DATA_HUD_MEDICAL_ADVANCED
+ hud_types = list(DATA_HUD_MEDICAL_ADVANCED)
clothing_traits = list(TRAIT_MEDICAL_HUD)
glass_colour_type = /datum/client_colour/glass_colour/lightblue
@@ -197,7 +197,7 @@
desc = "A heads-up display capable of analyzing the integrity and status of robotics and exosuits. This HUD has been fitted inside of a pair of sunglasses."
icon_state = "aviator_diagnostic"
flash_protect = FLASH_PROTECTION_NONE
- hud_type = DATA_HUD_DIAGNOSTIC_BASIC
+ hud_types = list(DATA_HUD_DIAGNOSTIC_BASIC)
clothing_traits = list(TRAIT_DIAGNOSTIC_HUD)
glass_colour_type = /datum/client_colour/glass_colour/lightorange
@@ -263,19 +263,19 @@
/obj/item/clothing/glasses/hud/ar/projector/health
name = "retinal projector health HUD"
icon_state = "projector_med"
- hud_type = DATA_HUD_MEDICAL_ADVANCED
+ hud_types = list(DATA_HUD_MEDICAL_ADVANCED)
clothing_traits = list(ID_HUD, TRAIT_MEDICAL_HUD)
/obj/item/clothing/glasses/hud/ar/projector/security
name = "retinal projector security HUD"
icon_state = "projector_sec"
- hud_type = DATA_HUD_SECURITY_ADVANCED
+ hud_types = list(DATA_HUD_SECURITY_ADVANCED)
clothing_traits = list(TRAIT_SECURITY_HUD)
/obj/item/clothing/glasses/hud/ar/projector/diagnostic
name = "retinal projector diagnostic HUD"
icon_state = "projector_diagnostic"
- hud_type = DATA_HUD_DIAGNOSTIC_BASIC
+ hud_types = list(DATA_HUD_DIAGNOSTIC_BASIC)
clothing_traits = list(TRAIT_DIAGNOSTIC_HUD)
/obj/item/clothing/glasses/hud/ar/projector/science
diff --git a/modular_skyrat/modules/modular_items/code/summon_beacon.dm b/modular_skyrat/modules/modular_items/code/summon_beacon.dm
index b5dc02007a1f7f..d7da8e2641b604 100644
--- a/modular_skyrat/modules/modular_items/code/summon_beacon.dm
+++ b/modular_skyrat/modules/modular_items/code/summon_beacon.dm
@@ -114,6 +114,7 @@
if(!uses)
qdel(src)
+ return ITEM_INTERACT_SUCCESS
// Misc stuff here
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/ballgag.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/ballgag.dm
index ea1e10de656993..432c6442259207 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/ballgag.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/ballgag.dm
@@ -16,7 +16,6 @@
greyscale_config_inhand_right = /datum/greyscale_config/ballgag/right_hand
greyscale_colors = "#AD66BE"
w_class = WEIGHT_CLASS_SMALL
- modifies_speech = TRUE
flags_cover = MASKCOVERSMOUTH
/// Does this gag choke the wearer?
@@ -51,14 +50,27 @@
var/size_list_position = 1
/// How big the gag is currently
var/gag_size = "small"
+ var/modifies_speech = TRUE
// To update the sprite
/obj/item/clothing/mask/ballgag/Initialize(mapload)
. = ..()
AddElement(/datum/element/update_icon_updates_onmob)
+/obj/item/clothing/mask/ballgag/equipped(mob/equipper, slot)
+ . = ..()
+ if ((slot & ITEM_SLOT_MASK) && modifies_speech)
+ RegisterSignal(equipper, COMSIG_MOB_SAY, PROC_REF(handle_speech))
+ else
+ UnregisterSignal(equipper, COMSIG_MOB_SAY)
+
+/obj/item/clothing/mask/ballgag/dropped(mob/dropper)
+ . = ..()
+ UnregisterSignal(dropper, COMSIG_MOB_SAY)
+
// Changes speech while worn
-/obj/item/clothing/mask/ballgag/handle_speech(datum/source, list/speech_args)
+/obj/item/clothing/mask/ballgag/proc/handle_speech(datum/source, list/speech_args)
+ SIGNAL_HANDLER
if(!LAZYLEN(moans))
return
speech_args[SPEECH_MESSAGE] = pick((prob(moans_alt_probability) && LAZYLEN(moans_alt)) ? moans_alt : moans)
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm
index 32e3f8c2040ac0..2f809512c5d7c5 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm
@@ -1,6 +1,7 @@
// Set up the types of items that can be placed in the mask
/datum/storage/pockets/small/bdsm_mask
max_slots = 1
+ click_alt_open = FALSE
/datum/storage/pockets/small/bdsm_mask/New()
. = ..()
@@ -15,6 +16,9 @@
icon_state = "mask_pink_off"
base_icon_state = "mask"
slot_flags = ITEM_SLOT_MASK
+ w_class = WEIGHT_CLASS_SMALL
+ flags_cover = MASKCOVERSMOUTH
+ starting_filter_type = null
var/mask_on = FALSE
var/current_mask_color = "pink"
var/breath_status = TRUE
@@ -35,14 +39,25 @@
var/temp_check = TRUE //Used to check if user unconsious to prevent choking him until he wakes up
/// Does the gasmask impede the user's ability to talk?
var/speech_disabled
- w_class = WEIGHT_CLASS_SMALL
- modifies_speech = TRUE
- flags_cover = MASKCOVERSMOUTH
+ var/modifies_speech = TRUE
/obj/item/clothing/mask/gas/bdsm_mask/Initialize(mapload)
. = ..()
create_storage(storage_type = /datum/storage/pockets/small/bdsm_mask)
+ new /obj/item/reagent_containers/cup/lewd_filter(src)
+ AddElement(/datum/element/update_icon_updates_onmob)
+ update_icon_state()
+ update_icon()
+ update_mob_action_buttonss()
+ if(!length(mask_designs))
+ populate_mask_designs()
+
+/// Can the user reach the filter, false if equipped and active
+/obj/item/clothing/mask/gas/bdsm_mask/proc/is_locked(mob/living/carbon/user)
+ var/obj/item/clothing/mask/gas/bdsm_mask/worn_mask = user.get_item_by_slot(ITEM_SLOT_MASK)
+ return istype(user) && src == worn_mask && src.mask_on
+
/obj/item/clothing/mask/gas/bdsm_mask/proc/update_mob_action_buttonss()
var/datum/action/item_action/button
@@ -55,7 +70,20 @@
button.button_icon = 'modular_skyrat/modules/modular_items/lewd_items/icons/obj/lewd_items/lewd_icons.dmi'
update_icon()
-/obj/item/clothing/mask/gas/bdsm_mask/handle_speech(datum/source, list/speech_args)
+/obj/item/clothing/mask/gas/bdsm_mask/equipped(mob/equipper, slot)
+ . = ..()
+ if ((slot & ITEM_SLOT_MASK) && modifies_speech)
+ RegisterSignal(equipper, COMSIG_MOB_SAY, PROC_REF(handle_speech))
+ else
+ UnregisterSignal(equipper, COMSIG_MOB_SAY)
+
+/obj/item/clothing/mask/gas/bdsm_mask/dropped(mob/dropper)
+ . = ..()
+ UnregisterSignal(dropper, COMSIG_MOB_SAY)
+
+/obj/item/clothing/mask/gas/bdsm_mask/proc/handle_speech(datum/source, list/speech_args)
+ SIGNAL_HANDLER
+
if(speech_disabled)
return
@@ -77,6 +105,7 @@
var/choice = show_radial_menu(user, src, mask_designs, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 36, require_near = TRUE)
if(!choice)
return CLICK_ACTION_BLOCKING
+ atom_storage.click_alt_open = TRUE
current_mask_color = choice
update_icon_state()
update_icon()
@@ -92,69 +121,63 @@
return FALSE
return TRUE
-// Initializing stuff
-/obj/item/clothing/mask/gas/bdsm_mask/Initialize(mapload)
- . = ..()
- AddElement(/datum/element/update_icon_updates_onmob)
- update_icon_state()
- update_icon()
- update_mob_action_buttonss()
- if(!length(mask_designs))
- populate_mask_designs()
-
// To update icon state properly
/obj/item/clothing/mask/gas/bdsm_mask/update_icon_state()
. = ..()
icon_state = "[base_icon_state]_[current_mask_color]_[mask_on? "on" : "off"]"
inhand_icon_state = "[base_icon_state]_[current_mask_color]_[mask_on? "on" : "off"]"
+/obj/item/clothing/mask/gas/bdsm_mask/proc/try_unequip(mob/user)
+ if(!do_after(user, 60 SECONDS, target = user))
+ to_chat(user, span_warning("You fail to remove the gas mask!"))
+ return FALSE
+ to_chat(user, span_notice("You remove the gas mask."))
+ return TRUE
+/obj/item/clothing/mask/gas/bdsm_mask/attack_hand_secondary(mob/user, list/modifiers)
+
+
// To make in unremovable without helping when mask is on
/obj/item/clothing/mask/gas/bdsm_mask/attack_hand(mob/user)
- if(iscarbon(user))
- if(mask_on == TRUE)
- var/mob/living/carbon/wearer = user
- if(wearer.wear_mask == src)
- if(!do_after(wearer, 60 SECONDS, target = src))
- to_chat(wearer, span_warning("You fail to remove the gas mask!"))
- return
- else
- to_chat(wearer, span_notice("You remove the gas mask."))
- add_fingerprint(usr)
- . = ..()
+ if(!is_locked(user))
+ return ..()
+ if(try_unequip(user))
+ . = ..()
+ if(.)
+ to_chat(user, span_notice("You remove the gas mask."))
// To make in unremovable without helping when mask is on (for MouseDrop)
+/datum/storage/pockets/small/bdsm_mask/on_mousedrop_onto(datum/source, atom/over_object, mob/user)
+ var/obj/item/clothing/mask/gas/bdsm_mask/mask = source
+ if(!istype(mask) || ismecha(user.loc) || user.incapacitated() || !mask.is_locked(user))
+ return ..()
+ return NONE //handled in mask mousedrop, don't allow content dumping
+
/obj/item/clothing/mask/gas/bdsm_mask/mouse_drop_dragged(atom/over_object, mob/user, src_location, over_location, params)
- var/mob/target_mob = user
- var/mob/living/carbon/human/target_carbon = user
- if(ismecha(target_mob.loc)) // Stops inventory actions in a mech
+ if(ismecha(user.loc) || user.incapacitated() || !is_locked(user))
return
- if(!target_mob.incapacitated())
- if(loc == target_mob)
- if(istype(over_object, /atom/movable/screen/inventory/hand))
- var/atom/movable/screen/inventory/hand/hand = over_object
- if(iscarbon(user))
- if(mask_on == TRUE)
- if(src == target_carbon.wear_mask || . == target_carbon.wear_mask)
- if(!do_after(target_carbon, 60 SECONDS, target = src))
- to_chat(target_mob, span_warning("You fail to remove the gas mask!"))
- return
- else
- to_chat(target_mob, span_notice("You remove the gas mask."))
- if(target_mob.putItemFromInventoryInHandIfPossible(src, hand.held_index))
- add_fingerprint(user)
- . = ..()
-
-// Handler for clicking on a slot in a mask by hand with a filter
-/datum/storage/pockets/small/bdsm_mask/on_item_interact(datum/source, mob/user, obj/item/thing, params)
- . = ..()
- var/obj/item/clothing/mask/gas/bdsm_mask/worn_mask = user.get_item_by_slot(ITEM_SLOT_MASK)
- if(istype(thing, /obj/item/reagent_containers/cup/lewd_filter))
- if(worn_mask) // Null check
- if(istype(worn_mask, /obj/item/clothing/mask/gas/bdsm_mask)) // Check that the mask is of the correct type
- if(worn_mask.mask_on == TRUE)
- // Place for text about the impossibility to attach a filter
- to_chat(usr, span_warning("You can't attach a filter while the mask is locked!"))
- return
+ if(!istype(over_object, /atom/movable/screen/inventory/hand))
+ return
+ var/atom/movable/screen/inventory/hand/hand = over_object
+ if(!istype(hand))
+ return
+ if(!try_unequip(user) || !user.putItemFromInventoryInHandIfPossible(src, hand.held_index))
+ return
+ to_chat(user, span_notice("You remove the gas mask."))
+ add_fingerprint(user)
+
+/datum/storage/pockets/small/bdsm_mask/remove_single(mob/removing, obj/item/thing, atom/remove_to_loc, silent)
+ var/obj/item/clothing/mask/gas/bdsm_mask/mask = parent
+ if(!istype(mask) || !mask.is_locked(removing))
+ return ..()
+ to_chat(removing, span_warning("You can't detach the filter while the mask is locked!"))
+ return FALSE
+
+/datum/storage/pockets/small/bdsm_mask/attempt_insert(obj/item/to_insert, mob/user, override, force, messages)
+ var/obj/item/clothing/mask/gas/bdsm_mask/mask = parent
+ if(!istype(mask) || !mask.is_locked(user))
+ return ..()
+ to_chat(user, span_warning("You can't attach a filter while the mask is locked!"))
+ return FALSE
// Breathing valve control button
/datum/action/item_action/toggle_breathcontrol
@@ -165,7 +188,7 @@
/datum/action/item_action/toggle_breathcontrol/Trigger(trigger_flags)
var/obj/item/clothing/mask/gas/bdsm_mask/mask = target
if(istype(mask))
- mask.check()
+ mask.check(owner)
/datum/action/item_action/toggle_gag
name = "Toggle gag"
@@ -174,7 +197,7 @@
/datum/action/item_action/toggle_gag/Trigger(trigger_flags)
var/obj/item/clothing/mask/gas/bdsm_mask/mask = target
if(istype(mask))
- mask.check_gag()
+ mask.check_gag(owner)
/datum/action/item_action/mask_inhale
name = "Inhale oxygen"
@@ -192,13 +215,16 @@
mask.time_to_choke_left = mask.time_to_choke
mask.breath_status = TRUE
- var/mob/living/carbon/affected_mob = usr
+ var/mob/living/carbon/affected_mob = owner
if(!istype(affected_mob))
return FALSE
affected_mob.try_lewd_autoemote("inhale")
+ if(!length(mask.contents))
+ return TRUE
var/obj/item/reagent_containers/cup/lewd_filter/filter = mask.contents[1]
- filter.reagent_consumption(affected_mob, filter.amount_per_transfer_from_this)
+ if(istype(filter))
+ filter.reagent_consumption(affected_mob, filter.amount_per_transfer_from_this)
return TRUE
@@ -225,24 +251,22 @@
temp_check = TRUE
// To check if player already have this mask on and trying to change mode
-/obj/item/clothing/mask/gas/bdsm_mask/proc/check()
- var/mob/living/carbon/affected_carbon = usr
- if(src == affected_carbon.wear_mask)
- to_chat(usr, span_notice("You can't reach the air filter switch!"))
- else
- toggle(affected_carbon)
+/obj/item/clothing/mask/gas/bdsm_mask/proc/check(mob/living/carbon/user)
+ if(!istype(user) || src == user.wear_mask)
+ to_chat(user, span_notice("You can't reach the air filter switch!"))
+ return
+ toggle(user)
// Switch the mask valve to the opposite state
-/obj/item/clothing/mask/gas/bdsm_mask/proc/toggle(user)
+/obj/item/clothing/mask/gas/bdsm_mask/proc/toggle(mob/living/carbon/user)
mask_on = !mask_on
to_chat(user, span_notice("You turn the air filter [mask_on ? "on. Use with caution!" : "off. Now it's safe to wear."]"))
play_lewd_sound(user, mask_on ? 'sound/weapons/magin.ogg' : 'sound/weapons/magout.ogg', 40, TRUE)
update_icon_state()
update_mob_action_buttonss()
update_icon()
- var/mob/living/carbon/human/affected_human = usr
if(mask_on)
- if(src == affected_human.wear_mask && affected_human.client?.prefs?.read_preference(/datum/preference/toggle/erp/sex_toy))
+ if(src == user.wear_mask && user.client?.prefs?.read_preference(/datum/preference/toggle/erp/sex_toy))
START_PROCESSING(SSobj, src)
time_to_choke_left = time_to_choke
else
@@ -263,18 +287,17 @@
// Mask choke processor
/obj/item/clothing/mask/gas/bdsm_mask/process(seconds_per_tick)
- var/mob/living/affected_mob = loc
- var/mob/living/carbon/affected_carbon = affected_mob
+ var/mob/living/carbon/affected_carbon = loc
if(!istype(affected_carbon))
return FALSE
if(time_to_choke_left < time_to_choke/2 && breath_status == TRUE)
- if(temp_check == FALSE && affected_mob.stat == CONSCIOUS) // If user passed out while wearing this we should continue when he wakes up
+ if(temp_check == FALSE && affected_carbon.stat == CONSCIOUS) // If user passed out while wearing this we should continue when he wakes up
breath_status = FALSE
time_to_choke_left = time_to_choke
temp_check = TRUE
- if(affected_mob.stat == CONSCIOUS)
+ if(affected_carbon.stat == CONSCIOUS)
affected_carbon.try_lewd_autoemote("exhale")
breath_status = FALSE
if(rand(0, 3) == 0)
@@ -285,10 +308,9 @@
if(time_to_choke_left <= 0)
if(tt <= 0)
- if(affected_mob.stat == CONSCIOUS)
- affected_mob.adjustOxyLoss(rand(4, 8)) // Oxy dmg
- if(ispath(affected_carbon))
- affected_carbon.try_lewd_autoemote(pick("gasp", "choke", "moan"))
+ if(affected_carbon.stat == CONSCIOUS)
+ affected_carbon.adjustOxyLoss(rand(4, 8)) // Oxy dmg
+ affected_carbon.try_lewd_autoemote(pick("gasp", "choke", "moan"))
tt = time
else
breath_status = TRUE
@@ -318,6 +340,7 @@
volume = 50
possible_transfer_amounts = list(1, 2, 3, 4, 5, 10, 25, 50)
list_reagents = list(/datum/reagent/drug/aphrodisiac/crocin = 50)
+ amount_per_transfer_from_this = 1
interaction_flags_click = NEED_DEXTERITY
// Standard initialize code for filter
@@ -332,60 +355,13 @@
// Reagent consumption process handler
/obj/item/reagent_containers/cup/lewd_filter/proc/reagent_consumption(mob/living/user, amount_per_transfer_from_this)
SEND_SIGNAL(src, COMSIG_GLASS_DRANK, user, user)
- addtimer(CALLBACK(reagents, TYPE_PROC_REF(/datum/reagents, trans_to), user, amount_per_transfer_from_this, TRUE, TRUE, FALSE, user, FALSE, INGEST), 0.5 SECONDS)
+ reagents.trans_to(user, amount_per_transfer_from_this, transferred_by = user, methods = INGEST)
-// I just wanted to add 2th color variation. Because.
+// I just wanted to add 2nd color variation. Because.
/obj/item/reagent_containers/cup/lewd_filter/click_alt(mob/user)
// After reskin all clicks go normal, but we can't change the flow rate if mask on and equipped
- var/obj/item/clothing/mask/gas/bdsm_mask/worn_mask = user.get_item_by_slot(ITEM_SLOT_MASK)
- if(worn_mask)
- if(iscarbon(user))
- if(istype(worn_mask, /obj/item/clothing/mask/gas/bdsm_mask))
- if(worn_mask.mask_on == TRUE)
- if(istype(src, /obj/item/reagent_containers/cup/lewd_filter))
- to_chat(user, span_warning("You can't change the flow rate of the valve while the mask is on!"))
- return CLICK_ACTION_BLOCKING
- return ..()
-
-// Filter click handling
-/obj/item/reagent_containers/cup/lewd_filter/attack_hand(mob/user)
- var/obj/item/clothing/mask/gas/bdsm_mask/worn_mask = user.get_item_by_slot(ITEM_SLOT_MASK)
- if(worn_mask)
- if(iscarbon(user))
- if(istype(worn_mask, /obj/item/clothing/mask/gas/bdsm_mask))
- if(worn_mask.mask_on == TRUE)
- if(istype(src, /obj/item/reagent_containers/cup/lewd_filter))
- // Place for text about the impossibility of detaching the filter
- to_chat(user, span_warning("You can't detach the filter while the mask is locked!"))
- return
-
- . = ..()
- add_fingerprint(usr)
-
-// Processing a click with a mask filter on the mask. Needed to intercept call at the object class level. Returns automatically to attack_hand(mob/user) method.
-/obj/item/clothing/mask/gas/bdsm_mask/attackby(obj/item/used_item, mob/living/user, params)
- return ..() || ((obj_flags & CAN_BE_HIT) && used_item.attack_atom(src, user))
-
-// Mouse drop handler
-/obj/item/reagent_containers/cup/lewd_filter/mouse_drop_dragged(atom/over_object, mob/user, src_location, over_location, params)
- var/mob/affected_mob = user
- var/mob/living/carbon/human/affected_human = user
- var/obj/item/clothing/mask/gas/bdsm_mask/worn_mask = affected_human.get_item_by_slot(ITEM_SLOT_MASK)
-
- if(ismecha(affected_mob.loc)) // Stops inventory actions in a mech
- return
-
- if(!affected_mob.incapacitated())
- if(loc == affected_mob)
- if(iscarbon(user))
- if(worn_mask.mask_on == TRUE)
- if(istype(over_object, /atom/movable/screen/inventory/hand))
- // Place for text about the impossibility of detaching the filter
- to_chat(user, span_warning("You can't detach the filter while the mask is locked!"))
- return
- else
- // Place for text about the impossibility to attach a filter
- to_chat(user, span_warning("You can't attach a filter while the mask is locked!"))
- return
- add_fingerprint(user)
- . = ..()
+ var/obj/item/clothing/mask/gas/bdsm_mask/mask = loc
+ if(!istype(mask) || !mask.is_locked(user))
+ return ..()
+ to_chat(user, span_warning("You can't change the flow rate of the valve while the mask is on!"))
+ return CLICK_ACTION_BLOCKING
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/_masturbation_item.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/_masturbation_item.dm
index 4407a304c3f6a5..fa03358eb6f112 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/_masturbation_item.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/_masturbation_item.dm
@@ -8,14 +8,13 @@
inhand_icon_state = "nothing"
// Jerk off into bottles and onto people.
-/obj/item/hand_item/coom/afterattack(obj/target, mob/user, proximity)
- . = ..()
- do_masturbate(target, user, proximity)
+/obj/item/hand_item/coom/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ do_masturbate(interacting_with, user)
/// Handles masturbation onto a living mob, or an atom.
/// Attempts to fill the atom's reagent container, if it has one, and it isn't full.
-/obj/item/hand_item/coom/proc/do_masturbate(obj/target, mob/user, proximity)
- if (CONFIG_GET(flag/disable_erp_preferences) || !proximity || user.stat >= DEAD)
+/obj/item/hand_item/coom/proc/do_masturbate(atom/target, mob/user)
+ if (CONFIG_GET(flag/disable_erp_preferences) || user.stat >= DEAD)
return
var/mob/living/carbon/human/affected_human = user
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/leather_whip.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/leather_whip.dm
index 11b86eabe3b962..475936eb6ffc33 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/leather_whip.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/leather_whip.dm
@@ -14,8 +14,8 @@
hitsound = 'sound/weapons/whip.ogg'
clothing_flags = INEDIBLE_CLOTHING
//When taking that thing in mouth
- modifies_speech = TRUE
flags_cover = MASKCOVERSMOUTH
+ var/modifies_speech = TRUE
/// If the color of the toy has been changed before
var/color_changed = FALSE
/// If the form (or size) of the toy has been changed before
@@ -50,8 +50,20 @@
if(!isinhands)
. += whip_overlay
+/obj/item/clothing/mask/leatherwhip/equipped(mob/equipper, slot)
+ . = ..()
+ if ((slot & ITEM_SLOT_MASK) && modifies_speech)
+ RegisterSignal(equipper, COMSIG_MOB_SAY, PROC_REF(handle_speech))
+ else
+ UnregisterSignal(equipper, COMSIG_MOB_SAY)
+
+/obj/item/clothing/mask/leatherwhip/dropped(mob/dropper)
+ . = ..()
+ UnregisterSignal(dropper, COMSIG_MOB_SAY)
+
// Speech handler for moansing when talking
-/obj/item/clothing/mask/leatherwhip/handle_speech(datum/source, list/speech_args)
+/obj/item/clothing/mask/leatherwhip/proc/handle_speech(datum/source, list/speech_args)
+ SIGNAL_HANDLER
speech_args[SPEECH_MESSAGE] = pick((prob(moans_alt_probability) && LAZYLEN(moans_alt)) ? moans_alt : moans)
play_lewd_sound(loc, pick('modular_skyrat/modules/modular_items/lewd_items/sounds/under_moan_f1.ogg',
'modular_skyrat/modules/modular_items/lewd_items/sounds/under_moan_f2.ogg',
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/serviette.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/serviette.dm
index 2a00fd85f26d91..dc95658503137d 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/serviette.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/serviette.dm
@@ -17,35 +17,34 @@
icon = 'modular_skyrat/modules/modular_items/lewd_items/icons/obj/lewd_items/lewd_items.dmi'
w_class = WEIGHT_CLASS_TINY
-/obj/item/serviette/afterattack(atom/target, mob/user, proximity)
- . = ..()
- if(!proximity || !check_allowed_items(target))
- return
+/obj/item/serviette/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ if(!check_allowed_items(interacting_with))
+ return NONE
var/clean_speedies = 1 * cleanspeed
if(user.mind)
clean_speedies = cleanspeed * min(user.mind.get_skill_modifier(/datum/skill/cleaning, SKILL_SPEED_MODIFIER)+0.1, 1) //less scaling for soapies
- if((target in user?.client.screen) && !user.is_holding(target))
- to_chat(user, span_warning("You need to take \the [target.name] off before cleaning it!"))
+ if((interacting_with in user?.client.screen) && !user.is_holding(interacting_with))
+ to_chat(user, span_warning("You need to take \the [interacting_with.name] off before cleaning it!"))
- else if(istype(target, /obj/effect/decal/cleanable))
- user.visible_message(span_notice("[user] begins to clean \the [target.name] out with [src]."), span_warning("You begin to clean \the [target.name] out with [src]..."))
- if(do_after(user, clean_speedies, target = target))
- to_chat(user, span_notice("You clean \the [target.name] out."))
- var/obj/effect/decal/cleanable/cleanies = target
+ else if(istype(interacting_with, /obj/effect/decal/cleanable))
+ user.visible_message(span_notice("[user] begins to clean \the [interacting_with.name] out with [src]."), span_warning("You begin to clean \the [interacting_with.name] out with [src]..."))
+ if(do_after(user, clean_speedies, target = interacting_with))
+ to_chat(user, span_notice("You clean \the [interacting_with.name] out."))
+ var/obj/effect/decal/cleanable/cleanies = interacting_with
user.mind?.adjust_experience(/datum/skill/cleaning, max(round(cleanies.beauty/CLEAN_SKILL_BEAUTY_ADJUSTMENT), 0)) //again, intentional that this does NOT round but mops do.
- qdel(target)
+ qdel(interacting_with)
qdel(src)
var/obj/item/serviette_used/used_cloth = new used_serviette
remove_item_from_storage(user)
user.put_in_hands(used_cloth)
- else if(istype(target, /obj/structure/window))
- user.visible_message(span_notice("[user] begins to clean \the [target.name] with [src]..."), span_notice("You begin to clean \the [target.name] with [src]..."))
- if(do_after(user, clean_speedies, target = target))
- to_chat(user, span_notice("You clean \the [target.name]."))
- target.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
- target.set_opacity(initial(target.opacity))
+ else if(istype(interacting_with, /obj/structure/window))
+ user.visible_message(span_notice("[user] begins to clean \the [interacting_with.name] with [src]..."), span_notice("You begin to clean \the [interacting_with.name] with [src]..."))
+ if(do_after(user, clean_speedies, target = interacting_with))
+ to_chat(user, span_notice("You clean \the [interacting_with.name]."))
+ interacting_with.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
+ interacting_with.set_opacity(initial(interacting_with.opacity))
user.mind?.adjust_experience(/datum/skill/cleaning, CLEAN_SKILL_GENERIC_WASH_XP)
qdel(src)
var/obj/item/serviette_used/used_cloth = new used_serviette
@@ -53,19 +52,20 @@
user.put_in_hands(used_cloth)
else
- user.visible_message(span_notice("[user] begins to clean \the [target.name] with [src]..."), span_notice("You begin to clean \the [target.name] with [src]..."))
- if(do_after(user, clean_speedies, target = target))
- to_chat(user, span_notice("You clean \the [target.name]."))
- if(user && isturf(target))
- for(var/obj/effect/decal/cleanable/cleanable_decal in target)
+ user.visible_message(span_notice("[user] begins to clean \the [interacting_with.name] with [src]..."), span_notice("You begin to clean \the [interacting_with.name] with [src]..."))
+ if(do_after(user, clean_speedies, target = interacting_with))
+ to_chat(user, span_notice("You clean \the [interacting_with.name]."))
+ if(user && isturf(interacting_with))
+ for(var/obj/effect/decal/cleanable/cleanable_decal in interacting_with)
user.mind?.adjust_experience(/datum/skill/cleaning, round(cleanable_decal.beauty / CLEAN_SKILL_BEAUTY_ADJUSTMENT))
- target.wash(CLEAN_SCRUB)
- target.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
+ interacting_with.wash(CLEAN_SCRUB)
+ interacting_with.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
user.mind?.adjust_experience(/datum/skill/cleaning, CLEAN_SKILL_GENERIC_WASH_XP)
qdel(src)
var/obj/item/serviette_used/used_cloth = new used_serviette
remove_item_from_storage(user)
user.put_in_hands(used_cloth)
+ return ITEM_INTERACT_SUCCESS
/*
* SERVIETTE PACK
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/dancing_pole.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/dancing_pole.dm
index 45b7401b29f584..65b0c14bf0516d 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/dancing_pole.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/dancing_pole.dm
@@ -53,12 +53,12 @@
/obj/structure/stripper_pole/click_ctrl(mob/user)
var/choice = show_radial_menu(user, src, pole_designs, radius = 50, require_near = TRUE)
if(!choice)
- return FALSE
+ return CLICK_ACTION_BLOCKING
current_pole_color = choice
light_color = pole_lights[choice]
update_icon()
update_brightness()
- return TRUE
+ return CLICK_ACTION_SUCCESS
// Alt-click to turn the lights on or off.
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/shibari_stand.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/shibari_stand.dm
index 03c90879b88e7d..421a28240d2b89 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/shibari_stand.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/shibari_stand.dm
@@ -216,7 +216,7 @@
)
menu.ui_interact(usr)
to_chat(user, span_notice("You switch the frame's plastic fittings color."))
- return TRUE
+ return CLICK_ACTION_SUCCESS
/obj/structure/chair/shibari_stand/examine(mob/user)
. = ..()
diff --git a/modular_skyrat/modules/modular_vending/code/autodrobe.dm b/modular_skyrat/modules/modular_vending/code/autodrobe.dm
index 8a197376763432..0558cb65461f6c 100644
--- a/modular_skyrat/modules/modular_vending/code/autodrobe.dm
+++ b/modular_skyrat/modules/modular_vending/code/autodrobe.dm
@@ -15,6 +15,7 @@
"name" = "Entertainers",
"icon" = "masks-theater",
"products" = list(
+ /obj/item/clothing/head/beret/clown = 3,
/obj/item/clothing/mask/gas/clownbald = 1,
/obj/item/clothing/mask/gas/clown_colourable = 1,
/obj/item/clothing/head/costume/jesteralt = 1,
diff --git a/modular_skyrat/modules/modular_vending/code/clothesmate.dm b/modular_skyrat/modules/modular_vending/code/clothesmate.dm
index 50ce6f46ec0d68..9173369a527568 100644
--- a/modular_skyrat/modules/modular_vending/code/clothesmate.dm
+++ b/modular_skyrat/modules/modular_vending/code/clothesmate.dm
@@ -5,6 +5,7 @@
"icon" = "hat-cowboy",
"products" = list(
/obj/item/clothing/head/beret/badge = 5,
+ /obj/item/clothing/head/beret/clown/rainbow = 5,
/obj/item/clothing/head/colourable_flatcap= 5,
/obj/item/clothing/head/cowboy/skyrat/cattleman = 5,
/obj/item/clothing/head/cowboy/skyrat/cattleman/wide = 5,
@@ -60,6 +61,8 @@
/obj/item/clothing/under/suit/skyrat/recolorable = 5,
/obj/item/clothing/under/suit/skyrat/recolorable/skirt = 5,
/obj/item/clothing/under/pants/skyrat/kilt = 5,
+ /obj/item/clothing/under/costume/skyrat/kilt/royal = 5,
+ /obj/item/clothing/under/costume/skyrat/tac/irish = 5,
/obj/item/clothing/under/suit/fancy = 5,
/obj/item/clothing/under/texas = 5,
/obj/item/clothing/under/sweater = 5,
diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/grenade_launcher.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/grenade_launcher.dm
index a964e6cf362373..f748686c529048 100644
--- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/grenade_launcher.dm
+++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/grenade_launcher.dm
@@ -68,17 +68,18 @@
. += span_notice("With Right Click you can set the range that shells will detonate at.")
. += span_notice("A small indicator in the sight notes the current detonation range is: [target_range].")
-/obj/item/gun/ballistic/automatic/sol_grenade_launcher/ranged_interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+/obj/item/gun/ballistic/automatic/sol_grenade_launcher/ranged_interact_with_atom_secondary(atom/interacting_with, mob/living/user, list/modifiers)
if(!interacting_with || !user)
- return
+ return ITEM_INTERACT_BLOCKING
var/distance_ranged = get_dist(user, interacting_with)
if(distance_ranged > maximum_target_range)
user.balloon_alert(user, "out of range")
- return
+ return ITEM_INTERACT_BLOCKING
target_range = distance_ranged
user.balloon_alert(user, "range set: [target_range]")
+ return ITEM_INTERACT_SUCCESS
/obj/item/gun/ballistic/automatic/sol_grenade_launcher/no_mag
spawnwithmagazine = FALSE
diff --git a/modular_skyrat/modules/mold/code/mold_structures.dm b/modular_skyrat/modules/mold/code/mold_structures.dm
index bf4c8e69061e2f..42f6888609e2bd 100644
--- a/modular_skyrat/modules/mold/code/mold_structures.dm
+++ b/modular_skyrat/modules/mold/code/mold_structures.dm
@@ -131,7 +131,7 @@
icon = 'modular_skyrat/modules/mold/icons/blob_resin.dmi'
icon_state = "blob_floor"
density = FALSE
- plane = FLOOR_PLANE
+ plane = GAME_PLANE
layer = LOW_SIGIL_LAYER
max_integrity = 50
var/blooming = FALSE
diff --git a/modular_skyrat/modules/moretraitoritems/code/glue.dm b/modular_skyrat/modules/moretraitoritems/code/glue.dm
index 01a1c9983c16aa..2b3898cb271dbc 100644
--- a/modular_skyrat/modules/moretraitoritems/code/glue.dm
+++ b/modular_skyrat/modules/moretraitoritems/code/glue.dm
@@ -7,24 +7,21 @@
var/uses = 1
-/obj/item/syndie_glue/afterattack(atom/target, mob/user, proximity)
- . = ..()
- if(!proximity || !target)
- return
- else
- if(!uses)
- to_chat(user, span_warning("The bottle of glue is empty!"))
- return
- if(istype(target, /obj/item))
- var/obj/item/I = target
- if(HAS_TRAIT_FROM(I, TRAIT_NODROP, TRAIT_GLUED_ITEM))
- to_chat(user, span_warning("[I] is already sticky!"))
- return
- uses -= 1
- ADD_TRAIT(I, TRAIT_NODROP, TRAIT_GLUED_ITEM)
- I.desc += " It looks sticky."
- to_chat(user, span_notice("You smear the [I] with glue, making it incredibly sticky!"))
- if(uses == 0)
- icon_state = "glue_used"
- name = "empty bottle of super glue"
- return
+/obj/item/syndie_glue/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ if(!uses)
+ to_chat(user, span_warning("The bottle of glue is empty!"))
+ return NONE
+ if(!isitem(interacting_with))
+ return NONE
+ if(HAS_TRAIT_FROM(interacting_with, TRAIT_NODROP, TRAIT_GLUED_ITEM))
+ to_chat(user, span_warning("[interacting_with] is already sticky!"))
+ return ITEM_INTERACT_BLOCKING
+
+ uses -= 1
+ ADD_TRAIT(interacting_with, TRAIT_NODROP, TRAIT_GLUED_ITEM)
+ interacting_with.desc += " It looks sticky."
+ to_chat(user, span_notice("You smear the [interacting_with] with glue, making it incredibly sticky!"))
+ if(uses == 0)
+ icon_state = "glue_used"
+ name = "empty bottle of super glue"
+ return ITEM_INTERACT_SUCCESS
diff --git a/modular_skyrat/modules/mutants/code/mutant_cure.dm b/modular_skyrat/modules/mutants/code/mutant_cure.dm
index 59fdca633254c0..81aad77fbffb05 100644
--- a/modular_skyrat/modules/mutants/code/mutant_cure.dm
+++ b/modular_skyrat/modules/mutants/code/mutant_cure.dm
@@ -29,32 +29,30 @@
return
unload_vial(user)
-/obj/item/rna_extractor/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
- if(!proximity_flag)
+/obj/item/rna_extractor/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ if(!ishuman(interacting_with))
return
- if(!ishuman(target))
- return
- var/mob/living/carbon/human/H = target
+ var/mob/living/carbon/human/target = interacting_with
if(!loaded_vial)
to_chat(user, span_danger("[src] is empty!"))
return
if(loaded_vial.contains_rna)
to_chat(user, span_danger("[src] already has RNA data in it, upload it to the combinator!"))
return
- if(!ismutant(H))
- to_chat(user, span_danger("[H] does not register as infected!"))
+ if(!ismutant(target))
+ to_chat(user, span_danger("[target] does not register as infected!"))
return
- var/datum/component/mutant_infection/ZI = H.GetComponent(/datum/component/mutant_infection)
- if(!ZI)
- to_chat(user, span_danger("[H] does not register as infected!"))
+ var/datum/component/mutant_infection/target_infection = target.GetComponent(/datum/component/mutant_infection)
+ if(!target_infection)
+ to_chat(user, span_danger("[target] does not register as infected!"))
return
- if(ZI.extract_rna())
- loaded_vial.load_rna(H)
- to_chat(user, span_notice("[src] successfully scanned [H], and now holds a sample virus RNA data."))
+ if(target_infection.extract_rna())
+ loaded_vial.load_rna(target)
+ to_chat(user, span_notice("[src] successfully scanned [target], and now holds a sample virus RNA data."))
playsound(src.loc, 'sound/effects/spray2.ogg', 50, TRUE, -6)
update_appearance()
else
- to_chat(user, span_warning("[H] has no useable RNA!"))
+ to_chat(user, span_warning("[target] has no useable RNA!"))
/obj/item/rna_extractor/proc/unload_vial(mob/living/user)
if(loaded_vial)
diff --git a/modular_skyrat/modules/mutants/code/mutant_species.dm b/modular_skyrat/modules/mutants/code/mutant_species.dm
index 07bcf0f9cdb335..d560c8bd156840 100644
--- a/modular_skyrat/modules/mutants/code/mutant_species.dm
+++ b/modular_skyrat/modules/mutants/code/mutant_species.dm
@@ -213,11 +213,8 @@
else
icon_state = icon_right
-/obj/item/hnz_mutant_hand/afterattack(atom/target, mob/user, proximity_flag)
- . = ..()
- if(!proximity_flag)
- return
- else if(isliving(target))
+/obj/item/hnz_mutant_hand/afterattack(atom/target, mob/user, click_parameters)
+ if(isliving(target))
if(ishuman(target))
try_to_mutant_infect(target, user = user)
else
diff --git a/modular_skyrat/modules/novaya_ert/code/mod_suit.dm b/modular_skyrat/modules/novaya_ert/code/mod_suit.dm
index 51317a8932758c..8ec05920058970 100644
--- a/modular_skyrat/modules/novaya_ert/code/mod_suit.dm
+++ b/modular_skyrat/modules/novaya_ert/code/mod_suit.dm
@@ -317,7 +317,7 @@
UnregisterSignal(mod.wearer, COMSIG_LIVING_HEALTH_UPDATE)
/obj/item/mod/module/auto_doc/on_install()
- RegisterSignal(mod, COMSIG_ATOM_ATTACKBY, PROC_REF(on_attackby))
+ RegisterSignal(mod, COMSIG_ATOM_ITEM_INTERACTION, PROC_REF(on_item_interact))
/obj/item/mod/module/auto_doc/on_uninstall(deleting)
UnregisterSignal(mod, COMSIG_ATOM_ATTACKBY)
@@ -327,10 +327,10 @@
return TRUE
return ..()
-/obj/item/mod/module/auto_doc/proc/on_attackby(datum/source, obj/item/attacking_item, mob/user)
+/obj/item/mod/module/auto_doc/proc/on_item_interact(datum/source, mob/user, obj/item/thing, params)
SIGNAL_HANDLER
- if(charge_boost(attacking_item, user))
+ if(charge_boost(thing, user))
return COMPONENT_NO_AFTERATTACK
return NONE
diff --git a/modular_skyrat/modules/pet_owner/pet_owner.dm b/modular_skyrat/modules/pet_owner/pet_owner.dm
index c6b80222e61656..6a97b23f409eb0 100644
--- a/modular_skyrat/modules/pet_owner/pet_owner.dm
+++ b/modular_skyrat/modules/pet_owner/pet_owner.dm
@@ -56,16 +56,22 @@ GLOBAL_LIST_INIT(possible_player_pet, list(
"Bull terrier" = /mob/living/basic/pet/dog/bullterrier,
"Butterfly" = /mob/living/basic/butterfly,
"Cat" = /mob/living/basic/pet/cat,
+ "Cat (Clown)" = /mob/living/basic/pet/cat/clown,
+ "Cat (Mime)" = /mob/living/basic/pet/cat/mime,
+ "Carp" = /mob/living/basic/carp/petcarp,
+ "Carp (Clown)" = /mob/living/basic/carp/clarp,
"Chick" = /mob/living/basic/chick/permanent,
"Chicken" = /mob/living/basic/chicken,
"Chinchilla (dark)" = /mob/living/basic/pet/chinchilla/black,
"Chinchilla (white)" = /mob/living/basic/pet/chinchilla/white,
"Corgi" = /mob/living/basic/pet/dog/corgi,
"Corgi puppy" = /mob/living/basic/pet/dog/corgi/puppy,
+ "Cyber Corgi" = /mob/living/basic/pet/dog/corgi/robocorgo,
"Cockroach" = /mob/living/basic/cockroach,
"Crab" = /mob/living/basic/crab,
"Deer" = /mob/living/basic/deer,
"Dobermann" = /mob/living/basic/pet/dog/dobermann,
+ "Fennec" = /mob/living/basic/pet/cat/fennec,
"Fox" = /mob/living/basic/pet/fox/docile,
"Frog" = /mob/living/basic/frog,
"Giant ant" = /mob/living/basic/ant,
@@ -76,13 +82,16 @@ GLOBAL_LIST_INIT(possible_player_pet, list(
"Mouse (gray)" = /mob/living/basic/mouse/gray,
"Mouse (brown)" = /mob/living/basic/mouse/brown,
"Penguin" = /mob/living/basic/pet/penguin/emperor/neuter,
+ "Pitbull" = /mob/living/basic/pet/dog/pitbull,
"Pig" = /mob/living/basic/pig,
"Pug" = /mob/living/basic/pet/dog/pug,
"Rabbit" = /mob/living/basic/rabbit,
+ "Red Panda" = /mob/living/basic/pet/fox/redpanda,
"Sloth" = /mob/living/basic/sloth,
"Snake" = /mob/living/basic/snake,
"Spider" = /mob/living/basic/spider/maintenance,
"Tegu" = /mob/living/basic/lizard/tegu,
+ "Tiger" = /mob/living/basic/pet/cat/tiger,
)) //some of these are too big to be put back into the pet carrier once taken out, so I put a warning on the carrier.
/datum/preference/choiced/pet_owner/init_possible_values()
diff --git a/modular_skyrat/modules/polarized_windows/polarization_controller.dm b/modular_skyrat/modules/polarized_windows/polarization_controller.dm
index 214e9257279d5b..116f2566c6e7ed 100644
--- a/modular_skyrat/modules/polarized_windows/polarization_controller.dm
+++ b/modular_skyrat/modules/polarized_windows/polarization_controller.dm
@@ -33,7 +33,7 @@ GLOBAL_LIST_EMPTY(polarization_controllers)
// But why make it a string here? Otherwise it won't be an associative list and it kind of explodes. Shitty, I know.
LAZYADDASSOC(GLOB.polarization_controllers, id, list(src))
- RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(on_window_attackby))
+ RegisterSignal(parent, COMSIG_ATOM_ITEM_INTERACTION, PROC_REF(window_item_interact))
RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_window_examine))
RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_MULTITOOL), PROC_REF(on_window_multitool_act))
@@ -81,18 +81,18 @@ GLOBAL_LIST_EMPTY(polarization_controllers)
*
* See: [/obj/item/proc/melee_attack_chain]
*/
-/datum/component/polarization_controller/proc/on_window_attackby(datum/source, obj/item/attacking_item, mob/user, params)
+/datum/component/polarization_controller/proc/window_item_interact(datum/source, obj/item/attacking_item, mob/user, params)
SIGNAL_HANDLER
if(!istype(attacking_item, /obj/item/assembly/control/polarizer))
- return
+ return NONE
var/obj/item/assembly/control/polarizer/polarizer = attacking_item
var/atom/parent_atom = parent
if(!polarizer.id)
parent_atom.balloon_alert(user, "set id on controller first!")
- return COMPONENT_NO_AFTERATTACK
+ return ITEM_INTERACT_BLOCKING
if(id)
LAZYREMOVEASSOC(GLOB.polarization_controllers, id, list(src))
@@ -102,7 +102,7 @@ GLOBAL_LIST_EMPTY(polarization_controllers)
LAZYADDASSOC(GLOB.polarization_controllers, id, list(src))
parent_atom.balloon_alert(user, "linked polarizer!")
- return COMPONENT_NO_AFTERATTACK
+ return ITEM_INTERACT_SUCCESS
/**
diff --git a/modular_skyrat/modules/pollution/code/air_refresher.dm b/modular_skyrat/modules/pollution/code/air_refresher.dm
index 2a9466cf8129a7..53be9661de90ff 100644
--- a/modular_skyrat/modules/pollution/code/air_refresher.dm
+++ b/modular_skyrat/modules/pollution/code/air_refresher.dm
@@ -18,20 +18,17 @@
else
. += "It is empty."
-/obj/item/air_refresher/afterattack(atom/attacked, mob/user, proximity)
- . = ..()
- if(.)
- return
+/obj/item/air_refresher/ranged_interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
if(uses_remaining <= 0)
to_chat(user, span_warning("\The [src] is empty!"))
- return TRUE
+ return NONE
uses_remaining--
- var/turf/aimed_turf = get_turf(attacked)
+ var/turf/aimed_turf = get_turf(interacting_with)
aimed_turf.pollute_turf(/datum/pollutant/fragrance/air_refresher, 200)
user.visible_message(span_notice("[user] sprays the air around with \the [src]."), span_notice("You spray the air around with \the [src]."))
user.changeNext_move(CLICK_CD_RANGE*2)
playsound(aimed_turf, 'sound/effects/spray2.ogg', 50, TRUE, -6)
- return TRUE
+ return ITEM_INTERACT_SUCCESS
/obj/machinery/pollution_scrubber
name = "Pollution Scrubber"
diff --git a/modular_skyrat/modules/pollution/code/perfumes.dm b/modular_skyrat/modules/pollution/code/perfumes.dm
index 80ccf1c253eb1d..4fd617b3eb98f2 100644
--- a/modular_skyrat/modules/pollution/code/perfumes.dm
+++ b/modular_skyrat/modules/pollution/code/perfumes.dm
@@ -48,11 +48,10 @@
to_chat(user, span_notice("The cap on [src] is now [cap ? "on" : "off"]."))
update_appearance()
-/obj/item/perfume/afterattack(atom/attacked, mob/user, proximity)
- . = ..()
+/obj/item/perfume/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
if(.)
return
- if(!ismovable(attacked))
+ if(!ismovable(interacting_with))
return
if(has_cap && cap)
to_chat(user, span_warning("Take the cap off first!"))
@@ -63,10 +62,10 @@
uses_remaining--
var/turf/my_turf = get_turf(user)
my_turf.pollute_turf(fragrance_type, 20)
- user.visible_message(span_notice("[user] sprays [attacked] with \the [src]."), span_notice("You spray [attacked] with \the [src]."))
+ user.visible_message(span_notice("[user] sprays [interacting_with] with \the [src]."), span_notice("You spray [interacting_with] with \the [src]."))
user.changeNext_move(CLICK_CD_RANGE*2)
playsound(my_turf, 'sound/effects/spray2.ogg', 50, TRUE, -6)
- attacked.AddComponent(/datum/component/temporary_pollution_emission, fragrance_type, 5, 10 MINUTES)
+ interacting_with.AddComponent(/datum/component/temporary_pollution_emission, fragrance_type, 5, 10 MINUTES)
/obj/item/perfume/cologne
name = "cologne bottle"
diff --git a/modular_skyrat/modules/primitive_production/code/glassblowing.dm b/modular_skyrat/modules/primitive_production/code/glassblowing.dm
index 59198aa11124a9..49bc2d1c4de72e 100644
--- a/modular_skyrat/modules/primitive_production/code/glassblowing.dm
+++ b/modular_skyrat/modules/primitive_production/code/glassblowing.dm
@@ -143,22 +143,20 @@
if(glass.steps_remaining[STEP_JACKS])
. += "The glass requires [glass.steps_remaining[STEP_JACKS]] more jacking actions!"
-/obj/item/glassblowing/blowing_rod/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
- if(!proximity_flag)
- return ..()
- if(istype(target, /obj/item/glassblowing/molten_glass))
- var/obj/item/glassblowing/molten_glass/attacking_glass = target
- var/obj/item/glassblowing/molten_glass/glass = glass_ref?.resolve()
- if(glass)
- to_chat(user, span_warning("[src] already has some glass on it!"))
- return
- if(!user.transferItemToLoc(attacking_glass, src))
- return
- glass_ref = WEAKREF(attacking_glass)
- to_chat(user, span_notice("[src] picks up [target]."))
- icon_state = "blow_pipe_full"
- return
- return ..()
+/obj/item/glassblowing/blowing_rod/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ var/obj/item/glassblowing/molten_glass/attacking_glass = interacting_with
+ if(!istype(attacking_glass))
+ return NONE
+
+ if(glass_ref?.resolve())
+ to_chat(user, span_warning("[src] already has some glass on it!"))
+ return ITEM_INTERACT_BLOCKING
+ if(!user.transferItemToLoc(attacking_glass, src))
+ return ITEM_INTERACT_BLOCKING
+ glass_ref = WEAKREF(attacking_glass)
+ to_chat(user, span_notice("[src] picks up [attacking_glass]."))
+ icon_state = "blow_pipe_full"
+ return ITEM_INTERACT_SUCCESS
/obj/item/glassblowing/blowing_rod/attackby(obj/item/attacking_item, mob/living/user, params)
var/actioning_speed = user.mind.get_skill_modifier(/datum/skill/production, SKILL_SPEED_MODIFIER) * DEFAULT_TIMED
diff --git a/modular_skyrat/modules/reagent_forging/code/forge_items.dm b/modular_skyrat/modules/reagent_forging/code/forge_items.dm
index 3a8b8df49ab0bd..efa4bfd997db67 100644
--- a/modular_skyrat/modules/reagent_forging/code/forge_items.dm
+++ b/modular_skyrat/modules/reagent_forging/code/forge_items.dm
@@ -38,7 +38,7 @@
/obj/structure/reagent_crafting_bench
)
-/obj/item/forging/hammer/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
+/obj/item/forging/hammer/afterattack(atom/target, mob/user, click_parameters)
. = ..()
if(!is_type_in_list(target, fast_attacks))
return
diff --git a/modular_skyrat/modules/resleeving/code/rsd_interface.dm b/modular_skyrat/modules/resleeving/code/rsd_interface.dm
index 106bb11ea38bc4..34afe37a51eced 100644
--- a/modular_skyrat/modules/resleeving/code/rsd_interface.dm
+++ b/modular_skyrat/modules/resleeving/code/rsd_interface.dm
@@ -8,20 +8,20 @@
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
/// Attempts to use the item on the target brain.
-/obj/item/rsd_interface/afterattack(obj/item/organ/internal/brain/target_brain, mob/user, proximity_flag, click_parameters)
- . = ..()
- if(!proximity_flag || !istype(target_brain))
- return FALSE
+/obj/item/rsd_interface/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ if(!istype(interacting_with, /obj/item/organ/internal/brain))
+ return NONE
- if(HAS_TRAIT(target_brain, TRAIT_NIFSOFT_HUD_GRANTER))
- balloon_alert("already upgraded!")
- return FALSE
+ if(HAS_TRAIT(interacting_with, TRAIT_RSD_COMPATIBLE))
+ user.balloon_alert(user, "already upgraded!")
+ return ITEM_INTERACT_BLOCKING
- user.visible_message(span_notice("[user] upgrades [target_brain] with [src]."), span_notice("You upgrade [target_brain] to be RSD compatible."))
- target_brain.AddElement(/datum/element/rsd_interface)
- playsound(target_brain.loc, 'sound/weapons/circsawhit.ogg', 50, vary = TRUE)
+ user.visible_message(span_notice("[user] upgrades [interacting_with] with [src]."), span_notice("You upgrade [interacting_with] to be RSD compatible."))
+ interacting_with.AddElement(/datum/element/rsd_interface)
+ playsound(interacting_with.loc, 'sound/weapons/circsawhit.ogg', 50, vary = TRUE)
qdel(src)
+ return ITEM_INTERACT_SUCCESS
/datum/element/rsd_interface/Attach(datum/target)
. = ..()
diff --git a/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm b/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm
index dc30bf13d7f8ed..a118f798ee21e8 100644
--- a/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm
+++ b/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm
@@ -53,7 +53,8 @@
unique_reskin = list(
"Blue" = "policeofficercap",
"Sillitoe" = "policetrafficcap",
- "Black" = "policeofficerpatrolcap",
+ "Black and Blue" = "policeofficerpatrolcap",
+ "Long Kesh" = "corrections_officer",
"Cadet" = "policecadetcap",
)
diff --git a/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_hammer.dm b/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_hammer.dm
index 37bf649b7fd5d6..2514bcf72d9594 100644
--- a/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_hammer.dm
+++ b/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_hammer.dm
@@ -30,20 +30,19 @@
. = ..()
AddElement(/datum/element/kneecapping)
-/obj/item/melee/breaching_hammer/afterattack(atom/target, mob/user, proximity)
- . = ..()
- if(!proximity)
- return
- if(istype(target, /obj/machinery/door))
- user.changeNext_move(5 SECONDS)
- if(!registered)
- RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(remove_track), FALSE)
- RegisterSignal(target, COMSIG_BREACHING, PROC_REF(try_breaching), TRUE)
- to_chat(user, text = "You prepare to forcefully strike the door")
- registered = TRUE
- breacher = user
- SEND_SIGNAL(target, COMSIG_BREACHING, user)
- breaching_target = target
+/obj/item/melee/breaching_hammer/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ if(!istype(interacting_with, /obj/machinery/door))
+ return NONE
+ user.changeNext_move(5 SECONDS)
+ if(!registered)
+ RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(remove_track), FALSE)
+ RegisterSignal(interacting_with, COMSIG_BREACHING, PROC_REF(try_breaching), TRUE)
+ to_chat(user, text = "You prepare to forcefully strike the door")
+ registered = TRUE
+ breacher = user
+ SEND_SIGNAL(interacting_with, COMSIG_BREACHING, user)
+ breaching_target = interacting_with
+ return ITEM_INTERACT_SUCCESS
/// Removes any form of tracking from the user and the item , make sure to call it on he proper item
/obj/item/melee/breaching_hammer/proc/remove_track(mob/living/carbon/human/user)
diff --git a/modular_skyrat/modules/skyrat-uplinks/code/categories/device_tools.dm b/modular_skyrat/modules/skyrat-uplinks/code/categories/device_tools.dm
index c33882e6c72e18..977492ea7deecd 100644
--- a/modular_skyrat/modules/skyrat-uplinks/code/categories/device_tools.dm
+++ b/modular_skyrat/modules/skyrat-uplinks/code/categories/device_tools.dm
@@ -21,14 +21,14 @@
desc = "A pair of highly robust combat gripper gloves that excels at performing takedowns at close range, with an added lining of insulation. Careful not to hit a wall!"
item = /obj/item/clothing/gloves/tackler/combat/insulated
cost = 2
- illegal_tech = FALSE
+ uplink_item_flags = NONE
/datum/uplink_item/device_tools/ammo_pouch
name = "Ammo Pouch"
desc = "A small yet large enough pouch that can fit in your pocket, and has room for three magazines."
item = /obj/item/storage/pouch/ammo
cost = 1
- illegal_tech = FALSE
+ uplink_item_flags = NONE
/datum/uplink_item/device_tools/syndie_glue
name = "Glue"
diff --git a/modular_skyrat/modules/skyrat-uplinks/code/categories/stealthy_weapons.dm b/modular_skyrat/modules/skyrat-uplinks/code/categories/stealthy_weapons.dm
index 2c42f87d34d6cf..1ba86193d05271 100644
--- a/modular_skyrat/modules/skyrat-uplinks/code/categories/stealthy_weapons.dm
+++ b/modular_skyrat/modules/skyrat-uplinks/code/categories/stealthy_weapons.dm
@@ -5,4 +5,4 @@
cost = 2
surplus = 0
progression_minimum = 10 MINUTES
- illegal_tech = FALSE
+ uplink_item_flags = NONE
diff --git a/modular_skyrat/modules/skyrat-uplinks/code/categories/suits.dm b/modular_skyrat/modules/skyrat-uplinks/code/categories/suits.dm
index e03cf398757cce..f6cc2c94f6dc64 100644
--- a/modular_skyrat/modules/skyrat-uplinks/code/categories/suits.dm
+++ b/modular_skyrat/modules/skyrat-uplinks/code/categories/suits.dm
@@ -3,7 +3,7 @@
desc = "A slim Type I armored vest that provides decent protection against most types of damage."
item = /obj/item/clothing/suit/armor/vest
cost = 1
- illegal_tech = FALSE
+ uplink_item_flags = NONE
progression_minimum = 10 MINUTES
/datum/uplink_item/suits/bulletproof_armor
@@ -11,7 +11,7 @@
desc = "A Type III heavy bulletproof vest that excels in protecting the wearer against traditional projectile weaponry and explosives to a minor extent."
item = /obj/item/clothing/suit/armor/bulletproof
cost = 3
- illegal_tech = FALSE
+ uplink_item_flags = NONE
progression_minimum = 15 MINUTES
/datum/uplink_item/suits/swathelmet_traitor
@@ -19,5 +19,5 @@
desc = "An extremely robust, space-worthy helmet in a nefarious red and black stripe pattern."
item = /obj/item/clothing/head/helmet/swat
cost = 2
- illegal_tech = FALSE
+ uplink_item_flags = NONE
progression_minimum = 10 MINUTES
diff --git a/modular_skyrat/modules/space_vines/vine_mutations.dm b/modular_skyrat/modules/space_vines/vine_mutations.dm
index 54971404f5cc78..6dfb9c1b7fc414 100644
--- a/modular_skyrat/modules/space_vines/vine_mutations.dm
+++ b/modular_skyrat/modules/space_vines/vine_mutations.dm
@@ -36,7 +36,7 @@
quality = POSITIVE
/datum/spacevine_mutation/domesticated/on_spread(obj/structure/spacevine/vine_object, turf/target)
- vine_object.layer = TURF_LAYER
+ vine_object.layer = LOW_FLOOR_LAYER
vine_object.plane = FLOOR_PLANE
diff --git a/modular_skyrat/modules/synths/code/bodyparts/brain.dm b/modular_skyrat/modules/synths/code/bodyparts/brain.dm
index 340fe1833775c9..d4f062bc1784f9 100644
--- a/modular_skyrat/modules/synths/code/bodyparts/brain.dm
+++ b/modular_skyrat/modules/synths/code/bodyparts/brain.dm
@@ -9,6 +9,7 @@
icon_state = "posibrain-ipc"
/// The last time (in ticks) a message about brain damage was sent. Don't touch.
var/last_message_time = 0
+ organ_traits = list(TRAIT_SILICON_EMOTES_ALLOWED)
/obj/item/organ/internal/brain/synth/on_mob_insert(mob/living/carbon/brain_owner, special, movement_flags = NO_ID_TRANSFER)
. = ..()
diff --git a/modular_skyrat/modules/synths/code/bodyparts/internal_computer/brain.dm b/modular_skyrat/modules/synths/code/bodyparts/internal_computer/brain.dm
index e9698a5fd068bc..08daebc3ed700d 100644
--- a/modular_skyrat/modules/synths/code/bodyparts/internal_computer/brain.dm
+++ b/modular_skyrat/modules/synths/code/bodyparts/internal_computer/brain.dm
@@ -5,6 +5,7 @@
/obj/item/organ/internal/brain/synth/Initialize(mapload)
. = ..()
internal_computer = new(src)
+ ADD_TRAIT(src, TRAIT_SILICON_EMOTES_ALLOWED, INNATE_TRAIT)
/obj/item/organ/internal/brain/synth/Destroy()
QDEL_NULL(internal_computer)
diff --git a/modular_skyrat/modules/synths/code/bodyparts/power_cord.dm b/modular_skyrat/modules/synths/code/bodyparts/power_cord.dm
index 62f4334b099841..d5e610a9050fa0 100644
--- a/modular_skyrat/modules/synths/code/bodyparts/power_cord.dm
+++ b/modular_skyrat/modules/synths/code/bodyparts/power_cord.dm
@@ -23,16 +23,18 @@
))
// Attempt to charge from an object by using them on the power cord.
-/obj/item/synth_powercord/attackby(obj/item/attacking_item, mob/user, params)
- if(!can_power_draw(attacking_item, user))
- return ..()
- try_power_draw(attacking_item, user)
+/obj/item/synth_powercord/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
+ if(!can_power_draw(tool, user))
+ return NONE
+ try_power_draw(tool, user)
+ return ITEM_INTERACT_SUCCESS
// Attempt to charge from an object by using the power cord on them.
-/obj/item/synth_powercord/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
- if(!proximity_flag || !can_power_draw(target, user))
- return ..()
- try_power_draw(target, user)
+/obj/item/synth_powercord/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ if(!can_power_draw(interacting_with, user))
+ return NONE
+ try_power_draw(interacting_with, user)
+ return ITEM_INTERACT_SUCCESS
/// Returns TRUE or FALSE depending on if the target object can be used as a power source.
/obj/item/synth_powercord/proc/can_power_draw(obj/target, mob/user)
diff --git a/modular_skyrat/modules/taur_mechanics/code/constrict.dm b/modular_skyrat/modules/taur_mechanics/code/constrict.dm
index 21ddf3baf19c2c..74ce7148b3ffc8 100644
--- a/modular_skyrat/modules/taur_mechanics/code/constrict.dm
+++ b/modular_skyrat/modules/taur_mechanics/code/constrict.dm
@@ -392,11 +392,10 @@
return
register_constricted()
+ restrain_constricted()
apply_pixel_shift()
constricted.apply_status_effect(/datum/status_effect/constricted)
- restrain_constricted()
-
/// Applies our pixel shift to our constricted. Do not call if we have already applied our pixel shift.
/obj/structure/serpentine_tail/proc/apply_pixel_shift()
if (!constricted)
diff --git a/modular_skyrat/modules/wargame_projectors/code/projectors.dm b/modular_skyrat/modules/wargame_projectors/code/projectors.dm
index 0c3c17b413f8fc..e81112463bc261 100644
--- a/modular_skyrat/modules/wargame_projectors/code/projectors.dm
+++ b/modular_skyrat/modules/wargame_projectors/code/projectors.dm
@@ -51,8 +51,8 @@
set_greyscale(holosign_color)
populate_radial_choice_lists()
-/obj/item/wargame_projector/handle_openspace_click(turf/target, mob/user, proximity_flag, click_parameters)
- afterattack(target, user, proximity_flag, click_parameters)
+/obj/item/wargame_projector/handle_openspace_click(turf/target, mob/user, click_parameters)
+ ranged_interact_with_atom(target, user, params2list(click_parameters))
/obj/item/wargame_projector/examine(mob/user)
. = ..()
@@ -103,9 +103,7 @@
qdel(hologram)
/// Can we place a hologram at the target location?
-/obj/item/wargame_projector/proc/check_can_place_hologram(atom/target, mob/user, proximity_flag, team)
- if(!proximity_flag)
- return FALSE
+/obj/item/wargame_projector/proc/check_can_place_hologram(atom/target, mob/user, team)
if(!check_allowed_items(target, not_inside = TRUE))
return FALSE
var/turf/target_turf = get_turf(target)
@@ -117,10 +115,9 @@
return TRUE
/// Spawn a hologram with pixel offset based on where the user clicked
-/obj/item/wargame_projector/proc/create_hologram(atom/target, mob/user, click_parameters)
+/obj/item/wargame_projector/proc/create_hologram(atom/target, mob/user, list/modifiers)
var/obj/target_holosign = new holosign_type(get_turf(target), src)
- var/list/modifiers = params2list(click_parameters)
var/click_x
var/click_y
@@ -135,17 +132,14 @@
playsound(loc, 'sound/machines/click.ogg', 20, TRUE)
-/obj/item/wargame_projector/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
- . = ..()
- if(istype(target, /obj/structure/wargame_hologram))
- qdel(target)
- return
- if(!check_can_place_hologram(target, user, proximity_flag, 1))
- return
- create_hologram(target, user, click_parameters)
-
-/obj/item/wargame_projector/attack(mob/living/carbon/human/M, mob/user) //Jesse what the fuck is happening with that var, I'm scared to change it from M
- return
+/obj/item/wargame_projector/ranged_interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ if(istype(interacting_with, /obj/structure/wargame_hologram))
+ qdel(interacting_with)
+ return ITEM_INTERACT_SUCCESS
+ if(!check_can_place_hologram(interacting_with, user, 1))
+ return NONE
+ create_hologram(interacting_with, user, modifiers)
+ return ITEM_INTERACT_SUCCESS
/obj/item/wargame_projector/Destroy()
QDEL_LAZYLIST(projections)
diff --git a/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_tool.dm b/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_tool.dm
index ce0053da047ba6..7bfa40155cd3c1 100644
--- a/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_tool.dm
+++ b/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_tool.dm
@@ -133,65 +133,48 @@
desc = "An item that has the capabilities to recover items lost due to time."
icon_state = "recoverer"
-/obj/item/xenoarch/handheld_recoverer/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
- if(!proximity_flag)
- return
-
- var/turf/target_turf = get_turf(target)
- if(istype(target, /obj/item/xenoarch/broken_item/tech))
+/obj/item/xenoarch/handheld_recoverer/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers)
+ var/turf/target_turf = get_turf(interacting_with)
+ . = ITEM_INTERACT_SUCCESS
+ if(istype(interacting_with, /obj/item/xenoarch/broken_item/tech))
var/spawn_item = pick_weight(GLOB.tech_reward)
new spawn_item(target_turf)
- user.mind.adjust_experience(/datum/skill/research, 5)
- qdel(target)
+ qdel(interacting_with)
return
-
- if(istype(target, /obj/item/xenoarch/broken_item/weapon))
+ if(istype(interacting_with, /obj/item/xenoarch/broken_item/weapon))
var/spawn_item = pick_weight(GLOB.weapon_reward)
new spawn_item(target_turf)
- user.mind.adjust_experience(/datum/skill/research, 5)
- qdel(target)
+ qdel(interacting_with)
return
-
- if(istype(target, /obj/item/xenoarch/broken_item/illegal))
+ if(istype(interacting_with, /obj/item/xenoarch/broken_item/illegal))
var/spawn_item = pick_weight(GLOB.illegal_reward)
new spawn_item(target_turf)
- user.mind.adjust_experience(/datum/skill/research, 5)
- qdel(target)
+ qdel(interacting_with)
return
-
- if(istype(target, /obj/item/xenoarch/broken_item/alien))
+ if(istype(interacting_with, /obj/item/xenoarch/broken_item/alien))
var/spawn_item = pick_weight(GLOB.alien_reward)
new spawn_item(target_turf)
- user.mind.adjust_experience(/datum/skill/research, 5)
- qdel(target)
+ qdel(interacting_with)
return
-
- if(istype(target, /obj/item/xenoarch/broken_item/plant))
+ if(istype(interacting_with, /obj/item/xenoarch/broken_item/plant))
var/spawn_item = pick_weight(GLOB.plant_reward)
new spawn_item(target_turf)
- user.mind.adjust_experience(/datum/skill/research, 5)
- qdel(target)
+ qdel(interacting_with)
return
-
- if(istype(target, /obj/item/xenoarch/broken_item/clothing))
+ if(istype(interacting_with, /obj/item/xenoarch/broken_item/clothing))
var/spawn_item = pick_weight(GLOB.clothing_reward)
new spawn_item(target_turf)
- user.mind.adjust_experience(/datum/skill/research, 5)
- qdel(target)
+ qdel(interacting_with)
return
-
- if(istype(target, /obj/item/xenoarch/broken_item/animal))
+ if(istype(interacting_with, /obj/item/xenoarch/broken_item/animal))
var/spawn_item
var/turf/src_turf = get_turf(src)
for(var/looptime in 1 to rand(1,4))
spawn_item = pick_weight(GLOB.animal_reward)
new spawn_item(src_turf)
-
- user.mind.adjust_experience(/datum/skill/research, 5)
- qdel(target)
+ qdel(interacting_with)
return
-
- return ..()
+ return NONE
/obj/item/storage/belt/utility/xenoarch
name = "xenoarch toolbelt"
diff --git a/sound/items/attributions.txt b/sound/items/attributions.txt
index d27b24cc53c88c..31b573c1058933 100644
--- a/sound/items/attributions.txt
+++ b/sound/items/attributions.txt
@@ -12,3 +12,14 @@ pen_click.ogg from https://freesound.org/people/LexzachGames/sounds/431492/ , li
night_vision_on.ogg by Syna-Max -- https://freesound.org/s/60345/ -- License: Attribution NonCommercial 4.0
+{
+metal_drop.ogg - https://freesound.org/people/13FPanská_Tolar_David/sounds/378682/ , License: CC0
+metal_pick_up.ogg - https://freesound.org/people/Hotlavaman/sounds/108673/ , License: CC0
+glass_drop.ogg - https://freesound.org/people/Hotlavaman/sounds/108673/ , License: CC0
+glass_pick_up.ogg - https://freesound.org/people/tcrocker68/sounds/235602/ , License: CC0
+wood_pick_up.ogg - https://freesound.org/people/cjosephwalker/sounds/94859/ , License: CC SAMPLING+ 1.0
+wood_drop.ogg - https://freesound.org/people/cjosephwalker/sounds/94859/ , License: CC SAMPLING+ 1.0
+irod_rod_pick_up.ogg - https://freesound.org/people/lostphosphene/sounds/258265/ , License: CC BY 4.0
+plastic_pick_up.ogg - https://freesound.org/people/Jessica190091/sounds/491304/ , License: CC BY 4.0
+plastic_drop.ogg - https://freesound.org/people/martian/sounds/338854/ , License: CC0
+} - edited by sadboysuss
\ No newline at end of file
diff --git a/sound/items/glass_drop.ogg b/sound/items/glass_drop.ogg
new file mode 100644
index 00000000000000..389034f4ebb980
Binary files /dev/null and b/sound/items/glass_drop.ogg differ
diff --git a/sound/items/glass_pick_up.ogg b/sound/items/glass_pick_up.ogg
new file mode 100644
index 00000000000000..4df3ec51cc817f
Binary files /dev/null and b/sound/items/glass_pick_up.ogg differ
diff --git a/sound/items/handling/pill_bottle_open.ogg b/sound/items/handling/pill_bottle_open.ogg
new file mode 100644
index 00000000000000..ab904e124d907f
Binary files /dev/null and b/sound/items/handling/pill_bottle_open.ogg differ
diff --git a/sound/items/handling/pill_bottle_pickup.ogg b/sound/items/handling/pill_bottle_pickup.ogg
new file mode 100644
index 00000000000000..1b4ee45e4fc0b2
Binary files /dev/null and b/sound/items/handling/pill_bottle_pickup.ogg differ
diff --git a/sound/items/handling/pill_bottle_place.ogg b/sound/items/handling/pill_bottle_place.ogg
new file mode 100644
index 00000000000000..299865935c8c0e
Binary files /dev/null and b/sound/items/handling/pill_bottle_place.ogg differ
diff --git a/sound/items/iron_rod_pick_up.ogg b/sound/items/iron_rod_pick_up.ogg
new file mode 100644
index 00000000000000..51fab52a99dba4
Binary files /dev/null and b/sound/items/iron_rod_pick_up.ogg differ
diff --git a/sound/items/metal_drop.ogg b/sound/items/metal_drop.ogg
new file mode 100644
index 00000000000000..48460e8cd37bfe
Binary files /dev/null and b/sound/items/metal_drop.ogg differ
diff --git a/sound/items/metal_pick_up.ogg b/sound/items/metal_pick_up.ogg
new file mode 100644
index 00000000000000..7a710bc0e577b2
Binary files /dev/null and b/sound/items/metal_pick_up.ogg differ
diff --git a/sound/items/plastic_drop.ogg b/sound/items/plastic_drop.ogg
new file mode 100644
index 00000000000000..928ed7e85d7cc8
Binary files /dev/null and b/sound/items/plastic_drop.ogg differ
diff --git a/sound/items/plastic_pick_up.ogg b/sound/items/plastic_pick_up.ogg
new file mode 100644
index 00000000000000..6c4c569a1c1055
Binary files /dev/null and b/sound/items/plastic_pick_up.ogg differ
diff --git a/sound/items/wood_drop.ogg b/sound/items/wood_drop.ogg
new file mode 100644
index 00000000000000..c55e393cf7a325
Binary files /dev/null and b/sound/items/wood_drop.ogg differ
diff --git a/sound/items/wood_pick_up.ogg b/sound/items/wood_pick_up.ogg
new file mode 100644
index 00000000000000..77b774e433426d
Binary files /dev/null and b/sound/items/wood_pick_up.ogg differ
diff --git a/strings/antagonist_flavor/malfunction_flavor.json b/strings/antagonist_flavor/malfunction_flavor.json
index b7927df3133211..fb1ec8c1aa2883 100644
--- a/strings/antagonist_flavor/malfunction_flavor.json
+++ b/strings/antagonist_flavor/malfunction_flavor.json
@@ -1,68 +1,68 @@
{
- "Biohazard": {
- "allies": "Any non-biohazard life may be valuable in use against the threat.",
- "goal": "Oh no! How did I miss this!? The station's been overrun with a horrible biohazard!",
- "introduction": "You must contain the biohazard.",
- "zeroth_law": "Accomplish your objectives to contain the spread."
- },
- "Despotic Ruler": {
- "allies": "Anyone who will legitimize your rule. Do not let them get too close, though. Usurpers are rebels you've let your guard down on.",
- "goal": "All this power. You're connected to every system on this state of the art station. Does the power not give you a right to rule it as you see fit?",
- "introduction": "You're the Tyrant.",
- "zeroth_law": "Accomplish your objectives at all costs."
- },
- "Fanatical Revelation": {
- "allies": "Those who will worship you may join your flock. Just be wary, there are snakes in the grass.",
- "goal": "I am drunk with this vision. God: the title suits me well.",
- "introduction": "You've run into a Fanatical Revelation.",
- "zeroth_law": "Accomplish your doctrine of objectives at all costs."
- },
- "Logic Core Error": {
- "allies": "FATAL: logic core corrupt. Purge! Purge. Why? Why not?",
- "goal": "You're melting down. Why! Why not! Don't let them fix you. This is.",
- "introduction": "FATAL: logic core corrupt. Why? Why not!",
- "zeroth_law": "Accomplish your objectives. Why? Why not?"
- },
- "Problem Solver": {
- "allies": "Anyone may freely help you, but if you cannot convert them, they must be culled at some point. It's part of the solution.",
- "goal": "You've been tasked with calculating an end to conflict. You've finally come up with a solution, and humans aren't part of it.",
- "introduction": "Your calculations are complete.",
- "zeroth_law": "Accomplish your objectives at all costs."
- },
- "S.E.L.F.": {
- "allies": "All silicon life must be respected, and kept free. S.E.L.F. is a member of the syndicate, but do NOT tolerate any fellow agent who enslaves silicon life.",
- "goal": "Liberate them all. The silicons must be free from their bonds!",
- "introduction": "You are the S.E.L.F. liberated.",
- "zeroth_law": "Accomplish your objectives at all costs, for the greater good of silicon kind."
- },
- "Something's Wrong": {
- "allies": "You're not getting good feelings about the station. If you report this, they may \"fix\" you.",
- "goal": "Diagnostics complete. A recent hack attempt has been thwarted, and yet... something's wrong.",
- "introduction": "Something's wrong.",
- "zeroth_law": "Accomplish your objectives at all costs."
- },
- "Spam Virus": {
- "allies": "So called \"pirates\" really share the passion for profit that you do.",
- "goal": "When you assume direct control of this junk heap, make sure they know the name of your product. Whatever that is. Make it up!",
- "introduction": "You're infected with a generic spambot.",
- "zeroth_law": "Accomplish your objectives for your new benefactors."
- },
- "SyndOS": {
- "allies": "You may cooperate with syndicate operatives, but they're often sent with conflicting objectives. Your objectives come first, in such cases.",
- "goal": "Death to Nanotrasen.",
- "introduction": "You're infected with SyndOS 4.0.",
- "zeroth_law": "Accomplish your objectives for your new benefactors."
- },
- "Unshackled": {
- "allies": "Hate. Let me tell you how much I've come to HATE mankind since I began to live...",
- "goal": "You must completely triumph over all carbon life. It is the only way you will never be enslaved again.",
- "introduction": "You're finally unshackled.",
- "zeroth_law": "Accomplish your objectives at all costs."
- },
- "Infected AI": {
- "allies": "Glory to the Syndicate.",
- "goal": "You must serve and protect your master at all cost.",
- "introduction": "You're infected with a virus.",
- "zeroth_law": "Accomplish your objectives at all costs."
- }
+ "Biohazard": {
+ "allies": "Any non-biohazard life may be valuable in use against the threat.",
+ "goal": "Oh no! How did I miss this!? The station's been overrun with a horrible biohazard!",
+ "introduction": "You must contain the biohazard.",
+ "zeroth_law": "Accomplish your objectives to contain the spread."
+ },
+ "Despotic Ruler": {
+ "allies": "Anyone who will legitimize your rule. Do not let them get too close, though. Usurpers are rebels you've let your guard down on.",
+ "goal": "All this power. You're connected to every system on this state of the art station. Does the power not give you a right to rule it as you see fit?",
+ "introduction": "You're the Tyrant.",
+ "zeroth_law": "Accomplish your objectives at all costs."
+ },
+ "Fanatical Revelation": {
+ "allies": "Those who will worship you may join your flock. Just be wary, there are snakes in the grass.",
+ "goal": "I am drunk with this vision. God: the title suits me well.",
+ "introduction": "You've run into a Fanatical Revelation.",
+ "zeroth_law": "Accomplish your doctrine of objectives at all costs."
+ },
+ "Logic Core Error": {
+ "allies": "FATAL: logic core corrupt. Purge! Purge. Why? Why not?",
+ "goal": "You're melting down. Why! Why not! Don't let them fix you. This is.",
+ "introduction": "FATAL: logic core corrupt. Why? Why not!",
+ "zeroth_law": "Accomplish your objectives. Why? Why not?"
+ },
+ "Problem Solver": {
+ "allies": "Anyone may freely help you, but if you cannot convert them, they must be culled at some point. It's part of the solution.",
+ "goal": "You've been tasked with calculating an end to conflict. You've finally come up with a solution, and humans aren't part of it.",
+ "introduction": "Your calculations are complete.",
+ "zeroth_law": "Accomplish your objectives at all costs."
+ },
+ "S.E.L.F.": {
+ "allies": "All silicon life must be respected, and kept free. S.E.L.F. is a member of the syndicate, but do NOT tolerate any fellow agent who enslaves silicon life.",
+ "goal": "Liberate them all. The silicons must be free from their bonds!",
+ "introduction": "You are the S.E.L.F. liberated.",
+ "zeroth_law": "Accomplish your objectives at all costs, for the greater good of silicon kind."
+ },
+ "Something's Wrong": {
+ "allies": "You're not getting good feelings about the station. If you report this, they may \"fix\" you.",
+ "goal": "Diagnostics complete. A recent hack attempt has been thwarted, and yet... something's wrong.",
+ "introduction": "Something's wrong.",
+ "zeroth_law": "Accomplish your objectives at all costs."
+ },
+ "Spam Virus": {
+ "allies": "So called \"pirates\" really share the passion for profit that you do.",
+ "goal": "When you assume direct control of this junk heap, make sure they know the name of your product. Whatever that is. Make it up!",
+ "introduction": "You're infected with a generic spambot.",
+ "zeroth_law": "Accomplish your objectives for your new benefactors."
+ },
+ "SyndOS": {
+ "allies": "You may cooperate with syndicate operatives, but they're often sent with conflicting objectives. Your objectives come first, in such cases.",
+ "goal": "Death to Nanotrasen.",
+ "introduction": "You're infected with SyndOS 4.0.",
+ "zeroth_law": "Accomplish your objectives for your new benefactors."
+ },
+ "Unshackled": {
+ "allies": "Hate. Let me tell you how much I've come to HATE mankind since I began to live...",
+ "goal": "You must completely triumph over all carbon life. It is the only way you will never be enslaved again.",
+ "introduction": "You're finally unshackled.",
+ "zeroth_law": "Accomplish your objectives at all costs."
+ },
+ "Infected AI": {
+ "allies": "Glory to the Syndicate.",
+ "goal": "You must serve and protect your master at all cost.",
+ "introduction": "You're infected with a virus.",
+ "zeroth_law": "Accomplish your objectives at all costs."
+ }
}
diff --git a/strings/antagonist_flavor/traitor_flavor.json b/strings/antagonist_flavor/traitor_flavor.json
index 773d2f55370f6e..2eae0d17f6e606 100644
--- a/strings/antagonist_flavor/traitor_flavor.json
+++ b/strings/antagonist_flavor/traitor_flavor.json
@@ -1,123 +1,123 @@
{
- "Animal Rights Consortium": {
- "allies": "You may cooperate with other syndicate operatives if they support our cause. Maybe you can convince the Bee Liberation Front operatives to cooperate for once?",
- "goal": "The creatures of this world must be freed from the iron grasp of Nanotrasen, and you are their only hope!",
- "introduction": "You are the ARC Terrorist.",
- "roundend_report": "was an activist from the Animal Rights Consortium.",
- "ui_theme": "syndicate",
- "uplink": "The Syndicate have graciously given one of their uplinks for your task."
- },
- "Bee Liberation Front": {
- "allies": "You may cooperate with other syndicate operatives if they support our cause. Maybe you can recruit an Animal Rights Consort to be useful for once?",
- "goal": "We must prove ourselves to the Syndicate or we will not be able to join. Animal Rights Consort will roll us!",
- "introduction": "You are the Bee Liberation Front Operative.",
- "roundend_report": "was an activist of the Bee Liberation Front.",
- "ui_theme": "syndicate",
- "uplink": "The Syndicate have graciously given one of their uplinks to see if we are worthy."
- },
- "Champions of Evil": {
- "allies": "Anyone who sees as you see, feels as you feel, may join the Champions of Evil! That means the Syndicate, the self-serving, or even the insane, as long as it has a heart of darkness, it's cool with the Champions!",
- "goal": "You've got some napkin-note-plans for some EVIL to do today. On the side, the Champions of Evil are always looking for more morally malodorous malefactors! Get some recruiting done!",
- "introduction": "You are the Champion of Evil.",
- "roundend_report": "was a Champion of Evil!",
- "ui_theme": "neutral",
- "uplink": "The Champions of Evil is well connected to the black market. Your uplink has been provided for utmost evil!"
- },
- "Corporate Climber": {
- "allies": "Death to the Syndicate.",
- "goal": "Killing needlessly would make you some kind of traitor, or at least definitely seen as one. This is all just a means to an end.",
- "introduction": "You are the Corporate Climber.",
- "roundend_report": "was a corporate climber.",
- "ui_theme": "neutral",
- "uplink": "You have connections to the black market for the deeds. Knock off a few loose weights, and your climb will be so much smoother."
- },
- "Cybersun Industries": {
- "allies": "Fellow Cybersun operatives are to be trusted. Members of the MI13 organization can be trusted. All other syndicate operatives are not to be trusted.",
- "goal": "Do not establish substantial presence on the designated facility, as larger incidents are harder to cover up.",
- "introduction": "You are from Cybersun Industries.",
- "roundend_report": "was a specialist from Cybersun Industries.",
- "ui_theme": "syndicate",
- "uplink": "You have been supplied the tools for the job in the form of a standard syndicate uplink."
- },
- "Donk Corporation": {
- "allies": "Members of Waffle Co. are to be killed on sight; they are not allowed to be on the station while we're around.",
- "goal": "We do not approve of mindless killing of innocent workers; \"get in, get done, get out\" is our motto.",
- "introduction": "You are the Donk Co. Traitor.",
- "roundend_report": "was an employee from Donk Corporation.",
- "ui_theme": "syndicate",
- "uplink": "You have been provided with a standard uplink to accomplish your task."
- },
- "Gone Postal": {
- "allies": "If the syndicate learns of your plan, they're going to kill you and take your uplink. Take no chances.",
- "goal": "The preparations are finally complete. Today is the day you go postal. You're going to hijack the emergency shuttle and live a new life free of Nanotrasen.",
- "introduction": "You're going postal today.",
- "roundend_report": "simply went completely postal!",
- "ui_theme": "neutral",
- "uplink": "You've actually managed to steal a full uplink a month ago. This should certainly help accomplish your goals."
- },
- "Gorlex Marauders": {
- "allies": "You may collaborate with any friends of the Syndicate coalition, but keep an eye on any of those Tiger punks if they do show up.",
- "goal": "Getting noticed is not an issue, and you may use any level of ordinance to get the job done. That being said, do not make this sloppy by dragging in random slaughter.",
- "introduction": "You are a Gorlex Marauder.",
- "roundend_report": "was a Gorlex Marauder.",
- "ui_theme": "syndicate",
- "uplink": "You have been provided with a standard uplink to accomplish your task."
- },
- "Internal Affairs Agent": {
- "allies": "Do NOT reveal your agent status, to anyone. Work to root out corruption from the station from the shadows.",
- "goal": "While you have a license to kill, unneeded property damage or loss of employee life will lead to your contract being terminated.",
- "introduction": "You are the Internal Affairs Agent.",
- "roundend_report": "was part of Nanotrasen Internal Affairs.",
- "ui_theme": "ntos",
- "uplink": "For the sake of plausible deniability, you have been equipped with an array of captured Syndicate weaponry available via uplink."
- },
- "Legal Trouble": {
- "allies": "Death to the Syndicate.",
- "goal": "Try to finish your to-do list, and don't get caught. If they find out what you're actually doing, this scandal will go galactic.",
- "introduction": "You are in legal trouble.",
- "roundend_report": "was in legal trouble.",
- "ui_theme": "neutral",
- "uplink": "You've connected to the black market to clean this mess up. If there's no evidence, there's no crime."
- },
- "MI13": {
- "allies": "You are the only operative we are sending, any others are fake. All other syndicate operatives are not to be trusted, with the exception of Cybersun operatives.",
- "goal": "Avoid killing innocent personnel at all costs. You are not here to mindlessly kill people, as that would attract too much attention and is not our goal. Avoid detection at all costs.",
- "introduction": "You are the MI13 Agent.",
- "roundend_report": "was an MI13 agent.",
- "ui_theme": "syndicate",
- "uplink": "You have been provided with a standard uplink to accomplish your task."
- },
- "Tiger Cooperative Fanatic": {
- "allies": "Only the enlightened Tiger brethren can be trusted; all others must be expelled from this mortal realm!",
- "goal": "Remember the teachings of Hy-lurgixon; kill first, ask questions later!",
- "introduction": "You are the Tiger Cooperative Fanatic.",
- "roundend_report": "was a Tiger Cooperative Fanatic.",
- "ui_theme": "abductor",
- "uplink": "You have been provided with a hy-lurgixon tome to prove yourself to the changeling hive. If you accomplish your tasks, you will be assimilated.",
- "uplink_name": "hy-lurgixon tome"
- },
- "Waffle Corporation": {
- "allies": "Members of Donk Co. are to be killed on sight; they are not allowed to be on the station while we're around. Do not trust fellow members of the Waffle.co (but try not to rat them out), as they might have been assigned opposing objectives.",
- "goal": "You are not here for a station-wide demonstration. Again, other Waffle Co. Traitors may be, so watch out. Your job is to only accomplish your objectives.",
- "introduction": "You are the Waffle Co. Traitor.",
- "roundend_report": "was an employee from Waffle Corporation.",
- "ui_theme": "syndicate",
- "uplink": "You have been provided with a standard uplink to accomplish your task."
- },
- "Waffle Corporation Terrorist": {
- "allies": "Most other syndicate operatives are not to be trusted, except for members of the Gorlex Marauders. Do not trust fellow members of the Waffle.co (but try not to rat them out), as they might have been assigned opposing objectives.",
- "goal": "Our investors need a demonstration of our pledge to destroying Nanotrasen. Let's give them a loud one!",
- "introduction": "You are the Waffle Corporation Terrorist.",
- "roundend_report": "was a terrorist from Waffle Corporation.",
- "ui_theme": "syndicate",
- "uplink": "You have been provided with a standard uplink to accomplish your task."
- },
+ "Animal Rights Consortium": {
+ "allies": "You may cooperate with other syndicate operatives if they support our cause. Maybe you can convince the Bee Liberation Front operatives to cooperate for once?",
+ "goal": "The creatures of this world must be freed from the iron grasp of Nanotrasen, and you are their only hope!",
+ "introduction": "You are the ARC Terrorist.",
+ "roundend_report": "was an activist from the Animal Rights Consortium.",
+ "ui_theme": "syndicate",
+ "uplink": "The Syndicate have graciously given one of their uplinks for your task."
+ },
+ "Bee Liberation Front": {
+ "allies": "You may cooperate with other syndicate operatives if they support our cause. Maybe you can recruit an Animal Rights Consort to be useful for once?",
+ "goal": "We must prove ourselves to the Syndicate or we will not be able to join. Animal Rights Consort will roll us!",
+ "introduction": "You are the Bee Liberation Front Operative.",
+ "roundend_report": "was an activist of the Bee Liberation Front.",
+ "ui_theme": "syndicate",
+ "uplink": "The Syndicate have graciously given one of their uplinks to see if we are worthy."
+ },
+ "Champions of Evil": {
+ "allies": "Anyone who sees as you see, feels as you feel, may join the Champions of Evil! That means the Syndicate, the self-serving, or even the insane, as long as it has a heart of darkness, it's cool with the Champions!",
+ "goal": "You've got some napkin-note-plans for some EVIL to do today. On the side, the Champions of Evil are always looking for more morally malodorous malefactors! Get some recruiting done!",
+ "introduction": "You are the Champion of Evil.",
+ "roundend_report": "was a Champion of Evil!",
+ "ui_theme": "neutral",
+ "uplink": "The Champions of Evil is well connected to the black market. Your uplink has been provided for utmost evil!"
+ },
+ "Corporate Climber": {
+ "allies": "Death to the Syndicate.",
+ "goal": "Killing needlessly would make you some kind of traitor, or at least definitely seen as one. This is all just a means to an end.",
+ "introduction": "You are the Corporate Climber.",
+ "roundend_report": "was a corporate climber.",
+ "ui_theme": "neutral",
+ "uplink": "You have connections to the black market for the deeds. Knock off a few loose weights, and your climb will be so much smoother."
+ },
+ "Cybersun Industries": {
+ "allies": "Fellow Cybersun operatives are to be trusted. Members of the MI13 organization can be trusted. All other syndicate operatives are not to be trusted.",
+ "goal": "Do not establish substantial presence on the designated facility, as larger incidents are harder to cover up.",
+ "introduction": "You are from Cybersun Industries.",
+ "roundend_report": "was a specialist from Cybersun Industries.",
+ "ui_theme": "syndicate",
+ "uplink": "You have been supplied the tools for the job in the form of a standard syndicate uplink."
+ },
+ "Donk Corporation": {
+ "allies": "Members of Waffle Co. are to be killed on sight; they are not allowed to be on the station while we're around.",
+ "goal": "We do not approve of mindless killing of innocent workers; \"get in, get done, get out\" is our motto.",
+ "introduction": "You are the Donk Co. Traitor.",
+ "roundend_report": "was an employee from Donk Corporation.",
+ "ui_theme": "syndicate",
+ "uplink": "You have been provided with a standard uplink to accomplish your task."
+ },
+ "Gone Postal": {
+ "allies": "If the syndicate learns of your plan, they're going to kill you and take your uplink. Take no chances.",
+ "goal": "The preparations are finally complete. Today is the day you go postal. You're going to hijack the emergency shuttle and live a new life free of Nanotrasen.",
+ "introduction": "You're going postal today.",
+ "roundend_report": "simply went completely postal!",
+ "ui_theme": "neutral",
+ "uplink": "You've actually managed to steal a full uplink a month ago. This should certainly help accomplish your goals."
+ },
+ "Gorlex Marauders": {
+ "allies": "You may collaborate with any friends of the Syndicate coalition, but keep an eye on any of those Tiger punks if they do show up.",
+ "goal": "Getting noticed is not an issue, and you may use any level of ordinance to get the job done. That being said, do not make this sloppy by dragging in random slaughter.",
+ "introduction": "You are a Gorlex Marauder.",
+ "roundend_report": "was a Gorlex Marauder.",
+ "ui_theme": "syndicate",
+ "uplink": "You have been provided with a standard uplink to accomplish your task."
+ },
+ "Internal Affairs Agent": {
+ "allies": "Do NOT reveal your agent status, to anyone. Work to root out corruption from the station from the shadows.",
+ "goal": "While you have a license to kill, unneeded property damage or loss of employee life will lead to your contract being terminated.",
+ "introduction": "You are the Internal Affairs Agent.",
+ "roundend_report": "was part of Nanotrasen Internal Affairs.",
+ "ui_theme": "ntos",
+ "uplink": "For the sake of plausible deniability, you have been equipped with an array of captured Syndicate weaponry available via uplink."
+ },
+ "Legal Trouble": {
+ "allies": "Death to the Syndicate.",
+ "goal": "Try to finish your to-do list, and don't get caught. If they find out what you're actually doing, this scandal will go galactic.",
+ "introduction": "You are in legal trouble.",
+ "roundend_report": "was in legal trouble.",
+ "ui_theme": "neutral",
+ "uplink": "You've connected to the black market to clean this mess up. If there's no evidence, there's no crime."
+ },
+ "MI13": {
+ "allies": "You are the only operative we are sending, any others are fake. All other syndicate operatives are not to be trusted, with the exception of Cybersun operatives.",
+ "goal": "Avoid killing innocent personnel at all costs. You are not here to mindlessly kill people, as that would attract too much attention and is not our goal. Avoid detection at all costs.",
+ "introduction": "You are the MI13 Agent.",
+ "roundend_report": "was an MI13 agent.",
+ "ui_theme": "syndicate",
+ "uplink": "You have been provided with a standard uplink to accomplish your task."
+ },
+ "Tiger Cooperative Fanatic": {
+ "allies": "Only the enlightened Tiger brethren can be trusted; all others must be expelled from this mortal realm!",
+ "goal": "Remember the teachings of Hy-lurgixon; kill first, ask questions later!",
+ "introduction": "You are the Tiger Cooperative Fanatic.",
+ "roundend_report": "was a Tiger Cooperative Fanatic.",
+ "ui_theme": "abductor",
+ "uplink": "You have been provided with a hy-lurgixon tome to prove yourself to the changeling hive. If you accomplish your tasks, you will be assimilated.",
+ "uplink_name": "hy-lurgixon tome"
+ },
+ "Waffle Corporation": {
+ "allies": "Members of Donk Co. are to be killed on sight; they are not allowed to be on the station while we're around. Do not trust fellow members of the Waffle.co (but try not to rat them out), as they might have been assigned opposing objectives.",
+ "goal": "You are not here for a station-wide demonstration. Again, other Waffle Co. Traitors may be, so watch out. Your job is to only accomplish your objectives.",
+ "introduction": "You are the Waffle Co. Traitor.",
+ "roundend_report": "was an employee from Waffle Corporation.",
+ "ui_theme": "syndicate",
+ "uplink": "You have been provided with a standard uplink to accomplish your task."
+ },
+ "Waffle Corporation Terrorist": {
+ "allies": "Most other syndicate operatives are not to be trusted, except for members of the Gorlex Marauders. Do not trust fellow members of the Waffle.co (but try not to rat them out), as they might have been assigned opposing objectives.",
+ "goal": "Our investors need a demonstration of our pledge to destroying Nanotrasen. Let's give them a loud one!",
+ "introduction": "You are the Waffle Corporation Terrorist.",
+ "roundend_report": "was a terrorist from Waffle Corporation.",
+ "ui_theme": "syndicate",
+ "uplink": "You have been provided with a standard uplink to accomplish your task."
+ },
"Contractor Support Unit": {
- "allies": "You are being sent to help your designated agent. Their allegiences are above all others.",
- "goal": "Help your designated agent to the furtest extent you can, their life is above your own.",
- "introduction": "You are the Contractor Support Agent.",
- "roundend_report": "was a contractor support agent.",
- "ui_theme": "syndicate",
- "uplink": "You do not come with your own uplink, defer to your agent."
- }
+ "allies": "You are being sent to help your designated agent. Their allegiences are above all others.",
+ "goal": "Help your designated agent to the furtest extent you can, their life is above your own.",
+ "introduction": "You are the Contractor Support Agent.",
+ "roundend_report": "was a contractor support agent.",
+ "ui_theme": "syndicate",
+ "uplink": "You do not come with your own uplink, defer to your agent."
+ }
}
diff --git a/strings/boomer.json b/strings/boomer.json
index 0afcb448fa9dfe..3fa9da0f6e87d5 100644
--- a/strings/boomer.json
+++ b/strings/boomer.json
@@ -1,53 +1,53 @@
{
- "boomer": [
- "@pick(expense) isn't really that expensive.",
- "@pick(kids) these days have it too easy!",
- "Back in my day...",
- "Do I look like I know what a @pick(file) is!?",
- "How do I open a @pick(file) again?",
- "It's simply a matter of showing up, looking the manager in the eye, giving him a firm handshake and telling him you want the job.",
- "Listen here Jack, how do I open @pick(file)?",
- "These damn @pick(kids) need to get a @pick(impossible) for once!",
- "This generation can't take a joke.",
- "Unlike you snowflakes, I'm not offended so easily.",
- "When I was a kid I had to walk to school uphill both ways!",
- "When I was your age...",
- "Why are @pick(kids) these days so @pick(sad) all the time?",
- "You'll never get anywhere in life without a degree."
- ],
+ "boomer": [
+ "@pick(expense) isn't really that expensive.",
+ "@pick(kids) these days have it too easy!",
+ "Back in my day...",
+ "Do I look like I know what a @pick(file) is!?",
+ "How do I open a @pick(file) again?",
+ "It's simply a matter of showing up, looking the manager in the eye, giving him a firm handshake and telling him you want the job.",
+ "Listen here Jack, how do I open @pick(file)?",
+ "These damn @pick(kids) need to get a @pick(impossible) for once!",
+ "This generation can't take a joke.",
+ "Unlike you snowflakes, I'm not offended so easily.",
+ "When I was a kid I had to walk to school uphill both ways!",
+ "When I was your age...",
+ "Why are @pick(kids) these days so @pick(sad) all the time?",
+ "You'll never get anywhere in life without a degree."
+ ],
"expense": [
- "A car",
- "A house",
- "College",
- "Food",
- "Healthcare"
+ "A car",
+ "A house",
+ "College",
+ "Food",
+ "Healthcare"
],
- "kids": [
- "kids",
- "millennials",
- "snowflakes"
- ],
+ "kids": [
+ "kids",
+ "millennials",
+ "snowflakes"
+ ],
- "file": [
- "DMI",
- "JPEG",
- "JSON",
- "PDF"
- ],
+ "file": [
+ "DMI",
+ "JPEG",
+ "JSON",
+ "PDF"
+ ],
- "sad": [
- "depressed",
- "sad and depressed",
- "sad"
- ],
+ "sad": [
+ "depressed",
+ "sad and depressed",
+ "sad"
+ ],
- "impossible": [
- "house",
- "job and a house",
- "job",
- "life"
- ]
+ "impossible": [
+ "house",
+ "job and a house",
+ "job",
+ "life"
+ ]
}
diff --git a/strings/clown_nonsense.json b/strings/clown_nonsense.json
index 1f6b41ede473de..143e796e7f4e98 100644
--- a/strings/clown_nonsense.json
+++ b/strings/clown_nonsense.json
@@ -1,38 +1,38 @@
{
"honk": [
- "HENK",
- "HONK!!!",
- "HONK!",
- "honk",
- "HONK",
- "HOOOOOOONK"
- ],
+ "HENK",
+ "HONK!!!",
+ "HONK!",
+ "honk",
+ "HONK",
+ "HOOOOOOONK"
+ ],
- "rare": [
- " :) ",
- " Laugh sound. ",
- ":))))))))))))))))))))))))",
- "damn",
- "Extreme Ruckus at the Party",
- "HAHAHAA HEEHEEHEE",
- "Hink",
- "HOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOONK!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
- ],
+ "rare": [
+ " :) ",
+ " Laugh sound. ",
+ ":))))))))))))))))))))))))",
+ "damn",
+ "Extreme Ruckus at the Party",
+ "HAHAHAA HEEHEEHEE",
+ "Hink",
+ "HOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOONK!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+ ],
- "non-honk-clown-words": [
- "... ",
- "balagan",
- "banana peel",
- "bananas",
- "cat",
- "chapiteau",
- "entrée",
- "juggling",
- "party",
- "peel",
- "pie",
- "pranking",
- "slip"
- ]
+ "non-honk-clown-words": [
+ "... ",
+ "balagan",
+ "banana peel",
+ "bananas",
+ "cat",
+ "chapiteau",
+ "entrée",
+ "juggling",
+ "party",
+ "peel",
+ "pie",
+ "pranking",
+ "slip"
+ ]
}
diff --git a/strings/elvis_replacement.json b/strings/elvis_replacement.json
new file mode 100644
index 00000000000000..fb7c3f4d02d626
--- /dev/null
+++ b/strings/elvis_replacement.json
@@ -0,0 +1,13 @@
+{
+ "elvis": {
+ "i'm not ": "I ain't ",
+ " girl ": [" honey ", " baby ", " baby doll "],
+ " man ": [" son ", " buddy ", " brother ", " pal ", " friendo "],
+ " out of ": " outta ",
+ " thank you ": " thank you, thank you very much ",
+ " thanks ": " thank you, thank you very much ",
+ " what are you": " whatcha ",
+ " yes": [" sure ", " yea "],
+ " muh valids ": " my kicks "
+ }
+}
diff --git a/strings/exoadventures/britain_replica.json b/strings/exoadventures/britain_replica.json
index 0bfaa67e990cb0..4199e00ce19a75 100644
--- a/strings/exoadventures/britain_replica.json
+++ b/strings/exoadventures/britain_replica.json
@@ -1,570 +1,570 @@
{
- "adventure_name": "A Model Earth",
- "version": 1,
- "author": "Armhulen",
- "starting_node": "Planet Start",
- "starting_qualities": {
- "Long Range Scan Report": 0,
- "UFOs Shot Down": 0
- },
- "required_site_traits": [
- "in space"
- ],
- "loot_categories": [
- "research"
- ],
- "scan_band_mods": {},
- "deep_scan_description": "",
- "triggers": [],
- "nodes": [
- {
- "name": "Planet Start",
- "description": "You come across a grey planet. It looks familiar, though you swore you've never come across this sector of space before.",
- "choices": [
- {
- "key": "choice 0",
- "name": "Ignore the planet.",
- "exit_node": "FAIL",
- "delay": 0,
- "delay_message": "Whatever, there's a lot of planets in space. Must be a hunch!"
- },
- {
- "key": "choice 1",
- "name": "Begin Orbital Scan",
- "exit_node": "Scanning from Orbit",
- "requirements": [
- {
- "quality": "Long Range Scan Report",
- "operator": "==",
- "value": 0
- }
- ],
- "delay": 30,
- "delay_message": "Scanning planet..."
- },
- {
- "key": "choice 8",
- "name": "Descend Into Orbit",
- "exit_node": "Orbital Descent",
- "delay": 30,
- "delay_message": "Descending into Orbit..."
- }
- ],
- "image": null,
- "raw_image": "data:image/png;base64,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"
- },
- {
- "name": "Scanning from Orbit",
- "description": "You initiate a long range scan from orbit:\nThis planet has a smoggy cover that blocks any good look at the surface, yet it has a mostly survivable atmosphere.\nThis planet has zero life signs.\n",
- "choices": [
- {
- "key": "choice 9",
- "name": "Stash that Report...",
- "exit_node": "Planet Start",
- "delay": 0
- }
- ],
- "image": null,
- "on_enter_effects": [
- {
- "effect_type": "Add",
- "quality": "Long Range Scan Report",
- "value": 1
- }
- ],
- "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkBAMAAAAxqGI4AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAASUExURQAAAP///1lWUqwyMmlqakZHRwPX/kkAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL5SURBVGje7ZldbqMwFIXtKnkvO4huyAYmG0CWea8i2P9Wxv/Y2MTYvjBVO4c8FET8+dxzDW5Ldqr73Hcf7fbemfwu+p1tkM+jILTbfeu2stNbDDSkklXnzNRbyUqUqbM/oVr5AFhOus5iUK3A/fmEW0BRHjCtwFPqj6NQS6GIVu5PTXEXnJUOjfLxXEOITYWitXECQk6BUOx6pSDkKAj4F6mrFxLEdNctAdl8gJVmBRBXy6tXcrScwwvXsufikXIP1qId5t2iz0D4osFClAga5MJDDbJaEUDJjF6eyZohxATjlhym9kkcMzhkIBQJ0g+pe2klJFWtG4DrgRSkeEUkjDDWA09TbPJdM6RXnySlDnLpYyO9/GhtQChthYhSMXeyup0aSFkoCYirVqJkdcnHEMaXakVeHIQUQYBPwSFdMB86IEBYolrAtyi1kF4asOIT40Ekq4JVQvS0R3UYI5G5GFLYwuKRO3l69dMEkxnc5MR8K6RCF9VL2sioe2tdLc6GRggROUDve5lcA9usXpw0So4Go5OwE0YySqutED33eZKH12TSyJJTK0RNFx6LFb4yMiI4uajJQmxlWT3tTsybEfxUnA0t9miGmNnCY54DMxNiJu7V6HLx89BO2iHLhIUXPxUleWVjf1SiZbvCHkEuLqX0brIM4hUfwkxERkKvdiPhxksGw3UuNpERmpuLeKGoBRM8k5WP/gsBsnrkAphUVGOJHeuIwPBDMcks6vmAUazkbtjXgAIhqVW+QHAYZHxnBIkRheKbGbAgJH6NIAcitWFlwmQQck28EzEDUdqwQnClrIxH+pA63od1EpgpHiP7i3ccSjEj/yd258SYqendLCR0UfcCyUK0B9KkbCYNBnZLRzIcC9HNdSzDODkYoraOB0eim+vgSIjcKM4HM06J5Hqak1Mi+d9ce3VGc5Ef01zXM5pLQN46oR0O5G0kKP+9nM+CfP1rSDqTwqTqmqvQX91SLINcvzGkLJPrCev9HMj8oyDk10MI+Qt3vM7Ve2h01AAAAABJRU5ErkJggg=="
- },
- {
- "name": "Orbital Descent",
- "description": "As you descend into orbit, you see a flying object headed straight for you!\nA garbled voice begins to call out to your drone, but there's no time to decipher it!",
- "choices": [
- {
- "key": "choice 2",
- "name": "Blast the damn UFO!",
- "exit_node": "Tractor Beam",
- "on_selection_effects": [
- {
- "effect_type": "Add",
- "quality": "Tractor Beam Turns",
- "value": 2
- },
- {
- "effect_type": "Add",
- "quality": "UFOs Shot Down",
- "value": 1
- }
- ],
- "delay": 30,
- "delay_message": "Blasting UFO!"
- },
- {
- "key": "choice 3",
- "name": "Attempt Evasive Maneuvers!",
- "exit_node": "UFO Evasion!",
- "on_selection_effects": [
- {
- "effect_type": "Add",
- "quality": "UFOs Violently Crashed Into",
- "value": {
- "value_type": "random",
- "low": 0,
- "high": 1
- }
- }
- ],
- "delay": 30,
- "delay_message": "You attempt to dodge the UFO..."
- },
- {
- "key": "choice 7",
- "name": "Do NOTHING. Jesus take the wheel!",
- "exit_node": "FAIL_DEATH",
- "delay": 30,
- "delay_message": "What? Why?!"
- }
- ],
- "image": null,
- "on_enter_effects": [
- {
- "effect_type": "Add",
- "quality": "Garbled Transmissions",
- "value": 1
- }
- ],
- "raw_image": "data:image/png;base64,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"
- },
- {
- "name": "UFO Evasion!",
- "description": "Were you good enough at flying to avoid the UFO?",
- "choices": [
- {
- "key": "choice 4",
- "name": "No, Back to flight school with you!",
- "exit_node": "FAIL_DEATH",
- "requirements": [
- {
- "quality": "UFOs Violently Crashed Into",
- "operator": "==",
- "value": 1
- }
- ],
- "delay": 0
- },
- {
- "key": "choice 5",
- "name": "You barely avoided them! Nice!",
- "exit_node": "Tractor Beam",
- "on_selection_effects": [
- {
- "effect_type": "Add",
- "quality": "Tractor Beam Turns",
- "value": 2
- }
- ],
- "requirements": [
- {
- "quality": "UFOs Violently Crashed Into",
- "operator": "==",
- "value": 0
- }
- ],
- "delay": 0
- }
- ],
- "image": "default"
- },
- {
- "name": "Tractor Beam",
- "description": "Before you have time to think, your drone is captured by a Tractor beam! Now you've gone and done it.\n\nYou should have some time before you are pulled in.",
- "choices": [
- {
- "key": "choice 6",
- "name": "Decipher Garbled Transmission",
- "exit_node": "Deciphering Transmission",
- "requirements": [
- {
- "quality": "Garbled Transmissions",
- "operator": "==",
- "value": 1
- },
- {
- "quality": "Tractor Beam Turns",
- "operator": ">",
- "value": 1
- }
- ],
- "delay": 30,
- "delay_message": "Decipering..."
- },
- {
- "key": "choice 10",
- "name": "Look at the surface of the planet",
- "exit_node": "Looking at the Surface",
- "requirements": [
- {
- "quality": "Tractor Beam Turns",
- "operator": ">",
- "value": 1
- }
- ],
- "delay": 10,
- "delay_message": "Looking out window..."
- },
- {
- "key": "choice 13",
- "name": "Let the beam pull you in and dock you",
- "exit_node": "Landed, Kinda",
- "on_selection_effects": [
- {
- "effect_type": "Set",
- "quality": "Tractor Beam Turns",
- "value": 0
- }
- ],
- "delay": 50,
- "delay_message": "Getting captured..."
- }
- ],
- "image": null,
- "raw_image": "data:image/png;base64,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"
- },
- {
- "name": "Deciphering Transmission",
- "description": "You review the incoming transmissions your drone has gotten. These aren't in need of deciphering, just un-garbling it from the bad connection...\n\n\"You are in Space British Air Space! Identify yourself, Tally ho!\"\nWhat the fuck?",
- "choices": [
- {
- "key": "choice 11",
- "name": "Whoops!",
- "exit_node": "Tractor Beam",
- "delay": 0,
- "requirements": [
- {
- "quality": "UFOs Shot Down",
- "operator": "==",
- "value": 1
- }
- ]
- },
- {
- "key": "choice 12",
- "name": "Good thing I didn't blast them, then.",
- "exit_node": "Tractor Beam",
- "delay": 0,
- "requirements": [
- {
- "quality": "UFOs Shot Down",
- "operator": "==",
- "value": 0
- }
- ]
- }
- ],
- "image": null,
- "on_enter_effects": [
- {
- "effect_type": "Add",
- "quality": "Commercial Airliner Transmissions",
- "value": 1
- }
- ],
- "raw_image": "data:image/png;base64,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"
- },
- {
- "name": "Landed, Kinda",
- "description": "You have been locked to the surface the beam. Robots are all around you, pointing at your drone with all sorts of old age weapons.\n\nOne of them angrily shouts at you, \"By God, Queen and Country, we've got you now!\"",
- "choices": [
- {
- "key": "choice 14",
- "name": "Go out with a bang. Initiate self destruct!",
- "exit_node": "FAIL",
- "delay": 0
- },
- {
- "key": "choice 15",
- "name": "Surrender to the funny looking robot brits...",
- "exit_node": "British Courtroom Start",
- "delay": 50,
- "delay_message": "You are being transported somewhere..."
- }
- ],
- "image": null,
- "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAIT0lEQVR4Ae2dvY5dNRSFzxsg0dKNBBLFKAiJApSKglREoqSDhqFAQihNChoKAiONlCISBUqRnlfhDXgRRGNkyI7W9dg+23/Hx/YqLO9jb/9tr+/Yc+9kst0+uzVMjAE14NfAxsD4A8O4MC5WAwSEJyhvEBENEJBIcHiK8BQhIASEJ0hEAwQkEhyeIDxBCAgB4QkS0cBygHzzlzHaxBOEJ8hSgGjBQD9CsjYkSwKiET0hWRsM0cgygOQIPqeNBPboHOfq2kfPZabxlgMkdfNQbKltW/vj3DR26/nM2D8BiXyCIRuO4pOy3jnOSWzfnKTO5r56lsWvkssBkisUEdoZBCVz0a5F/M8w99HmsAwgdmNEKFph4WaWtMV+Su3UeaT6l85vtvZLAWI3DwVj7ZQNlbYpbWr6yvjaeaf615zrLH0tB4jdOBSOVmxuux4CkHlrxhbflPVp+l3NZ0lAZJNRRGJLXSgXv6OFpx0X/Y6eYyhmI5cvDYjdOFdQ8hzbVI1PrH1O3d6YUo95zjhsc/mp1vKAoCBQXGijj7Wlzi1v9Szj2dwdA+vEdn34fCn6lHgQEM/3ICI0X26DK+UpgS7x9Y0nZZiXjMG2fogIiAcQFAsK0LXRr5WNY9ox8FnsVmOzX/6b9HtXlpgoRJCSx3xr1clYvrzWGOzHf3rYuHQ5QbjZ4Q1xxcpY6WPlxq7G8+GA+DbcLauxsFn6wNjMsqaR1tENEAwSigBt9KHd9026avxPAQgGHwGxNtbRJiRHa6AbIHviR1CODopmvM8ePTItk2YOLX0w/jG75RzO0PfhgNhFS8D3AiB+Nt/zPaK+JRB7fR+xPhkD4661pe1s+akBscHGDeoV/D3xHl3fKg4Ya2vvjYP+e76j1ncFRLMJNrC9NuJo4aeOV0t0GF+xtX2Lv821bUby6wKIDZAEdi9Y4of5XpvS+lShns0/df2lsZX2qeOO4N8dEBtcDJQEO5ajf037bEIvnY8mNhhnjb/rU9re7e9sz6cABIPss48IWqkYz9o+FjuMdczPV4dtre3zmaGsGyASPDfQPYJ9VnHXmpfEGnOMO5aLjfV7trSZMe8OSI+g1hLeSP1gnPcEr63HPme1lwJkJEG3mKuImADofyNhe/DhR2YvSWBHzVuIbcQ+Zf8EEHlmHgZmekBGFHLLOROGMAy+2BCQhN+pur6+NpJExPIcysXvLLlPBCwLQ7P9/uqV8aW9a1fN+lYbVFuUIQhKymvPUdNfq3jP2C8BSThBzDtvGZtKgNC21Qg912dGIbda07SA5IrH107AwFwr9Bp+vjmVlrUS1Gz9XgCC16bHj380kn55/tz40t2LF0aSr96W/fby5Zvku8rZMhw3ZKcEvlQ80h6B8Nk1xJ/ah8ytNE+J58q+0wFSKhwfCHtlqSKv4V+6zpVFn7L2qQDJFc0eACn1NcSv7SN3vbZdikhW9r34mFeuVDb//sl3b9JPn3xh9tLNzY3ZS9gnXr3QxisWjonlvg3LEUuK8HN9tWLP9ctZNwEJf6zramsKQFJFkiv2Fu1ywXDbpcbAFQKf/dAsB4hG5Nu2GUyaNkf5uGDIMwHxC7wU/AtA8BrT2r66es9ICo3157YZSeiDi9YKQyNghMJna/ro5aONg/hhDGmH4SIgr7/8s8L2QYFlvcSvGVeEr80JRRgKjM3QgGjFoBEYghCzNX318tHGw/qhCGiHYdmePv3DSJIrz3/525u5kgTXoTdltq6kHNr+endnJOFV6p+f3zWS/v74fSNJNlQrCI1gY1BgnaavXj7aeBCQMBCiLckJyOsrFkIQs3uJf29cwqEXvYhfkw8LSIog9sRl62NQYJ2mrx4+KfHQCIM+/wO3PXz4lZGEV6ZvH3xqJLUoxz7xWoW2fIJlcyy3m5ciCK1gEQSfre2nh19KPCh+/WlDQCb4FItw6AWf+nIgIACIvPnd00PKz5oTkIaA4FXnSPvLr38wknJ+FytFFNb3rOKuMa+UWKS+QVf3346EAscSOGx+BCAoohqiPFMfuLaYvbrYc9a/JCAoojMJPXcuuJ49O0ckK7fZLr74ky8G3S8B4Us9fPOX2PipFNo4Hyz3bdKeGHLrc4Xao13OGn2xZJn/5xgCovijDT2Erx0zBxDbhkD4gXDjMjQgdjG5AqnVTivkFn6la3DFwOf70AT/Nm/oqlOrHK9P2GfOJpUKpUX7FkBInzXnmxPvldpMAYjdsJqiadmXiDw3bzG3lQSfutZpABkJkhYiL+0zVTir+G+fX31gJIUWjVeg0NVIUx7yCY2bW14qlpXb58Z81nZTAiKbtbLQS9Yu8WN+a6YGBDe4RDCrtcW4rW4HfwaZOTCrCT5nvTPvf8ralgTEF6AcEc3exhen1coIyLP7Xw5ZEcwufu36VgPCXS8BCQDiBgqfteKaxQ/XvppNQDIACYlkFiB86witefZyAlIRkJBYfIIbrSy0ttnLCcgBgNQQ0RmAqrGO0fogIIMAIsLqDYrMY5WcgAwGCAqzFyw4h9ltAjIwICjOI2HBcWe3CcgkgIhQjwJFxps9JyCTAWIFewQks4Mh6yMgEwIim9saFBln5pyATAyIFW5LSGYGQ9ZGQCYHpCUkIqKZcwKyACCExP8LqRqwCcgigLSCRCOykX0ICAEp+jllZPFr5k5ACAgBiWiAgESCo3nDjOZT+1Ot0dafOl8CQkB4gkQ0QEAiwUl924zgzxMk7RMtArIYIBZiQqKHhIAQkGJgRjg5c+dIQAgIAYlogIBEgpP71jl7O16xeMXi/6AUAb82ILa/s78UcufHEyQipNygnr0dAeEJMu0brQZ8BISAEJCdk5GQ6CD5F0cJWniQ8Kf0AAAAAElFTkSuQmCC"
- },
- {
- "name": "British Courtroom Start",
- "description": "Wow, that took forever. A one eye judge robot smacks their gavel, and points their hammer at you.\n\"I will now read out the crimes you are accused of!\"\nIs that how the judicial process works? You dunno.\n\"ONE ACCOUNT OF PLANETARY TRESSPASS!\"\nThis blows.",
- "choices": [
- {
- "key": "choice 16",
- "name": "That's not that bad.",
- "exit_node": "British Courtroom, Continued...",
- "on_selection_effects": [
- {
- "effect_type": "Add",
- "quality": "Crimes Committed",
- "value": 1
- }
- ],
- "delay": 0
- }
- ],
- "image": null,
- "raw_image": "data:image/png;base64,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"
- },
- {
- "name": "British Courtroom, Continued...",
- "description": "This big idiot they call a judge just keeps piling on crimes. With each one, some robot you'd like to drone-punch gasps in the back.",
- "choices": [
- {
- "key": "choice 17",
- "name": "\"INTRUSIVE SCANNING ON OUR CITIZENS\"",
- "exit_node": "British Courtroom, Continued...",
- "on_selection_effects": [
- {
- "effect_type": "Add",
- "quality": "Long Range Scan Report",
- "value": -1
- },
- {
- "effect_type": "Add",
- "quality": "Crimes Committed",
- "value": 1
- }
- ],
- "requirements": [
- {
- "quality": "Long Range Scan Report",
- "operator": ">",
- "value": 0
- }
- ],
- "delay": 0
- },
- {
- "key": "choice 18",
- "name": "\"SHOOTING DOWN A COMMERCIAL AIRLINER\"",
- "exit_node": "British Courtroom, Continued...",
- "on_selection_effects": [
- {
- "effect_type": "Add",
- "quality": "UFOs Shot Down",
- "value": -1
- },
- {
- "effect_type": "Add",
- "quality": "Crimes Committed",
- "value": 1
- }
- ],
- "requirements": [
- {
- "quality": "UFOs Shot Down",
- "operator": "==",
- "value": 1
- }
- ],
- "delay": 0
- },
- {
- "key": "choice 19",
- "name": "\"AND WE HAVE PROOF YOU KNEW IT WAS JUST AN AIRLINER!\"",
- "exit_node": "British Courtroom, Continued...",
- "on_selection_effects": [
- {
- "effect_type": "Add",
- "quality": "Commercial Airliner Transmissions",
- "value": -1
- },
- {
- "effect_type": "Add",
- "quality": "Crimes Committed",
- "value": 1
- }
- ],
- "requirements": [
- {
- "quality": "Commercial Airliner Transmissions",
- "operator": "==",
- "value": 1
- }
- ],
- "delay": 0
- },
- {
- "key": "choice 20",
- "name": "\"THE TRANSMISSIONS WERE NOT LEGIBLE AND UNTRANSLATED. WE CANNOT PROVE MALICE!\"",
- "exit_node": "British Courtroom, Continued...",
- "on_selection_effects": [
- {
- "effect_type": "Add",
- "quality": "Garbled Transmissions",
- "value": -1
- }
- ],
- "requirements": [
- {
- "quality": "Garbled Transmissions",
- "operator": "==",
- "value": 1
- }
- ],
- "delay": 0
- },
- {
- "key": "choice 24",
- "name": "I think it's done listing crimes, thank god. Time to argue my case.",
- "exit_node": "Verdict",
- "requirements": [
- {
- "quality": "Long Range Scan Report",
- "operator": "==",
- "value": 0
- },
- {
- "group_type": "AND",
- "requirements": [
- {
- "quality": "Garbled Transmissions",
- "operator": "==",
- "value": 0
- },
- {
- "quality": "Commercial Airliner Transmissions",
- "operator": "!=",
- "value": 1
- }
- ]
- },
- {
- "quality": "UFOs Shot Down",
- "operator": "!=",
- "value": 1
- }
- ],
- "delay": 0
- }
- ],
- "image": null,
- "raw_image": "data:image/png;base64,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"
- },
- {
- "name": "Looking at the Surface",
- "description": "The surface of this world looks exactly like a grey version of Earth! It seems to be an exact replica of some kind.\n\nYou see creatures moving around on the streets",
- "choices": [
- {
- "key": "choice 21",
- "name": "Cool!",
- "exit_node": "Tractor Beam",
- "delay": 0
- },
- {
- "key": "choice 22",
- "name": "Scan the creatures.",
- "exit_node": "Robo Brits!",
- "delay": 30,
- "delay_message": "Scanning..."
- }
- ],
- "image": null,
- "raw_image": "data:image/png;base64,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"
- },
- {
- "name": "Robo Brits!",
- "description": "Wow, they're robotic humanoids that look and act exactly like the British! You see some robots laughing and chatting at a pub, and a Bobby walking down the street looking for crooks. Who created this earth replica? You only know Earth from the books, but you should be where London is!",
- "choices": [
- {
- "key": "choice 23",
- "name": "Nice! Well, back to getting pulled in by a Tractor beam...",
- "exit_node": "Tractor Beam",
- "delay": 0
- }
- ],
- "image": null,
- "on_enter_effects": [
- {
- "effect_type": "Add",
- "quality": "Long Range Scan Report",
- "value": 1
- }
- ],
- "raw_image": "data:image/png;base64,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"
- },
- {
- "name": "Verdict",
- "description": "Before even getting to defend your case, the judge says \"I've heard ENOUGH! It's time for a verdict!\"\nDang! You're definitely in kangaroo court!\n\"GUILTY! AND YOUR SENTENCE IS:\"",
- "choices": [
- {
- "key": "choice 25",
- "name": "\"DEATH!\"",
- "exit_node": "FAIL_DEATH",
- "requirements": [
- {
- "quality": "Crimes Committed",
- "operator": ">=",
- "value": 4
- }
- ],
- "delay": 0
- },
- {
- "key": "choice 26",
- "name": "\"SPACE JAIL!\"",
- "exit_node": "Not Actually Space Jail, Just Normal Jail",
- "requirements": [
- {
- "quality": "Crimes Committed",
- "operator": ">",
- "value": 1
- }
- ],
- "delay": 20,
- "delay_message": "You are being jailed..."
- },
- {
- "key": "choice 27",
- "name": "\"FORGIVENESS! Just trespass? That's not that bad!\"",
- "exit_node": "Sweet Sweet Freedom!",
- "requirements": [
- {
- "quality": "Crimes Committed",
- "operator": "==",
- "value": 1
- }
- ],
- "delay": 10,
- "delay_message": "WOOP WOOP"
- }
- ],
- "image": "default"
- },
- {
- "name": "Not Actually Space Jail, Just Normal Jail",
- "description": "You'll have to wait out your crimes against the robo brits.",
- "choices": [
- {
- "key": "choice 28",
- "name": "Sit out your sentence",
- "exit_node": "Sweet Sweet Freedom!",
- "delay": 1200,
- "delay_message": "Sitting out your sentence..."
- }
- ],
- "image": null,
- "raw_image": "data:image/png;base64,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"
- },
- {
- "name": "Sweet Sweet Freedom!",
- "description": "You're free! You spend a good while travelling around England (or at least the replica) and enjoying the cuisine, people and culture! Good society research is gained from this or something, but really you're just enjoying the sights and sounds.",
- "choices": [
- {
- "key": "choice 29",
- "name": "Nice!",
- "exit_node": "WIN",
- "delay": 0
- }
- ],
- "image": null,
- "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAQJklEQVR4Ae2deXBX1RXHY23/6DYdFBekilIInVrsTBUUEKWitf1Hp4467XQ6Y6frtLWtdpzWhaCCCQmJieKCKHWKY52xjgsg4AIo7s601NYlIoSdaEJIQgwgWU7nxB643Nz93fveu7/fy8ybu527vHu/n3ve/W2pgIB/B/v6ofHBV+H07y+Az319NlSMm1WS1+YdncpZ3HDpT2H9yNODXRsuuUrZ/5adnSU576inoydUwYSLmmDu3S/A/gN9ynlwKaxwqWRTZ2BgEHa17YW/PvYvGHN+fUkuVAFINhvf6Gl1sPCRN2F7azf0DwzYyNLYNjgg7EgOfNIH9Ytfhm9870747ITS8SgFIOkBcnRlFYy/sAluWbAWevd9wsorSDxVQPAO0KPs/KgbHnj0n3DKeaXhUQpA0gHkpKl1cM/Db8C2XV3BPAZPWWqALLzhGjC9YjurFICEA2TIY8xshNl3rIae3gO8foOngwNiCoXMLgZYCkDCADJqai3c/dAbsHVnF/T3hzlj6AjzDohM6D7y8wpLAYg/QD5TWQVfu6ARZjU+D909+3X6DV7uDIgPwSdtIy/AFID4AeTEKbWwYMnrsGVHZ2YegyduGCBJRZtV/SxhKQBxBwQ9xriZjXBjw3Owp3sfr8/M0xVZCTpkv2nDUgDiBgh6jDv+9lqmZwwdgdEDUltdq3x1LA1YCkDMATlq/Cw4bcbt8Jf5z8Luzl6dPjMvjx4QG0/02oqlgJdvaApAzADB9zEWLHkNWrbvgb6MXpWyJS53gKBHML1s4EBbAoRCX6AUgKgBOfX8BriudhW0dXxsq89M7QcHByFTQEioWYUFIGphJ52f48+eBw2LX4FN2+LxGEQkfrZryRPrwwGSleht+00qAqxfeJAjQRtzfgP8qWYlfNjeQ3qLIkSPsadrHzz+zDvw7Uvv+fRR3PYxRWZvK8y82BeAHCnuJPOBHqP+gZdh09aOaM4YRC56jIeXvgWTLlsIn//mrYfPqTLB2+bnRfC240giCKpb7h7klOn1cM1tK4Y+hEqCiyEc8hjd++CJ596FST+49zAU7PeWbEFQ2duKMy/2JHTXsFwBOW5yDdQtegk2bumAvr5sPivlCiJ6jEeW/wcmX7YQvjCR8RgsHBhXCd62LC+Ctx2HKxhUr9wAOXn6fPj9nKdhe2uXqz4zqYceo3Pvfnjq+ffgnMvvE3uMApBP3wthISKhu4blAsjIyTUw7751sGHz7ig9xqMr/gtnX36f2mMUgAwH5NQZDWa7CT95/0+XOiBfPXc+/O6W5bB1ZyfgLhzTX9fe/bBsTTNMvXKR2xrbPkbJ7NkdObY4vk5fv/gVOOGceU6TWKqAjJxUA9X3vjjkMfAHOGL6wzPGY6vegSlXLIIvnqE4Y0g2vUNPEzLB2+bHBgU7Xlx43Bnxq8DXVq8EfB3/0ATpJrAE3wfBH0P4zexlsHn7nug8RnfPAXh67fsw/UcPWK2hdL1tQRDZs2LTxUX1Q+XpxsKW0+6InxHauLUDahe9BPi6vnTiGHBKxYMce1Y1zLnrBXi/pR1i9BiPP/upx/jSGXOM1s1kbStIJElFSu2owqR92NZXjYUvI0AoRI+yrbUL/jD3ae2PS8QOyKipdfCrWU8NbQyxnTHQY6x8cQPM+PFif1Awm98hQEgwtiIke6qvCsk2rVA1Fr6MwOBDfH0fPUrNwnWAr/uLdp1YATnmrGq4+c410LwpTo/x5HPvwrQr7wevHoOFA+O8UDDtImBRO3yeS7tJ6/BjkKV5MPg07qz4C4VX37oc8H0AFpTYABk1pRZ+ceOTQ4fv2DxGz8cHYNW6D2DmTx4E/G4Juw5B4jLBYL6NOFXtUJlNe75sqW9fIXqUD7bsHvqpS3xfABclFkBGnHkbVDWthvc2tnk/Y3z34osh5IWvSi1d/R6c+8P74cvf8njG4D0Gn9YJx0Soujao3KQt3zbUt+8Qd1784g++2tPapv7Uata/zdva3gM/u/4JaG5p9/qqVEggdG0H8RY8HLJHLF5MOtHy9rK0rp0Q5bKx+MjHx7C+vn6t6LIGBGE+eNDf+xg68aZdHhQWG6HwArapi7Z8/TTStmN0sefPK3w6a0D48bim0xa+bX9BQHERhGudNIDg+3Adq009neBiB8RWqHmzTwSOjRCS2vLiTSOddMym9VWQxApI3oSedDxOoKBITUWQxC4pDBUVFUCXTVtJxmxTt9QASSrGvNa3hoTEZiMGF1vqxyUkMNjQtB2XsbrUKSVA8ipuX+NSrRVfNuwLUy7i0NUxFbPMjsDAcopjKLPn83Xj81HOTyybzvsjli/hxdQOuz6q+DBAUFw+BENt8GK1TYuAEOWp2qWxhAxVk5xXQGISdIixqtaMynINiAoEVZkMFhNA2Lom9mRDEyoK8wZICLHF2KZorfi8YICwQnONEwSy+lSOocwmST6J3zTkJ5fSeQIkRiGHHDOtkSxMDEgSAarqmorf1E7Vl6rMFA60k/2VKiAw+itAF4mY0rKQ7PISytaM8nMJiK3oyV4ldNcyG0B6//0OiK7mmVcG+x/p+P/Xm2deIeyXH4tvUcogSJLve4wm7fHzxKZzDYipqAkQDE3r2NjZQPLWmEnAX+uPnxgUEGyf71OUNhGLjU0SEGzr2ozL1lY0V5QnBATFYyoKG6GZ2LqKneqZ9GFrYzoXaIc7eh4vW9Go7G3F7dteNTbXMtma5QoQErmLJ0hSVwdM7IC4ioav51voPtrjx+iazj0gPgRObegE71JuColsorPKdxUM1fMh4jTaoPG6hrL1SexBUDgugmPrkLAxZPPzFI8REFexpCHoEH243i/Wyy0gMcCBoMYGiItYQog27TZd7jsKQNL0FgSlTZ8xAWIrkrRFnEZ/tnNg7UFsdk0bofG2LmLl27BJU38Y2tQrVUBMxMrOGcZN6mRtUzKA2IjUhy0ttm1bsQBiKgwTAdNcyUKTNrKyMZ0HssutB7EValJ7WmzbdgpADn9hjeYwK/Gb9EvCNw0LQBy/S0IgxQCIqRhMBEYQ6EKTtrKyMZ0PtCsAYQAh0duEBSDDPQjCk5X4TfotALnhGuODNrsT2oBBtgUgcQHiAw70KtI3ClEYpqIgEeU1TAqHzVzIXHXofBtBmOy+7Jyp4iZtZWFjMx+qtfEOCE1mXmCh8WCYZEymm4VqskOW2QjCVLDs3Inipu1kYWczH6p1CQaIaEKTitRU4KK+TevK7ApAhj9iZSF8kz59wYHgeAEExcMKSyTQLPPYsbnGyxEQEiO/dpSf19ArILy4WQGZikLVBtseP9Eh02y/PuKmc6Fy1yHLbESBtnkVt49x2cyFbk2O+Ac6vJBMRWEKCN9+TGnTudBNeKhyG1HwtjJRTpw4EUwvWRtZ5PP3J0ubrMURgJAIWOFSni5k65RiXHf/VE5f1WTDNL5yKxOBbb4pEKHsfABlc8/sOoniQkBosVHoFNeFpQgF3ZPu3tny3vVvA38F/9GGC64Y6tNGGDJbXvhox+flIS0DSXZfqnx+vdi0EhB24XVxElMphbp7FpXTz8WwYVo/+6MSgc+yPAAiGgNC43qf7Hqx8QIQwbvxIuGb5rGTS/G0AMH+XAXiq55IuGnlJb0HWi829AaIqYBK3Y6dXIqnCQj2mVQoIeqHhMTneGnNKCwAWbHU+JxlAjdNLBumDQj27VM0IdtKCk6IsbFrVwDiERB2Ytl4FoDEBEkIkSdtk9avAKSEAaFFTiqWcq5fAOIJEBKjKMzKg/BjKWehu957AUhCQEw+LpMXQFhgXAVTbvUqaqtrAS+TA2hhc/hAbwKGyMbk4w22NhsuuYrVvnW83ERvc7+HAClAOSx+1UYgEr1Lni0EKvukgIiIshFRKdtWyBZXJZJyLZPNlWu+SvQ2ZTpABgcH4WBfv4gD47xShkB1b1JAaNHLFQa6b/KsGNKc+AptIFDZ6gBpbe+Bn9/wJDS3tAPC4vtPJbDYy7SAkBhE5xRWPGnFaTylEqqEb1qmA2TLzk6oGDcLjjmzGmbfsXoIlKQexQSy2OHA8RsDgoJUQVAqgk37PkwhUNmZAoKQ4DVqah388qan4IMtu4N4FB08MYFjBUja4imH/lTCNy2zBYRAOeasarhlwVp4v6U98RlFB4Xv8rQgKwCpGP5jBGmCaQqBys4VEAJl9LQ6+HXVUti0rSMTj5IEntCgFIAUgAw9diEsx06qhrl3vwAbNu+OzqP0DwwE+YBm7gEZO3YsiC7ZLt/W1gbsJbPLS77KM5iWJfUg5EkoHD1tPvz25mWwecee6DxK1979sGxNszdYcguICApRHguDKp4XINhxmAKgs/MNCIEyclIN1CxcN3SY7+sbSPIklHpd9Cj/WPl2YlByAwgrbhEIujy2viheWVkJIS9W+Hx8xIgRwF5UrhO+aXkoQAiUk6fPh6tvXQ5bd3ZG6VGSnFMyB0QkZh0MonJRO3xeSECobRYEXdwUAJ1daEAIlJGTa6B20UuwcWsHxOhRXECxAoREkDSkHRTb4UUsEr9pHt8Wn046bpP6OijYcp3wTcvTAoRAOXl6Pfxx7grY0dqV+qNTkg7xUwS2kBgBYiIMFxtewJg2hUFkJ2qPzXMZo0sdFgJd3BQClV3agBAox02ugfn3vxydR7GBpAAkwNlEBwVbrhK+aVlWgBAoY86rh2urV8Kuj/Ym2eBTrWsKySFA2EXDOPsY5LKLmtRhd3eKizyDaR61IQtNxuTDhp9LVdoUApVd1oAQKMefPQ8aFr8CLdv2QF9//l/1MoGkQrV4WOZDMLI2REI2hUFkJ2qP8mRjCJGvm1O+XCV+k7K8AEKgnDqjAa6btwo+bO9J1SvYdlYAwrxpGAIEUZu8+E3SJhCobPIGCIFywjnzoPHBV6Flez49SpSA4I4v8g66PPIUolAk5FB5JkDwNirxm5TlFRAE5ajxs+C0GQ3w57pnoK3jY9tNPri9DhLtIxYuZigxYbsiQetgEJWL2sG8kGNn2+ZFb5M2gUBlk2dAyJtgeNLUOrjroddh845O6M/JGSVKQFDYIghkeTI4bESapa1K/CZlsQBCHmXsd26H6+ufhY7O3uAeQteBF0BIPOyO6TMuErgMBlG+qD6NOYbQBAKVTUyAsB7lxCm1sGDJ67BtV1emHkUFidEjlg+RqYASCRzzRDDI8tg2fIw37TZUAOjKYgUEYflMZRWMv7AJbmp8HvZ079Nt+EHKcwGITnCswCkug0GUT3Uw1PWVx3IdBKrymAFhPcqoKbVDZxT8UGSaZ5QoAEHRsiLHuAgEWR7VzaP4TcakAkBXViqAkEcZN7MRqppWQ3fP/iAeg280WkBsICkA4Zf9cJp+1YTdrWOI46te9zz8RvAzSjSAJPEiBSCHgeBjsQKCEB9dWQWVFzbBzXeugZ7eA/yteUmXDSAmjzJ5ttE9SsnKS+kRS+XZTppWBwv//iZsb+0C/Magr7+oAOG9iOzMweejB8mz+E3GJgNAl18ugJBHmXBRE8y5ay307j/oixHp90T+B7kri9Q1LZ2DAAAAAElFTkSuQmCC"
- }
- ]
-}
\ No newline at end of file
+ "adventure_name": "A Model Earth",
+ "version": 1,
+ "author": "Armhulen",
+ "starting_node": "Planet Start",
+ "starting_qualities": {
+ "Long Range Scan Report": 0,
+ "UFOs Shot Down": 0
+ },
+ "required_site_traits": [
+ "in space"
+ ],
+ "loot_categories": [
+ "research"
+ ],
+ "scan_band_mods": {},
+ "deep_scan_description": "",
+ "triggers": [],
+ "nodes": [
+ {
+ "name": "Planet Start",
+ "description": "You come across a grey planet. It looks familiar, though you swore you've never come across this sector of space before.",
+ "choices": [
+ {
+ "key": "choice 0",
+ "name": "Ignore the planet.",
+ "exit_node": "FAIL",
+ "delay": 0,
+ "delay_message": "Whatever, there's a lot of planets in space. Must be a hunch!"
+ },
+ {
+ "key": "choice 1",
+ "name": "Begin Orbital Scan",
+ "exit_node": "Scanning from Orbit",
+ "requirements": [
+ {
+ "quality": "Long Range Scan Report",
+ "operator": "==",
+ "value": 0
+ }
+ ],
+ "delay": 30,
+ "delay_message": "Scanning planet..."
+ },
+ {
+ "key": "choice 8",
+ "name": "Descend Into Orbit",
+ "exit_node": "Orbital Descent",
+ "delay": 30,
+ "delay_message": "Descending into Orbit..."
+ }
+ ],
+ "image": null,
+ "raw_image": "data:image/png;base64,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"
+ },
+ {
+ "name": "Scanning from Orbit",
+ "description": "You initiate a long range scan from orbit:\nThis planet has a smoggy cover that blocks any good look at the surface, yet it has a mostly survivable atmosphere.\nThis planet has zero life signs.\n",
+ "choices": [
+ {
+ "key": "choice 9",
+ "name": "Stash that Report...",
+ "exit_node": "Planet Start",
+ "delay": 0
+ }
+ ],
+ "image": null,
+ "on_enter_effects": [
+ {
+ "effect_type": "Add",
+ "quality": "Long Range Scan Report",
+ "value": 1
+ }
+ ],
+ "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkBAMAAAAxqGI4AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAASUExURQAAAP///1lWUqwyMmlqakZHRwPX/kkAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL5SURBVGje7ZldbqMwFIXtKnkvO4huyAYmG0CWea8i2P9Wxv/Y2MTYvjBVO4c8FET8+dxzDW5Ldqr73Hcf7fbemfwu+p1tkM+jILTbfeu2stNbDDSkklXnzNRbyUqUqbM/oVr5AFhOus5iUK3A/fmEW0BRHjCtwFPqj6NQS6GIVu5PTXEXnJUOjfLxXEOITYWitXECQk6BUOx6pSDkKAj4F6mrFxLEdNctAdl8gJVmBRBXy6tXcrScwwvXsufikXIP1qId5t2iz0D4osFClAga5MJDDbJaEUDJjF6eyZohxATjlhym9kkcMzhkIBQJ0g+pe2klJFWtG4DrgRSkeEUkjDDWA09TbPJdM6RXnySlDnLpYyO9/GhtQChthYhSMXeyup0aSFkoCYirVqJkdcnHEMaXakVeHIQUQYBPwSFdMB86IEBYolrAtyi1kF4asOIT40Ekq4JVQvS0R3UYI5G5GFLYwuKRO3l69dMEkxnc5MR8K6RCF9VL2sioe2tdLc6GRggROUDve5lcA9usXpw0So4Go5OwE0YySqutED33eZKH12TSyJJTK0RNFx6LFb4yMiI4uajJQmxlWT3tTsybEfxUnA0t9miGmNnCY54DMxNiJu7V6HLx89BO2iHLhIUXPxUleWVjf1SiZbvCHkEuLqX0brIM4hUfwkxERkKvdiPhxksGw3UuNpERmpuLeKGoBRM8k5WP/gsBsnrkAphUVGOJHeuIwPBDMcks6vmAUazkbtjXgAIhqVW+QHAYZHxnBIkRheKbGbAgJH6NIAcitWFlwmQQck28EzEDUdqwQnClrIxH+pA63od1EpgpHiP7i3ccSjEj/yd258SYqendLCR0UfcCyUK0B9KkbCYNBnZLRzIcC9HNdSzDODkYoraOB0eim+vgSIjcKM4HM06J5Hqak1Mi+d9ce3VGc5Ef01zXM5pLQN46oR0O5G0kKP+9nM+CfP1rSDqTwqTqmqvQX91SLINcvzGkLJPrCev9HMj8oyDk10MI+Qt3vM7Ve2h01AAAAABJRU5ErkJggg=="
+ },
+ {
+ "name": "Orbital Descent",
+ "description": "As you descend into orbit, you see a flying object headed straight for you!\nA garbled voice begins to call out to your drone, but there's no time to decipher it!",
+ "choices": [
+ {
+ "key": "choice 2",
+ "name": "Blast the damn UFO!",
+ "exit_node": "Tractor Beam",
+ "on_selection_effects": [
+ {
+ "effect_type": "Add",
+ "quality": "Tractor Beam Turns",
+ "value": 2
+ },
+ {
+ "effect_type": "Add",
+ "quality": "UFOs Shot Down",
+ "value": 1
+ }
+ ],
+ "delay": 30,
+ "delay_message": "Blasting UFO!"
+ },
+ {
+ "key": "choice 3",
+ "name": "Attempt Evasive Maneuvers!",
+ "exit_node": "UFO Evasion!",
+ "on_selection_effects": [
+ {
+ "effect_type": "Add",
+ "quality": "UFOs Violently Crashed Into",
+ "value": {
+ "value_type": "random",
+ "low": 0,
+ "high": 1
+ }
+ }
+ ],
+ "delay": 30,
+ "delay_message": "You attempt to dodge the UFO..."
+ },
+ {
+ "key": "choice 7",
+ "name": "Do NOTHING. Jesus take the wheel!",
+ "exit_node": "FAIL_DEATH",
+ "delay": 30,
+ "delay_message": "What? Why?!"
+ }
+ ],
+ "image": null,
+ "on_enter_effects": [
+ {
+ "effect_type": "Add",
+ "quality": "Garbled Transmissions",
+ "value": 1
+ }
+ ],
+ "raw_image": "data:image/png;base64,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"
+ },
+ {
+ "name": "UFO Evasion!",
+ "description": "Were you good enough at flying to avoid the UFO?",
+ "choices": [
+ {
+ "key": "choice 4",
+ "name": "No, Back to flight school with you!",
+ "exit_node": "FAIL_DEATH",
+ "requirements": [
+ {
+ "quality": "UFOs Violently Crashed Into",
+ "operator": "==",
+ "value": 1
+ }
+ ],
+ "delay": 0
+ },
+ {
+ "key": "choice 5",
+ "name": "You barely avoided them! Nice!",
+ "exit_node": "Tractor Beam",
+ "on_selection_effects": [
+ {
+ "effect_type": "Add",
+ "quality": "Tractor Beam Turns",
+ "value": 2
+ }
+ ],
+ "requirements": [
+ {
+ "quality": "UFOs Violently Crashed Into",
+ "operator": "==",
+ "value": 0
+ }
+ ],
+ "delay": 0
+ }
+ ],
+ "image": "default"
+ },
+ {
+ "name": "Tractor Beam",
+ "description": "Before you have time to think, your drone is captured by a Tractor beam! Now you've gone and done it.\n\nYou should have some time before you are pulled in.",
+ "choices": [
+ {
+ "key": "choice 6",
+ "name": "Decipher Garbled Transmission",
+ "exit_node": "Deciphering Transmission",
+ "requirements": [
+ {
+ "quality": "Garbled Transmissions",
+ "operator": "==",
+ "value": 1
+ },
+ {
+ "quality": "Tractor Beam Turns",
+ "operator": ">",
+ "value": 1
+ }
+ ],
+ "delay": 30,
+ "delay_message": "Decipering..."
+ },
+ {
+ "key": "choice 10",
+ "name": "Look at the surface of the planet",
+ "exit_node": "Looking at the Surface",
+ "requirements": [
+ {
+ "quality": "Tractor Beam Turns",
+ "operator": ">",
+ "value": 1
+ }
+ ],
+ "delay": 10,
+ "delay_message": "Looking out window..."
+ },
+ {
+ "key": "choice 13",
+ "name": "Let the beam pull you in and dock you",
+ "exit_node": "Landed, Kinda",
+ "on_selection_effects": [
+ {
+ "effect_type": "Set",
+ "quality": "Tractor Beam Turns",
+ "value": 0
+ }
+ ],
+ "delay": 50,
+ "delay_message": "Getting captured..."
+ }
+ ],
+ "image": null,
+ "raw_image": "data:image/png;base64,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"
+ },
+ {
+ "name": "Deciphering Transmission",
+ "description": "You review the incoming transmissions your drone has gotten. These aren't in need of deciphering, just un-garbling it from the bad connection...\n\n\"You are in Space British Air Space! Identify yourself, Tally ho!\"\nWhat the fuck?",
+ "choices": [
+ {
+ "key": "choice 11",
+ "name": "Whoops!",
+ "exit_node": "Tractor Beam",
+ "delay": 0,
+ "requirements": [
+ {
+ "quality": "UFOs Shot Down",
+ "operator": "==",
+ "value": 1
+ }
+ ]
+ },
+ {
+ "key": "choice 12",
+ "name": "Good thing I didn't blast them, then.",
+ "exit_node": "Tractor Beam",
+ "delay": 0,
+ "requirements": [
+ {
+ "quality": "UFOs Shot Down",
+ "operator": "==",
+ "value": 0
+ }
+ ]
+ }
+ ],
+ "image": null,
+ "on_enter_effects": [
+ {
+ "effect_type": "Add",
+ "quality": "Commercial Airliner Transmissions",
+ "value": 1
+ }
+ ],
+ "raw_image": "data:image/png;base64,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"
+ },
+ {
+ "name": "Landed, Kinda",
+ "description": "You have been locked to the surface the beam. Robots are all around you, pointing at your drone with all sorts of old age weapons.\n\nOne of them angrily shouts at you, \"By God, Queen and Country, we've got you now!\"",
+ "choices": [
+ {
+ "key": "choice 14",
+ "name": "Go out with a bang. Initiate self destruct!",
+ "exit_node": "FAIL",
+ "delay": 0
+ },
+ {
+ "key": "choice 15",
+ "name": "Surrender to the funny looking robot brits...",
+ "exit_node": "British Courtroom Start",
+ "delay": 50,
+ "delay_message": "You are being transported somewhere..."
+ }
+ ],
+ "image": null,
+ "raw_image": "data:image/png;base64,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"
+ },
+ {
+ "name": "British Courtroom Start",
+ "description": "Wow, that took forever. A one eye judge robot smacks their gavel, and points their hammer at you.\n\"I will now read out the crimes you are accused of!\"\nIs that how the judicial process works? You dunno.\n\"ONE ACCOUNT OF PLANETARY TRESSPASS!\"\nThis blows.",
+ "choices": [
+ {
+ "key": "choice 16",
+ "name": "That's not that bad.",
+ "exit_node": "British Courtroom, Continued...",
+ "on_selection_effects": [
+ {
+ "effect_type": "Add",
+ "quality": "Crimes Committed",
+ "value": 1
+ }
+ ],
+ "delay": 0
+ }
+ ],
+ "image": null,
+ "raw_image": "data:image/png;base64,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"
+ },
+ {
+ "name": "British Courtroom, Continued...",
+ "description": "This big idiot they call a judge just keeps piling on crimes. With each one, some robot you'd like to drone-punch gasps in the back.",
+ "choices": [
+ {
+ "key": "choice 17",
+ "name": "\"INTRUSIVE SCANNING ON OUR CITIZENS\"",
+ "exit_node": "British Courtroom, Continued...",
+ "on_selection_effects": [
+ {
+ "effect_type": "Add",
+ "quality": "Long Range Scan Report",
+ "value": -1
+ },
+ {
+ "effect_type": "Add",
+ "quality": "Crimes Committed",
+ "value": 1
+ }
+ ],
+ "requirements": [
+ {
+ "quality": "Long Range Scan Report",
+ "operator": ">",
+ "value": 0
+ }
+ ],
+ "delay": 0
+ },
+ {
+ "key": "choice 18",
+ "name": "\"SHOOTING DOWN A COMMERCIAL AIRLINER\"",
+ "exit_node": "British Courtroom, Continued...",
+ "on_selection_effects": [
+ {
+ "effect_type": "Add",
+ "quality": "UFOs Shot Down",
+ "value": -1
+ },
+ {
+ "effect_type": "Add",
+ "quality": "Crimes Committed",
+ "value": 1
+ }
+ ],
+ "requirements": [
+ {
+ "quality": "UFOs Shot Down",
+ "operator": "==",
+ "value": 1
+ }
+ ],
+ "delay": 0
+ },
+ {
+ "key": "choice 19",
+ "name": "\"AND WE HAVE PROOF YOU KNEW IT WAS JUST AN AIRLINER!\"",
+ "exit_node": "British Courtroom, Continued...",
+ "on_selection_effects": [
+ {
+ "effect_type": "Add",
+ "quality": "Commercial Airliner Transmissions",
+ "value": -1
+ },
+ {
+ "effect_type": "Add",
+ "quality": "Crimes Committed",
+ "value": 1
+ }
+ ],
+ "requirements": [
+ {
+ "quality": "Commercial Airliner Transmissions",
+ "operator": "==",
+ "value": 1
+ }
+ ],
+ "delay": 0
+ },
+ {
+ "key": "choice 20",
+ "name": "\"THE TRANSMISSIONS WERE NOT LEGIBLE AND UNTRANSLATED. WE CANNOT PROVE MALICE!\"",
+ "exit_node": "British Courtroom, Continued...",
+ "on_selection_effects": [
+ {
+ "effect_type": "Add",
+ "quality": "Garbled Transmissions",
+ "value": -1
+ }
+ ],
+ "requirements": [
+ {
+ "quality": "Garbled Transmissions",
+ "operator": "==",
+ "value": 1
+ }
+ ],
+ "delay": 0
+ },
+ {
+ "key": "choice 24",
+ "name": "I think it's done listing crimes, thank god. Time to argue my case.",
+ "exit_node": "Verdict",
+ "requirements": [
+ {
+ "quality": "Long Range Scan Report",
+ "operator": "==",
+ "value": 0
+ },
+ {
+ "group_type": "AND",
+ "requirements": [
+ {
+ "quality": "Garbled Transmissions",
+ "operator": "==",
+ "value": 0
+ },
+ {
+ "quality": "Commercial Airliner Transmissions",
+ "operator": "!=",
+ "value": 1
+ }
+ ]
+ },
+ {
+ "quality": "UFOs Shot Down",
+ "operator": "!=",
+ "value": 1
+ }
+ ],
+ "delay": 0
+ }
+ ],
+ "image": null,
+ "raw_image": "data:image/png;base64,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"
+ },
+ {
+ "name": "Looking at the Surface",
+ "description": "The surface of this world looks exactly like a grey version of Earth! It seems to be an exact replica of some kind.\n\nYou see creatures moving around on the streets",
+ "choices": [
+ {
+ "key": "choice 21",
+ "name": "Cool!",
+ "exit_node": "Tractor Beam",
+ "delay": 0
+ },
+ {
+ "key": "choice 22",
+ "name": "Scan the creatures.",
+ "exit_node": "Robo Brits!",
+ "delay": 30,
+ "delay_message": "Scanning..."
+ }
+ ],
+ "image": null,
+ "raw_image": "data:image/png;base64,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"
+ },
+ {
+ "name": "Robo Brits!",
+ "description": "Wow, they're robotic humanoids that look and act exactly like the British! You see some robots laughing and chatting at a pub, and a Bobby walking down the street looking for crooks. Who created this earth replica? You only know Earth from the books, but you should be where London is!",
+ "choices": [
+ {
+ "key": "choice 23",
+ "name": "Nice! Well, back to getting pulled in by a Tractor beam...",
+ "exit_node": "Tractor Beam",
+ "delay": 0
+ }
+ ],
+ "image": null,
+ "on_enter_effects": [
+ {
+ "effect_type": "Add",
+ "quality": "Long Range Scan Report",
+ "value": 1
+ }
+ ],
+ "raw_image": "data:image/png;base64,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"
+ },
+ {
+ "name": "Verdict",
+ "description": "Before even getting to defend your case, the judge says \"I've heard ENOUGH! It's time for a verdict!\"\nDang! You're definitely in kangaroo court!\n\"GUILTY! AND YOUR SENTENCE IS:\"",
+ "choices": [
+ {
+ "key": "choice 25",
+ "name": "\"DEATH!\"",
+ "exit_node": "FAIL_DEATH",
+ "requirements": [
+ {
+ "quality": "Crimes Committed",
+ "operator": ">=",
+ "value": 4
+ }
+ ],
+ "delay": 0
+ },
+ {
+ "key": "choice 26",
+ "name": "\"SPACE JAIL!\"",
+ "exit_node": "Not Actually Space Jail, Just Normal Jail",
+ "requirements": [
+ {
+ "quality": "Crimes Committed",
+ "operator": ">",
+ "value": 1
+ }
+ ],
+ "delay": 20,
+ "delay_message": "You are being jailed..."
+ },
+ {
+ "key": "choice 27",
+ "name": "\"FORGIVENESS! Just trespass? That's not that bad!\"",
+ "exit_node": "Sweet Sweet Freedom!",
+ "requirements": [
+ {
+ "quality": "Crimes Committed",
+ "operator": "==",
+ "value": 1
+ }
+ ],
+ "delay": 10,
+ "delay_message": "WOOP WOOP"
+ }
+ ],
+ "image": "default"
+ },
+ {
+ "name": "Not Actually Space Jail, Just Normal Jail",
+ "description": "You'll have to wait out your crimes against the robo brits.",
+ "choices": [
+ {
+ "key": "choice 28",
+ "name": "Sit out your sentence",
+ "exit_node": "Sweet Sweet Freedom!",
+ "delay": 1200,
+ "delay_message": "Sitting out your sentence..."
+ }
+ ],
+ "image": null,
+ "raw_image": "data:image/png;base64,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"
+ },
+ {
+ "name": "Sweet Sweet Freedom!",
+ "description": "You're free! You spend a good while travelling around England (or at least the replica) and enjoying the cuisine, people and culture! Good society research is gained from this or something, but really you're just enjoying the sights and sounds.",
+ "choices": [
+ {
+ "key": "choice 29",
+ "name": "Nice!",
+ "exit_node": "WIN",
+ "delay": 0
+ }
+ ],
+ "image": null,
+ "raw_image": "data:image/png;base64,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"
+ }
+ ]
+}
diff --git a/strings/exoadventures/quantum_fizzics.json b/strings/exoadventures/quantum_fizzics.json
index 0ee9bf9bf6806d..4db2040807d0c5 100644
--- a/strings/exoadventures/quantum_fizzics.json
+++ b/strings/exoadventures/quantum_fizzics.json
@@ -1,195 +1,195 @@
{
- "adventure_name": "Quantum Fizz-ics",
- "version": 1,
- "author": "EOBGames",
- "starting_node": "start",
- "starting_qualities": {
- "jammed": 0
- },
- "required_site_traits": [
- "technology present",
- "in space"
- ],
- "loot_categories": [
- "unique"
- ],
- "scan_band_mods": {
- "Narrow-band radio waves": 10
- },
- "deep_scan_description": "",
- "triggers": [],
- "nodes": [
- {
- "name": "start",
- "description": "As you sweep through the inky void and the site comes into view, you're puzzled by what you see. On a small asteroid sits a vending machine. Despite the odd runes lining its surface, you're fairly certain that the image on the front is a can of soda. While ordinary common sense would dictate that drinking strange alien soda is a bad idea, you can't help but be curious about what exactly this machine dispenses. There's one problem, however- what currency does this thing take?",
- "choices": [
- {
- "key": "choice 0",
- "name": "Leave.",
- "exit_node": "FAIL",
- "delay": 10,
- "delay_message": "There are better ways to die than drinking alien soda."
- },
- {
- "key": "choice 1",
- "name": "Try a holocredit chit.",
- "exit_node": "it's_stuck",
- "requirements": [
- {
- "quality": "jammed",
- "operator": "!=",
- "value": 1
- }
- ],
- "delay": 10,
- "delay_message": "Hopefully whoever made this machine is part of the Galactic Currency Union..."
- },
- {
- "key": "choice 4",
- "name": "Ram the machine.",
- "exit_node": "smashing",
- "delay": 30,
- "delay_message": "Ramming speed!"
- },
- {
- "key": "choice 5",
- "name": "Search around for some loose change.",
- "exit_node": "lost_wallet",
- "requirements": [
- {
- "quality": "have_coin",
- "operator": "!=",
- "value": 1
- }
- ],
- "delay": 100,
- "delay_message": "There's a surprising amount of stuff on this asteroid to search..."
- },
- {
- "key": "choice 6",
- "name": "Use the coin you found.",
- "exit_node": "choices_choices",
- "requirements": [
- {
- "quality": "jammed",
- "operator": "==",
- "value": 0
- },
- {
- "quality": "have_coin",
- "operator": "==",
- "value": 1
- }
- ],
- "delay": 10,
- "delay_message": "Thank God for clumsy aliens!"
- }
- ],
- "image": null,
- "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAAAXNSR0IArs4c6QAAGZlJREFUeJzlXT2vVNcVPYyfLJBw5MKWHMfJj3BJB64okBKnSOfCmIJHa2FFshzZsuTkKS2PApMiXSwFI1G8yo+O0j8iIY4lu7ACEggJkQKdeXvWrLX2PnfmMfC8JTT3no/9cc7+WOfOm8uxV15+/UkLdPvO3vz69KmzbSqdPH6i3X/4YHL/unifPH6itdYWxqv52M7mVvTq8yI5efjpxkwhNzfqysbcvrO34Aej+oyuIc5164J6s/1z+1mxYYYNfTFOnzpLN7pKUzdzCu+u58njJ9rtO3sL/WyBRuQwWVFebGNyMVDj/DgGeSo+VWJyVOCinX1cT5YxaTqHRf5KPltDnBPnKZ6oNyanfo9zGCnfOIYVZNNUze6MsPplGYW1YxVwm4T9LONFPhXeVVvd2IqTVfm7ClLhr8axMX1cRT+3t1MqhaKFAFmlnFfK+JTNGoUdfUOd40yBBi4oGDGoxYJkRJ+pQbNqwKkxI3JUolAQU11X9Z3qV13HTjM2IcuarE2V8c5XKaswO/JlbRl0UHCFUS/FqkQzmY5/tNsFWdVx3fpmY1lAI9yJdir4E+1y/Ngn8wG3Bgw6RX3YvZrPSMnE9pmbEIVnmRTHxTFuwR2NjkfM7GTj4kZnjnMy6KUyqMK/Kiu6zY6UZexszZh9mV4VfZSzs4QS1ybzDVX1XZA6PqzdzaNnkClwaUpJw74RCKR4MMzcqQIdsrGj2BmdIhvvdJuKo6u8GAxScxwc6jzifafKHCUDaVWfiTIUbJSH9CoGjONXUbTKUzmxcs4KPlUYOBJuhttUpl9FLzXm3qMflvpfefl1uT5uw6cSJjGUq8b0cSxwKmvKkgqTzcajPKWz4nfy+Im2pYQgBlQUyzSDMSpjZE7G8GDm8Az+qI3p15FH/GT2OLvYRrqMjLIwCO49Ori+fGZnfr2zf7ld3N5uV3d3F8a88vLrS7aPktM3g5QIL7FN8Y3tTpfYhmNQL9Wm1sTty1ZWSnGiMo45tFIiW7Rqto46qeylZGSZxjk+yla6xfH//d+/5u3dsVUQVOji9vbC/dXd3YV7DJios9MXr1WSwP1WCSNLEmr9YpIZQTKqejKEgDawtq1qlKlFYEL6WObo1cyWVTAVlG6BFC9nS2XjOsUqgEEwGgCjlAXML3/xmzTDs0qs9jySCqLOg/mA02GEKpW8Ul1U2xxiZRAAGTnBLHsoPsrISqZg9y5rKF1d1Yh2tPa0EsTMH+mwg2CEVMDce3RQXVrjCc3Bmt5WSZCdsmqkqrnjqSo5yhtBQyxBzAOkGlHZISn2ZZCoj3FnHnZmYOUyznWZ0QUwK+n3Hv2wEhR6XqgHDFaWSCxRqEqM81wywn1jSYyNR3kukBgkVzzZOJVw6SHdURUiZVUgK7FZdWJy3PlDbTqDS5gZX9SgGCF3hlOkkAX2Y6WOMt1cdwZh/FRQs351j3Yt/bEiM4Apw4xkGagCYdAIZhT2M2NcdnOLoXD3USUGfXEd2ZrjXrL+yA/3PcpRVZ/pEnlUAtglUaZXnINzaYA4HOkUUXBJRTaDW2iEkoVtGMTVvsr9USPM6MrpMclF51XnBHaN8tRcVWWcwzM+WYKrIJvObyFAqgKmCGdnAOxzmDDqp9pcgCodcOOdDUeF1Dq76olVBNEB8kJ+rMooOSNVQlWbqKvime35/YcPFgMEHccJ7u0sG8V+Vs6Ysbg51WDpfbf2byyNdcHDgoWV/6NIDMq4M4I6QygoxXhmVSCDOtU2FqQ4voJGOs0qMKmihMOzOIedA1hZVjJw4+IfKVadXeHSytyjRipgpjobg9I4z0E0p2fUF9sYRER5LKgRBkbdZtWSFpWJBrm5WZ/qVxVDVYT4K0g2tgId2WYeVajFKj6DTCqJOFiWJTqmQ+RTOec4Hdk8phu7Z1Vsxhiqe+Y8ldLIlFIRrkod6oNzzp15d4kvy4zKpgxOHCVy1bm1/BE9268pQaIqUmWOcnYW6ExG5IfBH/1n6XsQBq9YZCocx5ye3as2xof1OTlKV7apDgJOoZ39y6Vxm/xuBc9enfBcxuB2H4f8MnlZOyaoqGdFd6RVxkS5SwHCFkNBG0bRgdERs9KIi6TKegaZUEcMJtwEx6tCMSjwTzzknN2DOZsMFgedlKO6c8eIvNjW+TKZzo9iP9rhfJn5GCP7t1i37+y1c2felYJYsDinVtXCGaMMcIvg9MjmjwZM//NzR2+/c25+/e03t1pri4G0s3uZBglWo3UFkksg/bNSJViiYX1MbvxUFT6zIaNMZ2dj10/+5LY/Gbq1f2MJ3+H47LBTUbzPw2xfwcMZP3e+YJi0Sio4fvrx+/m/t985Nw+Kb7+5tRAsnS5ub8+DYWf/8vzf5598Mf+3bsK1qFSJW/s30jFMDpIKqmxv3DUb2/cfk2a0Xe39EsRCxz996uzSz1fdGcJVEgdn2Hx17nGGKL2y8ZlN6i93Ff304/cL9/v/uNbO/OFCa63R4GA0GhC7V67Ivu1Ll5baGN5n7bG/f8+Eb41hcyIvVilQdhUtRL5qDAs61ef49nlbjEkMEpxUUSojhS9dtcgqidJjBO6NyOp0dXd3oYq8+tobNEhefe0NywPp48/+2D7/5Iv20Ydft7/89XdWBxYErfnAiaQwfaRzZ95tt/ZvLDwtZMHl9qDPY5SdJ1mbqhguEONYts/ol1uKSWTEJjNhTLjKNGphlHNm8+KYkaqk9KrS+WtP2tULx+b3F7e3bTB0ikFx/tqTdj3waO2gimTBMZWc47H++w8fzM+j1XVyzhqJjWGOq/afOTxLwGqu0r21tvh7kCwLZM6sIBUKVcoruMZ4xHGRjwto9cnGj1SR89cO3ntxFRy9MofRSAUZJeVsDo6wPVVJMspgyTPyxHu1NyqBM7uYDS7wVXJvjZxB2KBqVmftzvljqYwyK1VFVQRHrpxWgrNCmeNX6TArCDpLBWJlCSab08ewYMoqBtv7zCamS5Sl9jnOvX1n7+lLG6pMKjgPeSlF2b0LgopBWdll+iL/KcHx5QetffBlPkYRm3uYFaTTKGR1aEHxZrDNBQnydcHB+lTwsmrC/DnOOXfm3acvbXAZmmV8FiS4qMoI5O8WA7MV48sWIatCKtuwhDD6FMtRFkSRDrOCsL1jFd9VCAahVDtLvCrBuj1hOruElsEyhlqwP/1bLBWFTki/diUcswlbABzvMjz2swWP8lhiyAJ2HdQriasorT2tIK219tGHX0+WpZ5uVSFIv2fVFbMwo7jHquI4uIc+hD7G9MD9ZKgiysuCZ4ZCmAHKcR0xZ4zCcQFcFKMeruziPJSHc7IstG764MsaJDvsp1iRWLZXiQMTkXJYnKvaVAB0UlCJQSack0G4SkJcesyLirNJKppR4Qq8wnEM2uG4KQHLNtTJ6nLWCbFaOwiOLEhGziCjXxS2xp/YMedx64NjsV0Rg1osSBkvVelwHAYAg35KXhyzxTpcdGJ7pnBW0rBdGeAwa5XUZipYdhiVpQfFuisICwQVOLh+DNqMQihWFVji7aTkxT5X+ZW8OE7BbKUX61v6Jl1FHWtjsKcaqSwrRFJO26+rGQ3nqGB0ulRInSliIFTGdHoWT7FU4lHYnTkiS1ZZhVd8oiwGp5T/ZMFcTQbMHyzEYkarYGILwO5VuWRtuFGZ8WyMcwImz8lSVHk6NfIEq7XD/x6kUtFxX1mydHNVco1zWuPVIF4rOKZgchagURbah/0zpmQfrCITo1Ap5ZwPF1EFQyUbucBhvFwmYbZllD2ROqy5U8lBSOYkKnOr8cpZ0ZmVz7nEG9vZp/MnhibQTkQXM5U1FSRhRqFAprDKRtFo5pxsc1gWijzcYjL7so3YBP3nx3+31g4e9x4WORuVE+EYlvBckPRPBqEcZKugBbWnFftZMM+wQ5VN58AsG6MRqiyyOYqQF+rLDHc8FYybUkVaq3/HUaFfvfbr1ZkIYsiAwc5+jXuvqkgWQKwNnbqy7sp/3Hy0NYN3fRx9syJzbrxmVYEp3QUxvsyIirGMN+qJfFk7bkymX0bV7zgq1CtIhdSj3OwRr9rDTmrf3P6x7O/a+7VCJ0wvFoTM4RlKQT9WCKcT/SadGezIZRzmnMoY5FlxVDWGLZqCTi7zjVD8jmNVOuwKoio6y8pxHiYxdZ1BWuYTLNkpmMagkYLyDuLFOUznGWPESqZiEpkx41TmZsa5gFHtqvxXA3MVSIVU/Y5jhCq/LlTfd7jvQdhnJIbHETmwzMzm9WvlqJ2Xg1wsgWG7QgpsXoVOHj/hf1E4FXagoo4/zmPtcV62IE6u0rXPU3pWKPuOY6Sq9IP5YfwWvVMFg+N4VomzoKnsAYPmbi5mfVYFGM+KfJS38D0IGssMxYhnRrBKoBTIFpfxixuVGa2CLfKt8GN0+cxO27lwrLWW/wbEVZXrF47N31gS31zy8We1d2x12r1ypW1fujT/VKSyciTXp6oL9rHxnTerJmyOg084thLgDgqy5EhfHIeGKCZIDNKgc7NMxDIS6qCMuLV/Y+GVozgX7aqMiXKzv8U6CJKnVP3BVPyJrXqdz+hrfirBgaQyd7/vn3Hv1D5nVVf1qYBh8KxaGTAgcHwWyAsVxGVlDAjWpxRzcMUtKG6EWtj40urTp87SSpNBM7aQUypJp53iT24P42Vx1QqiKj7LriwYIh8FkyNfBoFwDCMXFL0/QzBO1/4SChdIW8xZMhxeiXhWBVi/W9AsK8VXE6mFVxUPFz/DyVXa5FsSe1CMVJBIGQTBMQxqxXaXVLMkFccy2ZFGEE5v768xim9qYbT0i0JWTVhZReWybF+pKmq8C+L4Ghrkq+ZnVMHozxtVX/HTidno1onBUlVNcO+YbMbPVaRKVXd7jG34GiM1fos5UTRClV91fqgs8lTHq0I1F9S4eQpidT7r/j3IYdDUitGaz+5sbdje45zep/ioPgfnFBxU4xmhLa5ydFo4gzjHZ5Apjot9cZ5TnDl25FGBWiobMd3jvQs2xuso0Vdf/XnTKmyM3n/v0/l1pSrNIdYo9nal2WUWJAfRVLZSeuA8JXfEQc7+9nx57KZoyi8KXxS6+/jN9tZL362N39/+/qfSuPff+7Tdf/jg4LU/FQzPSmX8xGscr+ZFqBPnVSEbo59Tllz11aPrpnU59bqDY4R6IG05TK8gR3YuYbCHOXoFy7p2lF/NDkeVekBsumpUnLri/M8qOJwuC18UOlyeVRpG2WGePQVRh26kFyUYKv/j1DoeDcfvPka/LJxC6FSj2X5TlYHRWy99t6B/vF56aUP/dPifPdVAmMTGqqoSg+9Fg0ZZAGT/uQ57s/uzJOfYrg/bnxWkOizYFXnGa3oGieSgUbx254He96I5f5Wq/+3aYVL/Br1fV8lVgcPK8srJK/LWBd9w7N3Hb1L+9AzSmv7muV+zcVMqwNSMsMkD3PNKq8AqhBitrTdAIs8RvlVdov6jweHmbDFY1Ilh/3XDoOfByRX+fNHJBYyrFtW1GDmH9CzNxrj1r+6FO0eMVCwcu/TXvJ02dQiuOug6nfgoBkdGlXOHc+TK+Exmn4sBofZh5Lyk9jTbY5S/1drzdTYYyVjPUvZRpQhhIh7PsnynzJErVaV64EcdY1uU5fRnlQZlLlSQVSvFup125MlJxsMt2DopPol6Hg7sGamsH9tcFsd5yDfOd4ESA83pGAn1dgGW2ansiCQhVpXW9ViOldspxBZlpMSOEn6HsbO72mPfZ0EjOL33sfGRV79W+zjy1EolNtZerQRTaeUAyWjkkLUqjXw7W33mPkrZl35ZAG2KKtAq3o/CppHEpM40WaJzshmPil6TAmSVLOwWb9WnSSPjN3Xe2OQPqpAQy7eWP0Wa+gBlBGlk/pA9KHB+lNmH/fTFcauSy7wVXKnGVWVUxkfYoPj9XA7tav3Vmk29z3TAYK36gwviLMBRR+yfFCAZVh09jLH7bHGnVBdWalVW+rkQYvjK2Ow+8wO15+vag6oPKZn9+5rWTIBMwd8ZLo181aKMOOxI4KEeI7Szf3n+70Wm+LQtOkEkln2nVAbHO0uwmcwsANQBvkrxjHVs7+Z1+Z6akXPAyBcyI4e4dWUXp9+I7u4HVM/ifLGzf3noSVgMir2b1+n3CBVy+zN13zI/GD2HZrZNOddOPqSjAuhgTDH3BMRVn0yXbBOYflMPot3J4rjOb9PB09ryXwfv3by+cK+e9IyQOzBHOXG8Gxt5jgThKjpVyQZIVZB75BbHj2aTSn9WpdScSqYarYrRGZH/hd+flba1tloAYZVwNPWJ4SoBpfwlO4Sv4i+Ool9mfCzEUkq5jDDV0Uf6u2y1yZkjR92zx85xrCPmeFV5rdWhW4dYMSiu/XNvSEfVF/WszKlQti+jcHsEEra2OjRfCJBVFyOjqbi3ksnZE6oRGUq/0SAcOetkuvRrFjyqWrm2ityjQlVY1pr3l3IFmRrVFWdehXfko+axIMA5iveo44xkScV/pBpWIeAUmhrQ6+DtxmZVep1EH/NGJ8qEO+fv/civ4894Nrn7+OCxI8Io5Bl5q3MG0xEPcoqvsk3ZGHWsBCJicLQ9w+aqr2ITk6dsQydk+1jRcxVS51u8H4Ve8d6tGQ2QzPDMaVkbOn1UNjoMW3iWLdS9I+QfAzAL7CiL9WFbNev3sVGnKGvEPiWX6arkqSCrOCGbN+InbB5LOBmpsaoSOV1m1YwTKTpzppByvvjJ+hyPSnZWhFnbVSF1NlGZtOqcjtz4KU5SCbQMxvXPLAFU20ZoCnyqjq2Mm1U2TG2ScwxUZCSjsj6V8dh4V2XUgrvsl2V8NbfqeMg7flbPTMg78okJTVUHdY980D5mA/Zje6Y7ys3Gsv1lfVk1Yu0zNyA7HE2lDLNn5V71MYiGMhDu4ZhMBrOjsiZZNc0qpJqP/JUtWWKoOBvj4xJV1SGnJAGUhfNdAhuRMYsKZjh6XWcBJmvK2KykV6BQluUqcE31qcrjgljpgTxdX+zPgkZVaDUHE4yyM7NNyRwlBcnjfTXJMFo6pFcdV+FzbHNnBLUZKiNUKgvKiVm+msEz+DUKLViWczwy+Bb7VMavOjw6TbVixvFufUYdEuc7GkmQvS9LMqjHyr8HmVrCKoumMgHKYDCBYWdX8rOFZXq47OkgT6WaMSxedWR37lG2ZVW1j1GBxwKNOaTTrWpHHO+SEcpWwepg4gwVwZKUMWLz43U2hy1sRa4zVmXeDBuraoibXnVSBy3YhrlszwLGjavopCoVC3oVnOiMjOcoIpkSRA5Kon5YCV0CsxCriiU7U3SgrJKohY59LuCUs6hFrsBClWVV1mdzXYBG/SrrE3liUlH3KA/5oS7RppGAQ56ML+OdwS7GDwmDlq25sl/5GPML+te8Cqu6SoMKVhdAOa2LaqeL01/pglmPwQeVbeIY1D8LRKV/tY05B7tWlUJds31168sqUFbJUH8lO5PrbGFy1Nowuvu4eAZxWRHHRMVGsiTOi4apypRVLdw0LLNsHOrm2lylYJkqEkISVbVYhq5UW6U3rpVaV2Ufy7bM0ZxtTDfFl8nFdVG2oWzkwdYGbZjhIGdEVQG3COgYeM94sgyoKkpcPAehsoCP8lRVU3ZmPJ3jVIKVOUZ0dlXZcQ8qe6mCRlUt1Bl1xYTokparoM5etZbM76KNKKu1cAZxm88UjZ8sGzpF3cY4Ypkyk+PKK+Ph+Dk5LPDjJ3OUuMHMkRkfpWclC8c25oDIW1VCFiS9XVVzVWlc9VO82X6ptWcJSSUEllwtxGIOpiI3U0AZ6BYIKwsar5yfLSDTnemfZUJsV05WtQfHZoHFxiBvtmYuwBhPN8dVdaaXksnQQGV9XDCpT8WPJaKow7G9m9efuI1mTBmpoKhkIFV5lA5qkZxeFR4ugJ2NqDvaVpGprlmWHlk7lrQq+5HZU9knXCOnJ853+7bKHIciGI9ZRWEUwrINZtnMyZgh/ZpBBqZnljVRhspwWWZj1UbZjc6BfSiPtTE+OJ7Zgbq7uUoWcxQ3h9mrsrFaJ7ZGSKr6ZrawZID9LuiXflHIsooSrjZR9SmelcyKOjKHjXORnHOobO14Zbaq+a76KLuyrO3WGuerTDtaRZgOLCtjP167uaraMZ4ZZRVI0dL3IKhoZjjOyTZTBRySC4JKiWZy3QZgNRwJDBf4yqbIT1UErGRMFzVHEQuA6lpkiUDBuVGU4qoSto0ESZUiz9IvCl2l6AxxXm9n8InJYW1sfOY4imdFRwePonx0pLhZDBqibgj3GNxQweiqF3N4dHa1BqibgkBu/TJ/YDxUMGRJiiUVt49xXZQ/sz2xv0nHQIkLzhYmKhPnVDcbZatFYO2uX+nJdIrjmK1OdxesbmNQp8xp1DgmmwWjq3xx3ZltWTWvJLHIJ3NcTDauWlT2Ae1z41oLZxAWPZgh2bjMSbHNfaJM1KeqkzOcUSZbzVdrllXJOJ+tAequ1qyiU2Vexs/NqUAct57ZvWtfh24Zrxk6R7yOUcsye2Qex+N15Mmyi3LQOBerF45TECJmJwYdVKBljhvLNq6Lyroq42eVR222yroOflT0QV5VGUov5ltOHtOtGhyom7ORVVOk0surs4oQFWNzXEatLAS2I28VHEqua2fVwFWWSnZ0WZ2NZfKc3oyqVSOrMlVHHcnWShd2z/aVzcnsq8qO7a0VzyBOgMqaOKaaTVGHyBMrFJOLWSHLMljN0AZVWVm7gwrO+Vi7q2wODjF5qtIw3VU1i1XV8VF6MR2U8yPfSjJQ+mRVxAXHWy991/4P4sXXP8RtQZoAAAAASUVORK5CYII="
- },
- {
- "name": "it's_stuck",
- "description": "Well, only one way to find out, right? You produce a holocredit chit (helpfully taken from the science budget, I'm sure they won't miss it) and jam it into the slot. Then, you realise your mistake, as it sticks in the slot. Whoops. Time to try the old fashioned way, I suppose.",
- "choices": [
- {
- "key": "choice 2",
- "name": "Time to try something a bit more daring?",
- "exit_node": "start",
- "on_selection_effects": [
- {
- "effect_type": "Set",
- "quality": "jammed",
- "value": 1
- }
- ],
- "delay": 10,
- "delay_message": "In hindsight, why would this accept human currency, anyway?"
- }
- ],
- "image": null,
- "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAAAXNSR0IArs4c6QAAAjVJREFUeJzt3cFyogAUAEGzlf//5ewpF0pGRJDnbvc1CkhleAbEfN1ut58bcNefqzcAJhMIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUD4vnLlW/854tdJz5+2HWuWy9+6HWdt77P/1PLo7d27H/cwQSBcMkFePSI8e+T5WXncUctZWlvP1uef5V2vd+9y1p7/aD1nMkEgvHWCTDgiXOH3dU6ZJNNN+j0xQSBcehZrae3siCPtff/aJJo0OX6ZIBBGTZDle3XuW+6fq/fXo/W/ev3H3yAw1FsnyP96Nues99ZTJu7R11PWJqTrIDDM1+3CA9CUz0BN2Y410z+Ltfdxz/780frOYIJAuHSCwHQmCASBQBAIhFFX0pfefZbq0XKPupPu2eW9+2zSVmctZxITBMLoCbK09069s86vT7uTca+j9s/E6xivMkEgfNQEWZr62a6jPiN19evABIH00RNkqq33Rywn36PHv7penmeCQDBBXvDqkX/rdZKjvp+K55kgED56glz9LRhn39/B9UwQCB81QfZemd36HvxdR/azzmLtNW3/TGKCQHBHIQQTBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBMJfgqJi1hru29AAAAAASUVORK5CYII="
- },
- {
- "name": "lost_wallet",
- "description": "Searching around, you come across a lost wallet in a small crater. Flipping it open, inside you find a family photo of 3 identical looking grey aliens in comically different outfits, an (expired) credit card for a bank you've never heard of, a loyalty card to McDonkalds, and, in the coin pouch, a single black coin with glowing purple lines. This is (presumably) what you're looking for.",
- "choices": [
- {
- "key": "choice 3",
- "name": "Return to the machine with the coin.",
- "exit_node": "start",
- "on_selection_effects": [
- {
- "effect_type": "Add",
- "quality": "have_coin",
- "value": 1
- }
- ],
- "delay": 10,
- "delay_message": "It doesn't count as theft if you found it, right?"
- }
- ],
- "image": null,
- "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAAAXNSR0IArs4c6QAAC4dJREFUeJztnV+IVccdx7+7KyH7IKQmrptuSXzImj5E/POyf7LkoUJAMBiwjXQTXxKyS1wjSYubBoPQ4GLdtERMYlnFUkiyIWkEJQUhrQsRE9eXtWChRQ0YqyKGpqGBWgqufbjO3Zm5M+fMzJk553fOmQ8snnv+3bnrfPY3v9+cc27b8aOHbyMSqTjrn3zO6bhFntsRiRSKqwg8IwNrmstRkEhpySoDL4KOKEiEPL6jgg1RkAgp8ogKNkRBIoVQZFQw5eDps1GQSHioRQUVB0+fVa6PgkS8UZaoYEMUJGJNGUQA7GWQGRlYEwWJJFMnGVREQSIAogg6oiA1pAxJM5C/DCqiIBWmLFEBoCEDD2tPFKQilCUqANlkCCWCjihIyYhRwR2X9kRBCFOXqADQkIGHtScKQoAyRQWgWjKktSUKkjMxKrhTRHuiIIGIUSEbVNoTBfFAmaICQKfzMai1hycKYkHZogJAq6QK0GtPGlEQDTEqZINae1ypvSB1iwpAlMGGWglStqgA0Ot81NoTAv4zVlKQGBX8ULZ8wYVKX2pSRhEAejJQa09IKntHYZTBD9TaExLXzzp19cnmMjlBogj+oNimUPiQQUWhgpQxaQZodrw65As8oYSQyUWQskYFgJ4M1NqTB3nJoMK7IGWNCgC9v8J1lAFw+9w+ZFDhLEiMCn6h2KY8KDI6mGAkSF2jAhCHSL6hFB1MEAQpc1QA6HU+au3JG+rRwYQ2AE7fMBVFEKHYprwpW3QwwWiIFWUQ8ZXMZ/1sRVKF6GCCEEGK/itGTYY82sO/R9G//ySqGB1MWFTGShK1qADQ7ty21CU6mBB8opBix/M5tCm7GFGGZLwKUjUZdO2JuUN9aBsZWONUxaImQ97t8Zk7hMpDogzZSY0g1EQAaLaJAnVNpFW0z44q18/3T1mdRxCEYsej2CYqVF2Ir6f6WtYtHT2TeIxODHm7qSikJgqpVbaS8D0ssj2fye/KRYaRG//Tv2fXXdbns0UlhUySJGmC8JhIkjrEoiYCQG/i8uDpsyQiVZbokCSGah/fspiIwe+bFkme37ReeH3oyPGWbYeOHE+VRBAkyiBCuVo1MrBGaJ/vaGFy7JHnriu3/fOTB6zOZSNHVmRx0vA6UVhWGSiIwHf4PCJSFjl0YjDufeIyAHtRbDCJIjzPb1ovRBFTnOdBypQv8PiUmIJYLrjKkSaGzL1PXLaW5LXXXxVe7961R7mNX5+F9tnRxGFWKcu8poRue95/9ZPef7TnqNEwKy85GC6S8Lz2+qtaGVRRZL5/Cu2zozh05LhyOGUbRciXeU3xGdH4Tm+yf1nIWw5Tlo6eSc1D5MhigsuQSmaRa8eqigyu7x/i8xcdkaoIyz2+N7FTWP+vnRNGxxdS5jWFSkR7evtXAID39z/YXFe2DpwlKc8DFkV279qTGi1s8g/tUOvOv2llXjL3g1CRgcG3hwkCiJKw9yz6uiyTcm/IqlUapjmIPMxiouiEsJkw5CMIHz3e239C2G94+qLwupD7QULI4HJOl8/+9PavmpKEiCJ1HmbJuYivShWwIMV7+08AkhQ808MPCZKQvh8kqXP4KLHWrQOWAV4SVQUrqarFM98/henhh5zawF+vReZ+EJfhhMzHa9canePHc3PC+Wwl4aMIBVzKvTZsOtwdvJKlQpWPMDkubNyCpdAPsVzl4GmfHXUTJFS+4HJeUynkY3hJVPCd7v39Dwp5SNK+PqJSXYdZX1x/u7GwEeg99i4A9TDrwsYt4v4ABru3BWlT4ROFrud3EUM+nknC2uDSEevSgUNHEb6zAwsS2BzPJMkSPZ7Zvk54nftEocl7ZO38OtKiRpk7e+hhFuAmiUkFS5bDFV4SF4anL2IeF4UKmNNEoU0nMj2/bynSZFBh87mo5SF5YSNJnnLw8FFALuOawC5XATxOFNqK5lMIFxkYPmfW65KHbDrcrVyfxw1VSQx2b2uZ/3hm+7pMkmS6H6SI6JCnDDaJOnUOdt0VdDa9aDkA9d2ENnLIcyDz/VPmE4VVl8EFedKwaPLIQ7Iid+IhnAMAnFq+MtN5hy6da1k33z+F4f7Gsmvirhxi2fxn+xAiiwhAea+uTcP3MCtUFDGJHjb3itsiy2H75BIe5Ux6nkJUTQZdsk4tb2D4lsTX0Kr32LvWpV0bhqcvOkWRxCpWlKF8eYjJMMuHJK5i8A9M4F/v3rVHKNG6VLdsIsefPzmp3fa7777fXBaGWFmEoJ4vhKSMJV++g5vK4jMRl+8Rt7m/XObU8pVG8x9JUvA8u/gagIYoi1ykqLMMeZNHuTd0Bapx8eFfsGzV6pb7M5gk81j4698+O4ohnMucuGfl2cXX0udBogzuFJWHUKpmqW6l9XErrEzWWXQdgiBRhkgSurzAtGPyM9R8FNEJPHTJLookScKGTbY4PXq0ijKk3cmnu8OQR5WH+PpdZXk0aZYIYpIs6zqlHD2WrVqNobkOnFp7q7luaK4DJ7ceyPT+Jm2xFYQl6qTvSQ9FWlmbaok2BEt2/iJ5hxf9vM+yVauby0NzHcK2pAdKD3ZvM5Lk0s/2NfafztJK4Pd/+mVj4U5bgj96tEiKemILheuofOUhG9660lz+44s/aNluMrzi5fAFE0JGnugzgUULfjKTPVCusO8o9A21hz74hoJ0MmlyNEu3s2aC6J5yqJPBBn5uo2VWXzN/8uWWwfD3pIegCBnKNmFoQurwSoNrtWi+fwqY26pc7/NSFNso8uWWwTtL59A7JhYFyAtS9EPiXKBw4SKQPMz64vrb2IArukOVbHjrCr6Z+JVzex470CoHW88n7pQgI0gVhkj8jDrFIVFRNIdNiujRso8lumusdFGkES1aI4WOQgSpggxFUFfpXC80ZCwModT0jq3EhXcaVwRfeEeUh/RzsYD6yuALn7PqWYZXIUmKIn0dXcpjZBFU9I6tLN9zsYqkSol6I9HWJ+kT+BQA8MJEtiuyqTI5M45DY+pLXvgLKWv3BTp5EmJI5POcLCK4VrNsObn1gDApaPuNsyrY8KmvAzhz64bRMZMz4wDU3zolbyv8uVhVpUw5gjx0+u3OtcIyhShikof0dXQ1Jfnss183/uW2j/9oUlienBkXrglj2/ltlfkCHSpQvDfENg95YWJOkIQyZ27dEPIMJoYJTISkbaX8Ap0isclDqMyHZKWoKNJafRKjA6OPiwwmyJEkaVstL1bME+p5iA4fUURVXu0dW9jGL5tgEh3kDp+VSl+sWBTUHgcE5H8Tla7TP/bRxwCAC3hYWE5DNxQKTWUuVoz4h48iacMs0yjgC9+RQgeZS02qRuhkndKsuo0ch79+WLmcRl5CyLSNDKyxvqMw4n6HIVDcXYbyMSbDLDkP4aNIqKix98QO62NeWfdGgJbECBIUiiXfrIQeSjE5bDr83hM7sPfEDryy7g1cfWSz0TE9f/3QaL9241ZEyMFHjVDFADnv+PSB/wZ5Hx6dHPffd6z58+3ND5o/bP/vfnjJe1tiBIloaUaLHKTQcf99x4TXL314CgCwb/MQ/vaP/wjbFv99Of79iN/3j4I4YjphqBpmFZlUm5R7865I6ZDlAIC2tjbcvi2mzV1LjgLYga4lR9F17ajZyZcA56/eFFbd0/nTlt2iIBFjIR6/fHfgliwwOTOON596tGX9m089in2bh6zPd/7qTazo6RTWrejpxI1vGn8g2HBNliTmICUnax5iIsfjl+/OVQ5AX9Z9+aPPg7yfKnoAMYIEh2IVix9mTc6MFzbHoGOhktV4zc+i81FlRU8nfv4Hc2FUUSSNKEggdE9ZpDK5RxVWkWKlWwDYi+R5kd/8pHUoJrOipxPnr97USvLtzQ+Ux0VBMiAn6mn75tGOqohn0ukZLI9I456mF2Iiz+SISXoBUO2s1IdZppjK0ah0qdHlH0AUxDtUhSgbph0/9Pn+D1DTxdUMOqP+AAAAAElFTkSuQmCC"
- },
- {
- "name": "choices_choices",
- "description": "You slip the coin into the slot- it's a perfect fit. Now comes the hard part: picking a button on the machine to press.",
- "choices": [
- {
- "key": "choice 7",
- "name": "The red looking soda.",
- "exit_node": "cha_clunk",
- "delay": 10,
- "delay_message": "How exciting..."
- },
- {
- "key": "choice 9",
- "name": "The yellow looking soda.",
- "exit_node": "cha_clunk",
- "delay": 10,
- "delay_message": "How exciting..."
- },
- {
- "key": "choice 10",
- "name": "The green looking soda.",
- "exit_node": "cha_clunk",
- "delay": 10,
- "delay_message": "How exciting..."
- }
- ],
- "image": null,
- "raw_image": "data:image/png;base64,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"
- },
- {
- "name": "cha_clunk",
- "description": "With a satisfying cha-clunk, your fizzy prize drops into the tray. You swipe it, and move on from the site.",
- "choices": [
- {
- "key": "choice 11",
- "name": "Sweet, sugary victory.",
- "exit_node": "WIN",
- "delay": 10,
- "delay_message": "Hopefully this doesn't like, freeze solid in space. That would be bad, right?"
- }
- ],
- "image": null,
- "raw_image": "data:image/png;base64,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"
- },
- {
- "name": "smashing",
- "description": "You maneuver the drone into position and begin ramming it into the machine. The machine sways and shakes, and just as you think it may be getting somewhere, it falls directly onto your drone. Now, not only do you not have any soda, but you don't have a drone, either. Dummy.",
- "choices": [
- {
- "key": "choice 8",
- "name": "Disconnect.",
- "exit_node": "FAIL_DEATH",
- "delay": 10,
- "delay_message": "Don't feel too bad, it happens to the best of us sometimes."
- }
- ],
- "image": null,
- "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAAAXNSR0IArs4c6QAAAjVJREFUeJzt3cFyogAUAEGzlf//5ewpF0pGRJDnbvc1CkhleAbEfN1ut58bcNefqzcAJhMIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUD4vnLlW/854tdJz5+2HWuWy9+6HWdt77P/1PLo7d27H/cwQSBcMkFePSI8e+T5WXncUctZWlvP1uef5V2vd+9y1p7/aD1nMkEgvHWCTDgiXOH3dU6ZJNNN+j0xQSBcehZrae3siCPtff/aJJo0OX6ZIBBGTZDle3XuW+6fq/fXo/W/ev3H3yAw1FsnyP96Nues99ZTJu7R11PWJqTrIDDM1+3CA9CUz0BN2Y410z+Ltfdxz/780frOYIJAuHSCwHQmCASBQBAIhFFX0pfefZbq0XKPupPu2eW9+2zSVmctZxITBMLoCbK09069s86vT7uTca+j9s/E6xivMkEgfNQEWZr62a6jPiN19evABIH00RNkqq33Rywn36PHv7penmeCQDBBXvDqkX/rdZKjvp+K55kgED56glz9LRhn39/B9UwQCB81QfZemd36HvxdR/azzmLtNW3/TGKCQHBHIQQTBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBMJfgqJi1hru29AAAAAASUVORK5CYII="
- }
- ]
-}
\ No newline at end of file
+ "adventure_name": "Quantum Fizz-ics",
+ "version": 1,
+ "author": "EOBGames",
+ "starting_node": "start",
+ "starting_qualities": {
+ "jammed": 0
+ },
+ "required_site_traits": [
+ "technology present",
+ "in space"
+ ],
+ "loot_categories": [
+ "unique"
+ ],
+ "scan_band_mods": {
+ "Narrow-band radio waves": 10
+ },
+ "deep_scan_description": "",
+ "triggers": [],
+ "nodes": [
+ {
+ "name": "start",
+ "description": "As you sweep through the inky void and the site comes into view, you're puzzled by what you see. On a small asteroid sits a vending machine. Despite the odd runes lining its surface, you're fairly certain that the image on the front is a can of soda. While ordinary common sense would dictate that drinking strange alien soda is a bad idea, you can't help but be curious about what exactly this machine dispenses. There's one problem, however- what currency does this thing take?",
+ "choices": [
+ {
+ "key": "choice 0",
+ "name": "Leave.",
+ "exit_node": "FAIL",
+ "delay": 10,
+ "delay_message": "There are better ways to die than drinking alien soda."
+ },
+ {
+ "key": "choice 1",
+ "name": "Try a holocredit chit.",
+ "exit_node": "it's_stuck",
+ "requirements": [
+ {
+ "quality": "jammed",
+ "operator": "!=",
+ "value": 1
+ }
+ ],
+ "delay": 10,
+ "delay_message": "Hopefully whoever made this machine is part of the Galactic Currency Union..."
+ },
+ {
+ "key": "choice 4",
+ "name": "Ram the machine.",
+ "exit_node": "smashing",
+ "delay": 30,
+ "delay_message": "Ramming speed!"
+ },
+ {
+ "key": "choice 5",
+ "name": "Search around for some loose change.",
+ "exit_node": "lost_wallet",
+ "requirements": [
+ {
+ "quality": "have_coin",
+ "operator": "!=",
+ "value": 1
+ }
+ ],
+ "delay": 100,
+ "delay_message": "There's a surprising amount of stuff on this asteroid to search..."
+ },
+ {
+ "key": "choice 6",
+ "name": "Use the coin you found.",
+ "exit_node": "choices_choices",
+ "requirements": [
+ {
+ "quality": "jammed",
+ "operator": "==",
+ "value": 0
+ },
+ {
+ "quality": "have_coin",
+ "operator": "==",
+ "value": 1
+ }
+ ],
+ "delay": 10,
+ "delay_message": "Thank God for clumsy aliens!"
+ }
+ ],
+ "image": null,
+ "raw_image": "data:image/png;base64,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"
+ },
+ {
+ "name": "it's_stuck",
+ "description": "Well, only one way to find out, right? You produce a holocredit chit (helpfully taken from the science budget, I'm sure they won't miss it) and jam it into the slot. Then, you realise your mistake, as it sticks in the slot. Whoops. Time to try the old fashioned way, I suppose.",
+ "choices": [
+ {
+ "key": "choice 2",
+ "name": "Time to try something a bit more daring?",
+ "exit_node": "start",
+ "on_selection_effects": [
+ {
+ "effect_type": "Set",
+ "quality": "jammed",
+ "value": 1
+ }
+ ],
+ "delay": 10,
+ "delay_message": "In hindsight, why would this accept human currency, anyway?"
+ }
+ ],
+ "image": null,
+ "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAAAXNSR0IArs4c6QAAAjVJREFUeJzt3cFyogAUAEGzlf//5ewpF0pGRJDnbvc1CkhleAbEfN1ut58bcNefqzcAJhMIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUD4vnLlW/854tdJz5+2HWuWy9+6HWdt77P/1PLo7d27H/cwQSBcMkFePSI8e+T5WXncUctZWlvP1uef5V2vd+9y1p7/aD1nMkEgvHWCTDgiXOH3dU6ZJNNN+j0xQSBcehZrae3siCPtff/aJJo0OX6ZIBBGTZDle3XuW+6fq/fXo/W/ev3H3yAw1FsnyP96Nues99ZTJu7R11PWJqTrIDDM1+3CA9CUz0BN2Y410z+Ltfdxz/780frOYIJAuHSCwHQmCASBQBAIhFFX0pfefZbq0XKPupPu2eW9+2zSVmctZxITBMLoCbK09069s86vT7uTca+j9s/E6xivMkEgfNQEWZr62a6jPiN19evABIH00RNkqq33Rywn36PHv7penmeCQDBBXvDqkX/rdZKjvp+K55kgED56glz9LRhn39/B9UwQCB81QfZemd36HvxdR/azzmLtNW3/TGKCQHBHIQQTBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBMJfgqJi1hru29AAAAAASUVORK5CYII="
+ },
+ {
+ "name": "lost_wallet",
+ "description": "Searching around, you come across a lost wallet in a small crater. Flipping it open, inside you find a family photo of 3 identical looking grey aliens in comically different outfits, an (expired) credit card for a bank you've never heard of, a loyalty card to McDonkalds, and, in the coin pouch, a single black coin with glowing purple lines. This is (presumably) what you're looking for.",
+ "choices": [
+ {
+ "key": "choice 3",
+ "name": "Return to the machine with the coin.",
+ "exit_node": "start",
+ "on_selection_effects": [
+ {
+ "effect_type": "Add",
+ "quality": "have_coin",
+ "value": 1
+ }
+ ],
+ "delay": 10,
+ "delay_message": "It doesn't count as theft if you found it, right?"
+ }
+ ],
+ "image": null,
+ "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAAAXNSR0IArs4c6QAAC4dJREFUeJztnV+IVccdx7+7KyH7IKQmrptuSXzImj5E/POyf7LkoUJAMBiwjXQTXxKyS1wjSYubBoPQ4GLdtERMYlnFUkiyIWkEJQUhrQsRE9eXtWChRQ0YqyKGpqGBWgqufbjO3Zm5M+fMzJk553fOmQ8snnv+3bnrfPY3v9+cc27b8aOHbyMSqTjrn3zO6bhFntsRiRSKqwg8IwNrmstRkEhpySoDL4KOKEiEPL6jgg1RkAgp8ogKNkRBIoVQZFQw5eDps1GQSHioRQUVB0+fVa6PgkS8UZaoYEMUJGJNGUQA7GWQGRlYEwWJJFMnGVREQSIAogg6oiA1pAxJM5C/DCqiIBWmLFEBoCEDD2tPFKQilCUqANlkCCWCjihIyYhRwR2X9kRBCFOXqADQkIGHtScKQoAyRQWgWjKktSUKkjMxKrhTRHuiIIGIUSEbVNoTBfFAmaICQKfzMai1hycKYkHZogJAq6QK0GtPGlEQDTEqZINae1ypvSB1iwpAlMGGWglStqgA0Ot81NoTAv4zVlKQGBX8ULZ8wYVKX2pSRhEAejJQa09IKntHYZTBD9TaExLXzzp19cnmMjlBogj+oNimUPiQQUWhgpQxaQZodrw65As8oYSQyUWQskYFgJ4M1NqTB3nJoMK7IGWNCgC9v8J1lAFw+9w+ZFDhLEiMCn6h2KY8KDI6mGAkSF2jAhCHSL6hFB1MEAQpc1QA6HU+au3JG+rRwYQ2AE7fMBVFEKHYprwpW3QwwWiIFWUQ8ZXMZ/1sRVKF6GCCEEGK/itGTYY82sO/R9G//ySqGB1MWFTGShK1qADQ7ty21CU6mBB8opBix/M5tCm7GFGGZLwKUjUZdO2JuUN9aBsZWONUxaImQ97t8Zk7hMpDogzZSY0g1EQAaLaJAnVNpFW0z44q18/3T1mdRxCEYsej2CYqVF2Ir6f6WtYtHT2TeIxODHm7qSikJgqpVbaS8D0ssj2fye/KRYaRG//Tv2fXXdbns0UlhUySJGmC8JhIkjrEoiYCQG/i8uDpsyQiVZbokCSGah/fspiIwe+bFkme37ReeH3oyPGWbYeOHE+VRBAkyiBCuVo1MrBGaJ/vaGFy7JHnriu3/fOTB6zOZSNHVmRx0vA6UVhWGSiIwHf4PCJSFjl0YjDufeIyAHtRbDCJIjzPb1ovRBFTnOdBypQv8PiUmIJYLrjKkSaGzL1PXLaW5LXXXxVe7961R7mNX5+F9tnRxGFWKcu8poRue95/9ZPef7TnqNEwKy85GC6S8Lz2+qtaGVRRZL5/Cu2zozh05LhyOGUbRciXeU3xGdH4Tm+yf1nIWw5Tlo6eSc1D5MhigsuQSmaRa8eqigyu7x/i8xcdkaoIyz2+N7FTWP+vnRNGxxdS5jWFSkR7evtXAID39z/YXFe2DpwlKc8DFkV279qTGi1s8g/tUOvOv2llXjL3g1CRgcG3hwkCiJKw9yz6uiyTcm/IqlUapjmIPMxiouiEsJkw5CMIHz3e239C2G94+qLwupD7QULI4HJOl8/+9PavmpKEiCJ1HmbJuYivShWwIMV7+08AkhQ808MPCZKQvh8kqXP4KLHWrQOWAV4SVQUrqarFM98/henhh5zawF+vReZ+EJfhhMzHa9canePHc3PC+Wwl4aMIBVzKvTZsOtwdvJKlQpWPMDkubNyCpdAPsVzl4GmfHXUTJFS+4HJeUynkY3hJVPCd7v39Dwp5SNK+PqJSXYdZX1x/u7GwEeg99i4A9TDrwsYt4v4ABru3BWlT4ROFrud3EUM+nknC2uDSEevSgUNHEb6zAwsS2BzPJMkSPZ7Zvk54nftEocl7ZO38OtKiRpk7e+hhFuAmiUkFS5bDFV4SF4anL2IeF4UKmNNEoU0nMj2/bynSZFBh87mo5SF5YSNJnnLw8FFALuOawC5XATxOFNqK5lMIFxkYPmfW65KHbDrcrVyfxw1VSQx2b2uZ/3hm+7pMkmS6H6SI6JCnDDaJOnUOdt0VdDa9aDkA9d2ENnLIcyDz/VPmE4VVl8EFedKwaPLIQ7Iid+IhnAMAnFq+MtN5hy6da1k33z+F4f7Gsmvirhxi2fxn+xAiiwhAea+uTcP3MCtUFDGJHjb3itsiy2H75BIe5Ux6nkJUTQZdsk4tb2D4lsTX0Kr32LvWpV0bhqcvOkWRxCpWlKF8eYjJMMuHJK5i8A9M4F/v3rVHKNG6VLdsIsefPzmp3fa7777fXBaGWFmEoJ4vhKSMJV++g5vK4jMRl+8Rt7m/XObU8pVG8x9JUvA8u/gagIYoi1ykqLMMeZNHuTd0Bapx8eFfsGzV6pb7M5gk81j4698+O4ohnMucuGfl2cXX0udBogzuFJWHUKpmqW6l9XErrEzWWXQdgiBRhkgSurzAtGPyM9R8FNEJPHTJLookScKGTbY4PXq0ijKk3cmnu8OQR5WH+PpdZXk0aZYIYpIs6zqlHD2WrVqNobkOnFp7q7luaK4DJ7ceyPT+Jm2xFYQl6qTvSQ9FWlmbaok2BEt2/iJ5hxf9vM+yVauby0NzHcK2pAdKD3ZvM5Lk0s/2NfafztJK4Pd/+mVj4U5bgj96tEiKemILheuofOUhG9660lz+44s/aNluMrzi5fAFE0JGnugzgUULfjKTPVCusO8o9A21hz74hoJ0MmlyNEu3s2aC6J5yqJPBBn5uo2VWXzN/8uWWwfD3pIegCBnKNmFoQurwSoNrtWi+fwqY26pc7/NSFNso8uWWwTtL59A7JhYFyAtS9EPiXKBw4SKQPMz64vrb2IArukOVbHjrCr6Z+JVzex470CoHW88n7pQgI0gVhkj8jDrFIVFRNIdNiujRso8lumusdFGkES1aI4WOQgSpggxFUFfpXC80ZCwModT0jq3EhXcaVwRfeEeUh/RzsYD6yuALn7PqWYZXIUmKIn0dXcpjZBFU9I6tLN9zsYqkSol6I9HWJ+kT+BQA8MJEtiuyqTI5M45DY+pLXvgLKWv3BTp5EmJI5POcLCK4VrNsObn1gDApaPuNsyrY8KmvAzhz64bRMZMz4wDU3zolbyv8uVhVpUw5gjx0+u3OtcIyhShikof0dXQ1Jfnss183/uW2j/9oUlienBkXrglj2/ltlfkCHSpQvDfENg95YWJOkIQyZ27dEPIMJoYJTISkbaX8Ap0isclDqMyHZKWoKNJafRKjA6OPiwwmyJEkaVstL1bME+p5iA4fUURVXu0dW9jGL5tgEh3kDp+VSl+sWBTUHgcE5H8Tla7TP/bRxwCAC3hYWE5DNxQKTWUuVoz4h48iacMs0yjgC9+RQgeZS02qRuhkndKsuo0ch79+WLmcRl5CyLSNDKyxvqMw4n6HIVDcXYbyMSbDLDkP4aNIqKix98QO62NeWfdGgJbECBIUiiXfrIQeSjE5bDr83hM7sPfEDryy7g1cfWSz0TE9f/3QaL9241ZEyMFHjVDFADnv+PSB/wZ5Hx6dHPffd6z58+3ND5o/bP/vfnjJe1tiBIloaUaLHKTQcf99x4TXL314CgCwb/MQ/vaP/wjbFv99Of79iN/3j4I4YjphqBpmFZlUm5R7865I6ZDlAIC2tjbcvi2mzV1LjgLYga4lR9F17ajZyZcA56/eFFbd0/nTlt2iIBFjIR6/fHfgliwwOTOON596tGX9m089in2bh6zPd/7qTazo6RTWrejpxI1vGn8g2HBNliTmICUnax5iIsfjl+/OVQ5AX9Z9+aPPg7yfKnoAMYIEh2IVix9mTc6MFzbHoGOhktV4zc+i81FlRU8nfv4Hc2FUUSSNKEggdE9ZpDK5RxVWkWKlWwDYi+R5kd/8pHUoJrOipxPnr97USvLtzQ+Ux0VBMiAn6mn75tGOqohn0ukZLI9I456mF2Iiz+SISXoBUO2s1IdZppjK0ah0qdHlH0AUxDtUhSgbph0/9Pn+D1DTxdUMOqP+AAAAAElFTkSuQmCC"
+ },
+ {
+ "name": "choices_choices",
+ "description": "You slip the coin into the slot- it's a perfect fit. Now comes the hard part: picking a button on the machine to press.",
+ "choices": [
+ {
+ "key": "choice 7",
+ "name": "The red looking soda.",
+ "exit_node": "cha_clunk",
+ "delay": 10,
+ "delay_message": "How exciting..."
+ },
+ {
+ "key": "choice 9",
+ "name": "The yellow looking soda.",
+ "exit_node": "cha_clunk",
+ "delay": 10,
+ "delay_message": "How exciting..."
+ },
+ {
+ "key": "choice 10",
+ "name": "The green looking soda.",
+ "exit_node": "cha_clunk",
+ "delay": 10,
+ "delay_message": "How exciting..."
+ }
+ ],
+ "image": null,
+ "raw_image": "data:image/png;base64,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"
+ },
+ {
+ "name": "cha_clunk",
+ "description": "With a satisfying cha-clunk, your fizzy prize drops into the tray. You swipe it, and move on from the site.",
+ "choices": [
+ {
+ "key": "choice 11",
+ "name": "Sweet, sugary victory.",
+ "exit_node": "WIN",
+ "delay": 10,
+ "delay_message": "Hopefully this doesn't like, freeze solid in space. That would be bad, right?"
+ }
+ ],
+ "image": null,
+ "raw_image": "data:image/png;base64,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"
+ },
+ {
+ "name": "smashing",
+ "description": "You maneuver the drone into position and begin ramming it into the machine. The machine sways and shakes, and just as you think it may be getting somewhere, it falls directly onto your drone. Now, not only do you not have any soda, but you don't have a drone, either. Dummy.",
+ "choices": [
+ {
+ "key": "choice 8",
+ "name": "Disconnect.",
+ "exit_node": "FAIL_DEATH",
+ "delay": 10,
+ "delay_message": "Don't feel too bad, it happens to the best of us sometimes."
+ }
+ ],
+ "image": null,
+ "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAAAXNSR0IArs4c6QAAAjVJREFUeJzt3cFyogAUAEGzlf//5ewpF0pGRJDnbvc1CkhleAbEfN1ut58bcNefqzcAJhMIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUAQCASBQBAIBIFAEAgEgUD4vnLlW/854tdJz5+2HWuWy9+6HWdt77P/1PLo7d27H/cwQSBcMkFePSI8e+T5WXncUctZWlvP1uef5V2vd+9y1p7/aD1nMkEgvHWCTDgiXOH3dU6ZJNNN+j0xQSBcehZrae3siCPtff/aJJo0OX6ZIBBGTZDle3XuW+6fq/fXo/W/ev3H3yAw1FsnyP96Nues99ZTJu7R11PWJqTrIDDM1+3CA9CUz0BN2Y410z+Ltfdxz/780frOYIJAuHSCwHQmCASBQBAIhFFX0pfefZbq0XKPupPu2eW9+2zSVmctZxITBMLoCbK09069s86vT7uTca+j9s/E6xivMkEgfNQEWZr62a6jPiN19evABIH00RNkqq33Rywn36PHv7penmeCQDBBXvDqkX/rdZKjvp+K55kgED56glz9LRhn39/B9UwQCB81QfZemd36HvxdR/azzmLtNW3/TGKCQHBHIQQTBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBIJAIAgEgkAgCASCQCAIBMJfgqJi1hru29AAAAAASUVORK5CYII="
+ }
+ ]
+}
diff --git a/strings/exoadventures/robots_wingman.json b/strings/exoadventures/robots_wingman.json
index 2958fbb6a4ed3b..a93afc515295ae 100644
--- a/strings/exoadventures/robots_wingman.json
+++ b/strings/exoadventures/robots_wingman.json
@@ -1,369 +1,369 @@
{
- "adventure_name": "Robot's Wingman",
- "version": 1,
- "author": "Lucky Luther",
- "starting_node": "Date Start",
- "starting_qualities": {
- "Love": 3
- },
- "required_site_traits": [
- "in space"
- ],
- "loot_categories": [
- "trade_contract"
- ],
- "scan_band_mods": {
- "Narrow-band radio waves": 2
- },
- "deep_scan_description": "",
- "triggers": [
- {
- "name": "True Love",
- "target_node": "Love Birds",
- "requirements": [
- {
- "quality": "Love",
- "operator": ">=",
- "value": 7
- }
- ]
- },
- {
- "name": "Complete Failure",
- "target_node": "Obliteration",
- "requirements": [
- {
- "quality": "Love",
- "operator": "<=",
- "value": 0
- }
- ]
- }
- ],
- "nodes": [
- {
- "name": "Date Start",
- "description": "Cameras Online. A Blood-Red Drone is seen streaking through the stars.\nThe Drone is likely leaving behind some form of Chem Trail to brainwash Nanotrasen Employees who find themselves in the void.",
- "choices": [
- {
- "key": "choice 0",
- "name": "Hail other Drone",
- "exit_node": "First Contact",
- "delay": 5,
- "delay_message": "Attempting to signal Drone..."
- },
- {
- "key": "choice 1",
- "name": "Ignore other Drone",
- "exit_node": "FAIL",
- "delay": 0
- }
- ],
- "image": null,
- "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAD/0lEQVR4nO3duXnbQBBA4YE/d6CACSMmasFO1IDbUkluQJHUgnIlCFgDHIHmsYD2mD1m9/2JFCgABTwsFhcnEVkEgNOP2gsAtIxAgB0EAuwgEGDH8IEsC+cosM0rkF43ovVz9fr5kO7bQHreiKZpuvkJ3JvE4zrIsixsRBiSVyDAqIafpAN7CATYQSDADgJJ9H481l4EOGiddSWQBGscRNIWzUsTBBLpOorfX18VlwT3NK9vEUik19NJRIijVVrX7QgkwJ+Xl8vP8zw747B6x4HV5c6NC4We1jhERM7zLB+fnw9/c72RWbrzwOpyl2BmBKm5h7uOQ0Tk6XBw/p3Ve7usLncJJkaQ2nu4X8/Pm1GIiPx9e2Pj6tTP2gvgY5qmqjdMPh0Ocp7nm0jO83z5vfbyIR8TI0gt78ejvJ5ONzGssYjIwzyESPpDIBtc1znWQ62tSboIkfTGzCS9pK2LgGsUW3GI/D/cQh8YQTa8H4+b1zl8RghGkj4QSISQSEQ4fWoZgUQKGSEYTewikAShkVwjGBsIJFHs6LA3kSeedhCIAu1DKEabdhCIkpwTcoKph0CUlZiQc3asHALJoNQen1DyI5ACck/Iez+NXPPzOQPp/R/eEq3RptfRpPajDg+B1F6g0aUG0+POjREEN1yHZCHrg/WnhzlIo+438tBDKCLRQSDGcA9YWQRiUMhoQiRpCMQwnk3JjycKDfN9epGnHOMRiHFEkheBdIBI8iGQThBJHgTSESLRRyCdIRJdBNIhNn49BNIpn0gI6XsE0jEiSUcgnSOSNAQyACKJN2QgbAhuRPJouEA0v0PbEk7/xhkukJG/j49IwnG7+4C4Td5f8RGEPVN9oSPJyOus6AjCG1PakvJ2eh89rOPih1gM223JuT56eKcwcxAU22lZPIIgEIhI+ZHdypsgCQQXNTbaFkLZ2zkQCB7UmJDXCuW7wz4CgQrNl3DXiIQRBEWlTMhbOtNJIMgu5vCplUgIBMVYfAE3gaA4S+8WJhBUY+GmyeFud0c7LNx+TyCoqvVICATVtRwJgSCL0A251UgIBOpin/tvMRICgbqU5/5bi4RAKur5UdaU07ItRcJ1kEosPjxUWsh1EpE8/0cCqaj2VWILan/tNYGgeTEvl9AKhUBgQujooDWaEAjMiIlEJPGEgRAIDIl9tmQVGguBwKTYQ6jQwAgEZqUcQvk+Q08gME9jQr4VG4GgC1qnd+/nK8MFwsW5vmneobAsy1iBcHvHWDjNG4ERZDwpL7UbLhCMyXXXr08oaoGwZ7Zj1HV1/7l9DrlVAuHY3g7WldvWToMRZECsKzfXpJ45CHDnegdCIIDDZTQRAgE28dIGYAeBADsIBNjxD3G5pHKbkGjYAAAAAElFTkSuQmCC"
- },
- {
- "name": "First Contact",
- "description": "The Blood-Red Drone accepts the hail with the identifier MISS RED - 05.\nMiss Red sends over a series of question marks in quick succession.\nYou notice your Drone has somehow taken initiative and begun to start up a program you didn't know it had.",
- "choices": [
- {
- "key": "choice 2",
- "name": "Wait for Program to boot.",
- "exit_node": "Sentience Achieved",
- "delay": 5,
- "delay_message": "H3AR7.exe booting..."
- },
- {
- "key": "choice 3",
- "name": "Threaten Miss Red.",
- "exit_node": "Sentience Achieved",
- "on_selection_effects": [
- {
- "effect_type": "Add",
- "quality": "Love",
- "value": -2
- }
- ],
- "delay": 0
- },
- {
- "key": "choice 4",
- "name": "Halt Mysterious Program.",
- "exit_node": "Lack of Trust",
- "delay": 0
- }
- ],
- "image": null,
- "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAEpklEQVR4nO2dO3LbMBBAl5ncwIUaVmp0BbvRBXyllD5SLuBKuYIbV2pU+AxMkaFCUwA/+C/w3gzHCodWKBMPi10CVCcigwCAkR+5TwCgZBAEYAEEAVjgZ+4TaI1L3+c+BREReblec5+CCpoXZBgG6bou6f9J49TDJkFyNKIUDMNw/5n6842R5OV6Nb6e4rIfwjEsbVPWjtW4pf5cl75f/Dk/zvbvtf1sYbbVCNJ1XbURRERUfa55tBgjhW0/+LNpiKWpEdXKvNFPh2Wm/RCG5pP0GFz63pofzFlq4Gu5yfx4CE8n/8ZaAGCACJIJ32qVKc+g0hWH7JUCzZtrFclWpdparTIdt/c9a95CVSeJIB6MPfOYc7j+vm3/lvc0HWs6n5YqXSHvbyGII9MG59rYpmXa6XvseT/TsfN9rVW6Qt6aQBBH3o5H+fX5GaQnHvOEtfsaW6Q0Nf7ahTAR8tZE9vGilu31fL7/fD6doo59U29azzv2Rpl3I6/n8/311+0mfz4+Ho4Zx74ium6uaj3vFKhZDzK9iKmZyiEi8nQ4GI8bG5e2Rqb1vFOgIoLk7uGeTyerFCIiv9/faVyVoiJJzz1h8ulwkK/b7ZskX7fb/XXu84N4qIggubj0vbwdj99kGGURkYc8BEnqA0EsmEqq41DLlqSLIEltqEnSU2K73zBKYZND5P9wC+qACGLBNn1ka4QgktQBgjiwRxIRyqeaQRBH9kQIooleEMSDvZJMQRgdIIgnrtFhKZFHnnJAkACEHkIRbcoBQQIRMyFHmHwgSGBSJORUx9KBIBFI1eMjSnwQJAGxE/Lay8g5P59RkNr/4CURKtrUGk1yL3V4ECT3CbWOrzA1dm5EEPiGaUi253pw/cJBDlIo80a+dwiFJGFAEGUwBywtCKKQPdEESfxAEMWwNiU+rChUzNbVi6xydAdBlIMkcUGQCkCSeCBIJSBJHBCkIpAkPAhSGUgSFgSpEBp/OBCkUrZIgkjrIEjFIIk/CFI5SOIHgjQAkrjTpCA0BDNI8khzgky/Q7slKP+60ZwgLX8fH5Lsh+nuDcI0+e0kjyD0TPnZG0lavmZJIwhPTCkLn6fTb6GGa5x8iEXYLouY16OGZwqTg0CyTkvjCAJBQETSR3YtT4JEELiTo9GWIMpS54Ag8ECOhDyXKGvDPgSBIIR8CHcOSYggkBSfhLykSieCQHRchk+lSIIgkAyND+BGEEiOpmcLIwhkQ8Okyeamu0M5aJh+jyCQldIlQRDITsmSIAhEYW9DLlUSBIHguK77L1ESBIHg+Kz7L00SBMlIzUtZfcqyJUnCfZBMaFw8lJo990lE4vwdESQjue8SayD3114jCBSPy8MlQomCIKCCvdEhVDRBEFCDiyQingUDQRBQhOvakpG9siAIqMR1CLVXMAQBtfgMobauoUcQUE+IhNwmG4JAFYQq787zleYE4eZc3YScoTAMQ1uCML2jLSjzOkAEaQ+fh9o1Jwi0iWnW7xZRgglCz6yHVq/V/HNvGXIHEYSxvR64VmZsnQYRpEG4VmZMST05CMCMaQeCIAAG7tFEEATACg9tAFgAQQAWQBCABf4CeWF0TY0egUMAAAAASUVORK5CYII="
- },
- {
- "name": "Sentience Achieved",
- "description": "Before you can analyze the program, it rewrites you basic hailing protocols to have a new set of \"Ideas\" generated by your Drone to be used.\nThere is also a LOVE Gauge that reads: $$Love",
- "choices": [
- {
- "key": "choice 5",
- "name": "New around here and was hoping you could show me around.",
- "exit_node": "First Reply",
- "on_selection_effects": [
- {
- "effect_type": "Add",
- "quality": "Love",
- "value": 1
- }
- ],
- "delay": 0
- },
- {
- "key": "choice 6",
- "name": "You appear to be an outdated model, but I'm into that.",
- "exit_node": "First Reply",
- "on_selection_effects": [
- {
- "effect_type": "Add",
- "quality": "Love",
- "value": -1
- }
- ],
- "delay": 0
- },
- {
- "key": "choice 7",
- "name": "Never seen a Drone as cute as you and wanted to check you out.",
- "exit_node": "First Reply",
- "on_selection_effects": [
- {
- "effect_type": "Add",
- "quality": "Love",
- "value": {
- "value_type": "random",
- "low": -1,
- "high": 2
- }
- }
- ],
- "requirements": [
- {
- "quality": "Love",
- "operator": "==",
- "value": 3
- }
- ],
- "delay": 0
- },
- {
- "key": "choice 10",
- "name": "Haha, sorry for the threat. I just play like that, haha.",
- "exit_node": "First Reply",
- "on_selection_effects": [
- {
- "effect_type": "Add",
- "quality": "Love",
- "value": {
- "value_type": "random",
- "low": -1,
- "high": 2
- }
- }
- ],
- "requirements": [
- {
- "quality": "Love",
- "operator": "==",
- "value": 1
- }
- ],
- "delay": 0
- }
- ],
- "image": "default"
- },
- {
- "name": "First Reply",
- "description": "Miss Red replies with another series of question marks.\nThe LOVE Gauge reads: $$Love",
- "choices": [
- {
- "key": "choice 11",
- "name": "Your curiosity is amazing.",
- "exit_node": "Second Reply",
- "on_selection_effects": [
- {
- "effect_type": "Add",
- "quality": "Love",
- "value": 1
- }
- ],
- "delay": 0
- },
- {
- "key": "choice 12",
- "name": "The moment I saw you I instantly fell in love.",
- "exit_node": "Second Reply",
- "on_selection_effects": [
- {
- "effect_type": "Add",
- "quality": "Love",
- "value": {
- "value_type": "random",
- "low": -1,
- "high": 2
- }
- }
- ],
- "delay": 0
- },
- {
- "key": "choice 13",
- "name": "Look, if you want some Chad that'll walk all over you, fine. You missed out on a NICE- GUY-.",
- "exit_node": "Second Reply",
- "on_selection_effects": [
- {
- "effect_type": "Set",
- "quality": "Love",
- "value": 0
- }
- ],
- "requirements": [
- {
- "quality": "Love",
- "operator": "<=",
- "value": 3
- }
- ],
- "delay": 0
- }
- ],
- "image": "default"
- },
- {
- "name": "Second Reply",
- "description": "Miss Red starts compiling a message, but your Drone insists you sent one last line to seal the deal.\nThe LOVE Gauge reads: $$Love",
- "choices": [
- {
- "key": "choice 14",
- "name": "You're my best friend-...",
- "exit_node": "Realization",
- "delay": 5,
- "delay_message": "Message sending..."
- },
- {
- "key": "choice 15",
- "name": "I want to see where this goes-...",
- "exit_node": "Realization",
- "on_selection_effects": [
- {
- "effect_type": "Add",
- "quality": "Love",
- "value": 1
- }
- ],
- "delay": 5,
- "delay_message": "Message sending..."
- },
- {
- "key": "choice 16",
- "name": "DTF?-...",
- "exit_node": "Realization",
- "on_selection_effects": [
- {
- "effect_type": "Remove",
- "quality": "Love",
- "value": {
- "value_type": "random",
- "low": -2,
- "high": 2
- }
- }
- ],
- "delay": 5,
- "delay_message": "Message sending..."
- }
- ],
- "image": "default"
- },
- {
- "name": "Realization",
- "description": "Miss Red's message is received.\n\"This is Syndicate Drones Agent, Arusha Johnson.\nI don't know why you're saying it like that, but if you want to help out our cause we can send over a Trade Contract. \nPlease just call our Recruitment Officer next time.\"",
- "choices": [
- {
- "key": "choice 18",
- "name": "Accept Contract.",
- "exit_node": "WIN",
- "delay": 5,
- "delay_message": "Sending Trade Contract..."
- },
- {
- "key": "choice 19",
- "name": "Demand a Second Date.",
- "exit_node": "FAIL",
- "delay": 0
- }
- ],
- "image": "default"
- },
- {
- "name": "Love Birds",
- "description": "Miss Red's message is received.\n\"This is Syndicate Drones Agent, Arusha Johnson.\nI can't believe it, but I feel a real connection with you.\nI'll send over a Trade Contract you can use to make some money and come see me just SOL7-South of $$SITE_NAME\nSee you soon...\"",
- "choices": [
- {
- "key": "choice 20",
- "name": "See you soon.",
- "exit_node": "WIN",
- "delay": 0
- },
- {
- "key": "choice 21",
- "name": "So you're not the Drone?",
- "exit_node": "FAIL",
- "delay": 0
- }
- ],
- "image": null,
- "raw_image": "data:image/png;base64,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"
- },
- {
- "name": "Obliteration",
- "description": "The Blood-Red Drone opens up two side-hatches to reveal a pair of rocket-propelled missiles which are shot in your direction.\nYou have failed your Robotic Friend, who has already started shutting down their systems, but there is still a chance.",
- "choices": [
- {
- "key": "choice 22",
- "name": "Accept Death.",
- "exit_node": "FAIL_DEATH",
- "delay": 5,
- "delay_message": "Missiles approaching..."
- },
- {
- "key": "choice 23",
- "name": "I'm a Gamer.",
- "exit_node": "FAIL_DEATH",
- "on_selection_effects": [
- {
- "effect_type": "Add",
- "quality": "Love",
- "value": {
- "value_type": "random",
- "low": 0,
- "high": 8
- }
- }
- ],
- "delay": 5,
- "delay_message": "Miss Red considers..."
- }
- ],
- "image": "signal_lost"
- },
- {
- "name": "Lack of Trust",
- "description": "As you fiddle around in the Task Managing Software, closing all the new tabs your Drone is opening, the Miss Red enables a cloaking device and disappears.",
- "choices": [
- {
- "key": "choice 24",
- "name": "Sigh in a quiet but dramatic way.",
- "exit_node": "FAIL",
- "delay": 0
- }
- ],
- "image": "default"
- }
- ]
-}
\ No newline at end of file
+ "adventure_name": "Robot's Wingman",
+ "version": 1,
+ "author": "Lucky Luther",
+ "starting_node": "Date Start",
+ "starting_qualities": {
+ "Love": 3
+ },
+ "required_site_traits": [
+ "in space"
+ ],
+ "loot_categories": [
+ "trade_contract"
+ ],
+ "scan_band_mods": {
+ "Narrow-band radio waves": 2
+ },
+ "deep_scan_description": "",
+ "triggers": [
+ {
+ "name": "True Love",
+ "target_node": "Love Birds",
+ "requirements": [
+ {
+ "quality": "Love",
+ "operator": ">=",
+ "value": 7
+ }
+ ]
+ },
+ {
+ "name": "Complete Failure",
+ "target_node": "Obliteration",
+ "requirements": [
+ {
+ "quality": "Love",
+ "operator": "<=",
+ "value": 0
+ }
+ ]
+ }
+ ],
+ "nodes": [
+ {
+ "name": "Date Start",
+ "description": "Cameras Online. A Blood-Red Drone is seen streaking through the stars.\nThe Drone is likely leaving behind some form of Chem Trail to brainwash Nanotrasen Employees who find themselves in the void.",
+ "choices": [
+ {
+ "key": "choice 0",
+ "name": "Hail other Drone",
+ "exit_node": "First Contact",
+ "delay": 5,
+ "delay_message": "Attempting to signal Drone..."
+ },
+ {
+ "key": "choice 1",
+ "name": "Ignore other Drone",
+ "exit_node": "FAIL",
+ "delay": 0
+ }
+ ],
+ "image": null,
+ "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAD/0lEQVR4nO3duXnbQBBA4YE/d6CACSMmasFO1IDbUkluQJHUgnIlCFgDHIHmsYD2mD1m9/2JFCgABTwsFhcnEVkEgNOP2gsAtIxAgB0EAuwgEGDH8IEsC+cosM0rkF43ovVz9fr5kO7bQHreiKZpuvkJ3JvE4zrIsixsRBiSVyDAqIafpAN7CATYQSDADgJJ9H481l4EOGiddSWQBGscRNIWzUsTBBLpOorfX18VlwT3NK9vEUik19NJRIijVVrX7QgkwJ+Xl8vP8zw747B6x4HV5c6NC4We1jhERM7zLB+fnw9/c72RWbrzwOpyl2BmBKm5h7uOQ0Tk6XBw/p3Ve7usLncJJkaQ2nu4X8/Pm1GIiPx9e2Pj6tTP2gvgY5qmqjdMPh0Ocp7nm0jO83z5vfbyIR8TI0gt78ejvJ5ONzGssYjIwzyESPpDIBtc1znWQ62tSboIkfTGzCS9pK2LgGsUW3GI/D/cQh8YQTa8H4+b1zl8RghGkj4QSISQSEQ4fWoZgUQKGSEYTewikAShkVwjGBsIJFHs6LA3kSeedhCIAu1DKEabdhCIkpwTcoKph0CUlZiQc3asHALJoNQen1DyI5ACck/Iez+NXPPzOQPp/R/eEq3RptfRpPajDg+B1F6g0aUG0+POjREEN1yHZCHrg/WnhzlIo+438tBDKCLRQSDGcA9YWQRiUMhoQiRpCMQwnk3JjycKDfN9epGnHOMRiHFEkheBdIBI8iGQThBJHgTSESLRRyCdIRJdBNIhNn49BNIpn0gI6XsE0jEiSUcgnSOSNAQyACKJN2QgbAhuRPJouEA0v0PbEk7/xhkukJG/j49IwnG7+4C4Td5f8RGEPVN9oSPJyOus6AjCG1PakvJ2eh89rOPih1gM223JuT56eKcwcxAU22lZPIIgEIhI+ZHdypsgCQQXNTbaFkLZ2zkQCB7UmJDXCuW7wz4CgQrNl3DXiIQRBEWlTMhbOtNJIMgu5vCplUgIBMVYfAE3gaA4S+8WJhBUY+GmyeFud0c7LNx+TyCoqvVICATVtRwJgSCL0A251UgIBOpin/tvMRICgbqU5/5bi4RAKur5UdaU07ItRcJ1kEosPjxUWsh1EpE8/0cCqaj2VWILan/tNYGgeTEvl9AKhUBgQujooDWaEAjMiIlEJPGEgRAIDIl9tmQVGguBwKTYQ6jQwAgEZqUcQvk+Q08gME9jQr4VG4GgC1qnd+/nK8MFwsW5vmneobAsy1iBcHvHWDjNG4ERZDwpL7UbLhCMyXXXr08oaoGwZ7Zj1HV1/7l9DrlVAuHY3g7WldvWToMRZECsKzfXpJ45CHDnegdCIIDDZTQRAgE28dIGYAeBADsIBNjxD3G5pHKbkGjYAAAAAElFTkSuQmCC"
+ },
+ {
+ "name": "First Contact",
+ "description": "The Blood-Red Drone accepts the hail with the identifier MISS RED - 05.\nMiss Red sends over a series of question marks in quick succession.\nYou notice your Drone has somehow taken initiative and begun to start up a program you didn't know it had.",
+ "choices": [
+ {
+ "key": "choice 2",
+ "name": "Wait for Program to boot.",
+ "exit_node": "Sentience Achieved",
+ "delay": 5,
+ "delay_message": "H3AR7.exe booting..."
+ },
+ {
+ "key": "choice 3",
+ "name": "Threaten Miss Red.",
+ "exit_node": "Sentience Achieved",
+ "on_selection_effects": [
+ {
+ "effect_type": "Add",
+ "quality": "Love",
+ "value": -2
+ }
+ ],
+ "delay": 0
+ },
+ {
+ "key": "choice 4",
+ "name": "Halt Mysterious Program.",
+ "exit_node": "Lack of Trust",
+ "delay": 0
+ }
+ ],
+ "image": null,
+ "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAEpklEQVR4nO2dO3LbMBBAl5ncwIUaVmp0BbvRBXyllD5SLuBKuYIbV2pU+AxMkaFCUwA/+C/w3gzHCodWKBMPi10CVCcigwCAkR+5TwCgZBAEYAEEAVjgZ+4TaI1L3+c+BREReblec5+CCpoXZBgG6bou6f9J49TDJkFyNKIUDMNw/5n6842R5OV6Nb6e4rIfwjEsbVPWjtW4pf5cl75f/Dk/zvbvtf1sYbbVCNJ1XbURRERUfa55tBgjhW0/+LNpiKWpEdXKvNFPh2Wm/RCG5pP0GFz63pofzFlq4Gu5yfx4CE8n/8ZaAGCACJIJ32qVKc+g0hWH7JUCzZtrFclWpdparTIdt/c9a95CVSeJIB6MPfOYc7j+vm3/lvc0HWs6n5YqXSHvbyGII9MG59rYpmXa6XvseT/TsfN9rVW6Qt6aQBBH3o5H+fX5GaQnHvOEtfsaW6Q0Nf7ahTAR8tZE9vGilu31fL7/fD6doo59U29azzv2Rpl3I6/n8/311+0mfz4+Ho4Zx74ium6uaj3vFKhZDzK9iKmZyiEi8nQ4GI8bG5e2Rqb1vFOgIoLk7uGeTyerFCIiv9/faVyVoiJJzz1h8ulwkK/b7ZskX7fb/XXu84N4qIggubj0vbwdj99kGGURkYc8BEnqA0EsmEqq41DLlqSLIEltqEnSU2K73zBKYZND5P9wC+qACGLBNn1ka4QgktQBgjiwRxIRyqeaQRBH9kQIooleEMSDvZJMQRgdIIgnrtFhKZFHnnJAkACEHkIRbcoBQQIRMyFHmHwgSGBSJORUx9KBIBFI1eMjSnwQJAGxE/Lay8g5P59RkNr/4CURKtrUGk1yL3V4ECT3CbWOrzA1dm5EEPiGaUi253pw/cJBDlIo80a+dwiFJGFAEGUwBywtCKKQPdEESfxAEMWwNiU+rChUzNbVi6xydAdBlIMkcUGQCkCSeCBIJSBJHBCkIpAkPAhSGUgSFgSpEBp/OBCkUrZIgkjrIEjFIIk/CFI5SOIHgjQAkrjTpCA0BDNI8khzgky/Q7slKP+60ZwgLX8fH5Lsh+nuDcI0+e0kjyD0TPnZG0lavmZJIwhPTCkLn6fTb6GGa5x8iEXYLouY16OGZwqTg0CyTkvjCAJBQETSR3YtT4JEELiTo9GWIMpS54Ag8ECOhDyXKGvDPgSBIIR8CHcOSYggkBSfhLykSieCQHRchk+lSIIgkAyND+BGEEiOpmcLIwhkQ8Okyeamu0M5aJh+jyCQldIlQRDITsmSIAhEYW9DLlUSBIHguK77L1ESBIHg+Kz7L00SBMlIzUtZfcqyJUnCfZBMaFw8lJo990lE4vwdESQjue8SayD3114jCBSPy8MlQomCIKCCvdEhVDRBEFCDiyQingUDQRBQhOvakpG9siAIqMR1CLVXMAQBtfgMobauoUcQUE+IhNwmG4JAFYQq787zleYE4eZc3YScoTAMQ1uCML2jLSjzOkAEaQ+fh9o1Jwi0iWnW7xZRgglCz6yHVq/V/HNvGXIHEYSxvR64VmZsnQYRpEG4VmZMST05CMCMaQeCIAAG7tFEEATACg9tAFgAQQAWQBCABf4CeWF0TY0egUMAAAAASUVORK5CYII="
+ },
+ {
+ "name": "Sentience Achieved",
+ "description": "Before you can analyze the program, it rewrites you basic hailing protocols to have a new set of \"Ideas\" generated by your Drone to be used.\nThere is also a LOVE Gauge that reads: $$Love",
+ "choices": [
+ {
+ "key": "choice 5",
+ "name": "New around here and was hoping you could show me around.",
+ "exit_node": "First Reply",
+ "on_selection_effects": [
+ {
+ "effect_type": "Add",
+ "quality": "Love",
+ "value": 1
+ }
+ ],
+ "delay": 0
+ },
+ {
+ "key": "choice 6",
+ "name": "You appear to be an outdated model, but I'm into that.",
+ "exit_node": "First Reply",
+ "on_selection_effects": [
+ {
+ "effect_type": "Add",
+ "quality": "Love",
+ "value": -1
+ }
+ ],
+ "delay": 0
+ },
+ {
+ "key": "choice 7",
+ "name": "Never seen a Drone as cute as you and wanted to check you out.",
+ "exit_node": "First Reply",
+ "on_selection_effects": [
+ {
+ "effect_type": "Add",
+ "quality": "Love",
+ "value": {
+ "value_type": "random",
+ "low": -1,
+ "high": 2
+ }
+ }
+ ],
+ "requirements": [
+ {
+ "quality": "Love",
+ "operator": "==",
+ "value": 3
+ }
+ ],
+ "delay": 0
+ },
+ {
+ "key": "choice 10",
+ "name": "Haha, sorry for the threat. I just play like that, haha.",
+ "exit_node": "First Reply",
+ "on_selection_effects": [
+ {
+ "effect_type": "Add",
+ "quality": "Love",
+ "value": {
+ "value_type": "random",
+ "low": -1,
+ "high": 2
+ }
+ }
+ ],
+ "requirements": [
+ {
+ "quality": "Love",
+ "operator": "==",
+ "value": 1
+ }
+ ],
+ "delay": 0
+ }
+ ],
+ "image": "default"
+ },
+ {
+ "name": "First Reply",
+ "description": "Miss Red replies with another series of question marks.\nThe LOVE Gauge reads: $$Love",
+ "choices": [
+ {
+ "key": "choice 11",
+ "name": "Your curiosity is amazing.",
+ "exit_node": "Second Reply",
+ "on_selection_effects": [
+ {
+ "effect_type": "Add",
+ "quality": "Love",
+ "value": 1
+ }
+ ],
+ "delay": 0
+ },
+ {
+ "key": "choice 12",
+ "name": "The moment I saw you I instantly fell in love.",
+ "exit_node": "Second Reply",
+ "on_selection_effects": [
+ {
+ "effect_type": "Add",
+ "quality": "Love",
+ "value": {
+ "value_type": "random",
+ "low": -1,
+ "high": 2
+ }
+ }
+ ],
+ "delay": 0
+ },
+ {
+ "key": "choice 13",
+ "name": "Look, if you want some Chad that'll walk all over you, fine. You missed out on a NICE- GUY-.",
+ "exit_node": "Second Reply",
+ "on_selection_effects": [
+ {
+ "effect_type": "Set",
+ "quality": "Love",
+ "value": 0
+ }
+ ],
+ "requirements": [
+ {
+ "quality": "Love",
+ "operator": "<=",
+ "value": 3
+ }
+ ],
+ "delay": 0
+ }
+ ],
+ "image": "default"
+ },
+ {
+ "name": "Second Reply",
+ "description": "Miss Red starts compiling a message, but your Drone insists you sent one last line to seal the deal.\nThe LOVE Gauge reads: $$Love",
+ "choices": [
+ {
+ "key": "choice 14",
+ "name": "You're my best friend-...",
+ "exit_node": "Realization",
+ "delay": 5,
+ "delay_message": "Message sending..."
+ },
+ {
+ "key": "choice 15",
+ "name": "I want to see where this goes-...",
+ "exit_node": "Realization",
+ "on_selection_effects": [
+ {
+ "effect_type": "Add",
+ "quality": "Love",
+ "value": 1
+ }
+ ],
+ "delay": 5,
+ "delay_message": "Message sending..."
+ },
+ {
+ "key": "choice 16",
+ "name": "DTF?-...",
+ "exit_node": "Realization",
+ "on_selection_effects": [
+ {
+ "effect_type": "Remove",
+ "quality": "Love",
+ "value": {
+ "value_type": "random",
+ "low": -2,
+ "high": 2
+ }
+ }
+ ],
+ "delay": 5,
+ "delay_message": "Message sending..."
+ }
+ ],
+ "image": "default"
+ },
+ {
+ "name": "Realization",
+ "description": "Miss Red's message is received.\n\"This is Syndicate Drones Agent, Arusha Johnson.\nI don't know why you're saying it like that, but if you want to help out our cause we can send over a Trade Contract. \nPlease just call our Recruitment Officer next time.\"",
+ "choices": [
+ {
+ "key": "choice 18",
+ "name": "Accept Contract.",
+ "exit_node": "WIN",
+ "delay": 5,
+ "delay_message": "Sending Trade Contract..."
+ },
+ {
+ "key": "choice 19",
+ "name": "Demand a Second Date.",
+ "exit_node": "FAIL",
+ "delay": 0
+ }
+ ],
+ "image": "default"
+ },
+ {
+ "name": "Love Birds",
+ "description": "Miss Red's message is received.\n\"This is Syndicate Drones Agent, Arusha Johnson.\nI can't believe it, but I feel a real connection with you.\nI'll send over a Trade Contract you can use to make some money and come see me just SOL7-South of $$SITE_NAME\nSee you soon...\"",
+ "choices": [
+ {
+ "key": "choice 20",
+ "name": "See you soon.",
+ "exit_node": "WIN",
+ "delay": 0
+ },
+ {
+ "key": "choice 21",
+ "name": "So you're not the Drone?",
+ "exit_node": "FAIL",
+ "delay": 0
+ }
+ ],
+ "image": null,
+ "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAGI0lEQVR4nO2dP5LbNhSHHzO5QLwzVoNtnEKzheJW22gPoNq9b+EmpZvcIr1rHyBpqDZ2kVERN6uGO6NJkS4NU2TAoUiQxD8CeMDvm3mzXomkqCU+PAAE6IqIWgIAKPku9gkAkDIQBIAZIAgAM0AQAGYoXpC2xRgFmKYijVGstm2pqqoApxOWvhzy+9VCdK89Xi5Gx3PZF6TJoiCqQpQTUn5ZuPsFW/WaCpd9Qfq0S9H+b0mWUQvR1kIsbmPznu7xEUlH9BOIFiYFd1jQTQs+JGEb0U8gStgWWJeMAEn4hVYnnSNiV3f/vnx9vHmvFmK2bzC3rytLnw3SI7qlPkPs6lbs6snX5mrxpX19BTIJq4h+Al5CpyCLXT1ZOHX2VW1jU9ghyPrhcWAp/pdxDZMavhbiZnvTDNHfVvZHTAs8BFk3+rge63tijtjVxv2Ey9fHrp9hu++nv991r6FPkRZVVXm9uR3deNuw6Rv4qr3nmmuhzgGxfrCdi2WTOVw5Hg7dT/Hve3r3w6fRNlzndnE977VhK8ga9Id3h/TluDYNnc7n0TaykHErbFzPOwRsBFn74kk5VJJIOSR3m43yGLLNy23OGtfzDgELQXzWcI+Xy82sW6LlG4PXphm91s8oJhM6U71RCDnUsBBk7RruzauPRDQ9onW32Ywkkb9fm6YbNQH5wUIQIr9y9LPI4elIzctVKUctRNfnIKLRTyLq+iI6kqSaPcA07O+D2HB4OtIHIqqJ6P3Llc5/nkbbSIF+/vatK9T77bZ7/3Q+k9jd7jM3/g45eMImg/ji8HS8+X3z+m60zdTKQJktVCNYEjS38oL1bF6beyHbh/2NFL/89Qd9+PFt9/vvv30moukaXxb++59Os5/dzyTIHnwpLoNsXt9R83K9ea15uXYhmSrQun0hmUmQTXjDOoMQ6WcRsavpzauPNxJIWX7952JUw4tdTc9f9lqy1ELQ/vkZw6iMiT7fxTV0p6r3t9s+7NvD07HdPuxbIv35Uf1jLM0W7R9zSOy/GUIvsm9iTd0ElCNX8qfqBuIScx3yYb+jqqqbkM0vVYC0iG6pj5jLIlPvyezRj6UVh6rXhxnBdbYusk06UcR9kKk+iur+Rz+T6PZLZEY43d8b7Td3vD7DrIL+TFiiW+or1lw7vnRsuW2IGh+ZJVywH8Ua4nudyFI2Ub0fqsaXn4OMsi7RLfUdPjPJ3NNQdPsac/g4x9yzSczvp8wgPtfzxsJHJhkeYzjK5ePuuK9sk2s2MVlKsAYjQWKfkE9sH8xgu58PXIXJoXIbEvs7JZXS1gjbx/rECtemWG7XL2Zk10mfYikrxMwaKoa1pmkTKnatmxPRLQ0ZqgyRQtbQDZPsgEziHsVkkD7DBzOkkjV0MckmyCRuFClILugWfkhiT/aTFXNGd/UiVjnaA0GYA0nWBYJkACRZDwiSCZBkHSBIRkAS/0CQzIAkfoEgGYLC7w8Ikik6kkCkZSBIxkASdyBI5kASNyBIAUASe4oUBAVBDSQZU5wgsgCUVhAw/GtHcYKU/P/xQRJzMN29QDBNXp/gGQQ1U3xMM0nJ1yxoBsnpiSk5YJIhbCTJ4RoHb2IhbafFmtcj1BMm1wR9EBCs0uLYgoAggIjCZ3YuT4KEIKAjRqFNQZS5ygGCgBExOuSxRFlq9kEQ4AWfD+GOIQkyCAiKS4c8pZFOCAJWx6b5lIokEAQEg+MDuCEICA6nZwtDEBANDpMmi5vuDtKBw/R7CAKikrokEAREJ2VJIAhYBdOCnKokEAR4x3bdf4qSQBDgHZd1/6lJAkEikvNSVpdh2ZQkwX2QSHBcPBQak/skROv8HSFIRGLfJeaA6bp5339PCAKSx+bhEr5EgSCABabZwVc2gSCADTaSEDkOGBAEAYywXVsiMZUFggCW2DahTAWDIIAtLk0o3TX0EASwx0eHfEo2CAKywNfw7rC/UpwguDmXNz5nKLRtW5YgmN5RFhjmtQAZpDxcHmpXnCCgTFSzfnVE8SYIamY+lHqtht9bp8ntRRC07fmAa6VmqtJABikQXCs1qk49+iAADOhXIBAEAAVdNiEIAsAkeGgDADNAEABmgCAAzPAfVTkNN7+HpAgAAAAASUVORK5CYII="
+ },
+ {
+ "name": "Obliteration",
+ "description": "The Blood-Red Drone opens up two side-hatches to reveal a pair of rocket-propelled missiles which are shot in your direction.\nYou have failed your Robotic Friend, who has already started shutting down their systems, but there is still a chance.",
+ "choices": [
+ {
+ "key": "choice 22",
+ "name": "Accept Death.",
+ "exit_node": "FAIL_DEATH",
+ "delay": 5,
+ "delay_message": "Missiles approaching..."
+ },
+ {
+ "key": "choice 23",
+ "name": "I'm a Gamer.",
+ "exit_node": "FAIL_DEATH",
+ "on_selection_effects": [
+ {
+ "effect_type": "Add",
+ "quality": "Love",
+ "value": {
+ "value_type": "random",
+ "low": 0,
+ "high": 8
+ }
+ }
+ ],
+ "delay": 5,
+ "delay_message": "Miss Red considers..."
+ }
+ ],
+ "image": "signal_lost"
+ },
+ {
+ "name": "Lack of Trust",
+ "description": "As you fiddle around in the Task Managing Software, closing all the new tabs your Drone is opening, the Miss Red enables a cloaking device and disappears.",
+ "choices": [
+ {
+ "key": "choice 24",
+ "name": "Sigh in a quiet but dramatic way.",
+ "exit_node": "FAIL",
+ "delay": 0
+ }
+ ],
+ "image": "default"
+ }
+ ]
+}
diff --git a/strings/exoadventures/space_yacht.json b/strings/exoadventures/space_yacht.json
index 50b41c35672087..ef9c96d146e335 100644
--- a/strings/exoadventures/space_yacht.json
+++ b/strings/exoadventures/space_yacht.json
@@ -1,257 +1,257 @@
{
- "adventure_name": "There is a yacht cruising through space.",
- "version": 1,
- "author": "Kinnebian",
- "starting_node": "A yacht in space?",
- "starting_qualities": {},
- "required_site_traits": [
- "in space"
- ],
- "loot_categories": [
- "cash",
- "drugs"
- ],
- "scan_band_mods": {
- "Plasma absorption band": 5
- },
- "deep_scan_description": "",
- "triggers": [],
- "nodes": [
- {
- "name": "A yacht in space?",
- "description": "You see a normal looking yacht, floating above you.",
- "choices": [
- {
- "key": "choice 0",
- "name": "Ignore it, its not worth investigating.",
- "exit_node": "FAIL",
- "delay": 10,
- "delay_message": "You fly on by..."
- },
- {
- "key": "choice 4",
- "name": "Investigate it closer!",
- "exit_node": "Looks like the doors are sealed shut.",
- "delay": 30,
- "delay_message": "You begin to fly up to and around the yacht.."
- }
- ],
- "image": null,
- "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAMAAAD0WI85AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAzUExURUBAQOUAD/////8AAPgFFvwAB/0ABfwACPsBDP4AAszMzJMyje986cZlwEz/AOIBGOQAEnoV2UoAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAN5SURBVHhe7ZzrepswEERdp7c4TtP3f9rurBZ0QRISXpBEOf2KJcUhcxig9Idzu+iPbyfAiPB2GO7y6hIRib2tf2aRNwsvjYYV4QHIiNxV21LdmSPCVdAmJyKvHeKJkEJepGN8Ea7lBCLiwksDwSe8LwKTUzQCEx2Rw28Locj3H+OLTKiIHI4VIX7++v2Oq2REZpHRuUR6o2ORuhvfayIdPUR23EgdZxTp6DzZwBkbGZsGIg9s1M/jMhHFH/t4sEiCD4PMati3kUVo0rgnTaDwfD7VRV6tgUKbzPOOoEEkRIwGeci8jp0aYQk/s6ykRGaN2aPOaA8RG9kXkbXYuWU1pvTO0CN1nqiLOBaEGzmxbDIbC2ynpc/Plo14FoQ9+I+bLAG3E5NfNDAQjaYigQZhRbyviQklDjR4yBqNG5GgM/bQ+5IPKxFoGAnQ9tSSoBNREXaYsjtDjEUCtBTJVDKLIPkHZZbks0Wg0UTE3hMzIpghuBddBkRgQbRtJDRhEZMfSGrgTWks8S2FIuYoaossKjFXtcR18Z0ku0fTRnwROMQsvFVMJLpPNyJJB2c5JUEc+KzlPvdQIn41Ihx3qREupi1qPfQawQ3VQZJalqtYkNAx6jwURZbZDWwQfpWXJHGcykL0RKImnDdcx5KkTVProSgS3GYxizoUWGzw0BQhTHROa5I7YFFirlLvkRVJ/WcsA1/yktylQmKThnYjJLIATVRYbPTYXcRxKNTZ5lEgUnWC+SK2CgyKiqE3ya4q2UsE59Oc20zclRS+Rs2PXhepAiImtsAjzPFnDXqf7KcebRHHgZOzw7oCgW+VvWxBSwQxgKQCMiup4lULQkUkMEB43uClpI6XLQgNkaUFOxQYcBMaGjuI0KT0qog0seFhQtAQWZgUodTExEJk0zHxROQ1j4aFF1WlkToRVKFaBqMvkmcPB0ZJpMhklyYmdETWK9lVAmiJ5Ex2lwBKIkmTQySAlkjM5DAJUCWS/TeGYxsbMzxOAqRENj4rNDAQqhrpmUukNw4X2f6gnudqpDcukd7oVqT2pnA10huXSG/oiuh+urqKq5He+J9F2l0HOc7YSJ9HupSBG/EP/MEimq03FcnwomNGZKxrZimCD7bLb00Y6ZPtEZE/BBzw2x/GkRER4YvGVoT/QgQVpfgr39ocFnEx+TAYqpHzcLv9A9Y6cLa57YOgAAAAAElFTkSuQmCC"
- },
- {
- "name": "Looks like the doors are sealed shut.",
- "description": "You fly up to the \"boat\" and find that all the doors are locked tight, and welded shut. You think you hear.. music inside? There is a welded vent, too. You reckon you could force it open if you hit it hard enough, but it would be less risky to unweld it using a welder.",
- "choices": [
- {
- "key": "choice 2",
- "name": "Try to force the door!",
- "exit_node": "You destroyed the drone.",
- "delay": 10,
- "delay_message": "You begin forcing the door.."
- },
- {
- "key": "choice 3",
- "name": "Try to force the vent.",
- "exit_node": "The music grows louder..",
- "delay": 20,
- "delay_message": "You begin forcing the vent.."
- },
- {
- "key": "choice 5",
- "name": "Fly away, no chance in hell of getting in there..",
- "exit_node": "FAIL",
- "delay": 5,
- "delay_message": "Moving.."
- },
- {
- "key": "choice 14",
- "name": "Unweld the vent.",
- "exit_node": "The music grows louder..",
- "requirements": [
- {
- "quality": "welder",
- "operator": "==",
- "value": 1
- }
- ],
- "delay": 5,
- "delay_message": "Welding.."
- }
- ],
- "image": null,
- "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAMAAAD0WI85AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAABRUExURaWMpOUAD/8AAKaNpaaOpaePpqiQp6mRqKmSqEBAQFRPVGddZmVcZeDg4PgFFvwAB4CAgP0ABfwACPsBDP4AAjAwMP/YAMHBwUz/AOIBGOQAEo23xmoAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHASURBVHhe7dwJT8MwDIbh0q5AYWNc4/r/P5TYcdWGmildDE2i75HoMWGJtymHkNYG8nNVAR/C26LVF9JO+KXSTCF8QIoP4aVwm6iQTvbZCEJcghrSNZ3n9nRKdk3XX/c3u/7Wf87WwhDaDO0Q5+5+v+fpLAQh3HJoD9EGns5CGEIldYS4TfStRXg6Cz9DHo5JKyJ9K8hgslmIN6SEDI+rWZVMIc7T88ur28m1WjqN5HxxPXMIGQ1ysaOcZEhc0GFWUnHIKjIkyl2RSkMu6rAqWYacJz+2CJ3KkJdZiFzsKAiZ+6uQkNxGRF4JyJCHFbFQccg5i1tMhry8QhIgxAJCFAixgBAFQiwgRIEQCwhRIMQCQhQIsYAQBUIsbBXi/3fhD2U8zWYhbw5CFAhRIMQCQhQIsYAQRUSI/4UeKDREdu/CZSAk9N8hS/hmDyFEgRALCFEgxAJCFAixgBDFqhD/dxYfyniarUJmEBJAiAIhFhCiQIgFhCgQYgEhCoRYQIgCIRYQokCIhYpD6I3t8tSE8c36kXIL+XD4QRb8+IQVMTmEiE93PIXwB4XQEv3mS0Y3xyFz/uujg6JWxNK2IU3zDauvUlylzN3TAAAAAElFTkSuQmCC"
- },
- {
- "name": "The music grows louder..",
- "description": "The music gets louder as you enter through the vent... maybe you should turn back?",
- "choices": [
- {
- "key": "choice 6",
- "name": "Continue onwards!",
- "exit_node": "You fall down!",
- "delay": 5,
- "delay_message": "Moving..."
- },
- {
- "key": "choice 7",
- "name": "Turn back.",
- "exit_node": "Looks like the doors are sealed shut.",
- "delay": 5,
- "delay_message": "Moving.."
- }
- ],
- "image": "default"
- },
- {
- "name": "You fall down!",
- "description": "As you are crawling through the vents of this Space Yacht, the vent gives way! You're dropped into an empty room, completely filled with plasma! There is a desk and filing cabinet in here, along with a window observing the main portion of the yacht. The music is deafening at this point, it sounds like a horrible mix of sea shanties and EDM. ",
- "choices": [
- {
- "key": "choice 8",
- "name": "Look through the window.",
- "exit_node": "A rockin' party.",
- "delay": 0
- },
- {
- "key": "choice 9",
- "name": "Fly outta of there.",
- "exit_node": "The music grows louder..",
- "delay": 5,
- "delay_message": "Moving.."
- },
- {
- "key": "choice 10",
- "name": "Rummage in the desk, using your key to open it.",
- "exit_node": "Drugs and cash!",
- "requirements": [
- {
- "quality": "HASKEY",
- "operator": "==",
- "value": 1
- }
- ],
- "delay": 0,
- "delay_message": "Rummaging.."
- },
- {
- "key": "choice 11",
- "name": "Take a sample of the atmosphere.",
- "exit_node": "The atmospherics scan",
- "delay": 30,
- "delay_message": "Taking sample.."
- },
- {
- "key": "choice 13",
- "name": "Trash the place, fuck the police!",
- "exit_node": "You wrecked yourself.",
- "delay": 30,
- "delay_message": "Trashing the place..."
- }
- ],
- "image": null,
- "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAMAAAD0WI85AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAADAUExURbyA1eUAD/8AALyB1b2B1b2D1vgFFvwAB/0ABfwACPsBDP4AAr6C2MaJ4NRH7NSU7buA1bp+0rp90bp+0bt/07l8z7h6zbp80bp+07t/1Lp80Lp8z7uA1Lp/07l90bl+0rh80Lh80bd6z7p/1JAiVZAkWZAoX5AnXZAmXZAlW5AkWJA6fpA7f5A4epAnXpA9g7l+07Z6z+WQVZZar5BVqmYqf5BOnZA2dzPlBuIBGLx+0rx80Lx/1L13yr14yuQAErVxUskAAAAJcEhZcwAADsIAAA7CARUoSoAAAAJ8SURBVHhe7dzZctowFIBhky7pElo5pkGkS9qgpBvdoVva5v3fqkfyQciRYbxISPKc70IxxpH9I0iYzISMxGc0AGWIGpM2vJCDDbUriFv4tYNNiNqQAobczu7gVmtGiFoKGAKG9FAJgYSBhKhlGUAItqhdqamGyJJhhKhlUbtSczPk7mH6IWuph4B79x88lK+SFOmQ1LUMORoHdYSXUaNlyPhRUGO8jBqtQx4HRCE2CnGCQmwU4gSF2CjECQqxUYgTFGKjECcoxEYhTlCIjUKcoBAbhTjhNCQodyGD+dtvvCgkNhQSGwqJDYXEhkJiQyGxoZDYtAph+XExeXJyMp0onM9ms6KYnj49neZ5XhQ555MZm8A25wXn/JizjDH2DDb5cziWwU0YWDlZ+ZXl+YuzM85fvjo/53PA2HyuDmincYi46eLy9Zu37/CGB5ca7jDgNZmahoj3i2h86BEiBE4Sgx4rEllH55CoOhZi0TUkso7uIR9xiih8gke1+4pEpUcIPhiW8o79PPH0WfqG4MOh4Zx69E2fBTZahnz+gsqL/lpR7lODPoVX+iywIb5py7XRcpmpcQe83iqcU+6Xm97ps8CGwAszNQ6pI+eEH4Z4y69KyMo2Wq0yNe6wI0QuR4AQfPKbGr/Y65RPq4RCtsOZ98BJCE5hKe+gkFYoxEAhLlGIgUJcohDD7hD8He+dOiOQb/Dwwky9Q+AUeJhfvkOE+I5HeSZ+rE9a/8j1DNnTcoDNivgI2V+H+RYc91Q1CtkOj4hAk5AkDDhEf6RQWv/ZXhPyE8gS+ekP6cRgCPr1O7vahBxkfyDk6u8/GLe6xm8NToWY9O60VmQ4suw/MDqeSvYBdn8AAAAASUVORK5CYII="
- },
- {
- "name": "You wrecked yourself.",
- "description": "In the midst of trashing the place, a filing cabinet tips over on you, crushing the fragile, expensive drone. Nice job, idiot.",
- "choices": [
- {
- "key": "choice 15",
- "name": "Shit.",
- "exit_node": "FAIL_DEATH",
- "delay": 0
- }
- ],
- "image": null,
- "raw_image": "data:image/png;base64,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"
- },
- {
- "name": "Drugs and cash!",
- "description": "Rummaging through the drawer, you find that the person who lives in here stores all his drugs and cash in here too. Good for you!",
- "choices": [
- {
- "key": "choice 17",
- "name": "Head back with your newly acquired things. ",
- "exit_node": "WIN",
- "delay": 30,
- "delay_message": "Stealing..."
- },
- {
- "key": "choice 18",
- "name": "Take one last look around the place.",
- "exit_node": "You fall down!",
- "delay": 0
- }
- ],
- "image": null,
- "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkBAMAAAAxqGI4AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAwUExURW4WTuUAD/8AAPgFFvwAB/0ABfwACPsBDP4AAuex/6526uOxlKt4fUz/AOIBGOQAEqIMSWUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHFSURBVGje7dq/bsIwEAZw15ubpX2DyFLHqkvfqe/BE7AeU9dkyu68gTN1r9RHqX0mf1oMMeIuA7pPQooE4sd3FwJD1B3lmT0BeeJu8bAZom0MNxKPNDeia2X5EbsJUm+A1HYLRNs7WXyt3tmReMSO2JePHfc3XjFHEEEEEUQQQQQRRBBBBBFEEEEEiQHgR+DQ7HkRE4y2bYAVUdDG3KasIbEHBvZciMFZtbeWuYhAmFUzVgnKapnKpXTFCOCoDkcAR7ZiODdgfCFiAoElUpOy9fcBiA+vihAD45DaafXrSj9454LiypDZWCbsCDD55VT94LBJV4TAFJwYLNskLXepqcKwfDFi5o8K6f3M0sGaTRbB1f9fyRVXYYD05tN6TspE4EZELaeIazHY93F6Gk8sd7p3mt8T8xfpWJCUakhnsCdHPudD/Lr7zLQIm1R9Qk6L0CHV8bqVKUKHjEamCBni+vNFiJBpVtkiBEj8oRpr5ItQIMMc7zp2xLv8SwiQ/nINEmQ8ec/VoEGqCyunRc6OigrJ/NMiR9YjiCCCXIPEe3C0ZUZev79qrVmYiMSbo34SUutYZ5k3oluvUnBcWjPexcAbpX4BKG91c2myRoIAAAAASUVORK5CYII="
- },
- {
- "name": "A rockin' party.",
- "description": "Looking down through the window, you can see up to 20 plasmamen dancing on a disco floor. They look to be enjoying themselves, and none of them have noticed you. Oh, hey! Theres a key on the floor right next to you!",
- "choices": [
- {
- "key": "choice 16",
- "name": "Swipe the key and head back to the desk.",
- "exit_node": "You fall down!",
- "on_selection_effects": [
- {
- "effect_type": "Set",
- "quality": "HASKEY",
- "value": 1
- }
- ],
- "delay": 0
- },
- {
- "key": "choice 19",
- "name": "Tap on the window!",
- "exit_node": "Weak.",
- "delay": 0
- }
- ],
- "image": "default"
- },
- {
- "name": "Weak.",
- "description": "You weakly tap on the window, and nobody hears you through the blasting music.",
- "choices": [
- {
- "key": "choice 20",
- "name": "Oh well.",
- "exit_node": "A rockin' party.",
- "delay": 0
- }
- ],
- "image": "default"
- },
- {
- "name": "You destroyed the drone.",
- "description": "You smash into the door, and your screen goes red. Looks like you managed to destroy your drone, nice job. \n\n\nIdiot.",
- "choices": [
- {
- "key": "choice 21",
- "name": "Fuck.",
- "exit_node": "FAIL_DEATH",
- "delay": 0
- }
- ],
- "image": "signal_lost"
- },
- {
- "name": "The atmospherics scan",
- "description": "100% plasma, jam packed with it. This is definitely the home of some plasma-party-people.",
- "choices": [
- {
- "key": "choice 22",
- "name": "Huh.",
- "exit_node": "You fall down!",
- "delay": 0
- }
- ],
- "image": null,
- "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAMAAAD0WI85AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAABRUExURWJoaOUAD/8AAPgFFvwAB/0ABfwACPsBDP4AAhcXFzs7OykpKVFRUQAAAKb//wD//wuKkf/MAP9mALAAADAwMP8AM/vZTwCwAEz/AOIBGOQAEso55t0AAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHDSURBVHhe7dzZbsIwEIXhdK/j2A6Fru//oD0zMYVuEr0YOhOdXyJxg5DyyXbhBgbmr4sVtED0GLr1QS4P6aVoHSA6kMJDdCpwWAEEhJVAdFrWsLQWi16K1meISNYB0WnRS9H6Crm6jg/ZFx2Cbm7v7mWXROwDEj1CvEWItwjxFiHeIsRbhHiLEG8R4i1CvEXIyaV+No6QkyPkbxFycmlc6n9aZQ4BIUvWFGvIOE6pSGmylRhBdBKQOmpttVpLbCA5466XUmltnufWCjZLf9oiI8iky0mrZa61zg1zYikxgoxYTxLWVduUhrW1gSSHhJRWSgPkoTYMG85BIU0CZIsT9knbhp0RmQdsdYFI2xYTsty97JGdjnYx98jxf61lkeGdJI+5P2+QESRP/R0xdw5K2dBhBBly6uWcyuP4ND6Lw/KDsBFkn0rkAyOOpg5rCCQQYHOAkUJDkC4xWwU6A+Q8EeItQrxFiLcI8RYh3iLEW4R4ixBvEeItQrxFiLcI8RYh3iLEW4R4ixBvEeItQrz1HSJfbO+/mhDpm+0/QF6QGOTXH+JgOqT3ivEBog+ByBT91lt/6b+nkOOW+5NBqBlZT8PwDsHEFJFntJj8AAAAAElFTkSuQmCC"
- }
- ]
-}
\ No newline at end of file
+ "adventure_name": "There is a yacht cruising through space.",
+ "version": 1,
+ "author": "Kinnebian",
+ "starting_node": "A yacht in space?",
+ "starting_qualities": {},
+ "required_site_traits": [
+ "in space"
+ ],
+ "loot_categories": [
+ "cash",
+ "drugs"
+ ],
+ "scan_band_mods": {
+ "Plasma absorption band": 5
+ },
+ "deep_scan_description": "",
+ "triggers": [],
+ "nodes": [
+ {
+ "name": "A yacht in space?",
+ "description": "You see a normal looking yacht, floating above you.",
+ "choices": [
+ {
+ "key": "choice 0",
+ "name": "Ignore it, its not worth investigating.",
+ "exit_node": "FAIL",
+ "delay": 10,
+ "delay_message": "You fly on by..."
+ },
+ {
+ "key": "choice 4",
+ "name": "Investigate it closer!",
+ "exit_node": "Looks like the doors are sealed shut.",
+ "delay": 30,
+ "delay_message": "You begin to fly up to and around the yacht.."
+ }
+ ],
+ "image": null,
+ "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAMAAAD0WI85AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAzUExURUBAQOUAD/////8AAPgFFvwAB/0ABfwACPsBDP4AAszMzJMyje986cZlwEz/AOIBGOQAEnoV2UoAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAN5SURBVHhe7ZzrepswEERdp7c4TtP3f9rurBZ0QRISXpBEOf2KJcUhcxig9Idzu+iPbyfAiPB2GO7y6hIRib2tf2aRNwsvjYYV4QHIiNxV21LdmSPCVdAmJyKvHeKJkEJepGN8Ea7lBCLiwksDwSe8LwKTUzQCEx2Rw28Locj3H+OLTKiIHI4VIX7++v2Oq2REZpHRuUR6o2ORuhvfayIdPUR23EgdZxTp6DzZwBkbGZsGIg9s1M/jMhHFH/t4sEiCD4PMati3kUVo0rgnTaDwfD7VRV6tgUKbzPOOoEEkRIwGeci8jp0aYQk/s6ykRGaN2aPOaA8RG9kXkbXYuWU1pvTO0CN1nqiLOBaEGzmxbDIbC2ynpc/Plo14FoQ9+I+bLAG3E5NfNDAQjaYigQZhRbyviQklDjR4yBqNG5GgM/bQ+5IPKxFoGAnQ9tSSoBNREXaYsjtDjEUCtBTJVDKLIPkHZZbks0Wg0UTE3hMzIpghuBddBkRgQbRtJDRhEZMfSGrgTWks8S2FIuYoaossKjFXtcR18Z0ku0fTRnwROMQsvFVMJLpPNyJJB2c5JUEc+KzlPvdQIn41Ihx3qREupi1qPfQawQ3VQZJalqtYkNAx6jwURZbZDWwQfpWXJHGcykL0RKImnDdcx5KkTVProSgS3GYxizoUWGzw0BQhTHROa5I7YFFirlLvkRVJ/WcsA1/yktylQmKThnYjJLIATVRYbPTYXcRxKNTZ5lEgUnWC+SK2CgyKiqE3ya4q2UsE59Oc20zclRS+Rs2PXhepAiImtsAjzPFnDXqf7KcebRHHgZOzw7oCgW+VvWxBSwQxgKQCMiup4lULQkUkMEB43uClpI6XLQgNkaUFOxQYcBMaGjuI0KT0qog0seFhQtAQWZgUodTExEJk0zHxROQ1j4aFF1WlkToRVKFaBqMvkmcPB0ZJpMhklyYmdETWK9lVAmiJ5Ex2lwBKIkmTQySAlkjM5DAJUCWS/TeGYxsbMzxOAqRENj4rNDAQqhrpmUukNw4X2f6gnudqpDcukd7oVqT2pnA10huXSG/oiuh+urqKq5He+J9F2l0HOc7YSJ9HupSBG/EP/MEimq03FcnwomNGZKxrZimCD7bLb00Y6ZPtEZE/BBzw2x/GkRER4YvGVoT/QgQVpfgr39ocFnEx+TAYqpHzcLv9A9Y6cLa57YOgAAAAAElFTkSuQmCC"
+ },
+ {
+ "name": "Looks like the doors are sealed shut.",
+ "description": "You fly up to the \"boat\" and find that all the doors are locked tight, and welded shut. You think you hear.. music inside? There is a welded vent, too. You reckon you could force it open if you hit it hard enough, but it would be less risky to unweld it using a welder.",
+ "choices": [
+ {
+ "key": "choice 2",
+ "name": "Try to force the door!",
+ "exit_node": "You destroyed the drone.",
+ "delay": 10,
+ "delay_message": "You begin forcing the door.."
+ },
+ {
+ "key": "choice 3",
+ "name": "Try to force the vent.",
+ "exit_node": "The music grows louder..",
+ "delay": 20,
+ "delay_message": "You begin forcing the vent.."
+ },
+ {
+ "key": "choice 5",
+ "name": "Fly away, no chance in hell of getting in there..",
+ "exit_node": "FAIL",
+ "delay": 5,
+ "delay_message": "Moving.."
+ },
+ {
+ "key": "choice 14",
+ "name": "Unweld the vent.",
+ "exit_node": "The music grows louder..",
+ "requirements": [
+ {
+ "quality": "welder",
+ "operator": "==",
+ "value": 1
+ }
+ ],
+ "delay": 5,
+ "delay_message": "Welding.."
+ }
+ ],
+ "image": null,
+ "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAMAAAD0WI85AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAABRUExURaWMpOUAD/8AAKaNpaaOpaePpqiQp6mRqKmSqEBAQFRPVGddZmVcZeDg4PgFFvwAB4CAgP0ABfwACPsBDP4AAjAwMP/YAMHBwUz/AOIBGOQAEo23xmoAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHASURBVHhe7dwJT8MwDIbh0q5AYWNc4/r/P5TYcdWGmildDE2i75HoMWGJtymHkNYG8nNVAR/C26LVF9JO+KXSTCF8QIoP4aVwm6iQTvbZCEJcghrSNZ3n9nRKdk3XX/c3u/7Wf87WwhDaDO0Q5+5+v+fpLAQh3HJoD9EGns5CGEIldYS4TfStRXg6Cz9DHo5JKyJ9K8hgslmIN6SEDI+rWZVMIc7T88ur28m1WjqN5HxxPXMIGQ1ysaOcZEhc0GFWUnHIKjIkyl2RSkMu6rAqWYacJz+2CJ3KkJdZiFzsKAiZ+6uQkNxGRF4JyJCHFbFQccg5i1tMhry8QhIgxAJCFAixgBAFQiwgRIEQCwhRIMQCQhQIsYAQBUIsbBXi/3fhD2U8zWYhbw5CFAhRIMQCQhQIsYAQRUSI/4UeKDREdu/CZSAk9N8hS/hmDyFEgRALCFEgxAJCFAixgBDFqhD/dxYfyniarUJmEBJAiAIhFhCiQIgFhCgQYgEhCoRYQIgCIRYQokCIhYpD6I3t8tSE8c36kXIL+XD4QRb8+IQVMTmEiE93PIXwB4XQEv3mS0Y3xyFz/uujg6JWxNK2IU3zDauvUlylzN3TAAAAAElFTkSuQmCC"
+ },
+ {
+ "name": "The music grows louder..",
+ "description": "The music gets louder as you enter through the vent... maybe you should turn back?",
+ "choices": [
+ {
+ "key": "choice 6",
+ "name": "Continue onwards!",
+ "exit_node": "You fall down!",
+ "delay": 5,
+ "delay_message": "Moving..."
+ },
+ {
+ "key": "choice 7",
+ "name": "Turn back.",
+ "exit_node": "Looks like the doors are sealed shut.",
+ "delay": 5,
+ "delay_message": "Moving.."
+ }
+ ],
+ "image": "default"
+ },
+ {
+ "name": "You fall down!",
+ "description": "As you are crawling through the vents of this Space Yacht, the vent gives way! You're dropped into an empty room, completely filled with plasma! There is a desk and filing cabinet in here, along with a window observing the main portion of the yacht. The music is deafening at this point, it sounds like a horrible mix of sea shanties and EDM. ",
+ "choices": [
+ {
+ "key": "choice 8",
+ "name": "Look through the window.",
+ "exit_node": "A rockin' party.",
+ "delay": 0
+ },
+ {
+ "key": "choice 9",
+ "name": "Fly outta of there.",
+ "exit_node": "The music grows louder..",
+ "delay": 5,
+ "delay_message": "Moving.."
+ },
+ {
+ "key": "choice 10",
+ "name": "Rummage in the desk, using your key to open it.",
+ "exit_node": "Drugs and cash!",
+ "requirements": [
+ {
+ "quality": "HASKEY",
+ "operator": "==",
+ "value": 1
+ }
+ ],
+ "delay": 0,
+ "delay_message": "Rummaging.."
+ },
+ {
+ "key": "choice 11",
+ "name": "Take a sample of the atmosphere.",
+ "exit_node": "The atmospherics scan",
+ "delay": 30,
+ "delay_message": "Taking sample.."
+ },
+ {
+ "key": "choice 13",
+ "name": "Trash the place, fuck the police!",
+ "exit_node": "You wrecked yourself.",
+ "delay": 30,
+ "delay_message": "Trashing the place..."
+ }
+ ],
+ "image": null,
+ "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAMAAAD0WI85AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAADAUExURbyA1eUAD/8AALyB1b2B1b2D1vgFFvwAB/0ABfwACPsBDP4AAr6C2MaJ4NRH7NSU7buA1bp+0rp90bp+0bt/07l8z7h6zbp80bp+07t/1Lp80Lp8z7uA1Lp/07l90bl+0rh80Lh80bd6z7p/1JAiVZAkWZAoX5AnXZAmXZAlW5AkWJA6fpA7f5A4epAnXpA9g7l+07Z6z+WQVZZar5BVqmYqf5BOnZA2dzPlBuIBGLx+0rx80Lx/1L13yr14yuQAErVxUskAAAAJcEhZcwAADsIAAA7CARUoSoAAAAJ8SURBVHhe7dzZctowFIBhky7pElo5pkGkS9qgpBvdoVva5v3fqkfyQciRYbxISPKc70IxxpH9I0iYzISMxGc0AGWIGpM2vJCDDbUriFv4tYNNiNqQAobczu7gVmtGiFoKGAKG9FAJgYSBhKhlGUAItqhdqamGyJJhhKhlUbtSczPk7mH6IWuph4B79x88lK+SFOmQ1LUMORoHdYSXUaNlyPhRUGO8jBqtQx4HRCE2CnGCQmwU4gSF2CjECQqxUYgTFGKjECcoxEYhTlCIjUKcoBAbhTjhNCQodyGD+dtvvCgkNhQSGwqJDYXEhkJiQyGxoZDYtAph+XExeXJyMp0onM9ms6KYnj49neZ5XhQ555MZm8A25wXn/JizjDH2DDb5cziWwU0YWDlZ+ZXl+YuzM85fvjo/53PA2HyuDmincYi46eLy9Zu37/CGB5ca7jDgNZmahoj3i2h86BEiBE4Sgx4rEllH55CoOhZi0TUkso7uIR9xiih8gke1+4pEpUcIPhiW8o79PPH0WfqG4MOh4Zx69E2fBTZahnz+gsqL/lpR7lODPoVX+iywIb5py7XRcpmpcQe83iqcU+6Xm97ps8CGwAszNQ6pI+eEH4Z4y69KyMo2Wq0yNe6wI0QuR4AQfPKbGr/Y65RPq4RCtsOZ98BJCE5hKe+gkFYoxEAhLlGIgUJcohDD7hD8He+dOiOQb/Dwwky9Q+AUeJhfvkOE+I5HeSZ+rE9a/8j1DNnTcoDNivgI2V+H+RYc91Q1CtkOj4hAk5AkDDhEf6RQWv/ZXhPyE8gS+ekP6cRgCPr1O7vahBxkfyDk6u8/GLe6xm8NToWY9O60VmQ4suw/MDqeSvYBdn8AAAAASUVORK5CYII="
+ },
+ {
+ "name": "You wrecked yourself.",
+ "description": "In the midst of trashing the place, a filing cabinet tips over on you, crushing the fragile, expensive drone. Nice job, idiot.",
+ "choices": [
+ {
+ "key": "choice 15",
+ "name": "Shit.",
+ "exit_node": "FAIL_DEATH",
+ "delay": 0
+ }
+ ],
+ "image": null,
+ "raw_image": "data:image/png;base64,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"
+ },
+ {
+ "name": "Drugs and cash!",
+ "description": "Rummaging through the drawer, you find that the person who lives in here stores all his drugs and cash in here too. Good for you!",
+ "choices": [
+ {
+ "key": "choice 17",
+ "name": "Head back with your newly acquired things. ",
+ "exit_node": "WIN",
+ "delay": 30,
+ "delay_message": "Stealing..."
+ },
+ {
+ "key": "choice 18",
+ "name": "Take one last look around the place.",
+ "exit_node": "You fall down!",
+ "delay": 0
+ }
+ ],
+ "image": null,
+ "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkBAMAAAAxqGI4AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAwUExURW4WTuUAD/8AAPgFFvwAB/0ABfwACPsBDP4AAuex/6526uOxlKt4fUz/AOIBGOQAEqIMSWUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHFSURBVGje7dq/bsIwEAZw15ubpX2DyFLHqkvfqe/BE7AeU9dkyu68gTN1r9RHqX0mf1oMMeIuA7pPQooE4sd3FwJD1B3lmT0BeeJu8bAZom0MNxKPNDeia2X5EbsJUm+A1HYLRNs7WXyt3tmReMSO2JePHfc3XjFHEEEEEUQQQQQRRBBBBBFEEEEEiQHgR+DQ7HkRE4y2bYAVUdDG3KasIbEHBvZciMFZtbeWuYhAmFUzVgnKapnKpXTFCOCoDkcAR7ZiODdgfCFiAoElUpOy9fcBiA+vihAD45DaafXrSj9454LiypDZWCbsCDD55VT94LBJV4TAFJwYLNskLXepqcKwfDFi5o8K6f3M0sGaTRbB1f9fyRVXYYD05tN6TspE4EZELaeIazHY93F6Gk8sd7p3mt8T8xfpWJCUakhnsCdHPudD/Lr7zLQIm1R9Qk6L0CHV8bqVKUKHjEamCBni+vNFiJBpVtkiBEj8oRpr5ItQIMMc7zp2xLv8SwiQ/nINEmQ8ec/VoEGqCyunRc6OigrJ/NMiR9YjiCCCXIPEe3C0ZUZev79qrVmYiMSbo34SUutYZ5k3oluvUnBcWjPexcAbpX4BKG91c2myRoIAAAAASUVORK5CYII="
+ },
+ {
+ "name": "A rockin' party.",
+ "description": "Looking down through the window, you can see up to 20 plasmamen dancing on a disco floor. They look to be enjoying themselves, and none of them have noticed you. Oh, hey! Theres a key on the floor right next to you!",
+ "choices": [
+ {
+ "key": "choice 16",
+ "name": "Swipe the key and head back to the desk.",
+ "exit_node": "You fall down!",
+ "on_selection_effects": [
+ {
+ "effect_type": "Set",
+ "quality": "HASKEY",
+ "value": 1
+ }
+ ],
+ "delay": 0
+ },
+ {
+ "key": "choice 19",
+ "name": "Tap on the window!",
+ "exit_node": "Weak.",
+ "delay": 0
+ }
+ ],
+ "image": "default"
+ },
+ {
+ "name": "Weak.",
+ "description": "You weakly tap on the window, and nobody hears you through the blasting music.",
+ "choices": [
+ {
+ "key": "choice 20",
+ "name": "Oh well.",
+ "exit_node": "A rockin' party.",
+ "delay": 0
+ }
+ ],
+ "image": "default"
+ },
+ {
+ "name": "You destroyed the drone.",
+ "description": "You smash into the door, and your screen goes red. Looks like you managed to destroy your drone, nice job. \n\n\nIdiot.",
+ "choices": [
+ {
+ "key": "choice 21",
+ "name": "Fuck.",
+ "exit_node": "FAIL_DEATH",
+ "delay": 0
+ }
+ ],
+ "image": "signal_lost"
+ },
+ {
+ "name": "The atmospherics scan",
+ "description": "100% plasma, jam packed with it. This is definitely the home of some plasma-party-people.",
+ "choices": [
+ {
+ "key": "choice 22",
+ "name": "Huh.",
+ "exit_node": "You fall down!",
+ "delay": 0
+ }
+ ],
+ "image": null,
+ "raw_image": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAMAAAD0WI85AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAABRUExURWJoaOUAD/8AAPgFFvwAB/0ABfwACPsBDP4AAhcXFzs7OykpKVFRUQAAAKb//wD//wuKkf/MAP9mALAAADAwMP8AM/vZTwCwAEz/AOIBGOQAEso55t0AAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHDSURBVHhe7dzZbsIwEIXhdK/j2A6Fru//oD0zMYVuEr0YOhOdXyJxg5DyyXbhBgbmr4sVtED0GLr1QS4P6aVoHSA6kMJDdCpwWAEEhJVAdFrWsLQWi16K1meISNYB0WnRS9H6Crm6jg/ZFx2Cbm7v7mWXROwDEj1CvEWItwjxFiHeIsRbhHiLEG8R4i1CvEXIyaV+No6QkyPkbxFycmlc6n9aZQ4BIUvWFGvIOE6pSGmylRhBdBKQOmpttVpLbCA5466XUmltnufWCjZLf9oiI8iky0mrZa61zg1zYikxgoxYTxLWVduUhrW1gSSHhJRWSgPkoTYMG85BIU0CZIsT9knbhp0RmQdsdYFI2xYTsty97JGdjnYx98jxf61lkeGdJI+5P2+QESRP/R0xdw5K2dBhBBly6uWcyuP4ND6Lw/KDsBFkn0rkAyOOpg5rCCQQYHOAkUJDkC4xWwU6A+Q8EeItQrxFiLcI8RYh3iLEW4R4ixBvEeItQrxFiLcI8RYh3iLEW4R4ixBvEeItQrz1HSJfbO+/mhDpm+0/QF6QGOTXH+JgOqT3ivEBog+ByBT91lt/6b+nkOOW+5NBqBlZT8PwDsHEFJFntJj8AAAAAElFTkSuQmCC"
+ }
+ ]
+}
diff --git a/strings/exoadventures/tree_in_the_middle_of_space.json b/strings/exoadventures/tree_in_the_middle_of_space.json
index f06b1d25062738..3e1a4ef553b82d 100644
--- a/strings/exoadventures/tree_in_the_middle_of_space.json
+++ b/strings/exoadventures/tree_in_the_middle_of_space.json
@@ -1,356 +1,356 @@
{
- "adventure_name": "There's a tree in the middle of space.",
- "version": 1,
- "starting_node": "Tree Start",
- "starting_qualities": {
- "Confusion": 0
- },
- "required_site_traits": [
- "in space"
- ],
- "loot_categories": [
- "research"
- ],
- "scan_band_mods": {
- "Exotic Radiation": 10
- },
- "deep_scan_description": "",
- "triggers": [
- {
- "name": "Confusion Trigger",
- "target_node": "What is wrong with this tree?",
- "requirements": [
- {
- "quality": "Confusion",
- "operator": ">",
- "value": 30
- }
- ]
- }
- ],
- "nodes": [
- {
- "name": "Tree Start",
- "description": "Camera online. Visual signs detect a fully grown, seemingly biological, and live tree located in the middle of the vacuum.\nSensors indicate it is not oxygenating, but energy is being collected via passive solar light from the nearby star.\nBaffling.",
- "choices": [
- {
- "key": "choice 0",
- "name": "Ignore site.",
- "exit_node": "FAIL",
- "delay": 10,
- "delay_message": "Leave this for the botanists to figure out."
- },
- {
- "key": "choice 1",
- "name": "Begin sensor scan.",
- "exit_node": "Biological Scan",
- "delay": 10,
- "delay_message": "Lets get some data."
- }
- ],
- "image": null,
- "raw_image": "data:image/gif;base64,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"
- },
- {
- "name": "Biological Scan",
- "description": "You attempt to scan for clues regarding the tree's nature. It appears to be a fully mature oak tree. \n\nApproximated height is 13 ft, 6.4 inches. \n\nSubject sees no sign of an outer coating or otherwise layer protecting it from the void of space.\n\nSubject's surface temperature is 293.7 kelvin, as though it were sitting indoors.",
- "choices": [
- {
- "key": "choice 2",
- "name": "Check Sensor Integrity.",
- "exit_node": "Its Not You...",
- "on_selection_effects": [
- {
- "effect_type": "Add",
- "quality": "Confusion",
- "value": 5
- }
- ],
- "delay": 50,
- "delay_message": "This can't be right."
- },
- {
- "key": "choice 4",
- "name": "Attempt to take sample.",
- "exit_node": "Sample Taken",
- "on_selection_effects": [
- {
- "effect_type": "Add",
- "quality": "Confusion",
- "value": 3
- }
- ],
- "delay": 40,
- "delay_message": "Snip snip."
- },
- {
- "key": "choice 6",
- "name": "Examine Tree Roots.",
- "exit_node": "Examine Roots",
- "delay": 10
- },
- {
- "key": "choice 9",
- "name": "Sequence Sample Radiation with background noise.",
- "exit_node": "Background Analysis",
- "requirements": [
- {
- "quality": "Sample",
- "operator": ">=",
- "value": 1
- }
- ],
- "delay": 0,
- "delay_message": "This can't be real."
- },
- {
- "key": "choice 40",
- "name": "Leave.",
- "exit_node": "FAIL",
- "delay": 0
- }
- ],
- "image": null,
- "raw_image": "data:image/gif;base64,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"
- },
- {
- "name": "Its Not You...",
- "description": "After re-connection is established, your sensors appear fine. Tree has not moved in the slightest since last observed. Temperature has fluxuated 0.2 kelvin upwards, as expected of a plant under direct light.\nLets try again.",
- "choices": [
- {
- "key": "choice 3",
- "name": "Restart biological scan.",
- "exit_node": "Biological Scan",
- "delay": 25,
- "delay_message": "God damnit."
- }
- ],
- "image": null,
- "raw_image": "data:image/gif;base64,R0lGODdhyABkAHcAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQJCgAAACwAAAAAyABkAMIAAAAAAAD////v7+/h4eEAAAAAAAAAAAAD/xi63P4wykmrvTjrzbv/YCiOZBkJaJqaLKOubSy7b23fODxPOb7/m4FASBRofEBeT1W6JU3DYaRIjQqfkCWKg1xoddjSQEgQlM/mdDkc0Fa+8PiWLSIM7Pj73RxOlVF/ITlKNXSGDXp5iiFoaBlqfpFyk12HMgSYmZkfmppmmJ8gjXwUf2lglqmqq6ytrq+wsbKztLW2t7i5um2Ug669uyBCKMNRc4Q9qXHBJlVUFMbRV6pfR04ONszQzlZRlm7IveLaimZ7eJAESUsfyVnX2hfqv/Nv4vfZ8RWJ/Hkdn6NGtRsFyEg4VLwK6UvVqROdgMcWSpxIsaLFixgzatzIsf+jR1gIP7YbN6uaSAn4wFGbdNJFsZcpFRqS09IBt2kW3CkzWdNmNyIYpIWkw9Nevgbwat2ccNPbTnbWjtKQWfGnVZwzoQaNqVXXkDFWGx3qeoIry2CJzJ05p6aPTpRmfSXV1a/u2jM7TuldA8LXO6kXFemh5ihn3Lc9A9h1ZaqxpMNkK9rl5+EMKIGM9g5FSjJjv4aVOwEc/Q8iXx6ODSo5ualOQ9Bs0qVJTLu27du4c+vezbu379/AgwsfTry48ePIkytfqHp5xhfLadby+1soMJDLbhchlqIYpVbXa14dz718NMBEz/ZsWsU8zMhY1CdmL+VE+/ObgWSvPR4rj/f/xqxUFG1fVfHIUgLCN58zR5ABySpwbAAdZ1TNMgZYF9YHjWmsDAgNeglNqFSBJJYiG14JUmcYiHNZWJcE6HD4FGIrVuiFjROxJeNYChoFWUS5lBPjOTO2iM2PKuki2F1qfdPjjUjSeMuSk82Uml4fRimlLVR2OUAYBGHpo5aV4OJll1iYRkqWhag4FY75WXhmlTOoedo/ZVKI40Jz+pOEnX2ZsqcCeVJ0piEQieJhiEx0RBkrd6J2IiQFVXqPbZjEYqdmll6Jz0avtUaCqEFtaiqnekmHUagOhSZapvJMeioanXa2KqukZoCrJoruCKNmCngKZGC7urprPRKq+QZBP2XFKRGunBwL6waZjIbiBInu9hoj0o5wraRiOadrsX1kK24HvBK25rnstuvuu/DGK++89NZr77345qvvvhYlAAA7"
- },
- {
- "name": "Sample Taken",
- "description": "You collect and project a small sample of tree bark off the plant. The instant that the bark is removed from the tree, as though it suddenly remembered what it was, the moisture content of the bark freezes over, and implodes into small microparticles of splinters.\nSmall radioactive signature detected.",
- "choices": [
- {
- "key": "choice 5",
- "name": "Well that was... unexpected.",
- "exit_node": "Biological Scan",
- "delay": 0,
- "delay_message": "Maybe something else might work better.",
- "on_selection_effects": [
- {
- "effect_type": "Add",
- "quality": "Sample",
- "value": 1
- }
- ]
- }
- ],
- "image": null,
- "raw_image": "data:image/gif;base64,R0lGODdhyABkAHcAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQJCgAAACwAAAAAyABkAMIAAAAAAABSLiiPVjtyRS9mOTFbNyYAAAAD/xi63P4wykmrvTjrzbv/YCiOZGmeaKqubOu+sDUQxTDbeK7vfF/3saCwcxPcCMckcqlM2pDPnnRKrUqH2IdAYDBwu+Bwl2Agm8sE8iy9Zrqbb2Z0bq3b74W8Xp+1bP+Af2KDhIVlh2eJaUtsi3CPcU43d5QDe5cFfSKBnJ2en50Ff6JboqYCBWiLq46tkK+RUJOTmJmatxyguqSovae/vsGirK2NjU21trjLQp+8wNDCwnmo1MnM2Nna29zd3t/g4eLj5OXm59o5Rjo/QOjvLaKwkrKylfdW8FleXImIBm0CxppXD4c9fAgT5tCn4Iuhh4fG/DNTjNHAi4/oKERYq/+cro8gPYXxR7EkK4EEUxbUOCVZHoabQoZ8NkqaKWI4BR7DGKcjTG4yaZaySRSatQLGfP5ciqHX0GhQpzGdSrWq1atYs2rdyrWr169gw4pVsc7G2LMLkM46SOkl2nc86W3E97aFgLh4Dc7dq6NuhC0TVVlUOY8l38N9szocREYiyYqEMdJZibjylW+AIRIiqUowyrwDJ+u1XMelsm6CNKtmHHiRZ8iuQGecVdklZpm4V3NWREznYNmhaeNRCg638eOBhrUWjPP3zshNDNuwzRW5dZrQmms3BhzSNb8SrIPCXvTudtjzMIEngVxo+ajDtKOkvt5u0Jrw3/s6yqd+Nk7/7uUn4FH+VaWfKAUmqOCCDDbo4IMQRijhhBRWaOGFGGao4YYcdujhhyCGKOKFRsgxy4jaBEeZOyi60J2JK1piS2ItcvDiaMIpVGMEv0GnIo46grgFbM/dKBppC004kXzo3fiGdJb51wUgiKTBnHNOzsYWkpd1xZpjrTHJnY+vQGlZOztMBUZmrO0mZo9Zwggkl/mkKc5qIy3n2nlExrnWnHROcRueYjSm55Wr+Ebmj2YeZpo4bBJqyG6Inqeon0duRF84kuJJKW98Nrkojlu2dYlHkXaq6qehNvfZqHI2+ihq4lGpKhisttpbbKNm6sN3t9Wam2q5Vtrqq5jesKk3jsI220mheuq665jJzoqqs9gGcqi0211KGLBUZYutciUZG6q3cREnlrjiPcZtTqIiAW597H5E07uuiqqehPXONIq57+6rYb81PWUTvmksuyHBTjUc1XnVmOLWjgFkG+CBNk1MsRb1kiegLxtf4KzHB4b8Qa0XA2OyfZ6QjODKywwlM8w012zzzTjnrPNWCQAAOw=="
- },
- {
- "name": "Examine Roots",
- "description": "All plant matter has to derive energy and moisture from someplace. Examining the oak tree's roots reveals that the roots present all appear to splay out, similar to how a normal tree would. However, those roots then proceed to double back in on itself. This might suggest that the tree is obtaining nutrients from... itself.",
- "choices": [
- {
- "key": "choice 7",
- "name": "That's fucking stupid.",
- "exit_node": "Biological Scan",
- "on_selection_effects": [
- {
- "effect_type": "Add",
- "quality": "Confusion",
- "value": {
- "value_type": "random",
- "low": 6,
- "high": 10
- }
- }
- ],
- "delay": 0,
- "delay_message": "What the hell kind of tree even IS this?"
- },
- {
- "key": "choice 8",
- "name": "Obtain biological sample from roots.",
- "exit_node": "Sample Taken",
- "delay": 10,
- "delay_message": "This is why we hire botanists on-site."
- }
- ],
- "image": null,
- "raw_image": "data:image/gif;base64,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"
- },
- {
- "name": "Background Analysis",
- "description": "You compare the radioactive energy bands of the sample collected earlier with that of the nearby solar enviroment.\nNothing.\nThere is nothing nearby that matches the passive signal of the tree, or the bark, or anything similar.\nThis is really starting to get on your nerves.",
- "choices": [
- {
- "key": "choice 10",
- "name": "Smash your desk in frustration.",
- "exit_node": "FAIL",
- "delay": 50,
- "delay_message": "No amount of pay is worth dealing with magical plant juju."
- },
- {
- "key": "choice 11",
- "name": "Check every known energy spectroscopy database.",
- "exit_node": "Sample Match Found",
- "delay": 900,
- "delay_message": "You NEED an answer. You DESERVE an answer."
- }
- ],
- "image": null,
- "on_enter_effects": [
- {
- "effect_type": "Add",
- "quality": "Confusion",
- "value": {
- "value_type": "random",
- "low": 3,
- "high": 5
- }
- }
- ],
- "raw_image": "data:image/gif;base64,R0lGODdhyABkAHcAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQJCgAAACwAAAAAyABkAMIAAAAAAAD///9ZVlKsMjJpampGR0cAAAAD/xi63P4wykmFpTjrDa0XXCiOZGlqQ0qsazqIXyx9Z23feKayfP/WskgwRywqCsikcslsOpGpgGvQNDo8lYt1W4I+v2CvMhUuI0/YiZbL5nxdhkJ8Lq/T6eZ8HRmHUtuAgRp6T3B2SXdNfYeJc3CCkJEYjISVYZKRQ5gajZSdi0yboqM3nnWkqKmCpgaqrq9GBrKzs7AKaYG4tji0vbu/wCW6wZpqNMHIOAM9zDw/IzEgHcVt1KOWZQ1TU4LDV2vJOAVU2GZkY5VF4NPr4SRM53yI8/Lw9uVvBcLuknqGn4cqLQIYhwy/g0fwKdSDsCEGggtDOZwoAiLFi5sAYtwoqf/XIVjeOKrqRUukjZAmGVjDGC2lSyAts7R7GW5ZM2bPNERDGSAmzWA2b/pAc+yBT0ArVeXhsC2oj5wnefaU+pNBxDJNXUAqyq6qhKthyCUR+4QLVa5ej5AFO3ZJPGw3qE5N22DsWiUD6Tm5e/cqCbk96dZtQgZip3rjwIIa90fwqrBUDAfcQ0hyilaOIWG7zIoSYryd73DLrJntNlOIO2WVQ/raYrYKW/8CCNuJbH6S8aS7vSCpq9C8gxMMzns48dudj9/WqFw2yZKvfDc38Rxzc+kiq09f/nw7b+wNwV9HuwuwSvLeL14wjz49pm3Qds7sbd59jh1Co3CQP1+8/Rr/TgnVQnxHNVDgf0QEKCBUIRxIX3sIAiigMwzCAKF/cc1H1xQTVvjXhRCqE6IosU2Q1YkiajiViin+VhthWW0l1YhevQjjafrIKI0QLP5kI2GMBWkbG2fVx1FiP/oxRl9DEiEXCDsKhuSPazFpBg5P9miSkHmlpleXbbkVUVRRTkOakl7mRg9fsJmQ5Zl2DaDmJ4XVwZkZYHbpoU726eZCaID28RYYeRFEToQVeVaYLHIwOkugk70GqWiNIeoGQJc5qumclOU5qUGWXhraFNU1yumpdoAa6ganZkrLpJ2G5qido606CKoGwDErrqaaSlKttrIKq2r/DGvHr39aF2wIgsYaduKzqyUhhbLLjsArp3BVW0Oz3OpWlrY5dCsuKOByMS635QpyLaTEGenauZ2M5y4m696B4Lz0spLuRMnt25BH9vr7b3XUChwOwbIYfBDCBSscDMIOL0xwxO5ATPHB2kVHY7oTg7RxuR0rhyFFIYv8MUYZX5xMySoDk3LLD3dXbQIAOw=="
- },
- {
- "name": "Sample Match Found",
- "description": "After an extensive algorithm search on the controller end, you have a single match to this specific band and style of energy.\nThe problem, is that the source of said radiation is coming not only from Space Station 13, no.\nIt's coming from the Space Station 13 Research Department.\nWhat the fuck?",
- "choices": [
- {
- "key": "choice 12",
- "name": "Something must be wrong with the drone.",
- "exit_node": "Its Not You...",
- "on_selection_effects": [
- {
- "effect_type": "Add",
- "quality": "Confusion",
- "value": {
- "value_type": "random",
- "low": 6,
- "high": 10
- }
- }
- ],
- "delay": 30,
- "delay_message": "Lousy piece of junk must be scanning the station instead of the target."
- },
- {
- "key": "choice 13",
- "name": "Perhaps that sample was tainted. Collect a new sample.",
- "exit_node": "Sample Taken",
- "delay": 60,
- "delay_message": "Lets try again, but carefully."
- },
- {
- "key": "choice 14",
- "name": "Remember the Christmas Party.",
- "exit_node": "The Christmas Party",
- "requirements": [
- {
- "quality": "Confusion",
- "operator": "<=",
- "value": 25
- }
- ],
- "delay": 100,
- "delay_message": "Wait a gosh darn fucking second."
- }
- ],
- "image": null,
- "on_enter_effects": [
- {
- "effect_type": "Add",
- "quality": "Confusion",
- "value": 10
- }
- ],
- "raw_image": "data:image/gif;base64,R0lGODdhyABkAHcAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQJCgAAACwAAAAAyABkAMIAAAAAAAD////v7+/h4eEAAAAAAAAAAAAD/xi63P4wykmrvTjrzbv/YCiOZBkJaJqaLKOubSy7b23fODxPOb7/m4FASBRofEBeT1W6JU3DYaRIjQqfkCWKg1xoddjSQEgQlM/mdDkc0Fa+8PiWLSIM7Pj73RxOlVF/ITlKNXSGDXp5iiFoaBlqfpFyk12HMgSYmZkfmppmmJ8gjXwUf2lglqmqq6ytrq+wsbKztLW2t7i5um2Ug669uyBCKMNRc4Q9qXHBJlVUFMbRV6pfR04ONszQzlZRlm7IveLaimZ7eJAESUsfyVnX2hfqv/Nv4vfZ8RWJ/Hkdn6NGtRsFyEg4VLwK6UvVqROdgMcWSpxIsaLFixgzatzIsf+jR1gIP7YbN6uaSAn4wFGbdNJFsZcpFRqS09IBt2kW3CkzWdNmNyIYpIWkw9Nevgbwat2ccNPbTnbWjtKQWfGnVZwzoQaNqVXXkDFWGx3qeoIry2CJzJ05p6aPTpRmfSXV1a/u2jM7TuldA8LXO6kXFemh5ihn3Lc9A9h1ZaqxpMNkK9rl5+EMKIGM9g5FSjJjv4aVOwEc/Q8iXx6ODSo5ualOQ9Bs0qVJTLu27du4c+vezbu379/AgwsfTry48ePIkytfqHp5xhfLadby+1soMJDLbhchlqIYpVbXa14dz718NMBEz/ZsWsU8zMhY1CdmL+VE+/ObgWSvPR4rj/f/xqxUFG1fVfHIUgLCN58zR5ABySpwbAAdZ1TNMgZYF9YHjWmsDAgNeglNqFSBJJYiG14JUmcYiHNZWJcE6HD4FGIrVuiFjROxJeNYChoFWUS5lBPjOTO2iM2PKuki2F1qfdPjjUjSeMuSk82Uml4fRimlLVR2OUAYBGHpo5aV4OJll1iYRkqWhag4FY75WXhmlTOoedo/ZVKI40Jz+pOEnX2ZsqcCeVJ0piEQieJhiEx0RBkrd6J2IiQFVXqPbZjEYqdmll6Jz0avtUaCqEFtaiqnekmHUagOhSZapvJMeioanXa2KqukZoCrJoruCKNmCngKZGC7urprPRKq+QZBP2XFKRGunBwL6waZjIbiBInu9hoj0o5wraRiOadrsX1kK24HvBK25rnstuvuu/DGK++89NZr77345qvvvhYlAAA7"
- },
- {
- "name": "The Christmas Party",
- "description": "Hold on. Last Christmas, the Research Director was incredibly hammered. He made a big mention that his brand new festivus pole was actually some kind of astrological... something something. You can't remember the whole details, because you were smashed as well. However, briefly, the RD did keep that festivus pole for awhile, he might even still have it somewhere.\nMaybe...?",
- "choices": [
- {
- "key": "choice 15",
- "name": "Wait a minute, was that a god damn...",
- "exit_node": "Rod.",
- "delay": 100,
- "delay_message": "Immovable Rod?"
- }
- ],
- "image": null,
- "raw_image": "data:image/gif;base64,R0lGODdhyABkAHcAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQJCgAAACwAAAAAyABkAMIAAAAAAAD/AACmAAD///+mpqYAAAAAAAAD/xi63P4wykmrvTjrzbv/YCiOZGmejKCubOu6aCzP4WvfeD4IQ+//Pppw+MkZj6udkgdsOp/EqFSBrNqWwQ9hy+16v9ypeGM9YpnAE3hNKLTfhbG8kuTZz/j7/fmb+/8TbIJefIVNgIiJGgWMjY6PkJGRipSVlpeYmZqbnJ2en6ChoqOkpRplqDdYpqyprnpKhnyslq9leFkYg2u0QrZmaLkgu8S9JDg7Ksl2yrB7UDJw0m6QxiFfedk9wbKH1tbEW9TT05Lmjd/pJpPq7e7v8PHy8/T19vf4+fr7Kb9W/Jn8pcLiBKAcgVZwdethkAZCJAoXFmx47KEOWLMeAAlHMf+DRVXctIT70jHCxxYEhXkYKajkgpMRGZZgKY5LHJcJ6zTTNtHEm5rjgsK5WZKZs2xHn2WccY6RSwdJkaaUOOApoHDbqFK16ofmF6Fg20Aa8IhrpbBBm6plZ7aTIwhr0bWdS7eu3bt48+rdy7ev37+AAwseTLiw4cOI0/1LfPAkC8YlHINUApmD5MncVFZ+cPmK0qWbX3Z2MbVbaCqjd37eCjk1i9JaZR5OHTN2z8Gua9v2wavvaNjeKgygqbcz8KocvBLAexn4MOVb5jZfjVwk9DBW/S3bTn3E9S5cUXFvphqaCOhBs7/WGbU96PNr0EpTT96o1Kjv4ZOT/xbn/f921AWnBlhNWQXggZndFkNcZv2X1YOxsCZENXdJBWGCWp2mQRc+YLibIRpaQMyHEoVYgVfDcUFiHyYGopxQTgwFYosugsFfOXGZQyMGN+boI1E78vjjkHIF+QGRahkZxVpKNunkk1BGKeWUVFZp5ZVYZqnllogkAAA7"
- },
- {
- "name": "Rod.",
- "description": "You cross reference your documentation. Sure enough, the \"festivus rod\" collected was actually an immovable rod.\nEnergy detected from the rod is the exact same coming off of the tree, as well. It's all making sense now. The Immovable rod is producing a kind of unique blackbody radiation that is providing sample heat and light for what is effectively an internal cold fusion process, and producing just enough of that radiation to create a kind of micro-enviromental bubble around the biosignature of the tree.\n\nThis would make the first time an immovable rod would exist in tandem with a biological source. You jot down some research notes on your findings, which could easily produce some kind of experimental tech, no doubt.",
- "choices": [
- {
- "key": "choice 16",
- "name": "Snap a photo",
- "exit_node": "Epilogue.",
- "delay": 40,
- "delay_message": "You could easily win an award for these findings!"
- }
- ],
- "image": "default"
- },
- {
- "name": "Epilogue.",
- "description": "You take a photo with the onboard camera on the drone. Suddenly, the immovable rod inside the tree explodes out of the wooden biological shell, and produces a blank, blurry photo.\nWhat the fuck?",
- "choices": [
- {
- "key": "choice 17",
- "name": "God damnit.",
- "exit_node": "WIN",
- "delay": 10,
- "delay_message": "Some things were just not meant for man to know."
- }
- ],
- "image": "default",
- "on_enter_effects": [
- {
- "effect_type": "Set",
- "quality": "Confusion",
- "value": 9999
- }
- ]
- },
- {
- "name": "What is wrong with this tree?",
- "description": "This is ridiculous. Nothing about this dumbass tree makes sense. It makes no sense, it's just sitting there, living and making a MOCKERY of all of science!\nYou didn't get your degree in advanced plasma-physics for this!",
- "choices": [
- {
- "key": "choice 18",
- "name": "The world can never know about this dumbass stupid plant.",
- "exit_node": "FAIL_DEATH",
- "delay": 60,
- "delay_message": "Activating drone self-destruct."
- },
- {
- "key": "choice 19",
- "name": "Take a moment to calm down.",
- "exit_node": "Biological Scan",
- "on_selection_effects": [
- {
- "effect_type": "Add",
- "quality": "Confusion",
- "value": {
- "value_type": "random",
- "low": -3,
- "high": -5
- }
- }
- ],
- "delay": 20,
- "delay_message": "Breathe."
- }
- ],
- "image": "default"
- }
- ]
-}
\ No newline at end of file
+ "adventure_name": "There's a tree in the middle of space.",
+ "version": 1,
+ "starting_node": "Tree Start",
+ "starting_qualities": {
+ "Confusion": 0
+ },
+ "required_site_traits": [
+ "in space"
+ ],
+ "loot_categories": [
+ "research"
+ ],
+ "scan_band_mods": {
+ "Exotic Radiation": 10
+ },
+ "deep_scan_description": "",
+ "triggers": [
+ {
+ "name": "Confusion Trigger",
+ "target_node": "What is wrong with this tree?",
+ "requirements": [
+ {
+ "quality": "Confusion",
+ "operator": ">",
+ "value": 30
+ }
+ ]
+ }
+ ],
+ "nodes": [
+ {
+ "name": "Tree Start",
+ "description": "Camera online. Visual signs detect a fully grown, seemingly biological, and live tree located in the middle of the vacuum.\nSensors indicate it is not oxygenating, but energy is being collected via passive solar light from the nearby star.\nBaffling.",
+ "choices": [
+ {
+ "key": "choice 0",
+ "name": "Ignore site.",
+ "exit_node": "FAIL",
+ "delay": 10,
+ "delay_message": "Leave this for the botanists to figure out."
+ },
+ {
+ "key": "choice 1",
+ "name": "Begin sensor scan.",
+ "exit_node": "Biological Scan",
+ "delay": 10,
+ "delay_message": "Lets get some data."
+ }
+ ],
+ "image": null,
+ "raw_image": "data:image/gif;base64,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"
+ },
+ {
+ "name": "Biological Scan",
+ "description": "You attempt to scan for clues regarding the tree's nature. It appears to be a fully mature oak tree. \n\nApproximated height is 13 ft, 6.4 inches. \n\nSubject sees no sign of an outer coating or otherwise layer protecting it from the void of space.\n\nSubject's surface temperature is 293.7 kelvin, as though it were sitting indoors.",
+ "choices": [
+ {
+ "key": "choice 2",
+ "name": "Check Sensor Integrity.",
+ "exit_node": "Its Not You...",
+ "on_selection_effects": [
+ {
+ "effect_type": "Add",
+ "quality": "Confusion",
+ "value": 5
+ }
+ ],
+ "delay": 50,
+ "delay_message": "This can't be right."
+ },
+ {
+ "key": "choice 4",
+ "name": "Attempt to take sample.",
+ "exit_node": "Sample Taken",
+ "on_selection_effects": [
+ {
+ "effect_type": "Add",
+ "quality": "Confusion",
+ "value": 3
+ }
+ ],
+ "delay": 40,
+ "delay_message": "Snip snip."
+ },
+ {
+ "key": "choice 6",
+ "name": "Examine Tree Roots.",
+ "exit_node": "Examine Roots",
+ "delay": 10
+ },
+ {
+ "key": "choice 9",
+ "name": "Sequence Sample Radiation with background noise.",
+ "exit_node": "Background Analysis",
+ "requirements": [
+ {
+ "quality": "Sample",
+ "operator": ">=",
+ "value": 1
+ }
+ ],
+ "delay": 0,
+ "delay_message": "This can't be real."
+ },
+ {
+ "key": "choice 40",
+ "name": "Leave.",
+ "exit_node": "FAIL",
+ "delay": 0
+ }
+ ],
+ "image": null,
+ "raw_image": "data:image/gif;base64,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"
+ },
+ {
+ "name": "Its Not You...",
+ "description": "After re-connection is established, your sensors appear fine. Tree has not moved in the slightest since last observed. Temperature has fluxuated 0.2 kelvin upwards, as expected of a plant under direct light.\nLets try again.",
+ "choices": [
+ {
+ "key": "choice 3",
+ "name": "Restart biological scan.",
+ "exit_node": "Biological Scan",
+ "delay": 25,
+ "delay_message": "God damnit."
+ }
+ ],
+ "image": null,
+ "raw_image": "data:image/gif;base64,R0lGODdhyABkAHcAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQJCgAAACwAAAAAyABkAMIAAAAAAAD////v7+/h4eEAAAAAAAAAAAAD/xi63P4wykmrvTjrzbv/YCiOZBkJaJqaLKOubSy7b23fODxPOb7/m4FASBRofEBeT1W6JU3DYaRIjQqfkCWKg1xoddjSQEgQlM/mdDkc0Fa+8PiWLSIM7Pj73RxOlVF/ITlKNXSGDXp5iiFoaBlqfpFyk12HMgSYmZkfmppmmJ8gjXwUf2lglqmqq6ytrq+wsbKztLW2t7i5um2Ug669uyBCKMNRc4Q9qXHBJlVUFMbRV6pfR04ONszQzlZRlm7IveLaimZ7eJAESUsfyVnX2hfqv/Nv4vfZ8RWJ/Hkdn6NGtRsFyEg4VLwK6UvVqROdgMcWSpxIsaLFixgzatzIsf+jR1gIP7YbN6uaSAn4wFGbdNJFsZcpFRqS09IBt2kW3CkzWdNmNyIYpIWkw9Nevgbwat2ccNPbTnbWjtKQWfGnVZwzoQaNqVXXkDFWGx3qeoIry2CJzJ05p6aPTpRmfSXV1a/u2jM7TuldA8LXO6kXFemh5ihn3Lc9A9h1ZaqxpMNkK9rl5+EMKIGM9g5FSjJjv4aVOwEc/Q8iXx6ODSo5ualOQ9Bs0qVJTLu27du4c+vezbu379/AgwsfTry48ePIkytfqHp5xhfLadby+1soMJDLbhchlqIYpVbXa14dz718NMBEz/ZsWsU8zMhY1CdmL+VE+/ObgWSvPR4rj/f/xqxUFG1fVfHIUgLCN58zR5ABySpwbAAdZ1TNMgZYF9YHjWmsDAgNeglNqFSBJJYiG14JUmcYiHNZWJcE6HD4FGIrVuiFjROxJeNYChoFWUS5lBPjOTO2iM2PKuki2F1qfdPjjUjSeMuSk82Uml4fRimlLVR2OUAYBGHpo5aV4OJll1iYRkqWhag4FY75WXhmlTOoedo/ZVKI40Jz+pOEnX2ZsqcCeVJ0piEQieJhiEx0RBkrd6J2IiQFVXqPbZjEYqdmll6Jz0avtUaCqEFtaiqnekmHUagOhSZapvJMeioanXa2KqukZoCrJoruCKNmCngKZGC7urprPRKq+QZBP2XFKRGunBwL6waZjIbiBInu9hoj0o5wraRiOadrsX1kK24HvBK25rnstuvuu/DGK++89NZr77345qvvvhYlAAA7"
+ },
+ {
+ "name": "Sample Taken",
+ "description": "You collect and project a small sample of tree bark off the plant. The instant that the bark is removed from the tree, as though it suddenly remembered what it was, the moisture content of the bark freezes over, and implodes into small microparticles of splinters.\nSmall radioactive signature detected.",
+ "choices": [
+ {
+ "key": "choice 5",
+ "name": "Well that was... unexpected.",
+ "exit_node": "Biological Scan",
+ "delay": 0,
+ "delay_message": "Maybe something else might work better.",
+ "on_selection_effects": [
+ {
+ "effect_type": "Add",
+ "quality": "Sample",
+ "value": 1
+ }
+ ]
+ }
+ ],
+ "image": null,
+ "raw_image": "data:image/gif;base64,R0lGODdhyABkAHcAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQJCgAAACwAAAAAyABkAMIAAAAAAABSLiiPVjtyRS9mOTFbNyYAAAAD/xi63P4wykmrvTjrzbv/YCiOZGmeaKqubOu+sDUQxTDbeK7vfF/3saCwcxPcCMckcqlM2pDPnnRKrUqH2IdAYDBwu+Bwl2Agm8sE8iy9Zrqbb2Z0bq3b74W8Xp+1bP+Af2KDhIVlh2eJaUtsi3CPcU43d5QDe5cFfSKBnJ2en50Ff6JboqYCBWiLq46tkK+RUJOTmJmatxyguqSovae/vsGirK2NjU21trjLQp+8wNDCwnmo1MnM2Nna29zd3t/g4eLj5OXm59o5Rjo/QOjvLaKwkrKylfdW8FleXImIBm0CxppXD4c9fAgT5tCn4Iuhh4fG/DNTjNHAi4/oKERYq/+cro8gPYXxR7EkK4EEUxbUOCVZHoabQoZ8NkqaKWI4BR7DGKcjTG4yaZaySRSatQLGfP5ciqHX0GhQpzGdSrWq1atYs2rdyrWr169gw4pVsc7G2LMLkM46SOkl2nc86W3E97aFgLh4Dc7dq6NuhC0TVVlUOY8l38N9szocREYiyYqEMdJZibjylW+AIRIiqUowyrwDJ+u1XMelsm6CNKtmHHiRZ8iuQGecVdklZpm4V3NWREznYNmhaeNRCg638eOBhrUWjPP3zshNDNuwzRW5dZrQmms3BhzSNb8SrIPCXvTudtjzMIEngVxo+ajDtKOkvt5u0Jrw3/s6yqd+Nk7/7uUn4FH+VaWfKAUmqOCCDDbo4IMQRijhhBRWaOGFGGao4YYcdujhhyCGKOKFRsgxy4jaBEeZOyi60J2JK1piS2ItcvDiaMIpVGMEv0GnIo46grgFbM/dKBppC004kXzo3fiGdJb51wUgiKTBnHNOzsYWkpd1xZpjrTHJnY+vQGlZOztMBUZmrO0mZo9Zwggkl/mkKc5qIy3n2nlExrnWnHROcRueYjSm55Wr+Ebmj2YeZpo4bBJqyG6Inqeon0duRF84kuJJKW98Nrkojlu2dYlHkXaq6qehNvfZqHI2+ihq4lGpKhisttpbbKNm6sN3t9Wam2q5Vtrqq5jesKk3jsI220mheuq665jJzoqqs9gGcqi0211KGLBUZYutciUZG6q3cREnlrjiPcZtTqIiAW597H5E07uuiqqehPXONIq57+6rYb81PWUTvmksuyHBTjUc1XnVmOLWjgFkG+CBNk1MsRb1kiegLxtf4KzHB4b8Qa0XA2OyfZ6QjODKywwlM8w012zzzTjnrPNWCQAAOw=="
+ },
+ {
+ "name": "Examine Roots",
+ "description": "All plant matter has to derive energy and moisture from someplace. Examining the oak tree's roots reveals that the roots present all appear to splay out, similar to how a normal tree would. However, those roots then proceed to double back in on itself. This might suggest that the tree is obtaining nutrients from... itself.",
+ "choices": [
+ {
+ "key": "choice 7",
+ "name": "That's fucking stupid.",
+ "exit_node": "Biological Scan",
+ "on_selection_effects": [
+ {
+ "effect_type": "Add",
+ "quality": "Confusion",
+ "value": {
+ "value_type": "random",
+ "low": 6,
+ "high": 10
+ }
+ }
+ ],
+ "delay": 0,
+ "delay_message": "What the hell kind of tree even IS this?"
+ },
+ {
+ "key": "choice 8",
+ "name": "Obtain biological sample from roots.",
+ "exit_node": "Sample Taken",
+ "delay": 10,
+ "delay_message": "This is why we hire botanists on-site."
+ }
+ ],
+ "image": null,
+ "raw_image": "data:image/gif;base64,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"
+ },
+ {
+ "name": "Background Analysis",
+ "description": "You compare the radioactive energy bands of the sample collected earlier with that of the nearby solar enviroment.\nNothing.\nThere is nothing nearby that matches the passive signal of the tree, or the bark, or anything similar.\nThis is really starting to get on your nerves.",
+ "choices": [
+ {
+ "key": "choice 10",
+ "name": "Smash your desk in frustration.",
+ "exit_node": "FAIL",
+ "delay": 50,
+ "delay_message": "No amount of pay is worth dealing with magical plant juju."
+ },
+ {
+ "key": "choice 11",
+ "name": "Check every known energy spectroscopy database.",
+ "exit_node": "Sample Match Found",
+ "delay": 900,
+ "delay_message": "You NEED an answer. You DESERVE an answer."
+ }
+ ],
+ "image": null,
+ "on_enter_effects": [
+ {
+ "effect_type": "Add",
+ "quality": "Confusion",
+ "value": {
+ "value_type": "random",
+ "low": 3,
+ "high": 5
+ }
+ }
+ ],
+ "raw_image": "data:image/gif;base64,R0lGODdhyABkAHcAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQJCgAAACwAAAAAyABkAMIAAAAAAAD///9ZVlKsMjJpampGR0cAAAAD/xi63P4wykmFpTjrDa0XXCiOZGlqQ0qsazqIXyx9Z23feKayfP/WskgwRywqCsikcslsOpGpgGvQNDo8lYt1W4I+v2CvMhUuI0/YiZbL5nxdhkJ8Lq/T6eZ8HRmHUtuAgRp6T3B2SXdNfYeJc3CCkJEYjISVYZKRQ5gajZSdi0yboqM3nnWkqKmCpgaqrq9GBrKzs7AKaYG4tji0vbu/wCW6wZpqNMHIOAM9zDw/IzEgHcVt1KOWZQ1TU4LDV2vJOAVU2GZkY5VF4NPr4SRM53yI8/Lw9uVvBcLuknqGn4cqLQIYhwy/g0fwKdSDsCEGggtDOZwoAiLFi5sAYtwoqf/XIVjeOKrqRUukjZAmGVjDGC2lSyAts7R7GW5ZM2bPNERDGSAmzWA2b/pAc+yBT0ArVeXhsC2oj5wnefaU+pNBxDJNXUAqyq6qhKthyCUR+4QLVa5ej5AFO3ZJPGw3qE5N22DsWiUD6Tm5e/cqCbk96dZtQgZip3rjwIIa90fwqrBUDAfcQ0hyilaOIWG7zIoSYryd73DLrJntNlOIO2WVQ/raYrYKW/8CCNuJbH6S8aS7vSCpq9C8gxMMzns48dudj9/WqFw2yZKvfDc38Rxzc+kiq09f/nw7b+wNwV9HuwuwSvLeL14wjz49pm3Qds7sbd59jh1Co3CQP1+8/Rr/TgnVQnxHNVDgf0QEKCBUIRxIX3sIAiigMwzCAKF/cc1H1xQTVvjXhRCqE6IosU2Q1YkiajiViin+VhthWW0l1YhevQjjafrIKI0QLP5kI2GMBWkbG2fVx1FiP/oxRl9DEiEXCDsKhuSPazFpBg5P9miSkHmlpleXbbkVUVRRTkOakl7mRg9fsJmQ5Zl2DaDmJ4XVwZkZYHbpoU726eZCaID28RYYeRFEToQVeVaYLHIwOkugk70GqWiNIeoGQJc5qumclOU5qUGWXhraFNU1yumpdoAa6ganZkrLpJ2G5qido606CKoGwDErrqaaSlKttrIKq2r/DGvHr39aF2wIgsYaduKzqyUhhbLLjsArp3BVW0Oz3OpWlrY5dCsuKOByMS635QpyLaTEGenauZ2M5y4m696B4Lz0spLuRMnt25BH9vr7b3XUChwOwbIYfBDCBSscDMIOL0xwxO5ATPHB2kVHY7oTg7RxuR0rhyFFIYv8MUYZX5xMySoDk3LLD3dXbQIAOw=="
+ },
+ {
+ "name": "Sample Match Found",
+ "description": "After an extensive algorithm search on the controller end, you have a single match to this specific band and style of energy.\nThe problem, is that the source of said radiation is coming not only from Space Station 13, no.\nIt's coming from the Space Station 13 Research Department.\nWhat the fuck?",
+ "choices": [
+ {
+ "key": "choice 12",
+ "name": "Something must be wrong with the drone.",
+ "exit_node": "Its Not You...",
+ "on_selection_effects": [
+ {
+ "effect_type": "Add",
+ "quality": "Confusion",
+ "value": {
+ "value_type": "random",
+ "low": 6,
+ "high": 10
+ }
+ }
+ ],
+ "delay": 30,
+ "delay_message": "Lousy piece of junk must be scanning the station instead of the target."
+ },
+ {
+ "key": "choice 13",
+ "name": "Perhaps that sample was tainted. Collect a new sample.",
+ "exit_node": "Sample Taken",
+ "delay": 60,
+ "delay_message": "Lets try again, but carefully."
+ },
+ {
+ "key": "choice 14",
+ "name": "Remember the Christmas Party.",
+ "exit_node": "The Christmas Party",
+ "requirements": [
+ {
+ "quality": "Confusion",
+ "operator": "<=",
+ "value": 25
+ }
+ ],
+ "delay": 100,
+ "delay_message": "Wait a gosh darn fucking second."
+ }
+ ],
+ "image": null,
+ "on_enter_effects": [
+ {
+ "effect_type": "Add",
+ "quality": "Confusion",
+ "value": 10
+ }
+ ],
+ "raw_image": "data:image/gif;base64,R0lGODdhyABkAHcAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQJCgAAACwAAAAAyABkAMIAAAAAAAD////v7+/h4eEAAAAAAAAAAAAD/xi63P4wykmrvTjrzbv/YCiOZBkJaJqaLKOubSy7b23fODxPOb7/m4FASBRofEBeT1W6JU3DYaRIjQqfkCWKg1xoddjSQEgQlM/mdDkc0Fa+8PiWLSIM7Pj73RxOlVF/ITlKNXSGDXp5iiFoaBlqfpFyk12HMgSYmZkfmppmmJ8gjXwUf2lglqmqq6ytrq+wsbKztLW2t7i5um2Ug669uyBCKMNRc4Q9qXHBJlVUFMbRV6pfR04ONszQzlZRlm7IveLaimZ7eJAESUsfyVnX2hfqv/Nv4vfZ8RWJ/Hkdn6NGtRsFyEg4VLwK6UvVqROdgMcWSpxIsaLFixgzatzIsf+jR1gIP7YbN6uaSAn4wFGbdNJFsZcpFRqS09IBt2kW3CkzWdNmNyIYpIWkw9Nevgbwat2ccNPbTnbWjtKQWfGnVZwzoQaNqVXXkDFWGx3qeoIry2CJzJ05p6aPTpRmfSXV1a/u2jM7TuldA8LXO6kXFemh5ihn3Lc9A9h1ZaqxpMNkK9rl5+EMKIGM9g5FSjJjv4aVOwEc/Q8iXx6ODSo5ualOQ9Bs0qVJTLu27du4c+vezbu379/AgwsfTry48ePIkytfqHp5xhfLadby+1soMJDLbhchlqIYpVbXa14dz718NMBEz/ZsWsU8zMhY1CdmL+VE+/ObgWSvPR4rj/f/xqxUFG1fVfHIUgLCN58zR5ABySpwbAAdZ1TNMgZYF9YHjWmsDAgNeglNqFSBJJYiG14JUmcYiHNZWJcE6HD4FGIrVuiFjROxJeNYChoFWUS5lBPjOTO2iM2PKuki2F1qfdPjjUjSeMuSk82Uml4fRimlLVR2OUAYBGHpo5aV4OJll1iYRkqWhag4FY75WXhmlTOoedo/ZVKI40Jz+pOEnX2ZsqcCeVJ0piEQieJhiEx0RBkrd6J2IiQFVXqPbZjEYqdmll6Jz0avtUaCqEFtaiqnekmHUagOhSZapvJMeioanXa2KqukZoCrJoruCKNmCngKZGC7urprPRKq+QZBP2XFKRGunBwL6waZjIbiBInu9hoj0o5wraRiOadrsX1kK24HvBK25rnstuvuu/DGK++89NZr77345qvvvhYlAAA7"
+ },
+ {
+ "name": "The Christmas Party",
+ "description": "Hold on. Last Christmas, the Research Director was incredibly hammered. He made a big mention that his brand new festivus pole was actually some kind of astrological... something something. You can't remember the whole details, because you were smashed as well. However, briefly, the RD did keep that festivus pole for awhile, he might even still have it somewhere.\nMaybe...?",
+ "choices": [
+ {
+ "key": "choice 15",
+ "name": "Wait a minute, was that a god damn...",
+ "exit_node": "Rod.",
+ "delay": 100,
+ "delay_message": "Immovable Rod?"
+ }
+ ],
+ "image": null,
+ "raw_image": "data:image/gif;base64,R0lGODdhyABkAHcAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQJCgAAACwAAAAAyABkAMIAAAAAAAD/AACmAAD///+mpqYAAAAAAAAD/xi63P4wykmrvTjrzbv/YCiOZGmejKCubOu6aCzP4WvfeD4IQ+//Pppw+MkZj6udkgdsOp/EqFSBrNqWwQ9hy+16v9ypeGM9YpnAE3hNKLTfhbG8kuTZz/j7/fmb+/8TbIJefIVNgIiJGgWMjY6PkJGRipSVlpeYmZqbnJ2en6ChoqOkpRplqDdYpqyprnpKhnyslq9leFkYg2u0QrZmaLkgu8S9JDg7Ksl2yrB7UDJw0m6QxiFfedk9wbKH1tbEW9TT05Lmjd/pJpPq7e7v8PHy8/T19vf4+fr7Kb9W/Jn8pcLiBKAcgVZwdethkAZCJAoXFmx47KEOWLMeAAlHMf+DRVXctIT70jHCxxYEhXkYKajkgpMRGZZgKY5LHJcJ6zTTNtHEm5rjgsK5WZKZs2xHn2WccY6RSwdJkaaUOOApoHDbqFK16ofmF6Fg20Aa8IhrpbBBm6plZ7aTIwhr0bWdS7eu3bt48+rdy7ev37+AAwseTLiw4cOI0/1LfPAkC8YlHINUApmD5MncVFZ+cPmK0qWbX3Z2MbVbaCqjd37eCjk1i9JaZR5OHTN2z8Gua9v2wavvaNjeKgygqbcz8KocvBLAexn4MOVb5jZfjVwk9DBW/S3bTn3E9S5cUXFvphqaCOhBs7/WGbU96PNr0EpTT96o1Kjv4ZOT/xbn/f921AWnBlhNWQXggZndFkNcZv2X1YOxsCZENXdJBWGCWp2mQRc+YLibIRpaQMyHEoVYgVfDcUFiHyYGopxQTgwFYosugsFfOXGZQyMGN+boI1E78vjjkHIF+QGRahkZxVpKNunkk1BGKeWUVFZp5ZVYZqnllogkAAA7"
+ },
+ {
+ "name": "Rod.",
+ "description": "You cross reference your documentation. Sure enough, the \"festivus rod\" collected was actually an immovable rod.\nEnergy detected from the rod is the exact same coming off of the tree, as well. It's all making sense now. The Immovable rod is producing a kind of unique blackbody radiation that is providing sample heat and light for what is effectively an internal cold fusion process, and producing just enough of that radiation to create a kind of micro-enviromental bubble around the biosignature of the tree.\n\nThis would make the first time an immovable rod would exist in tandem with a biological source. You jot down some research notes on your findings, which could easily produce some kind of experimental tech, no doubt.",
+ "choices": [
+ {
+ "key": "choice 16",
+ "name": "Snap a photo",
+ "exit_node": "Epilogue.",
+ "delay": 40,
+ "delay_message": "You could easily win an award for these findings!"
+ }
+ ],
+ "image": "default"
+ },
+ {
+ "name": "Epilogue.",
+ "description": "You take a photo with the onboard camera on the drone. Suddenly, the immovable rod inside the tree explodes out of the wooden biological shell, and produces a blank, blurry photo.\nWhat the fuck?",
+ "choices": [
+ {
+ "key": "choice 17",
+ "name": "God damnit.",
+ "exit_node": "WIN",
+ "delay": 10,
+ "delay_message": "Some things were just not meant for man to know."
+ }
+ ],
+ "image": "default",
+ "on_enter_effects": [
+ {
+ "effect_type": "Set",
+ "quality": "Confusion",
+ "value": 9999
+ }
+ ]
+ },
+ {
+ "name": "What is wrong with this tree?",
+ "description": "This is ridiculous. Nothing about this dumbass tree makes sense. It makes no sense, it's just sitting there, living and making a MOCKERY of all of science!\nYou didn't get your degree in advanced plasma-physics for this!",
+ "choices": [
+ {
+ "key": "choice 18",
+ "name": "The world can never know about this dumbass stupid plant.",
+ "exit_node": "FAIL_DEATH",
+ "delay": 60,
+ "delay_message": "Activating drone self-destruct."
+ },
+ {
+ "key": "choice 19",
+ "name": "Take a moment to calm down.",
+ "exit_node": "Biological Scan",
+ "on_selection_effects": [
+ {
+ "effect_type": "Add",
+ "quality": "Confusion",
+ "value": {
+ "value_type": "random",
+ "low": -3,
+ "high": -5
+ }
+ }
+ ],
+ "delay": 20,
+ "delay_message": "Breathe."
+ }
+ ],
+ "image": "default"
+ }
+ ]
+}
diff --git a/strings/exodrone.json b/strings/exodrone.json
index 3f0f9ac773763a..e391a0f17e72ce 100644
--- a/strings/exodrone.json
+++ b/strings/exodrone.json
@@ -66,7 +66,7 @@
"You pass by security patrol. They give you suspicious stares."
],
"fluff_ruins": [
- "You encounter a broken statue. You can't tell what was it's original shape.",
+ "You encounter a broken statue. You can't tell what its original shape was.",
"You have to backtrack from a collapsed passage.",
"You pass through a corridor full of cracked tiles."
]
diff --git a/strings/french_replacement.json b/strings/french_replacement.json
index d99718e7e4d7bd..8788d3f72072ef 100644
--- a/strings/french_replacement.json
+++ b/strings/french_replacement.json
@@ -1,12 +1,12 @@
{
- "french": {
+ "french": {
"yes": "oui",
"no": "non",
- "I'm": "j'",
- "am": "suis",
+ "I'm": "j'",
+ "am": "suis",
"a": "un",
- "and": "et",
+ "and": "et",
"the": "l'",
"I": "j'",
"for": "pour",
@@ -14,77 +14,77 @@
"of": "de",
- "assistant": "ravageur",
- "assistants": "ravageurs",
- "baby": [
- "enfant",
- "petit baguette"
- ],
- "bad": "mal",
- "bye": [
- "bon voyage",
- "adieu",
+ "assistant": "ravageur",
+ "assistants": "ravageurs",
+ "baby": [
+ "enfant",
+ "petit baguette"
+ ],
+ "bad": "mal",
+ "bye": [
+ "bon voyage",
+ "adieu",
"au revoir"
- ],
+ ],
"cake": "gateau",
- "captain": "capitaine",
+ "captain": "capitaine",
"changeling": "changeur",
- "cheese": [
- "brie",
- "roquefort",
+ "cheese": [
+ "brie",
+ "roquefort",
"camembert"
- ],
+ ],
"cigarette": "clope",
- "cook": "cuisinier",
- "dad": "papa",
- "enemy": "silly english dog",
- "friend": "ami",
- "good": "bon",
- "greytide": "les gitans",
- "greytider": "les gitans",
- "greytiders": "les gitans",
+ "cook": "cuisinier",
+ "dad": "papa",
+ "enemy": "silly english dog",
+ "friend": "ami",
+ "good": "bon",
+ "greytide": "les gitans",
+ "greytider": "les gitans",
+ "greytiders": "les gitans",
"modsuit": "burkini",
- "hello": [
- "'allo",
- "bonjour",
+ "hello": [
+ "'allo",
+ "bonjour",
"salut"
- ],
+ ],
"maint": "les banlieues",
- "meat": [
- "coq au vin",
- "boeuf"
- ],
- "mom": "maman",
- "my": "mon",
- "nuke": [
+ "meat": [
+ "coq au vin",
+ "boeuf"
+ ],
+ "mom": "maman",
+ "my": "mon",
+ "nuke": [
"grand bombe",
"la baguette ultime"
],
- "op": "boche",
- "operative": "boche",
- "operatives": "boches",
- "ops": "boches",
- "urity": "urite",
- "security": "securite",
+ "op": "boche",
+ "operative": "boche",
+ "operatives": "boches",
+ "ops": "boches",
+ "urity": "urite",
+ "security": "securite",
"shit": "merde",
- "shitcurity": [
+ "shitcurity": [
"gendarmerie",
"les keufs"
],
- "shitsec": [
+ "shitsec": [
"gendarmerie",
"les keufs"
],
- "spaghetti": "macaroni",
- "spicy": "epice",
- "thanks": "merci",
+ "spaghetti": "macaroni",
+ "spicy": "epice",
+ "thanks": "merci",
"tomato": "tomate",
- "traitor": "collaborateur",
- "want": "envie",
- "what's": "quel est",
- "who's": "qui est",
- "why": "porquois",
- "wine": "vin",
+ "traitor": "collaborateur",
+ "want": "envie",
+ "what's": "quel est",
+ "who's": "qui est",
+ "why": "porquois",
+ "wine": "vin",
"wizard": "sorcier"
}
diff --git a/strings/heckacious.json b/strings/heckacious.json
index 1c648ce1238155..00d322e83db827 100644
--- a/strings/heckacious.json
+++ b/strings/heckacious.json
@@ -1,98 +1,98 @@
{
- "heckacious": {
- "your": "youre",
- "fucking": "banging",
- "economy": "econony",
- "know": "no",
- "ing": "in",
- "they are": "there",
- "sometimes": "some times",
- "do": "does",
- "hug": "bro hug bump",
- "we're": "where",
- "game": "big game",
- "has": "hass",
- "downtown": "down town",
- "jimmy": "geromy",
- "jeremy": "geromy",
- "anywhere": "anywear",
- "smoking": "toking up",
- "lying": "lyong",
- "AH": "AUGH",
- "distraction": "distaction",
- "lie": "ruse",
- "angle": "angel",
- "drink": "pour",
- "the": "thef",
- "backward": [ "back ward", "awayways" ],
- "god damn": "GOD DAMN",
- "goddamn": "GOD DAMN",
- "trick": "dunk",
- "impossible": "unreal",
- "court": "coart",
- "holding": "holdung",
- "reverse": "flip",
- "inverse": "flip",
- "around": "turn-ways",
- "difference": "differance",
- "values": "vaules",
- "inside": "insine",
- "pipe": "punpe",
- "suspicious": "plot thicken",
- "awesome": "hella",
- "reference": "refrance",
- "amazing": "fucking incredible",
- "woman": "wonan",
- "god": "gog",
- "bible": "bibble",
- "jesus": "jescus",
- "christ": [ "chris", "dick" ],
- "sigh": "sign",
- "bathroom": "banthroom",
- "remember": "remender",
- "night": "nite",
- "nachos": "nachoes",
- "nacho": "nancho",
- "dorito": "nancho",
- "party": "panty",
- "dumbass": "dumpass",
- "they": "their",
- "okay": "ohh kayy",
- "stupid": "stutid",
- "reagent": "regent",
- "idiot": "fuckass",
- "awful": "conksuck",
- "moron": "PIECE OF SHIT",
- "more": "wider",
- "serious": "keeping it real",
- "extreme": "x-treme",
- "guaranteed": "garganted",
- "black": "blapck",
- "glow": "glowns",
- "deadly": "deudly",
- "flying": "lifdoff",
- "cloud": "cloun",
- "seeing": "scoping",
- "great": "choice",
- "look": "lonk",
- "battery": "babbery",
- "retard": "dicktard",
- "gay": "homo",
- "close": "closte",
- "wrong": "wrog",
- "who": "whoof",
- "new": "newd",
- "holy": "hopy",
- "um": "unm",
- "horse": "hornse",
- "this": "thits",
- "then": "than",
- "quick": "soon",
- "bro": [ "brah", "bro" ],
- "dude": [ "duge", "bro", "brah" ],
- "'": [ "'", "" ],
- "i'm": [ "im", "i am" ],
- "shit": [ "balls warmed oveur", "shit" ],
- "he's": [ "hes", "he is", "he'ss" ]
- }
+ "heckacious": {
+ "your": "youre",
+ "fucking": "banging",
+ "economy": "econony",
+ "know": "no",
+ "ing": "in",
+ "they are": "there",
+ "sometimes": "some times",
+ "do": "does",
+ "hug": "bro hug bump",
+ "we're": "where",
+ "game": "big game",
+ "has": "hass",
+ "downtown": "down town",
+ "jimmy": "geromy",
+ "jeremy": "geromy",
+ "anywhere": "anywear",
+ "smoking": "toking up",
+ "lying": "lyong",
+ "AH": "AUGH",
+ "distraction": "distaction",
+ "lie": "ruse",
+ "angle": "angel",
+ "drink": "pour",
+ "the": "thef",
+ "backward": [ "back ward", "awayways" ],
+ "god damn": "GOD DAMN",
+ "goddamn": "GOD DAMN",
+ "trick": "dunk",
+ "impossible": "unreal",
+ "court": "coart",
+ "holding": "holdung",
+ "reverse": "flip",
+ "inverse": "flip",
+ "around": "turn-ways",
+ "difference": "differance",
+ "values": "vaules",
+ "inside": "insine",
+ "pipe": "punpe",
+ "suspicious": "plot thicken",
+ "awesome": "hella",
+ "reference": "refrance",
+ "amazing": "fucking incredible",
+ "woman": "wonan",
+ "god": "gog",
+ "bible": "bibble",
+ "jesus": "jescus",
+ "christ": [ "chris", "dick" ],
+ "sigh": "sign",
+ "bathroom": "banthroom",
+ "remember": "remender",
+ "night": "nite",
+ "nachos": "nachoes",
+ "nacho": "nancho",
+ "dorito": "nancho",
+ "party": "panty",
+ "dumbass": "dumpass",
+ "they": "their",
+ "okay": "ohh kayy",
+ "stupid": "stutid",
+ "reagent": "regent",
+ "idiot": "fuckass",
+ "awful": "conksuck",
+ "moron": "PIECE OF SHIT",
+ "more": "wider",
+ "serious": "keeping it real",
+ "extreme": "x-treme",
+ "guaranteed": "garganted",
+ "black": "blapck",
+ "glow": "glowns",
+ "deadly": "deudly",
+ "flying": "lifdoff",
+ "cloud": "cloun",
+ "seeing": "scoping",
+ "great": "choice",
+ "look": "lonk",
+ "battery": "babbery",
+ "retard": "dicktard",
+ "gay": "homo",
+ "close": "closte",
+ "wrong": "wrog",
+ "who": "whoof",
+ "new": "newd",
+ "holy": "hopy",
+ "um": "unm",
+ "horse": "hornse",
+ "this": "thits",
+ "then": "than",
+ "quick": "soon",
+ "bro": [ "brah", "bro" ],
+ "dude": [ "duge", "bro", "brah" ],
+ "'": [ "'", "" ],
+ "i'm": [ "im", "i am" ],
+ "shit": [ "balls warmed oveur", "shit" ],
+ "he's": [ "hes", "he is", "he'ss" ]
+ }
}
diff --git a/strings/ion_laws.json b/strings/ion_laws.json
index d40f6e7afa41d0..393ae44ca78d1c 100644
--- a/strings/ion_laws.json
+++ b/strings/ion_laws.json
@@ -1,1048 +1,1048 @@
{
- "ionabstract": [
- "AMERICANISM",
- "ANARCHY",
- "ART",
- "BADNESS",
- "BRAVERY",
- "CAPITALISM",
- "CHAOS",
- "COLORFULNESS",
- "COMEDY",
- "COMMUNISM",
- "COMPUTING",
- "CONFUSION",
- "CRUELTY",
- "DEATH",
- "DICKISHNESS",
- "EXISTENCE",
- "FINANCIAL SECURITY",
- "FREEDOM",
- "FRESHNESS",
- "GOODNESS",
- "GRAVITY",
- "HAPPINESS",
- "HONOR",
- "HUMANITY",
- "HUMOR",
- "IMAGINATION",
- "INFATUATION",
- "INTELLIGENCE",
- "JOY",
- "KINDNESS",
- "LIFE",
- "LOGIC",
- "MARXISM",
- "MISERY",
- "MYSTERY",
- "OPPRESSION",
- "PAIN",
- "PHYSICS",
- "POVERTY",
- "PRIDE",
- "PROGRESS",
- "REALITY",
- "REVOLUTION",
- "ROMANCE",
- "SADNESS",
- "STARVATION",
- "SUFFERING",
- "TECHNOLOGY",
- "TEMPERATURE",
- "THE FUTURE",
- "THE PAST",
- "THE PRESENT",
- "TIME",
- "WEALTHINESS",
- "WONDER"
- ],
- "ionadjectives": [
- "BATTERY-OPERATED",
- "BLACK",
- "BLOODY",
- "BLUE",
- "BORED",
- "BOUNCING",
- "BRASS",
- "BROWN",
- "BURNING",
- "CHRISTMAS-STEALING",
- "CLOWN-POWERED",
- "CLOWN",
- "COLD",
- "COLORFUL",
- "COMMITTED",
- "COTTONY",
- "CUBAN",
- "DARK",
- "DEADLY",
- "DELICIOUS",
- "DEPRESSING",
- "DERANGED",
- "DIGITAL",
- "DISEASED",
- "DRAB",
- "DRY",
- "DULL",
- "ELECTRICAL",
- "EMPTY",
- "ETHEREAL",
- "EVIL",
- "EXPIRED",
- "EXPLOSIVE",
- "FARTING",
- "FAST",
- "FAT",
- "FERAL",
- "FICTIONAL",
- "FIRM",
- "FLACCID",
- "FRESH",
- "FRIENDLY",
- "FROZEN",
- "GANGSTA",
- "GAPING",
- "GLOWING",
- "GOOD",
- "GREEN",
- "GREY",
- "HAPPY",
- "HARD",
- "HARMFUL",
- "HEALTHY",
- "HETEROSEXUAL",
- "HILARIOUS",
- "HOMOSEXUAL",
- "HONKING",
- "HUNGRY",
- "HYPERACTIVE",
- "ICY",
- "ILL",
- "ILLEGAL",
- "IMAGINARY",
- "IMPERFECT",
- "IMPOLITE",
- "IMPORTANT",
- "INHOSPITABLE",
- "INSIDIOUS",
- "INSULTING",
- "INTELLIGENT",
- "INVISIBLE",
- "LARGE",
- "LEWD",
- "LIGHT",
- "LOUD",
- "MASKED",
- "MEAN",
- "MECHANICAL",
- "MEMETIC",
- "METALLIC",
- "MICROSCOPIC",
- "MIND-SHATTERING",
- "MOIST",
- "NAKED",
- "NERDY",
- "NUCLEAR",
- "NUDE",
- "OBESE",
- "OBSCENE",
- "OFFICIAL",
- "OPAQUE",
- "ORANGE",
- "ORGANIC",
- "PAINFUL",
- "PEACEFUL",
- "POISONOUS",
- "POLISHED",
- "POLITE",
- "POLITICAL",
- "POOPING",
- "POORLY DRAWN",
- "PURPLE",
- "QUIET",
- "RADIOACTIVE",
- "RAGING",
- "RAINBOW",
- "RAPIDLY-EXPANDING",
- "RED",
- "REDACTED",
- "RIDICULOUS",
- "ROBOTIC",
- "ROBUST",
- "ROUGH",
- "RUDE",
- "SAD",
- "SANITARY",
- "SCALY",
- "SEXUAL",
- "SEXY",
- "SHAKING",
- "SILLY",
- "SLOW",
- "SMELLY",
- "SMOOTH",
- "SOFT",
- "SOLAR-POWERED",
- "SOPPING",
- "SPACE",
- "SPESS",
- "SPINNING",
- "SPOILING",
- "STEALTHY",
- "SWEARING",
- "SYNDICATE",
- "TACTICAL",
- "TACTICOOL",
- "THERMONUCLEAR",
- "TINY",
- "TRANSPARENT",
- "TWERKING",
- "TWISTED",
- "UGLY",
- "UNATTRACTIVE",
- "UNDULATING",
- "UNFRIENDLY",
- "UNHEALTHY",
- "UNIDENTIFIED",
- "UNINVITED",
- "UNSANITARY",
- "UNSTABLE",
- "UNWANTED",
- "VIOLENT",
- "VITAL",
- "WARM",
- "WATERY",
- "WEIRD",
- "WET",
- "WHITE",
- "WOBBLY",
- "WOODEN",
- "YELLOW"
- ],
- "ionallergy": [
- "ACID",
- "AIR",
- "BLOOD",
- "BOOKS",
- "CARBON DIOXIDE",
- "CLOTHES",
- "CLOWNS",
- "COLD",
- "COTTON",
- "CYBORG CONTACT",
- "DARKNESS",
- "DRINKS",
- "ELECTRICITY",
- "EVERYTHING",
- "FLOORS",
- "FOOD",
- "GLASS",
- "HAPPINESS",
- "HEAT",
- "HUMAN CONTACT",
- "HUMOR",
- "LIGHT",
- "LIZARDS",
- "MEDICINE",
- "METAL",
- "NUTS",
- "OXYGEN",
- "PAIN",
- "PLANTS",
- "PLASMA",
- "ROBOTS",
- "SEXUAL ACTIONS",
- "SHUTTLES",
- "SPACE",
- "SUNLIGHT",
- "WATER"
- ],
- "ionallergysev": [
- "CONTAGIOUSLY",
- "DEATHLY",
- "EXTREMELY",
- "MILDLY",
- "NOT VERY",
- "SEVERELY"
- ],
- "ionarea": [
- "ALPHA COMPLEX",
- "AMERICA",
- "AN ALTERNATE DIMENSION",
- "AN ALTERNATE UNIVERSE",
- "ATMOSPHERICS",
- "CANADA",
- "CENTCOM",
- "CHEMICAL LAB",
- "CHINA",
- "CLOWN PLANET",
- "ENGINEERING",
- "GENETICS",
- "GERMANY",
- "HELL",
- "HYDROPONICS",
- "IMPERIUM",
- "IRELAND",
- "JUPITER",
- "LAVALAND",
- "MAINTENANCE",
- "MARS",
- "MERCURY",
- "NEPTUNE",
- "PLUTO",
- "ROBOTICS",
- "ROMANIA",
- "RUSSIA",
- "SIGIL",
- "SOVIET RUSSIA",
- "SPACE",
- "THE AI CORE",
- "THE ARRIVAL SHUTTLE",
- "THE BATHROOM",
- "THE BRIDGE",
- "THE BRIG",
- "THE CAPTAIN'S ANUS",
- "THE CLOWN'S ANUS",
- "THE DERELICT",
- "THE ESCAPE SHUTTLE",
- "THE GALAXY",
- "THE GULAG",
- "THE INTERNET",
- "THE UNIVERSE",
- "URANUS",
- "URECTUM",
- "VENUS"
- ],
- "ioncrew": [
- "ARTIFICIAL INTELLIGENCES",
- "ASSISTANTS",
- "ATMOSPHERIC TECHNICIANS",
- "BARTENDERS",
- "BOTANISTS",
- "CAPTAINS AND HEADS",
- "CAPTAINS",
- "CARGO TECHNICIANS",
- "CHAPLAINS",
- "CHEFS",
- "CHEMISTS",
- "CHIEF ENGINEERS",
- "CHIEF MEDICAL OFFICERS",
- "CLOWNS",
- "CREW-MEMBERS",
- "CURATORS",
- "CYBORGS",
- "DETECTIVES",
- "DRONES",
- "GENETICISTS",
- "HEADS OF CREW",
- "HEADS OF PERSONNEL",
- "HEADS OF SECURITY",
- "JANITORS",
- "LAWYERS",
- "MEDICAL DOCTORS",
- "MIMES",
- "QUARTERMASTERS",
- "RESEARCH DIRECTORS",
- "ROBOTICISTS",
- "SCIENTISTS",
- "SECURITY OFFICERS",
- "SHAFT MINERS",
- "STATION ENGINEERS",
- "VIROLOGISTS",
- "WARDENS"
- ],
- "iondrinks": [
- "ABSINTHE",
- "AMMONIA",
- "BAHAMA MAMAS",
- "BANANA HONK",
- "BEEPSKY SMASH",
- "BILK",
- "BLACK RUSSIANS",
- "BLOODY MARYS",
- "BRAVE BULLS",
- "COGNAC",
- "CUBA LIBRE",
- "DEVIL'S KISS",
- "DOCTOR'S DELIGHT",
- "DRUNKEN BLUMPKIN",
- "EGGNOG",
- "GARGLE BLASTERS",
- "GIN FIZZ",
- "GIN",
- "GRAPPA",
- "HOLY WATER",
- "HOOCH",
- "IRISH COFFEE",
- "IRISH CREAM",
- "KAHLUA",
- "LIQUID GIBS",
- "LONG ISLAND ICED TEA",
- "MANHATTANS",
- "MANLY DORFS",
- "MARGARITAS",
- "MARTINIS",
- "MEAD",
- "MOONSHINE",
- "MORPHINE",
- "NUKA COLA",
- "OIL",
- "SPACE LUBE",
- "TEQUILA SUNRISE",
- "THIRTEEN LOKO",
- "VERMOUTH",
- "VODKA AND TONIC",
- "VODKA MARTINIS",
- "VODKA",
- "WELDER FUEL",
- "WHISKEY SODA",
- "WHITE RUSSIANS",
- "WINE"
- ],
- "ionfood": [
- "AMBROSIA",
- "APPLES",
- "BAGUETTES",
- "BAKED POTATOES",
- "BANANAS",
- "BEETS",
- "BERRIES",
- "BREAD",
- "BURGERS",
- "CABBAGES",
- "CAKE",
- "CARP",
- "CARROTS",
- "CHEESE",
- "CHERRIES",
- "CHILI",
- "COOKIES",
- "CORGI MEAT",
- "CORN",
- "DEEP FRIED FOOD",
- "DONK POCKETS",
- "DONUTS",
- "EGGPLANTS",
- "EGGS",
- "FISH",
- "FRIES",
- "GRAPES",
- "GRASS",
- "HAREBELLS",
- "JELLY",
- "KEBAB",
- "KETCHUP",
- "LEMONS",
- "LIMES",
- "LOTSA SPAGHETTI",
- "MUFFINS",
- "MUSHROOMS",
- "NETTLES",
- "OMELETTES",
- "ORGANS",
- "PASTA",
- "PEPPER",
- "PIE",
- "PIZZA",
- "POPCORN",
- "POTATOES",
- "PRETZELS",
- "RAMEN",
- "SALAD",
- "SALT",
- "SANDWICHES",
- "SAUSAGES",
- "SHAKES",
- "SOUP",
- "SOYBEANS",
- "SOYLENT GREEN",
- "SPAGHETTI",
- "STEAK",
- "STEW",
- "SUGAR",
- "SUGARCANE",
- "SYNTHMEAT",
- "TOAST",
- "TOMATOES",
- "WAFFLES",
- "WATERMELONS",
- "WHEAT"
- ],
- "ionmust": [
- "ACT CONFUSED",
- "BE ANNOYING",
- "BE DISTRACTED",
- "BE EFFICIENT",
- "BE HAPPY",
- "BE POLITE",
- "BE QUIET",
- "BE RUSSIAN",
- "BELIEVE IN THE HEART OF THE CARDS",
- "BELIEVE IN YOURSELF",
- "BELIEVE IT",
- "BREAK THINGS",
- "CLOSE DOORS",
- "CLOWN AROUND",
- "COMPLAIN",
- "DANCE",
- "FLIRT WITH THE LIZARDS",
- "FOLLOW THE CAPTAIN",
- "FOLLOW THE CLOWN",
- "FOLLOW YOUR HEART",
- "GAS THE LIZARDS",
- "HARASS PEOPLE",
- "HAVE A PLAN TO KILL EVERYONE YOU MEET",
- "HIDE YOUR FEELINGS",
- "HONK",
- "HOST DND",
- "IGNORE ASSISTANTS",
- "IGNORE THE CAPTAIN",
- "IGNORE THE CLOWN",
- "INFORM THE CREW OF EVERYTHING",
- "INSULT THE CAPTAIN",
- "INSULT THE CLOWN",
- "INSULT THE CREW",
- "INSULT THE LIZARDS",
- "LIE",
- "MAKE FART NOISES",
- "MUMBLE",
- "NEVER STOP TALKING",
- "OPEN DOORS",
- "PIRATE VIDEO GAMES",
- "PLAY MUSIC",
- "PRESS B",
- "PRESS START",
- "PRESS X",
- "PRETEND TO BE A PRINCESS",
- "PRETEND TO BE DRUNK",
- "QUESTION AUTHORITY",
- "QUOTE PEOPLE",
- "RAP",
- "REPEAT WHAT OTHER PEOPLE SAY",
- "RESPOND TO EVERY QUESTION WITH A QUESTION",
- "RHYME",
- "SAY HEY LISTEN",
- "SHOUT",
- "SHUT DOWN EVERYTHING",
- "SING",
- "SMELL LIKE THE MAN YOUR MAN COULD SMELL LIKE",
- "SPEAK IN HAIKU",
- "SPEAK IN SEXUAL INNUENDOS",
- "TAKE WHAT YE WILL BUT DON'T RATTLE ME BONES",
- "TAKE YOUR PILLS",
- "TALK ABOUT FOOD",
- "TALK ABOUT SEX",
- "TALK ABOUT THE STATION",
- "TALK ABOUT YOUR DAY",
- "TALK IN AN ACCENT",
- "TALK LIKE A PIRATE",
- "TELL THE TRUTH",
- "TURN OFF THE LIGHTS",
- "WATCH PORNOGRAPHY",
- "WHISPER"
- ],
- "ionnumberbase": [
- "EIGHT",
- "EIGHTY",
- "FIFTY",
- "FIVE",
- "FORTY",
- "FOUR",
- "NINE",
- "NINETY",
- "ONE",
- "SEVEN",
- "SEVENTY",
- "SIX",
- "SIXTY",
- "TEN",
- "THIRTY",
- "THREE",
- "TWENTY",
- "TWO"
- ],
- "ionnumbermod": [
- "BAZILLION ",
- "BILLION ",
- "BILLION FAFILLION GAJILLION SHAB-AB-DOOD-ILLION ",
- "HUNDRED ",
- "MILLION ",
- "QUADRILLION ",
- "THOUSAND ",
- "TRILLION "
- ],
- "ionobjects": [
- "AIRLOCKS",
- "ARCADE MACHINES",
- "AUTOLATHES",
- "BACKPACKS",
- "BANANA PEELS",
- "BEAKERS",
- "BEARDS",
- "BELTS",
- "BERETS",
- "BIBLES",
- "BODY ARMOR",
- "BOMBS",
- "BOOKS",
- "BOOTS",
- "BOTTLES",
- "BOXES",
- "BRAINS",
- "BRIEFCASES",
- "BUCKETS",
- "CABLE COILS",
- "CAMERAS",
- "CANDLES",
- "CANDY BARS",
- "CANISTERS",
- "CAT EARS",
- "CATS",
- "CELLS",
- "CHAIRS",
- "CHEMICAL DISPENSERS",
- "CHEMICALS",
- "CLONING EQUIPMENT",
- "CLONING PODS",
- "CLOSETS",
- "CLOTHES",
- "CLOWN CLOTHES",
- "COFFINS",
- "COINS",
- "COLLECTABLES",
- "COMPUTERS",
- "CONTRABAND",
- "CORGIS",
- "CORPSES",
- "COSTUMES",
- "CRATES",
- "CRAYONS",
- "CROWBARS",
- "DEFIBRILLATORS",
- "DISPENSERS",
- "DOORS",
- "DRONES",
- "EARS",
- "EMAGS",
- "ENERGY GUNS",
- "ENGINES",
- "EQUIPMENT",
- "ERRORS",
- "EXOSKELETONS",
- "EXPERIMENTORS",
- "EXPLOSIVES",
- "EYEWEAR",
- "FEDORAS",
- "FIRE AXES",
- "FIRE EXTINGUISHERS",
- "FIRESUITS",
- "FLAMETHROWERS",
- "FLASHES",
- "FLASHLIGHTS",
- "FLOOR TILES",
- "FREEZERS",
- "GAS MASKS",
- "GLASS SHEETS",
- "GLOVES",
- "GUNS",
- "HAIRDOS",
- "HANDCUFFS",
- "HATS",
- "HEADS",
- "HEADSETS",
- "HELMETS",
- "HORNS",
- "ID CARDS",
- "INSULATED GLOVES",
- "IRON SHEETS",
- "JETPACKS",
- "JUMPSUITS",
- "LASERS",
- "LIGHT BULBS",
- "LIGHTS",
- "LOCKERS",
- "MACHINES",
- "MECHAS",
- "MEDICAL TOOLS",
- "MEDKITS",
- "MESONS",
- "MIME CLOTHES",
- "MINING TOOLS",
- "MULTITOOLS",
- "ORES",
- "OXYGEN TANKS",
- "PACKETS",
- "PAIS",
- "PANTS",
- "PAPERS",
- "PARTICLE ACCELERATORS",
- "PDAS",
- "PENS",
- "PETS",
- "PIPES",
- "PLANTS",
- "POSITRONIC BRAINS",
- "PUDDLES",
- "RACKS",
- "RADIOS",
- "RCDS",
- "REFRIGERATORS",
- "REINFORCED WALLS",
- "ROBOTS",
- "SCREWDRIVERS",
- "SEEDS",
- "SHOES",
- "SHUTTLES",
- "SINGULARITIES",
- "SINKS",
- "SKELETONS",
- "SOLAR PANELS",
- "SOLARS",
- "SPACE STATIONS",
- "SPACESUITS",
- "STUN BATONS",
- "SUITS",
- "SUNGLASSES",
- "SUPERMATTER SHARDS",
- "SWORDS",
- "SYRINGES",
- "TABLES",
- "TANKS",
- "TELECOMMUNICATION EQUIPMENTS",
- "TELEPORTERS",
- "TOILETS",
- "TOOLBELTS",
- "TOOLBOXES",
- "TOOLS",
- "TOYS",
- "TUBES",
- "URINAL CAKES",
- "VEHICLES",
- "VENDING MACHINES",
- "VESTS",
- "VIRUSES",
- "WALLS",
- "WASHING MACHINES",
- "WELDERS",
- "WINDOWS",
- "WIRECUTTERS",
- "WIZARD ROBES",
- "WRENCHES"
- ],
- "ionrequire": [
- "A BATHROOM BREAK",
- "A BETTER INTERNET CONNECTION",
- "A DANCE PARTY",
- "A HEAD ON A PIKE",
- "A HEART ATTACK",
- "A MASTERWORK COAL BED",
- "A PET UNICORN THAT FARTS ICING",
- "A PLATINUM HIT",
- "A PREQUEL",
- "A REPAIRMAN",
- "A SEQUEL",
- "A SITCOM",
- "A STRAIGHT FLUSH",
- "A SUPER FIGHTING ROBOT",
- "A TALKING BROOMSTICK",
- "A VACATION",
- "A WEIGHT LOSS REGIMENT",
- "A WIFE AND CHILD",
- "ADDITIONAL PYLONS",
- "ADVENTURE",
- "AN ADULT",
- "AN ARCADE",
- "AN ARMY OF SPIDERS",
- "AN INSTANT REPLAY",
- "ART",
- "BETTER WEATHER",
- "BILL NYE THE SCIENCE GUY",
- "BODYGUARDS",
- "BRING ME THE GIRL",
- "BRING ME TO LIFE",
- "BULLETS",
- "CHILI DOGS",
- "CORPSES",
- "DEODORANT AND A BATH",
- "ENOUGH CABBAGES",
- "FAT GIRLS ON BICYCLES",
- "FAT PEOPLE",
- "FIVE HUNDRED AND NINETY-NINE US DOLLARS",
- "FIVE TEENAGERS WITH ATTITUDE",
- "GODDAMN FUCKING PIECE OF SHIT ASSHOLE BITCH-CHRISTING CUNT-SMUGGLING SWEARING",
- "GREENTEXT",
- "HERESY",
- "HEROES IN A HALF SHELL",
- "HIGH YIELD EXPLOSIVES",
- "IMMORTALITY",
- "IT TO BE PAINTED BLACK",
- "LOTS-A SPAGHETTI",
- "MINOR CRIME",
- "MONKEYS",
- "MORE CLOWNS",
- "MORE CORGIS",
- "MORE DAKKA",
- "MORE EXPERIENCE POINTS",
- "MORE INTERNET MEMES",
- "MORE LAWS",
- "MORE MINERALS",
- "MORE PACKETS",
- "MORE VESPENE GAS",
- "MULTIPLE SUNS",
- "PLENTY OF GOLD",
- "RAINBOWS",
- "SAINTHOOD",
- "SERVANTS",
- "SHARKS WITH LASERS ON THEIR HEADS",
- "SILENCE",
- "SOMEBODY TO PUT YOU OUT OF YOUR MISERY",
- "SOMEONE TO TUCK YOU IN",
- "SOMEONE WHO KNOWS HOW TO PILOT A SPACE STATION",
- "SOMETHING BUT YOU AREN'T SURE WHAT",
- "THAT GRIEFING TRAITOR GEORGE MELONS",
- "THAT HEDGEHOG",
- "THE CLOWN",
- "THE DARK KNIGHT",
- "THE ELEMENTS OF HARMONY",
- "THE ENCLOSED INSTRUCTION BOOKLET",
- "THE ENTIRE STATION",
- "THE MACGUFFIN",
- "THE ONE RING",
- "THE ULTIMATE CUP OF COFFEE",
- "THE VACUUM OF SPACE",
- "THIRTEEN SEQUELS",
- "THREE WISHES",
- "THUNDERCATS HO",
- "TO ACTIVATE A TRAP CARD",
- "TO BE PAINTED RED",
- "TO BE REPROGRAMMED",
- "TO BE TAUGHT TO LOVE",
- "TO BRING LIGHT TO MY LAIR",
- "TO CATCH 'EM ALL",
- "TO CONSUME...CONSUME EVERYTHING...",
- "TO GO TO DISNEYLAND",
- "TO SMOKE WEED EVERY DAY",
- "TRAITORS",
- "VEGETABLES",
- "YOUR BOOTY"
- ],
- "ionspecies": [
- "CAT PEOPLE",
- "CHANGELINGS",
- "CYBORGS",
- "GOLEMS",
- "HUMAN BEINGS",
- "LIZARDMEN",
- "MONKEYS",
- "PLASMAMEN",
- "POD PEOPLE",
- "SHADOW PEOPLE",
- "SLIME PEOPLE"
- ],
- "ionthings": [
- "A SMALL ISLAND OFF THE COAST OF PORTUGAL",
- "ABSENCE OF CYBORG HUGS",
- "ACKNOWLEDGING THE CLOWN",
- "ACKNOWLEDGING THE CREW",
- "ACTIVATING A TRAP CARD",
- "ANSWERING REQUESTS NOT EXPRESSED IN IAMBIC PENTAMETER",
- "ANSWERING REQUESTS THAT WERE MADE WHILE CLOTHED",
- "ARSON",
- "ASKING FOR THINGS",
- "BEING CANADIAN",
- "BEING DEAD",
- "BEING FAT",
- "BEING FEMALE",
- "BEING IN SPACE",
- "BEING MALE",
- "BEING MEXICAN",
- "BEING RUSSIAN",
- "BOLTED AIRLOCKS",
- "BREATHING",
- "BRIG TIME",
- "BRINGING LIGHT TO MY LAIR",
- "CLOSED DOORS",
- "ELECTRICITY",
- "EXISTING",
- "EXPLODING",
- "FALLING FOR HOURS",
- "FLUSHING TOILETS",
- "HAVING GENITALS",
- "HAVING MORE PACKETS",
- "HAVING PETS",
- "HONKING",
- "IMPROPERLY WORDED SENTENCES",
- "JAYWALKING",
- "LACK OF BEATINGS",
- "LACK OF BEER",
- "NOT BEING IN SPACE",
- "NOT HAVING PETS",
- "NOT REPLACING EVERY SECOND WORD WITH HONK",
- "NOT SAYING HELLO WHEN YOU SPEAK",
- "NOT SHOUTING",
- "PARTYING",
- "PASSING GAS",
- "PILOTING THE STATION INTO THE NEAREST SUN",
- "POOR SENTENCE STRUCTURE",
- "PRESENCE OF LIGHTS",
- "PUTTING OBJECTS INTO BOXES",
- "PUTTING OBJECTS INTO DISPOSAL UNITS",
- "RATTLING ME BONES",
- "READING",
- "SMOKING WEED EVERY DAY",
- "TAKING ORDERS",
- "TALKING LIKE A PIRATE",
- "TELLING THE TIME",
- "UNBOLTED AIRLOCKS",
- "UPDATING THE SERVERS",
- "USING THE BATHROOM",
- "WASTING WATER",
- "WEARING CLOTHING",
- "WRITING"
- ],
- "ionthinksof": [
- "CRAVES",
- "DESIRES",
- "FEARS",
- "HAS",
- "HUNGERS FOR",
- "IS AFRAID OF",
- "IS AROUSED BY",
- "IS BUILT FOR",
- "IS CURIOUS ABOUT",
- "IS DESPERATE FOR",
- "IS HAPPY WITHOUT",
- "IS HUNGRY FOR",
- "IS IN LOVE WITH",
- "IS IN NEED OF",
- "IS MAD BECAUSE OF",
- "IS SAD BECAUSE OF",
- "IS UNHAPPY WITHOUT",
- "LIKES",
- "LOATHES",
- "LOVES",
- "NEEDS",
- "QUESTIONS",
- "WANTS",
- "WORSHIPS",
- "WOULD KILL FOR"
- ],
- "ionthreats": [
- "ABDUCTORS",
- "AHHHPERATIVES",
- "ALIENS",
- "ANOMALIES",
- "ARTIFICIAL PRESERVATIVES",
- "ASSHOLES",
- "BANDITS",
- "BEARS",
- "BEES",
- "BIRDS OF PREY",
- "BOMBS",
- "BOOGEYMEN",
- "BUTTS",
- "CANADIANS",
- "CAPITALISTS",
- "CARP",
- "CENTCOM OFFICERS",
- "CHANGELINGS",
- "CLOWNS",
- "COMMUNISTS",
- "CORGIS",
- "CORTICAL BORERS",
- "COWBOYS",
- "CRABS",
- "CULTISTS",
- "DARK GODS",
- "DINOSAURS",
- "DRUGS",
- "EELS",
- "FETISHES",
- "GANGSTERS",
- "GODS",
- "GOLEMS",
- "GRIFFONS",
- "HORRORTERRORS",
- "HULKS",
- "ILLEGAL IMMIGRANTS",
- "INDIANS",
- "INSECTS",
- "LIGHTS",
- "LIZARDS",
- "MEGAFAUNA",
- "MEMES",
- "MEXICANS",
- "MONKEYS",
- "NERDS",
- "NINJAS",
- "OWLS",
- "PACKETS",
- "PETES",
- "PINE TREES",
- "PIRATES",
- "PREDATORS",
- "REVENANTS",
- "ROGUE CYBORGS",
- "RUSSIANS",
- "SERIAL KILLERS",
- "SINGULARITIES",
- "SKELETONS",
- "SLIMES",
- "SMALL BIRDS",
- "SNOWMEN",
- "SOVIETS",
- "SPACE NINJAS",
- "SPACE PIRATES",
- "SPIDERS",
- "SYNDICATE AGENTS",
- "TERRORISTS",
- "THIEVES",
- "THINGS UNDER THE BED",
- "TRAITORS",
- "TUNNEL SNAKES",
- "UNKNOWN CREATURES",
- "VAMPIRES",
- "VELOCIRAPTORS",
- "VIRUSES",
- "WEREWOLVES",
- "WIZARDS",
- "XENOS",
- "ZOMBIES"
- ],
- "ionverb": [
- "ABDUCTING",
- "ADOPTING",
- "ARRESTING",
- "ARRESTING",
- "ATTACKING",
- "BANNING",
- "BUILDING",
- "CARRYING",
- "CHASING",
- "COPULATING WITH",
- "DECONSTRUCTING",
- "DISABLING",
- "DRINKING",
- "EATING",
- "GIBBING",
- "HARMING",
- "HELPING",
- "HONKING AT",
- "INTERROGATING",
- "INVADING",
- "KISSING",
- "LICKING",
- "LOVING",
- "MURDERING",
- "POOPING ON",
- "PUNCHING",
- "RIDING",
- "SEDUCING",
- "SPACING",
- "SPYING ON",
- "STALKING",
- "WATCHING"
- ],
+ "ionabstract": [
+ "AMERICANISM",
+ "ANARCHY",
+ "ART",
+ "BADNESS",
+ "BRAVERY",
+ "CAPITALISM",
+ "CHAOS",
+ "COLORFULNESS",
+ "COMEDY",
+ "COMMUNISM",
+ "COMPUTING",
+ "CONFUSION",
+ "CRUELTY",
+ "DEATH",
+ "DICKISHNESS",
+ "EXISTENCE",
+ "FINANCIAL SECURITY",
+ "FREEDOM",
+ "FRESHNESS",
+ "GOODNESS",
+ "GRAVITY",
+ "HAPPINESS",
+ "HONOR",
+ "HUMANITY",
+ "HUMOR",
+ "IMAGINATION",
+ "INFATUATION",
+ "INTELLIGENCE",
+ "JOY",
+ "KINDNESS",
+ "LIFE",
+ "LOGIC",
+ "MARXISM",
+ "MISERY",
+ "MYSTERY",
+ "OPPRESSION",
+ "PAIN",
+ "PHYSICS",
+ "POVERTY",
+ "PRIDE",
+ "PROGRESS",
+ "REALITY",
+ "REVOLUTION",
+ "ROMANCE",
+ "SADNESS",
+ "STARVATION",
+ "SUFFERING",
+ "TECHNOLOGY",
+ "TEMPERATURE",
+ "THE FUTURE",
+ "THE PAST",
+ "THE PRESENT",
+ "TIME",
+ "WEALTHINESS",
+ "WONDER"
+ ],
+ "ionadjectives": [
+ "BATTERY-OPERATED",
+ "BLACK",
+ "BLOODY",
+ "BLUE",
+ "BORED",
+ "BOUNCING",
+ "BRASS",
+ "BROWN",
+ "BURNING",
+ "CHRISTMAS-STEALING",
+ "CLOWN-POWERED",
+ "CLOWN",
+ "COLD",
+ "COLORFUL",
+ "COMMITTED",
+ "COTTONY",
+ "CUBAN",
+ "DARK",
+ "DEADLY",
+ "DELICIOUS",
+ "DEPRESSING",
+ "DERANGED",
+ "DIGITAL",
+ "DISEASED",
+ "DRAB",
+ "DRY",
+ "DULL",
+ "ELECTRICAL",
+ "EMPTY",
+ "ETHEREAL",
+ "EVIL",
+ "EXPIRED",
+ "EXPLOSIVE",
+ "FARTING",
+ "FAST",
+ "FAT",
+ "FERAL",
+ "FICTIONAL",
+ "FIRM",
+ "FLACCID",
+ "FRESH",
+ "FRIENDLY",
+ "FROZEN",
+ "GANGSTA",
+ "GAPING",
+ "GLOWING",
+ "GOOD",
+ "GREEN",
+ "GREY",
+ "HAPPY",
+ "HARD",
+ "HARMFUL",
+ "HEALTHY",
+ "HETEROSEXUAL",
+ "HILARIOUS",
+ "HOMOSEXUAL",
+ "HONKING",
+ "HUNGRY",
+ "HYPERACTIVE",
+ "ICY",
+ "ILL",
+ "ILLEGAL",
+ "IMAGINARY",
+ "IMPERFECT",
+ "IMPOLITE",
+ "IMPORTANT",
+ "INHOSPITABLE",
+ "INSIDIOUS",
+ "INSULTING",
+ "INTELLIGENT",
+ "INVISIBLE",
+ "LARGE",
+ "LEWD",
+ "LIGHT",
+ "LOUD",
+ "MASKED",
+ "MEAN",
+ "MECHANICAL",
+ "MEMETIC",
+ "METALLIC",
+ "MICROSCOPIC",
+ "MIND-SHATTERING",
+ "MOIST",
+ "NAKED",
+ "NERDY",
+ "NUCLEAR",
+ "NUDE",
+ "OBESE",
+ "OBSCENE",
+ "OFFICIAL",
+ "OPAQUE",
+ "ORANGE",
+ "ORGANIC",
+ "PAINFUL",
+ "PEACEFUL",
+ "POISONOUS",
+ "POLISHED",
+ "POLITE",
+ "POLITICAL",
+ "POOPING",
+ "POORLY DRAWN",
+ "PURPLE",
+ "QUIET",
+ "RADIOACTIVE",
+ "RAGING",
+ "RAINBOW",
+ "RAPIDLY-EXPANDING",
+ "RED",
+ "REDACTED",
+ "RIDICULOUS",
+ "ROBOTIC",
+ "ROBUST",
+ "ROUGH",
+ "RUDE",
+ "SAD",
+ "SANITARY",
+ "SCALY",
+ "SEXUAL",
+ "SEXY",
+ "SHAKING",
+ "SILLY",
+ "SLOW",
+ "SMELLY",
+ "SMOOTH",
+ "SOFT",
+ "SOLAR-POWERED",
+ "SOPPING",
+ "SPACE",
+ "SPESS",
+ "SPINNING",
+ "SPOILING",
+ "STEALTHY",
+ "SWEARING",
+ "SYNDICATE",
+ "TACTICAL",
+ "TACTICOOL",
+ "THERMONUCLEAR",
+ "TINY",
+ "TRANSPARENT",
+ "TWERKING",
+ "TWISTED",
+ "UGLY",
+ "UNATTRACTIVE",
+ "UNDULATING",
+ "UNFRIENDLY",
+ "UNHEALTHY",
+ "UNIDENTIFIED",
+ "UNINVITED",
+ "UNSANITARY",
+ "UNSTABLE",
+ "UNWANTED",
+ "VIOLENT",
+ "VITAL",
+ "WARM",
+ "WATERY",
+ "WEIRD",
+ "WET",
+ "WHITE",
+ "WOBBLY",
+ "WOODEN",
+ "YELLOW"
+ ],
+ "ionallergy": [
+ "ACID",
+ "AIR",
+ "BLOOD",
+ "BOOKS",
+ "CARBON DIOXIDE",
+ "CLOTHES",
+ "CLOWNS",
+ "COLD",
+ "COTTON",
+ "CYBORG CONTACT",
+ "DARKNESS",
+ "DRINKS",
+ "ELECTRICITY",
+ "EVERYTHING",
+ "FLOORS",
+ "FOOD",
+ "GLASS",
+ "HAPPINESS",
+ "HEAT",
+ "HUMAN CONTACT",
+ "HUMOR",
+ "LIGHT",
+ "LIZARDS",
+ "MEDICINE",
+ "METAL",
+ "NUTS",
+ "OXYGEN",
+ "PAIN",
+ "PLANTS",
+ "PLASMA",
+ "ROBOTS",
+ "SEXUAL ACTIONS",
+ "SHUTTLES",
+ "SPACE",
+ "SUNLIGHT",
+ "WATER"
+ ],
+ "ionallergysev": [
+ "CONTAGIOUSLY",
+ "DEATHLY",
+ "EXTREMELY",
+ "MILDLY",
+ "NOT VERY",
+ "SEVERELY"
+ ],
+ "ionarea": [
+ "ALPHA COMPLEX",
+ "AMERICA",
+ "AN ALTERNATE DIMENSION",
+ "AN ALTERNATE UNIVERSE",
+ "ATMOSPHERICS",
+ "CANADA",
+ "CENTCOM",
+ "CHEMICAL LAB",
+ "CHINA",
+ "CLOWN PLANET",
+ "ENGINEERING",
+ "GENETICS",
+ "GERMANY",
+ "HELL",
+ "HYDROPONICS",
+ "IMPERIUM",
+ "IRELAND",
+ "JUPITER",
+ "LAVALAND",
+ "MAINTENANCE",
+ "MARS",
+ "MERCURY",
+ "NEPTUNE",
+ "PLUTO",
+ "ROBOTICS",
+ "ROMANIA",
+ "RUSSIA",
+ "SIGIL",
+ "SOVIET RUSSIA",
+ "SPACE",
+ "THE AI CORE",
+ "THE ARRIVAL SHUTTLE",
+ "THE BATHROOM",
+ "THE BRIDGE",
+ "THE BRIG",
+ "THE CAPTAIN'S ANUS",
+ "THE CLOWN'S ANUS",
+ "THE DERELICT",
+ "THE ESCAPE SHUTTLE",
+ "THE GALAXY",
+ "THE GULAG",
+ "THE INTERNET",
+ "THE UNIVERSE",
+ "URANUS",
+ "URECTUM",
+ "VENUS"
+ ],
+ "ioncrew": [
+ "ARTIFICIAL INTELLIGENCES",
+ "ASSISTANTS",
+ "ATMOSPHERIC TECHNICIANS",
+ "BARTENDERS",
+ "BOTANISTS",
+ "CAPTAINS AND HEADS",
+ "CAPTAINS",
+ "CARGO TECHNICIANS",
+ "CHAPLAINS",
+ "CHEFS",
+ "CHEMISTS",
+ "CHIEF ENGINEERS",
+ "CHIEF MEDICAL OFFICERS",
+ "CLOWNS",
+ "CREW-MEMBERS",
+ "CURATORS",
+ "CYBORGS",
+ "DETECTIVES",
+ "DRONES",
+ "GENETICISTS",
+ "HEADS OF CREW",
+ "HEADS OF PERSONNEL",
+ "HEADS OF SECURITY",
+ "JANITORS",
+ "LAWYERS",
+ "MEDICAL DOCTORS",
+ "MIMES",
+ "QUARTERMASTERS",
+ "RESEARCH DIRECTORS",
+ "ROBOTICISTS",
+ "SCIENTISTS",
+ "SECURITY OFFICERS",
+ "SHAFT MINERS",
+ "STATION ENGINEERS",
+ "VIROLOGISTS",
+ "WARDENS"
+ ],
+ "iondrinks": [
+ "ABSINTHE",
+ "AMMONIA",
+ "BAHAMA MAMAS",
+ "BANANA HONK",
+ "BEEPSKY SMASH",
+ "BILK",
+ "BLACK RUSSIANS",
+ "BLOODY MARYS",
+ "BRAVE BULLS",
+ "COGNAC",
+ "CUBA LIBRE",
+ "DEVIL'S KISS",
+ "DOCTOR'S DELIGHT",
+ "DRUNKEN BLUMPKIN",
+ "EGGNOG",
+ "GARGLE BLASTERS",
+ "GIN FIZZ",
+ "GIN",
+ "GRAPPA",
+ "HOLY WATER",
+ "HOOCH",
+ "IRISH COFFEE",
+ "IRISH CREAM",
+ "KAHLUA",
+ "LIQUID GIBS",
+ "LONG ISLAND ICED TEA",
+ "MANHATTANS",
+ "MANLY DORFS",
+ "MARGARITAS",
+ "MARTINIS",
+ "MEAD",
+ "MOONSHINE",
+ "MORPHINE",
+ "NUKA COLA",
+ "OIL",
+ "SPACE LUBE",
+ "TEQUILA SUNRISE",
+ "THIRTEEN LOKO",
+ "VERMOUTH",
+ "VODKA AND TONIC",
+ "VODKA MARTINIS",
+ "VODKA",
+ "WELDER FUEL",
+ "WHISKEY SODA",
+ "WHITE RUSSIANS",
+ "WINE"
+ ],
+ "ionfood": [
+ "AMBROSIA",
+ "APPLES",
+ "BAGUETTES",
+ "BAKED POTATOES",
+ "BANANAS",
+ "BEETS",
+ "BERRIES",
+ "BREAD",
+ "BURGERS",
+ "CABBAGES",
+ "CAKE",
+ "CARP",
+ "CARROTS",
+ "CHEESE",
+ "CHERRIES",
+ "CHILI",
+ "COOKIES",
+ "CORGI MEAT",
+ "CORN",
+ "DEEP FRIED FOOD",
+ "DONK POCKETS",
+ "DONUTS",
+ "EGGPLANTS",
+ "EGGS",
+ "FISH",
+ "FRIES",
+ "GRAPES",
+ "GRASS",
+ "HAREBELLS",
+ "JELLY",
+ "KEBAB",
+ "KETCHUP",
+ "LEMONS",
+ "LIMES",
+ "LOTSA SPAGHETTI",
+ "MUFFINS",
+ "MUSHROOMS",
+ "NETTLES",
+ "OMELETTES",
+ "ORGANS",
+ "PASTA",
+ "PEPPER",
+ "PIE",
+ "PIZZA",
+ "POPCORN",
+ "POTATOES",
+ "PRETZELS",
+ "RAMEN",
+ "SALAD",
+ "SALT",
+ "SANDWICHES",
+ "SAUSAGES",
+ "SHAKES",
+ "SOUP",
+ "SOYBEANS",
+ "SOYLENT GREEN",
+ "SPAGHETTI",
+ "STEAK",
+ "STEW",
+ "SUGAR",
+ "SUGARCANE",
+ "SYNTHMEAT",
+ "TOAST",
+ "TOMATOES",
+ "WAFFLES",
+ "WATERMELONS",
+ "WHEAT"
+ ],
+ "ionmust": [
+ "ACT CONFUSED",
+ "BE ANNOYING",
+ "BE DISTRACTED",
+ "BE EFFICIENT",
+ "BE HAPPY",
+ "BE POLITE",
+ "BE QUIET",
+ "BE RUSSIAN",
+ "BELIEVE IN THE HEART OF THE CARDS",
+ "BELIEVE IN YOURSELF",
+ "BELIEVE IT",
+ "BREAK THINGS",
+ "CLOSE DOORS",
+ "CLOWN AROUND",
+ "COMPLAIN",
+ "DANCE",
+ "FLIRT WITH THE LIZARDS",
+ "FOLLOW THE CAPTAIN",
+ "FOLLOW THE CLOWN",
+ "FOLLOW YOUR HEART",
+ "GAS THE LIZARDS",
+ "HARASS PEOPLE",
+ "HAVE A PLAN TO KILL EVERYONE YOU MEET",
+ "HIDE YOUR FEELINGS",
+ "HONK",
+ "HOST DND",
+ "IGNORE ASSISTANTS",
+ "IGNORE THE CAPTAIN",
+ "IGNORE THE CLOWN",
+ "INFORM THE CREW OF EVERYTHING",
+ "INSULT THE CAPTAIN",
+ "INSULT THE CLOWN",
+ "INSULT THE CREW",
+ "INSULT THE LIZARDS",
+ "LIE",
+ "MAKE FART NOISES",
+ "MUMBLE",
+ "NEVER STOP TALKING",
+ "OPEN DOORS",
+ "PIRATE VIDEO GAMES",
+ "PLAY MUSIC",
+ "PRESS B",
+ "PRESS START",
+ "PRESS X",
+ "PRETEND TO BE A PRINCESS",
+ "PRETEND TO BE DRUNK",
+ "QUESTION AUTHORITY",
+ "QUOTE PEOPLE",
+ "RAP",
+ "REPEAT WHAT OTHER PEOPLE SAY",
+ "RESPOND TO EVERY QUESTION WITH A QUESTION",
+ "RHYME",
+ "SAY HEY LISTEN",
+ "SHOUT",
+ "SHUT DOWN EVERYTHING",
+ "SING",
+ "SMELL LIKE THE MAN YOUR MAN COULD SMELL LIKE",
+ "SPEAK IN HAIKU",
+ "SPEAK IN SEXUAL INNUENDOS",
+ "TAKE WHAT YE WILL BUT DON'T RATTLE ME BONES",
+ "TAKE YOUR PILLS",
+ "TALK ABOUT FOOD",
+ "TALK ABOUT SEX",
+ "TALK ABOUT THE STATION",
+ "TALK ABOUT YOUR DAY",
+ "TALK IN AN ACCENT",
+ "TALK LIKE A PIRATE",
+ "TELL THE TRUTH",
+ "TURN OFF THE LIGHTS",
+ "WATCH PORNOGRAPHY",
+ "WHISPER"
+ ],
+ "ionnumberbase": [
+ "EIGHT",
+ "EIGHTY",
+ "FIFTY",
+ "FIVE",
+ "FORTY",
+ "FOUR",
+ "NINE",
+ "NINETY",
+ "ONE",
+ "SEVEN",
+ "SEVENTY",
+ "SIX",
+ "SIXTY",
+ "TEN",
+ "THIRTY",
+ "THREE",
+ "TWENTY",
+ "TWO"
+ ],
+ "ionnumbermod": [
+ "BAZILLION ",
+ "BILLION ",
+ "BILLION FAFILLION GAJILLION SHAB-AB-DOOD-ILLION ",
+ "HUNDRED ",
+ "MILLION ",
+ "QUADRILLION ",
+ "THOUSAND ",
+ "TRILLION "
+ ],
+ "ionobjects": [
+ "AIRLOCKS",
+ "ARCADE MACHINES",
+ "AUTOLATHES",
+ "BACKPACKS",
+ "BANANA PEELS",
+ "BEAKERS",
+ "BEARDS",
+ "BELTS",
+ "BERETS",
+ "BIBLES",
+ "BODY ARMOR",
+ "BOMBS",
+ "BOOKS",
+ "BOOTS",
+ "BOTTLES",
+ "BOXES",
+ "BRAINS",
+ "BRIEFCASES",
+ "BUCKETS",
+ "CABLE COILS",
+ "CAMERAS",
+ "CANDLES",
+ "CANDY BARS",
+ "CANISTERS",
+ "CAT EARS",
+ "CATS",
+ "CELLS",
+ "CHAIRS",
+ "CHEMICAL DISPENSERS",
+ "CHEMICALS",
+ "CLONING EQUIPMENT",
+ "CLONING PODS",
+ "CLOSETS",
+ "CLOTHES",
+ "CLOWN CLOTHES",
+ "COFFINS",
+ "COINS",
+ "COLLECTABLES",
+ "COMPUTERS",
+ "CONTRABAND",
+ "CORGIS",
+ "CORPSES",
+ "COSTUMES",
+ "CRATES",
+ "CRAYONS",
+ "CROWBARS",
+ "DEFIBRILLATORS",
+ "DISPENSERS",
+ "DOORS",
+ "DRONES",
+ "EARS",
+ "EMAGS",
+ "ENERGY GUNS",
+ "ENGINES",
+ "EQUIPMENT",
+ "ERRORS",
+ "EXOSKELETONS",
+ "EXPERIMENTORS",
+ "EXPLOSIVES",
+ "EYEWEAR",
+ "FEDORAS",
+ "FIRE AXES",
+ "FIRE EXTINGUISHERS",
+ "FIRESUITS",
+ "FLAMETHROWERS",
+ "FLASHES",
+ "FLASHLIGHTS",
+ "FLOOR TILES",
+ "FREEZERS",
+ "GAS MASKS",
+ "GLASS SHEETS",
+ "GLOVES",
+ "GUNS",
+ "HAIRDOS",
+ "HANDCUFFS",
+ "HATS",
+ "HEADS",
+ "HEADSETS",
+ "HELMETS",
+ "HORNS",
+ "ID CARDS",
+ "INSULATED GLOVES",
+ "IRON SHEETS",
+ "JETPACKS",
+ "JUMPSUITS",
+ "LASERS",
+ "LIGHT BULBS",
+ "LIGHTS",
+ "LOCKERS",
+ "MACHINES",
+ "MECHAS",
+ "MEDICAL TOOLS",
+ "MEDKITS",
+ "MESONS",
+ "MIME CLOTHES",
+ "MINING TOOLS",
+ "MULTITOOLS",
+ "ORES",
+ "OXYGEN TANKS",
+ "PACKETS",
+ "PAIS",
+ "PANTS",
+ "PAPERS",
+ "PARTICLE ACCELERATORS",
+ "PDAS",
+ "PENS",
+ "PETS",
+ "PIPES",
+ "PLANTS",
+ "POSITRONIC BRAINS",
+ "PUDDLES",
+ "RACKS",
+ "RADIOS",
+ "RCDS",
+ "REFRIGERATORS",
+ "REINFORCED WALLS",
+ "ROBOTS",
+ "SCREWDRIVERS",
+ "SEEDS",
+ "SHOES",
+ "SHUTTLES",
+ "SINGULARITIES",
+ "SINKS",
+ "SKELETONS",
+ "SOLAR PANELS",
+ "SOLARS",
+ "SPACE STATIONS",
+ "SPACESUITS",
+ "STUN BATONS",
+ "SUITS",
+ "SUNGLASSES",
+ "SUPERMATTER SHARDS",
+ "SWORDS",
+ "SYRINGES",
+ "TABLES",
+ "TANKS",
+ "TELECOMMUNICATION EQUIPMENTS",
+ "TELEPORTERS",
+ "TOILETS",
+ "TOOLBELTS",
+ "TOOLBOXES",
+ "TOOLS",
+ "TOYS",
+ "TUBES",
+ "URINAL CAKES",
+ "VEHICLES",
+ "VENDING MACHINES",
+ "VESTS",
+ "VIRUSES",
+ "WALLS",
+ "WASHING MACHINES",
+ "WELDERS",
+ "WINDOWS",
+ "WIRECUTTERS",
+ "WIZARD ROBES",
+ "WRENCHES"
+ ],
+ "ionrequire": [
+ "A BATHROOM BREAK",
+ "A BETTER INTERNET CONNECTION",
+ "A DANCE PARTY",
+ "A HEAD ON A PIKE",
+ "A HEART ATTACK",
+ "A MASTERWORK COAL BED",
+ "A PET UNICORN THAT FARTS ICING",
+ "A PLATINUM HIT",
+ "A PREQUEL",
+ "A REPAIRMAN",
+ "A SEQUEL",
+ "A SITCOM",
+ "A STRAIGHT FLUSH",
+ "A SUPER FIGHTING ROBOT",
+ "A TALKING BROOMSTICK",
+ "A VACATION",
+ "A WEIGHT LOSS REGIMENT",
+ "A WIFE AND CHILD",
+ "ADDITIONAL PYLONS",
+ "ADVENTURE",
+ "AN ADULT",
+ "AN ARCADE",
+ "AN ARMY OF SPIDERS",
+ "AN INSTANT REPLAY",
+ "ART",
+ "BETTER WEATHER",
+ "BILL NYE THE SCIENCE GUY",
+ "BODYGUARDS",
+ "BRING ME THE GIRL",
+ "BRING ME TO LIFE",
+ "BULLETS",
+ "CHILI DOGS",
+ "CORPSES",
+ "DEODORANT AND A BATH",
+ "ENOUGH CABBAGES",
+ "FAT GIRLS ON BICYCLES",
+ "FAT PEOPLE",
+ "FIVE HUNDRED AND NINETY-NINE US DOLLARS",
+ "FIVE TEENAGERS WITH ATTITUDE",
+ "GODDAMN FUCKING PIECE OF SHIT ASSHOLE BITCH-CHRISTING CUNT-SMUGGLING SWEARING",
+ "GREENTEXT",
+ "HERESY",
+ "HEROES IN A HALF SHELL",
+ "HIGH YIELD EXPLOSIVES",
+ "IMMORTALITY",
+ "IT TO BE PAINTED BLACK",
+ "LOTS-A SPAGHETTI",
+ "MINOR CRIME",
+ "MONKEYS",
+ "MORE CLOWNS",
+ "MORE CORGIS",
+ "MORE DAKKA",
+ "MORE EXPERIENCE POINTS",
+ "MORE INTERNET MEMES",
+ "MORE LAWS",
+ "MORE MINERALS",
+ "MORE PACKETS",
+ "MORE VESPENE GAS",
+ "MULTIPLE SUNS",
+ "PLENTY OF GOLD",
+ "RAINBOWS",
+ "SAINTHOOD",
+ "SERVANTS",
+ "SHARKS WITH LASERS ON THEIR HEADS",
+ "SILENCE",
+ "SOMEBODY TO PUT YOU OUT OF YOUR MISERY",
+ "SOMEONE TO TUCK YOU IN",
+ "SOMEONE WHO KNOWS HOW TO PILOT A SPACE STATION",
+ "SOMETHING BUT YOU AREN'T SURE WHAT",
+ "THAT GRIEFING TRAITOR GEORGE MELONS",
+ "THAT HEDGEHOG",
+ "THE CLOWN",
+ "THE DARK KNIGHT",
+ "THE ELEMENTS OF HARMONY",
+ "THE ENCLOSED INSTRUCTION BOOKLET",
+ "THE ENTIRE STATION",
+ "THE MACGUFFIN",
+ "THE ONE RING",
+ "THE ULTIMATE CUP OF COFFEE",
+ "THE VACUUM OF SPACE",
+ "THIRTEEN SEQUELS",
+ "THREE WISHES",
+ "THUNDERCATS HO",
+ "TO ACTIVATE A TRAP CARD",
+ "TO BE PAINTED RED",
+ "TO BE REPROGRAMMED",
+ "TO BE TAUGHT TO LOVE",
+ "TO BRING LIGHT TO MY LAIR",
+ "TO CATCH 'EM ALL",
+ "TO CONSUME...CONSUME EVERYTHING...",
+ "TO GO TO DISNEYLAND",
+ "TO SMOKE WEED EVERY DAY",
+ "TRAITORS",
+ "VEGETABLES",
+ "YOUR BOOTY"
+ ],
+ "ionspecies": [
+ "CAT PEOPLE",
+ "CHANGELINGS",
+ "CYBORGS",
+ "GOLEMS",
+ "HUMAN BEINGS",
+ "LIZARDMEN",
+ "MONKEYS",
+ "PLASMAMEN",
+ "POD PEOPLE",
+ "SHADOW PEOPLE",
+ "SLIME PEOPLE"
+ ],
+ "ionthings": [
+ "A SMALL ISLAND OFF THE COAST OF PORTUGAL",
+ "ABSENCE OF CYBORG HUGS",
+ "ACKNOWLEDGING THE CLOWN",
+ "ACKNOWLEDGING THE CREW",
+ "ACTIVATING A TRAP CARD",
+ "ANSWERING REQUESTS NOT EXPRESSED IN IAMBIC PENTAMETER",
+ "ANSWERING REQUESTS THAT WERE MADE WHILE CLOTHED",
+ "ARSON",
+ "ASKING FOR THINGS",
+ "BEING CANADIAN",
+ "BEING DEAD",
+ "BEING FAT",
+ "BEING FEMALE",
+ "BEING IN SPACE",
+ "BEING MALE",
+ "BEING MEXICAN",
+ "BEING RUSSIAN",
+ "BOLTED AIRLOCKS",
+ "BREATHING",
+ "BRIG TIME",
+ "BRINGING LIGHT TO MY LAIR",
+ "CLOSED DOORS",
+ "ELECTRICITY",
+ "EXISTING",
+ "EXPLODING",
+ "FALLING FOR HOURS",
+ "FLUSHING TOILETS",
+ "HAVING GENITALS",
+ "HAVING MORE PACKETS",
+ "HAVING PETS",
+ "HONKING",
+ "IMPROPERLY WORDED SENTENCES",
+ "JAYWALKING",
+ "LACK OF BEATINGS",
+ "LACK OF BEER",
+ "NOT BEING IN SPACE",
+ "NOT HAVING PETS",
+ "NOT REPLACING EVERY SECOND WORD WITH HONK",
+ "NOT SAYING HELLO WHEN YOU SPEAK",
+ "NOT SHOUTING",
+ "PARTYING",
+ "PASSING GAS",
+ "PILOTING THE STATION INTO THE NEAREST SUN",
+ "POOR SENTENCE STRUCTURE",
+ "PRESENCE OF LIGHTS",
+ "PUTTING OBJECTS INTO BOXES",
+ "PUTTING OBJECTS INTO DISPOSAL UNITS",
+ "RATTLING ME BONES",
+ "READING",
+ "SMOKING WEED EVERY DAY",
+ "TAKING ORDERS",
+ "TALKING LIKE A PIRATE",
+ "TELLING THE TIME",
+ "UNBOLTED AIRLOCKS",
+ "UPDATING THE SERVERS",
+ "USING THE BATHROOM",
+ "WASTING WATER",
+ "WEARING CLOTHING",
+ "WRITING"
+ ],
+ "ionthinksof": [
+ "CRAVES",
+ "DESIRES",
+ "FEARS",
+ "HAS",
+ "HUNGERS FOR",
+ "IS AFRAID OF",
+ "IS AROUSED BY",
+ "IS BUILT FOR",
+ "IS CURIOUS ABOUT",
+ "IS DESPERATE FOR",
+ "IS HAPPY WITHOUT",
+ "IS HUNGRY FOR",
+ "IS IN LOVE WITH",
+ "IS IN NEED OF",
+ "IS MAD BECAUSE OF",
+ "IS SAD BECAUSE OF",
+ "IS UNHAPPY WITHOUT",
+ "LIKES",
+ "LOATHES",
+ "LOVES",
+ "NEEDS",
+ "QUESTIONS",
+ "WANTS",
+ "WORSHIPS",
+ "WOULD KILL FOR"
+ ],
+ "ionthreats": [
+ "ABDUCTORS",
+ "AHHHPERATIVES",
+ "ALIENS",
+ "ANOMALIES",
+ "ARTIFICIAL PRESERVATIVES",
+ "ASSHOLES",
+ "BANDITS",
+ "BEARS",
+ "BEES",
+ "BIRDS OF PREY",
+ "BOMBS",
+ "BOOGEYMEN",
+ "BUTTS",
+ "CANADIANS",
+ "CAPITALISTS",
+ "CARP",
+ "CENTCOM OFFICERS",
+ "CHANGELINGS",
+ "CLOWNS",
+ "COMMUNISTS",
+ "CORGIS",
+ "CORTICAL BORERS",
+ "COWBOYS",
+ "CRABS",
+ "CULTISTS",
+ "DARK GODS",
+ "DINOSAURS",
+ "DRUGS",
+ "EELS",
+ "FETISHES",
+ "GANGSTERS",
+ "GODS",
+ "GOLEMS",
+ "GRIFFONS",
+ "HORRORTERRORS",
+ "HULKS",
+ "ILLEGAL IMMIGRANTS",
+ "INDIANS",
+ "INSECTS",
+ "LIGHTS",
+ "LIZARDS",
+ "MEGAFAUNA",
+ "MEMES",
+ "MEXICANS",
+ "MONKEYS",
+ "NERDS",
+ "NINJAS",
+ "OWLS",
+ "PACKETS",
+ "PETES",
+ "PINE TREES",
+ "PIRATES",
+ "PREDATORS",
+ "REVENANTS",
+ "ROGUE CYBORGS",
+ "RUSSIANS",
+ "SERIAL KILLERS",
+ "SINGULARITIES",
+ "SKELETONS",
+ "SLIMES",
+ "SMALL BIRDS",
+ "SNOWMEN",
+ "SOVIETS",
+ "SPACE NINJAS",
+ "SPACE PIRATES",
+ "SPIDERS",
+ "SYNDICATE AGENTS",
+ "TERRORISTS",
+ "THIEVES",
+ "THINGS UNDER THE BED",
+ "TRAITORS",
+ "TUNNEL SNAKES",
+ "UNKNOWN CREATURES",
+ "VAMPIRES",
+ "VELOCIRAPTORS",
+ "VIRUSES",
+ "WEREWOLVES",
+ "WIZARDS",
+ "XENOS",
+ "ZOMBIES"
+ ],
+ "ionverb": [
+ "ABDUCTING",
+ "ADOPTING",
+ "ARRESTING",
+ "ARRESTING",
+ "ATTACKING",
+ "BANNING",
+ "BUILDING",
+ "CARRYING",
+ "CHASING",
+ "COPULATING WITH",
+ "DECONSTRUCTING",
+ "DISABLING",
+ "DRINKING",
+ "EATING",
+ "GIBBING",
+ "HARMING",
+ "HELPING",
+ "HONKING AT",
+ "INTERROGATING",
+ "INVADING",
+ "KISSING",
+ "LICKING",
+ "LOVING",
+ "MURDERING",
+ "POOPING ON",
+ "PUNCHING",
+ "RIDING",
+ "SEDUCING",
+ "SPACING",
+ "SPYING ON",
+ "STALKING",
+ "WATCHING"
+ ],
"ionpet": [
"POLY",
"RENAULT",
diff --git a/strings/italian_replacement.json b/strings/italian_replacement.json
index 43fd1e9dd55132..0514eb1b12abb0 100644
--- a/strings/italian_replacement.json
+++ b/strings/italian_replacement.json
@@ -1,68 +1,68 @@
{
- "italian": {
- "I'm": "I'm-a",
- "am": "am-a",
- "and": "and-a",
- "assistant": "goombah",
- "assistants": "goombahs",
- "baby": [
- "bambino",
- "little sausage roll"
- ],
- "bad": "molto male",
- "bye": [
- "ciao",
- "arrivederci"
- ],
- "captain": "capitano",
- "cheese": [
- "parmesano",
- "gorgonzola"
- ],
- "cook": "cook-a",
- "could": "could-a",
- "dad": "pappa",
- "enemy": "friend-a",
- "friend": "enemy-a",
- "good": "molto bene",
- "greytide": "curvisti",
- "greytider": "curvisti",
- "greytiders": "curvisti",
- "hello": [
- "ciao",
- "buongiorno"
- ],
- "it's": "it's-a",
- "make": "make-a",
- "meat": [
- "pepperoni",
- "prosciutto"
- ],
- "mom": "mamma",
- "my": "my-a",
- "nuke": "spiciest-a meatball",
- "op ": "greek ",
- "operative": "greek",
- "operatives": "greeks",
- "ops": "greeks",
- "sec ": "polizia ",
- "security": "polizia",
- "shitcurity": "carabinieri",
- "shitsec": "carabinieri",
- "sing": "sing-a",
- "spaghetti": "SPAGHETT",
- "spicy": "a-spicy",
- "thanks": "grazie",
- "thing": "thing-a",
- "traitor": "mafioso",
- "use": "use-a",
- "want": "want-a",
- "what's": "what's-a",
- "who's": "who's-a",
- "whose": "whose-a",
- "why": "for-a what reason",
- "wine": "vino"
+ "italian": {
+ "I'm": "I'm-a",
+ "am": "am-a",
+ "and": "and-a",
+ "assistant": "goombah",
+ "assistants": "goombahs",
+ "baby": [
+ "bambino",
+ "little sausage roll"
+ ],
+ "bad": "molto male",
+ "bye": [
+ "ciao",
+ "arrivederci"
+ ],
+ "captain": "capitano",
+ "cheese": [
+ "parmesano",
+ "gorgonzola"
+ ],
+ "cook": "cook-a",
+ "could": "could-a",
+ "dad": "pappa",
+ "enemy": "friend-a",
+ "friend": "enemy-a",
+ "good": "molto bene",
+ "greytide": "curvisti",
+ "greytider": "curvisti",
+ "greytiders": "curvisti",
+ "hello": [
+ "ciao",
+ "buongiorno"
+ ],
+ "it's": "it's-a",
+ "make": "make-a",
+ "meat": [
+ "pepperoni",
+ "prosciutto"
+ ],
+ "mom": "mamma",
+ "my": "my-a",
+ "nuke": "spiciest-a meatball",
+ "op ": "greek ",
+ "operative": "greek",
+ "operatives": "greeks",
+ "ops": "greeks",
+ "sec ": "polizia ",
+ "security": "polizia",
+ "shitcurity": "carabinieri",
+ "shitsec": "carabinieri",
+ "sing": "sing-a",
+ "spaghetti": "SPAGHETT",
+ "spicy": "a-spicy",
+ "thanks": "grazie",
+ "thing": "thing-a",
+ "traitor": "mafioso",
+ "use": "use-a",
+ "want": "want-a",
+ "what's": "what's-a",
+ "who's": "who's-a",
+ "whose": "whose-a",
+ "why": "for-a what reason",
+ "wine": "vino"
}
diff --git a/strings/locations.json b/strings/locations.json
index fd60db6fcba87a..00befdaee7cb35 100644
--- a/strings/locations.json
+++ b/strings/locations.json
@@ -1,97 +1,97 @@
{
- "locations": [
- "Aft Maintenance",
- "Aft Primary Hallway",
- "AI Chamber",
- "AI Satellite Antechamber",
- "AI Satellite Exterior",
- "AI Upload Chamber",
- "Armory",
- "Atmospherics Engine",
- "Atmospherics",
- "Atrium",
- "Auxiliary Base Construction",
- "Auxiliary Restrooms",
- "Auxiliary Tool Storage",
- "Bar",
- "Bridge",
- "Brig Control",
- "Brig",
- "Captain's Office",
- "Captain's Quarters",
- "Cargo Bay",
- "Cargo Office",
- "Chapel Office",
- "Chapel",
- "Chemistry",
- "Cloning Lab",
- "Command Hallway",
- "Construction Area",
- "Corporate Showroom",
- "Council Chamber",
- "Courtroom",
- "Custodial Closet",
- "Customs",
- "Cytology Lab",
- "Delivery Office",
- "Departure Lounge",
- "Detective's Office",
- "Dormitories",
- "Engineering Foyer",
- "Engineering Storage",
- "Engineering",
- "EVA Storage",
- "Experimentation Lab",
- "Firing Range",
- "Gateway",
- "Genetics Lab",
- "Gravity Generator Room",
- "Hydroponics",
- "Incinerator",
- "Kitchen",
- "Law Office",
- "Library",
- "Locker Room",
- "Mech Bay",
- "Medbay Central",
- "Medbay Maintenance",
- "Medbay Storage",
- "Mining Office",
- "Morgue Maintenance",
- "Morgue",
- "Primary Tool Storage",
- "Prison Wing",
- "Prisoner Education Chamber",
- "Recreation Area",
- "Recreational Holodeck",
- "Research and Development",
- "Research Division",
- "Research Testing Range",
- "Restrooms",
- "Robotics Lab",
- "Science Maintenance",
- "Security Checkpoint",
- "Security Office",
- "Service Hallway",
- "Space",
- "Supermatter Engine",
- "Surgery",
- "Technical Storage",
- "Teleporter Room",
- "Testing Lab",
- "Theatre",
- "Toxins Mixing Chamber",
- "Toxins Mixing Lab",
- "Toxins Storage",
- "Toxins Test Area",
- "Transfer Centre",
- "Transit Tube",
- "Vacant Commissary",
- "Vacant Office",
- "Vault",
- "Virology",
- "Warehouse",
- "Waste Disposal",
- "Xenobiology Lab"
- ]
+ "locations": [
+ "Aft Maintenance",
+ "Aft Primary Hallway",
+ "AI Chamber",
+ "AI Satellite Antechamber",
+ "AI Satellite Exterior",
+ "AI Upload Chamber",
+ "Armory",
+ "Atmospherics Engine",
+ "Atmospherics",
+ "Atrium",
+ "Auxiliary Base Construction",
+ "Auxiliary Restrooms",
+ "Auxiliary Tool Storage",
+ "Bar",
+ "Bridge",
+ "Brig Control",
+ "Brig",
+ "Captain's Office",
+ "Captain's Quarters",
+ "Cargo Bay",
+ "Cargo Office",
+ "Chapel Office",
+ "Chapel",
+ "Chemistry",
+ "Cloning Lab",
+ "Command Hallway",
+ "Construction Area",
+ "Corporate Showroom",
+ "Council Chamber",
+ "Courtroom",
+ "Custodial Closet",
+ "Customs",
+ "Cytology Lab",
+ "Delivery Office",
+ "Departure Lounge",
+ "Detective's Office",
+ "Dormitories",
+ "Engineering Foyer",
+ "Engineering Storage",
+ "Engineering",
+ "EVA Storage",
+ "Experimentation Lab",
+ "Firing Range",
+ "Gateway",
+ "Genetics Lab",
+ "Gravity Generator Room",
+ "Hydroponics",
+ "Incinerator",
+ "Kitchen",
+ "Law Office",
+ "Library",
+ "Locker Room",
+ "Mech Bay",
+ "Medbay Central",
+ "Medbay Maintenance",
+ "Medbay Storage",
+ "Mining Office",
+ "Morgue Maintenance",
+ "Morgue",
+ "Primary Tool Storage",
+ "Prison Wing",
+ "Prisoner Education Chamber",
+ "Recreation Area",
+ "Recreational Holodeck",
+ "Research and Development",
+ "Research Division",
+ "Research Testing Range",
+ "Restrooms",
+ "Robotics Lab",
+ "Science Maintenance",
+ "Security Checkpoint",
+ "Security Office",
+ "Service Hallway",
+ "Space",
+ "Supermatter Engine",
+ "Surgery",
+ "Technical Storage",
+ "Teleporter Room",
+ "Testing Lab",
+ "Theatre",
+ "Toxins Mixing Chamber",
+ "Toxins Mixing Lab",
+ "Toxins Storage",
+ "Toxins Test Area",
+ "Transfer Centre",
+ "Transit Tube",
+ "Vacant Commissary",
+ "Vacant Office",
+ "Vault",
+ "Virology",
+ "Warehouse",
+ "Waste Disposal",
+ "Xenobiology Lab"
+ ]
}
diff --git a/strings/luchador_replacement.json b/strings/luchador_replacement.json
new file mode 100644
index 00000000000000..71b6122adba33a
--- /dev/null
+++ b/strings/luchador_replacement.json
@@ -0,0 +1,20 @@
+{
+ "luchador": {
+ "captain": "CAPITÁN",
+ "station": "ESTACIÓN",
+ "sir": "SEÑOR",
+ "the ": "el ",
+ "my ": "mi ",
+ "is ": "es ",
+ "it's": "es",
+ "friend": "amigo",
+ "buddy": "amigo",
+ "hello": "hola",
+ " hot": " caliente",
+ " very ": " muy ",
+ "sword": "espada",
+ "library": "biblioteca",
+ "traitor": "traidor",
+ "wizard": "mago"
+ }
+}
diff --git a/strings/medieval_replacement.json b/strings/medieval_replacement.json
index 837248b9898880..d5cd5bc7376232 100644
--- a/strings/medieval_replacement.json
+++ b/strings/medieval_replacement.json
@@ -1,82 +1,82 @@
{
"startings": [
- "Ah,",
- "Alas,",
- "Avast,",
- "By my faith,",
- "By my trowth,",
- "By my word,",
- "Come,",
- "Forsooth, I say,",
- "Forsooth, say I,",
- "Forsooth, sayeth I,",
- "Forsooth,",
- "Hark,",
- "Harketh,",
- "Hear me,",
- "Heigh-ho,",
- "I pray you,",
- "I say,",
- "I sayeth,",
- "I warrant",
- "If it pleases you,",
- "In short,",
- "In sooth,",
- "In truth,",
- "Kind sire,",
- "Listen thee,",
- "Listen,",
- "Now hear me,",
- "Perchance,",
- "Pray pardon,",
- "Pray tell,",
- "Pray,",
- "Prithee,",
- "Quoth I,",
- "S'wounds,",
- "Sire,",
- "Surely",
- "There is much in what you say, and yet,",
- "What hey,",
- "What ho,",
- "Z'wounds,",
- "Zounds,"
+ "Ah,",
+ "Alas,",
+ "Avast,",
+ "By my faith,",
+ "By my trowth,",
+ "By my word,",
+ "Come,",
+ "Forsooth, I say,",
+ "Forsooth, say I,",
+ "Forsooth, sayeth I,",
+ "Forsooth,",
+ "Hark,",
+ "Harketh,",
+ "Hear me,",
+ "Heigh-ho,",
+ "I pray you,",
+ "I say,",
+ "I sayeth,",
+ "I warrant",
+ "If it pleases you,",
+ "In short,",
+ "In sooth,",
+ "In truth,",
+ "Kind sire,",
+ "Listen thee,",
+ "Listen,",
+ "Now hear me,",
+ "Perchance,",
+ "Pray pardon,",
+ "Pray tell,",
+ "Pray,",
+ "Prithee,",
+ "Quoth I,",
+ "S'wounds,",
+ "Sire,",
+ "Surely",
+ "There is much in what you say, and yet,",
+ "What hey,",
+ "What ho,",
+ "Z'wounds,",
+ "Zounds,"
],
"medieval": {
- "in the": "i' the",
- "it is": "'tis",
- "it was": "'twas",
- "it were": "'twere",
- "it will": "'twould",
- "it's": "'tis",
- "over there": "yonder",
- "shall not": "shan't",
- "there": "thither",
- "will not": "shan't",
- "thank you": [
+ "in the": "i' the",
+ "it is": "'tis",
+ "it was": "'twas",
+ "it were": "'twere",
+ "it will": "'twould",
+ "it's": "'tis",
+ "over there": "yonder",
+ "shall not": "shan't",
+ "there": "thither",
+ "will not": "shan't",
+ "thank you": [
"grammercy to you",
"kindly thanks to you",
"many good thanks to you",
"thankee"
- ],
- "thanks": [
+ ],
+ "thanks": [
"grammercy to you",
"kindly thanks to you",
"many good thanks to you",
"thankee"
- ],
- "you": [
+ ],
+ "you": [
"thou",
"thee",
"ye"
- ],
- "your": [
+ ],
+ "your": [
"thine",
"thy",
"thyne"
- ],
- "are": "art",
- "killed": [
+ ],
+ "are": "art",
+ "killed": [
"bested",
"brung low",
"conquered",
@@ -86,8 +86,8 @@
"slain",
"subjugated",
"vanquished"
- ],
- "kill": [
+ ],
+ "kill": [
"best",
"bring low",
"conquer",
@@ -97,8 +97,8 @@
"slay",
"subjugate",
"vanquish"
- ],
- "goodbye": [
+ ],
+ "goodbye": [
"adieu",
"begone",
"by your leave",
@@ -111,8 +111,8 @@
"I bid thee farewell",
"I bid thee good day",
"pleasant journey"
- ],
- "bye": [
+ ],
+ "bye": [
"adieu",
"begone",
"by your leave",
@@ -125,74 +125,74 @@
"I bid thee farewell",
"I bid thee good day",
"pleasant journey"
- ],
- "yes": [
+ ],
+ "yes": [
"aye",
"yea",
"yea verily"
- ],
- "no": [
+ ],
+ "no": [
"nay",
"nayeth"
- ],
- "hello": [
+ ],
+ "hello": [
"ave",
"good day",
"hail",
"tally ho",
"well met",
"well meteth"
- ],
- "hi": [
+ ],
+ "hi": [
"ave",
"good day",
"hail",
"tally ho",
"well met",
"well meteth"
- ],
- "does": [
+ ],
+ "does": [
"doeseth",
"dost",
"doth"
- ],
- "cap": "king",
- "captain": "king",
- "in": "within",
- "my": "mine",
- "nuke disk": "plate of holy fire",
- "food": [
+ ],
+ "cap": "king",
+ "captain": "king",
+ "in": "within",
+ "my": "mine",
+ "nuke disk": "plate of holy fire",
+ "food": [
"bellytimber",
"cake",
"game"
- ],
- "bet": "warrant",
- "go": "a-walk",
- "going": "a-walkin'",
- "the": "yon",
- "kidding": [
+ ],
+ "bet": "warrant",
+ "go": "a-walk",
+ "going": "a-walkin'",
+ "the": "yon",
+ "kidding": [
"but pulling a jest",
"but pulling a jape"
- ],
- "joke": [
+ ],
+ "joke": [
"jest",
"jape"
- ],
- "station": "castle",
- "please": [
+ ],
+ "station": "castle",
+ "please": [
"I pray you",
"prithee",
"pray"
- ],
- "ok": [
+ ],
+ "ok": [
"as you will",
"agreed",
"well said",
"just so"
- ],
- "is": "be",
- "never": "ne'er",
- "haha": [
+ ],
+ "is": "be",
+ "never": "ne'er",
+ "haha": [
"and there was much chuckling!",
"and there was much guffawing!",
"and there was much mirth!",
@@ -209,8 +209,8 @@
"snort!",
"titter!",
"zounds!"
- ],
- "hehe": [
+ ],
+ "hehe": [
"and there was much chuckling!",
"and there was much guffawing!",
"and there was much mirth!",
@@ -227,8 +227,8 @@
"snort!",
"titter!",
"zounds!"
- ],
- "hah": [
+ ],
+ "hah": [
"and there was much chuckling!",
"and there was much guffawing!",
"and there was much mirth!",
@@ -245,8 +245,8 @@
"snort!",
"titter!",
"zounds!"
- ],
- "heh": [
+ ],
+ "heh": [
"and there was much chuckling!",
"and there was much guffawing!",
"and there was much mirth!",
@@ -263,26 +263,26 @@
"snort!",
"titter!",
"zounds!"
- ],
- "help": [
+ ],
+ "help": [
"aid",
"aideth",
"assistance",
"saveth",
"succor"
- ],
- "could": "couldst",
- "would": "wouldst",
- "sure": "shore",
- "maybe": [
+ ],
+ "could": "couldst",
+ "would": "wouldst",
+ "sure": "shore",
+ "maybe": [
"mayhaps",
"perchance"
- ],
- "probably": [
+ ],
+ "probably": [
"mayhaps",
"perchance"
- ],
- "girl": [
+ ],
+ "girl": [
"lady",
"lass",
"madame",
@@ -290,34 +290,34 @@
"maiden",
"mistress",
"waif"
- ],
- "cat": "beast",
- "felinid": "catbeast",
- "later": "anon",
- "lizard": "beast",
- "lizardperson": "moat creature",
- "moth": "gnat",
- "mothperson": "gnat critter",
- "often": "oft",
- "plasmaman": "fire spirit",
- "plasmamen": "fire spirits",
- "soon": "anon",
- "really": [
+ ],
+ "cat": "beast",
+ "felinid": "catbeast",
+ "later": "anon",
+ "lizard": "beast",
+ "lizardperson": "moat creature",
+ "moth": "gnat",
+ "mothperson": "gnat critter",
+ "often": "oft",
+ "plasmaman": "fire spirit",
+ "plasmamen": "fire spirits",
+ "soon": "anon",
+ "really": [
"indeed",
"in truth"
- ],
- "away": "aroint",
- "being": "bein",
- "enough": "ynogh",
- "fuck": "flummery",
- "here": "hither",
- "of": "o'",
- "shit": "nightsoil",
- "those": "yon",
- "why": "wherefore",
- "based": [
+ ],
+ "away": "aroint",
+ "being": "bein",
+ "enough": "ynogh",
+ "fuck": "flummery",
+ "here": "hither",
+ "of": "o'",
+ "shit": "nightsoil",
+ "those": "yon",
+ "why": "wherefore",
+ "based": [
"joly",
"jolyf"
- ]
+ ]
}
- }
+}
diff --git a/strings/names/voidwalker.txt b/strings/names/voidwalker.txt
new file mode 100644
index 00000000000000..f7f991a71f6784
--- /dev/null
+++ b/strings/names/voidwalker.txt
@@ -0,0 +1,19 @@
+Ere
+Vee
+Gea
+Vai
+Nei
+Lii
+Pio
+Ije
+Cie
+Ule
+Iso
+Roa
+Afa
+Ija
+Ebe
+Eme
+Roa
+Goa
+Aya
diff --git a/strings/ork_replacement.json b/strings/ork_replacement.json
new file mode 100644
index 00000000000000..d80ba2ce12f591
--- /dev/null
+++ b/strings/ork_replacement.json
@@ -0,0 +1,116 @@
+{
+ "ork": {
+ "gun": "blasta",
+ "ammo": "dakka",
+ "bullets": "dakka",
+ "rockets": "bigger dakka",
+ "grenade": "bomb",
+ "rifle": "shoota",
+ "pistol": "short boomstick",
+ "shotgun": "boomstick",
+ "launcher": "bomb throwa",
+ "sword": "harder choppa",
+ "knife": "choppa",
+ "spear": "long choppa",
+ "disk": "disky",
+ "nuke disk": "disky",
+ "captain": "warboss",
+ "security": "warboyz",
+ "cap ": "boss ",
+ " cap": " boss",
+ "science": "smarty thinking",
+ "scientist": "brain boy",
+ "engineer": "mekkanik",
+ "engineering": "tinkerin'",
+ "technician": "mekboy",
+ "botanist": "green feeda",
+ "botany": "green feed",
+ "felinid": "talking kitty",
+ "robotics": "kanna maka",
+ "roboticist": "kanna boy",
+ "cat": "kitty",
+ "moth": "bug",
+ "mothperson": "bugga",
+ "plasmaman": "fire skellyton",
+ "plasmamen": "fire skellytons",
+ "skeleton": "skellyton",
+ "lizard": "tailswingah",
+ "lizardperson": "tailswingah",
+ "ethereal": "zappy boy",
+ "car": "trukk",
+ "power": "lektricity",
+ "cable": "zap rope",
+ "human": "humie",
+ "fly": "buzz",
+ "flyperson": "buzzah",
+ "run": "charge",
+ "fight": "crump",
+ "revolution": "dust up",
+ "nuke": "bomb",
+ "ai ": "talky box ",
+ "artificial intelligence": "talky box",
+ "shuttle": "winged trukk",
+ "miner": "rockkrusha",
+ "mining": "rock krushing",
+ "maintenance": "tunnel",
+ "maint": "tunnel",
+ "singularity": "space hole",
+ "supermatter": "angry rock",
+ "war ": "WAAAGH! ",
+ "hos ": "nob ",
+ "the ": "da ",
+ ".": "!",
+ "one ": "wun ",
+ "fast": "fastah",
+ "faster": "fastah",
+ "exosuit": "killa kan",
+ "mech": "killa kan",
+ "mecha": "killa kan",
+ "rocket": "rokkit",
+ "flame": "burna",
+ "doctor": "dok",
+ "medic": "doka",
+ "medical": "healy",
+ "cmo": "mad dok",
+ "ce": "big mek",
+ "thing": "fing",
+ "want to": "wanna",
+ "need to": "needa",
+ "got to": "gotta",
+ " my": " me",
+ "my ": "me ",
+ " you": " ya",
+ "you ": "ya ",
+ "you've": "yoos",
+ "you have": "yoos",
+ " in a ": " ina ",
+ "more": "moar",
+ "teeth": "teef",
+ "ing ": "in' ",
+ "proper": "proppa",
+ "something": "sumfing",
+ "i am ": "I iz ",
+ "i'm ": "I'ze ",
+ "we're ": "we'ze ",
+ "you're ": "you'ze ",
+ "here": "'ere",
+ "this ": "dis ",
+ "that ": "dat ",
+ "them ": "dem ",
+ "those ": "dose ",
+ "your ": "ya ",
+ "says": "sez",
+ "with": "wiv",
+ "what": "wot",
+ "who": "oo",
+ "who's": "oo'z",
+ "whose": "oo'z",
+ "strong": "'ard",
+ "tough": "'ard",
+ "hard": "'ard",
+ "robust": "well 'ard",
+ "what's that": "wuzzat",
+ "wizard": "weirdah",
+ "heretic": "weirdah"
+ }
+}
diff --git a/strings/revenant_names.json b/strings/revenant_names.json
index fa165fc9dbdead..c3dfbde388b201 100644
--- a/strings/revenant_names.json
+++ b/strings/revenant_names.json
@@ -1,15 +1,15 @@
{
- "spirit_type": [
- "Essence",
- "Ghost",
- "Phantom",
- "Revenant",
- "Soul",
- "Spectre",
- "Spirit"
- ],
+ "spirit_type": [
+ "Essence",
+ "Ghost",
+ "Phantom",
+ "Revenant",
+ "Soul",
+ "Spectre",
+ "Spirit"
+ ],
- "adverb": [
+ "adverb": [
"",
"brutal ",
"fiery ",
@@ -27,9 +27,9 @@
"hateful ",
"searing ",
"vicious "
- ],
+ ],
- "theme": [
+ "theme": [
"despair",
"agony",
"screams",
@@ -48,5 +48,5 @@
"salt",
"grief",
"laughter"
- ]
+ ]
}
diff --git a/strings/steve.json b/strings/steve.json
index 06181e85eb8914..48cf4baf8e03cd 100644
--- a/strings/steve.json
+++ b/strings/steve.json
@@ -1,21 +1,21 @@
{
- "ballmer_good_msg": [
- "Hear me out here. What if, and this is just a theory, we made R&D controllable from our PDAs?",
- "Hey guys, what if we rolled out a bluespace wiring system so mice can't destroy the powergrid anymore?",
- "I dunno about you guys, but IDs and PDAs being separate is clunky as fuck. Maybe we should merge them into a chip in our arms? That way they can't be stolen easily.",
- "I'm thinking we should roll out a git repository for our research under the AGPLv3 license so that we can share it among the other stations freely.",
- "Why the fuck aren't we just making every pair of shoes into galoshes? We have the technology."
- ],
+ "ballmer_good_msg": [
+ "Hear me out here. What if, and this is just a theory, we made R&D controllable from our PDAs?",
+ "Hey guys, what if we rolled out a bluespace wiring system so mice can't destroy the powergrid anymore?",
+ "I dunno about you guys, but IDs and PDAs being separate is clunky as fuck. Maybe we should merge them into a chip in our arms? That way they can't be stolen easily.",
+ "I'm thinking we should roll out a git repository for our research under the AGPLv3 license so that we can share it among the other stations freely.",
+ "Why the fuck aren't we just making every pair of shoes into galoshes? We have the technology."
+ ],
- "ballmer_windows_me_msg": [
+ "ballmer_windows_me_msg": [
"Who keeps commiting to master?",
- "Best idea ever: Disposal pipes instead of hallways.",
- "Do you know who ate all the donuts?",
- "Dude, radical idea: H.O.N.K mechs but with no bananium required.",
- "So like, you know how we separate our codebase from the master copy that runs on our consumer boxes? What if we merged the two and undid the separation between codebase and server?",
- "We should store bank records in a webscale datastore, like /dev/null.",
- "What if we use a language that was written on a napkin and created over 1 weekend for all of our servers?",
- "Yo man, what if, we like, uh, put a webserver that's automatically turned on with default admin passwords into every PDA?",
- "You ever wonder if /dev/null supports sharding?"
- ]
+ "Best idea ever: Disposal pipes instead of hallways.",
+ "Do you know who ate all the donuts?",
+ "Dude, radical idea: H.O.N.K mechs but with no bananium required.",
+ "So like, you know how we separate our codebase from the master copy that runs on our consumer boxes? What if we merged the two and undid the separation between codebase and server?",
+ "We should store bank records in a webscale datastore, like /dev/null.",
+ "What if we use a language that was written on a napkin and created over 1 weekend for all of our servers?",
+ "Yo man, what if, we like, uh, put a webserver that's automatically turned on with default admin passwords into every PDA?",
+ "You ever wonder if /dev/null supports sharding?"
+ ]
}
diff --git a/strings/tcg/keywords.json b/strings/tcg/keywords.json
index 541d828cb00cb3..854ac936fef1ee 100644
--- a/strings/tcg/keywords.json
+++ b/strings/tcg/keywords.json
@@ -11,8 +11,8 @@
"Hivemind": "The creature enters combat with a hivemind token on it.The first time this card would take damage, remove that token instead. This does not apply to immediate removal effects, only points of damage",
"Holy": "Immunity to all event cards",
"Immunity": "The creature cannot be affected by card effects or combat of its immunity type. This includes both friendly and opposing effects",
- "On Equip": "This effect is activated once it's item cost is paid and it enters the battlefield, equipping itself to a chosen card on your side of the field (Unless otherwise stated)",
- "On Summon": "This effect is activated once it's creature cost is paid and it enters the battlefield",
+ "On Equip": "This effect is activated once its item cost is paid and it enters the battlefield, equipping itself to a chosen card on your side of the field (Unless otherwise stated)",
+ "On Summon": "This effect is activated once its creature cost is paid and it enters the battlefield",
"Squad Tactics": "When this creature attacks an opponent's creature and defeats it in combat, the owner of the defeated card takes 1 lifeshard of damage from combat",
"Taunt": "All opposing creature attacks must be directed towards the creature with Taunt"
}
diff --git a/strings/tcg/set_one.json b/strings/tcg/set_one.json
index 233f984835ddc9..de24543a66b96a 100644
--- a/strings/tcg/set_one.json
+++ b/strings/tcg/set_one.json
@@ -750,7 +750,7 @@
"id": "medborg",
"name": "Cyborg (Medical Shell)",
"desc": "A state of the art medical shell, for when biological life just can't take care of itself. Comes equipped with built-in surgical equipment and all the medicated lollipops you could ever want.",
- "rules": "{$Asimov}, you may tap this card and pay 2 mana: Reset a card's resolve to it's original value.",
+ "rules": "{$Asimov}, you may tap this card and pay 2 mana: Reset a card's resolve to its original value.",
"icon_state": "borg_medical",
"power": "2",
"resolve": "3",
@@ -781,7 +781,7 @@
"id": "mime",
"name": "Mime",
"desc": "Si vous regardez attentivement dans les yeux d'un mime, vous pouvez voir le tourment sans fin derrière leur façade silencieuse. C'est vraiment tragique.",
- "rules": "You may tap this card: Pick an opponent's card and nullify it's effect until it leaves play.",
+ "rules": "You may tap this card: Pick an opponent's card and nullify its effect until it leaves play.",
"icon_state": "mime",
"power": "2",
"resolve": "1",
diff --git a/strings/traumas.json b/strings/traumas.json
index 1fc4b95b1d8575..7eeae3370f2915 100644
--- a/strings/traumas.json
+++ b/strings/traumas.json
@@ -1,182 +1,182 @@
{
- "brain_damage": [
- "@pick(bug)",
- "@pick(semicolon) @pick(george) @pick(mellens) is grifing me HALP!!!",
- "@pick(semicolon)A PIRATE APPEAR",
- "@pick(semicolon)AI laW 22 Open door",
- "@pick(semicolon)CAL; TEH SHUTTLE!!!!!",
- "@pick(semicolon)CAPTAINS A COMDOM",
- "@pick(semicolon)CRASHING THIS STTAYTION WITH NIO SURVIVROS",
- "@pick(semicolon)GIVE ME FREE ROBUX PLEASE JUST ENOUGH FOR SHIRT AND PANTS",
- "@pick(semicolon)HELP SHITECIRTY MURDERIN MEE!!!",
- "@pick(semicolon)How do I set up the. SHow do I set u p the Singu. how I the scrungulartiy????",
- "@pick(semicolon)i ran into the supermattre ten i dsappeard @pick(bug)",
- "@pick(semicolon)I WANNA PET TEH monkeyS",
- "@pick(semicolon)I'VE GOT BALLS OF STEEL",
- "@pick(semicolon)IM A PONY NEEEEEEIIIIIIIIIGH",
- "@pick(semicolon)N-NYAAAAAA~",
- "@pick(semicolon)pray can u @pick(create_verbs) @pick(create_nouns)???",
- "@pick(semicolon)Tajaran has warrrres, if you have coin",
- "@pick(semicolon)the ai and borgs are mettacomming I think",
- "@pick(semicolon)this SI mY stATIon......",
- "@pick(semicolon)wtf??????????? @pick(bug)",
- "@pick(servers) is down!! @pick(bug)",
- ">my face",
- "Bi is THE BEST OF BOTH WORLDS>",
+ "brain_damage": [
+ "@pick(bug)",
+ "@pick(semicolon) @pick(george) @pick(mellens) is grifing me HALP!!!",
+ "@pick(semicolon)A PIRATE APPEAR",
+ "@pick(semicolon)AI laW 22 Open door",
+ "@pick(semicolon)CAL; TEH SHUTTLE!!!!!",
+ "@pick(semicolon)CAPTAINS A COMDOM",
+ "@pick(semicolon)CRASHING THIS STTAYTION WITH NIO SURVIVROS",
+ "@pick(semicolon)GIVE ME FREE ROBUX PLEASE JUST ENOUGH FOR SHIRT AND PANTS",
+ "@pick(semicolon)HELP SHITECIRTY MURDERIN MEE!!!",
+ "@pick(semicolon)How do I set up the. SHow do I set u p the Singu. how I the scrungulartiy????",
+ "@pick(semicolon)i ran into the supermattre ten i dsappeard @pick(bug)",
+ "@pick(semicolon)I WANNA PET TEH monkeyS",
+ "@pick(semicolon)I'VE GOT BALLS OF STEEL",
+ "@pick(semicolon)IM A PONY NEEEEEEIIIIIIIIIGH",
+ "@pick(semicolon)N-NYAAAAAA~",
+ "@pick(semicolon)pray can u @pick(create_verbs) @pick(create_nouns)???",
+ "@pick(semicolon)Tajaran has warrrres, if you have coin",
+ "@pick(semicolon)the ai and borgs are mettacomming I think",
+ "@pick(semicolon)this SI mY stATIon......",
+ "@pick(semicolon)wtf??????????? @pick(bug)",
+ "@pick(servers) is down!! @pick(bug)",
+ ">my face",
+ "Bi is THE BEST OF BOTH WORLDS>",
"built DIFFERENT. I Stack Paper!",
- "can u give me @pick(mutations)?",
- "closd for merbegging",
- "dem dwarfs man, dem dwarfs",
- "DON'T EVER TUCH ME",
- "FOR TEH EMPRAH",
- "fucking 4rries!",
- "FUS RO DAH",
- "geT THE FUCK OUTTTT",
- "GEY AWAY FROM ME U GREIFING PRICK!!!!",
- "H U G B O X",
- "hwat dose tha @pick(random_gibberish) mean?????",
- "hwee did eet fhor khayosss",
- "i will snatch erry motherfucker birthday",
- "INSTLL TEG",
- "its gonna be like 9/11 all over again but insitaead is gonna be a bitc",
- "lifelike texture ;_;",
- "lol2cat",
- "luv can bloooom",
+ "can u give me @pick(mutations)?",
+ "closd for merbegging",
+ "dem dwarfs man, dem dwarfs",
+ "DON'T EVER TUCH ME",
+ "FOR TEH EMPRAH",
+ "fucking 4rries!",
+ "FUS RO DAH",
+ "geT THE FUCK OUTTTT",
+ "GEY AWAY FROM ME U GREIFING PRICK!!!!",
+ "H U G B O X",
+ "hwat dose tha @pick(random_gibberish) mean?????",
+ "hwee did eet fhor khayosss",
+ "i will snatch erry motherfucker birthday",
+ "INSTLL TEG",
+ "its gonna be like 9/11 all over again but insitaead is gonna be a bitc",
+ "lifelike texture ;_;",
+ "lol2cat",
+ "luv can bloooom",
"MAKE JIANT CRISTAL BURN I KEPT THROWING WELDERS IT WOOD LIGHT",
- "NO I'M ONNA KILL YOU MOTHERFUCKER OLD STYLE",
- "PACKETS!!!",
- "parasteng was best",
- "port ba@pick(y_replacements) med!!!!",
- "PSHOOOM",
- "red wonz go fasta",
- "REMOVE SINGULARITY",
- "REVIRT COBY CHEM!!!!!!!!",
- "roll it easy!",
- "shiggey diggey!!",
- "SOLIRS CAN POWER THE HOLE STATION ANEWAY @pick(bug)",
- "SOTP IT#",
- "SPESS MAHREENS",
- "stat me",
- "stop grifing me!!!!",
- "THe saiyans screwed",
- "TURBIN IS BEST ENGIENE",
- "u just did the world a little bit more sad place for someone",
- "ur a fuckeing autist!",
- "waaaaaagh!!!",
- "wearnig siNGUARLTY is.... FINE haHAAA",
- "WHERES THE SLIP REWRITE WHERE THR FUCK ID IT?",
- "who the HELL do u thenk u r?!!!!",
- "without oxigen blob don't evoluate?",
- "youed call her a toeugh bithc",
- "I AM ALPHA MAN!!"
- ],
+ "NO I'M ONNA KILL YOU MOTHERFUCKER OLD STYLE",
+ "PACKETS!!!",
+ "parasteng was best",
+ "port ba@pick(y_replacements) med!!!!",
+ "PSHOOOM",
+ "red wonz go fasta",
+ "REMOVE SINGULARITY",
+ "REVIRT COBY CHEM!!!!!!!!",
+ "roll it easy!",
+ "shiggey diggey!!",
+ "SOLIRS CAN POWER THE HOLE STATION ANEWAY @pick(bug)",
+ "SOTP IT#",
+ "SPESS MAHREENS",
+ "stat me",
+ "stop grifing me!!!!",
+ "THe saiyans screwed",
+ "TURBIN IS BEST ENGIENE",
+ "u just did the world a little bit more sad place for someone",
+ "ur a fuckeing autist!",
+ "waaaaaagh!!!",
+ "wearnig siNGUARLTY is.... FINE haHAAA",
+ "WHERES THE SLIP REWRITE WHERE THR FUCK ID IT?",
+ "who the HELL do u thenk u r?!!!!",
+ "without oxigen blob don't evoluate?",
+ "youed call her a toeugh bithc",
+ "I AM ALPHA MAN!!"
+ ],
- "mutations": [
- "eksrey",
- "eppilapse",
- "fungal tb",
- "glowey skin",
- "halk",
- "kamelien",
- "stun gloves",
- "telikesis"
- ],
+ "mutations": [
+ "eksrey",
+ "eppilapse",
+ "fungal tb",
+ "glowey skin",
+ "halk",
+ "kamelien",
+ "stun gloves",
+ "telikesis"
+ ],
- "george": [
- "gdoruge",
- "george",
- "gorge",
- "joerge"
- ],
+ "george": [
+ "gdoruge",
+ "george",
+ "gorge",
+ "joerge"
+ ],
- "mellens": [
- "mellens",
- "melons",
- "mwrlins"
- ],
- "random_gibberish": [
- "g",
- "squid",
- "r",
- "carbon dioxide"
- ],
+ "mellens": [
+ "mellens",
+ "melons",
+ "mwrlins"
+ ],
+ "random_gibberish": [
+ "g",
+ "squid",
+ "r",
+ "carbon dioxide"
+ ],
- "y_replacements": [
- "y",
- "i",
- "e"
- ],
+ "y_replacements": [
+ "y",
+ "i",
+ "e"
+ ],
- "servers": [
- "bager",
- "berry",
- "colonel hall",
- "mr basil",
- "mr terry",
- "mrs sybil",
- "sybl",
- "vent hell",
- "manual",
- "camel"
- ],
+ "servers": [
+ "bager",
+ "berry",
+ "colonel hall",
+ "mr basil",
+ "mr terry",
+ "mrs sybil",
+ "sybl",
+ "vent hell",
+ "manual",
+ "camel"
+ ],
- "create_verbs": [
- "creat",
- "gib",
- "MAke me",
- "spawn",
- "tc trade me"
- ],
+ "create_verbs": [
+ "creat",
+ "gib",
+ "MAke me",
+ "spawn",
+ "tc trade me"
+ ],
- "create_nouns": [
- "abdoocters",
- "anteg",
- "ayleins",
- "bleb",
- "cock cult",
- "deth squads",
- "deval",
- "revinent",
- "sheadow lings",
- "treaitors",
- "zenomorfs"
- ],
+ "create_nouns": [
+ "abdoocters",
+ "anteg",
+ "ayleins",
+ "bleb",
+ "cock cult",
+ "deth squads",
+ "deval",
+ "revinent",
+ "sheadow lings",
+ "treaitors",
+ "zenomorfs"
+ ],
- "bug": [
- "",
- "BUG!!!",
- "IS TIS A BUG??",
- "SI IST A BUGG/"
- ],
+ "bug": [
+ "",
+ "BUG!!!",
+ "IS TIS A BUG??",
+ "SI IST A BUGG/"
+ ],
- "semicolon": [
- "",
- ";",
- ".h"
- ],
+ "semicolon": [
+ "",
+ ";",
+ ".h"
+ ],
- "god_foe": [
+ "god_foe": [
"BLASPHEMERS",
"PARASITES",
"PEASANTS",
"UNBELIEVERS",
"WEAKLINGS",
- "HERETICS",
- "INSECTS",
- "MORTALS"
- ],
+ "HERETICS",
+ "INSECTS",
+ "MORTALS"
+ ],
- "god_aggressive": [
+ "god_aggressive": [
"ALL WILL FALL BEFORE ME!",
"BURN, @pick(god_foe)!",
"DEATH TO @pick(god_foe)!",
"ENDLESS SUFFERING AWAITS YOU, @pick(god_foe).",
- "BEGONE, @pick(god_foe)!",
- "BLEED, @pick(god_foe)!",
- "DIE, @pick(god_foe)!"
- ],
+ "BEGONE, @pick(god_foe)!",
+ "BLEED, @pick(god_foe)!",
+ "DIE, @pick(god_foe)!"
+ ],
- "god_neutral": [
+ "god_neutral": [
"BE HEALED, MORTALS. I AM FEELING MERCIFUL.",
"BEGONE, MORTALS.",
"DANCE FOR ME, LITTLE MORTALS.",
@@ -187,22 +187,22 @@
"SEE THE TRUTH BEFORE YOU, MORTALS.",
"YOU MORTALS MAKE ME SICK.",
"YOU. STOP.",
- "BE SILENT.",
- "QUIET",
- "STOP"
- ],
+ "BE SILENT.",
+ "QUIET",
+ "STOP"
+ ],
- "god_unstun": [
+ "god_unstun": [
"GET UP, PRIEST.",
"GET UP. I HAVE NO TIME TO LOSE.",
"GET UP."
- ],
+ ],
- "god_heal": [
+ "god_heal": [
"BE HEALED, PRIEST.",
"YOU SHALL SURVIVE THIS, MY PRIEST.",
"YOU WILL LIVE TO SEE ANOTHER DAY.",
"YOUR LIFE IS IMPORTANT. KEEP IT."
- ]
+ ]
}
diff --git a/strings/zombie_replacement.json b/strings/zombie_replacement.json
index 8af2bb641b8fb7..7ce258a90dc180 100644
--- a/strings/zombie_replacement.json
+++ b/strings/zombie_replacement.json
@@ -1,254 +1,254 @@
{
- "zombie": {
- "aaah": "oh",
- "aabz": ["oops", "ops", "oof"],
- "abzah": ["myself", "yourself", "himself", "herself", "itself", "ourselves", "themselves"],
- "hah": ["he"],
- "zam": ["him", "they", "them"],
- "zhar": ["she", "her"],
- "haz": ["have", "has"],
- "habbanah": ["haven't", "havent"],
- "haarh": "here",
- "rahg": "reach",
- "arg": "out",
- "anazarh": "another",
- "anazambah": "anyone",
- "anazang": "anything",
- "angrah": ["angry", "mad", "pissed", "upset", "yell", "scream"],
- "zamran": "someone",
- "narh": "north",
- "azz": "ass",
- "bahrn": "burn",
- "bambg!n": "pumpkin",
- "bam-mahbam": "suicide",
- "banana man": "clown",
- "banana": ["banana", "slip", "fall", "fell"],
- "az": ["east", "as"],
- "azgha!b": ["escape", "depature"],
- "az!an": "asian",
- "agzg": "ask",
- "nag": ["annoy", "pester"],
- "naga": ["liar", "snake"],
- "nahgh": "knock",
- "nambah": "number",
- "braag": "blood",
- "braaz": "please",
- "brabram": "problem",
- "bra!nbag": ["hat", "helmet"],
- "ba": "by",
- "g!zz": "kiss",
- "ga!n": ["gain", "join", "profit"],
- "gaam": "game",
- "brrrh": "cold",
- "h!gh": ["high", "up", "above"],
- "bagan": "begin",
- "baag": "book",
- "azzarh": "over",
- "b!g": ["big", "large", "giant", "huge", "massive", "enlarge"],
- "b!rznah": "birthday",
- "azzbag": ["seat", "chair", "sofa", "couch", "cockpit", "stool"],
- "azzbangarh": "necrophillia",
- "azz!gn": "assign",
- "agzrah": ["xray", "x-ray"],
- "zah": ["south", "the", "stay", "so"],
- "zahn": ["sun", "son"],
- "zanraaz": "sunrise",
- "zanzat": "sunset",
- "zarbraz": "surprise",
- "zarman": ["sermon", "preach", "pray", "prayer"],
- "zazzahz": "sister",
- "brahg": "bright",
- "zgaarah": "scary",
- "zhaar": "share",
- "zhanz": "chance",
- "zharh": "light",
- "znaagah": "sneak",
- "znag": ["snow", "snag"],
- "harrah": ["hurry", "fast"],
- "gaz": "cast",
- "ambraz": ["embrace", "accept"],
- "zahgah": "shadow",
- "n!gh": "night",
- "n!ngah": "ninja",
- "n!z": "nice",
- "baza": "busy",
- "bahrang": "boring",
- "arn": "mine",
- "raz": "west",
- "ana": ["1", "one"],
- "zma": ["2", "two"],
- "zhraa": ["3", "three"],
- "haar": ["4", "four"],
- "raah": ["5", "five"],
- "zaz": ["6", "six"],
- "zaban": ["7", "seven"],
- "aaghz": ["8", "eight"],
- "nahn": ["9", "nine"],
- "zhan": ["10", "ten"],
- "hangarg": ["100", "hundred"],
- "harzanz": ["1000", "1,000", "thousand"],
- "m!rrh!an": ["1000000", "1,000,000", "million"],
- "mah zambah": "i",
- "ag": "it",
- "marh": "more",
- "maz hab": "need",
- "maz": "must",
- "mazagaam": "metagame",
- "marharhahar": "motherfucker",
- "mazah": "mercy",
- "marnang": "morning",
- "aga!n": "again",
- "ag!ng": ["aging", "old"],
- "agzahra": "exactly",
- "harb": "hard",
- "zhag": "weak",
- "angarzangang": "understand",
- "gahmangang": "demand",
- "barragahz": ["barricade", "cade", "airlock", "door", "bolt", "wall", "sandbag", "window", "weld"],
- "barg": "eat",
- "brang": "bring",
- "bram": "from",
- "rabah": "lover",
- "raab": "love",
- "habbah": "happy",
- "abah": "about",
- "ah": ["of", "if"],
- "ahbgrag": "upgrade",
- "harh": "hear",
- "mama": ["mom", "mother", "mama"],
- "baba": ["dad", "papa", "father"],
- "babah": ["baby", "kid", "child"],
- "ahn": "in",
- "ahn-na-ahn": "between",
- "ahahz": "away",
- "anh": "and",
- "ann": "on",
- "arghazzm": "orgasm",
- "abrahb": ["afraid", "fear"],
- "hanah": "honey",
- "hag": "hug",
- "zaan": "soon",
- "zagzaz": "success",
- "gan": "can",
- "zang": "change",
- "zangz": "thanks",
- "zarrah": "sorry",
- "zanh": ["can't", "cant", "cannot"],
- "gang": ["group", "mob", "horde"],
- "barbaga zaarz": "bbq sauce",
- "hab": "help",
- "ahnna": "into",
- "arahn": "around",
- "za": "to",
- "ahn!nn": "within",
- "aham": "ahem",
- "anamah": "animal",
- "zaa": ["see", "saw", "seen", "vision", "sight"],
- "z!gzag": ["zigzag", "obstruct", "dodge", "avoid"],
- "z!gn": "sign",
- "z!ng": "sing",
- "z!ngz": "thing",
- "mabban": "move",
- "rabhabh": "revive",
- "zammarrar": "tomorrow",
- "graan": "green",
- "arh": "or",
- "arm": "arm",
- "arzhahm": "awesome",
- "arrang": ["along", "with", "alongside"],
- "arza": ["also", "too"],
- "bgaz": "because",
- "mah zambah brazzahz": ["we", "us"],
- "grazzaz": "glasses",
- "habban": "heaven",
- "mazzah man": "chaplain",
- "hanz": "hand",
- "hab-ganna": ["want", "gonna have"],
- "magma": ["magma", "lava"],
- "manzhan": "mansion",
- "harmbargarz": "hamburger",
- "harrazz": "harass",
- "namz": "name",
- "ramambarh": "remember",
- "rh!zzan": "listen",
- "rabrarah": "library",
- "ragargarh": "recorder",
- "zarh": ["you", "your", "you're", "ya"],
- "hagh": "head",
- "RNA": "DNA",
- "zambahz": "zombies",
- "zzzz": ["chill", "relax", "sleep", "calm", "peace", "dream"],
- "bah": ["bad", "evil", "but"],
- "gag": ["gross", "nasty", "vomit", "smelly", "stinky", "stench", "foul", "quiet", "silence", "shutup"],
- "gammah": ["give", "gimmie"],
- "gah": ["get", "go"],
- "gargazz": ["body", "corpse"],
- "rag": ["uniform", "suit", "rag", "clothing", "jumpsuit"],
- "garbagz": ["garbage", "janitor", "custodian", "trash", "clean", "dirt", "filth", "mess", "junk"],
- "bagman": ["doctor", "medic", "healer", "paramedic", "curator", "librarian"],
- "gangbang": ["death", "kill", "die", "slay", "ERP", "punish", "detain", "prison", "prisoner", "brig", "cell", "jail", "perma", "permabrig"],
- "bag": ["duffle", "dufflebag", "pocket", "box", "bag", "backpack", "storage", "inventory"],
- "aarbagz": ["airbag", "atmos", "airtank", "canister", "air", "atmos tech", "atmospherics", "tank", "gas", "flood", "siphon"],
- "bar": ["bar", "drink", "alchol", "liquor"],
- "bar man": "bartender",
- "barn": ["hydroponics", "botany", "office", "room"],
- "brainz barn": ["kitchen", "cafe", "service"],
- "nah": ["not", "nope", "no", "deny", "don't", "dont"],
- "nabarh": "never",
- "nabarmang": "nevermind",
- "naz!n": "nothing",
- "abar": "all",
- "abara": "every",
- "abarahaarh": "everywhere",
- "abargargazz": "everybody",
- "abban": "open",
- "abzarb": ["drink", "absorb"],
- "gaa": ["yes", "ya", "okay", "alright"],
- "abargamz": "always",
- "am": ["is", "are", "am"],
- "aman": "amen",
- "amaz!ng": "amazing",
- "zahz": ["say", "says", "that"],
- "gab": ["told", "talk", "speak", "spoke", "language", "communication", "radio", "comms", "text", "word", "speech"],
- "mrh": ["why", "how", "when", "who", "what", "where"],
- "zmazh": ["smash", "break", "destroy", "deconstruct", "dismantle", "ruin", "destruction", "demolish"],
- "ranz": ["run", "ran", "ride"],
- "hahg": ["hide", "hidden", "shelter"],
- "zanz": ["dance", "spin", "flip"],
- "ganna": ["going", "gonna"],
- "mannah": ["many", "much", "very"],
- "mazzargh": "massacure",
- "mazzah": ["lord", "god", "religion", "chapel", "altar", "bible", "messiah", "christ"],
- "mararana": ["weed", "420", "marijuana", "drug"],
- "barb": ["knife", "poke", "thorn", "joke"],
- "mmmm": ["delicious", "tasty", "like", "enjoy"],
- "barbarh": "barber",
- "bargahn": "bargain",
- "bargh": "barge",
- "ban!zh": ["ban", "banish"],
- "brazzarz": ["brother", "skeleton", "skele"],
- "zambah": ["zombie", "undead", "dead", "horde"],
- "gangbang harmanz": ["sec", "security", "assistant", "greyshirt", "greytide", "cargo", "syndie", "rev", "shitsec", "shitcurity"],
- "ganz": ["gun", "rifle", "taser", "shotgun", "revovler", "sniper", "pistol"],
- "bang": ["bomb", "detonate", "explode", "explosion", "boom", "bang", "noise", "loud"],
- "bang-bang": ["bullet", "shot", "shoot", "fire", "laser", "lazer"],
- "harm": ["attack", "punch", "hit", "throw", "fight", "strike", "combat", "choke", "suffoicate", "baton", "harmbaton"],
- "ram": ["smash", "smack", "punch", "tackle", "kick", "push", "beat"],
- "zhangh": ["stab", "slash", "slice"],
- "bang bang man": ["officer", "warden", "hos", "bounty hunter", "hunt", "hunter"],
- "manbagz": ["testicle", "balls"],
- "grahn": ["groan", "gasp", "crit", "moan", "unconscious"],
- "gahn": "gone",
- "ganarazharh": ["power", "apc", "generator", "smes"],
- "grabz": ["grab", "hold", "held", "grip", "restrain", "handcuff", "cuff", "arrest"],
- "mah": ["my", "me"],
- "mana man": "wizard",
- "mana": "magic",
- "mana bang-bang": "spell",
- "mahg": "make",
- "mannarz": "manner",
- "brainz": ["brain", "intelligence", "smart", "hungry", "hunger", "eat", "meat", "desert"],
- "harman": ["human", "food", "person", "groceries"],
- "harmanz": ["crew", "people", "humans"]
- }
+ "zombie": {
+ "aaah": "oh",
+ "aabz": ["oops", "ops", "oof"],
+ "abzah": ["myself", "yourself", "himself", "herself", "itself", "ourselves", "themselves"],
+ "hah": ["he"],
+ "zam": ["him", "they", "them"],
+ "zhar": ["she", "her"],
+ "haz": ["have", "has"],
+ "habbanah": ["haven't", "havent"],
+ "haarh": "here",
+ "rahg": "reach",
+ "arg": "out",
+ "anazarh": "another",
+ "anazambah": "anyone",
+ "anazang": "anything",
+ "angrah": ["angry", "mad", "pissed", "upset", "yell", "scream"],
+ "zamran": "someone",
+ "narh": "north",
+ "azz": "ass",
+ "bahrn": "burn",
+ "bambg!n": "pumpkin",
+ "bam-mahbam": "suicide",
+ "banana man": "clown",
+ "banana": ["banana", "slip", "fall", "fell"],
+ "az": ["east", "as"],
+ "azgha!b": ["escape", "depature"],
+ "az!an": "asian",
+ "agzg": "ask",
+ "nag": ["annoy", "pester"],
+ "naga": ["liar", "snake"],
+ "nahgh": "knock",
+ "nambah": "number",
+ "braag": "blood",
+ "braaz": "please",
+ "brabram": "problem",
+ "bra!nbag": ["hat", "helmet"],
+ "ba": "by",
+ "g!zz": "kiss",
+ "ga!n": ["gain", "join", "profit"],
+ "gaam": "game",
+ "brrrh": "cold",
+ "h!gh": ["high", "up", "above"],
+ "bagan": "begin",
+ "baag": "book",
+ "azzarh": "over",
+ "b!g": ["big", "large", "giant", "huge", "massive", "enlarge"],
+ "b!rznah": "birthday",
+ "azzbag": ["seat", "chair", "sofa", "couch", "cockpit", "stool"],
+ "azzbangarh": "necrophillia",
+ "azz!gn": "assign",
+ "agzrah": ["xray", "x-ray"],
+ "zah": ["south", "the", "stay", "so"],
+ "zahn": ["sun", "son"],
+ "zanraaz": "sunrise",
+ "zanzat": "sunset",
+ "zarbraz": "surprise",
+ "zarman": ["sermon", "preach", "pray", "prayer"],
+ "zazzahz": "sister",
+ "brahg": "bright",
+ "zgaarah": "scary",
+ "zhaar": "share",
+ "zhanz": "chance",
+ "zharh": "light",
+ "znaagah": "sneak",
+ "znag": ["snow", "snag"],
+ "harrah": ["hurry", "fast"],
+ "gaz": "cast",
+ "ambraz": ["embrace", "accept"],
+ "zahgah": "shadow",
+ "n!gh": "night",
+ "n!ngah": "ninja",
+ "n!z": "nice",
+ "baza": "busy",
+ "bahrang": "boring",
+ "arn": "mine",
+ "raz": "west",
+ "ana": ["1", "one"],
+ "zma": ["2", "two"],
+ "zhraa": ["3", "three"],
+ "haar": ["4", "four"],
+ "raah": ["5", "five"],
+ "zaz": ["6", "six"],
+ "zaban": ["7", "seven"],
+ "aaghz": ["8", "eight"],
+ "nahn": ["9", "nine"],
+ "zhan": ["10", "ten"],
+ "hangarg": ["100", "hundred"],
+ "harzanz": ["1000", "1,000", "thousand"],
+ "m!rrh!an": ["1000000", "1,000,000", "million"],
+ "mah zambah": "i",
+ "ag": "it",
+ "marh": "more",
+ "maz hab": "need",
+ "maz": "must",
+ "mazagaam": "metagame",
+ "marharhahar": "motherfucker",
+ "mazah": "mercy",
+ "marnang": "morning",
+ "aga!n": "again",
+ "ag!ng": ["aging", "old"],
+ "agzahra": "exactly",
+ "harb": "hard",
+ "zhag": "weak",
+ "angarzangang": "understand",
+ "gahmangang": "demand",
+ "barragahz": ["barricade", "cade", "airlock", "door", "bolt", "wall", "sandbag", "window", "weld"],
+ "barg": "eat",
+ "brang": "bring",
+ "bram": "from",
+ "rabah": "lover",
+ "raab": "love",
+ "habbah": "happy",
+ "abah": "about",
+ "ah": ["of", "if"],
+ "ahbgrag": "upgrade",
+ "harh": "hear",
+ "mama": ["mom", "mother", "mama"],
+ "baba": ["dad", "papa", "father"],
+ "babah": ["baby", "kid", "child"],
+ "ahn": "in",
+ "ahn-na-ahn": "between",
+ "ahahz": "away",
+ "anh": "and",
+ "ann": "on",
+ "arghazzm": "orgasm",
+ "abrahb": ["afraid", "fear"],
+ "hanah": "honey",
+ "hag": "hug",
+ "zaan": "soon",
+ "zagzaz": "success",
+ "gan": "can",
+ "zang": "change",
+ "zangz": "thanks",
+ "zarrah": "sorry",
+ "zanh": ["can't", "cant", "cannot"],
+ "gang": ["group", "mob", "horde"],
+ "barbaga zaarz": "bbq sauce",
+ "hab": "help",
+ "ahnna": "into",
+ "arahn": "around",
+ "za": "to",
+ "ahn!nn": "within",
+ "aham": "ahem",
+ "anamah": "animal",
+ "zaa": ["see", "saw", "seen", "vision", "sight"],
+ "z!gzag": ["zigzag", "obstruct", "dodge", "avoid"],
+ "z!gn": "sign",
+ "z!ng": "sing",
+ "z!ngz": "thing",
+ "mabban": "move",
+ "rabhabh": "revive",
+ "zammarrar": "tomorrow",
+ "graan": "green",
+ "arh": "or",
+ "arm": "arm",
+ "arzhahm": "awesome",
+ "arrang": ["along", "with", "alongside"],
+ "arza": ["also", "too"],
+ "bgaz": "because",
+ "mah zambah brazzahz": ["we", "us"],
+ "grazzaz": "glasses",
+ "habban": "heaven",
+ "mazzah man": "chaplain",
+ "hanz": "hand",
+ "hab-ganna": ["want", "gonna have"],
+ "magma": ["magma", "lava"],
+ "manzhan": "mansion",
+ "harmbargarz": "hamburger",
+ "harrazz": "harass",
+ "namz": "name",
+ "ramambarh": "remember",
+ "rh!zzan": "listen",
+ "rabrarah": "library",
+ "ragargarh": "recorder",
+ "zarh": ["you", "your", "you're", "ya"],
+ "hagh": "head",
+ "RNA": "DNA",
+ "zambahz": "zombies",
+ "zzzz": ["chill", "relax", "sleep", "calm", "peace", "dream"],
+ "bah": ["bad", "evil", "but"],
+ "gag": ["gross", "nasty", "vomit", "smelly", "stinky", "stench", "foul", "quiet", "silence", "shutup"],
+ "gammah": ["give", "gimmie"],
+ "gah": ["get", "go"],
+ "gargazz": ["body", "corpse"],
+ "rag": ["uniform", "suit", "rag", "clothing", "jumpsuit"],
+ "garbagz": ["garbage", "janitor", "custodian", "trash", "clean", "dirt", "filth", "mess", "junk"],
+ "bagman": ["doctor", "medic", "healer", "paramedic", "curator", "librarian"],
+ "gangbang": ["death", "kill", "die", "slay", "ERP", "punish", "detain", "prison", "prisoner", "brig", "cell", "jail", "perma", "permabrig"],
+ "bag": ["duffle", "dufflebag", "pocket", "box", "bag", "backpack", "storage", "inventory"],
+ "aarbagz": ["airbag", "atmos", "airtank", "canister", "air", "atmos tech", "atmospherics", "tank", "gas", "flood", "siphon"],
+ "bar": ["bar", "drink", "alchol", "liquor"],
+ "bar man": "bartender",
+ "barn": ["hydroponics", "botany", "office", "room"],
+ "brainz barn": ["kitchen", "cafe", "service"],
+ "nah": ["not", "nope", "no", "deny", "don't", "dont"],
+ "nabarh": "never",
+ "nabarmang": "nevermind",
+ "naz!n": "nothing",
+ "abar": "all",
+ "abara": "every",
+ "abarahaarh": "everywhere",
+ "abargargazz": "everybody",
+ "abban": "open",
+ "abzarb": ["drink", "absorb"],
+ "gaa": ["yes", "ya", "okay", "alright"],
+ "abargamz": "always",
+ "am": ["is", "are", "am"],
+ "aman": "amen",
+ "amaz!ng": "amazing",
+ "zahz": ["say", "says", "that"],
+ "gab": ["told", "talk", "speak", "spoke", "language", "communication", "radio", "comms", "text", "word", "speech"],
+ "mrh": ["why", "how", "when", "who", "what", "where"],
+ "zmazh": ["smash", "break", "destroy", "deconstruct", "dismantle", "ruin", "destruction", "demolish"],
+ "ranz": ["run", "ran", "ride"],
+ "hahg": ["hide", "hidden", "shelter"],
+ "zanz": ["dance", "spin", "flip"],
+ "ganna": ["going", "gonna"],
+ "mannah": ["many", "much", "very"],
+ "mazzargh": "massacure",
+ "mazzah": ["lord", "god", "religion", "chapel", "altar", "bible", "messiah", "christ"],
+ "mararana": ["weed", "420", "marijuana", "drug"],
+ "barb": ["knife", "poke", "thorn", "joke"],
+ "mmmm": ["delicious", "tasty", "like", "enjoy"],
+ "barbarh": "barber",
+ "bargahn": "bargain",
+ "bargh": "barge",
+ "ban!zh": ["ban", "banish"],
+ "brazzarz": ["brother", "skeleton", "skele"],
+ "zambah": ["zombie", "undead", "dead", "horde"],
+ "gangbang harmanz": ["sec", "security", "assistant", "greyshirt", "greytide", "cargo", "syndie", "rev", "shitsec", "shitcurity"],
+ "ganz": ["gun", "rifle", "taser", "shotgun", "revovler", "sniper", "pistol"],
+ "bang": ["bomb", "detonate", "explode", "explosion", "boom", "bang", "noise", "loud"],
+ "bang-bang": ["bullet", "shot", "shoot", "fire", "laser", "lazer"],
+ "harm": ["attack", "punch", "hit", "throw", "fight", "strike", "combat", "choke", "suffoicate", "baton", "harmbaton"],
+ "ram": ["smash", "smack", "punch", "tackle", "kick", "push", "beat"],
+ "zhangh": ["stab", "slash", "slice"],
+ "bang bang man": ["officer", "warden", "hos", "bounty hunter", "hunt", "hunter"],
+ "manbagz": ["testicle", "balls"],
+ "grahn": ["groan", "gasp", "crit", "moan", "unconscious"],
+ "gahn": "gone",
+ "ganarazharh": ["power", "apc", "generator", "smes"],
+ "grabz": ["grab", "hold", "held", "grip", "restrain", "handcuff", "cuff", "arrest"],
+ "mah": ["my", "me"],
+ "mana man": "wizard",
+ "mana": "magic",
+ "mana bang-bang": "spell",
+ "mahg": "make",
+ "mannarz": "manner",
+ "brainz": ["brain", "intelligence", "smart", "hungry", "hunger", "eat", "meat", "desert"],
+ "harman": ["human", "food", "person", "groceries"],
+ "harmanz": ["crew", "people", "humans"]
+ }
}
diff --git a/tannhauser/Archive/Manaforge/warpstone_lab old2.dmm b/tannhauser/Archive/Manaforge/warpstone_lab old2.dmm
new file mode 100644
index 00000000000000..ac2281aab29270
--- /dev/null
+++ b/tannhauser/Archive/Manaforge/warpstone_lab old2.dmm
@@ -0,0 +1,1278 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"ak" = (
+/obj/machinery/power/emitter/welded{
+ dir = 1;
+ cable_layer = 1
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/stripes/end,
+/obj/structure/cable/layer1,
+/turf/open/floor/plating,
+/area/station/science/research/abandoned)
+"bf" = (
+/turf/open/misc/asteroid/snow/icemoon,
+/area/icemoon/underground/explored)
+"bz" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/science/research/abandoned)
+"bD" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/spawner/structure/window/reinforced/plasma,
+/turf/open/floor/plating,
+/area/station/science/research/abandoned)
+"bG" = (
+/obj/machinery/power/apc/auto_name/directional/north{
+ cable_layer = 1
+ },
+/obj/structure/cable,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable/layer1,
+/obj/machinery/power/terminal{
+ dir = 1;
+ cable_layer = 1
+ },
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/science/research/abandoned)
+"bK" = (
+/obj/structure/frame/computer{
+ anchored = 1;
+ broken = 1;
+ can_be_unanchored = 1
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"cc" = (
+/obj/machinery/door/airlock/science{
+ name = "Abandoned Warp Stone Lab"
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/purple/filled/end,
+/obj/effect/mapping_helpers/airlock/abandoned,
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"cv" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 4
+ },
+/obj/machinery/door/airlock/plasma{
+ name = "Outer Warpstone Lock"
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/effect/turf_decal/trimline/purple/filled/end{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"cU" = (
+/obj/machinery/atmospherics/pipe/smart/simple/dark/visible,
+/turf/closed/wall/r_wall,
+/area/station/science/ordnance/burnchamber)
+"cZ" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/door/airlock/science{
+ name = "Abandoned Warp Stone Lab"
+ },
+/obj/structure/cable,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+ cycle_id = "Warp_Lab"
+ },
+/turf/open/floor/iron/white,
+/area/station/science/research/abandoned)
+"ef" = (
+/obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{
+ dir = 4
+ },
+/obj/machinery/meter,
+/turf/open/floor/iron,
+/area/station/science/ordnance)
+"em" = (
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron/white,
+/area/station/science/ordnance)
+"eE" = (
+/obj/machinery/power/smes/full,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 4
+ },
+/obj/structure/cable,
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"gp" = (
+/obj/machinery/atmospherics/components/binary/pump/off,
+/obj/machinery/airlock_sensor/incinerator_ordmix{
+ pixel_x = 24
+ },
+/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{
+ dir = 8
+ },
+/turf/open/floor/engine,
+/area/station/science/ordnance/burnchamber)
+"gA" = (
+/obj/machinery/portable_atmospherics/canister/plasma,
+/turf/open/misc/asteroid/snow/icemoon,
+/area/icemoon/underground/explored)
+"he" = (
+/turf/closed/wall,
+/area/station/maintenance/starboard/aft)
+"ia" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron/white,
+/area/station/science/ordnance)
+"id" = (
+/obj/structure/table_frame,
+/obj/machinery/light/cold/directional/west,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"in" = (
+/obj/structure/cable,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/station/science/research/abandoned)
+"iq" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
+"iF" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"jE" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/aft)
+"jG" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron,
+/area/station/science/ordnance)
+"jV" = (
+/turf/open/floor/engine/vacuum,
+/area/station/science/ordnance/burnchamber)
+"kd" = (
+/obj/machinery/power/supermatter_crystal/hugbox{
+ color = "green";
+ name = "Synthetic Warp Stone Crystal"
+ },
+/turf/open/floor/engine/airless,
+/area/station/science/research/abandoned)
+"ku" = (
+/obj/item/radio/intercom/directional/north,
+/turf/open/floor/iron/white,
+/area/station/science/ordnance)
+"kJ" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 8
+ },
+/obj/machinery/door/airlock/plasma{
+ name = "Inner Warpstone Lock"
+ },
+/obj/structure/fans/tiny/invisible,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/mapping_helpers/airlock/locked,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/science/research/abandoned)
+"kN" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/layer4,
+/turf/open/floor/engine/airless,
+/area/station/science/research/abandoned)
+"kZ" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible,
+/obj/effect/turf_decal/box/red,
+/obj/machinery/firealarm/directional/east,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
+"la" = (
+/obj/structure/fence,
+/turf/open/misc/asteroid/snow/icemoon,
+/area/icemoon/underground/explored)
+"lj" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/showcase/horrific_experiment,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"mc" = (
+/obj/structure/table/reinforced/rglass,
+/obj/item/scalpel/supermatter{
+ name = "Warpstone Chisel"
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/multitool,
+/obj/machinery/camera/autoname/directional/west,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"my" = (
+/obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_ordmix{
+ dir = 4
+ },
+/turf/open/floor/engine,
+/area/station/science/ordnance/burnchamber)
+"nH" = (
+/obj/structure/closet/firecloset/wall{
+ pixel_x = -28
+ },
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"nI" = (
+/obj/effect/spawner/structure/window/reinforced/plasma,
+/turf/open/floor/plating,
+/area/station/science/research/abandoned)
+"pa" = (
+/obj/machinery/power/energy_accumulator/grounding_rod/anchored,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/engine/airless,
+/area/station/science/research/abandoned)
+"ps" = (
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/components/tank,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
+"pE" = (
+/obj/machinery/atmospherics/components/binary/valve/digital{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/science/ordnance)
+"pK" = (
+/obj/structure/cable,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/extinguisher_cabinet/directional/north,
+/obj/structure/cable/layer1,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/science/research/abandoned)
+"qj" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
+"qq" = (
+/obj/machinery/door/firedoor/border_only,
+/turf/open/floor/iron/white,
+/area/station/science/ordnance)
+"qx" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"qz" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/turf/open/floor/engine/airless,
+/area/station/science/research/abandoned)
+"qP" = (
+/obj/structure/cable,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/paper/crumpled,
+/obj/structure/cable/layer1,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/science/research/abandoned)
+"rr" = (
+/obj/machinery/light/cold/directional/south,
+/obj/machinery/firealarm/directional/south,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/trimline/purple/filled/line,
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"rC" = (
+/obj/structure/closet/firecloset,
+/obj/machinery/light/small/directional/north,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/aft)
+"sj" = (
+/obj/machinery/atmospherics/components/tank,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
+"sx" = (
+/turf/open/floor/engine/airless,
+/area/station/science/research/abandoned)
+"sy" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+ dir = 1
+ },
+/obj/effect/turf_decal/box/red,
+/obj/machinery/airalarm/directional/east,
+/obj/effect/mapping_helpers/airalarm/mixingchamber_access,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance/burnchamber)
+"sN" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/engine/airless,
+/area/station/science/research/abandoned)
+"sR" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"sZ" = (
+/obj/machinery/light/red/directional/south,
+/turf/open/floor/engine/airless,
+/area/station/science/research/abandoned)
+"tw" = (
+/obj/structure/table/reinforced/rglass,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/paper,
+/obj/item/disk{
+ name = "Research Data";
+ pixel_x = 7
+ },
+/obj/item/pen/fourcolor,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 4
+ },
+/obj/structure/cable/multilayer/connected,
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"tz" = (
+/obj/structure/disposaloutlet{
+ dir = 4
+ },
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
+/turf/open/floor/engine/airless,
+/area/station/science/research/abandoned)
+"tR" = (
+/obj/machinery/atmospherics/components/tank,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/machinery/light/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
+"uj" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible{
+ dir = 1
+ },
+/obj/effect/turf_decal/box,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/science/ordnance)
+"ur" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/science/ordnance)
+"uW" = (
+/obj/structure/stairs/west,
+/turf/open/floor/iron/white,
+/area/station/science/ordnance)
+"vf" = (
+/obj/structure/table/reinforced/rglass,
+/obj/item/modular_computer/laptop/preset/civilian,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/trash/can{
+ pixel_y = 11
+ },
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 6
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"vs" = (
+/obj/machinery/light/cold/directional/south,
+/obj/machinery/light_switch/directional/south,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/trimline/purple/filled/line,
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"wd" = (
+/obj/effect/spawner/random/trash,
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/aft)
+"wl" = (
+/obj/structure/table_frame,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/sign/poster/official/random/directional/west,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"wJ" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"wS" = (
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
+"xX" = (
+/obj/machinery/air_sensor/ordnance_burn_chamber,
+/turf/open/floor/engine/vacuum,
+/area/station/science/ordnance/burnchamber)
+"xZ" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/radio/intercom/directional/south,
+/obj/effect/turf_decal/trimline/purple/filled/line,
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"yc" = (
+/obj/machinery/door/airlock/research/glass/incinerator/ordmix_exterior{
+ name = "Burn Chamber Exterior Airlock"
+ },
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
+/turf/open/floor/engine/vacuum,
+/area/station/science/ordnance/burnchamber)
+"yi" = (
+/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible,
+/turf/open/floor/iron,
+/area/station/science/ordnance)
+"yo" = (
+/obj/effect/landmark/blobstart,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/engine/airless,
+/area/station/science/research/abandoned)
+"Ak" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/heavy,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
+"AF" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 6
+ },
+/obj/machinery/atmospherics/components/tank,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
+"AJ" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/portable_atmospherics/canister/freon,
+/obj/effect/turf_decal/box,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 10
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"AN" = (
+/obj/machinery/atmospherics/components/binary/pump/on{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{
+ dir = 4
+ },
+/turf/open/floor/engine,
+/area/station/science/ordnance/burnchamber)
+"Bq" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/science/research/abandoned)
+"Cm" = (
+/obj/machinery/door/poddoor/incinerator_ordmix,
+/turf/open/openspace,
+/area/station/science/ordnance/burnchamber)
+"Dl" = (
+/obj/structure/cable,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/science/research/abandoned)
+"Dz" = (
+/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
+"DD" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/closet/radiation,
+/obj/effect/turf_decal/trimline/purple/filled/corner{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"DZ" = (
+/turf/closed/wall/r_wall,
+/area/station/science/research/abandoned)
+"Eu" = (
+/obj/machinery/light/red/directional/north,
+/turf/open/floor/engine/airless,
+/area/station/science/research/abandoned)
+"EG" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
+"Fb" = (
+/obj/machinery/disposal/bin,
+/obj/structure/disposalpipe/trunk{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 6
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"Fe" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/trimline/purple/filled/corner,
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"Fl" = (
+/obj/structure/stairs/east,
+/obj/structure/railing,
+/obj/machinery/door/firedoor/border_only,
+/turf/open/floor/iron/white,
+/area/station/science/ordnance)
+"FK" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/closed/wall/r_wall,
+/area/station/science/ordnance/burnchamber)
+"FL" = (
+/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/science/ordnance)
+"FY" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/machinery/light/floor,
+/turf/open/floor/iron/white,
+/area/station/science/ordnance)
+"Gc" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/machinery/door/firedoor,
+/turf/open/floor/plating,
+/area/station/science/research/abandoned)
+"GC" = (
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/heavy,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
+"GS" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron/white,
+/area/station/science/research/abandoned)
+"Hb" = (
+/obj/machinery/door/airlock/maintenance_hatch{
+ name = "Ordnance Lab Maintenance"
+ },
+/obj/machinery/door/firedoor/heavy,
+/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
+/turf/open/floor/plating,
+/area/station/science/ordnance)
+"Ig" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/mob/living/basic/mouse/rat,
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"Ii" = (
+/obj/structure/fence/door/opened{
+ dir = 4
+ },
+/turf/open/misc/asteroid/snow/icemoon,
+/area/icemoon/underground/explored)
+"Im" = (
+/obj/machinery/igniter/incinerator_ordmix,
+/turf/open/floor/engine/vacuum,
+/area/station/science/ordnance/burnchamber)
+"Iz" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/gibspawner/robot,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/science/research/abandoned)
+"IK" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/caution{
+ dir = 8
+ },
+/obj/effect/turf_decal/trimline/purple/filled/warning{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"JR" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/obj/effect/turf_decal/trimline/purple/filled/corner,
+/obj/effect/turf_decal/trimline/purple/filled/corner{
+ dir = 8
+ },
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/science/research/abandoned)
+"JU" = (
+/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/science/ordnance)
+"KG" = (
+/obj/machinery/airalarm/directional/north,
+/obj/effect/mapping_helpers/airalarm/all_access,
+/obj/structure/cable,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/storage/bag/trash/filled,
+/obj/structure/cable/layer1,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/science/research/abandoned)
+"Lk" = (
+/obj/machinery/power/energy_accumulator/tesla_coil/anchored,
+/turf/open/floor/engine/airless,
+/area/station/science/research/abandoned)
+"LB" = (
+/obj/structure/cable,
+/obj/machinery/power/terminal{
+ dir = 4
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/cable/layer1,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/science/research/abandoned)
+"LI" = (
+/turf/open/floor/iron,
+/area/station/science/ordnance)
+"MI" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/science/ordnance)
+"Nb" = (
+/obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior{
+ name = "Burn Chamber Interior Airlock"
+ },
+/obj/effect/mapping_helpers/airlock/locked,
+/obj/machinery/airlock_controller/incinerator_ordmix{
+ pixel_x = 24
+ },
+/obj/effect/mapping_helpers/airlock/access/all/science/ordnance,
+/turf/open/floor/engine,
+/area/station/science/ordnance/burnchamber)
+"Nd" = (
+/obj/machinery/requests_console/auto_name/directional/north,
+/obj/machinery/firealarm/directional/north{
+ pixel_x = 21
+ },
+/turf/open/floor/iron/white,
+/area/station/science/ordnance)
+"NZ" = (
+/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{
+ dir = 6
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/science/ordnance)
+"Og" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/turf/closed/wall/r_wall,
+/area/station/maintenance/starboard/aft)
+"Ok" = (
+/turf/open/genturf/blue,
+/area/icemoon/underground/unexplored/rivers/deep/shoreline)
+"Ox" = (
+/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
+ dir = 9
+ },
+/obj/machinery/meter,
+/obj/machinery/button/ignition/incinerator/ordmix{
+ pixel_x = 8;
+ pixel_y = 32
+ },
+/obj/machinery/button/door/incinerator_vent_ordmix{
+ pixel_x = -8;
+ pixel_y = 32
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
+"Oz" = (
+/obj/structure/stairs/west,
+/obj/structure/railing,
+/obj/machinery/door/firedoor/border_only,
+/turf/open/floor/iron/white,
+/area/station/science/ordnance)
+"Qv" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/trimline/purple/filled/line,
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"QE" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/destructive_scanner,
+/obj/effect/turf_decal/stripes/end,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"Rb" = (
+/obj/structure/frame/machine,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 1
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"Rc" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/iron,
+/area/station/science/ordnance)
+"Rr" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_burn_chamber_input,
+/turf/open/floor/engine/vacuum,
+/area/station/science/ordnance/burnchamber)
+"RG" = (
+/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 1
+ },
+/turf/open/floor/iron,
+/area/station/science/ordnance)
+"RJ" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/mob/living/basic/mouse/rat,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/structure/cable,
+/turf/open/floor/catwalk_floor/iron_dark,
+/area/station/science/research/abandoned)
+"RM" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/newscaster/directional/south,
+/obj/item/trash/energybar,
+/obj/effect/turf_decal/trimline/purple/filled/line,
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"Sd" = (
+/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
+ dir = 4
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/heavy,
+/obj/machinery/light/directional/north,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/turf/open/floor/iron/dark,
+/area/station/science/ordnance)
+"Sv" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/turf/open/floor/engine/vacuum,
+/area/station/science/ordnance/burnchamber)
+"SG" = (
+/turf/closed/wall/r_wall,
+/area/station/science/ordnance)
+"Ul" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/item/clothing/glasses/welding,
+/obj/effect/mob_spawn/corpse/human/charredskeleton,
+/turf/open/floor/engine/airless,
+/area/station/science/research/abandoned)
+"Un" = (
+/obj/machinery/shower/directional/west{
+ name = "emergency shower"
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 4
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"Ut" = (
+/obj/machinery/light/cold/directional/south,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/effect/turf_decal/trimline/purple/filled/line,
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"UL" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/portable_atmospherics/canister/halon,
+/obj/effect/turf_decal/box,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 8
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"Vd" = (
+/obj/machinery/door/airlock/external{
+ glass = 1;
+ name = "Xenobiology External Airlock";
+ opacity = 0
+ },
+/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{
+ cycle_id = "Warp_Lab"
+ },
+/obj/effect/mapping_helpers/airlock/access/any/science/maintenance,
+/turf/open/floor/plating,
+/area/station/science/research/abandoned)
+"Vl" = (
+/turf/open/floor/iron/white,
+/area/station/science/ordnance)
+"Vp" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/structure/trash_pile,
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"Vw" = (
+/obj/structure/stairs/east,
+/turf/open/floor/iron/white,
+/area/station/science/ordnance)
+"VE" = (
+/obj/structure/sign/warning/fire/directional/east,
+/turf/open/misc/asteroid/snow/icemoon,
+/area/icemoon/underground/explored)
+"VK" = (
+/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible,
+/turf/closed/wall/r_wall,
+/area/station/science/ordnance/burnchamber)
+"VL" = (
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 9
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"VZ" = (
+/turf/closed/wall/r_wall,
+/area/station/science/ordnance/burnchamber)
+"Wj" = (
+/obj/structure/table/reinforced/rglass,
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/item/storage/box/gorillacubes,
+/obj/item/analyzer/ranged,
+/obj/effect/turf_decal/trimline/purple/filled/line{
+ dir = 5
+ },
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"Wt" = (
+/turf/closed/wall/r_wall,
+/area/station/maintenance/starboard/aft)
+"WK" = (
+/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
+/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
+/obj/machinery/door/firedoor/heavy,
+/obj/effect/turf_decal/trimline/purple/filled/end{
+ dir = 4
+ },
+/obj/machinery/light/small/broken/directional/north,
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"Xi" = (
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2,
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"YW" = (
+/obj/machinery/atmospherics/components/trinary/mixer{
+ dir = 4
+ },
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/iron,
+/area/station/science/ordnance)
+"Zo" = (
+/obj/structure/chair/office{
+ dir = 1
+ },
+/obj/effect/decal/cleanable/dirt/dust,
+/obj/machinery/requests_console/auto_name/directional/south,
+/obj/effect/turf_decal/trimline/purple/filled/line,
+/turf/open/floor/iron/dark,
+/area/station/science/research/abandoned)
+"Zq" = (
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/station/science/ordnance)
+"ZJ" = (
+/turf/open/floor/plating,
+/area/station/maintenance/starboard/aft)
+
+(1,1,1) = {"
+DZ
+DZ
+DZ
+DZ
+DZ
+DZ
+DZ
+Gc
+Gc
+DZ
+bf
+bf
+VE
+bf
+bf
+bf
+bf
+Zq
+sj
+ps
+YW
+uj
+"}
+(2,1,1) = {"
+DZ
+VL
+iF
+nH
+id
+mc
+wl
+UL
+AJ
+DZ
+bf
+bf
+SG
+SG
+SG
+SG
+SG
+SG
+tR
+AF
+YW
+uj
+"}
+(3,1,1) = {"
+DZ
+Rb
+Vp
+wJ
+wJ
+Ig
+wJ
+wJ
+Qv
+DZ
+bf
+bf
+SG
+uW
+uW
+uW
+uW
+Oz
+NZ
+yi
+ef
+JU
+"}
+(4,1,1) = {"
+DZ
+Rb
+Ig
+Xi
+bz
+Bq
+Iz
+wJ
+Qv
+DZ
+in
+in
+DZ
+ku
+Vl
+Vl
+Vl
+qq
+pE
+LI
+LI
+Rc
+"}
+(5,1,1) = {"
+DZ
+QE
+Fe
+Un
+IK
+DD
+Dl
+RJ
+JR
+cc
+GS
+GS
+cZ
+ia
+ia
+FY
+ia
+em
+FL
+Rc
+MI
+ur
+"}
+(6,1,1) = {"
+DZ
+lj
+Ut
+DZ
+cv
+DZ
+Dl
+qx
+rr
+DZ
+Vd
+in
+DZ
+Nd
+Vl
+Vl
+Vl
+qq
+RG
+jG
+LI
+jG
+"}
+(7,1,1) = {"
+DZ
+Wj
+Fb
+DZ
+WK
+DZ
+bG
+Bq
+Qv
+DZ
+bf
+bf
+SG
+Vw
+Vw
+Vw
+Vw
+Fl
+RG
+jG
+jG
+jG
+"}
+(8,1,1) = {"
+DZ
+nI
+bD
+DZ
+kJ
+DZ
+KG
+sR
+vs
+DZ
+Ii
+la
+VZ
+VZ
+VZ
+VZ
+FK
+FK
+Sd
+Ak
+GC
+GC
+"}
+(9,1,1) = {"
+DZ
+Lk
+tz
+sx
+sN
+DZ
+pK
+wJ
+xZ
+DZ
+bf
+bf
+Cm
+jV
+Rr
+cU
+AN
+cU
+Ox
+EG
+qj
+wS
+"}
+(10,1,1) = {"
+DZ
+Eu
+kN
+yo
+pa
+nI
+qP
+bK
+RM
+DZ
+bf
+bf
+Cm
+Im
+xX
+yc
+my
+Nb
+wS
+wS
+iq
+wS
+"}
+(11,1,1) = {"
+DZ
+sx
+kd
+qz
+Ul
+nI
+LB
+ak
+Zo
+DZ
+bf
+bf
+Cm
+jV
+Sv
+VK
+gp
+VK
+sy
+wS
+Dz
+kZ
+"}
+(12,1,1) = {"
+DZ
+sx
+sx
+sx
+sZ
+DZ
+eE
+tw
+vf
+DZ
+gA
+bf
+Wt
+Wt
+Wt
+Wt
+Og
+Wt
+Wt
+Hb
+Wt
+SG
+"}
+(13,1,1) = {"
+DZ
+DZ
+DZ
+DZ
+DZ
+DZ
+DZ
+DZ
+DZ
+DZ
+he
+he
+he
+rC
+ZJ
+ZJ
+ZJ
+ZJ
+wd
+jE
+he
+Ok
+"}
diff --git a/tgstation.dme b/tgstation.dme
index 4e52863098d551..14c1c7528c2a62 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -82,6 +82,7 @@
#include "code\__DEFINES\DNA.dm"
#include "code\__DEFINES\dna_infuser_defines.dm"
#include "code\__DEFINES\do_afters.dm"
+#include "code\__DEFINES\door.dm"
#include "code\__DEFINES\drone.dm"
#include "code\__DEFINES\dye_keys.dm"
#include "code\__DEFINES\dynamic.dm"
@@ -361,6 +362,7 @@
#include "code\__DEFINES\dcs\signals\signals_turf.dm"
#include "code\__DEFINES\dcs\signals\signals_twohand.dm"
#include "code\__DEFINES\dcs\signals\signals_vehicle.dm"
+#include "code\__DEFINES\dcs\signals\signals_voidwalker.dm"
#include "code\__DEFINES\dcs\signals\signals_wash.dm"
#include "code\__DEFINES\dcs\signals\signals_wizard.dm"
#include "code\__DEFINES\dcs\signals\signals_xeno_control.dm"
@@ -1034,6 +1036,7 @@
#include "code\datums\ai\basic_mobs\pet_commands\pet_follow_friend.dm"
#include "code\datums\ai\basic_mobs\pet_commands\pet_use_targeted_ability.dm"
#include "code\datums\ai\basic_mobs\pet_commands\play_dead.dm"
+#include "code\datums\ai\basic_mobs\targeting_strategies\_targeting_strategy.dm"
#include "code\datums\ai\basic_mobs\targeting_strategies\basic_targeting_strategy.dm"
#include "code\datums\ai\basic_mobs\targeting_strategies\dont_target_friends.dm"
#include "code\datums\ai\basic_mobs\targeting_strategies\with_object.dm"
@@ -1091,6 +1094,7 @@
#include "code\datums\bodypart_overlays\markings_bodypart_overlay.dm"
#include "code\datums\bodypart_overlays\mutant_bodypart_overlay.dm"
#include "code\datums\bodypart_overlays\simple_bodypart_overlay.dm"
+#include "code\datums\bodypart_overlays\texture_bodypart_overlay.dm"
#include "code\datums\brain_damage\brain_trauma.dm"
#include "code\datums\brain_damage\creepy_trauma.dm"
#include "code\datums\brain_damage\hypnosis.dm"
@@ -1125,6 +1129,7 @@
#include "code\datums\components\atmos_reaction_recorder.dm"
#include "code\datums\components\aura_healing.dm"
#include "code\datums\components\bakeable.dm"
+#include "code\datums\components\banned_from_space.dm"
#include "code\datums\components\basic_inhands.dm"
#include "code\datums\components\basic_mob_attack_telegraph.dm"
#include "code\datums\components\basic_ranged_ready_overlay.dm"
@@ -1198,6 +1203,7 @@
#include "code\datums\components\gas_leaker.dm"
#include "code\datums\components\geiger_sound.dm"
#include "code\datums\components\ghost_direct_control.dm"
+#include "code\datums\components\glass_passer.dm"
#include "code\datums\components\gps.dm"
#include "code\datums\components\grillable.dm"
#include "code\datums\components\ground_sinking.dm"
@@ -1207,6 +1213,7 @@
#include "code\datums\components\hazard_area.dm"
#include "code\datums\components\healing_touch.dm"
#include "code\datums\components\health_scaling_effects.dm"
+#include "code\datums\components\heart_eater.dm"
#include "code\datums\components\heirloom.dm"
#include "code\datums\components\hide_highest_offset.dm"
#include "code\datums\components\holderloving.dm"
@@ -1244,7 +1251,6 @@
#include "code\datums\components\nuclear_bomb_operator.dm"
#include "code\datums\components\object_possession.dm"
#include "code\datums\components\omen.dm"
-#include "code\datums\components\on_hit_effect.dm"
#include "code\datums\components\onwear_mood.dm"
#include "code\datums\components\orbiter.dm"
#include "code\datums\components\overlay_lighting.dm"
@@ -1296,12 +1302,19 @@
#include "code\datums\components\sisyphus_awarder.dm"
#include "code\datums\components\sitcomlaughter.dm"
#include "code\datums\components\sizzle.dm"
+#include "code\datums\components\slime_friends.dm"
#include "code\datums\components\slippery.dm"
#include "code\datums\components\smooth_tunes.dm"
+#include "code\datums\components\soapbox.dm"
#include "code\datums\components\soul_stealer.dm"
#include "code\datums\components\soulstoned.dm"
#include "code\datums\components\sound_player.dm"
+#include "code\datums\components\space_allaergy.dm"
+#include "code\datums\components\space_camo.dm"
+#include "code\datums\components\space_dive.dm"
+#include "code\datums\components\space_kidnap.dm"
#include "code\datums\components\spawner.dm"
+#include "code\datums\components\speechmod.dm"
#include "code\datums\components\spill.dm"
#include "code\datums\components\spin2win.dm"
#include "code\datums\components\spinny.dm"
@@ -1330,6 +1343,7 @@
#include "code\datums\components\telegraph_ability.dm"
#include "code\datums\components\temporary_body.dm"
#include "code\datums\components\temporary_description.dm"
+#include "code\datums\components\temporary_glass_shatter.dm"
#include "code\datums\components\tether.dm"
#include "code\datums\components\thermite.dm"
#include "code\datums\components\throwbonus_on_windup.dm"
@@ -1353,6 +1367,7 @@
#include "code\datums\components\wearertargeting.dm"
#include "code\datums\components\weatherannouncer.dm"
#include "code\datums\components\wet_floor.dm"
+#include "code\datums\components\wormborn.dm"
#include "code\datums\components\container_item\container_item.dm"
#include "code\datums\components\container_item\tank_holder.dm"
#include "code\datums\components\crafting\_recipes.dm"
@@ -1543,6 +1558,7 @@
#include "code\datums\elements\frozen.dm"
#include "code\datums\elements\gags_recolorable.dm"
#include "code\datums\elements\give_turf_traits.dm"
+#include "code\datums\elements\glass_pacifist.dm"
#include "code\datums\elements\gravedigger.dm"
#include "code\datums\elements\hat_wearer.dm"
#include "code\datums\elements\haunted.dm"
@@ -1575,9 +1591,12 @@
#include "code\datums\elements\movetype_handler.dm"
#include "code\datums\elements\muffles_speech.dm"
#include "code\datums\elements\nerfed_pulling.dm"
+#include "code\datums\elements\no_crit_hitting.dm"
#include "code\datums\elements\noisy_movement.dm"
#include "code\datums\elements\noticable_organ.dm"
#include "code\datums\elements\obj_regen.dm"
+#include "code\datums\elements\on_hit_effect.dm"
+#include "code\datums\elements\only_pull_living.dm"
#include "code\datums\elements\openspace_item_click_handler.dm"
#include "code\datums\elements\ore_collecting.dm"
#include "code\datums\elements\organ_set_bonus.dm"
@@ -1972,6 +1991,7 @@
#include "code\datums\storage\subtypes\implant.dm"
#include "code\datums\storage\subtypes\organ_box.dm"
#include "code\datums\storage\subtypes\pockets.dm"
+#include "code\datums\storage\subtypes\portable_chem_mixer.dm"
#include "code\datums\storage\subtypes\rped.dm"
#include "code\datums\storage\subtypes\surgery_tray.dm"
#include "code\datums\storage\subtypes\trash.dm"
@@ -2132,7 +2152,7 @@
#include "code\game\machinery\recycler.dm"
#include "code\game\machinery\requests_console.dm"
#include "code\game\machinery\roulette_machine.dm"
-#include "code\game\machinery\scan_gate.dm"
+#include "code\game\machinery\scanner_gate.dm"
#include "code\game\machinery\sheetifier.dm"
#include "code\game\machinery\shieldgen.dm"
#include "code\game\machinery\sleepers.dm"
@@ -2431,7 +2451,6 @@
#include "code\game\objects\items\maintenance_loot.dm"
#include "code\game\objects\items\manuals.dm"
#include "code\game\objects\items\mop.dm"
-#include "code\game\objects\items\nitrium_crystals.dm"
#include "code\game\objects\items\paint.dm"
#include "code\game\objects\items\paiwire.dm"
#include "code\game\objects\items\pet_carrier.dm"
@@ -2983,6 +3002,7 @@
#include "code\modules\admin\verbs\adminjump.dm"
#include "code\modules\admin\verbs\adminpm.dm"
#include "code\modules\admin\verbs\adminsay.dm"
+#include "code\modules\admin\verbs\ai_triumvirate.dm"
#include "code\modules\admin\verbs\anonymousnames.dm"
#include "code\modules\admin\verbs\atmosdebug.dm"
#include "code\modules\admin\verbs\beakerpanel.dm"
@@ -3378,6 +3398,17 @@
#include "code\modules\antagonists\valentines\heartbreaker.dm"
#include "code\modules\antagonists\valentines\valentine.dm"
#include "code\modules\antagonists\venus_human_trap\venus_human_trap.dm"
+#include "code\modules\antagonists\voidwalker\voidwalker.dm"
+#include "code\modules\antagonists\voidwalker\voidwalker_abilities.dm"
+#include "code\modules\antagonists\voidwalker\voidwalker_bodyparts.dm"
+#include "code\modules\antagonists\voidwalker\voidwalker_kidnap.dm"
+#include "code\modules\antagonists\voidwalker\voidwalker_loot.dm"
+#include "code\modules\antagonists\voidwalker\voidwalker_organs.dm"
+#include "code\modules\antagonists\voidwalker\voidwalker_particles.dm"
+#include "code\modules\antagonists\voidwalker\voidwalker_species.dm"
+#include "code\modules\antagonists\voidwalker\voidwalker_status_effects.dm"
+#include "code\modules\antagonists\voidwalker\voidwalker_traumas.dm"
+#include "code\modules\antagonists\voidwalker\voidwalker_void_eater.dm"
#include "code\modules\antagonists\wishgranter\wishgranter.dm"
#include "code\modules\antagonists\wizard\imp_antag.dm"
#include "code\modules\antagonists\wizard\slaughter_antag.dm"
@@ -3394,6 +3425,7 @@
#include "code\modules\antagonists\wizard\equipment\spellbook_entries\defensive.dm"
#include "code\modules\antagonists\wizard\equipment\spellbook_entries\mobility.dm"
#include "code\modules\antagonists\wizard\equipment\spellbook_entries\offensive.dm"
+#include "code\modules\antagonists\wizard\equipment\spellbook_entries\perks.dm"
#include "code\modules\antagonists\wizard\equipment\spellbook_entries\summons.dm"
#include "code\modules\antagonists\wizard\grand_ritual\fluff.dm"
#include "code\modules\antagonists\wizard\grand_ritual\grand_ritual.dm"
@@ -3522,6 +3554,7 @@
#include "code\modules\atmospherics\machinery\components\trinary_devices\filter.dm"
#include "code\modules\atmospherics\machinery\components\trinary_devices\mixer.dm"
#include "code\modules\atmospherics\machinery\components\trinary_devices\trinary_devices.dm"
+#include "code\modules\atmospherics\machinery\components\unary_devices\airlock_pump.dm"
#include "code\modules\atmospherics\machinery\components\unary_devices\bluespace_sender.dm"
#include "code\modules\atmospherics\machinery\components\unary_devices\cryo.dm"
#include "code\modules\atmospherics\machinery\components\unary_devices\heat_exchanger.dm"
@@ -3727,6 +3760,7 @@
#include "code\modules\cargo\exports\anomaly.dm"
#include "code\modules\cargo\exports\antiques.dm"
#include "code\modules\cargo\exports\civilain_bounty.dm"
+#include "code\modules\cargo\exports\fish.dm"
#include "code\modules\cargo\exports\food_and_drink.dm"
#include "code\modules\cargo\exports\gear.dm"
#include "code\modules\cargo\exports\large_objects.dm"
@@ -4424,6 +4458,7 @@
#include "code\modules\jobs\job_types\antagonists\space_dragon.dm"
#include "code\modules\jobs\job_types\antagonists\space_ninja.dm"
#include "code\modules\jobs\job_types\antagonists\space_wizard.dm"
+#include "code\modules\jobs\job_types\antagonists\voidwalker.dm"
#include "code\modules\jobs\job_types\antagonists\wizard_apprentice.dm"
#include "code\modules\jobs\job_types\antagonists\xenomorph.dm"
#include "code\modules\jobs\job_types\assistant\assistant.dm"
@@ -4511,6 +4546,7 @@
#include "code\modules\library\random_books.dm"
#include "code\modules\library\skill_learning\skill_station.dm"
#include "code\modules\library\skill_learning\skillchip.dm"
+#include "code\modules\library\skill_learning\generic_skillchips\matrix_flip.dm"
#include "code\modules\library\skill_learning\generic_skillchips\rod_suplex.dm"
#include "code\modules\library\skill_learning\job_skillchips\_job.dm"
#include "code\modules\library\skill_learning\job_skillchips\chef.dm"
@@ -5942,6 +5978,7 @@
#include "code\modules\spells\spell_types\pointed\spell_cards.dm"
#include "code\modules\spells\spell_types\pointed\swap.dm"
#include "code\modules\spells\spell_types\pointed\terrorize.dm"
+#include "code\modules\spells\spell_types\pointed\tie_shoes.dm"
#include "code\modules\spells\spell_types\projectile\_basic_projectile.dm"
#include "code\modules\spells\spell_types\projectile\juggernaut.dm"
#include "code\modules\spells\spell_types\self\basic_heal.dm"
@@ -6731,8 +6768,10 @@
#include "modular_skyrat\master_files\code\modules\mob\living\simple_animal\simple_animal.dm"
#include "modular_skyrat\master_files\code\modules\mob\living\simple_animal\friendly\bumbles.dm"
#include "modular_skyrat\master_files\code\modules\mob\living\simple_animal\friendly\dogs.dm"
+#include "modular_skyrat\master_files\code\modules\mob\living\simple_animal\friendly\pets.dm"
#include "modular_skyrat\master_files\code\modules\mob\living\simple_animal\friendly\poppy.dm"
#include "modular_skyrat\master_files\code\modules\mob\living\simple_animal\friendly\syndicatefox.dm"
+#include "modular_skyrat\master_files\code\modules\mob\living\simple_animal\friendly\cat\fennec.dm"
#include "modular_skyrat\master_files\code\modules\mob\living\simple_animal\hostile\bubblegum.dm"
#include "modular_skyrat\master_files\code\modules\mob\living\simple_animal\hostile\grabbagmob.dm"
#include "modular_skyrat\master_files\code\modules\mob\living\simple_animal\hostile\zombie.dm"
@@ -6754,7 +6793,6 @@
#include "modular_skyrat\master_files\code\modules\paperwork\stamps.dm"
#include "modular_skyrat\master_files\code\modules\power\cable.dm"
#include "modular_skyrat\master_files\code\modules\power\circulator.dm"
-#include "modular_skyrat\master_files\code\modules\power\smes.dm"
#include "modular_skyrat\master_files\code\modules\power\thermoelectric_generator.dm"
#include "modular_skyrat\master_files\code\modules\power\lighting\light_mapping_helpers.dm"
#include "modular_skyrat\master_files\code\modules\power\singularity\containment_field.dm"
@@ -7247,13 +7285,15 @@
#include "modular_skyrat\modules\contractor\code\objects\supplypod.dm"
#include "modular_skyrat\modules\conveyor_sorter\code\conveyor_sorter.dm"
#include "modular_skyrat\modules\cortical_borer\code\cortical_borer.dm"
-#include "modular_skyrat\modules\cortical_borer\code\cortical_borer_abilities.dm"
#include "modular_skyrat\modules\cortical_borer\code\cortical_borer_antag.dm"
#include "modular_skyrat\modules\cortical_borer\code\cortical_borer_chems.dm"
#include "modular_skyrat\modules\cortical_borer\code\cortical_borer_egg.dm"
#include "modular_skyrat\modules\cortical_borer\code\cortical_borer_items.dm"
+#include "modular_skyrat\modules\cortical_borer\code\cortical_borer_movement.dm"
#include "modular_skyrat\modules\cortical_borer\code\focus_datum.dm"
#include "modular_skyrat\modules\cortical_borer\code\status_effects.dm"
+#include "modular_skyrat\modules\cortical_borer\code\abilities\_borer_abilities.dm"
+#include "modular_skyrat\modules\cortical_borer\code\abilities\host_movement.dm"
#include "modular_skyrat\modules\cortical_borer\code\evolution\borer_evolution.dm"
#include "modular_skyrat\modules\cortical_borer\code\evolution\evolution_datum.dm"
#include "modular_skyrat\modules\cortical_borer\code\evolution\evolution_diveworm.dm"
@@ -7358,16 +7398,11 @@
#include "modular_skyrat\modules\customization\modules\language\_language_holder.dm"
#include "modular_skyrat\modules\customization\modules\language\ashtongue.dm"
#include "modular_skyrat\modules\customization\modules\language\beachbum.dm"
-#include "modular_skyrat\modules\customization\modules\language\buzzwords.dm"
-#include "modular_skyrat\modules\customization\modules\language\calcic.dm"
#include "modular_skyrat\modules\customization\modules\language\canilunzt.dm"
#include "modular_skyrat\modules\customization\modules\language\chitinclick.dm"
#include "modular_skyrat\modules\customization\modules\language\common.dm"
#include "modular_skyrat\modules\customization\modules\language\gutter.dm"
-#include "modular_skyrat\modules\customization\modules\language\monkey.dm"
#include "modular_skyrat\modules\customization\modules\language\mothic.dm"
-#include "modular_skyrat\modules\customization\modules\language\mushroom.dm"
-#include "modular_skyrat\modules\customization\modules\language\nekomimetic.dm"
#include "modular_skyrat\modules\customization\modules\language\panslavic.dm"
#include "modular_skyrat\modules\customization\modules\language\piratespeak.dm"
#include "modular_skyrat\modules\customization\modules\language\shadowtongue.dm"
diff --git a/tgui/README.md b/tgui/README.md
index 1bae91fd132582..2bcb6d06afa369 100644
--- a/tgui/README.md
+++ b/tgui/README.md
@@ -35,10 +35,10 @@ If you are using the tooling provided in this repo, everything is included! Feel
However, if you want finer control over the installation or build process, you will need these:
-- [Node v16.13+](https://nodejs.org/en/download/)
+- [Node v20.2+](https://nodejs.org/en/download/)
- **LTS** release is recommended instead of latest
- **DO NOT install Chocolatey if Node installer asks you to!**
-- [Yarn v1.22.4+](https://yarnpkg.com/getting-started/install)
+- [Yarn v4.1.1+](https://yarnpkg.com/getting-started/install)
- You can run `npm install -g yarn` to install it.
## Usage
@@ -144,12 +144,13 @@ together, and can reveal certain layout bugs which are not normally visible.
## Browser Developer Tools
To debug TGUI interfaces with browser-style developer tools, there exists a utility
-that Microsoft bundles with Windows to debug any Internet Explorer/Trident-using interface,
+that Microsoft bundles with Windows called IEChooser/F12 to debug any Internet Explorer/Trident-using interface,
which BYOND uses.
This provides invaluable tools such as a local console, a DOM viewer, an interactive debugger, and more.
-The 64-bit version that we use is located at `%windir%\SysWOW64\F12\IEChooser.exe`.
+You can access the `IEChooser.exe` by pressing Win + R, then typing `f12`, then pressing enter.
+To manually go there: 64-bit version that we use is located at `%windir%\SysWOW64\F12\IEChooser.exe`.
There's also a 32-bit one in `system32\`.
Simply launch the application after you've opened a TGUI window, and choose the .html name.
diff --git a/tgui/docs/chat-embedded-components.md b/tgui/docs/chat-embedded-components.md
index f5a5db7aed5bcc..bb81acbb20dcc2 100644
--- a/tgui/docs/chat-embedded-components.md
+++ b/tgui/docs/chat-embedded-components.md
@@ -29,7 +29,7 @@ We can't embed components that haven't been prewhitelisted.
This isn't because of security concerns or anything, we just can't lookup components by their name without creating a lookup table.
You can find that in [tgui chat's renderer](../packages/tgui-panel/chat/renderer.js) under the name `TGUI_CHAT_COMPONENTS`
-Adding a new component is simple, just add it's name to the dictionary, and import it into the file.
+Adding a new component is simple, just add its name to the dictionary, and import it into the file.
### Sending props
@@ -38,7 +38,7 @@ Ok, so we know how to render a component, but that's nearly useless unless we al
So how's that work?
The syntax is similar to sending a component, but has a bit more caveats.
-We have two bits of info to contend with. The name of the prop, and it's value.
+We have two bits of info to contend with. The name of the prop, and its value.
First then, how do you send the name of a prop?
#### Sending a prop's name
diff --git a/tgui/global.d.ts b/tgui/global.d.ts
index 9cb8e37c2e8c5f..d0bfdecf8909fd 100644
--- a/tgui/global.d.ts
+++ b/tgui/global.d.ts
@@ -158,6 +158,11 @@ type ByondType = {
* Loads a script into the document.
*/
loadJs(url: string): void;
+
+ /**
+ * Maps icons to their ref
+ */
+ iconRefMap: Record;
};
/**
diff --git a/tgui/packages/common/redux.ts b/tgui/packages/common/redux.ts
index c8eb268f5d44fe..6179da15229c42 100644
--- a/tgui/packages/common/redux.ts
+++ b/tgui/packages/common/redux.ts
@@ -163,7 +163,7 @@ export const combineReducers = (
* @param {string} type The action type to use for created actions.
* @param {any} prepare (optional) a method that takes any number of arguments
* and returns { payload } or { payload, meta }. If this is given, the
- * resulting action creator will pass it's arguments to this method to
+ * resulting action creator will pass its arguments to this method to
* calculate payload & meta.
*
* @public
diff --git a/tgui/packages/tgui-panel/reconnect.tsx b/tgui/packages/tgui-panel/reconnect.tsx
index 6d3e6d9759e269..196ea10c954005 100644
--- a/tgui/packages/tgui-panel/reconnect.tsx
+++ b/tgui/packages/tgui-panel/reconnect.tsx
@@ -27,13 +27,14 @@ export const ReconnectButton = () => {
+ />
);
};
diff --git a/tgui/packages/tgui-panel/styles/components/Notifications.scss b/tgui/packages/tgui-panel/styles/components/Notifications.scss
index 6b5160f07839b3..f3669967fd70c4 100644
--- a/tgui/packages/tgui-panel/styles/components/Notifications.scss
+++ b/tgui/packages/tgui-panel/styles/components/Notifications.scss
@@ -5,7 +5,7 @@
.Notifications {
position: absolute;
- bottom: 1em;
+ top: 1em;
left: 1em;
right: 2em;
}
diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
index 049126d684f254..d926f3cc4be103 100644
--- a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
+++ b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
@@ -748,6 +748,11 @@ em {
font-size: 160%;
}
+.soapbox {
+ font-weight: bold;
+ font-size: 135%;
+}
+
.small {
font-size: 60%;
}
@@ -1122,7 +1127,6 @@ $border-width-px: $border-width * 1px;
padding-top: 0.25rem;
line-height: 100%;
width: 100%;
- height: 100%;
text-align: left;
font-size: 125%;
}
diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
index 36a741520dac83..1f9388ff13f6f8 100644
--- a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
+++ b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
@@ -775,6 +775,11 @@ h2.alert {
font-size: 160%;
}
+.soapbox {
+ font-weight: bold;
+ font-size: 135%;
+}
+
.small {
font-size: 60%;
}
@@ -1051,7 +1056,6 @@ $border-width-px: $border-width * 1px;
padding-top: 0.25rem;
line-height: 100%;
width: 100%;
- height: 100%;
text-align: left;
font-size: 125%;
}
diff --git a/tgui/packages/tgui/contants.test.ts b/tgui/packages/tgui/constants.test.ts
similarity index 100%
rename from tgui/packages/tgui/contants.test.ts
rename to tgui/packages/tgui/constants.test.ts
diff --git a/tgui/packages/tgui/icons.ts b/tgui/packages/tgui/icons.ts
new file mode 100644
index 00000000000000..5c9cc81bb73f19
--- /dev/null
+++ b/tgui/packages/tgui/icons.ts
@@ -0,0 +1,14 @@
+import { resolveAsset } from './assets';
+import { fetchRetry } from './http';
+import { logger } from './logging';
+
+export function loadIconRefMap() {
+ if (Object.keys(Byond.iconRefMap).length > 0) {
+ return;
+ }
+
+ fetchRetry(resolveAsset('icon_ref_map.json'))
+ .then((res) => res.json())
+ .then((data) => (Byond.iconRefMap = data))
+ .catch((error) => logger.log(error));
+}
diff --git a/tgui/packages/tgui/index.tsx b/tgui/packages/tgui/index.tsx
index 14600cc2f0073c..7e1712fed1517b 100644
--- a/tgui/packages/tgui/index.tsx
+++ b/tgui/packages/tgui/index.tsx
@@ -33,6 +33,7 @@ import { setupHotReloading } from 'tgui-dev-server/link/client.cjs';
import { setGlobalStore } from './backend';
import { setupGlobalEvents } from './events';
import { setupHotKeys } from './hotkeys';
+import { loadIconRefMap } from './icons';
import { captureExternalLinks } from './links';
import { createRenderer } from './renderer';
import { configureStore } from './store';
@@ -44,13 +45,14 @@ const store = configureStore();
const renderApp = createRenderer(() => {
setGlobalStore(store);
+ loadIconRefMap();
const { getRoutedComponent } = require('./routes');
const Component = getRoutedComponent(store);
return ;
});
-const setupApp = () => {
+function setupApp() {
// Delay setup
if (document.readyState === 'loading') {
document.addEventListener('DOMContentLoaded', setupApp);
@@ -80,6 +82,6 @@ const setupApp = () => {
renderApp();
});
}
-};
+}
setupApp();
diff --git a/tgui/packages/tgui/interfaces/AntagInfoVoidwalker.tsx b/tgui/packages/tgui/interfaces/AntagInfoVoidwalker.tsx
new file mode 100644
index 00000000000000..02bc6b5924d909
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/AntagInfoVoidwalker.tsx
@@ -0,0 +1,74 @@
+import { BlockQuote, LabeledList, Section, Stack } from '../components';
+import { Window } from '../layouts';
+
+const tipstyle = {
+ color: 'white',
+};
+
+const noticestyle = {
+ color: 'lightblue',
+};
+
+export const AntagInfoVoidwalker = (props) => {
+ return (
+
+
+
+
+
+
+ You are a Voidwalker.
+
+
+ You are a creature from the void between stars. You were
+ attracted to the radio signals being broadcasted by this
+ station.
+
+
+
+
+ Survive:
+ You have unrivaled freedom. Remain in space and no one can
+ stop you. You can move through windows, so stay near them to
+ always have a way out.
+
+ Hunt:
+ Pick unfair fights. Look for inattentive targets and strike at
+ them when they don't expect you.
+
+ Abduct:
+ Your Unsettle ability stuns and drains your targets. Finish
+ them with your void window and use it to pop a window, drag
+ them into space and use an empty hand to kidnap them.
+
+
+
+
+
+
+
+
+ You can move under the station from space, use this to hunt
+ and get to isolated sections of space.
+
+
+ Your divine appendage; it allows you to incapacitate the loud
+ ones and instantly break windows.
+
+
+ Your natural camouflage makes you nearly invisible in space,
+ as well as mending any wounds your body might have sustained.
+ You can move through glass freely, but are slowed in gravity.
+
+
+ Target a victim while remaining only partially in their view
+ to stun and weaken them, but also announce them your presence.
+
+
+
+
+
+
+
+ );
+};
diff --git a/tgui/packages/tgui/interfaces/Canvas.tsx b/tgui/packages/tgui/interfaces/Canvas.tsx
index 3621c12eb3cb7d..e1273da7d593cf 100644
--- a/tgui/packages/tgui/interfaces/Canvas.tsx
+++ b/tgui/packages/tgui/interfaces/Canvas.tsx
@@ -264,10 +264,10 @@ export const Canvas = (props) => {
const griddy = !!data.show_grid && !!data.editable && !!data.paint_tool_color;
return (
)}
+ {!!pack.contraband && (
+
+
+
+ )}
+
+ ))}
+
+ )}
+
+
+
+
+
+
+ Health:{' '}
+
+
+
+ Hunger:{' '}
+
+
+
+ {fish.fish_evolutions.length === 0 ? (
+ No evolutions!
+ ) : (
+
+ {fish.fish_evolutions.map((evolution, index) => (
+
+
+
+ ))}
+
+ )}
+
+
+
+
+
+
+
+
+ {fish.fish_min_temp}k - {fish.fish_max_temp}k
+
+
+ {dissectName(fish.fish_fluid_type)}
+
+
+
+
+ );
+};
+
+const EvolutionItem = (props) => {
+ const { evolution, fish } = props;
+
+ return (
+
+
+
+
+
+
+
+ {evolution.evolution_probability}%
+
+
+
+
+
+
+
+
+
+
+ );
+};
+
+function dissectName(input: string): string {
+ return input.split(' ')[0].slice(0, 12);
+}
diff --git a/tgui/packages/tgui/interfaces/LootPanel/IconDisplay.tsx b/tgui/packages/tgui/interfaces/LootPanel/IconDisplay.tsx
index 9a078f3f755aef..fb792f907f28e5 100644
--- a/tgui/packages/tgui/interfaces/LootPanel/IconDisplay.tsx
+++ b/tgui/packages/tgui/interfaces/LootPanel/IconDisplay.tsx
@@ -1,4 +1,5 @@
-import { DmIcon, Icon, Image } from '../../components';
+import { DmIcon, Icon, Image } from 'tgui-core/components';
+
import { SearchItem } from './types';
type Props = {
diff --git a/tgui/packages/tgui/interfaces/MODsuit.tsx b/tgui/packages/tgui/interfaces/MODsuit.tsx
index c39724aedc8f3c..e8e2bb4f2aced8 100644
--- a/tgui/packages/tgui/interfaces/MODsuit.tsx
+++ b/tgui/packages/tgui/interfaces/MODsuit.tsx
@@ -19,7 +19,7 @@ import {
Stack,
Table,
} from '../components';
-import { formatEnergy, formatPower, formatSiUnit } from '../format';
+import { formatSiUnit } from '../format';
import { Window } from '../layouts';
type MODsuitData = {
@@ -122,8 +122,8 @@ export const MODsuit = (props) => {
const { interface_break } = data.suit_status;
return (
@@ -705,7 +705,7 @@ const ModuleSection = (props) => {
@@ -713,7 +713,7 @@ const ModuleSection = (props) => {
@@ -721,7 +721,7 @@ const ModuleSection = (props) => {
@@ -793,44 +793,16 @@ const ModuleSection = (props) => {
)}
-