\ -If the unit breaks down shortly after reactivation, replace any missing internal components and reboot again if necessary.
\ Nanotrasen is not liable for any damages caused during the repair process." + +/datum/surgery/synth_revival + name = "Synthetic Reactivation" + desc = "This procedure reactivates a positronic brain inside a synthetic body, restoring it to a functional state." + icon_state = "revival_posi" + possible_locs = list(BODY_ZONE_HEAD) + ignore_clothes = TRUE + requires_bodypart_type = BODYPART_ROBOTIC + steps = list( + /datum/surgery_step/mechanic_open, + /datum/surgery_step/open_hatch, + /datum/surgery_step/revive_ipc, + /datum/surgery_step/mechanic_close + ) + +/datum/surgery/synth_revival/can_start(mob/user, mob/living/target) + if(target.stat != DEAD) + return FALSE // they're already activated + if(!is_synth(user)) + return FALSE + var/obj/item/organ/brain/B = target.getorganslot(ORGAN_SLOT_BRAIN) + if(!B) // you can't reactivate a brain that DOESN'T EXIST + return FALSE + return istype(target.getorganslot(ORGAN_SLOT_BRAIN), /obj/item/organ/brain/positron) diff --git a/code/modules/surgery/organ_manipulation.dm b/code/modules/surgery/organ_manipulation.dm index 59a27a606e5e..44e3a64a6017 100644 --- a/code/modules/surgery/organ_manipulation.dm +++ b/code/modules/surgery/organ_manipulation.dm @@ -129,8 +129,10 @@ else var/list/radial_menu = list() for(var/obj/item/organ/O in organs) + O.on_find(user) - radial_menu[O] = image(O) + if(O.can_extract()) + radial_menu[O] = image(O) I = show_radial_menu(user, target, radial_menu, tooltips = TRUE) if(I && user && target && user.Adjacent(target) && user.get_active_held_item() == tool) display_results(user, target, span_notice("You begin to extract [I] from [target]'s [parse_zone(target_zone)]..."), diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm index 1f018e8918e7..7a205f04602b 100644 --- a/code/modules/surgery/organs/augments_arms.dm +++ b/code/modules/surgery/organs/augments_arms.dm @@ -329,7 +329,6 @@ lefthand_file = active_tool.lefthand_file righthand_file = active_tool.righthand_file linkedarm.owner.update_inv_hands() - plane = 22 /obj/item/toolset_handler/attack_self(mob/user) linkedarm.ui_action_click() diff --git a/code/modules/surgery/organs/augments_chest.dm b/code/modules/surgery/organs/augments_chest.dm index c58ac8b27f2f..141ca0dcf30d 100644 --- a/code/modules/surgery/organs/augments_chest.dm +++ b/code/modules/surgery/organs/augments_chest.dm @@ -229,8 +229,6 @@ var/on = FALSE var/time_on = 0 var/hasexerted = FALSE - var/list/hsv - var/last_step = 0 COOLDOWN_DECLARE(alertcooldown) COOLDOWN_DECLARE(startsoundcooldown) COOLDOWN_DECLARE(endsoundcooldown) @@ -258,7 +256,7 @@ human.physiology.crawl_speed -= 1 owner.next_move_modifier *= 0.7 owner.add_movespeed_modifier("spinalimplant", priority=100, multiplicative_slowdown=-1) - RegisterSignal(owner, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(move_react)) + owner.AddComponent(/datum/component/after_image, 2 SECONDS, 0.5, TRUE) else if(COOLDOWN_FINISHED(src, endsoundcooldown)) playsound(owner, 'sound/effects/spinal_implant_off.ogg', 70) @@ -270,7 +268,8 @@ human.physiology.crawl_speed += 1 owner.next_move_modifier /= 0.7 owner.remove_movespeed_modifier("spinalimplant") - UnregisterSignal(owner, COMSIG_MOVABLE_PRE_MOVE) + var/datum/component/after_image = owner.GetComponent(/datum/component/after_image) + qdel(after_image) on = !on if(!silent) to_chat(owner, span_notice("You turn your spinal implant [on? "on" : "off"].")) @@ -285,15 +284,6 @@ for(var/datum/action/A as anything in actions) A.build_all_button_icons() -/obj/item/organ/cyberimp/chest/spinalspeed/proc/move_react()//afterimage - var/turf/currentloc = get_turf(owner) - var/obj/effect/temp_visual/decoy/fading/F = new(currentloc, owner) - if(!hsv) - hsv = RGBtoHSV(rgb(255, 0, 0)) - hsv = RotateHue(hsv, world.time - last_step * 15) - last_step = world.time - F.color = HSVtoRGB(hsv) //gotta add the flair - /obj/item/organ/cyberimp/chest/spinalspeed/on_life() if(!syndicate_implant)//the toy doesn't have a drawback return diff --git a/code/modules/surgery/organs/augments_eyes.dm b/code/modules/surgery/organs/augments_eyes.dm index 067261c67490..67d77435c416 100644 --- a/code/modules/surgery/organs/augments_eyes.dm +++ b/code/modules/surgery/organs/augments_eyes.dm @@ -1,6 +1,6 @@ /obj/item/organ/cyberimp/eyes/hud name = "cybernetic hud" - desc = "artificial photoreceptors with specialized functionality" + desc = "A couple of artificial photoreceptors with specialized functionality." icon_state = "eye_implant" implant_overlay = "eye_implant_overlay" slot = ORGAN_SLOT_EYES diff --git a/code/modules/surgery/organs/ethereal_heart.dm b/code/modules/surgery/organs/ethereal_heart.dm index a3a157fc02c5..98f4f43e4906 100644 --- a/code/modules/surgery/organs/ethereal_heart.dm +++ b/code/modules/surgery/organs/ethereal_heart.dm @@ -210,7 +210,7 @@ being_built = FALSE update_icon() -/obj/structure/ethereal_crystal/obj_destruction(damage_flag) +/obj/structure/ethereal_crystal/atom_destruction(damage_flag) playsound(get_turf(ethereal_heart.owner), 'sound/effects/ethereal_revive_fail.ogg', 100) return ..() diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm index 7be34b681780..10cb00b9f812 100644 --- a/code/modules/surgery/organs/eyes.dm +++ b/code/modules/surgery/organs/eyes.dm @@ -42,16 +42,17 @@ HMN.eye_color = eye_color else eye_color = HMN.eye_color + HMN.dna.update_ui_block(DNA_EYE_COLOR_BLOCK) //updates eye icon + HMN.update_body() M.update_tint() owner.update_sight() - if(M.has_dna() && ishuman(M)) - M.dna.species.handle_body(M) //updates eye icon /obj/item/organ/eyes/Remove(mob/living/carbon/M, special = 0) ..() if(ishuman(M) && eye_color) var/mob/living/carbon/human/HMN = M HMN.eye_color = old_eye_color + HMN.dna.update_ui_block(DNA_EYE_COLOR_BLOCK) HMN.update_body() M.cure_blind(list(EYE_DAMAGE)) // can't be blind from eye damage if there's no eye to be damaged, still blind from not having eyes though M.cure_nearsighted(list(EYE_DAMAGE)) // likewise for nearsightedness @@ -172,6 +173,12 @@ medium_light_cutoff = list(0, 20, 35) high_light_cutoff = list(0, 40, 50) +/obj/item/organ/eyes/zombie + name = "undead eyes" + desc = "Somewhat counterintuitively, these half-rotten eyes actually have superior vision to those of a living human." + color_cutoffs = list(25, 35, 5) + lighting_cutoff = LIGHTING_CUTOFF_HIGH + //innate nightvision eyes /obj/item/organ/eyes/alien name = "alien eyes" @@ -180,12 +187,6 @@ color_cutoffs = list(25, 5, 42) lighting_cutoff = LIGHTING_CUTOFF_HIGH -/obj/item/organ/eyes/zombie - name = "undead eyes" - desc = "Somewhat counterintuitively, these half-rotten eyes actually have superior vision to those of a living human." - color_cutoffs = list(25, 35, 5) - lighting_cutoff = LIGHTING_CUTOFF_HIGH - /obj/item/organ/eyes/shadow name = "burning red eyes" desc = "Even without their shadowy owner, looking at these eyes gives you a sense of dread." @@ -243,7 +244,7 @@ sight_flags = SEE_MOBS // We're gonna downshift green and blue a bit so darkness looks yellow color_cutoffs = list(25, 8, 5) - flash_protect = -1 + flash_protect = FLASH_PROTECTION_SENSITIVE /obj/item/organ/eyes/robotic/flashlight name = "flashlight eyes" @@ -279,7 +280,7 @@ /obj/item/organ/eyes/robotic/shield name = "shielded robotic eyes" desc = "These reactive micro-shields will protect you from welders and flashes without obscuring your vision." - flash_protect = 2 + flash_protect = FLASH_PROTECTION_WELDER /obj/item/organ/eyes/robotic/shield/emp_act(severity) return @@ -476,6 +477,9 @@ if(!isnull(light_flags)) set_light_flags(light_flags) +/obj/item/organ/eyes/robotic/synth + flash_protect = 2 + /obj/item/organ/eyes/moth name = "moth eyes" desc = "These eyes can see just a little too well, light doesn't entirely agree with them." diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index 0a356759507b..e4cfbbe821f0 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -75,6 +75,10 @@ /obj/item/organ/proc/on_find(mob/living/finder) return +/obj/item/organ/proc/can_extract(mob/living/finder) + return TRUE + + /obj/item/organ/process() //runs decay when outside of a person if((organ_flags & (ORGAN_SYNTHETIC | ORGAN_FROZEN)) || istype(loc, /obj/item/mmi)) return diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm index 3377c06405ef..331e34447ec6 100644 --- a/code/modules/surgery/organs/stomach.dm +++ b/code/modules/surgery/organs/stomach.dm @@ -151,7 +151,7 @@ . = ..() if(HAS_TRAIT(stomach_owner, TRAIT_POWERHUNGRY)) stomach_owner.nutrition = stored_charge - RegisterSignal(stomach_owner, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, PROC_REF(charge)) + RegisterSignal(stomach_owner, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, PROC_REF(charge), override = TRUE) /obj/item/organ/stomach/cell/Remove(mob/living/carbon/stomach_owner, special) . = ..() diff --git a/code/modules/surgery/organs/tails.dm b/code/modules/surgery/organs/tails.dm index 5ea7c1175016..762289a123b8 100644 --- a/code/modules/surgery/organs/tails.dm +++ b/code/modules/surgery/organs/tails.dm @@ -19,6 +19,9 @@ /obj/item/organ/tail/get_availability(datum/species/species) return (HAS_TAIL in species.species_traits) +/obj/item/organ/tail/proc/get_butt_sprite() + return null + /obj/item/organ/tail/cat name = "cat tail" desc = "A severed cat tail. Who's wagging now?" @@ -43,6 +46,9 @@ color = H.hair_color H.update_body() +/obj/item/organ/tail/cat/get_butt_sprite() + return BUTT_SPRITE_CAT + /obj/item/organ/tail/lizard name = "lizard tail" desc = "A severed lizard tail. Somewhere, no doubt, a lizard hater is very pleased with themselves." diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm index c2394a19d583..223e09bfe126 100644 --- a/code/modules/surgery/surgery.dm +++ b/code/modules/surgery/surgery.dm @@ -49,6 +49,8 @@ ..() if(surgery_target) target = surgery_target + if(is_synth(target)) + ignore_clothes = TRUE target.surgeries += src if(surgery_location) location = surgery_location diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index 985e0397a275..211f195938d6 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -241,6 +241,7 @@ /obj/item/circular_saw/Initialize(mapload) . = ..() + AddComponent(/datum/component/cleave_attack) AddComponent(/datum/component/butchering, 40 * toolspeed, 100, 5, 'sound/weapons/circsawhit.ogg') //saws are very accurate and fast at butchering /obj/item/circular_saw/attack(mob/living/M, mob/user) @@ -406,6 +407,9 @@ demolition_mod = 1.5 // lasers are good at cutting metal sharpness = SHARP_EDGED +/obj/item/scalpel/advanced/Initialize(mapload) + . = ..() + AddComponent(/datum/component/cleave_attack) // woe, angry medbay be upon ye /obj/item/scalpel/advanced/attack_self(mob/user) playsound(get_turf(user), 'sound/machines/click.ogg', 50, TRUE) diff --git a/code/modules/swarmers/swarmer_objs.dm b/code/modules/swarmers/swarmer_objs.dm index c5801983b834..2de324d3329a 100644 --- a/code/modules/swarmers/swarmer_objs.dm +++ b/code/modules/swarmers/swarmer_objs.dm @@ -108,7 +108,14 @@ max_integrity = 10 density = FALSE -/obj/structure/swarmer/trap/Crossed(atom/movable/AM) +/obj/structure/swarmer/trap/Initialize(mapload) + . = ..() + var/static/list/loc_connections = list( + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), + ) + AddElement(/datum/element/connect_loc, loc_connections) + +/obj/structure/swarmer/trap/proc/on_entered(datum/source, atom/movable/AM, ...) if(isliving(AM)) var/mob/living/living_crosser = AM if(!istype(living_crosser, /mob/living/simple_animal/hostile/swarmer)) @@ -117,7 +124,7 @@ if(iscyborg(living_crosser)) living_crosser.Paralyze(100) qdel(src) - return ..() + return /obj/structure/swarmer/blockade name = "swarmer blockade" diff --git a/code/modules/tgs/LICENSE b/code/modules/tgs/LICENSE index 221f9e1deb21..85bca8c3f814 100644 --- a/code/modules/tgs/LICENSE +++ b/code/modules/tgs/LICENSE @@ -1,24 +1,24 @@ -The MIT License - -Copyright (c) 2017 Jordan Brown - -Permission is hereby granted, free of charge, -to any person obtaining a copy of this software and -associated documentation files (the "Software"), to -deal in the Software without restriction, including -without limitation the rights to use, copy, modify, -merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom -the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice -shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR -ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +The MIT License + +Copyright (c) 2017-2023 Jordan Brown + +Permission is hereby granted, free of charge, +to any person obtaining a copy of this software and +associated documentation files (the "Software"), to +deal in the Software without restriction, including +without limitation the rights to use, copy, modify, +merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom +the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice +shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR +ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/code/modules/tgs/core/_definitions.dm b/code/modules/tgs/core/_definitions.dm index ebf6d17c2a07..fd98034eb716 100644 --- a/code/modules/tgs/core/_definitions.dm +++ b/code/modules/tgs/core/_definitions.dm @@ -1,2 +1,10 @@ +#if DM_VERSION < 510 +#error The TGS DMAPI does not support BYOND versions < 510! +#endif + #define TGS_UNIMPLEMENTED "___unimplemented" #define TGS_VERSION_PARAMETER "server_service_version" + +#ifndef TGS_DEBUG_LOG +#define TGS_DEBUG_LOG(message) +#endif diff --git a/code/modules/tgs/core/core.dm b/code/modules/tgs/core/core.dm index 41a047339452..15622228e91f 100644 --- a/code/modules/tgs/core/core.dm +++ b/code/modules/tgs/core/core.dm @@ -42,11 +42,11 @@ var/datum/tgs_version/max_api_version = TgsMaximumApiVersion(); if(version.suite != null && version.minor != null && version.patch != null && version.deprecated_patch != null && version.deprefixed_parameter > max_api_version.deprefixed_parameter) - TGS_ERROR_LOG("Detected unknown API version! Defaulting to latest. Update the DMAPI to fix this problem.") + TGS_ERROR_LOG("Detected unknown Interop API version! Defaulting to latest. Update the DMAPI to fix this problem.") api_datum = /datum/tgs_api/latest if(!api_datum) - TGS_ERROR_LOG("Found unsupported API version: [raw_parameter]. If this is a valid version please report this, backporting is done on demand.") + TGS_ERROR_LOG("Found unsupported Interop API version: [raw_parameter]. If this is a valid version please report this, backporting is done on demand.") return TGS_INFO_LOG("Activating API for version [version.deprefixed_parameter]") @@ -107,6 +107,13 @@ if(api) return api.ApiVersion() +/world/TgsEngine() +#ifdef OPENDREAM + return TGS_ENGINE_TYPE_OPENDREAM +#else + return TGS_ENGINE_TYPE_BYOND +#endif + /world/TgsInstanceName() var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs) if(api) @@ -153,4 +160,17 @@ /world/TgsSecurityLevel() var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs) if(api) - api.SecurityLevel() + return api.SecurityLevel() + +/world/TgsVisibility() + var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs) + if(api) + return api.Visibility() + +/world/TgsTriggerEvent(event_name, list/parameters, wait_for_completion = FALSE) + var/datum/tgs_api/api = TGS_READ_GLOBAL(tgs) + if(api) + if(!istype(parameters, /list)) + parameters = list() + + return api.TriggerEvent(event_name, parameters, wait_for_completion) diff --git a/code/modules/tgs/core/datum.dm b/code/modules/tgs/core/datum.dm index 68b0330fe860..898516f12486 100644 --- a/code/modules/tgs/core/datum.dm +++ b/code/modules/tgs/core/datum.dm @@ -11,6 +11,15 @@ TGS_DEFINE_AND_SET_GLOBAL(tgs, null) src.event_handler = event_handler src.version = version +/datum/tgs_api/proc/TerminateWorld() + while(TRUE) + TGS_DEBUG_LOG("About to terminate world. Tick: [world.time], sleep_offline: [world.sleep_offline]") + world.sleep_offline = FALSE // https://www.byond.com/forum/post/2894866 + del(world) + world.sleep_offline = FALSE // just in case, this is BYOND after all... + sleep(world.tick_lag) + TGS_DEBUG_LOG("BYOND DIDN'T TERMINATE THE WORLD!!! TICK IS: [world.time], sleep_offline: [world.sleep_offline]") + /datum/tgs_api/latest parent_type = /datum/tgs_api/v5 @@ -57,3 +66,9 @@ TGS_PROTECT_DATUM(/datum/tgs_api) /datum/tgs_api/proc/SecurityLevel() return TGS_UNIMPLEMENTED + +/datum/tgs_api/proc/Visibility() + return TGS_UNIMPLEMENTED + +/datum/tgs_api/proc/TriggerEvent(event_name, list/parameters, wait_for_completion) + return FALSE diff --git a/code/modules/tgs/v3210/commands.dm b/code/modules/tgs/v3210/commands.dm index d9bd287465b9..e65c816320dc 100644 --- a/code/modules/tgs/v3210/commands.dm +++ b/code/modules/tgs/v3210/commands.dm @@ -47,7 +47,7 @@ user.friendly_name = sender // Discord hack, fix the mention if it's only numbers (fuck you IRC trolls) - var/regex/discord_id_regex = regex(@"^[0-9]+$") + var/regex/discord_id_regex = regex("^\[0-9\]+$") if(findtext(sender, discord_id_regex)) sender = "<@[sender]>" @@ -55,4 +55,4 @@ var/datum/tgs_message_content/result = stc.Run(user, params) result = UpgradeDeprecatedCommandResponse(result, command) - return result?.text || TRUE + return result ? result.text : TRUE diff --git a/code/modules/tgs/v4/api.dm b/code/modules/tgs/v4/api.dm index b9a75c4abb48..7c87922750b9 100644 --- a/code/modules/tgs/v4/api.dm +++ b/code/modules/tgs/v4/api.dm @@ -73,7 +73,7 @@ if(cached_json["apiValidateOnly"]) TGS_INFO_LOG("Validating API and exiting...") Export(TGS4_COMM_VALIDATE, list(TGS4_PARAMETER_DATA = "[minimum_required_security_level]")) - del(world) + TerminateWorld() security_level = cached_json["securityLevel"] chat_channels_json_path = cached_json["chatChannelsJson"] @@ -181,14 +181,14 @@ var/json = json_encode(data) while(requesting_new_port && !override_requesting_new_port) - sleep(1) + sleep(world.tick_lag) //we need some port open at this point to facilitate return communication if(!world.port) requesting_new_port = TRUE if(!world.OpenPort(0)) //open any port TGS_ERROR_LOG("Unable to open random port to retrieve new port![TGS4_PORT_CRITFAIL_MESSAGE]") - del(world) + TerminateWorld() //request a new port export_lock = FALSE @@ -196,20 +196,20 @@ if(!new_port_json) TGS_ERROR_LOG("No new port response from server![TGS4_PORT_CRITFAIL_MESSAGE]") - del(world) + TerminateWorld() var/new_port = new_port_json[TGS4_PARAMETER_DATA] if(!isnum(new_port) || new_port <= 0) TGS_ERROR_LOG("Malformed new port json ([json_encode(new_port_json)])![TGS4_PORT_CRITFAIL_MESSAGE]") - del(world) + TerminateWorld() if(new_port != world.port && !world.OpenPort(new_port)) TGS_ERROR_LOG("Unable to open port [new_port]![TGS4_PORT_CRITFAIL_MESSAGE]") - del(world) + TerminateWorld() requesting_new_port = FALSE while(export_lock) - sleep(1) + sleep(world.tick_lag) export_lock = TRUE last_interop_response = null @@ -217,7 +217,7 @@ text2file(json, server_commands_json_path) for(var/I = 0; I < EXPORT_TIMEOUT_DS && !last_interop_response; ++I) - sleep(1) + sleep(world.tick_lag) if(!last_interop_response) TGS_ERROR_LOG("Failed to get export result for: [json]") diff --git a/code/modules/tgs/v4/commands.dm b/code/modules/tgs/v4/commands.dm index d6d3d718d471..25dd6740e3af 100644 --- a/code/modules/tgs/v4/commands.dm +++ b/code/modules/tgs/v4/commands.dm @@ -40,5 +40,5 @@ var/datum/tgs_message_content/result = sc.Run(u, params) result = UpgradeDeprecatedCommandResponse(result, command) - return result?.text + return result ? result.text : TRUE return "Unknown command: [command]!" diff --git a/code/modules/tgs/v5/__interop_version.dm b/code/modules/tgs/v5/__interop_version.dm index 5d3d491a7362..f4806f7adb97 100644 --- a/code/modules/tgs/v5/__interop_version.dm +++ b/code/modules/tgs/v5/__interop_version.dm @@ -1 +1 @@ -"5.6.1" +"5.9.0" diff --git a/code/modules/tgs/v5/_defines.dm b/code/modules/tgs/v5/_defines.dm index a3f949081f16..92c7a8388a71 100644 --- a/code/modules/tgs/v5/_defines.dm +++ b/code/modules/tgs/v5/_defines.dm @@ -5,19 +5,20 @@ #define DMAPI5_TOPIC_DATA "tgs_data" #define DMAPI5_BRIDGE_REQUEST_LIMIT 8198 -#define DMAPI5_TOPIC_REQUEST_LIMIT 65529 -#define DMAPI5_TOPIC_RESPONSE_LIMIT 65528 +#define DMAPI5_TOPIC_REQUEST_LIMIT 65528 +#define DMAPI5_TOPIC_RESPONSE_LIMIT 65529 -#define DMAPI5_BRIDGE_COMMAND_PORT_UPDATE 0 #define DMAPI5_BRIDGE_COMMAND_STARTUP 1 #define DMAPI5_BRIDGE_COMMAND_PRIME 2 #define DMAPI5_BRIDGE_COMMAND_REBOOT 3 #define DMAPI5_BRIDGE_COMMAND_KILL 4 #define DMAPI5_BRIDGE_COMMAND_CHAT_SEND 5 #define DMAPI5_BRIDGE_COMMAND_CHUNK 6 +#define DMAPI5_BRIDGE_COMMAND_EVENT 7 #define DMAPI5_PARAMETER_ACCESS_IDENTIFIER "accessIdentifier" #define DMAPI5_PARAMETER_CUSTOM_COMMANDS "customCommands" +#define DMAPI5_PARAMETER_TOPIC_PORT "topicPort" #define DMAPI5_CHUNK "chunk" #define DMAPI5_CHUNK_PAYLOAD "payload" @@ -34,6 +35,7 @@ #define DMAPI5_BRIDGE_PARAMETER_VERSION "version" #define DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE "chatMessage" #define DMAPI5_BRIDGE_PARAMETER_MINIMUM_SECURITY_LEVEL "minimumSecurityLevel" +#define DMAPI5_BRIDGE_PARAMETER_EVENT_INVOCATION "eventInvocation" #define DMAPI5_BRIDGE_RESPONSE_NEW_PORT "newPort" #define DMAPI5_BRIDGE_RESPONSE_RUNTIME_INFORMATION "runtimeInformation" @@ -48,6 +50,7 @@ #define DMAPI5_RUNTIME_INFORMATION_REVISION "revision" #define DMAPI5_RUNTIME_INFORMATION_TEST_MERGES "testMerges" #define DMAPI5_RUNTIME_INFORMATION_SECURITY_LEVEL "securityLevel" +#define DMAPI5_RUNTIME_INFORMATION_VISIBILITY "visibility" #define DMAPI5_CHAT_UPDATE_CHANNELS "channels" @@ -75,10 +78,12 @@ #define DMAPI5_TOPIC_COMMAND_INSTANCE_RENAMED 4 #define DMAPI5_TOPIC_COMMAND_CHAT_CHANNELS_UPDATE 5 #define DMAPI5_TOPIC_COMMAND_SERVER_PORT_UPDATE 6 -#define DMAPI5_TOPIC_COMMAND_HEARTBEAT 7 +#define DMAPI5_TOPIC_COMMAND_HEALTHCHECK 7 #define DMAPI5_TOPIC_COMMAND_WATCHDOG_REATTACH 8 #define DMAPI5_TOPIC_COMMAND_SEND_CHUNK 9 #define DMAPI5_TOPIC_COMMAND_RECEIVE_CHUNK 10 +#define DMAPI5_TOPIC_COMMAND_RECEIVE_BROADCAST 11 +#define DMAPI5_TOPIC_COMMAND_COMPLETE_EVENT 12 #define DMAPI5_TOPIC_PARAMETER_COMMAND_TYPE "commandType" #define DMAPI5_TOPIC_PARAMETER_CHAT_COMMAND "chatCommand" @@ -88,6 +93,7 @@ #define DMAPI5_TOPIC_PARAMETER_NEW_INSTANCE_NAME "newInstanceName" #define DMAPI5_TOPIC_PARAMETER_CHAT_UPDATE "chatUpdate" #define DMAPI5_TOPIC_PARAMETER_NEW_SERVER_VERSION "newServerVersion" +#define DMAPI5_TOPIC_PARAMETER_BROADCAST_MESSAGE "broadcastMessage" #define DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE "commandResponse" #define DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE_MESSAGE "commandResponseMessage" @@ -113,3 +119,9 @@ #define DMAPI5_CUSTOM_CHAT_COMMAND_NAME "name" #define DMAPI5_CUSTOM_CHAT_COMMAND_HELP_TEXT "helpText" #define DMAPI5_CUSTOM_CHAT_COMMAND_ADMIN_ONLY "adminOnly" + +#define DMAPI5_EVENT_ID "eventId" + +#define DMAPI5_EVENT_INVOCATION_NAME "eventName" +#define DMAPI5_EVENT_INVOCATION_PARAMETERS "parameters" +#define DMAPI5_EVENT_INVOCATION_NOTIFY_COMPLETION "notifyCompletion" diff --git a/code/modules/tgs/v5/api.dm b/code/modules/tgs/v5/api.dm index 926ea10a8f27..95b8edd3ee5c 100644 --- a/code/modules/tgs/v5/api.dm +++ b/code/modules/tgs/v5/api.dm @@ -4,11 +4,16 @@ var/instance_name var/security_level + var/visibility var/reboot_mode = TGS_REBOOT_MODE_NORMAL + /// List of chat messages list()s that attempted to be sent during a topic call. To be bundled in the result of the call var/list/intercepted_message_queue + /// List of chat messages list()s that attempted to be sent during a topic call. To be bundled in the result of the call + var/list/offline_message_queue + var/list/custom_commands var/list/test_merges @@ -16,24 +21,38 @@ var/list/chat_channels var/initialized = FALSE + var/initial_bridge_request_received = FALSE + var/datum/tgs_version/interop_version var/chunked_requests = 0 var/list/chunked_topics = list() + var/list/pending_events = list() + var/detached = FALSE +/datum/tgs_api/v5/New() + . = ..() + interop_version = version + TGS_DEBUG_LOG("V5 API created: [json_encode(args)]") + /datum/tgs_api/v5/ApiVersion() return new /datum/tgs_version( #include "__interop_version.dm" ) /datum/tgs_api/v5/OnWorldNew(minimum_required_security_level) + TGS_DEBUG_LOG("OnWorldNew()") server_port = world.params[DMAPI5_PARAM_SERVER_PORT] access_identifier = world.params[DMAPI5_PARAM_ACCESS_IDENTIFIER] var/datum/tgs_version/api_version = ApiVersion() - version = null - 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())) + 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 + sleep(world.tick_lag) + + 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)) TGS_ERROR_LOG("Failed initial bridge request!") return FALSE @@ -45,10 +64,12 @@ if(runtime_information[DMAPI5_RUNTIME_INFORMATION_API_VALIDATE_ONLY]) TGS_INFO_LOG("DMAPI validation, exiting...") - del(world) + TerminateWorld() - version = new /datum/tgs_version(runtime_information[DMAPI5_RUNTIME_INFORMATION_SERVER_VERSION]) + initial_bridge_request_received = TRUE + version = new /datum/tgs_version(runtime_information[DMAPI5_RUNTIME_INFORMATION_SERVER_VERSION]) // reassigning this because it can change if TGS updates security_level = runtime_information[DMAPI5_RUNTIME_INFORMATION_SECURITY_LEVEL] + visibility = runtime_information[DMAPI5_RUNTIME_INFORMATION_VISIBILITY] instance_name = runtime_information[DMAPI5_RUNTIME_INFORMATION_INSTANCE_NAME] var/list/revisionData = runtime_information[DMAPI5_RUNTIME_INFORMATION_REVISION] @@ -95,18 +116,36 @@ initialized = TRUE return TRUE +/datum/tgs_api/v5/proc/GetTopicPort() +#if defined(OPENDREAM) && defined(OPENDREAM_TOPIC_PORT_EXISTS) + return "[world.opendream_topic_port]" +#else + return null +#endif + /datum/tgs_api/v5/proc/RequireInitialBridgeResponse() - while(!version) - sleep(1) + TGS_DEBUG_LOG("RequireInitialBridgeResponse()") + var/logged = FALSE + while(!initial_bridge_request_received) + if(!logged) + TGS_DEBUG_LOG("RequireInitialBridgeResponse: Starting sleep") + logged = TRUE + + sleep(world.tick_lag) + + TGS_DEBUG_LOG("RequireInitialBridgeResponse: Passed") /datum/tgs_api/v5/OnInitializationComplete() Bridge(DMAPI5_BRIDGE_COMMAND_PRIME) /datum/tgs_api/v5/OnTopic(T) + TGS_DEBUG_LOG("OnTopic()") RequireInitialBridgeResponse() + TGS_DEBUG_LOG("OnTopic passed bridge request gate") var/list/params = params2list(T) var/json = params[DMAPI5_TOPIC_DATA] if(!json) + TGS_DEBUG_LOG("No \"[DMAPI5_TOPIC_DATA]\" entry found, ignoring...") return FALSE // continue to /world/Topic if(!initialized) @@ -156,7 +195,7 @@ TGS_WARNING_LOG("Received legacy string when a [/datum/tgs_message_content] was expected. Please audit all calls to TgsChatBroadcast, TgsChatTargetedBroadcast, and TgsChatPrivateMessage to ensure they use the new /datum.") return new /datum/tgs_message_content(message) -/datum/tgs_api/v5/ChatBroadcast(datum/tgs_message_content/message, list/channels) +/datum/tgs_api/v5/ChatBroadcast(datum/tgs_message_content/message2, list/channels) if(!length(channels)) channels = ChatChannelInfo() @@ -165,52 +204,93 @@ var/datum/tgs_chat_channel/channel = I ids += channel.id - message = UpgradeDeprecatedChatMessage(message) + SendChatMessageRaw(message2, ids) - if (!length(channels)) - return - - message = message._interop_serialize() - message[DMAPI5_CHAT_MESSAGE_CHANNEL_IDS] = ids - if(intercepted_message_queue) - intercepted_message_queue += list(message) - else - Bridge(DMAPI5_BRIDGE_COMMAND_CHAT_SEND, list(DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE = message)) - -/datum/tgs_api/v5/ChatTargetedBroadcast(datum/tgs_message_content/message, admin_only) +/datum/tgs_api/v5/ChatTargetedBroadcast(datum/tgs_message_content/message2, admin_only) var/list/channels = list() for(var/I in ChatChannelInfo()) var/datum/tgs_chat_channel/channel = I if (!channel.is_private_channel && ((channel.is_admin_channel && admin_only) || (!channel.is_admin_channel && !admin_only))) channels += channel.id - message = UpgradeDeprecatedChatMessage(message) + SendChatMessageRaw(message2, channels) + +/datum/tgs_api/v5/ChatPrivateMessage(datum/tgs_message_content/message2, datum/tgs_chat_user/user) + SendChatMessageRaw(message2, list(user.channel.id)) - if (!length(channels)) +/datum/tgs_api/v5/proc/SendChatMessageRaw(datum/tgs_message_content/message2, list/channel_ids) + message2 = UpgradeDeprecatedChatMessage(message2) + + if (!length(channel_ids)) return - message = message._interop_serialize() - message[DMAPI5_CHAT_MESSAGE_CHANNEL_IDS] = channels + var/list/data = message2._interop_serialize() + data[DMAPI5_CHAT_MESSAGE_CHANNEL_IDS] = channel_ids if(intercepted_message_queue) - intercepted_message_queue += list(message) - else - Bridge(DMAPI5_BRIDGE_COMMAND_CHAT_SEND, list(DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE = message)) + intercepted_message_queue += list(data) + return -/datum/tgs_api/v5/ChatPrivateMessage(datum/tgs_message_content/message, datum/tgs_chat_user/user) - message = UpgradeDeprecatedChatMessage(message) - message = message._interop_serialize() - message[DMAPI5_CHAT_MESSAGE_CHANNEL_IDS] = list(user.channel.id) - if(intercepted_message_queue) - intercepted_message_queue += list(message) + if(offline_message_queue) + offline_message_queue += list(data) + return + + if(detached) + offline_message_queue = list(data) + + WaitForReattach(FALSE) + + data = offline_message_queue + offline_message_queue = null + + for(var/queued_message in data) + SendChatDataRaw(queued_message) else - Bridge(DMAPI5_BRIDGE_COMMAND_CHAT_SEND, list(DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE = message)) + SendChatDataRaw(data) + +/datum/tgs_api/v5/proc/SendChatDataRaw(list/data) + Bridge(DMAPI5_BRIDGE_COMMAND_CHAT_SEND, list(DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE = data)) /datum/tgs_api/v5/ChatChannelInfo() RequireInitialBridgeResponse() WaitForReattach(TRUE) return chat_channels.Copy() +/datum/tgs_api/v5/TriggerEvent(event_name, list/parameters, wait_for_completion) + RequireInitialBridgeResponse() + WaitForReattach(TRUE) + + if(interop_version.minor < 9) + TGS_WARNING_LOG("Interop version too low for custom events!") + return FALSE + + var/str_parameters = list() + for(var/i in parameters) + str_parameters += "[i]" + + var/list/response = Bridge(DMAPI5_BRIDGE_COMMAND_EVENT, list(DMAPI5_BRIDGE_PARAMETER_EVENT_INVOCATION = list(DMAPI5_EVENT_INVOCATION_NAME = event_name, DMAPI5_EVENT_INVOCATION_PARAMETERS = str_parameters, DMAPI5_EVENT_INVOCATION_NOTIFY_COMPLETION = wait_for_completion))) + if(!response) + return FALSE + + var/event_id = response[DMAPI5_EVENT_ID] + if(!event_id) + return FALSE + + TGS_DEBUG_LOG("Created event ID: [event_id]") + if(!wait_for_completion) + return TRUE + + TGS_DEBUG_LOG("Waiting for completion of event ID: [event_id]") + + while(!pending_events[event_id]) + sleep(world.tick_lag) + + TGS_DEBUG_LOG("Completed wait on event ID: [event_id]") + pending_events -= event_id + + return TRUE + /datum/tgs_api/v5/proc/DecodeChannels(chat_update_json) + TGS_DEBUG_LOG("DecodeChannels()") var/list/chat_channels_json = chat_update_json[DMAPI5_CHAT_UPDATE_CHANNELS] if(istype(chat_channels_json)) chat_channels.Cut() @@ -235,3 +315,7 @@ /datum/tgs_api/v5/SecurityLevel() RequireInitialBridgeResponse() return security_level + +/datum/tgs_api/v5/Visibility() + RequireInitialBridgeResponse() + return visibility diff --git a/code/modules/tgs/v5/bridge.dm b/code/modules/tgs/v5/bridge.dm index 37f58bcdf632..0c5e701a32b6 100644 --- a/code/modules/tgs/v5/bridge.dm +++ b/code/modules/tgs/v5/bridge.dm @@ -48,7 +48,9 @@ var/json = CreateBridgeData(command, data, TRUE) var/encoded_json = url_encode(json) - var/url = "http://127.0.0.1:[server_port]/Bridge?[DMAPI5_BRIDGE_DATA]=[encoded_json]" + var/api_prefix = interop_version.minor >= 8 ? "api/" : "" + + var/url = "http://127.0.0.1:[server_port]/[api_prefix]Bridge?[DMAPI5_BRIDGE_DATA]=[encoded_json]" return url /datum/tgs_api/v5/proc/CreateBridgeData(command, list/data, needs_auth) @@ -63,7 +65,7 @@ if(detached) // Wait up to one minute for(var/i in 1 to 600) - sleep(1) + sleep(world.tick_lag) if(!detached && (!require_channels || length(chat_channels))) break @@ -75,17 +77,25 @@ /datum/tgs_api/v5/proc/PerformBridgeRequest(bridge_request) WaitForReattach(FALSE) + TGS_DEBUG_LOG("Bridge request start") // This is an infinite sleep until we get a response var/export_response = world.Export(bridge_request) + TGS_DEBUG_LOG("Bridge request complete") + if(!export_response) TGS_ERROR_LOG("Failed bridge request: [bridge_request]") return - var/response_json = file2text(export_response["CONTENT"]) - if(!response_json) + var/content = export_response["CONTENT"] + if(!content) TGS_ERROR_LOG("Failed bridge request, missing content!") return + var/response_json = TGS_FILE2TEXT_NATIVE(content) + if(!response_json) + TGS_ERROR_LOG("Failed bridge request, failed to load content!") + return + var/list/bridge_response = json_decode(response_json) if(!bridge_response) TGS_ERROR_LOG("Failed bridge request, bad json: [response_json]") diff --git a/code/modules/tgs/v5/commands.dm b/code/modules/tgs/v5/commands.dm index a832c81f172d..9557f8a08ed5 100644 --- a/code/modules/tgs/v5/commands.dm +++ b/code/modules/tgs/v5/commands.dm @@ -35,10 +35,10 @@ if(sc) var/datum/tgs_message_content/response = sc.Run(u, params) response = UpgradeDeprecatedCommandResponse(response, command) - + var/list/topic_response = TopicResponse() - topic_response[DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE_MESSAGE] = response?.text - topic_response[DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE] = response?._interop_serialize() + topic_response[DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE_MESSAGE] = response ? response.text : null + topic_response[DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE] = response ? response._interop_serialize() : null return topic_response return TopicResponse("Unknown custom chat command: [command]!") diff --git a/code/modules/tgs/v5/serializers.dm b/code/modules/tgs/v5/serializers.dm index 7f9bc731b792..3a32848ad512 100644 --- a/code/modules/tgs/v5/serializers.dm +++ b/code/modules/tgs/v5/serializers.dm @@ -1,12 +1,12 @@ /datum/tgs_message_content/proc/_interop_serialize() - return list("text" = text, "embed" = embed?._interop_serialize()) + return list("text" = text, "embed" = embed ? embed._interop_serialize() : null) /datum/tgs_chat_embed/proc/_interop_serialize() CRASH("Base /proc/interop_serialize called on [type]!") /datum/tgs_chat_embed/structure/_interop_serialize() var/list/serialized_fields - if(islist(fields)) + if(istype(fields, /list)) serialized_fields = list() for(var/datum/tgs_chat_embed/field/field as anything in fields) serialized_fields += list(field._interop_serialize()) @@ -16,12 +16,12 @@ "url" = url, "timestamp" = timestamp, "colour" = colour, - "image" = image?._interop_serialize(), - "thumbnail" = thumbnail?._interop_serialize(), - "video" = video?._interop_serialize(), - "footer" = footer?._interop_serialize(), - "provider" = provider?._interop_serialize(), - "author" = author?._interop_serialize(), + "image" = src.image ? src.image._interop_serialize() : null, + "thumbnail" = thumbnail ? thumbnail._interop_serialize() : null, + "video" = video ? video._interop_serialize() : null, + "footer" = footer ? footer._interop_serialize() : null, + "provider" = provider ? provider._interop_serialize() : null, + "author" = author ? author._interop_serialize() : null, "fields" = serialized_fields ) @@ -43,7 +43,7 @@ . = ..() .["iconUrl"] = icon_url .["proxyIconUrl"] = proxy_icon_url - + /datum/tgs_chat_embed/footer/_interop_serialize() return list( "text" = text, diff --git a/code/modules/tgs/v5/topic.dm b/code/modules/tgs/v5/topic.dm index 3779db6237a3..e1f2cb638578 100644 --- a/code/modules/tgs/v5/topic.dm +++ b/code/modules/tgs/v5/topic.dm @@ -5,6 +5,7 @@ return response /datum/tgs_api/v5/proc/ProcessTopicJson(json, check_access_identifier) + TGS_DEBUG_LOG("ProcessTopicJson(..., [check_access_identifier])") var/list/result = ProcessRawTopic(json, check_access_identifier) if(!result) result = TopicResponse("Runtime error!") @@ -25,16 +26,20 @@ return response_json /datum/tgs_api/v5/proc/ProcessRawTopic(json, check_access_identifier) + TGS_DEBUG_LOG("ProcessRawTopic(..., [check_access_identifier])") var/list/topic_parameters = json_decode(json) if(!topic_parameters) + TGS_DEBUG_LOG("ProcessRawTopic: json_decode failed") return TopicResponse("Invalid topic parameters json: [json]!"); var/their_sCK = topic_parameters[DMAPI5_PARAMETER_ACCESS_IDENTIFIER] if(check_access_identifier && their_sCK != access_identifier) - return TopicResponse("Failed to decode [DMAPI5_PARAMETER_ACCESS_IDENTIFIER]!") + TGS_DEBUG_LOG("ProcessRawTopic: access identifier check failed") + return TopicResponse("Failed to decode [DMAPI5_PARAMETER_ACCESS_IDENTIFIER] or it does not match!") var/command = topic_parameters[DMAPI5_TOPIC_PARAMETER_COMMAND_TYPE] if(!isnum(command)) + TGS_DEBUG_LOG("ProcessRawTopic: command type check failed") return TopicResponse("Failed to decode [DMAPI5_TOPIC_PARAMETER_COMMAND_TYPE]!") return ProcessTopicCommand(command, topic_parameters) @@ -43,6 +48,7 @@ return "response[payload_id]" /datum/tgs_api/v5/proc/ProcessTopicCommand(command, list/topic_parameters) + TGS_DEBUG_LOG("ProcessTopicCommand([command], ...)") switch(command) if(DMAPI5_TOPIC_COMMAND_CHAT_COMMAND) @@ -55,7 +61,6 @@ return result if(DMAPI5_TOPIC_COMMAND_EVENT_NOTIFICATION) - intercepted_message_queue = list() var/list/event_notification = topic_parameters[DMAPI5_TOPIC_PARAMETER_EVENT_NOTIFICATION] if(!istype(event_notification)) return TopicResponse("Invalid [DMAPI5_TOPIC_PARAMETER_EVENT_NOTIFICATION]!") @@ -66,28 +71,30 @@ var/list/event_parameters = event_notification[DMAPI5_EVENT_NOTIFICATION_PARAMETERS] if(event_parameters && !istype(event_parameters)) - return TopicResponse("Invalid or missing [DMAPI5_EVENT_NOTIFICATION_PARAMETERS]!") + . = TopicResponse("Invalid or missing [DMAPI5_EVENT_NOTIFICATION_PARAMETERS]!") + else + var/list/response = TopicResponse() + . = response + if(event_handler != null) + var/list/event_call = list(event_type) + if(event_parameters) + event_call += event_parameters + + intercepted_message_queue = list() + event_handler.HandleEvent(arglist(event_call)) + response[DMAPI5_TOPIC_RESPONSE_CHAT_RESPONSES] = intercepted_message_queue + intercepted_message_queue = null - var/list/event_call = list(event_type) if (event_type == TGS_EVENT_WATCHDOG_DETACH) detached = TRUE chat_channels.Cut() // https://github.com/tgstation/tgstation-server/issues/1490 - if(event_parameters) - event_call += event_parameters - - if(event_handler != null) - event_handler.HandleEvent(arglist(event_call)) - - var/list/response = TopicResponse() - response[DMAPI5_TOPIC_RESPONSE_CHAT_RESPONSES] = intercepted_message_queue - intercepted_message_queue = null - return response + return if(DMAPI5_TOPIC_COMMAND_CHANGE_PORT) var/new_port = topic_parameters[DMAPI5_TOPIC_PARAMETER_NEW_PORT] if (!isnum(new_port) || !(new_port > 0)) - return TopicResponse("Invalid or missing [DMAPI5_TOPIC_PARAMETER_NEW_PORT]]") + return TopicResponse("Invalid or missing [DMAPI5_TOPIC_PARAMETER_NEW_PORT]") if(event_handler != null) event_handler.HandleEvent(TGS_EVENT_PORT_SWAP, new_port) @@ -122,8 +129,10 @@ return TopicResponse() if(DMAPI5_TOPIC_COMMAND_CHAT_CHANNELS_UPDATE) + TGS_DEBUG_LOG("ProcessTopicCommand: It's a chat update") var/list/chat_update_json = topic_parameters[DMAPI5_TOPIC_PARAMETER_CHAT_UPDATE] if(!istype(chat_update_json)) + TGS_DEBUG_LOG("ProcessTopicCommand: failed \"[DMAPI5_TOPIC_PARAMETER_CHAT_UPDATE]\" check") return TopicResponse("Invalid or missing [DMAPI5_TOPIC_PARAMETER_CHAT_UPDATE]!") DecodeChannels(chat_update_json) @@ -132,12 +141,14 @@ if(DMAPI5_TOPIC_COMMAND_SERVER_PORT_UPDATE) var/new_port = topic_parameters[DMAPI5_TOPIC_PARAMETER_NEW_PORT] if (!isnum(new_port) || !(new_port > 0)) - return TopicResponse("Invalid or missing [DMAPI5_TOPIC_PARAMETER_NEW_PORT]]") + return TopicResponse("Invalid or missing [DMAPI5_TOPIC_PARAMETER_NEW_PORT]") server_port = new_port return TopicResponse() - if(DMAPI5_TOPIC_COMMAND_HEARTBEAT) + if(DMAPI5_TOPIC_COMMAND_HEALTHCHECK) + if(event_handler && event_handler.receive_health_checks) + event_handler.HandleEvent(TGS_EVENT_HEALTH_CHECK) return TopicResponse() if(DMAPI5_TOPIC_COMMAND_WATCHDOG_REATTACH) @@ -146,7 +157,7 @@ var/error_message = null if (new_port != null) if (!isnum(new_port) || !(new_port > 0)) - error_message = "Invalid [DMAPI5_TOPIC_PARAMETER_NEW_PORT]]" + error_message = "Invalid [DMAPI5_TOPIC_PARAMETER_NEW_PORT]" else server_port = new_port @@ -154,7 +165,7 @@ if (!istext(new_version_string)) if(error_message != null) error_message += ", " - error_message += "Invalid or missing [DMAPI5_TOPIC_PARAMETER_NEW_SERVER_VERSION]]" + error_message += "Invalid or missing [DMAPI5_TOPIC_PARAMETER_NEW_SERVER_VERSION]" else var/datum/tgs_version/new_version = new(new_version_string) if (event_handler) @@ -164,6 +175,11 @@ var/list/reattach_response = TopicResponse(error_message) reattach_response[DMAPI5_PARAMETER_CUSTOM_COMMANDS] = ListCustomCommands() + reattach_response[DMAPI5_PARAMETER_TOPIC_PORT] = GetTopicPort() + + for(var/eventId in pending_events) + pending_events[eventId] = TRUE + return reattach_response if(DMAPI5_TOPIC_COMMAND_SEND_CHUNK) @@ -256,4 +272,25 @@ return chunk_to_send + if(DMAPI5_TOPIC_COMMAND_RECEIVE_BROADCAST) + var/message = topic_parameters[DMAPI5_TOPIC_PARAMETER_BROADCAST_MESSAGE] + if (!istext(message)) + return TopicResponse("Invalid or missing [DMAPI5_TOPIC_PARAMETER_BROADCAST_MESSAGE]") + + TGS_WORLD_ANNOUNCE(message) + return TopicResponse() + + if(DMAPI5_TOPIC_COMMAND_COMPLETE_EVENT) + var/event_id = topic_parameters[DMAPI5_EVENT_ID] + if (!istext(event_id)) + return TopicResponse("Invalid or missing [DMAPI5_EVENT_ID]") + + TGS_DEBUG_LOG("Completing event ID [event_id]...") + pending_events[event_id] = TRUE + return TopicResponse() + return TopicResponse("Unknown command: [command]") + +/datum/tgs_api/v5/proc/WorldBroadcast(message) + set waitfor = FALSE + TGS_WORLD_ANNOUNCE(message) diff --git a/code/modules/tgs/v5/undefs.dm b/code/modules/tgs/v5/undefs.dm index e3455b69d1c6..237207fdfd05 100644 --- a/code/modules/tgs/v5/undefs.dm +++ b/code/modules/tgs/v5/undefs.dm @@ -8,16 +8,17 @@ #undef DMAPI5_TOPIC_REQUEST_LIMIT #undef DMAPI5_TOPIC_RESPONSE_LIMIT -#undef DMAPI5_BRIDGE_COMMAND_PORT_UPDATE #undef DMAPI5_BRIDGE_COMMAND_STARTUP #undef DMAPI5_BRIDGE_COMMAND_PRIME #undef DMAPI5_BRIDGE_COMMAND_REBOOT #undef DMAPI5_BRIDGE_COMMAND_KILL #undef DMAPI5_BRIDGE_COMMAND_CHAT_SEND #undef DMAPI5_BRIDGE_COMMAND_CHUNK +#undef DMAPI5_BRIDGE_COMMAND_EVENT #undef DMAPI5_PARAMETER_ACCESS_IDENTIFIER #undef DMAPI5_PARAMETER_CUSTOM_COMMANDS +#undef DMAPI5_PARAMETER_TOPIC_PORT #undef DMAPI5_CHUNK #undef DMAPI5_CHUNK_PAYLOAD @@ -34,6 +35,7 @@ #undef DMAPI5_BRIDGE_PARAMETER_VERSION #undef DMAPI5_BRIDGE_PARAMETER_CHAT_MESSAGE #undef DMAPI5_BRIDGE_PARAMETER_MINIMUM_SECURITY_LEVEL +#undef DMAPI5_BRIDGE_PARAMETER_EVENT_INVOCATION #undef DMAPI5_BRIDGE_RESPONSE_NEW_PORT #undef DMAPI5_BRIDGE_RESPONSE_RUNTIME_INFORMATION @@ -48,6 +50,7 @@ #undef DMAPI5_RUNTIME_INFORMATION_REVISION #undef DMAPI5_RUNTIME_INFORMATION_TEST_MERGES #undef DMAPI5_RUNTIME_INFORMATION_SECURITY_LEVEL +#undef DMAPI5_RUNTIME_INFORMATION_VISIBILITY #undef DMAPI5_CHAT_UPDATE_CHANNELS @@ -75,8 +78,12 @@ #undef DMAPI5_TOPIC_COMMAND_INSTANCE_RENAMED #undef DMAPI5_TOPIC_COMMAND_CHAT_CHANNELS_UPDATE #undef DMAPI5_TOPIC_COMMAND_SERVER_PORT_UPDATE -#undef DMAPI5_TOPIC_COMMAND_HEARTBEAT +#undef DMAPI5_TOPIC_COMMAND_HEALTHCHECK #undef DMAPI5_TOPIC_COMMAND_WATCHDOG_REATTACH +#undef DMAPI5_TOPIC_COMMAND_SEND_CHUNK +#undef DMAPI5_TOPIC_COMMAND_RECEIVE_CHUNK +#undef DMAPI5_TOPIC_COMMAND_RECEIVE_BROADCAST +#undef DMAPI5_TOPIC_COMMAND_COMPLETE_EVENT #undef DMAPI5_TOPIC_PARAMETER_COMMAND_TYPE #undef DMAPI5_TOPIC_PARAMETER_CHAT_COMMAND @@ -86,6 +93,7 @@ #undef DMAPI5_TOPIC_PARAMETER_NEW_INSTANCE_NAME #undef DMAPI5_TOPIC_PARAMETER_CHAT_UPDATE #undef DMAPI5_TOPIC_PARAMETER_NEW_SERVER_VERSION +#undef DMAPI5_TOPIC_PARAMETER_BROADCAST_MESSAGE #undef DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE #undef DMAPI5_TOPIC_RESPONSE_COMMAND_RESPONSE_MESSAGE @@ -111,3 +119,9 @@ #undef DMAPI5_CUSTOM_CHAT_COMMAND_NAME #undef DMAPI5_CUSTOM_CHAT_COMMAND_HELP_TEXT #undef DMAPI5_CUSTOM_CHAT_COMMAND_ADMIN_ONLY + +#undef DMAPI5_EVENT_ID + +#undef DMAPI5_EVENT_INVOCATION_NAME +#undef DMAPI5_EVENT_INVOCATION_PARAMETERS +#undef DMAPI5_EVENT_INVOCATION_NOTIFY_COMPLETION diff --git a/code/modules/tgui/states.dm b/code/modules/tgui/states.dm index aef5773594ac..703ec1c735ee 100644 --- a/code/modules/tgui/states.dm +++ b/code/modules/tgui/states.dm @@ -116,7 +116,7 @@ * * return UI_state The state of the UI. */ -/mob/living/proc/shared_living_ui_distance(atom/movable/src_object, viewcheck = TRUE) +/mob/living/proc/shared_living_ui_distance(atom/movable/src_object, viewcheck = TRUE, allow_tk = TRUE) // If the object is obscured, close it. if(viewcheck && !(src_object in view(src))) return UI_CLOSE @@ -133,7 +133,7 @@ // Otherwise, we got nothing. return UI_CLOSE -/mob/living/carbon/human/shared_living_ui_distance(atom/movable/src_object, viewcheck = TRUE) - if(dna.check_mutation(TK) && tkMaxRangeCheck(src, src_object)) +/mob/living/carbon/human/shared_living_ui_distance(atom/movable/src_object, viewcheck = TRUE, allow_tk = TRUE) + if(allow_tk && dna.check_mutation(TK) && tkMaxRangeCheck(src, src_object)) return UI_INTERACTIVE return ..() diff --git a/code/modules/tgui/states/pilot.dm b/code/modules/tgui/states/pilot.dm new file mode 100644 index 000000000000..c5b63b5ad1d8 --- /dev/null +++ b/code/modules/tgui/states/pilot.dm @@ -0,0 +1,9 @@ +GLOBAL_DATUM_INIT(pilot_state, /datum/ui_state/pilot_state, new) + +/datum/ui_state/pilot_state/can_use_topic(src_object, mob/user) + if(!ismecha(src_object)) + return UI_CLOSE + var/obj/mecha/gundam = src_object + if(user == gundam.occupant) + return UI_INTERACTIVE + return UI_CLOSE diff --git a/code/modules/tgui/status_composers.dm b/code/modules/tgui/status_composers.dm new file mode 100644 index 000000000000..46eef2b40204 --- /dev/null +++ b/code/modules/tgui/status_composers.dm @@ -0,0 +1,112 @@ +/// The sane defaults for a UI such as a computer or a machine. +/proc/default_ui_state(mob/user, atom/source) + return min( + ui_status_user_is_abled(user, source), + ui_status_user_has_free_hands(user, source), + ui_status_user_is_advanced_tool_user(user), + ui_status_only_living(user), + max( + ui_status_user_is_adjacent(user, source), + ui_status_silicon_has_access(user, source), + ) + ) + +/// Returns a UI status such that users adjacent to source will be able to interact, +/// far away users will be able to see, and anyone farther won't see anything. +/// Dead users will receive updates no matter what, though you likely want to add +/// a [`ui_status_only_living`] check for finer observer interactions. +/proc/ui_status_user_is_adjacent(mob/user, atom/source, allow_tk = TRUE) + if (isliving(user)) + var/mob/living/living_user = user + return living_user.shared_living_ui_distance(source, allow_tk = allow_tk) + else + return UI_UPDATE + +/// Returns a UI status such that the dead will be able to watch, but not interact. +/proc/ui_status_only_living(mob/user, source) + if (isliving(user)) + return UI_INTERACTIVE + + if(isobserver(user)) + // If they turn on ghost AI control, admins can always interact. + if(IsAdminGhost(user)) + return UI_INTERACTIVE + + // Regular ghosts can always at least view if in range. + var/datum/client_interface/client = GET_CLIENT(user) + if(client) + var/clientviewlist = getviewsize(client.view) + if(get_dist(source, user) < max(clientviewlist[1], clientviewlist[2])) + return UI_UPDATE + + return UI_CLOSE + +/// Returns a UI status such that users with debilitating conditions, such as +/// being dead or not having power for silicons, will not be able to interact. +/// Being dead will disable UI, being incapacitated will continue updating it, +/// and anything else will make it interactive. +/proc/ui_status_user_is_abled(mob/user, atom/source) + return user.shared_ui_interaction(source) + +/// Returns a UI status such that those without blocked hands will be able to interact, +/// but everyone else can only watch. +/proc/ui_status_user_has_free_hands(mob/user, atom/source) + return HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) ? UI_UPDATE : UI_INTERACTIVE + +/// Returns a UI status such that advanced tool users will be able to interact, +/// but everyone else can only watch. +/proc/ui_status_user_is_advanced_tool_user(mob/user) + return user.IsAdvancedToolUser() ? UI_INTERACTIVE : UI_UPDATE + +/// Returns a UI status such that silicons will be able to interact with whatever +/// they would have access to if this was a machine. For example, AIs can +/// interact if there's cameras with wireless control is enabled. +/proc/ui_status_silicon_has_access(mob/user, atom/source) + if (!issilicon(user)) + return UI_CLOSE + var/mob/living/silicon/silicon_user = user + return silicon_user.get_ui_access(source) + +/// Returns a UI status representing this silicon's capability to access +/// the given source. Called by `ui_status_silicon_has_access`. +/mob/living/silicon/proc/get_ui_access(atom/source) + return UI_CLOSE + +/mob/living/silicon/robot/get_ui_access(atom/source) + // Robots can interact with anything they can see. + var/list/clientviewlist = getviewsize(client.view) + if(get_dist(src, source) <= min(clientviewlist[1],clientviewlist[2])) + return UI_INTERACTIVE + return UI_DISABLED // Otherwise they can keep the UI open. + +/mob/living/silicon/ai/get_ui_access(atom/source) + // The AI can interact with anything it can see nearby, or with cameras while wireless control is enabled. + if(!control_disabled && can_see(source)) + return UI_INTERACTIVE + return UI_CLOSE + +/mob/living/silicon/pai/get_ui_access(atom/source) + // pAIs can only use themselves and the owner's radio. + if((source == src || source == radio) && !stat) + return UI_INTERACTIVE + else + return UI_CLOSE + +/// Returns UI_INTERACTIVE if the user is conscious and lying down. +/// Returns UI_UPDATE otherwise. +/proc/ui_status_user_is_conscious_and_lying_down(mob/user) + if (!isliving(user)) + return UI_UPDATE + + var/mob/living/living_user = user + return (!(living_user.mobility_flags & MOBILITY_MOVE) && living_user.stat == CONSCIOUS) \ + ? UI_INTERACTIVE \ + : UI_UPDATE + +/// Return UI_INTERACTIVE if the user is strictly adjacent to the target atom, whether they can see it or not. +/// Return UI_CLOSE otherwise. +/proc/ui_status_user_strictly_adjacent(mob/user, atom/target) + if(get_dist(target, user) > 1) + return UI_CLOSE + + return UI_INTERACTIVE diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm index ca029b16733c..15eadfe6557e 100644 --- a/code/modules/unit_tests/_unit_tests.dm +++ b/code/modules/unit_tests/_unit_tests.dm @@ -70,12 +70,14 @@ #define TRAIT_SOURCE_UNIT_TESTS "unit_tests" #include "anchored_mobs.dm" +#include "atmos_tests.dm" #include "baseturfs.dm" #include "component_tests.dm" #include "dcs_check_list_arguments.dm" #include "dragon_expiration.dm" #include "dynamic_ruleset_sanity.dm" #include "focus_only_tests.dm" +#include "greyscale_config.dm" #include "map_landmarks.dm" #include "mapping.dm" #include "reagent_id_typos.dm" diff --git a/code/modules/unit_tests/atmos_tests.dm b/code/modules/unit_tests/atmos_tests.dm new file mode 100644 index 000000000000..dea62df4a0ab --- /dev/null +++ b/code/modules/unit_tests/atmos_tests.dm @@ -0,0 +1,12 @@ +/datum/unit_test/fusion_reaction/Run() + var/datum/gas_mixture/fusion_test_mix = new + + fusion_test_mix.set_moles(GAS_TRITIUM, 1000) + fusion_test_mix.set_moles(GAS_PLASMA, 4500) + fusion_test_mix.set_moles(GAS_CO2, 1500) + fusion_test_mix.set_moles(GAS_DILITHIUM, 2000) + fusion_test_mix.set_temperature(FUSION_TEMPERATURE_THRESHOLD - 1) + + if(fusion_test_mix.react() != REACTING) + TEST_FAIL("Fusion reaction was unable to start!") + qdel(fusion_test_mix) diff --git a/code/modules/unit_tests/greyscale_config.dm b/code/modules/unit_tests/greyscale_config.dm new file mode 100644 index 000000000000..4b441a101936 --- /dev/null +++ b/code/modules/unit_tests/greyscale_config.dm @@ -0,0 +1,41 @@ +/// Makes sure items using GAGS have all the icon states needed to work +/datum/unit_test/greyscale_item_icon_states + +/datum/unit_test/greyscale_item_icon_states/Run() + for(var/obj/item/item_path as anything in subtypesof(/obj/item)) + if(isnull(initial(item_path.greyscale_colors))) + continue //All configs depend on greyscale_colors being defined. + var/held_icon_state = initial(item_path.item_state) || initial(item_path.icon_state) + + var/datum/greyscale_config/lefthand = SSgreyscale.configurations["[initial(item_path.greyscale_config_inhand_left)]"] + if(lefthand && !lefthand.icon_states[held_icon_state]) + TEST_FAIL("[lefthand.DebugName()] is missing a sprite for the held lefthand for [item_path]. Expected icon state: '[held_icon_state]'") + + var/datum/greyscale_config/righthand = SSgreyscale.configurations["[initial(item_path.greyscale_config_inhand_right)]"] + if(righthand && !righthand.icon_states[held_icon_state]) + TEST_FAIL("[righthand.DebugName()] is missing a sprite for the held righthand for [item_path]. Expected icon state: '[held_icon_state]'") + + var/datum/greyscale_config/worn = SSgreyscale.configurations["[initial(item_path.greyscale_config_worn)]"] + var/worn_icon_state = initial(item_path.worn_icon_state) || initial(item_path.icon_state) + if(worn && !worn.icon_states[worn_icon_state]) + TEST_FAIL("[worn.DebugName()] is missing a sprite for the worn overlay for [item_path]. Expected icon state: '[worn_icon_state]'") + + var/datum/greyscale_config/belt = SSgreyscale.configurations["[initial(item_path.greyscale_config_belt)]"] + var/belt_icon_state = initial(item_path.belt_icon_state) || initial(item_path.icon_state) + if(belt && !belt.icon_states[belt_icon_state]) + TEST_FAIL("[belt.DebugName()] is missing a sprite for the belt overlay for [item_path]. Expected icon state: '[belt_icon_state]'") + +/// Makes sure objects using greyscale configs have, if any, the correct number of colors +/datum/unit_test/greyscale_color_count + +/datum/unit_test/greyscale_color_count/Run() + for(var/atom/thing as anything in subtypesof(/atom)) + var/datum/greyscale_config/config = SSgreyscale.configurations["[initial(thing.greyscale_config)]"] + if(!config) + continue + var/list/colors = splittext(initial(thing.greyscale_colors), "#") + if(!length(colors)) + continue + var/number_of_colors = length(colors) - 1 + if(config.expected_colors != number_of_colors) + TEST_FAIL("[thing] has the wrong amount of colors configured for [config.DebugName()]. Expected [config.expected_colors] but only found [number_of_colors].") diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index 96460e519239..f44e8fc98bde 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -339,6 +339,13 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) manufacturer = /datum/corporation/traitor/cybersun surplus = 0 +/datum/uplink_item/dangerous/gasharpoon + name = "Gasharpoon" + desc = "A repurposed space-whaling tool attatched to a glove, can be used as a sturdy weapon in both hands, or worn as a glove to allow access to it's harpoon." + item = /obj/item/clothing/gloves/gasharpoon + cost = 10 + surplus = 0 + /datum/uplink_item/dangerous/rawketlawnchair name = "84mm Rocket Propelled Grenade Launcher" desc = "A reusable rocket propelled grenade launcher preloaded with a low-yield 84mm HE round. \ @@ -707,6 +714,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) deflecting all ranged weapon fire when throwmode is enabled, but you also refuse to use dishonorable ranged weaponry." item = /obj/item/book/granter/martial/carp cost = 14 + player_minimum = 20 surplus = 0 exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops, /datum/game_mode/infiltration) // yogs: infiltration @@ -1435,6 +1443,14 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) cant_discount = TRUE cost = 105 //Yogs change +/datum/uplink_item/support/mamba + name = "Black Mamba Exosuit" + desc = "A stealthy, quick, and deadly combat exosuit, this modified sidewinder chassis is capable of suddenly striking and retreating while \ + the effects of its venomous weapons take hold. Comes with a venom carbine, dual daggers, and an anti-projectile armor booster." + item = /obj/mecha/combat/sidewinder/mamba/loaded + cant_discount = TRUE + cost = 75 + // Stealth Items /datum/uplink_item/stealthy_tools category = "Stealth Gadgets" diff --git a/code/modules/vehicles/_vehicle.dm b/code/modules/vehicles/_vehicle.dm index 836fcd5035c2..51227b0f60df 100644 --- a/code/modules/vehicles/_vehicle.dm +++ b/code/modules/vehicles/_vehicle.dm @@ -33,19 +33,6 @@ occupant_actions = list() generate_actions() -/obj/vehicle/examine(mob/user) - . = ..() - if(resistance_flags & ON_FIRE) - . += span_warning("It's on fire!") - var/healthpercent = obj_integrity/max_integrity * 100 - switch(healthpercent) - if(50 to 99) - . += "It looks slightly damaged." - if(25 to 50) - . += "It appears heavily damaged." - if(0 to 25) - . += span_warning("It's falling apart!") - /obj/vehicle/proc/is_key(obj/item/I) return I? (key_type_exact? (I.type == key_type) : istype(I, key_type)) : FALSE diff --git a/code/modules/vehicles/cars/clowncar.dm b/code/modules/vehicles/cars/clowncar.dm index a8b685b63fdb..6f25e03b4f1c 100644 --- a/code/modules/vehicles/cars/clowncar.dm +++ b/code/modules/vehicles/cars/clowncar.dm @@ -57,7 +57,7 @@ . = ..() if(istype(I, /obj/item/reagent_containers/food/snacks/grown/banana)) var/obj/item/reagent_containers/food/snacks/grown/banana/banana = I - obj_integrity += min(banana.seed.potency, max_integrity-obj_integrity) + update_integrity(atom_integrity + min(banana.seed.potency, max_integrity-atom_integrity)) to_chat(user, span_danger("You use the [banana] to repair the [src]!")) qdel(banana) diff --git a/code/modules/vehicles/motorized_wheelchair.dm b/code/modules/vehicles/motorized_wheelchair.dm index 29337df5d20c..d50b4fda63f6 100644 --- a/code/modules/vehicles/motorized_wheelchair.dm +++ b/code/modules/vehicles/motorized_wheelchair.dm @@ -36,7 +36,7 @@ power_cell.update_appearance(UPDATE_ICON) refresh_parts() -/obj/vehicle/ridden/wheelchair/motorized/obj_destruction(damage_flag) +/obj/vehicle/ridden/wheelchair/motorized/atom_destruction(damage_flag, total_destruction=FALSE) drop_contents() . = ..() diff --git a/code/modules/vehicles/scooter.dm b/code/modules/vehicles/scooter.dm index bea046eb4ca9..009d67722663 100644 --- a/code/modules/vehicles/scooter.dm +++ b/code/modules/vehicles/scooter.dm @@ -252,6 +252,8 @@ name = "Wheely-Heels" desc = "Uses patented retractable wheel technology. Never sacrifice speed for style - not that this provides much of either." icon = null + ///Stores the shoes associated with the vehicle + var/obj/item/clothing/shoes/wheelys/shoes = null /obj/vehicle/ridden/scooter/wheelys/Initialize(mapload) . = ..() @@ -266,12 +268,18 @@ if(!has_buckled_mobs()) to_chat(M, span_notice("You pop the Wheely-Heels' wheels back into place.")) moveToNullspace() + shoes.toggle_wheels(FALSE) return ..() /obj/vehicle/ridden/scooter/wheelys/post_buckle_mob(mob/living/M) to_chat(M, span_notice("You pop out the Wheely-Heels' wheels.")) + shoes.toggle_wheels(TRUE) return ..() +///Sets the shoes that the vehicle is associated with, called when the shoes are initialized +/obj/vehicle/ridden/scooter/wheelys/proc/link_shoes(newshoes) + shoes = newshoes + /obj/vehicle/ridden/scooter/wheelys/Bump(atom/A) . = ..() if(A.density && has_buckled_mobs()) @@ -316,7 +324,8 @@ /obj/vehicle/ridden/scooter/airshoes/Destroy() if(sparks) QDEL_NULL(sparks) - . = ..() + return ..() + /obj/vehicle/ridden/scooter/airshoes/relaymove() if (grinding || world.time < next_crash) return FALSE diff --git a/code/modules/vehicles/secway.dm b/code/modules/vehicles/secway.dm index 0309789cc224..cf3f2d9284b9 100644 --- a/code/modules/vehicles/secway.dm +++ b/code/modules/vehicles/secway.dm @@ -17,15 +17,15 @@ if(user.a_intent == INTENT_HARM) return FALSE - if(obj_integrity == max_integrity) + if(atom_integrity == max_integrity) to_chat(user, span_warning("[src] is already in good condition!")) return FALSE to_chat(user, span_notice("You begin repairing [src]...")) if(I.use_tool(src, user, 10, volume=50)) to_chat(user, span_notice("You repair [src].")) - obj_integrity = min(max_integrity, obj_integrity + 20) - if(obj_integrity == max_integrity) + update_integrity(min(max_integrity, atom_integrity + 20)) + if(atom_integrity == max_integrity) to_chat(user, span_notice("[src] looks to be fully repaired now.")) return TRUE diff --git a/code/modules/vehicles/wheelchair.dm b/code/modules/vehicles/wheelchair.dm index 4ae64a963983..3faa7e853b80 100644 --- a/code/modules/vehicles/wheelchair.dm +++ b/code/modules/vehicles/wheelchair.dm @@ -22,10 +22,10 @@ D.set_vehicle_dir_layer(WEST, OBJ_LAYER) AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE, CALLBACK(src, PROC_REF(can_user_rotate)),CALLBACK(src, PROC_REF(can_be_rotated)),null) -/obj/vehicle/ridden/wheelchair/obj_destruction(damage_flag) +/obj/vehicle/ridden/wheelchair/atom_destruction(damage_flag) new /obj/item/stack/rods(drop_location(), 1) new /obj/item/stack/sheet/metal(drop_location(), 1) - ..() + return ..() /obj/vehicle/ridden/wheelchair/Destroy() if(has_buckled_mobs()) @@ -171,7 +171,7 @@ . = ..() initialize_controller_action_type(/datum/action/vehicle/ridden/wheelchair/explosive/kaboom, VEHICLE_CONTROL_DRIVE) -/obj/vehicle/ridden/wheelchair/explosive/obj_destruction(damage_flag) +/obj/vehicle/ridden/wheelchair/explosive/atom_destruction(damage_flag) explosion(src, 1, 3, 5) qdel(src) diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index d24140621bcc..c7aeff5c7b11 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -303,7 +303,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C if(light_mask && !(stat & BROKEN) && powered()) . += emissive_appearance(icon, light_mask, src) -/obj/machinery/vending/obj_break(damage_flag) +/obj/machinery/vending/atom_break(damage_flag) . = ..() if(!.) return diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index b55dd8715d32..c7dd2a957a23 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -43,6 +43,7 @@ /obj/item/clothing/neck/tie/red = 3, /obj/item/clothing/neck/tie/black = 3, /obj/item/clothing/neck/tie/horrible = 3, + /obj/item/clothing/accessory/pride = 15, /obj/item/storage/belt/fannypack = 3, /obj/item/storage/belt/fannypack/blue = 3, /obj/item/storage/belt/fannypack/red = 3, diff --git a/code/modules/vending/medical_wall.dm b/code/modules/vending/medical_wall.dm index adfcc0a5e178..150a758261dc 100644 --- a/code/modules/vending/medical_wall.dm +++ b/code/modules/vending/medical_wall.dm @@ -1,6 +1,7 @@ /obj/machinery/vending/wallmed name = "\improper NanoMed" desc = "Wall-mounted Medical Equipment dispenser." + icon = 'yogstation/icons/obj/vending.dmi' icon_state = "wallmed" icon_deny = "wallmed-deny" density = FALSE @@ -19,7 +20,7 @@ extra_price = 100 payment_department = ACCOUNT_MED tiltable = FALSE - light_mask = "wallmed-light-mask" + light_mask = "wall-light-mask" /obj/item/vending_refill/wallmed machine_name = "NanoMed" diff --git a/code/modules/vending/megaseed.dm b/code/modules/vending/megaseed.dm index 7e7b36b53812..ada6634c49e7 100644 --- a/code/modules/vending/megaseed.dm +++ b/code/modules/vending/megaseed.dm @@ -18,6 +18,7 @@ /obj/item/seeds/chili = 3, /obj/item/seeds/cinnamomum = 3, /obj/item/seeds/cocoapod = 3, + /obj/item/seeds/coconut = 3, /obj/item/seeds/coffee = 3, /obj/item/seeds/corn = 3, /obj/item/seeds/cotton = 3, diff --git a/code/modules/vending/modularpc.dm b/code/modules/vending/modularpc.dm index dd2c012d4cb8..9937454bbc3f 100644 --- a/code/modules/vending/modularpc.dm +++ b/code/modules/vending/modularpc.dm @@ -24,7 +24,8 @@ /obj/item/computer_hardware/card_slot/secondary = 2, /obj/item/computer_hardware/ai_slot = 2, /obj/item/computer_hardware/printer/mini = 2, - /obj/item/computer_hardware/recharger/APC = 2) + /obj/item/computer_hardware/recharger/APC = 2, + /obj/item/computer_hardware/ai_interface = 2) refill_canister = /obj/item/vending_refill/modularpc default_price = 30 extra_price = 250 diff --git a/code/modules/vending/toys.dm b/code/modules/vending/toys.dm index 32519753a6ae..ed695971e3e4 100644 --- a/code/modules/vending/toys.dm +++ b/code/modules/vending/toys.dm @@ -43,3 +43,32 @@ /obj/item/vending_refill/donksoft machine_name = "Donksoft Toy Vendor" icon_state = "refill_donksoft" + +/obj/machinery/vending/donksofttoyvendor/hugbox + name = "\improper Hugsoft Toy Vendor" + desc = "An ages 8 and up approved vendor that dispenses toys. This one feels noticably less fun..." + circuit = /obj/item/circuitboard/machine/vending/donksofttoyvendor/hugbox + products = list( + /obj/item/gun/ballistic/automatic/toy/unrestricted/hugbox = 10, + /obj/item/gun/ballistic/automatic/toy/pistol/unrestricted/hugbox = 10, + /obj/item/gun/ballistic/shotgun/toy/unrestricted/hugbox = 10, + /obj/item/toy/sword = 10, + /obj/item/melee/vxtvulhammer/toy = 7, + /obj/item/ammo_box/foambox = 30, + /obj/item/toy/foamblade = 10, + /obj/item/toy/foamblade/baseball = 10, + /obj/item/toy/syndicateballoon = 10, + /obj/item/clothing/suit/syndicatefake = 5, + /obj/item/clothing/head/syndicatefake = 5, + /obj/item/gun/magic/sickly_blade_toy = 1, + /obj/item/gun/magic/sickly_blade_toy/rust_toy = 1, + /obj/item/gun/magic/sickly_blade_toy/ash_toy = 1, + /obj/item/gun/magic/sickly_blade_toy/flesh_toy =1, + /obj/item/gun/ballistic/shotgun/toy/crossbow/hugbox = 10, // No more contraband section because they cant load riot darts anymore. + /obj/item/gun/ballistic/automatic/c20r/toy/unrestricted/hugbox = 10, + /obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted/hugbox = 10, + /obj/item/gun/water/full = 10, + /obj/item/toy/katana = 10, + /obj/item/melee/dualsaber/toy = 5, + /obj/item/organ/cyberimp/chest/spinalspeed/toy = 5 + ) diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 37098892965c..4c8d65b165c8 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -58,7 +58,9 @@ /obj/item/clothing/head/helmet/secconhelm = 3, /obj/item/clothing/suit/armor/secconcoat = 3, /obj/item/clothing/head/beret/sec/secconhat = 3, - /obj/item/clothing/suit/armor/secconvest = 3) + /obj/item/clothing/suit/armor/secconvest = 3, + /obj/item/clothing/under/plasmaman/security = 3, + /obj/item/clothing/head/helmet/space/plasmaman/security = 3) premium = list(/obj/item/clothing/under/rank/security/navyblue = 3, /obj/item/clothing/suit/armor/officerjacket = 3, /obj/item/clothing/head/beret/sec/navyofficer = 3) @@ -368,7 +370,6 @@ /obj/item/clothing/under/yogs/casualjanitorsuit = 2, /obj/item/clothing/suit/yogs/janitorcoat = 2, /obj/item/clothing/suit/hooded/wintercoat/janitor = 2, - /obj/item/cartridge/janitor = 2, /obj/item/clothing/under/rank/janitor/skirt = 2, /obj/item/clothing/under/janimaid = 2, /obj/item/clothing/gloves/color/black = 2, diff --git a/config/admins.txt b/config/admins.txt index e53c2ea948a8..e03a6aa4268f 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -8,11 +8,11 @@ # and will override any duplicate entries in the database. # ############################################################################################### -AshCorr = Host +spl99 = Host Xantam = Host aquizit = Council Member -mordrehel = Council Member +hisakaki = Council Member cowbot93 = Council Member jamied12 = Head Developer diff --git a/config/config.txt b/config/config.txt index e077fe2da1f1..e3e17849b3e1 100644 --- a/config/config.txt +++ b/config/config.txt @@ -422,6 +422,16 @@ DEFAULT_VIEW 19x15 ## You probably shouldn't ever be changing this, but it's here if you want to. DEFAULT_VIEW_SQUARE 15x15 + +## Enable automatic profiling - Byond 513.1506 and newer only. +#AUTO_PROFILE + +## Threshold (in deciseconds) for real time between ticks before we start dumping profiles +DRIFT_DUMP_THRESHOLD 40 + +## How long to wait (in deciseconds) after a profile dump before logging another tickdrift sourced one +DRIFT_PROFILE_DELAY 150 + ## Comment this out if you want to use the SQL based mentor system, the legacy system uses mentors.txt. ## You need to set up your database to use the SQL based system. ## This flag is automatically enabled if SQL_ENABLED isn't diff --git a/config/dbconfig.txt b/config/dbconfig.txt index 4e1c5edc1e07..42c37282d967 100644 --- a/config/dbconfig.txt +++ b/config/dbconfig.txt @@ -12,7 +12,7 @@ ASYNC_QUERY_TIMEOUT 10 BLOCKING_QUERY_TIMEOUT 5 ## The maximum number of additional threads BSQL is allowed to run at once -BSQL_THREAD_LIMIT 50 +POOLING_MAX_SQL_CONNECTIONS 50 ## Uncomment to enable verbose BSQL communication logs #BSQL_DEBUG diff --git a/config/game_options.txt b/config/game_options.txt index 9dd863aded73..1b5cbf0dd834 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -54,7 +54,7 @@ WALK_DELAY 6 ## Entries completely override all subtypes. Later entries have precedence over earlier entries. ## This means if you put /mob 0 on the last entry, it will null out all changes, while if you put /mob as the first entry and ## /mob/living/carbon/human on the last entry, the last entry will override the first. -##MULTIPLICATIVE_MOVESPEED /mob/living/carbon/human 0 +MULTIPLICATIVE_MOVESPEED /mob/living/carbon/human 0.1 ##MULTIPLICATIVE_MOVESPEED /mob/living/silicon/robot 0 MULTIPLICATIVE_MOVESPEED /mob/living/carbon/monkey 0 ##MULTIPLICATIVE_MOVESPEED /mob/living/carbon/alien 0 @@ -674,11 +674,8 @@ MICE_ROUNDSTART 5 ## This used to be named traits, hence the config name, but it handles quirks, not the other kind of trait! ROUNDSTART_TRAITS -## Uncomment to disable human moods. -DISABLE_HUMAN_MOOD - -## Uncomment to force human moods. Not compatible with DISABLE_HUMAN_MOOD -FORCE_HUMAN_MOOD +## Uncomment to allow selection for human moods. Comment to force moods on +#DISABLE_HUMAN_MOOD ## Enable night shifts ## #ENABLE_NIGHT_SHIFTS diff --git a/config/minor_filter.txt b/config/minor_filter.txt index aa85b4b3076f..ac7413206708 100644 --- a/config/minor_filter.txt +++ b/config/minor_filter.txt @@ -46,7 +46,7 @@ pls=please plz=please \btf\b=the fuck \bi\b=I -auxmos=space wind -aux mos=space wind +auxmos=La Li Lu Le Lo +aux mos=La Li Lu Le Lo \bnp\b=no problem \bthx\b=thanks diff --git a/config/private_default.txt b/config/private_default.txt index 88850ee7cada..832186c7c650 100644 --- a/config/private_default.txt +++ b/config/private_default.txt @@ -86,9 +86,8 @@ VOICE_ANNOUNCE_DIR ../Yogstation.net/voice_announce_tmp ## Enable the demo subsystem #DEMOS_ENABLED -## Starlight for exterior walls and breaches. Uncomment for starlight! -## This is disabled by default to make testing quicker, should be enabled on production servers or testing servers messing with lighting -#STARLIGHT +## Enable automatic profiling - Byond 513.1506 and newer only. +#AUTO_PROFILE ## Assets can opt-in to caching their results into `tmp`. diff --git a/config/private_server.txt b/config/private_server.txt index 8b2019e124ee..f8d2ee73d29d 100644 --- a/config/private_server.txt +++ b/config/private_server.txt @@ -97,6 +97,9 @@ VOICE_ANNOUNCE_DIR data/voice_announcements ## Enable the demo subsystem DEMOS_ENABLED +## Enable automatic profiling - Byond 513.1506 and newer only. +AUTO_PROFILE + ## Starlight for exterior walls and breaches. Uncomment for starlight! ## This is disabled by default to make testing quicker, should be enabled on production servers or testing servers messing with lighting STARLIGHT diff --git a/config/title_screens/images/joke/Am37000.gif b/config/title_screens/images/joke/Am37000.gif new file mode 100644 index 000000000000..692f6d005e43 Binary files /dev/null and b/config/title_screens/images/joke/Am37000.gif differ diff --git a/config/title_screens/images/joke/lazenn.png b/config/title_screens/images/joke/lazenn.png new file mode 100644 index 000000000000..0b8b1c630307 Binary files /dev/null and b/config/title_screens/images/joke/lazenn.png differ diff --git a/config/title_screens/images/joke/narwhalstar13.png b/config/title_screens/images/joke/narwhalstar13.png new file mode 100644 index 000000000000..379dde335ef2 Binary files /dev/null and b/config/title_screens/images/joke/narwhalstar13.png differ diff --git a/config/title_screens/images/joke/thatguyphil.png b/config/title_screens/images/joke/thatguyphil.png new file mode 100644 index 000000000000..2348795a7776 Binary files /dev/null and b/config/title_screens/images/joke/thatguyphil.png differ diff --git a/config/title_screens/images/joke/willymount00.png b/config/title_screens/images/joke/willymount00.png new file mode 100644 index 000000000000..6b816734aa6e Binary files /dev/null and b/config/title_screens/images/joke/willymount00.png differ diff --git a/config/title_screens/images/normal/boba.gif b/config/title_screens/images/normal/boba.gif new file mode 100644 index 000000000000..09b1f0d45216 Binary files /dev/null and b/config/title_screens/images/normal/boba.gif differ diff --git a/config/title_screens/images/normal/flikr.png b/config/title_screens/images/normal/flikr.png new file mode 100644 index 000000000000..7d65a7a5f0e2 Binary files /dev/null and b/config/title_screens/images/normal/flikr.png differ diff --git a/config/title_screens/images/normal/monster.gif b/config/title_screens/images/normal/monster.gif new file mode 100644 index 000000000000..7c0dc3a5be70 Binary files /dev/null and b/config/title_screens/images/normal/monster.gif differ diff --git a/config/title_screens/images/normal/tessa.gif b/config/title_screens/images/normal/tessa.gif new file mode 100644 index 000000000000..84b6d2957a6f Binary files /dev/null and b/config/title_screens/images/normal/tessa.gif differ diff --git a/config/title_screens/images/yogstation.png b/config/title_screens/images/normal/yogstation.png similarity index 100% rename from config/title_screens/images/yogstation.png rename to config/title_screens/images/normal/yogstation.png diff --git a/config/title_screens/images/rare/azzzertyy.png b/config/title_screens/images/rare/azzzertyy.png new file mode 100644 index 000000000000..5d0fdb339527 Binary files /dev/null and b/config/title_screens/images/rare/azzzertyy.png differ diff --git a/config/title_screens/images/rare+fire.png b/config/title_screens/images/rare/fire.png similarity index 100% rename from config/title_screens/images/rare+fire.png rename to config/title_screens/images/rare/fire.png diff --git a/config/title_screens/images/rare/m4565.png b/config/title_screens/images/rare/m4565.png new file mode 100644 index 000000000000..d5bf1b9b6cb9 Binary files /dev/null and b/config/title_screens/images/rare/m4565.png differ diff --git a/config/title_screens/images/rare+yogurt.png b/config/title_screens/images/rare/yogurt.png similarity index 100% rename from config/title_screens/images/rare+yogurt.png rename to config/title_screens/images/rare/yogurt.png diff --git a/html/changelog.css b/html/changelog.css index 2bfa3fa49558..a59d295f4872 100644 --- a/html/changelog.css +++ b/html/changelog.css @@ -1,41 +1,42 @@ -.top{font-family:Tahoma,sans-serif;font-size:12px;} -h2{font-family:Tahoma,sans-serif;} -a img {border:none;} -.bgimages16 li { - padding:2px 10px 2px 30px; - background-position:6px center; - background-repeat:no-repeat; - border:1px solid #ddd; - border-left:4px solid #999; - margin-bottom:2px; -} -.bugfix {background-image:url(bug-minus.png)} -.wip {background-image:url(hard-hat-exclamation.png)} -.tweak {background-image:url(wrench-screwdriver.png)} -.soundadd {background-image:url(music-plus.png)} -.sounddel {background-image:url(music-minus.png)} -.rscdel {background-image:url(cross-circle.png)} -.rscadd {background-image:url(tick-circle.png)} -.imageadd {background-image:url(image-plus.png)} -.imagedel {background-image:url(image-minus.png)} -.spellcheck {background-image:url(spell-check.png)} -.experiment {background-image:url(burn-exclamation.png)} -.refactor {background-image:url(burn-exclamation.png)} -.code_imp {background-image:url(coding.png)} -.config {background-image:url(chrome-wrench.png)} -.admin {background-image:url(ban.png)} -.server {background-image:url(hard-hat-exclamation.png)} -.balance {background-image:url(scales.png)} -.sansserif {font-family:Tahoma,sans-serif;font-size:12px;} -.commit {margin-bottom:20px;font-size:100%;font-weight:normal;} -.changes {list-style:none;margin:5px 0;padding:0 0 0 25px;font-size:0.8em;} -.date {margin:10px 0;color:blue;border-bottom:2px solid #00f;width:60%;padding:2px 0;font-size:1em;font-weight:bold;} -.author {padding-left:10px;margin:0;font-weight:bold;font-size:0.9em;} -.drop {cursor:pointer;border:1px solid #999;display:inline;font-size:0.9em;padding:1px 20px 1px 5px;line-height:16px;} -.hidden {display:none;} -.indrop {margin:2px 0 0 0;clear:both;background:#fff;border:1px solid #ddd;padding:5px 10px;} -.indrop p {margin:0;font-size:0.8em;line-height:16px;margin:1px 0;} -.indrop img {margin-right:5px;vertical-align:middle;} -.closed {background:url(chevron-expand.png) right center no-repeat;} -.open {background:url(chevron.png) right center no-repeat;} -.lic {font-size:9px;} +.top{font-family:Tahoma,sans-serif;font-size:12px;} +h2{font-family:Tahoma,sans-serif;} +a img {border:none;} +.bgimages16 li { + padding:2px 10px 2px 30px; + background-position:6px center; + background-repeat:no-repeat; + border:1px solid #ddd; + border-left:4px solid #999; + margin-bottom:2px; +} +.bugfix {background-image:url(bug-minus.png)} +.wip {background-image:url(hard-hat-exclamation.png)} +.tweak {background-image:url(wrench-screwdriver.png)} +.soundadd {background-image:url(music-plus.png)} +.sounddel {background-image:url(music-minus.png)} +.rscdel {background-image:url(cross-circle.png)} +.rscadd {background-image:url(tick-circle.png)} +.imageadd {background-image:url(image-plus.png)} +.imagedel {background-image:url(image-minus.png)} +.mapping {background-image:url(mapping.png)} +.spellcheck {background-image:url(spell-check.png)} +.experiment {background-image:url(burn-exclamation.png)} +.refactor {background-image:url(burn-exclamation.png)} +.code_imp {background-image:url(coding.png)} +.config {background-image:url(chrome-wrench.png)} +.admin {background-image:url(ban.png)} +.server {background-image:url(hard-hat-exclamation.png)} +.balance {background-image:url(scales.png)} +.sansserif {font-family:Tahoma,sans-serif;font-size:12px;} +.commit {margin-bottom:20px;font-size:100%;font-weight:normal;} +.changes {list-style:none;margin:5px 0;padding:0 0 0 25px;font-size:0.8em;} +.date {margin:10px 0;color:blue;border-bottom:2px solid #00f;width:60%;padding:2px 0;font-size:1em;font-weight:bold;} +.author {padding-left:10px;margin:0;font-weight:bold;font-size:0.9em;} +.drop {cursor:pointer;border:1px solid #999;display:inline;font-size:0.9em;padding:1px 20px 1px 5px;line-height:16px;} +.hidden {display:none;} +.indrop {margin:2px 0 0 0;clear:both;background:#fff;border:1px solid #ddd;padding:5px 10px;} +.indrop p {margin:0;font-size:0.8em;line-height:16px;margin:1px 0;} +.indrop img {margin-right:5px;vertical-align:middle;} +.closed {background:url(chevron-expand.png) right center no-repeat;} +.open {background:url(chevron.png) right center no-repeat;} +.lic {font-size:9px;} diff --git a/html/changelog.html b/html/changelog.html index 1b0723494808..d7a0a41882b9 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -57,1294 +57,1385 @@ -->
-
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index b4c9cd4cb552..d08bea6e0eba 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -43173,3 +43173,510 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- mapping: Removes arrival shuttle from NVS Gax, people spawn in cryo now
cowbot92:
- rscdel: Removed Yellow Jacket Matriarchs from the gold slime pool
+2024-02-19:
+ SapphicOverload:
+ - bugfix: RCDs work on space tiles again
+ - bugfix: Fixed space lighting not working in space
+2024-02-20:
+ Chubbygummibear:
+ - bugfix: fix adminwho by skipping null clients in the admin list
+ cowbot92:
+ - bugfix: fixed beartraps not trapping
+ warface1234455:
+ - bugfix: cable coil maxstacks is now 40
+2024-02-21:
+ ' Identification':
+ - imageadd: Restores walls to true top-down.
+ ' sapphicoverload, syncit21, zxaber':
+ - rscadd: added a bunch more equipment for utility mechs
+ - soundadd: adds new sound effects for hydraulic clamp and APLU mech movement
+ - tweak: hydraulic clamp works as a wrench or crowbar and can pry powered doors
+ - tweak: mech plasma cutter can be used as a welder like the handheld version
+ - tweak: mech RCD works like an actual RCD now
+ - tweak: adds tgui RCD menu
+ - tweak: strafe button icon shows whether or not you're strafing
+ - tweak: APLU and Clarke mechs now have radiation shielding
+ - bugfix: fixed clarke movement not working correctly
+ - bugfix: fixes and re-adds multi-Z mech movement (no phasing through floors or
+ teleporting to other z-levels this time)
+ 13spacemen:
+ - tweak: The latejoin menu no longer has anemia.
+ AMyriad:
+ - bugfix: Fixed the eye of god expose cooldown going off when an invalid target
+ is selected
+ - spellcheck: Fixed mention of Weyland-Yutani appearing in the ripley mech repair
+ manual
+ - tweak: '"Hyperspace" no longer exists and never did, FTL travel is achieved by
+ tunneling through bluespace'
+ - bugfix: Players can no longer relabel gas canisters to a variant that's intended
+ for admins and breaks the 4th wall
+ Chubbygummibear:
+ - bugfix: index_out_of_bounds fixed on blend_cutoff_colors
+ - bugfix: turfs that smooth will spur their neighboring turfs to check their smoothing
+ again when late loaded in
+ - bugfix: cables on the correct plane so they don't have weird lattice lighting
+ filters
+ - bugfix: meteors with space lighting overlays rotate with the meteors instead of
+ being disjointed and unmoving
+ - bugfix: shuttle atmos shouldn't get left behind on takeoff
+ LazennG:
+ - bugfix: fixed seismic suplex animation and some text
+ adamsong:
+ - bugfix: fixed shuttle catastrophe
+ - bugfix: fixed admin shuttle manipulator
+ cowbot92:
+ - tweak: adjust some pop requirements for several antags
+ redmoogle:
+ - rscadd: PC Range Upgrade
+ - rscadd: PC Cooldown Upgrade
+ - bugfix: Vending machines not containing upgrades
+ - tweak: All plasma cutters can be upgraded
+ - tweak: Plasmacutters can be recharged with one click now
+ warface1234455:
+ - tweak: Partially revert undocumented change to shutter/blastdoor layer covering
+ window but still keep the blast door covering the door
+2024-02-23:
+ ' Cowbot92 & Chubbygummibear':
+ - bugfix: Fixes a bunch of stuff you step on
+ - rscadd: Added new traitor item, the gasharpoon
+ Chubbygummibear:
+ - rscadd: auto_profile config flag added to the private default and private server
+ config files
+ - tweak: private servers aren't dumpy unless you specifically request them to be
+ - tweak: main yog server will be extra dumpy because we can handle it
+ - bugfix: no more double clerk and chaplain workplace spawns
+ Moltijoe:
+ - imageadd: New ethereal bodyparts
+ - imagedel: Old ethereal bodyparts
+2024-02-24:
+ ' ktlwjec':
+ - imageadd: Lightens the outline for the bag of holding in-hand sprites.
+ 13spacemen:
+ - rscadd: Footprints are now based on what shoes you're wearing and what legs you
+ have
+ - bugfix: Fixed bloody item overlays leaking onto other objects
+ AMyriad:
+ - spellcheck: Fixed every description that didn't begin with a capital letter, make
+ a bug report if you find something I missed
+ - tweak: MMIs and positronic brains can no longer be printed from the medical techfab
+ Mqiib:
+ - tweak: The clarke is now tied for fastest mech in the game with the ripley mk-I
+ - tweak: Mech melee weapons now also hit vines properly when using cleave attacks
+ SapphicOverload:
+ - tweak: flamethrowers now react their fuel for damage and effects instead of using
+ pre-determined values
+ - tweak: flamethrower tanks release some of their contents when shot instead of
+ just deleting themselves
+ - tweak: flamethrowers can hit vines on windows
+ - bugfix: fixed flamethrowers sometimes using more fuel than intended
+ cowbot92:
+ - rscadd: ' Ports baton light up from TG'
+ warface1234455:
+ - tweak: HFR gas byproducts now uses scaled_production instead of fuel_consumption,
+ and now scaled alongside with gas produced from moderator, code refactor
+2024-02-25:
+ ' Cowbot92 & Chubbigummybear':
+ - bugfix: fixes most floor stuff you walk over not working
+ ' cark':
+ - rscadd: Added a new disease which turns you into a crab
+ AMyriad:
+ - mapping: Removed all old PDA cartridges from all lockers, vendors, and tables
+ on all stations excluding the clerk's gift vendor
+ - spellcheck: Revised the flavor text on old PDAs to reflect their status as outdated,
+ "antique" pieces of equipment
+ - mapping: Replaced the old ID console from the CE's office on icemeta with the
+ newer modular console
+ Marmio64:
+ - rscadd: Adds the Den of Sin, a jungleland casino run by a demon.
+ Moltijoe:
+ - bugfix: No more zombies in xenobio
+ - rscadd: Preternis eyes glow purple when nightvision is active
+ - tweak: Battle royale
+ - rscadd: Certain species bodyparts now glow in the dark
+ - rscadd: Adds S.E.L.F. ipcs and S.E.L.F. insurgents
+ - rscdel: Synths and Military synths
+ - rscdel: Syndicate bounties
+ - rscdel: Lights no longer start off except for empty departments
+ - tweak: adds a cooldown to light flickering from explosions/etc
+ - bugfix: Skittish now works properly for crates
+ SapphicOverload:
+ - rscadd: Added a unit test for fusion reactions
+ - bugfix: Fixed fusion reactions not working in the atmospherics simulator computer
+ - bugfix: Fixed hydraulic clamp not being able to pick up lockers or deconstruct
+ tables
+ - tweak: Ripley MK-II and Firefighter have been merged into the same mech
+ Yarinoi:
+ - imageadd: added new chaplain hat icons
+ - imagedel: 'removed old chaplain hat icons :exploding_head:'
+ warface1234455:
+ - tweak: Raise the HFR's healium healing threshold from 66.66% to 90%.
+ - bugfix: Fix apc building and unnable to change electric armor value from VV
+ - rscadd: Add pluoxium + antinoblium gas recipe to HFR
+ - bugfix: fix tier 2 moderator pluonium production output on tgui
+2024-02-26:
+ Moltijoe:
+ - bugfix: Traitors can no longer roll whiteship or freeminer machines for the destroy
+ objective
+ Mqiib:
+ - bugfix: Undoes accidental revert pertaining to bloody footprints
+ cowbot92:
+ - rscdel: Removed mindreading
+ - tweak: tweaked cerebral neuroplasticity gene
+ redmoogle:
+ - tweak: Examining cutter mods shows you cost and stackability
+2024-02-27:
+ ' axietheaxolotl':
+ - rscadd: Added pride pins
+ 13spacemen:
+ - bugfix: Humans have shoe footprints again
+ Moltijoe:
+ - bugfix: Fixes being unable to place items in closets or crates
+ - bugfix: Miners and mining medics now properly cause the mining base to start with
+ the lights on
+ - bugfix: Fixes bugs with blood type compatibility
+ - bugfix: venus human trap bulb vines properly get destroyed when the bulb is
+ - bugfix: fixes a bug where emissive bodyparts showed as white in the character
+ menu
+ Mqiib:
+ - rscadd: Adds the new Black Mamba for nuclear operatives to play with
+ - rscadd: Adds two new venom-related weapons for the Mamba
+ SapphicOverload:
+ - bugfix: Fixed clothes that don't cover your hands protecting your hands from electric
+ shock
+ adamsong:
+ - bugfix: fixed info command showing numerical security levels
+2024-02-28:
+ 13spacemen:
+ - rscadd: Mimes get their own special survival boxes
+ - bugfix: Plasmaman clowns will properly get their plasma tank in their hugbox
+2024-02-29:
+ ' ktlwjec':
+ - tweak: Meatballs in ingredient boxes start off raw.
+ AMyriad:
+ - mapping: Added a second button to the kitchen on Box to toggle counter shutters
+ - mapping: The privacy shutters in the kitchen on Box are now toggled with the bottom
+ (already existing) button
+ - mapping: Removed the third blender from the kitchen on Box
+ - mapping: Fixed every fire alarm that was facing the wrong direction on Box
+ - mapping: Fixed a mountain of decals using the wrong colors on every map
+ - mapping: Asteroid maint doors now have clear hazard stripes instead of nearly
+ invisible brown ones
+ - mapping: Changed a few bridge decals to look better on every map
+ - mapping: Gax telecomms is now color coded, now has nice engie decals in the net
+ admin's office
+ Moltijoe:
+ - tweak: New sandevistan visual effect
+ - tweak: Weedkiller does 2x damage to venus human traps than before
+ - tweak: Venus human traps can no longer pull
+ - tweak: venus human traps now require a pressurized environment
+ - bugfix: Fixes surgical toolset arm implant visuals
+ - bugfix: Fixes being unable to select a clan as bloodsucker
+ - tweak: Preternis eyes now also care about if a species is powerhungry instead
+ of only robotic
+ - tweak: Preternis eyes night vision now consumes power from powerhungry species
+ - tweak: Preternis eyes only take damage in non powerhungry species when nightvision
+ is turned on
+ - bugfix: Powered ruins properly start with lights on if they have a lightswitch
+ - rscadd: Wizards can now cast iron
+ - rscadd: Lets hecata necromancy poll ghosts into mindless corpses
+ - rscadd: Lets admins force a specific bloodsucker clan on people
+ Mqiib:
+ - bugfix: Light step now stops your shoes from getting dirty again
+ SapphicOverload:
+ - bugfix: Goliath hide plates can be attached to APLU mechs again
+ ToasterBiome:
+ - bugfix: quirks won't delete themselves from your characters if you load in fast
+ anymore
+ cowbot92:
+ - rscadd: 'Added new smite: wibblify'
+ warface1234455:
+ - tweak: You can now go through atmos resin with slowdown.
+ - tweak: Changed resin description
+ wonderinghost:
+ - tweak: updates max byond version to .1640
+2024-03-01:
+ AMyriad:
+ - mapping: Patients can now exit from both left and right doors on Box medbay
+ MajManatee:
+ - rscadd: New hugboxed donk-soft vendor for roundstart. Cant load riot darts.
+2024-03-02:
+ AMyriad:
+ - mapping: Adjusted decals and added some spooky flooring to the curator's backroom
+ in the library on Box
+ - mapping: Fixed a misplaced decal
+2024-03-03:
+ JamieD1:
+ - rscadd: Added new Title Screens from 2024 Contest
+ Moltijoe:
+ - bugfix: Properly updates special eye colour upon insert and removal
+2024-03-04:
+ ' cark':
+ - mapping: fixes an issue where psychiatrist on donut didnt have a spawnpoint
+ SapphicOverload:
+ - tweak: walls are now destructible
+ Scrambledeggs00:
+ - bugfix: Fixes book modification
+ - spellcheck: Changes the wording of some book modification prompts
+2024-03-05:
+ 13spacemen:
+ - tweak: Human unarmed attack visual effects are based on species instead of the
+ attack verb text
+ N3D6:
+ - mapping: adds an extra smes unit to donut engi, adds light switches and extra
+ closets to donut engi
+2024-03-06:
+ 13spacemen:
+ - tweak: Chat no longer complains if you have unbound keys
+2024-03-07:
+ warface1234455:
+ - tweak: Blob now generate research points if inside a containment field
+ - tweak: Shuttle will leave when blob is contained inside a containment field
+ - tweak: Supermatter blob delam now create blob without ghost poll (you can still
+ click the blob camera to enter the blob if ur not banned or the blob is not
+ occupied by another ghost)
+2024-03-08:
+ ' Identification':
+ - imageadd: Adds a sprite for ColtonOps, you will know it when you see it.
+ 13spacemen:
+ - rscadd: Moths, Phytosians, Abductors, Plasmamen, IPCs, Jelly/Slimepeople, Felinids,
+ Polysmorph, all have their own butt sprites
+ JamieD1:
+ - tweak: Changes Hub Text
+ LazennG:
+ - bugfix: added proximity check to suplex
+ - tweak: seismic arm suplex bonus damage vs charging bubblegum
+ Moltijoe:
+ - bugfix: Fixes a runtime that allows infinite duping of possessed sword nullrods
+ - rscadd: Adds new wizard spell, scrunch
+ - bugfix: Fixes a bug where mood wasn't properly forced for everyone
+ Runian:
+ - rscadd: Only obtainable via a camera laser upgrade disk (or by being a traitor),
+ the AI can get an ability based around lasers and their cameras.
+ - rscadd: This new AI ability lets them enter a burst mode which lets them shoot
+ a laser from any functioning camera every second. It lasts for 30 seconds and
+ be re-activated every 60 seconds. Cameras used in this matter are hit with a
+ heavy EMP.
+ - bugfix: Hitting an AI control console with an upgrade no longer runtimes.
+ - spellcheck: Logging regarding upgrading the AI with disks has better formatting.
+ SapphicOverload:
+ - tweak: Liquid plasma tiles cool down gas in radiator loops instead of heating
+ them
+ Scrambledeggs00:
+ - rscadd: Adds the flagellant's chains to chaplain's armament beacon
+ - imageadd: Adds sprites for the flagellant's chains
+ Therandomhoboo:
+ - bugfix: Drunken Resilience back into the fray
+ - rscadd: Drunk Level 81 & Drunk Level 101 giving heals
+ - tweak: Drunk Resilience no longer is culmative healing
+ warface1234455:
+ - tweak: Healium now heals oxy damage
+2024-03-10:
+ N3D6:
+ - mapping: cleans up some decals on meta
+ - mapping: makes teg console recognize injector and replaces the scrubber with a
+ vent pump
+ - mapping: replaces airlock controllers on meta teg with lavaland airlock controllers,
+ should fix taking pressure damage
+2024-03-11:
+ LoliconSlayer:
+ - tweak: tweaked the elder atmosian statue's description
+2024-03-12:
+ ' Am37000 & Molti':
+ - rscadd: Added new hawaiian themed items
+ - imageadd: addedsprites for hawaiian themed items
+ ' ktlwjec':
+ - bugfix: The pin for the pocket fire extinguisher in-hand sprites are correct.
+ AMyriad:
+ - bugfix: Fixed being able to enter centcom via disposals
+ - tweak: Skin twister health reduced from 320 -> 285
+ Chubbygummibear:
+ - bugfix: Box Chapel tiles had no plating under them so crow barring them would
+ send you straight to god
+ - bugfix: Broken grille sprites back. They just wanted to grille for Pete's sake
+ - tweak: Organized the spaghetti layering of atmos pipes, disposal pipes, and cables.
+ Mqiib:
+ - tweak: Lizards, polysmorphs, and skeletons now actually make claw noises like
+ everyone always said they did. This also indirectly makes them louder.
+ cowbot92:
+ - rscadd: Added Sec Plasmaman stuff to the SecDrobe
+2024-03-13:
+ AMyriad:
+ - rscadd: CentCom inspectors and clown ops now have their own PDA presets
+ - tweak: CentCom inspectors, contractor supports, chameleon kits, etc. no longer
+ spawn with old PDAs - now have modern ones
+ - spellcheck: Changed nukie PDA flavor text
+ - imageadd: Button frames now have a proper sprite
+ Moltijoe:
+ - tweak: Reduces the chance for rare and joke title screens
+ N3D6:
+ - tweak: rcd ore silo upgrade research price 2500 from 25000
+ ToasterBiome:
+ - bugfix: jaunters activate automatically in non-belt slots again
+ - bugfix: bad mail wont stop shuttle anymore
+2024-03-14:
+ Chubbygummibear:
+ - bugfix: simple mobs call update_appearance on death which will update overlays
+ applied to them
+ Moltijoe:
+ - bugfix: Makes the night vision quirk work again
+ - tweak: Joe the goliath no longer resists being pulled
+ N3D6:
+ - tweak: tweaks meta engine weights to 45/30/25 sm, reactor, teg
+ SapphicOverload:
+ - bugfix: Crew monitoring and tracking works in multi-z
+ - bugfix: Radio messages work across connected z-levels
+ YashinHak:
+ - rscadd: moar pins mostly meme ones but also the gay one
+ - tweak: pins are now smaller
+ - imageadd: new pin icons (obj + mob)
+ - imagedel: old pin obj icons
+2024-03-15:
+ SapphicOverload:
+ - bugfix: fixed chasms killing you if there's an available z-level below
+ ToasterBiome:
+ - bugfix: job occupations won't delete themselves and you won't be put into random
+ jobs if you haven't loaded your character
+ - bugfix: mining points card says the correct description
+ - bugfix: scars check for the correct body part flag instead of the body part itself
+ cowbot92:
+ - tweak: adjusts the minor filter
+2024-03-16:
+ ' cark':
+ - mapping: fixes a couple mapping errors on box
+ AMyriad:
+ - bugfix: Fixed NanoMed using the wrong sprite
+ - imagedel: Deleted TG's ChemVend and NanoMed sprites after being left over from
+ another PR
+ Moltijoe:
+ - tweak: Tweak mining medic jackets to have comparable armour to an unupgraded explorer
+ suit
+ - bugfix: Fixes a bug where maroon organ objective wouldn't mulligan properly
+ - bugfix: fixes mining medic jumpsuit from having 5 less wound armour than every
+ other basic jumpsuit
+ - bugfix: brig phys now spawns with the brig phys jumpsuit rather than the mining
+ medic one
+ - tweak: gives mining medic jumpsuit the same armour as miner's jumpsuit
+ - tweak: Gives a 30% chance for traitors to get another objective instead of being
+ told to escape
+ - bugfix: Fixes a couple issues with hawaiian stuff
+ - tweak: Reworks the cursed ice hiking boots
+ - tweak: Tweaks mood to have significantly less negatives and REALLY minor positives
+ - experiment: This is experimental
+ - bugfix: Fixes a bug with the dryad crusher trophy
+ N3D6:
+ - mapping: adds a missing decal to icemeta
+ ToasterBiome:
+ - rscadd: Adds a new NVS Gax poster
+ cark:
+ - mapping: adds colton statue to the CC testing chamber
+ tattax:
+ - rscadd: admins can change colors on a specific item if it uses the GAGS system
+ - rscadd: you can now use right click -> toggle flashlight to toggle PDA flashlight
+ - imageadd: changed some sprites to use GAGS
+2024-03-17:
+ Chubbygummibear:
+ - bugfix: casino slot machines visible again
+ - rscadd: You can "Bash" on windows by harm intent clicking them with an open hand
+ for a louder audio queue.
+ - bugfix: Paperframe window sprites were invisible
+ - soundadd: glassbash.ogg from TG
+ Moltijoe:
+ - bugfix: Maybe fixes a bug with disposal pipes qdeleting people
+ warface1234455:
+ - bugfix: fix decal being transparent when applied with decal painter
+2024-03-18:
+ AMyriad:
+ - bugfix: Fixed invincible carpets looking like a black void (see goat king's arena)
+ - bugfix: Fixed cog grilles looking like smiling tables
+ - bugfix: Fixed cargo shuttle blast doors not opening properly
+ - bugfix: Fixed regenerative cerulean's second extract getting a null description
+ Aquizit:
+ - mapping: Adjusts and adds vents and scrubbers in Atmos Pumping Room
+ Chubbygummibear:
+ - rscdel: Ai-detecting multi-tool cannot show you blind spots anymore due to the
+ rendering rework. Rip to a real one
+ - bugfix: Ai cam location is visible to ghosts again and other entities that should
+ be able to see it
+ Yarinoi:
+ - tweak: hulk no longer screams over radio
+ enkidienne:
+ - rscadd: added lava fishing.
+ tattax:
+ - bugfix: prison jumpsuit shows up again
+2024-03-19:
+ ' cark':
+ - mapping: fixes some issues on donut
+2024-03-20:
+ AMyriad:
+ - bugfix: Fixed meatspike frames not checking if they're anchored or not when finishing
+ - bugfix: Fixed bamboo walls and floors looking like a black void
+ - bugfix: Fixed the pirate data siphon going invisible when activated
+ - bugfix: Fixed nuke op's telecomms machine being invisible
+ - mapping: Fixed two xeno spawn locations being in public areas
+ Aquizit:
+ - bugfix: Gave armory cameras on box and gax c_tags
+2024-03-21:
+ tattax:
+ - bugfix: fixed missing sprite on booth circuitboard
+ - imageadd: reduced saturation on med and engie circuitobards
+ - bugfix: fixed wirecutter blood sprites
+ - bugfix: fixed some messed up screwdriver and wirecutter sprites
+2024-03-22:
+ AMyriad:
+ - bugfix: Fixed a lot of engineering doors having incorrect access requirements
+ - tweak: Curators may now only go as far as where the protolathe is in engineering
+ - mapping: The Tar King's arena has been completely redesigned! Go check it out
+ Cartlord:
+ - rscadd: The Service Hall now has its own access type, which Heads of personnel
+ can add or remove as they see fit.
+ - rscadd: Artists now have Service Hall access.
+ - mapping: Hydroponics on IceMeta can no longer be accessed by Chefs without skeleton
+ crew being active.
+2024-03-23:
+ AMyriad:
+ - bugfix: Fixed PDA screens being one pixel more to the left than they should be
+ - bugfix: Fixed water cookies tasting like /datum/reagent/water and metallic cookies
+ tasting like /datum/reagent/copper
+ - bugfix: Fixed cherry bulbs disappearing when ready to harvest
+ ToasterBiome:
+ - bugfix: Cargo shuttle call displays the correct time
+ - rscadd: sound now travels through z levels if they are onnected
+ - bugfix: quirks should finally stop resetting for real, along with your jobs since
+ your character is loaded properly.
+2024-03-24:
+ Moltijoe:
+ - bugfix: Fixes laptop screen overlays appearing while the laptop is closed
+ - tweak: adds a 20 pop req to sleeping carp (doesn't require readied up like gamemodes
+ do)
+ SapphicOverload:
+ - rscadd: some weapons can now swing in an arc when using harm intent
+ tattax:
+ - bugfix: fixed canisters not laying on their side and showing the correct side
+ when broken
+ - bugfix: fixed error on toolbelt sprite
+2024-03-25:
+ Moltijoe:
+ - tweak: Traitor Vampire gamemode can now roll during lowpop
+ - tweak: Traitor Vampire now spawns less traitors to make up for the vampires it
+ spawns
+ - bugfix: Fixes a typo in coffepack code that made them function like regular boxes
+ redmoogle:
+ - tweak: Mice have darkvision again
+ - tweak: Lipid extractor can no longer extract robots
+ - bugfix: Smart mines work again
+ - bugfix: Hilberts hotel works again
+ - mapping: Mapping Icon!
+ - bugfix: Shocked vending machines no longer spark when you walk away
+ - bugfix: You can no longer take RDS as a robotic species
+2024-03-27:
+ AMyriad:
+ - mapping: Fixed an issue where prisoners/warden couldn't access the top fridge
+ in perma on Asteroid
+ - mapping: Fixed two misplaced firelocks in Box service maintenance
+ Moltijoe:
+ - bugfix: Fixes a bug where the break machinery objective wouldn't complete until
+ deleted objects went through garbage collection
+ redmoogle:
+ - bugfix: Mice cheese powers last more than 1 nanosecond
+ - tweak: Filing cabinets can accept tape now
+ - bugfix: Chasms no longer cause wounds
diff --git a/html/mapping.png b/html/mapping.png
new file mode 100644
index 000000000000..72e835d36b9e
Binary files /dev/null and b/html/mapping.png differ
diff --git a/icons/ass/assalien.png b/icons/ass/assalien.png
deleted file mode 100644
index d7586f3b5ffd..000000000000
Binary files a/icons/ass/assalien.png and /dev/null differ
diff --git a/icons/ass/asscat.png b/icons/ass/asscat.png
deleted file mode 100644
index e37788e3dd73..000000000000
Binary files a/icons/ass/asscat.png and /dev/null differ
diff --git a/icons/ass/assdrone.png b/icons/ass/assdrone.png
deleted file mode 100644
index 748d207ff932..000000000000
Binary files a/icons/ass/assdrone.png and /dev/null differ
diff --git a/icons/ass/assfemale.png b/icons/ass/assfemale.png
deleted file mode 100644
index 4c941a9281d7..000000000000
Binary files a/icons/ass/assfemale.png and /dev/null differ
diff --git a/icons/ass/assmale.png b/icons/ass/assmale.png
deleted file mode 100644
index c6091cf19154..000000000000
Binary files a/icons/ass/assmale.png and /dev/null differ
diff --git a/icons/effects/64x64.dmi b/icons/effects/64x64.dmi
index fc3e1ff515c5..eb36ab84fd1e 100644
Binary files a/icons/effects/64x64.dmi and b/icons/effects/64x64.dmi differ
diff --git a/icons/effects/96x96.dmi b/icons/effects/96x96.dmi
index d7e81d7c86c2..8e4bd9e87d9a 100644
Binary files a/icons/effects/96x96.dmi and b/icons/effects/96x96.dmi differ
diff --git a/icons/effects/beam.dmi b/icons/effects/beam.dmi
index fbe6182716b7..9f06f421b549 100644
Binary files a/icons/effects/beam.dmi and b/icons/effects/beam.dmi differ
diff --git a/icons/effects/blood.dmi b/icons/effects/blood.dmi
index 432ef8861cfb..483ab0444233 100644
Binary files a/icons/effects/blood.dmi and b/icons/effects/blood.dmi differ
diff --git a/icons/effects/footprints.dmi b/icons/effects/footprints.dmi
index a98344abe41e..29fdbe8eb0dd 100644
Binary files a/icons/effects/footprints.dmi and b/icons/effects/footprints.dmi differ
diff --git a/icons/materials/composite.dmi b/icons/materials/composite.dmi
new file mode 100644
index 000000000000..7bb2d4717887
Binary files /dev/null and b/icons/materials/composite.dmi differ
diff --git a/icons/mecha/mecha.dmi b/icons/mecha/mecha.dmi
index 61d03cedaf79..b282e003376b 100644
Binary files a/icons/mecha/mecha.dmi and b/icons/mecha/mecha.dmi differ
diff --git a/icons/mecha/mecha_ammo.dmi b/icons/mecha/mecha_ammo.dmi
index 21e788225770..4257ee664e43 100644
Binary files a/icons/mecha/mecha_ammo.dmi and b/icons/mecha/mecha_ammo.dmi differ
diff --git a/icons/mecha/mecha_equipment.dmi b/icons/mecha/mecha_equipment.dmi
index e64729a33764..da6934255d3b 100644
Binary files a/icons/mecha/mecha_equipment.dmi and b/icons/mecha/mecha_equipment.dmi differ
diff --git a/icons/mob/actions/actions_arm.dmi b/icons/mob/actions/actions_arm.dmi
index 71bb415e8ad9..2154e742819e 100644
Binary files a/icons/mob/actions/actions_arm.dmi and b/icons/mob/actions/actions_arm.dmi differ
diff --git a/icons/mob/actions/actions_items.dmi b/icons/mob/actions/actions_items.dmi
index 380c03b64db3..efa30d1a998f 100644
Binary files a/icons/mob/actions/actions_items.dmi and b/icons/mob/actions/actions_items.dmi differ
diff --git a/icons/mob/actions/actions_mecha.dmi b/icons/mob/actions/actions_mecha.dmi
index 81c706b22c8a..78a2ba5ec89a 100644
Binary files a/icons/mob/actions/actions_mecha.dmi and b/icons/mob/actions/actions_mecha.dmi differ
diff --git a/icons/mob/broadMobs.dmi b/icons/mob/broadMobs.dmi
index a02cc7b40eba..fbd0b3dc0eba 100644
Binary files a/icons/mob/broadMobs.dmi and b/icons/mob/broadMobs.dmi differ
diff --git a/icons/mob/butts.dmi b/icons/mob/butts.dmi
new file mode 100644
index 000000000000..ae4b41961a1c
Binary files /dev/null and b/icons/mob/butts.dmi differ
diff --git a/icons/mob/carp.dmi b/icons/mob/carp.dmi
index 5b6138ee99a4..e06d43632dbc 100644
Binary files a/icons/mob/carp.dmi and b/icons/mob/carp.dmi differ
diff --git a/icons/mob/clothing/accessories.dmi b/icons/mob/clothing/accessories.dmi
index 03d7097a5665..9341c981bc02 100644
Binary files a/icons/mob/clothing/accessories.dmi and b/icons/mob/clothing/accessories.dmi differ
diff --git a/icons/mob/clothing/feet/feet.dmi b/icons/mob/clothing/feet/feet.dmi
index 419bf0662a6a..b6a4e7dc80fd 100644
Binary files a/icons/mob/clothing/feet/feet.dmi and b/icons/mob/clothing/feet/feet.dmi differ
diff --git a/icons/mob/clothing/hands/hands.dmi b/icons/mob/clothing/hands/hands.dmi
index 57bef8c67fff..e07cfff4b117 100644
Binary files a/icons/mob/clothing/hands/hands.dmi and b/icons/mob/clothing/hands/hands.dmi differ
diff --git a/icons/mob/clothing/head/head.dmi b/icons/mob/clothing/head/head.dmi
index a43e34bcaaa5..fb64585b16e2 100644
Binary files a/icons/mob/clothing/head/head.dmi and b/icons/mob/clothing/head/head.dmi differ
diff --git a/icons/mob/clothing/suit/suit.dmi b/icons/mob/clothing/suit/suit.dmi
index ac8c422c19db..184d25b111b4 100644
Binary files a/icons/mob/clothing/suit/suit.dmi and b/icons/mob/clothing/suit/suit.dmi differ
diff --git a/icons/mob/clothing/uniform/color.dmi b/icons/mob/clothing/uniform/color.dmi
new file mode 100644
index 000000000000..9b06725cbba7
Binary files /dev/null and b/icons/mob/clothing/uniform/color.dmi differ
diff --git a/icons/mob/clothing/uniform/digitigrade.dmi b/icons/mob/clothing/uniform/digitigrade.dmi
new file mode 100644
index 000000000000..262a3a6ef5b9
Binary files /dev/null and b/icons/mob/clothing/uniform/digitigrade.dmi differ
diff --git a/icons/mob/clothing/uniform/uniform.dmi b/icons/mob/clothing/uniform/uniform.dmi
index 9fa35b94b8f3..519caf8bab22 100644
Binary files a/icons/mob/clothing/uniform/uniform.dmi and b/icons/mob/clothing/uniform/uniform.dmi differ
diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi
index 6f626fe09f85..3731e47bd1c8 100644
Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ
diff --git a/icons/mob/human_parts_greyscale.dmi b/icons/mob/human_parts_greyscale.dmi
index 004bf8ad9902..a7e311e3a225 100644
Binary files a/icons/mob/human_parts_greyscale.dmi and b/icons/mob/human_parts_greyscale.dmi differ
diff --git a/icons/mob/inhands/clothing/shoes_lefthand.dmi b/icons/mob/inhands/clothing/shoes_lefthand.dmi
new file mode 100644
index 000000000000..a5fd6d3318cf
Binary files /dev/null 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
new file mode 100644
index 000000000000..8f5a3c374ca0
Binary files /dev/null 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
new file mode 100644
index 000000000000..fa5710999c01
Binary files /dev/null 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
new file mode 100644
index 000000000000..125bd7d31880
Binary files /dev/null and b/icons/mob/inhands/clothing/suits_righthand.dmi differ
diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi
index 1ebfa63e995f..dc91db1cee3a 100644
Binary files a/icons/mob/inhands/clothing_lefthand.dmi and b/icons/mob/inhands/clothing_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi
index f68dba6e9fb7..907f4139ca43 100644
Binary files a/icons/mob/inhands/clothing_righthand.dmi and b/icons/mob/inhands/clothing_righthand.dmi differ
diff --git a/icons/mob/inhands/equipment/backpack_lefthand.dmi b/icons/mob/inhands/equipment/backpack_lefthand.dmi
index 15425dabca14..0183ae173468 100644
Binary files a/icons/mob/inhands/equipment/backpack_lefthand.dmi and b/icons/mob/inhands/equipment/backpack_lefthand.dmi differ
diff --git a/icons/mob/inhands/equipment/backpack_righthand.dmi b/icons/mob/inhands/equipment/backpack_righthand.dmi
index c51285f0867f..94b50fbb8d63 100644
Binary files a/icons/mob/inhands/equipment/backpack_righthand.dmi and b/icons/mob/inhands/equipment/backpack_righthand.dmi differ
diff --git a/icons/mob/inhands/equipment/tools_lefthand.dmi b/icons/mob/inhands/equipment/tools_lefthand.dmi
index 9ad00aa5bd76..c712bd6c6fd8 100644
Binary files a/icons/mob/inhands/equipment/tools_lefthand.dmi and b/icons/mob/inhands/equipment/tools_lefthand.dmi differ
diff --git a/icons/mob/inhands/equipment/tools_righthand.dmi b/icons/mob/inhands/equipment/tools_righthand.dmi
index 9dc0437d76cf..d8e2ff8680a8 100644
Binary files a/icons/mob/inhands/equipment/tools_righthand.dmi and b/icons/mob/inhands/equipment/tools_righthand.dmi differ
diff --git a/icons/mob/inhands/weapons/melee_lefthand.dmi b/icons/mob/inhands/weapons/melee_lefthand.dmi
index 63624745e62c..dd0e7cfc86b0 100644
Binary files a/icons/mob/inhands/weapons/melee_lefthand.dmi and b/icons/mob/inhands/weapons/melee_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/melee_righthand.dmi b/icons/mob/inhands/weapons/melee_righthand.dmi
index d50eb8ccea9d..6b66977d77a0 100644
Binary files a/icons/mob/inhands/weapons/melee_righthand.dmi and b/icons/mob/inhands/weapons/melee_righthand.dmi differ
diff --git a/icons/mob/large-worn-icons/64x64/feet.dmi b/icons/mob/large-worn-icons/64x64/feet.dmi
new file mode 100644
index 000000000000..a61eac554937
Binary files /dev/null and b/icons/mob/large-worn-icons/64x64/feet.dmi differ
diff --git a/icons/mob/mob.dmi b/icons/mob/mob.dmi
index f6bf7d3f1319..6b6e9542fb9e 100644
Binary files a/icons/mob/mob.dmi and b/icons/mob/mob.dmi differ
diff --git a/icons/mob/radial.dmi b/icons/mob/radial.dmi
index 533e11521d65..9006b42b0700 100644
Binary files a/icons/mob/radial.dmi and b/icons/mob/radial.dmi differ
diff --git a/icons/mob/robots.dmi b/icons/mob/robots.dmi
index 151d24c214c0..7f5803efd00c 100644
Binary files a/icons/mob/robots.dmi and b/icons/mob/robots.dmi differ
diff --git a/icons/obj/3x3.dmi b/icons/obj/3x3.dmi
index 07a0213aa937..ee6e36bca0b8 100644
Binary files a/icons/obj/3x3.dmi and b/icons/obj/3x3.dmi differ
diff --git a/icons/obj/abductor.dmi b/icons/obj/abductor.dmi
index e227028cb686..4eff54131ec2 100644
Binary files a/icons/obj/abductor.dmi and b/icons/obj/abductor.dmi differ
diff --git a/icons/obj/atmospherics/canister.dmi b/icons/obj/atmospherics/canister.dmi
deleted file mode 100644
index 761370ee112f..000000000000
Binary files a/icons/obj/atmospherics/canister.dmi and /dev/null differ
diff --git a/icons/obj/atmospherics/canisters.dmi b/icons/obj/atmospherics/canisters.dmi
new file mode 100644
index 000000000000..9e18e78b5875
Binary files /dev/null and b/icons/obj/atmospherics/canisters.dmi differ
diff --git a/icons/obj/atmospherics/prototype_canister.dmi b/icons/obj/atmospherics/prototype_canister.dmi
new file mode 100644
index 000000000000..fb73aa2ed6d2
Binary files /dev/null and b/icons/obj/atmospherics/prototype_canister.dmi differ
diff --git a/icons/obj/atmospherics/stationary_canisters.dmi b/icons/obj/atmospherics/stationary_canisters.dmi
new file mode 100644
index 000000000000..4f87a50845b0
Binary files /dev/null and b/icons/obj/atmospherics/stationary_canisters.dmi differ
diff --git a/icons/obj/clothing/accessories.dmi b/icons/obj/clothing/accessories.dmi
index 0f588ad01b4c..e6bb2b724a45 100644
Binary files a/icons/obj/clothing/accessories.dmi and b/icons/obj/clothing/accessories.dmi differ
diff --git a/icons/obj/clothing/belt_overlays.dmi b/icons/obj/clothing/belt_overlays.dmi
index 9ecdbf6f3511..ae0fd1f8a7c0 100644
Binary files a/icons/obj/clothing/belt_overlays.dmi and b/icons/obj/clothing/belt_overlays.dmi differ
diff --git a/icons/obj/clothing/hats/hats.dmi b/icons/obj/clothing/hats/hats.dmi
index 38329a78dc60..8c15a42aef03 100644
Binary files a/icons/obj/clothing/hats/hats.dmi and b/icons/obj/clothing/hats/hats.dmi differ
diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi
index cc8fb14c949d..2d1ab1d4076a 100644
Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ
diff --git a/icons/obj/clothing/sombrero.dmi b/icons/obj/clothing/sombrero.dmi
new file mode 100644
index 000000000000..b072bf65d46c
Binary files /dev/null and b/icons/obj/clothing/sombrero.dmi differ
diff --git a/icons/obj/clothing/suits/suits.dmi b/icons/obj/clothing/suits/suits.dmi
index 9e3b9be7ff5a..44742549c464 100644
Binary files a/icons/obj/clothing/suits/suits.dmi and b/icons/obj/clothing/suits/suits.dmi differ
diff --git a/icons/obj/clothing/under/color.dmi b/icons/obj/clothing/under/color.dmi
new file mode 100644
index 000000000000..7fac6b2cd8c2
Binary files /dev/null and b/icons/obj/clothing/under/color.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index 7b37fce3408f..fd57bf712485 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ
diff --git a/icons/obj/contraband.dmi b/icons/obj/contraband.dmi
index f58c661468a4..36e120bfac75 100644
Binary files a/icons/obj/contraband.dmi and b/icons/obj/contraband.dmi differ
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index bb0f060df263..2e4f8c092751 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ
diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi
index 8af620b9d4b5..310033272db2 100644
Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ
diff --git a/icons/obj/food/soupsalad.dmi b/icons/obj/food/soupsalad.dmi
index ea88c770277c..fff6d0578aa7 100644
Binary files a/icons/obj/food/soupsalad.dmi and b/icons/obj/food/soupsalad.dmi differ
diff --git a/icons/obj/frame.dmi b/icons/obj/frame.dmi
index 4f61df487064..6b9f614d8105 100644
Binary files a/icons/obj/frame.dmi and b/icons/obj/frame.dmi differ
diff --git a/icons/obj/guns/magic.dmi b/icons/obj/guns/magic.dmi
index 94bb606cbfc5..7ae2646ec3b8 100644
Binary files a/icons/obj/guns/magic.dmi and b/icons/obj/guns/magic.dmi differ
diff --git a/icons/obj/hydroponics/growing_fruits.dmi b/icons/obj/hydroponics/growing_fruits.dmi
index 58802d672cb5..8a0fc079d28d 100644
Binary files a/icons/obj/hydroponics/growing_fruits.dmi and b/icons/obj/hydroponics/growing_fruits.dmi differ
diff --git a/icons/obj/hydroponics/harvest.dmi b/icons/obj/hydroponics/harvest.dmi
index 106e8724a364..e6b8c3031218 100644
Binary files a/icons/obj/hydroponics/harvest.dmi and b/icons/obj/hydroponics/harvest.dmi differ
diff --git a/icons/obj/hydroponics/seeds.dmi b/icons/obj/hydroponics/seeds.dmi
index f707bb375d0e..74511acb53ea 100644
Binary files a/icons/obj/hydroponics/seeds.dmi and b/icons/obj/hydroponics/seeds.dmi differ
diff --git a/icons/obj/improvised.dmi b/icons/obj/improvised.dmi
index 34e0c33a56b8..a86e0adc3e25 100644
Binary files a/icons/obj/improvised.dmi and b/icons/obj/improvised.dmi differ
diff --git a/icons/obj/lavaland/artefacts.dmi b/icons/obj/lavaland/artefacts.dmi
index 494c964d48f2..00d590b2ac43 100644
Binary files a/icons/obj/lavaland/artefacts.dmi and b/icons/obj/lavaland/artefacts.dmi differ
diff --git a/icons/obj/machines/lithography.dmi b/icons/obj/machines/lithography.dmi
new file mode 100644
index 000000000000..bdc433b0cb98
Binary files /dev/null and b/icons/obj/machines/lithography.dmi differ
diff --git a/icons/obj/machines/telecomms.dmi b/icons/obj/machines/telecomms.dmi
index f102d1f285fd..c6351744438a 100644
Binary files a/icons/obj/machines/telecomms.dmi and b/icons/obj/machines/telecomms.dmi differ
diff --git a/icons/obj/modular_pda.dmi b/icons/obj/modular_pda.dmi
index 868a5bf6e666..7ae61a241bbd 100644
Binary files a/icons/obj/modular_pda.dmi and b/icons/obj/modular_pda.dmi differ
diff --git a/icons/obj/module.dmi b/icons/obj/module.dmi
index 80fcbe6c6184..0f546d2f09c6 100644
Binary files a/icons/obj/module.dmi and b/icons/obj/module.dmi differ
diff --git a/icons/obj/networking_machine.dmi b/icons/obj/networking_machine.dmi
new file mode 100644
index 000000000000..e803d1d15aba
Binary files /dev/null and b/icons/obj/networking_machine.dmi differ
diff --git a/icons/obj/pda.dmi b/icons/obj/pda.dmi
index 6d12af0bd357..605f4e3d5dfe 100644
Binary files a/icons/obj/pda.dmi and b/icons/obj/pda.dmi differ
diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi
index 505e934fb411..60e091811ace 100644
Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index bd97442a1b4f..f050f11da77a 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/icons/obj/tiles.dmi b/icons/obj/tiles.dmi
index 12c051c0d837..16ca47c2aeb5 100644
Binary files a/icons/obj/tiles.dmi and b/icons/obj/tiles.dmi differ
diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi
index e772caff0077..6e80f9d97e95 100644
Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ
diff --git a/icons/obj/traitor.dmi b/icons/obj/traitor.dmi
index 92851f3708cd..4d7a4931bcaf 100644
Binary files a/icons/obj/traitor.dmi and b/icons/obj/traitor.dmi differ
diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi
index a5db6caa6e2b..68ee93459785 100644
Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ
diff --git a/icons/turf/walls/false_walls.dmi b/icons/turf/walls/false_walls.dmi
index 1b02b4bdbe6d..a64fbe06fa5b 100644
Binary files a/icons/turf/walls/false_walls.dmi and b/icons/turf/walls/false_walls.dmi differ
diff --git a/icons/turf/walls/material_wall.dmi b/icons/turf/walls/material_wall.dmi
index 2bd844c0b135..d4c48e66f6ea 100644
Binary files a/icons/turf/walls/material_wall.dmi and b/icons/turf/walls/material_wall.dmi differ
diff --git a/icons/turf/walls/material_wall.png b/icons/turf/walls/material_wall.png
index 1f636cb6db09..0c2533dec6f9 100644
Binary files a/icons/turf/walls/material_wall.png and b/icons/turf/walls/material_wall.png differ
diff --git a/icons/turf/walls/reinforced_states.dmi b/icons/turf/walls/reinforced_states.dmi
index 89c0114a8d6e..4fc5c06e05a9 100644
Binary files a/icons/turf/walls/reinforced_states.dmi and b/icons/turf/walls/reinforced_states.dmi differ
diff --git a/icons/turf/walls/reinforced_wall.dmi b/icons/turf/walls/reinforced_wall.dmi
index 65267a93b2d2..210268b4625a 100644
Binary files a/icons/turf/walls/reinforced_wall.dmi and b/icons/turf/walls/reinforced_wall.dmi differ
diff --git a/icons/turf/walls/reinforced_wall.png b/icons/turf/walls/reinforced_wall.png
index f8d07602c574..37093774fbdc 100644
Binary files a/icons/turf/walls/reinforced_wall.png and b/icons/turf/walls/reinforced_wall.png differ
diff --git a/icons/turf/walls/wall.dmi b/icons/turf/walls/wall.dmi
index 6cdd342fd9ed..043da38c0346 100644
Binary files a/icons/turf/walls/wall.dmi and b/icons/turf/walls/wall.dmi differ
diff --git a/icons/turf/walls/wall.png b/icons/turf/walls/wall.png
index 8f95ca652cdf..6e603751a6e0 100644
Binary files a/icons/turf/walls/wall.png and b/icons/turf/walls/wall.png differ
diff --git a/sound/effects/glassbash.ogg b/sound/effects/glassbash.ogg
new file mode 100644
index 000000000000..59931e6a73ca
Binary files /dev/null and b/sound/effects/glassbash.ogg differ
diff --git a/sound/mecha/hydraulic.ogg b/sound/mecha/hydraulic.ogg
new file mode 100644
index 000000000000..3281ed2dc0f0
Binary files /dev/null and b/sound/mecha/hydraulic.ogg differ
diff --git a/sound/mecha/powerloader_step.ogg b/sound/mecha/powerloader_step.ogg
new file mode 100644
index 000000000000..538ba1efed31
Binary files /dev/null and b/sound/mecha/powerloader_step.ogg differ
diff --git a/sound/mecha/powerloader_turn2.ogg b/sound/mecha/powerloader_turn2.ogg
new file mode 100644
index 000000000000..c3816df9d9e2
Binary files /dev/null and b/sound/mecha/powerloader_turn2.ogg differ
diff --git a/tgui/packages/common/string.js b/tgui/packages/common/string.js
index 16a0921a2559..5b4e5d6d7f2b 100644
--- a/tgui/packages/common/string.js
+++ b/tgui/packages/common/string.js
@@ -87,6 +87,19 @@ export const capitalize = str => {
return str.charAt(0).toUpperCase() + str.slice(1).toLowerCase();
};
+/**
+ * Similar to capitalize, this takes a string and replaces all first letters
+ * of any words.
+ *
+ * @param {string} str
+ * @return {string} The string with the first letters capitalized.
+ *
+ * @example capitalizeAll('heLLo woRLd') === 'HeLLo WoRLd'
+ */
+export const capitalizeAll = (str) => {
+ return str.replace(/(^\w{1})|(\s+\w{1})/g, (letter) => letter.toUpperCase());
+};
+
export const toTitleCase = str => {
// Handle array
if (Array.isArray(str)) {
diff --git a/tgui/packages/tgui/interfaces/AiDashboard.js b/tgui/packages/tgui/interfaces/AiDashboard.js
index e9f4f48c0f0e..6d6d1b8c7477 100644
--- a/tgui/packages/tgui/interfaces/AiDashboard.js
+++ b/tgui/packages/tgui/interfaces/AiDashboard.js
@@ -1,18 +1,13 @@
import { Fragment } from 'inferno';
import { useBackend, useLocalState } from '../backend';
-import { Box, Button, Tabs, ProgressBar, Section, Divider, LabeledControls, NumberInput, Input } from '../components';
+import { Box, Button, Tabs, ProgressBar, Section, Divider, LabeledControls, NumberInput, Input, LabeledList, Flex } from '../components';
import { Window } from '../layouts';
export const AiDashboard = (props, context) => {
const { act, data } = useBackend(context);
- const [search, setSearch] = useLocalState(context, 'search', null);
- const [searchCompleted, setSearchCompleted] = useLocalState(context, 'searchCompleted', null);
const [tab, setTab] = useLocalState(context, 'tab', 1);
- const [selectedCategory, setCategory] = useLocalState(context, 'selectedCategory', data.categories[0]);
- const [activeProjectsOnly, setActiveProjectsOnly] = useLocalState(context, 'activeProjectsOnly', true);
- let remaining_cpu = (1 - data.used_cpu) * 100;
let amount_of_cpu = data.current_cpu ? data.current_cpu * data.max_cpu : 0;
return (
@@ -22,9 +17,7 @@ export const AiDashboard = (props, context) => {
resizable
title="Dashboard">
18 February 2024
-Chubbygummibear, cowbot92, JohnFulpWillard, ToasterBiome, LazennG, Moltijoe, LemonInTheDark, azzzertyy updated:
+27 March 2024
+AMyriad updated:
-
-
- Rendering backend is like 200% different -
- stuff glows in the dark -
- Overlay smoothing is dead -
- Cameras and other popup maps work on clients >1615 -
- mapmerge tool shouldn't blow up multi-z maps anymore -
- Yes -
- icemeta got flipped but it should be the same from top to bottom -
- yeah +
- Fixed an issue where prisoners/warden couldn't access the top fridge in perma on Asteroid +
- Fixed two misplaced firelocks in Box service maintenance
Moltijoe updated:
-
-
- Adds stuff for Hisa to bus with -
- Sound for bussing stuff -
- Images for bussing stuff +
- Fixes a bug where the break machinery objective wouldn't complete until deleted objects went through garbage collection
ToasterBiome updated:
+redmoogle updated:
-
-
- Removes arrival shuttle from NVS Gax, people spawn in cryo now +
- Mice cheese powers last more than 1 nanosecond +
- Filing cabinets can accept tape now +
- Chasms no longer cause wounds
cowbot92 updated:
+ +25 March 2024
+Moltijoe updated:
-
-
- Removed Yellow Jacket Matriarchs from the gold slime pool +
- Traitor Vampire gamemode can now roll during lowpop +
- Traitor Vampire now spawns less traitors to make up for the vampires it spawns +
- Fixes a typo in coffepack code that made them function like regular boxes
17 February 2024
-cark updated:
+redmoogle updated:
-
-
- Added a new lobby song for Valentine's Day "Be My Valentine" by Tim McMorris +
- Mice have darkvision again +
- Lipid extractor can no longer extract robots +
- Smart mines work again +
- Hilberts hotel works again +
- Mapping Icon! +
- Shocked vending machines no longer spark when you walk away +
- You can no longer take RDS as a robotic species
24 March 2024
Moltijoe updated:
-
-
- TRAIT_HARDLY_WOUNDED now actually does what it says +
- Fixes laptop screen overlays appearing while the laptop is closed +
- adds a 20 pop req to sleeping carp (doesn't require readied up like gamemodes do)
Mqiib updated:
+SapphicOverload updated:
-
-
- Mechs without any power are no longer immune to EMPs +
- some weapons can now swing in an arc when using harm intent
ToasterBiome updated:
+tattax updated:
-
-
- Traitor AIs can no longer edit their laws. -
- Paladin now has the correct laws again. +
- fixed canisters not laying on their side and showing the correct side when broken +
- fixed error on toolbelt sprite
cowbot92 updated:
+ +23 March 2024
+AMyriad updated:
-
-
- Adds new donut recipie +
- Fixed PDA screens being one pixel more to the left than they should be +
- Fixed water cookies tasting like /datum/reagent/water and metallic cookies tasting like /datum/reagent/copper +
- Fixed cherry bulbs disappearing when ready to harvest
redmoogle updated:
+ToasterBiome updated:
-
-
- Plasma shotgun can no longer steal your stuff +
- Cargo shuttle call displays the correct time +
- sound now travels through z levels if they are onnected +
- quirks should finally stop resetting for real, along with your jobs since your character is loaded properly.
16 February 2024
-Mqiib updated:
+22 March 2024
+AMyriad updated:
-
-
- Tweaked female neck pixel to make clothes look better on non-humans +
- Fixed a lot of engineering doors having incorrect access requirements +
- Curators may now only go as far as where the protolathe is in engineering +
- The Tar King's arena has been completely redesigned! Go check it out +
Cartlord updated:
+-
+
- The Service Hall now has its own access type, which Heads of personnel can add or remove as they see fit. +
- Artists now have Service Hall access. +
- Hydroponics on IceMeta can no longer be accessed by Chefs without skeleton crew being active.
15 February 2024
-@Chubbygummibear @LazennG updated:
+21 March 2024
+tattax updated:
-
-
- Added new martial art for seismic arm -
- Removed old seismic arm actions +
- fixed missing sprite on booth circuitboard +
- reduced saturation on med and engie circuitobards +
- fixed wirecutter blood sprites +
- fixed some messed up screwdriver and wirecutter sprites
ktlwjec updated:
+ +20 March 2024
+AMyriad updated:
-
-
- Ice cream vat tells you that vanilla ice cream needs vanilla powder to make. -
- Grape snowcone recipe changed from 5u berry juice to 5u grape juice. +
- Fixed meatspike frames not checking if they're anchored or not when finishing +
- Fixed bamboo walls and floors looking like a black void +
- Fixed the pirate data siphon going invisible when activated +
- Fixed nuke op's telecomms machine being invisible +
- Fixed two xeno spawn locations being in public areas
Aquizit updated:
-
-
- No longer told to ahelp when cryoing as a valentine +
- Gave armory cameras on box and gax c_tags
Moltijoe updated:
+ +19 March 2024
+cark updated:
-
-
- New wizard spell, bestow appendicitis -
- Bad wizard that previously had curse of cluwne (before it was removed) now gets appendicitis +
- fixes some issues on donut
Runian updated:
+ +18 March 2024
+AMyriad updated:
-
-
- Newly created cyborgs with an closed AI Connection Port do not inherit an AI's laws (if any) before getting desynced. +
- Fixed invincible carpets looking like a black void (see goat king's arena) +
- Fixed cog grilles looking like smiling tables +
- Fixed cargo shuttle blast doors not opening properly +
- Fixed regenerative cerulean's second extract getting a null description
SapphicOverload updated:
+Aquizit updated:
-
-
- radial menus show up when you're inside an object +
- Adjusts and adds vents and scrubbers in Atmos Pumping Room
redmoogle updated:
+Chubbygummibear updated:
-
-
- Shitcurity jumpsuit shows up -
- Light switches are no longer a free source of frames -
- Fixed RLS description -
- Teleport + Jump to Area have been merged together -
- new PS upgrade: doubles the capacity +
- Ai-detecting multi-tool cannot show you blind spots anymore due to the rendering rework. Rip to a real one +
- Ai cam location is visible to ghosts again and other entities that should be able to see it
tattax updated:
+Yarinoi updated:
-
-
- fixed spells statpanel not working -
- fixed golden violin devil spell (lol) +
- hulk no longer screams over radio
thorium90cent updated:
+enkidienne updated:
-
-
- rain on brick from katana zero is now apart of the jukebox +
- added lava fishing.
13 February 2024
-ktlwjec updated:
+tattax updated:
-
-
- Removes stray pixels from a couple of medikits. +
- prison jumpsuit shows up again
warface1234455 updated:
+ +17 March 2024
+Chubbygummibear updated:
-
-
- Give HFR gas monitoring bar a decreasement/increasement rate rate -
- Moderator now list all sticky gases -
- increase HFR effciency due to recent process change that decreased HFR performance -
- dirty production rate no longer relies on fuel injection rate and instead fully rely on the amount of byproduct gas in the reaction +
- casino slot machines visible again +
- You can "Bash" on windows by harm intent clicking them with an open hand for a louder audio queue. +
- Paperframe window sprites were invisible +
- glassbash.ogg from TG
12 February 2024
Moltijoe updated:
-
-
- Makes a small minor mini tweak to some battle royale weapon weights +
- Maybe fixes a bug with disposal pipes qdeleting people
wonderinghost updated:
+warface1234455 updated:
-
-
- fixes holoparasites ability to break cuffs -
- swarmer cuffs take 20 seconds instead of 45 -
- converts cuff deci seconds to seconds -
- added sprite to alien cuffs +
- fix decal being transparent when applied with decal painter
11 February 2024
-AMyriad, Wallem, Vincent938, The-Moon-Itself updated:
+16 March 2024
+cark updated:
-
-
- You can now construct, deconstruct, and print mass drivers -
- You can also hack mass drivers now -
- Mass driver base power reduced from 50 to 10, can be upgraded or hacked to increase it -
- Mass drivers also have sound effects now! -
- Updated the mass driver sprite(s) +
- fixes a couple mapping errors on box
AMyriad updated:
-
-
- Standardized all mentions of the Clockwork "Justicar" into "Justiciar" +
- Fixed NanoMed using the wrong sprite +
- Deleted TG's ChemVend and NanoMed sprites after being left over from another PR
Loiosh42 updated:
+Moltijoe updated:
-
-
- Adds an Anti-megafauna ERT, mk2 +
- Tweak mining medic jackets to have comparable armour to an unupgraded explorer suit +
- Fixes a bug where maroon organ objective wouldn't mulligan properly +
- fixes mining medic jumpsuit from having 5 less wound armour than every other basic jumpsuit +
- brig phys now spawns with the brig phys jumpsuit rather than the mining medic one +
- gives mining medic jumpsuit the same armour as miner's jumpsuit +
- Gives a 30% chance for traitors to get another objective instead of being told to escape +
- Fixes a couple issues with hawaiian stuff +
- Reworks the cursed ice hiking boots +
- Tweaks mood to have significantly less negatives and REALLY minor positives +
- This is experimental +
- Fixes a bug with the dryad crusher trophy
MajManatee updated:
+N3D6 updated:
-
-
- Holopads stop recording/playback when wrenched +
- adds a missing decal to icemeta
Moltijoe updated:
+ToasterBiome updated:
-
-
- Confusion modified to not scale up to completely randomized movement +
- Adds a new NVS Gax poster
Mqiib updated:
+cark updated:
-
-
- Flying fang inaccuracy debuff now actually goes away fully instead of stacking infinitely -
- Leaping with air shoes makes you fall over -
- Blocking the flying fang leap helps significantly but won't totally save you -
- Disarm chain defaults to basic harm intent attacks when prone -
- Mechs don't deflect ion bolts any more +
- adds colton statue to the CC testing chamber
Runian updated:
+tattax updated:
-
-
- Silicon Law Manager has been added. -
- Antag AIs can modify their laws with exceptions. They cannot remove their zeroth law (or their devil laws). -
- "State Laws" has been replaced/moved to the Law Manager. -
- "Set Auto Announce Mode" has been replaced/moved to Law Manager. -
- You can no longer view a law module's laws by using it in hand and has been replaced with examining. -
- The unused and unobtainable "malfunction" lawset was removed. -
- Examining a law module has been improved and also reveals the laws on it if you are near it or are an observer. Now with formatting! -
- Silicons now have an easier time setting their auto announcement to Holopad and Binary. -
- Trying to upload an another law that has the same exact text as a previous law in the same category simply doesn't upload it as panic/spam prevention. -
- Core preset lawset boards ignores the law cap limit and should no longer causes accidental purges of all inherent laws for AIs. -
- Changing a pAI's laws is now logged in their history. -
- RoboTact's law section displays laws without any formatting that comes from things like ion/hacked laws. +
- admins can change colors on a specific item if it uses the GAGS system +
- you can now use right click -> toggle flashlight to toggle PDA flashlight +
- changed some sprites to use GAGS
bruhlookatthisdood updated:
+ +15 March 2024
+SapphicOverload updated:
-
-
- donut station's tachyon-doppler array is facing the right way now. +
- fixed chasms killing you if there's an available z-level below
cowbot92 updated:
+ToasterBiome updated:
-
-
- Removes the donksoft vendor from asteroid +
- job occupations won't delete themselves and you won't be put into random jobs if you haven't loaded your character +
- mining points card says the correct description +
- scars check for the correct body part flag instead of the body part itself
wonderinghost updated:
+cowbot92 updated:
-
-
- max tabs in microprocessors have been reduced by one -
- telescreens can now download camera software -
- construction bag can now hold computer parts -
- wired network card has added one bulk to advanced network card -
- pdas and phones can accept small computer parts -
- adds box and meta TEG to engine rotation. +
- adjusts the minor filter
10 February 2024
-Identification & Molti updated:
+14 March 2024
+Chubbygummibear updated:
-
-
- Adds a new preternis body colour -
- adds new preternis eye option -
- adds new preternis wings +
- simple mobs call update_appearance on death which will update overlays applied to them
Aquizit updated:
+Moltijoe updated:
-
-
- Laying pipe +
- Makes the night vision quirk work again +
- Joe the goliath no longer resists being pulled
Runian updated:
+N3D6 updated:
-
-
- Decreases the unintended burn damage reduction from 2 to 1 for preternis limbs. -
- The genetics power, Shock Touch, causes confusion down from 15 seconds to 3 seconds. Can be reduced/increased based on targeted electric armor. +
- tweaks meta engine weights to 45/30/25 sm, reactor, teg +
SapphicOverload updated:
+-
+
- Crew monitoring and tracking works in multi-z +
- Radio messages work across connected z-levels +
YashinHak updated:
+-
+
- moar pins mostly meme ones but also the gay one +
- pins are now smaller +
- new pin icons (obj + mob) +
- old pin obj icons
09 February 2024
-Mqiib, @Ebin-Halcyon updated:
+13 March 2024
+AMyriad updated:
-
-
- Added new turtlenecks for cargo, CMO, and HoP! +
- CentCom inspectors and clown ops now have their own PDA presets +
- CentCom inspectors, contractor supports, chameleon kits, etc. no longer spawn with old PDAs - now have modern ones +
- Changed nukie PDA flavor text +
- Button frames now have a proper sprite
ToasterBiome updated:
+Moltijoe updated:
-
-
- hermes boots no lonnger create runtimes when walking +
- Reduces the chance for rare and joke title screens
cowbot92 updated:
+N3D6 updated:
-
-
- Tweaks changeling abilities +
- rcd ore silo upgrade research price 2500 from 25000
08 February 2024
-Identification, Molti, lore team (rip skrem) updated:
+ToasterBiome updated:
-
-
- new preternis sprites -
- old preternis sprites +
- jaunters activate automatically in non-belt slots again +
- bad mail wont stop shuttle anymore
06 February 2024
-Cowbot92 & Chubbygummibear & Mqiib updated:
+12 March 2024
+Am37000 & Molti updated:
-
-
- adjusts how emagged minesweeper rewards/works -
- adjusts the sound of syndicate mines +
- Added new hawaiian themed items +
- addedsprites for hawaiian themed items
Moltijoe updated:
+ktlwjec updated:
-
-
- Battle Royale +
- The pin for the pocket fire extinguisher in-hand sprites are correct.
warface1234455 updated:
+AMyriad updated:
-
-
- Airalarm draught mode now set scrubber range from normal to expanded +
- Fixed being able to enter centcom via disposals +
- Skin twister health reduced from 320 -> 285
05 February 2024
-AMyriad updated:
+Chubbygummibear updated:
-
-
- Chemist ID card no longer looks like the prisoner ID card +
- Box Chapel tiles had no plating under them so crow barring them would send you straight to god +
- Broken grille sprites back. They just wanted to grille for Pete's sake +
- Organized the spaghetti layering of atmos pipes, disposal pipes, and cables.
SapphicOverload updated:
+Mqiib updated:
-
-
- reactions happening in tanks now know they're reacting inside a tank -
- buckling to operating tables no longer requires cuffs +
- Lizards, polysmorphs, and skeletons now actually make claw noises like everyone always said they did. This also indirectly makes them louder. +
cowbot92 updated:
+-
+
- Added Sec Plasmaman stuff to the SecDrobe
04 February 2024
-AMyriad updated:
+11 March 2024
+LoliconSlayer updated:
-
-
- Corporate Agents are now gone. Don't know what they are? Exactly nobody does, they won't be missed +
- tweaked the elder atmosian statue's description
Therandomhoboo updated:
+ +10 March 2024
+N3D6 updated:
-
-
- Cluwne Curse is gone because 3 minutes might as well be 1 use per round -
- Shitty wizards can't have a chance to spawn with Cluwnecurse spell -
- Shit wiz's now have Slip spell instead of Cluwnecurse +
- cleans up some decals on meta +
- makes teg console recognize injector and replaces the scrubber with a vent pump +
- replaces airlock controllers on meta teg with lavaland airlock controllers, should fix taking pressure damage
02 February 2024
-AMyriad updated:
+08 March 2024
+Identification updated:
-
-
- Added "np" and "thx" to the netspeak filter -
- Saying "auxmos" IC now becomes "space wind" +
- Adds a sprite for ColtonOps, you will know it when you see it.
Moltijoe updated:
+13spacemen updated:
-
-
- xeno embryos now burst significantly faster if the host is alive and buckled to a xeno bed -
- xeno embryos now burst significantly slower if the host is dead or not buckled to a xeno bed -
- xeno beds now handcuff the person buckled to it -
- xeno beds are significantly faster to unbuckle from (if not handcuffed) +
- Moths, Phytosians, Abductors, Plasmamen, IPCs, Jelly/Slimepeople, Felinids, Polysmorph, all have their own butt sprites
Therandomhoboo updated:
+JamieD1 updated:
-
-
- Nice, Good, Very good and Fantastic quality drinks have their mood changes increased, and their timeouts increased -
- Allies cocktail mood flavour text is less cringe +
- Changes Hub Text
31 January 2024
-ktlwjec updated:
+LazennG updated:
-
-
- Mime's mail cheesewheel is now visible. -
- Croissants need raw pastry bases to craft, instead of cooked ones. -
- Seafood ingredients box for cooks. +
- added proximity check to suplex +
- seismic arm suplex bonus damage vs charging bubblegum
AMyriad updated:
+Moltijoe updated:
-
-
- Salicylic acid is now spelled correctly +
- Fixes a runtime that allows infinite duping of possessed sword nullrods +
- Adds new wizard spell, scrunch +
- Fixes a bug where mood wasn't properly forced for everyone
Marmio64 updated:
+Runian updated:
-
-
- Adds jaunt abilities for sinful demons. +
- Only obtainable via a camera laser upgrade disk (or by being a traitor), the AI can get an ability based around lasers and their cameras. +
- This new AI ability lets them enter a burst mode which lets them shoot a laser from any functioning camera every second. It lasts for 30 seconds and be re-activated every 60 seconds. Cameras used in this matter are hit with a heavy EMP. +
- Hitting an AI control console with an upgrade no longer runtimes. +
- Logging regarding upgrading the AI with disks has better formatting.
Mqiib updated:
+SapphicOverload updated:
-
-
- Chaplain monk staff null rod (stamina) damage increased (15 -> 18) -
- The above no longer can block projectiles +
- Liquid plasma tiles cool down gas in radiator loops instead of heating them
RG4ORDR updated:
+Scrambledeggs00 updated:
-
-
- Syndie Borgs Spawners removed from BR loot pool. +
- Adds the flagellant's chains to chaplain's armament beacon +
- Adds sprites for the flagellant's chains
Runian updated:
+Therandomhoboo updated:
-
-
- Four tech node dedicated for cyborgs upgrades: Night Vision, Engineering, Mining, and Service. Each costing 500 points. -
- Various cyborg upgrades have been moved to more relevant/dedicated technodes. -
- Most tech nodes that involve cyborg upgrades now require the "Advanced Robotics" tech node or a node that already has it as a prerequisite. -
- Most tech nodes that involve cyborg upgrades have now a better description that explains the purpose of the node. -
- "Cyborg Upgrades: Advanced Utility" tech node has been renamed to "Cyborg Upgrades: Advanced Engineering". -
- "Cyborg Upgrades: Advanced Engineering" tech node cost reduced to 2,500 from 5,000. -
- "Cyborg Upgrades: Utility" tech node cost reduced to 1,500 from 2,000. -
- "Cyborg Upgrades: Engineering" and "Cyborg Upgrades: Mining" tech node's icon has been changed to better visualize the node. -
- Janiborg's trashbag of holding upgrade is properly locked behind Advanced Sanitation Technology. -
- Medical gripper can now hold medsprays, lollipops, pills, patches, gummies, and chemistry bags. +
- Drunken Resilience back into the fray +
- Drunk Level 81 & Drunk Level 101 giving heals +
- Drunk Resilience no longer is culmative healing
SapphicOverload updated:
+warface1234455 updated:
-
-
- beam rifles now create turf fires instead of hotspots -
- beam rifle projectiles can always reflect off of coins -
- fixed hitscan projectiles not rendering properly when reflected -
- fixed beam rifle projectiles not doing damage when fired from turrets or emitters +
- Healium now heals oxy damage
SomeguyManperson updated:
+ +07 March 2024
+warface1234455 updated:
-
-
- limb loss in brazil is now worth 7 marbles -
- limb skeletonization in brazil is now worth 3 marbles -
- If you somehow manage to run out of limbs while leaving brazil, you will be ejected +
- Blob now generate research points if inside a containment field +
- Shuttle will leave when blob is contained inside a containment field +
- Supermatter blob delam now create blob without ghost poll (you can still click the blob camera to enter the blob if ur not banned or the blob is not occupied by another ghost)
jachlompsky updated:
+ +06 March 2024
+13spacemen updated:
-
-
- Added a frost oil chem sprayer to the mr freeze syndikit +
- Chat no longer complains if you have unbound keys
warface1234455 updated:
+ +05 March 2024
+13spacemen updated:
-
-
- Shitcurity uniform now has fucking armor -
- Nightshift lights now actually consume less power -
- Removes other useless power vars as they dont work with the light fixture anyway -
- Cyborg engineering gripper can now hold server rack and cpu +
- Human unarmed attack visual effects are based on species instead of the attack verb text
wonderinghost updated:
+N3D6 updated:
-
-
- Cluwncurse takes 3 minutes instead of 1 minute +
- adds an extra smes unit to donut engi, adds light switches and extra closets to donut engi
29 January 2024
-ktlwjec updated:
+04 March 2024
+cark updated:
-
-
- All pizzas need mozzarella to craft (5u enzyme, 30u cow milk, 5u lemon juice). -
- Mime finger guns properly show what was shot at, and by who. -
- Mime finger gun button has a working icon. +
- fixes an issue where psychiatrist on donut didnt have a spawnpoint
13spacemen updated:
+SapphicOverload updated:
-
-
- Compiling the code launches directly into Dream Seeker +
- walls are now destructible +
Scrambledeggs00 updated:
+-
+
- Fixes book modification +
- Changes the wording of some book modification prompts +
03 March 2024
+JamieD1 updated:
+-
+
- Added new Title Screens from 2024 Contest
Moltijoe updated:
-
-
- Fixes a bug with polysmorph tail crawlspeed +
- Properly updates special eye colour upon insert and removal
SapphicOverload updated:
+ +02 March 2024
+AMyriad updated:
-
-
- fixed budget insulating gloves melting when touching unpowered cables +
- Adjusted decals and added some spooky flooring to the curator's backroom in the library on Box +
- Fixed a misplaced decal
adamsong updated:
+ +01 March 2024
+AMyriad updated:
-
-
- Added option for admins to spawn items directly in a storage container +
- Patients can now exit from both left and right doors on Box medbay
bruhlookatthisdood updated:
+MajManatee updated:
-
-
- bonesetter spawns during battle royal now +
- New hugboxed donk-soft vendor for roundstart. Cant load riot darts.
cowbot92 updated:
+ +29 February 2024
+ktlwjec updated:
-
-
- removes infinite money in the form of syrup +
- Meatballs in ingredient boxes start off raw.
jachlompsky updated:
+AMyriad updated:
-
-
- fixed lasombra vassals and eye examine +
- Added a second button to the kitchen on Box to toggle counter shutters +
- The privacy shutters in the kitchen on Box are now toggled with the bottom (already existing) button +
- Removed the third blender from the kitchen on Box +
- Fixed every fire alarm that was facing the wrong direction on Box +
- Fixed a mountain of decals using the wrong colors on every map +
- Asteroid maint doors now have clear hazard stripes instead of nearly invisible brown ones +
- Changed a few bridge decals to look better on every map +
- Gax telecomms is now color coded, now has nice engie decals in the net admin's office
wonderinghost updated:
+Moltijoe updated:
-
-
- updates min and max values of byond_version_combat +
- New sandevistan visual effect +
- Weedkiller does 2x damage to venus human traps than before +
- Venus human traps can no longer pull +
- venus human traps now require a pressurized environment +
- Fixes surgical toolset arm implant visuals +
- Fixes being unable to select a clan as bloodsucker +
- Preternis eyes now also care about if a species is powerhungry instead of only robotic +
- Preternis eyes night vision now consumes power from powerhungry species +
- Preternis eyes only take damage in non powerhungry species when nightvision is turned on +
- Powered ruins properly start with lights on if they have a lightswitch +
- Wizards can now cast iron +
- Lets hecata necromancy poll ghosts into mindless corpses +
- Lets admins force a specific bloodsucker clan on people
ynot01 updated:
+Mqiib updated:
-
-
- Live xeno aliens on station level now passively generate research points +
- Light step now stops your shoes from getting dirty again
28 January 2024
SapphicOverload updated:
-
-
- fixed being unable to analyze the instability of cold fusion reactions -
- IPCs, androids, polysmorphs, and slimepeople now have unique typing indicators -
- Using harm intent makes your typing indicator angry +
- Goliath hide plates can be attached to APLU mechs again
adamsong updated:
+ToasterBiome updated:
-
-
- fixed mfa backup codes not working +
- quirks won't delete themselves from your characters if you load in fast anymore
cowbot92 updated:
-
-
- Makes the deep fryer hungry, occsionally -
- fixed the faded eyepatch not giving you night vision despite it telling you it does +
- Added new smite: wibblify
27 January 2024
-ktlwjec updated:
+warface1234455 updated:
-
-
- Removes a line in the sith cloak sprite. +
- You can now go through atmos resin with slowdown. +
- Changed resin description
26 January 2024
-Runian updated:
+wonderinghost updated:
-
-
- Shooting a cyborg snack dispenser while in a zero gravity environment correctly starts moving you in the opposite direction that you shot it. +
- updates max byond version to .1640
23 January 2024
-Moltijoe updated:
+28 February 2024
+13spacemen updated:
-
-
- Fixes an issue with blood decals +
- Mimes get their own special survival boxes +
- Plasmaman clowns will properly get their plasma tank in their hugbox
22 January 2024
+27 February 2024
+axietheaxolotl updated:
+-
+
- Added pride pins +
13spacemen updated:
+-
+
- Humans have shoe footprints again +
Moltijoe updated:
-
-
- Added new maroon organ objective for traitors to roll -
- Traitor break machinery objective only requires breaking the original machines -
- Traitor break machinery targets at max 2 areas instead of up to 4 +
- Fixes being unable to place items in closets or crates +
- Miners and mining medics now properly cause the mining base to start with the lights on +
- Fixes bugs with blood type compatibility +
- venus human trap bulb vines properly get destroyed when the bulb is +
- fixes a bug where emissive bodyparts showed as white in the character menu
Mqiib updated:
-
-
- Imperial jumpsuits don't have alt styles, stop trying to break the dress code soldier! +
- Adds the new Black Mamba for nuclear operatives to play with +
- Adds two new venom-related weapons for the Mamba
Yarinoi updated:
+SapphicOverload updated:
-
-
- 'Solo' special syndi-kit is now slightly more balanced. David. David you aren't going to let this stop you are you David. Get to work David ignore the EMPs. Take your pills get to work. +
- Fixed clothes that don't cover your hands protecting your hands from electric shock
21 January 2024
-ktlwjec updated:
+adamsong updated:
-
-
- Mammi and Pea Soup need bowls to craft. +
- fixed info command showing numerical security levels
20 January 2024
-kugamo, warface1234455 updated:
+26 February 2024
+Moltijoe updated:
-
-
- Resprites the Bluespace Harvester. -
- Also also slightly changes the nether portals event, so that the portals spawn sequentially over at most 15 seconds. +
- Traitors can no longer roll whiteship or freeminer machines for the destroy objective
19 January 2024
-SapphicOverload updated:
+Mqiib updated:
-
-
- added stairs to icemeta's mining base -
- added directional stairs icons -
- fixed regenerative cores having a delay on icemoon +
- Undoes accidental revert pertaining to bloody footprints
warface1234455 updated:
+cowbot92 updated:
-
-
- Fix invisible netmin wintercoat hood -
- Bring back Raven cruiser emergency shuttle +
- Removed mindreading +
- tweaked cerebral neuroplasticity gene
18 January 2024
-SapphicOverload updated:
+redmoogle updated:
-
-
- made the chat message from losing obsession more visible -
- you can now place items on the altar of the gods without having to climb on top of it +
- Examining cutter mods shows you cost and stackability
17 January 2024
-Loiosh42 updated:
+25 February 2024
+Cowbot92 & Chubbigummybear updated:
-
-
- Adds an ignition_effect to the cautery. +
- fixes most floor stuff you walk over not working
15 January 2024
-bruhlookatthisdood updated:
+cark updated:
-
-
- Waiting For The Sun (Rimworld OST) is in jukebox now +
- Added a new disease which turns you into a crab
cowbot92 updated:
+AMyriad updated:
-
-
- fixes decals +
- Removed all old PDA cartridges from all lockers, vendors, and tables on all stations excluding the clerk's gift vendor +
- Revised the flavor text on old PDAs to reflect their status as outdated, "antique" pieces of equipment +
- Replaced the old ID console from the CE's office on icemeta with the newer modular console
13 January 2024
-SapphicOverload updated:
+Marmio64 updated:
-
-
- fixed chat not always showing up in replays +
- Adds the Den of Sin, a jungleland casino run by a demon. +
Moltijoe updated:
+-
+
- No more zombies in xenobio +
- Preternis eyes glow purple when nightvision is active +
- Battle royale +
- Certain species bodyparts now glow in the dark +
- Adds S.E.L.F. ipcs and S.E.L.F. insurgents +
- Synths and Military synths +
- Syndicate bounties +
- Lights no longer start off except for empty departments +
- adds a cooldown to light flickering from explosions/etc +
- Skittish now works properly for crates
12 January 2024
SapphicOverload updated:
-
-
- adds more winter coats -
- moves winter coat and hood sprites to their own files +
- Added a unit test for fusion reactions +
- Fixed fusion reactions not working in the atmospherics simulator computer +
- Fixed hydraulic clamp not being able to pick up lockers or deconstruct tables +
- Ripley MK-II and Firefighter have been merged into the same mech
Therandomhoboo updated:
+Yarinoi updated:
-
-
- Astrotame, bbq, sugar, cream & chocolate are now 10u's instead of 5. -
- Chocolate packets are now correctly called chocolate packets instead of Creamer.... +
- added new chaplain hat icons +
- removed old chaplain hat icons :exploding_head:
warface1234455 updated:
-
-
- FIx preset programs arent installed in pda/phone +
- Raise the HFR's healium healing threshold from 66.66% to 90%. +
- Fix apc building and unnable to change electric armor value from VV +
- Add pluoxium + antinoblium gas recipe to HFR +
- fix tier 2 moderator pluonium production output on tgui
11 January 2024
-Runian updated:
+24 February 2024
+ktlwjec updated:
-
-
- The description of ammo boxes now accurately show how much bullets are left when you use an ammo box on another ammo box. +
- Lightens the outline for the bag of holding in-hand sprites.
10 January 2024
-AMyriad updated:
+13spacemen updated:
-
-
- Dusted plasmamen now have plasma remains +
- Footprints are now based on what shoes you're wearing and what legs you have +
- Fixed bloody item overlays leaking onto other objects
Runian updated:
+AMyriad updated:
-
-
- Override Machine and Overload Machine abilities (from malf AI/malf upgrade disk) now work. -
- Nerve Grounding and other ways that change your physiology's siemens coeff properly protect you from getting electrocuted. +
- Fixed every description that didn't begin with a capital letter, make a bug report if you find something I missed +
- MMIs and positronic brains can no longer be printed from the medical techfab
Scrambledeggs00 updated:
+Mqiib updated:
-
-
- Added a new thing to IceMeta -
- Sprites for the new thing +
- The clarke is now tied for fastest mech in the game with the ripley mk-I +
- Mech melee weapons now also hit vines properly when using cleave attacks
ToasterBiome updated:
+SapphicOverload updated:
-
-
- rating polls now work properly -
- Updates maintainer list and thanks more stations in our special thanks section +
- flamethrowers now react their fuel for damage and effects instead of using pre-determined values +
- flamethrower tanks release some of their contents when shot instead of just deleting themselves +
- flamethrowers can hit vines on windows +
- fixed flamethrowers sometimes using more fuel than intended
bruhlookatthisdood updated:
+cowbot92 updated:
-
-
- ASay and DSay are now no longer visible to non-admins +
- Ports baton light up from TG
wonderinghost updated:
+warface1234455 updated:
-
-
- fixed my mistakes -
- makes the prior pr picture perfect +
- HFR gas byproducts now uses scaled_production instead of fuel_consumption, and now scaled alongside with gas produced from moderator, code refactor
09 January 2024
-Aquizit updated:
+23 February 2024
+Cowbot92 & Chubbygummibear updated:
-
-
- The innkeeper can now get stuff from their booze-o-matic and kitchen vending machines. +
- Fixes a bunch of stuff you step on +
- Added new traitor item, the gasharpoon
08 January 2024
-cark updated:
+Chubbygummibear updated:
-
-
- fixes some railings in bar -
- Reenables Icemoon Walkers +
- auto_profile config flag added to the private default and private server config files +
- private servers aren't dumpy unless you specifically request them to be +
- main yog server will be extra dumpy because we can handle it +
- no more double clerk and chaplain workplace spawns
Therandomhoboo updated:
+Moltijoe updated:
-
-
- Moonshine now makes you gain blurry, long live blurry vision +
- New ethereal bodyparts +
- Old ethereal bodyparts
05 January 2024
-AMyriad updated:
+21 February 2024
+Identification updated:
-
-
- Updated the storage implant's toggle sprite +
- Restores walls to true top-down.
EdgeLordExe updated:
+sapphicoverload, syncit21, zxaber updated:
-
-
- New Mining area: Jungleland, Most content added by Djiq, Most ruins, some mobs and Ivymen added by Marmio64. Other ruins added by ToasterBiome. Various fixes and updates by courtesy of Jamie1D and SapphicOverload! -
- New Mobs now appear on jungleland, such as Meduracha, Dryads, Giant mosquitoes, and Skin Twisters! -
- New Mining implement: Kinetic Javelin, get it either from the roundstart kit, or buy it in a mining vendor. -
- New Megafauna: Tar King - You can summon it by collecting 3 parts of a broken crystal, assembling it, and placing it in a Forgotten Altar! -
- Ivymen - Jungleland's counterpart to ashwalkers, by Marmio64 -
- Jungleland has many new biomes, beware of sulphuric pits, as it will cause you trouble if you step into it. -
- Added new icons and icon states for jungleland -
- Added Jungleland as a new mining destination! +
- added a bunch more equipment for utility mechs +
- adds new sound effects for hydraulic clamp and APLU mech movement +
- hydraulic clamp works as a wrench or crowbar and can pry powered doors +
- mech plasma cutter can be used as a welder like the handheld version +
- mech RCD works like an actual RCD now +
- adds tgui RCD menu +
- strafe button icon shows whether or not you're strafing +
- APLU and Clarke mechs now have radiation shielding +
- fixed clarke movement not working correctly +
- fixes and re-adds multi-Z mech movement (no phasing through floors or teleporting to other z-levels this time)
04 January 2024
-ZephyrTFA, san7890 updated:
+13spacemen updated:
-
-
- fixed chat messages not showing up sometimes +
- The latejoin menu no longer has anemia.
Aquizit updated:
+AMyriad updated:
-
-
- Removed disposals air alarm -
- Moved windoor in disposals -
- Scrubs a couple bad AI Ion Law things +
- Fixed the eye of god expose cooldown going off when an invalid target is selected +
- Fixed mention of Weyland-Yutani appearing in the ripley mech repair manual +
- "Hyperspace" no longer exists and never did, FTL travel is achieved by tunneling through bluespace +
- Players can no longer relabel gas canisters to a variant that's intended for admins and breaks the 4th wall
Runian updated:
+Chubbygummibear updated:
-
-
- The threshold description for symbiotic regeneration is now accurate. +
- index_out_of_bounds fixed on blend_cutoff_colors +
- turfs that smooth will spur their neighboring turfs to check their smoothing again when late loaded in +
- cables on the correct plane so they don't have weird lattice lighting filters +
- meteors with space lighting overlays rotate with the meteors instead of being disjointed and unmoving +
- shuttle atmos shouldn't get left behind on takeoff
SapphicOverload updated:
+LazennG updated:
-
-
- polysmorph tails slightly increase crawl speed -
- fixed printed IPCs having human names instead of IPC names -
- supermatter crystal and nuclear reactor are less unstable -
- footstep sounds actually work again +
- fixed seismic suplex animation and some text
Therandomhoboo updated:
+adamsong updated:
-
-
- Slurring now happens based on what kind of drinker you are (Light, normal or heavy drinker which are based on traits) -
- Slurring duration changed based on drinker type -
- The constant chance to randomly slur, we can drink now +
- fixed shuttle catastrophe +
- fixed admin shuttle manipulator
03 January 2024
-Cowbot92 & Molti updated:
+cowbot92 updated:
-
-
- tweaks how blood works -
- adds new blood -
- removes the old bad blood -
- fear the old blood +
- adjust some pop requirements for several antags
Moltijoe updated:
+redmoogle updated:
-
-
- Ethereal eyes now give +1 view range +
- PC Range Upgrade +
- PC Cooldown Upgrade +
- Vending machines not containing upgrades +
- All plasma cutters can be upgraded +
- Plasmacutters can be recharged with one click now +
warface1234455 updated:
+-
+
- Partially revert undocumented change to shutter/blastdoor layer covering window but still keep the blast door covering the door
29 December 2023
-SapphicOverload updated:
+20 February 2024
+Chubbygummibear updated:
-
-
- exosuits now have directional lights, with much longer range +
- fix adminwho by skipping null clients in the admin list
ToasterBiome updated:
+cowbot92 updated:
-
-
- Project Bee has a new sprite and description +
- fixed beartraps not trapping
jupyterkat updated:
+warface1234455 updated:
-
-
- updated auxmos to latest +
- cable coil maxstacks is now 40
25 December 2023
-cark updated:
+19 February 2024
+SapphicOverload updated:
-
-
- Icemoon Hermit's home has been improved with more amenities -
- fixes there being too many firelocks under a door in AI sat on Donut +
- RCDs work on space tiles again +
- Fixed space lighting not working in space +
18 February 2024
+Chubbygummibear, cowbot92, JohnFulpWillard, ToasterBiome, LazennG, Moltijoe, LemonInTheDark, azzzertyy updated:
+-
+
- Rendering backend is like 200% different +
- stuff glows in the dark +
- Overlay smoothing is dead +
- Cameras and other popup maps work on clients >1615 +
- mapmerge tool shouldn't blow up multi-z maps anymore +
- Yes +
- icemeta got flipped but it should be the same from top to bottom +
- yeah
Moltijoe updated:
-
-
- Adds more tool options for ghetto mechanical surgery -
- existing ghetto mechanical surgery options are slightly better +
- Adds stuff for Hisa to bus with +
- Sound for bussing stuff +
- Images for bussing stuff
N3D6 updated:
+ToasterBiome updated:
-
-
- moves smes units from engi foyer to the former gravity generator area on icemeta +
- Removes arrival shuttle from NVS Gax, people spawn in cryo now +
cowbot92 updated:
+-
+
- Removed Yellow Jacket Matriarchs from the gold slime pool
24 December 2023
+17 February 2024
+cark updated:
+-
+
- Added a new lobby song for Valentine's Day "Be My Valentine" by Tim McMorris +
Moltijoe updated:
-
-
- Lets hand-based extinguishing be used on corpses -
- Gives polysmorph minor resistance to pressure damage -
- Preterni no longer regenerate blood +
- TRAIT_HARDLY_WOUNDED now actually does what it says
Runian updated:
+Mqiib updated:
-
-
- Trying to remove decoy brains from MMIs properly works. -
- Removing MMI brains from range no longer teleport it into your hands if you're far away (e.g. through walls/windows with TK). Same for folding paper. -
- Ending punctuation for ripping out brain from MMI. -
- IPCs now play their special walk sound when they move as intended. -
- Emagging/hacking cyborg event typo: privleges -> privileges +
- Mechs without any power are no longer immune to EMPs
SapphicOverload updated:
+ToasterBiome updated:
-
-
- fixed a runtime error caused by steamed hams -
- fixed meson goggles not protecting you from looking at the supermatter crystal -
- being on fire no longer gives a negative moodlet if you're immune to fire +
- Traitor AIs can no longer edit their laws. +
- Paladin now has the correct laws again.
azzzertyy updated:
+cowbot92 updated:
-
-
- Removes the "WARNING. THE WAY AI IS PLAYED HAS CHANGED" message when joining as AI +
- Adds new donut recipie
hedgehog1029 updated:
+redmoogle updated:
-
-
- XL beakers show contained chemicals again +
- Plasma shotgun can no longer steal your stuff
23 December 2023
-bruhlookatthisdood updated:
+16 February 2024
+Mqiib updated:
-
-
- fixed a lot of ai blind spots +
- Tweaked female neck pixel to make clothes look better on non-humans
21 December 2023
+15 February 2024
+@Chubbygummibear @LazennG updated:
+-
+
- Added new martial art for seismic arm +
- Removed old seismic arm actions +
ktlwjec updated:
+-
+
- Ice cream vat tells you that vanilla ice cream needs vanilla powder to make. +
- Grape snowcone recipe changed from 5u berry juice to 5u grape juice. +
Aquizit updated:
+-
+
- No longer told to ahelp when cryoing as a valentine +
Moltijoe updated:
+-
+
- New wizard spell, bestow appendicitis +
- Bad wizard that previously had curse of cluwne (before it was removed) now gets appendicitis +
Runian updated:
-
-
- Various mood descriptions now properly start on a new line. -
- Space cigarettes now properly spawn with their branded cigarette rather than the base cigarette. -
- Ending punctuation for a few mood descriptions. -
- Removing/extracting IPC's positron brain properly moves their mind. -
- Spells properly transfer over from one mob to another; e.g. wizard shapechange & xenobio burning black shapechange. -
- Rune scimitar works as intended; you can now properly grind and obtain loot. +
- Newly created cyborgs with an closed AI Connection Port do not inherit an AI's laws (if any) before getting desynced.
SapphicOverload updated:
-
-
- cryo pod joining puts you inside the pod instead of on the ground +
- radial menus show up when you're inside an object +
redmoogle updated:
+-
+
- Shitcurity jumpsuit shows up +
- Light switches are no longer a free source of frames +
- Fixed RLS description +
- Teleport + Jump to Area have been merged together +
- new PS upgrade: doubles the capacity
azzzertyy updated:
+tattax updated:
-
-
- Ambience follows ai eye rather than its core. -
- Added paystand to bar and kitchen, decreased wideness of kitchen, made the raised section look logical. +
- fixed spells statpanel not working +
- fixed golden violin devil spell (lol) +
thorium90cent updated:
+-
+
- rain on brick from katana zero is now apart of the jukebox
20 December 2023
-Mqiib updated:
+13 February 2024
+ktlwjec updated:
-
-
- Fixes spray cans/crayons not working +
- Removes stray pixels from a couple of medikits.
Runian updated:
+warface1234455 updated:
-
-
- You can now use a wrench to anchor armed beartraps after a second delay. It can be disarmed with an empty hand with a second delay. -
- Message for arming and disarming beartraps properly ends with a period. +
- Give HFR gas monitoring bar a decreasement/increasement rate rate +
- Moderator now list all sticky gases +
- increase HFR effciency due to recent process change that decreased HFR performance +
- dirty production rate no longer relies on fuel injection rate and instead fully rely on the amount of byproduct gas in the reaction
ToasterBiome updated:
+ +12 February 2024
+Moltijoe updated:
-
-
- Removes arrival shuttle from NVS Gax, people spawn in cryo now +
- Makes a small minor mini tweak to some battle royale weapon weights
ynot01 updated:
+wonderinghost updated:
-
-
- Disarming someone holding a gun now has a high chance to force them to fire +
- fixes holoparasites ability to break cuffs +
- swarmer cuffs take 20 seconds instead of 45 +
- converts cuff deci seconds to seconds +
- added sprite to alien cuffs
19 December 2023
-Scrambledeggs00 & Molti updated:
+11 February 2024
+AMyriad, Wallem, Vincent938, The-Moon-Itself updated:
-
-
- new vampire cloak -
- old vampire cloak +
- You can now construct, deconstruct, and print mass drivers +
- You can also hack mass drivers now +
- Mass driver base power reduced from 50 to 10, can be upgraded or hacked to increase it +
- Mass drivers also have sound effects now! +
- Updated the mass driver sprite(s)
cark updated:
+AMyriad updated:
+-
+
- Standardized all mentions of the Clockwork "Justicar" into "Justiciar" +
Loiosh42 updated:
-
-
- fixes mislabeled cameras in chapel on box +
- Adds an Anti-megafauna ERT, mk2
cark, cowbot93 updated:
+MajManatee updated:
-
-
- improves new bar by fixing issues and adding coffee +
- Holopads stop recording/playback when wrenched
SapphicOverload updated:
+Moltijoe updated:
-
-
- icemeta's useless solar arrays have been replaced with geothermal power stations +
- Confusion modified to not scale up to completely randomized movement +
Mqiib updated:
+-
+
- Flying fang inaccuracy debuff now actually goes away fully instead of stacking infinitely +
- Leaping with air shoes makes you fall over +
- Blocking the flying fang leap helps significantly but won't totally save you +
- Disarm chain defaults to basic harm intent attacks when prone +
- Mechs don't deflect ion bolts any more +
Runian updated:
+-
+
- Silicon Law Manager has been added. +
- Antag AIs can modify their laws with exceptions. They cannot remove their zeroth law (or their devil laws). +
- "State Laws" has been replaced/moved to the Law Manager. +
- "Set Auto Announce Mode" has been replaced/moved to Law Manager. +
- You can no longer view a law module's laws by using it in hand and has been replaced with examining. +
- The unused and unobtainable "malfunction" lawset was removed. +
- Examining a law module has been improved and also reveals the laws on it if you are near it or are an observer. Now with formatting! +
- Silicons now have an easier time setting their auto announcement to Holopad and Binary. +
- Trying to upload an another law that has the same exact text as a previous law in the same category simply doesn't upload it as panic/spam prevention. +
- Core preset lawset boards ignores the law cap limit and should no longer causes accidental purges of all inherent laws for AIs. +
- Changing a pAI's laws is now logged in their history. +
- RoboTact's law section displays laws without any formatting that comes from things like ion/hacked laws. +
bruhlookatthisdood updated:
+-
+
- donut station's tachyon-doppler array is facing the right way now.
18 December 2023
cowbot92 updated:
-
-
- Adjusts the singulo/tesla engine template +
- Removes the donksoft vendor from asteroid
17 December 2023
-SapphicOverload updated:
+wonderinghost updated:
-
-
- fixed a bunch of things being able to behead when they shouldn't -
- fixed roboticists not having robotics access +
- max tabs in microprocessors have been reduced by one +
- telescreens can now download camera software +
- construction bag can now hold computer parts +
- wired network card has added one bulk to advanced network card +
- pdas and phones can accept small computer parts +
- adds box and meta TEG to engine rotation.
15 December 2023
-Mqiib updated:
+10 February 2024
+Identification & Molti updated:
-
-
- You can now use darker colors on canvases. +
- Adds a new preternis body colour +
- adds new preternis eye option +
- adds new preternis wings
ToasterBiome updated:
+Aquizit updated:
-
-
- Removes species pay modifiers +
- Laying pipe +
Runian updated:
+-
+
- Decreases the unintended burn damage reduction from 2 to 1 for preternis limbs. +
- The genetics power, Shock Touch, causes confusion down from 15 seconds to 3 seconds. Can be reduced/increased based on targeted electric armor.
14 December 2023
-Mqiib, @RG4ORDR @SapphicOverload updated:
+09 February 2024
+Mqiib, @Ebin-Halcyon updated:
-
-
- Sidewinder mechs made moderately tougher -
- Sidewinder mechs slightly better in melee than before -
- Sidewinder mechs have superior projectile deflection, watch those lasers! -
- Directional damage modifiers and deflection modifiers work for melee too now -
- Demolition modifiers are half-effective versus non-combat mechs and completely ineffective vs combat mechs +
- Added new turtlenecks for cargo, CMO, and HoP!
cark updated:
+ToasterBiome updated:
+-
+
- hermes boots no lonnger create runtimes when walking +
cowbot92 updated:
-
-
- fixed some issues on donut -
- certain items now give chems they did not before +
- Tweaks changeling abilities
cark, azzzertyy updated:
+ +08 February 2024
+Identification, Molti, lore team (rip skrem) updated:
-
-
- Redesigns Box's bar/kitchen, nukes all the old templates and moves theatre north to fitness. +
- new preternis sprites +
- old preternis sprites
AMyriad updated:
+ +06 February 2024
+Cowbot92 & Chubbygummibear & Mqiib updated:
-
-
- Added Biosignaller implants to nuke ops and ERTs, which alert their teammates when and where they died -
- Syndicate ghost roles now have a survival box +
- adjusts how emagged minesweeper rewards/works +
- adjusts the sound of syndicate mines
Moltijoe updated:
-
-
- Reworks superficial healing +
- Battle Royale
Mqiib updated:
+warface1234455 updated:
-
-
- Actually buffs the immolator this time -
- Base mech vs mech damage multiplier for melee weapons and punches reduced -
- Energy axe and rapier mech multipliers tweaked -
- Mech katana damage bonus and AP increased +
- Airalarm draught mode now set scrubber range from normal to expanded
SapphicOverload updated:
+ +05 February 2024
+AMyriad updated:
-
-
- fixed snowstorms bypassing cold protection -
- adds electrical and heat protection to engineering envirosuit helmets +
- Chemist ID card no longer looks like the prisoner ID card
ToasterBiome updated:
+SapphicOverload updated:
-
-
- Changes NVS Gax Robotics to be more open -
- Mood is globally enabled for everyone -
- Map rotations and player votes no longer offer maps if they were played the last 70% of rounds -
- Adds a new Christmas song to the lobby music for Christmas! +
- reactions happening in tanks now know they're reacting inside a tank +
- buckling to operating tables no longer requires cuffs
bruhlookatthisdood updated:
+ +04 February 2024
+AMyriad updated:
-
-
- you can now hit the captain's gun case +
- Corporate Agents are now gone. Don't know what they are? Exactly nobody does, they won't be missed
cowbot92 updated:
+Therandomhoboo updated:
-
-
- Adds coffee machine to the new bar -
- Maps it duh +
- Cluwne Curse is gone because 3 minutes might as well be 1 use per round +
- Shitty wizards can't have a chance to spawn with Cluwnecurse spell +
- Shit wiz's now have Slip spell instead of Cluwnecurse
13 December 2023
+02 February 2024
AMyriad updated:
-
-
- Captains can now access their antique gun display case on Gamma alert or higher +
- Added "np" and "thx" to the netspeak filter +
- Saying "auxmos" IC now becomes "space wind"
Mqiib updated:
+Moltijoe updated:
-
-
- Immolator laser gun cooldown reduced (0.8s -> 0.5s) +
- xeno embryos now burst significantly faster if the host is alive and buckled to a xeno bed +
- xeno embryos now burst significantly slower if the host is dead or not buckled to a xeno bed +
- xeno beds now handcuff the person buckled to it +
- xeno beds are significantly faster to unbuckle from (if not handcuffed)
Runian updated:
+Therandomhoboo updated:
-
-
- Regenerative cores cannot be put into autosurgeons. +
- Nice, Good, Very good and Fantastic quality drinks have their mood changes increased, and their timeouts increased +
- Allies cocktail mood flavour text is less cringe
bruhlookatthisdood updated:
+ +31 January 2024
+ktlwjec updated:
-
-
- Moved items in captain's office to make them more accessible +
- Mime's mail cheesewheel is now visible. +
- Croissants need raw pastry bases to craft, instead of cooked ones. +
- Seafood ingredients box for cooks.
12 December 2023
-SapphicOverload updated:
+AMyriad updated:
-
-
- new virology symptom: symbiotic regeneration -
- fixed HFR heating not taking delta_time into account -
- updates a bunch of engineering-related sprites +
- Salicylic acid is now spelled correctly
azzzertyy updated:
+Marmio64 updated:
-
-
- Removed Hippocratic from roundstart lawsets. -
- Icemeta disposals now reroutes into the plasmariver. +
- Adds jaunt abilities for sinful demons.
cowbot92 updated:
+Mqiib updated:
-
-
- Adds new coffee machines -
- Adds new sound for coffee machine -
- Adds coffee related sprites +
- Chaplain monk staff null rod (stamina) damage increased (15 -> 18) +
- The above no longer can block projectiles
tattax updated:
+RG4ORDR updated:
-
-
- fixed a non-human storage hotkey, "E", bug +
- Syndie Borgs Spawners removed from BR loot pool.
11 December 2023
-Moltijoe updated:
+Runian updated:
+-
+
- Four tech node dedicated for cyborgs upgrades: Night Vision, Engineering, Mining, and Service. Each costing 500 points. +
- Various cyborg upgrades have been moved to more relevant/dedicated technodes. +
- Most tech nodes that involve cyborg upgrades now require the "Advanced Robotics" tech node or a node that already has it as a prerequisite. +
- Most tech nodes that involve cyborg upgrades have now a better description that explains the purpose of the node. +
- "Cyborg Upgrades: Advanced Utility" tech node has been renamed to "Cyborg Upgrades: Advanced Engineering". +
- "Cyborg Upgrades: Advanced Engineering" tech node cost reduced to 2,500 from 5,000. +
- "Cyborg Upgrades: Utility" tech node cost reduced to 1,500 from 2,000. +
- "Cyborg Upgrades: Engineering" and "Cyborg Upgrades: Mining" tech node's icon has been changed to better visualize the node. +
- Janiborg's trashbag of holding upgrade is properly locked behind Advanced Sanitation Technology. +
- Medical gripper can now hold medsprays, lollipops, pills, patches, gummies, and chemistry bags. +
SapphicOverload updated:
-
-
- Adds a job blacklist to certain quirks +
- beam rifles now create turf fires instead of hotspots +
- beam rifle projectiles can always reflect off of coins +
- fixed hitscan projectiles not rendering properly when reflected +
- fixed beam rifle projectiles not doing damage when fired from turrets or emitters
SomeguyManperson updated:
-
-
- plasma fixation now heals significantly more while standing in a room full of plasma +
- limb loss in brazil is now worth 7 marbles +
- limb skeletonization in brazil is now worth 3 marbles +
- If you somehow manage to run out of limbs while leaving brazil, you will be ejected
09 December 2023
-Farquaar, ArcaneDefence, Cark updated:
+jachlompsky updated:
-
-
- added plasmamen screams +
- Added a frost oil chem sprayer to the mr freeze syndikit
Mothblocks, san7890, SpaceManiac, Sinsinins, ZephyrTFA updated:
+warface1234455 updated:
-
-
- Adds EZDB +
- Shitcurity uniform now has fucking armor +
- Nightshift lights now actually consume less power +
- Removes other useless power vars as they dont work with the light fixture anyway +
- Cyborg engineering gripper can now hold server rack and cpu
cark, azzzertyy updated:
+wonderinghost updated:
-
-
- Redesigns captain's office on box +
- Cluwncurse takes 3 minutes instead of 1 minute
Aquizit updated:
+ +29 January 2024
+ktlwjec updated:
-
-
- IceMeta Hermit and Walker ruins can now spawn. -
- Rewrote Hermit flavor text. -
- Walkers currently disabled in config since map needs editing now that it is no longer underground. +
- All pizzas need mozzarella to craft (5u enzyme, 30u cow milk, 5u lemon juice). +
- Mime finger guns properly show what was shot at, and by who. +
- Mime finger gun button has a working icon.
Moltijoe updated:
+13spacemen updated:
-
-
- Fixes a bug with the possessed blade -
- Changes sheltered into a neutral quirk that gives 0 quirk points +
- Compiling the code launches directly into Dream Seeker
N3D6 updated:
+Moltijoe updated:
-
-
- demonic frost miner no longer spawns +
- Fixes a bug with polysmorph tail crawlspeed
SapphicOverload updated:
-
-
- fixed water gun spilling gases when it shouldn't -
- water gun can be drained into containers or emptied -
- water gun can be refilled from water tanks +
- fixed budget insulating gloves melting when touching unpowered cables
azzzertyy updated:
+adamsong updated:
-
-
- Reworded cowboy to be clearer -
- Chaplain can now choose their chapel +
- Added option for admins to spawn items directly in a storage container
bruhlookatthisdood updated:
-
-
- Added a warrant console outside gax brig and a pay stand to gax brig control +
- bonesetter spawns during battle royal now
cuackles updated:
+cowbot92 updated:
-
-
- fixes the chaplain helmet +
- removes infinite money in the form of syrup
08 December 2023
-cowbot92 updated:
+jachlompsky updated:
-
-
- Adds 3 new barsigns -
- Adds new barsign images +
- fixed lasombra vassals and eye examine
07 December 2023
-LoliconSlayer updated:
+wonderinghost updated:
-
-
- Tweaked the names of a few mech melee weapons +
- updates min and max values of byond_version_combat
06 December 2023
-AMyriad updated:
+ynot01 updated:
-
-
- Scrubbed the second "m" from the last mentions of "Centcomm" -
- All mentions of "NanoTrasen" have also been corrected to "Nanotrasen" -
- Added some more words and fixed some old ones for the Nordic accent +
- Live xeno aliens on station level now passively generate research points
28 January 2024
SapphicOverload updated:
-
-
- HFR processes at the same rate as other atmos machines now -
- fixed extended lungs -
- fixed a few issues with the tgui for supermatter monitor, HFR control panel, atmos scanner, and filters/scrubbers -
- fixed ethereal stomachs having the EMP effects of IPCs +
- fixed being unable to analyze the instability of cold fusion reactions +
- IPCs, androids, polysmorphs, and slimepeople now have unique typing indicators +
- Using harm intent makes your typing indicator angry
azzzertyy updated:
+adamsong updated:
-
-
- Network admin now has rnd access +
- fixed mfa backup codes not working
warface1234455 updated:
+cowbot92 updated:
-
-
- fix supermatter normal delam not working +
- Makes the deep fryer hungry, occsionally +
- fixed the faded eyepatch not giving you night vision despite it telling you it does
05 December 2023
-cowbot92 updated:
+27 January 2024
+ktlwjec updated:
-
-
- Adds new alt-job titles to roboticists +
- Removes a line in the sith cloak sprite.
ninjanomnom, Ryll-Ryll, Bizzonium, KylerAce, Sinsinins, lessthnthree updated:
+ +26 January 2024
+Runian updated:
-
-
- Added new fonts and refactored runechat. Also some backend stuff it's fine. +
- Shooting a cyborg snack dispenser while in a zero gravity environment correctly starts moving you in the opposite direction that you shot it.
sapphicoverload, bluishtsunami updated:
+ +23 January 2024
+Moltijoe updated:
-
-
- adds a water gun to donksoft vending machines (and uplink) -
- preternis water damage tweaked to be more affected by smaller volumes -
- preternis water damage updates immediately when splashed instead of waiting up to 2 seconds +
- Fixes an issue with blood decals
04 December 2023
+22 January 2024
Moltijoe updated:
-
-
- Pseudocider costs 8tc instead of 6tc -
- Pseudocider has a 30s cooldown instead of 20s +
- Added new maroon organ objective for traitors to roll +
- Traitor break machinery objective only requires breaking the original machines +
- Traitor break machinery targets at max 2 areas instead of up to 4
SapphicOverload updated:
+Mqiib updated:
-
-
- electrical protection is now its own armor type -
- certain engineering equipment like hard hats and work boots now have electrical protection -
- spliced wires check electrical protection on your feet instead of your hands when you step on them -
- combat defib disarm takes electrical protection on targeted limb into account -
- lightning flow punches, combat defib disarm, and hacked cyborg hug module all check electrical protection on the targeted limb -
- touching hacked cyborg energy fields with your hand now actually checks protection on that hand -
- slightly reorganized the armor tags and adds electrical protection to the list -
- fixed nanites not being affected by electric shock because of a missing signal -
- fixed gloves and shoes with armor not actually protecting your hands and feet respectively -
- fixed power fist not working +
- Imperial jumpsuits don't have alt styles, stop trying to break the dress code soldier!
azzzertyy updated:
+Yarinoi updated:
-
-
- Mediator is no longer roundstart. +
- 'Solo' special syndi-kit is now slightly more balanced. David. David you aren't going to let this stop you are you David. Get to work David ignore the EMPs. Take your pills get to work.
03 December 2023
-cark updated:
--
-
- fixes missing floor in airlock on donut -
itseasytosee, sapphicoverload updated:
+21 January 2024
+ktlwjec updated:
-
-
- some items and projectiles are now better or worse than others at destroying things -
- chat messages from hitting an object now tell whether you can damage it -
- fixed machines/structures/etc not caring about armor penetration when hit by a melee weapon -
- fixed cannonballs not doing any damage to mobs +
- Mammi and Pea Soup need bowls to craft.
Moltijoe updated:
+ +20 January 2024
+kugamo, warface1234455 updated:
-
-
- Sometimes fixes feed ability sometimes breaking -
- Gangrel transformation ability now shows the radial menu before the 10 second do_after -
- Fixes gangrel transformation ability sometimes deleting itself without ever being used -
- Fixes gangrel werewolf transformation being eradicated from the timeline by tattax +
- Resprites the Bluespace Harvester. +
- Also also slightly changes the nether portals event, so that the portals spawn sequentially over at most 15 seconds.
19 January 2024
SapphicOverload updated:
-
-
- fixed ED-209 not being affected by heavy EMPs -
- fixed leg implants not being affected by EMPs at all -
- fixed cybernetic ears causing longer knockdown times on light EMPs instead of the other way around -
- fixed nanite heart killing you instantly on EMP regardless of whether or not it kills your nanites -
- HoS gun now shoots ion carbine projectiles instead of its own redundant projectile type -
- mech ion cannon has 1.5x stronger EMPs than the ion rifle -
- syndicate EMP bomb has 2.5x stronger EMPs than standard EMP grenades -
- reworks EMPs to allow any severity, which now decreases with distance +
- added stairs to icemeta's mining base +
- added directional stairs icons +
- fixed regenerative cores having a delay on icemoon
02 December 2023
-Moltijoe updated:
+warface1234455 updated:
-
-
- No more infinitely duplicating hulk DAN -
- Hulk now occasionally says the brain damage hulk lines +
- Fix invisible netmin wintercoat hood +
- Bring back Raven cruiser emergency shuttle
18 January 2024
SapphicOverload updated:
-
-
- fixed runtime error when passive vents encounter zero temperature or zero volume -
- fixed abandoned crates having a 2% chance to cause runtime errors when initialized +
- made the chat message from losing obsession more visible +
- you can now place items on the altar of the gods without having to climb on top of it
01 December 2023
-Twaticus, Imaginos16, Cark updated:
--
-
- added new object sprite for plasteel tile -
- deleted old object sprite for plasteel tile -
JohnFulpWillard updated:
--
-
- Stasis units and sleepers now have proper overlays and lavaland sleepers aren't invisible anymore. -
Yarinoi updated:
+17 January 2024
+Loiosh42 updated:
-
-
- Pitying the miners attempting to look for it, the Demonic Frost Miner now gives out a Hollow Signal on GPS. +
- Adds an ignition_effect to the cautery.
azzzertyy updated:
+ +15 January 2024
+bruhlookatthisdood updated:
-
-
- You can now point while handcuffed +
- Waiting For The Sun (Rimworld OST) is in jukebox now
cowbot92 updated:
-
-
- Adds new bar signs +
- fixes decals
30 November 2023
-ToasterBiome updated:
+13 January 2024
+SapphicOverload updated:
-
-
- Adds a new lavaland lava type that you can't replace with shelter -
- lavaland syndie base is surrounded by no-shelter lavaland lava +
- fixed chat not always showing up in replays
29 November 2023
-Moltijoe updated:
--
-
- Brig physician also gets cloning and airlock access during skeleton crew -
- Paramedic also gets surgery access during skeleton crew -
- Mining medic also gets cloning, maint, and airlock access during skeleton crew -
- All hecata zombies die when the controlling bloodsucker dies -
- lightning flow no longer immobilizes for like 0.1 seconds every dash -
- Preterni no longer get 20% more power from liquid electricity than other powerhungry species -
- All powerhungry species now get "food" from consuming teslium, not just Preterni -
Runian updated:
+12 January 2024
+SapphicOverload updated:
-
-
- Lizard tail users can *thump their tail. -
- Tail thump. -
- Guardian's Frenzy Ability now respects the three second cooldown that it is suppose to be limited by. +
- adds more winter coats +
- moves winter coat and hood sprites to their own files
ToasterBiome updated:
+Therandomhoboo updated:
-
-
- Removes tile grime and support for it. -
- Replaces tiles to be less shiny. +
- Astrotame, bbq, sugar, cream & chocolate are now 10u's instead of 5. +
- Chocolate packets are now correctly called chocolate packets instead of Creamer....
ynot01 updated:
+warface1234455 updated:
-
-
- Command channel is now blue once more -
- fixed pseudocider not duplicating headwear +
- FIx preset programs arent installed in pda/phone
28 November 2023
-MajManatee updated:
+11 January 2024
+Runian updated:
-
-
- Horrors can now scan their hosts -
- Horror chemicals now say how much they inject +
- The description of ammo boxes now accurately show how much bullets are left when you use an ammo box on another ammo box.
Moltijoe updated:
+ +10 January 2024
+AMyriad updated:
-
-
- Only Delta alert gets red lights -
- Fixes an IAA bug involving pseudocider -
- adds a glowing outline to anyone with the holy light heal boost -
- fixed a bug where limb healing generated less favour than overall healing -
- Increases the holy light heal boost duration to 1 minute from 30 seconds -
- Reduces the amount of favour that holy light generates by 50% -
- Gives warden brig phys access during skeleton crew -
- Makes monster hunters monster hunting objective actually tell the monster hunter to hunt monsters +
- Dusted plasmamen now have plasma remains
Runian updated:
-
-
- Constructed anchored emitters are correctly recognized as wrenched; you no longer need to wrench these anchored emitters twice to make it work. -
- Flying Fang's damage-dealing disarms respects pacifism as intended. -
SapphicOverload updated:
--
-
- fixed fire extinguishers not working if the particle never moves +
- Override Machine and Overload Machine abilities (from malf AI/malf upgrade disk) now work. +
- Nerve Grounding and other ways that change your physiology's siemens coeff properly protect you from getting electrocuted.
cowbot92 updated:
+Scrambledeggs00 updated:
-
-
- Added new fruit -
- Added new drink to go with that fruit -
- added some icons and images for lantern fruits and drinks +
- Added a new thing to IceMeta +
- Sprites for the new thing
27 November 2023
-goober3, cark updated:
+ToasterBiome updated:
-
-
- added some dirt linings +
- rating polls now work properly +
- Updates maintainer list and thanks more stations in our special thanks section
Moltijoe updated:
+bruhlookatthisdood updated:
-
-
- Syndicate fedora can no longer be caught using throw mode +
- ASay and DSay are now no longer visible to non-admins
Mqiib updated:
+wonderinghost updated:
-
-
- Lizard wings now use the new lizard colors instead of the slightly-off old colors +
- fixed my mistakes +
- makes the prior pr picture perfect
Runian updated:
+ +09 January 2024
+Aquizit updated:
-
-
- Ion storms can affect up to 20 airlocks and 10 APCs with random effects, only if is no AI. -
- Airlocks affected by ion storms will randomly have one of the following effects: toggle bolts, toggle emergency access, shock temporarily or have their safety & speed toggled. -
- APCs affected by ion storms will have one of three or all of their power channels turned off. +
- The innkeeper can now get stuff from their booze-o-matic and kitchen vending machines.
SapphicOverload updated:
+ +08 January 2024
+cark updated:
-
-
- preternis now purge 4% of internal chemicals every tick, instead of purging everything after 20 ticks -
- preternis are no longer immune to the effects of morphine and a few other chemicals -
- fixed unintended change to damage of every two-handed weapon -
- fixed runtime error when trying to use certain two-handed weapons with one hand -
- fixed preternis being affected by water through hardsuits +
- fixes some railings in bar +
- Reenables Icemoon Walkers
cowbot92 updated:
+Therandomhoboo updated:
-
-
- Ports updated TG announcements & TGUI +
- Moonshine now makes you gain blurry, long live blurry vision
26 November 2023
-Moltijoe updated:
+05 January 2024
+AMyriad updated:
-
-
- Battle royale loot distribution +
- Updated the storage implant's toggle sprite
SomeguyManperson updated:
+EdgeLordExe updated:
-
-
- hallucination anomalies have had their effects altered. You many want to bring a toolbox instead of mesons when responding to one -
- hallucination reactive armor has had its effects modified similarly to the new effects of the anomaly -
- the supermatter will no longer spawn hallucination anomalies when exploding, on fire, or otherwise. +
- New Mining area: Jungleland, Most content added by Djiq, Most ruins, some mobs and Ivymen added by Marmio64. Other ruins added by ToasterBiome. Various fixes and updates by courtesy of Jamie1D and SapphicOverload! +
- New Mobs now appear on jungleland, such as Meduracha, Dryads, Giant mosquitoes, and Skin Twisters! +
- New Mining implement: Kinetic Javelin, get it either from the roundstart kit, or buy it in a mining vendor. +
- New Megafauna: Tar King - You can summon it by collecting 3 parts of a broken crystal, assembling it, and placing it in a Forgotten Altar! +
- Ivymen - Jungleland's counterpart to ashwalkers, by Marmio64 +
- Jungleland has many new biomes, beware of sulphuric pits, as it will cause you trouble if you step into it. +
- Added new icons and icon states for jungleland +
- Added Jungleland as a new mining destination!
25 November 2023
-Ghommie updated:
--
-
- Examining a human mob as an observer displays "Quirks", not "Traits" -
JohnFulpWillard updated:
+04 January 2024
+ZephyrTFA, san7890 updated:
-
-
- Seclites now have directional lights- point them in the direction you want to see more of. -
- Ported over many refactors to lighting and opacity. Please report if you can walk or see through walls unintentionally. +
- fixed chat messages not showing up sometimes
Majkl-J updated:
+Aquizit updated:
-
-
- Virology: New symptom, superficial healing +
- Removed disposals air alarm +
- Moved windoor in disposals +
- Scrubs a couple bad AI Ion Law things
Runian updated:
-
-
- Shooting plasma sheets with a damaging burn-based projectile ignites it. +
- The threshold description for symbiotic regeneration is now accurate.
SapphicOverload updated:
-
-
- added preference for non-upgraded cybernetic organs as quirk options -
- random cybernetic organ quirk costs 3 instead of 4 +
- polysmorph tails slightly increase crawl speed +
- fixed printed IPCs having human names instead of IPC names +
- supermatter crystal and nuclear reactor are less unstable +
- footstep sounds actually work again
cowbot92 updated:
+Therandomhoboo updated:
-
-
- Adds auxmos to the minor filter +
- Slurring now happens based on what kind of drinker you are (Light, normal or heavy drinker which are based on traits) +
- Slurring duration changed based on drinker type +
- The constant chance to randomly slur, we can drink now
23 November 2023
-SapphicOverload updated:
--
-
- power-fist works like a glove now -
SomeguyManperson updated:
--
-
- gangrel gorilla transformation is now 15 armor down from 40 -
Yarinoi updated:
--
-
- Medical can print chemical analyzer implants again. -
warface1234455 updated:
+03 January 2024
+Cowbot92 & Molti updated:
-
-
- Remove the portable pump cargo pack +
- tweaks how blood works +
- adds new blood +
- removes the old bad blood +
- fear the old blood
ynot01 updated:
+Moltijoe updated:
-
-
- The door between the armory and the auxiliary armory are now default security access +
- Ethereal eyes now give +1 view range
22 November 2023
-PositiveEntropy, Cark, Blutsu updated:
--
-
- new wood sprites from TG, and resprites on stairs by Blutsu -
- replaces old wood tile sprites -
cark updated:
--
-
- bridge on donut now has an APC and blast doors, apc in chapel is moved and some other minor fixes -
00ze-cyclone updated:
--
-
- Removed helmet, bulletproof helmet and riot helmet crates -
- armor, bulletproof armor and riot armor crates now contain helmets as well, price adjusted to cost the same as before -
JohnFulpWillard updated:
--
-
- Pancake overlays now work -
29 December 2023
SapphicOverload updated:
-
-
- fixed people with the bald trait not being bald when cloned -
Therandomhoboo updated:
--
-
- Glycerol making results in 3 units instead of 1 -
- Reinforced Window Damage deflection is now 11 instead of 10 -
wonderinghost updated:
--
-
- Adds new programs and hardware to pdas +
- exosuits now have directional lights, with much longer range
20 November 2023
-Cowbot92 & ChubbyGummibear updated:
+ToasterBiome updated:
-
-
- tweaks heretic TGUI -
- tweaks heretic blade's wound chance +
- Project Bee has a new sprite and description
Moltijoe updated:
+jupyterkat updated:
-
-
- Fixes a bug where lightning flow disabled certain actions if a dash ended weirdly -
- Makes syndicate fedora and boomerang not super janky -
- Syndicate fedora has a longer click throw cd -
- Fixes extended shock touch not having a cooldown or sound effect +
- updated auxmos to latest
-
-
+
+
+
- +Many days and many nights have passed since I left our sanctuary across the isles. +They gave me this crystal, and told me it would be the key to exposing it, the source of our world's cancer.
+ +Now, I see the altar they spoke of, and its misshapen! The lock is too wide, too deep. And there I realized it doesn't fucking fit! +It wasn't a key, it was a SHARD. I risked my life for this! Traveled half the world just for a fucking fragment? And for what? To die here, alone?
+ +This is it. My flask ran dry days ago. I could carry on, but I'm far too weak and too far to go back.
+If any of you find this, I'm so sorry. I failed you all.
+- Welwitschie"} + infolang = /datum/language/sylvan //90% sure this is broken anyways but whatevs diff --git a/yogstation/code/datums/ruins/station.dm b/yogstation/code/datums/ruins/station.dm index 20c2716f1cc4..e5a9d5a66d20 100644 --- a/yogstation/code/datums/ruins/station.dm +++ b/yogstation/code/datums/ruins/station.dm @@ -4,7 +4,6 @@ /datum/map_template/ruin/station/box prefix = "_maps/RandomRuins/StationRuins/BoxStation/" - should_place_on_top = FALSE /datum/map_template/ruin/station/box/engine id = "engine_sm" diff --git a/yogstation/code/datums/world_topic.dm b/yogstation/code/datums/world_topic.dm index 8fc07efea64f..97e34eb09d5e 100644 --- a/yogstation/code/datums/world_topic.dm +++ b/yogstation/code/datums/world_topic.dm @@ -31,6 +31,8 @@ GLOBAL_VAR_INIT(mentornoot, FALSE) var/list/admin_keys = list() for(var/adm in GLOB.permissions.admins) var/client/C = adm + if(isnull(C)) //Yog we're having issues with null holders breaking adminwho, so let's skip nulls + continue if(input["adminchannel"]) admin_keys += "[C][C.holder.fakekey ? "(Stealth)" : ""][C.is_afk() ? "(AFK)" : ""]" else if(!C.holder.fakekey) diff --git a/yogstation/code/game/gamemodes/battle_royale/battleroyale.dm b/yogstation/code/game/gamemodes/battle_royale/battleroyale.dm index 1810591c78ae..be5e3d95852c 100644 --- a/yogstation/code/game/gamemodes/battle_royale/battleroyale.dm +++ b/yogstation/code/game/gamemodes/battle_royale/battleroyale.dm @@ -152,13 +152,13 @@ GLOBAL_VAR(final_zone) /datum/game_mode/fortnite/proc/shrinkborders() switch(borderstage)//to keep it seperate and not fuck with weather selection if(1) - set_security_level("blue") + SSsecurity_level.set_level(SEC_LEVEL_BLUE) if(4) - set_security_level("red") + SSsecurity_level.set_level(SEC_LEVEL_RED) if(7) - set_security_level("gamma") + SSsecurity_level.set_level(SEC_LEVEL_GAMMA) if(9) - set_security_level("epsilon") + SSsecurity_level.set_level(SEC_LEVEL_EPSILON) var/datum/weather/royale/W switch(borderstage) diff --git a/yogstation/code/game/gamemodes/battle_royale/loot.dm b/yogstation/code/game/gamemodes/battle_royale/loot.dm index 640699b352c7..dff852c2da91 100644 --- a/yogstation/code/game/gamemodes/battle_royale/loot.dm +++ b/yogstation/code/game/gamemodes/battle_royale/loot.dm @@ -90,7 +90,6 @@ GLOBAL_LIST_INIT(battleroyale_armour, list( //weight of 0 - all round good things /obj/item/shield/riot = 0, /obj/item/clothing/suit/armor/elder_atmosian = 0, - /obj/item/clothing/head/det_hat/evil = 0, /obj/item/clothing/suit/space/hardsuit/mining = 0, /obj/item/clothing/suit/armor/bulletproof = 0, /obj/item/clothing/head/helmet/space/pirate = 0, @@ -274,6 +273,7 @@ GLOBAL_LIST_INIT(battleroyale_weapon, list( /obj/item/gun/ballistic/automatic/ar = -5, /obj/item/gun/ballistic/automatic/lwt650 = -5, /obj/item/gun/ballistic/automatic/k41s = -5, + /obj/item/clothing/head/det_hat/evil = -5, //infinite ammo ranged weapon with high dps /obj/item/gun/energy/beam_rifle = -6, /obj/item/gun/ballistic/rifle/sniper_rifle = -6, @@ -411,8 +411,7 @@ GLOBAL_LIST_INIT(battleroyale_utility, list(//bombs, explosives, anything that's /obj/item/autosurgeon/syndicate/spinalspeed = -6, // No opportunity cost speed boost /obj/item/storage/belt/wands/full = -7, //not quite spellbook, but some of these wands are FUCKED - - /obj/item/spellbook = -8, //literally auto-win + /obj/item/spellbook = -7, //literally auto-win IF you have the time to use it (a lot of spells are robe locked too) )) /obj/structure/closet/crate/battleroyale @@ -509,7 +508,7 @@ GLOBAL_LIST_INIT(battleroyale_utility, list(//bombs, explosives, anything that's to_chat(user,span_warning("You already know [user.mind.martial_art.name]!")) return - if(do_after(user, 6 SECONDS, user)) + if(do_after(user, 2 SECONDS, user)) var/datum/martial_art/MA = new martial user.set_species(species) MA.teach(user) diff --git a/yogstation/code/game/gamemodes/darkspawn/darkspawn.dm b/yogstation/code/game/gamemodes/darkspawn/darkspawn.dm index 7877abae56fc..a7387e3b4559 100644 --- a/yogstation/code/game/gamemodes/darkspawn/darkspawn.dm +++ b/yogstation/code/game/gamemodes/darkspawn/darkspawn.dm @@ -13,7 +13,7 @@ required_enemies = 3 recommended_enemies = 3 enemy_minimum_age = 15 - restricted_jobs = list("AI", "Cyborg") + restricted_jobs = list("AI", "Cyborg", "Synthetic") protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Research Director", "Chief Engineer", "Chief Medical Officer", "Brig Physician") //Added Brig Physician title_icon = "ss13" diff --git a/yogstation/code/game/gamemodes/gangs/dominator.dm b/yogstation/code/game/gamemodes/gangs/dominator.dm index 6faa286dc4c5..a547e09c032f 100644 --- a/yogstation/code/game/gamemodes/gangs/dominator.dm +++ b/yogstation/code/game/gamemodes/gangs/dominator.dm @@ -63,7 +63,7 @@ if(gang) dominator_overlay.color = gang.color . += dominator_overlay - if(obj_integrity/max_integrity < 0.66) + if(atom_integrity/max_integrity < 0.66) . += "damage" /obj/machinery/dominator/update_icon_state() @@ -90,7 +90,7 @@ . += span_notice("System on standby.") if(nukedisk) . += span_notice("[nukedisk] seems to be stuck inside.") - . += span_danger("System Integrity: [round((obj_integrity/max_integrity)*100,1)]%") + . += span_danger("System Integrity: [round((atom_integrity/max_integrity)*100,1)]%") /obj/machinery/dominator/process() ..() @@ -138,7 +138,7 @@ /obj/machinery/dominator/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = TRUE, attack_dir, armour_penetration = 0) . = ..() if(.) - if(obj_integrity/max_integrity > 0.66) + if(atom_integrity/max_integrity > 0.66) if(prob(damage_amount*2)) spark_system.start() else if(!(stat & BROKEN)) @@ -146,7 +146,8 @@ update_appearance(UPDATE_ICON) -/obj/machinery/dominator/obj_break(damage_flag) +/obj/machinery/dominator/atom_break(damage_flag) + . = ..() if(!(stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1)) set_broken() @@ -242,8 +243,8 @@ if(!was_stranded) priority_announce("All hostile activity within station systems has ceased.","Network Alert") - if(get_security_level() == "delta") - set_security_level("red") + if(SSsecurity_level.get_current_level_as_text() == SEC_LEVEL_DELTA) + SSsecurity_level.set_level(SEC_LEVEL_RED) gang.message_gangtools("Hostile takeover cancelled: Dominator is no longer operational.[gang.dom_attempts ? " You have [gang.dom_attempts] attempt remaining." : " The station network will have likely blocked any more attempts by us."]",1,1) diff --git a/yogstation/code/game/gamemodes/gangs/gangs.dm b/yogstation/code/game/gamemodes/gangs/gangs.dm index 22bc56500ed1..c1cd34e2a966 100644 --- a/yogstation/code/game/gamemodes/gangs/gangs.dm +++ b/yogstation/code/game/gamemodes/gangs/gangs.dm @@ -6,7 +6,7 @@ GLOBAL_LIST_EMPTY(gangs) name = "gang war" config_tag = "gang" antag_flag = ROLE_GANG - restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer", "Brig Physician") //Added Brig Physician + restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer", "Brig Physician", "Synthetic") //Added Brig Physician required_players = 35 required_enemies = 1 recommended_enemies = 2 diff --git a/yogstation/code/game/gamemodes/shadowling/shadowling.dm b/yogstation/code/game/gamemodes/shadowling/shadowling.dm index 8c49e5e19ca0..d9c11c590596 100644 --- a/yogstation/code/game/gamemodes/shadowling/shadowling.dm +++ b/yogstation/code/game/gamemodes/shadowling/shadowling.dm @@ -55,7 +55,7 @@ Made by Xhuis required_enemies = 3 recommended_enemies = 3 enemy_minimum_age = 14 - restricted_jobs = list("AI", "Cyborg") + restricted_jobs = list("AI", "Cyborg", "Synthetic") protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Research Director", "Chief Engineer", "Chief Medical Officer", "Brig Physician") title_icon = "ss13" diff --git a/yogstation/code/game/gamemodes/vampire/traitor_vamp.dm b/yogstation/code/game/gamemodes/vampire/traitor_vamp.dm index 19cbcd4ae94d..e70598ac3fbc 100644 --- a/yogstation/code/game/gamemodes/vampire/traitor_vamp.dm +++ b/yogstation/code/game/gamemodes/vampire/traitor_vamp.dm @@ -4,11 +4,12 @@ false_report_weight = 10 traitors_possible = 3 //hard limit on traitors if scaling is turned off restricted_jobs = list("AI", "Cyborg") - required_players = 25 + required_players = 15 required_enemies = 1 // how many of each type are required recommended_enemies = 3 reroll_friendly = 1 + num_modifier = -2 //less traitors to account for the vamps var/list/possible_vampires = list() var/const/vampire_amt = 2 //hard limit on vampires if scaling is turned off var/list/pre_vamps = list() diff --git a/yogstation/code/game/gamemodes/vampire/vampire.dm b/yogstation/code/game/gamemodes/vampire/vampire.dm index fe88cdada4e2..e14a335a21f9 100644 --- a/yogstation/code/game/gamemodes/vampire/vampire.dm +++ b/yogstation/code/game/gamemodes/vampire/vampire.dm @@ -13,7 +13,7 @@ config_tag = "vampire" antag_flag = ROLE_VAMPIRE false_report_weight = 1 - restricted_jobs = list("AI", "Cyborg") + restricted_jobs = list("AI", "Cyborg", "Synthetic") protected_jobs = list("Head of Security", "Captain", "Head of Personnel", "Research Director", "Chief Engineer", "Chief Medical Officer", "Security Officer", "Chaplain", "Detective", "Warden", "Brig Physician") //Added Brig Physician required_players = 15 required_enemies = 1 diff --git a/yogstation/code/game/machinery/telecomms/computers/traffic_control.dm b/yogstation/code/game/machinery/telecomms/computers/traffic_control.dm index b5d4ea19754a..c1ad4605fe15 100644 --- a/yogstation/code/game/machinery/telecomms/computers/traffic_control.dm +++ b/yogstation/code/game/machinery/telecomms/computers/traffic_control.dm @@ -21,10 +21,13 @@ circuit = /obj/item/circuitboard/computer/telecomms/comm_traffic req_access = list(ACCESS_TCOM_ADMIN) + var/unlimited_range = FALSE /obj/machinery/computer/telecomms/traffic/Initialize(mapload) . = ..() GLOB.traffic_comps += src + if(mapload) + unlimited_range = TRUE /obj/machinery/computer/telecomms/traffic/Destroy() GLOB.traffic_comps -= src @@ -223,9 +226,14 @@ temp = "- FAILED: CANNOT PROBE WHEN BUFFER FULL -" else - for(var/obj/machinery/telecomms/server/T in range(25, src)) - if(T.network == network) - servers.Add(T) + if(unlimited_range) + for(var/obj/machinery/telecomms/server/T as anything in GLOB.tcomms_servers) + if(T.network == network) + servers.Add(T) + else + for(var/obj/machinery/telecomms/server/T in range(25, src)) + if(T.network == network) + servers.Add(T) if(!servers.len) temp = "- FAILED: UNABLE TO LOCATE SERVERS IN \[[network]\] -" diff --git a/yogstation/code/game/machinery/telecomms/machines/server.dm b/yogstation/code/game/machinery/telecomms/machines/server.dm index 12cadbe0faf8..fe12c5063815 100644 --- a/yogstation/code/game/machinery/telecomms/machines/server.dm +++ b/yogstation/code/game/machinery/telecomms/machines/server.dm @@ -1,3 +1,5 @@ +GLOBAL_LIST_EMPTY(tcomms_servers) + /obj/item/radio/server /obj/item/radio/server/can_receive(frequency,levels) @@ -21,6 +23,11 @@ Compiler = new() Compiler.Holder = src server_radio = new() + GLOB.tcomms_servers += src + . = ..() + +/obj/machinery/telecomms/server/Destroy() + GLOB.tcomms_servers -= src . = ..() /obj/machinery/telecomms/server/proc/update_logs() diff --git a/yogstation/code/game/objects/effects/landmarks.dm b/yogstation/code/game/objects/effects/landmarks.dm index afb45340a277..69d1e7c5e183 100644 --- a/yogstation/code/game/objects/effects/landmarks.dm +++ b/yogstation/code/game/objects/effects/landmarks.dm @@ -60,6 +60,7 @@ GLOBAL_LIST_EMPTY(chosen_station_templates) stack_trace("Station room spawner [src] at ([T.x], [T.y], [T.z]) has a null template.") if(!template_name || template_name == EMPTY_SPAWN) GLOB.stationroom_landmarks -= src + qdel(src) return FALSE GLOB.chosen_station_templates += template_name var/datum/map_template/template = SSmapping.station_room_templates[template_name] @@ -69,7 +70,7 @@ GLOBAL_LIST_EMPTY(chosen_station_templates) template.load(T, centered = FALSE) template.loaded++ GLOB.stationroom_landmarks -= src - //qdel(src) + qdel(src) return TRUE // Proc to allow you to add conditions for choosing templates, instead of just randomly picking from the template list. @@ -91,40 +92,22 @@ GLOBAL_LIST_EMPTY(chosen_station_templates) template_names = current_templates return chosen_template -/obj/effect/landmark/stationroom/box - ///Should this landmark load a template during setup? You might not want to in the case of the chapel or clerk office that uses - ///player preferences to determine which template loads on roundstart - var/load_on_init = TRUE - -/obj/effect/landmark/stationroom/box/load(template_name) - GLOB.stationroom_landmarks -= src - if(!load_on_init) - //don't actually load anything, we're going to do that ourselves - return TRUE - . = ..() - /obj/effect/landmark/stationroom/box/bar - load_on_init = FALSE template_names = list( "Bar Trek", "Bar Spacious", "Bar Box", "Bar Casino", "Bar Citadel", "Bar Conveyor", "Bar Diner", "Bar Disco", "Bar Purple", "Bar Cheese", "Bar Clock", "Bar Arcade") -/obj/effect/landmark/stationroom/box/bar/Initialize(mapload) - . = ..() - GLOB.bar_landmarks += src +/obj/effect/landmark/stationroom/box/bar/load(template_name) + GLOB.stationroom_landmarks -= src + return TRUE /obj/effect/landmark/stationroom/box/clerk - load_on_init = FALSE template_names = list("Clerk Box", "Clerk Pod", "Clerk Meta", "Clerk Gambling Hall") -/obj/effect/landmark/stationroom/box/clerk/Initialize(mapload) - . = ..() - GLOB.clerk_office_landmarks += src - -// /obj/effect/landmark/stationroom/box/clerk/load(template_name) -// GLOB.stationroom_landmarks -= src -// return TRUE +/obj/effect/landmark/stationroom/box/clerk/load(template_name) + GLOB.stationroom_landmarks -= src + return TRUE /obj/effect/landmark/stationroom/box/engine template_names = list("Engine SM" = 40, "Engine Singulo And Tesla" = 20, "Engine Nuclear Reactor" = 20,"Engine TEG" = 20) @@ -161,19 +144,14 @@ GLOBAL_LIST_EMPTY(chosen_station_templates) template_names = list("Transfer 1", "Transfer 2", "Transfer 3", "Transfer 4", "Transfer 5", "Transfer 6", "Transfer 7", "Transfer 8", "Transfer 9", "Transfer 10") /obj/effect/landmark/stationroom/box/chapel - load_on_init = FALSE template_names = list("Chapel 1", "Chapel 2") -/obj/effect/landmark/stationroom/box/chapel/Initialize(mapload) - . = ..() - GLOB.chapel_landmarks += src - -// /obj/effect/landmark/stationroom/box/chapel/load(template_name) -// GLOB.stationroom_landmarks -= src -// return TRUE +/obj/effect/landmark/stationroom/box/chapel/load(template_name) + GLOB.stationroom_landmarks -= src + return TRUE /obj/effect/landmark/stationroom/meta/engine - template_names = list("Meta SM" = 25, "Meta Nuclear Reactor" = 45, "Meta TEG" = 25) // tesla is loud as fuck and singulo doesn't make sense, so SM/reactor only + template_names = list("Meta SM" = 45, "Meta Nuclear Reactor" = 30, "Meta TEG" = 25) // tesla is loud as fuck and singulo doesn't make sense, so SM/reactor only /obj/effect/landmark/stationroom/meta/engine/choose() . = ..() diff --git a/yogstation/code/game/objects/items/devices/PDA/PDA_types.dm b/yogstation/code/game/objects/items/devices/PDA/PDA_types.dm index db7b25682297..935d444e14b5 100644 --- a/yogstation/code/game/objects/items/devices/PDA/PDA_types.dm +++ b/yogstation/code/game/objects/items/devices/PDA/PDA_types.dm @@ -1,23 +1,23 @@ /obj/item/pda/network_admin - name = "telecomms PDA" + name = "\improper antique telecomms PDA" default_cartridge = /obj/item/cartridge/signal icon_state = "pda_tcomms" light_color = LIGHT_COLOR_ORANGE /obj/item/pda/para - name = "paramedic PDA" + name = "\improper antique paramedic PDA" default_cartridge = /obj/item/cartridge/paramedic icon_state = "pda-medical" light_color = LIGHT_COLOR_LIGHT_CYAN /obj/item/pda/miningmed - name = "mining medic PDA" + name = "\improper antique mining medic PDA" default_cartridge = /obj/item/cartridge/medical icon_state = "pda-miningmed" light_color = LIGHT_COLOR_LIGHT_CYAN /obj/item/pda/physician - name = "brig physician PDA" + name = "\improper antique brig physician PDA" default_cartridge = /obj/item/cartridge/medical icon_state = "pda-physician" light_color = LIGHT_COLOR_RED diff --git a/yogstation/code/game/objects/items/fishing/bait.dm b/yogstation/code/game/objects/items/fishing/bait.dm index 54e4abf3d3f8..d0c64df32657 100644 --- a/yogstation/code/game/objects/items/fishing/bait.dm +++ b/yogstation/code/game/objects/items/fishing/bait.dm @@ -1,6 +1,6 @@ /obj/item/reagent_containers/food/snacks/bait name = "development bait" - desc = "if you see this, get help" + desc = "If you see this, get help." icon = 'yogstation/icons/obj/fishing/fishing.dmi' icon_state = "bait_worm" tastes = list("sour, rotten water" = 1) diff --git a/yogstation/code/game/objects/items/fryingpan.dm b/yogstation/code/game/objects/items/fryingpan.dm index 713456831d22..1ab09be3a910 100644 --- a/yogstation/code/game/objects/items/fryingpan.dm +++ b/yogstation/code/game/objects/items/fryingpan.dm @@ -54,8 +54,7 @@ statue.name = "bananium plated [statue.name]" statue.desc = "An incredibly lifelike bananium carving." statue.add_atom_colour("#ffd700", FIXED_COLOUR_PRIORITY) - statue.max_integrity = 9999 - statue.obj_integrity = 9999 + statue.modify_max_integrity(9999, can_break=FALSE) return ..() /obj/item/melee/fryingpan/bananium/honk_act() diff --git a/yogstation/code/game/objects/items/implants/implant_teleporter.dm b/yogstation/code/game/objects/items/implants/implant_teleporter.dm index 9cabcb3d96ca..6a4aab7397a8 100644 --- a/yogstation/code/game/objects/items/implants/implant_teleporter.dm +++ b/yogstation/code/game/objects/items/implants/implant_teleporter.dm @@ -6,6 +6,8 @@ var/useblacklist = TRUE var/on = FALSE var/retrievalmessage = "Retrieval complete." + var/punishment = FALSE + var/punishment_damage = 0 /obj/item/implant/teleporter/Initialize(mapload) START_PROCESSING(SSobj, src) @@ -49,6 +51,8 @@ if(!is_centcom_level(T.z)) do_teleport(imp_in, pointofreturn, 0, channel = TELEPORT_CHANNEL_WORMHOLE) say(retrievalmessage) + if(punishment == TRUE) + imp_in.adjustFireLoss(punishment_damage) /obj/item/implant/teleporter/implant(mob/living/target, mob/user, silent = FALSE, force = FALSE) LAZYINITLIST(target.implants) @@ -107,3 +111,10 @@ pointofreturn = /area/ruin/powered/inn usewhitelist = TRUE retrievalmessage = "Safety retrieval complete." + +/obj/item/implant/teleporter/demon + pointofreturn = /area/ruin/powered/sinden + usewhitelist = TRUE + punishment = TRUE + punishment_damage = 50 + retrievalmessage = "You think you can just abandon your contract?" diff --git a/yogstation/code/game/objects/items/tools.dm b/yogstation/code/game/objects/items/tools.dm index 477c5ff547be..318ecf491089 100644 --- a/yogstation/code/game/objects/items/tools.dm +++ b/yogstation/code/game/objects/items/tools.dm @@ -118,6 +118,9 @@ if(HAS_TRAIT(user, TRAIT_PACIFISM)) to_chat(user, span_warning("You don't want to harm [M]!")) return + if(!synth_check(user, SYNTH_ORGANIC_HARM)) + to_chat(user, span_warning("You don't want to harm [M]!")) + return if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50)) M = user return eyestab(M,user) diff --git a/yogstation/code/game/objects/items/wielded/big_spoon.dm b/yogstation/code/game/objects/items/wielded/big_spoon.dm index 107bce062e96..d6f0ad40c6ca 100644 --- a/yogstation/code/game/objects/items/wielded/big_spoon.dm +++ b/yogstation/code/game/objects/items/wielded/big_spoon.dm @@ -28,6 +28,7 @@ wield_callback = CALLBACK(src, PROC_REF(on_wield)), \ unwield_callback = CALLBACK(src, PROC_REF(on_unwield)), \ ) + AddComponent(/datum/component/cleave_attack, requires_wielded=TRUE, no_multi_hit=TRUE) /obj/item/bigspoon/proc/on_wield(atom/source, mob/living/user) hitsound = 'yogstation/sound/weapons/bat_hit.ogg' diff --git a/yogstation/code/game/objects/items/wielded/sledgehammer.dm b/yogstation/code/game/objects/items/wielded/sledgehammer.dm index 9101954a7a3d..750a91ccf359 100644 --- a/yogstation/code/game/objects/items/wielded/sledgehammer.dm +++ b/yogstation/code/game/objects/items/wielded/sledgehammer.dm @@ -33,6 +33,11 @@ require_twohands = TRUE, \ wielded_stats = list(SWING_SPEED = 1.5, ENCUMBRANCE = 0.5, ENCUMBRANCE_TIME = 1 SECONDS, REACH = 1, DAMAGE_LOW = 0, DAMAGE_HIGH = 0), \ ) + AddComponent(/datum/component/cleave_attack, \ + arc_size=180, \ + requires_wielded=TRUE, \ + no_multi_hit=TRUE, \ + ) // big and heavy hammer makes wide arc /obj/item/melee/sledgehammer/proc/on_wield(atom/source, mob/living/user) hitsound = "swing_hit" @@ -50,11 +55,12 @@ if(!proximity_flag) return - if(isstructure(target) || ismachinery(target)) + if(target.uses_integrity) if(!QDELETED(target)) - var/obj/structure/S = target - if(istype(S, /obj/structure/window)) // Sledgehammer really good at smashing windows. 2-7 hits to kill a window - S.take_damage(S.max_integrity/2, BRUTE, MELEE, FALSE, null, armour_penetration) + if(istype(target, /obj/structure/window)) // Sledgehammer really good at smashing windows. 2-7 hits to kill a window + target.take_damage(target.max_integrity/2, BRUTE, MELEE, FALSE, null, armour_penetration) + if(iswallturf(target)) + target.take_damage(force * demolition_mod, BRUTE, MELEE, FALSE, null, armour_penetration) // Sledgehammers are quite good at smashing walls playsound(src, 'sound/effects/bang.ogg', 50, 1) /obj/item/melee/sledgehammer/throw_at(atom/target, range, speed, mob/thrower, spin, diagonals_first, datum/callback/callback, force, quickstart) diff --git a/yogstation/code/game/objects/items/wielded/vxtvulhammer.dm b/yogstation/code/game/objects/items/wielded/vxtvulhammer.dm index b5e709874d34..dcdf2f921549 100644 --- a/yogstation/code/game/objects/items/wielded/vxtvulhammer.dm +++ b/yogstation/code/game/objects/items/wielded/vxtvulhammer.dm @@ -46,6 +46,11 @@ force_wielded = force_wielded, \ unwield_callback = CALLBACK(src, PROC_REF(on_unwield)), \ ) + AddComponent(/datum/component/cleave_attack, \ + arc_size=180, \ + requires_wielded=TRUE, \ + cleave_end_callback=CALLBACK(src, PROC_REF(end_swing)), \ + ) /obj/item/melee/vxtvulhammer/Destroy() //Even though the hammer won't probably be destroyed, Ever™ QDEL_NULL(spark_system) @@ -70,6 +75,10 @@ user.visible_message(span_warning("[user] flicks the hammer off!")) charging = FALSE +/obj/item/melee/vxtvulhammer/proc/end_swing(obj/item/weapon, mob/user) + if(supercharged) + supercharge() + /obj/item/melee/vxtvulhammer/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(attack_type == PROJECTILE_ATTACK || !HAS_TRAIT(src, TRAIT_WIELDED)) //Doesn't work against ranged or if it's not wielded final_block_chance = 0 //Please show me how you can block a bullet with an industrial hammer I would LOVE to see it @@ -143,39 +152,26 @@ K.color = color playsound(loc, 'sound/effects/powerhammerhit.ogg', 80, FALSE) //Mainly this sound playsound(loc, 'sound/effects/explosion3.ogg', 20, TRUE) //Bit of a reverb - supercharge() //At start so it doesn't give an unintentional message if you hit yourself + if(!HAS_TRAIT(src, TRAIT_CLEAVING)) // wait for the swing to end + supercharge() //At start so it doesn't give an unintentional message if you hit yourself - if(ismachinery(target) && !toy) - var/obj/machinery/machine = target - machine.take_damage(machine.max_integrity * 2) //Should destroy machines in one hit - if(istype(target, /obj/machinery/door)) + if(ismecha(target) && !toy) + user.visible_message(span_danger("The hammer thunders against [target], caving in part of its outer plating!")) + target.take_damage(target.max_integrity/3, damtype, MELEE, FALSE, null, armour_penetration) + + else if(target.uses_integrity && !toy) + user.visible_message(span_danger("The hammer thunders against [target], demolishing it!"), blind_message=span_hear("You hear thunder.")) + target.atom_destruction(damtype) + if(ismachinery(target)) for(var/obj/structure/door_assembly/door in target_turf) //Will destroy airlock assembly left behind, but drop the parts door.take_damage(door.max_integrity * 2) - else for(var/obj/structure/frame/base in target_turf) //Will destroy machine or computer frame left behind, but drop the parts base.take_damage(base.max_integrity * 2) for(var/obj/structure/light_construct/light in target_turf) //Also light frames because why not light.take_damage(light.max_integrity * 2) - user.visible_message(span_danger("The hammer thunders against the [target.name], demolishing it!")) - - else if(isstructure(target) && !toy) - var/obj/structure/struct = target - struct.take_damage(struct.max_integrity * 2) //Destroy structures in one hit too if(istype(target, /obj/structure/table)) for(var/obj/structure/table_frame/platform in target_turf) platform.take_damage(platform.max_integrity * 2) //Destroys table frames left behind - user.visible_message(span_danger("The hammer thunders against the [target.name], destroying it!")) - - else if(iswallturf(target) && !toy) - var/turf/closed/wall/fort = target - fort.dismantle_wall(1) //Deletes the wall but drop the materials, just like destroying a machine above - user.visible_message(span_danger("The hammer thunders against the [target.name], shattering it!")) - playsound(loc, 'sound/effects/meteorimpact.ogg', 50, TRUE) //Otherwise there's no sound for hitting the wall, since it's just dismantled - - else if(ismecha(target) && !toy) - var/obj/mecha/mech = target - mech.take_damage(mech.max_integrity/3) //A third of its max health is dealt as an untyped damage, in addition to the normal damage of the weapon (which has high AP) - user.visible_message(span_danger("The hammer thunders as it massively dents the plating of the [target.name]!")) else if(isliving(target)) var/atom/throw_target = get_edge_target_turf(target, user.dir) diff --git a/yogstation/code/game/objects/structures/bar_stuff/bar_stuff.dm b/yogstation/code/game/objects/structures/bar_stuff/bar_stuff.dm index a516fed1e226..76a5945595f7 100644 --- a/yogstation/code/game/objects/structures/bar_stuff/bar_stuff.dm +++ b/yogstation/code/game/objects/structures/bar_stuff/bar_stuff.dm @@ -76,4 +76,3 @@ turf/open/floor/plasteel/ameridiner name = "slot machine" desc = "Gambling for the antisocial." icon = 'yogstation/icons/obj/special_slot_machine.dmi' - icon_state = "slots1" diff --git a/yogstation/code/game/objects/structures/fireaxe.dm b/yogstation/code/game/objects/structures/fireaxe.dm index 782a1d697575..c70ab3751551 100644 --- a/yogstation/code/game/objects/structures/fireaxe.dm +++ b/yogstation/code/game/objects/structures/fireaxe.dm @@ -30,7 +30,7 @@ return ..() /obj/structure/fireaxecabinet/proc/check_deconstruct(obj/item/I, mob/user) - if(istype(I, /obj/item/wrench) && !(flags_1 & NODECONSTRUCT_1) && !fireaxe && (open || broken || obj_integrity >= max_integrity)) + if(istype(I, /obj/item/wrench) && !(flags_1 & NODECONSTRUCT_1) && !fireaxe && (open || broken || atom_integrity >= max_integrity)) //User is attempting to wrench an open/broken fireaxe cabinet with NO fireaxe in it user.visible_message(span_warning("[user] disassembles the [name]."), \ "You start to disassemble the [name]...", \ diff --git a/yogstation/code/game/world.dm b/yogstation/code/game/world.dm index 19f4643c9869..d678208817ea 100644 --- a/yogstation/code/game/world.dm +++ b/yogstation/code/game/world.dm @@ -40,9 +40,9 @@ GLOBAL_LIST_EMPTY(donators) var/s = "" var/server_name = CONFIG_GET(string/servername) if (server_name) - s += "[server_name]\] — Dive in Now: Perfect for Beginners!" - s += "
99% Lag-Free MRP Experience! Join the Adventure!" - s += "
Time: [gameTimestamp("hh:mm")] | Map: [SSmapping?.config?.map_name || "Unknown"] | Alert: [capitalize(get_security_level())]" + s += "[server_name]\] — Dive in Now: Perfect for Beginners!" + s += "
99% Lag-Free | Regular Events | Active Community" + s += "
Time: [gameTimestamp("hh:mm")] | Map: [SSmapping?.config?.map_name || "Unknown"] | Alert: [capitalize(SSsecurity_level.get_current_level_as_text())]" s += "
\[Website" // link to our website so they can join forums + discord from here //As of October 27th, 2023 taglines.txt is no longer used in the status because we never had the characters to spare it, so it would put 2-3 random characters at the end and look bad. diff --git a/yogstation/code/modules/antagonists/blob/blob/blobs/core.dm b/yogstation/code/modules/antagonists/blob/blob/blobs/core.dm index 3d0cae270729..f4a71e4d6d06 100644 --- a/yogstation/code/modules/antagonists/blob/blob/blobs/core.dm +++ b/yogstation/code/modules/antagonists/blob/blob/blobs/core.dm @@ -1,5 +1,5 @@ /obj/structure/blob/core/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = TRUE, attack_dir, armour_penetration = 0, overmind_reagent_trigger = 1) . = ..() - if(obj_integrity > 0) + if(atom_integrity > 0) if(overmind) //we should have an overmind, but... to_chat(overmind, span_userdanger("Your core is under attack!")) diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn.dm index cabb30efe47c..71929e7a87f6 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn.dm @@ -354,7 +354,7 @@ /datum/antagonist/darkspawn/proc/sacrament() var/mob/living/carbon/human/user = owner.current if(!SSticker.mode.sacrament_done) - set_security_level(SEC_LEVEL_GAMMA) + SSsecurity_level.set_level(SEC_LEVEL_GAMMA) addtimer(CALLBACK(src, PROC_REF(sacrament_shuttle_call)), 50) for(var/V in abilities) remove_ability(abilities[V], TRUE) diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/psionic_barrier.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/psionic_barrier.dm index 281aab20764d..da12b75b8c62 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/psionic_barrier.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/psionic_barrier.dm @@ -2,7 +2,6 @@ /obj/structure/psionic_barrier name = "psionic barrier" desc = "Shimmering violet particles dancing in the air. They're impossible to move past." - obj_integrity = 200 max_integrity = 200 icon = 'icons/effects/effects.dmi' icon_state = "purplesparkles" @@ -21,7 +20,7 @@ QDEL_IN(src, time) /obj/structure/psionic_barrier/Destroy() - if(!obj_integrity) + if(!atom_integrity) visible_message(span_warning("[src] vanishes in a burst of violet energy!")) playsound(src, 'sound/effects/hit_on_shattered_glass.ogg', 50, TRUE) new/obj/effect/temp_visual/revenant/cracks(get_turf(src)) @@ -29,4 +28,4 @@ return ..() /obj/structure/psionic_barrier/process() - obj_integrity = max(0, min(max_integrity, obj_integrity + 1)) + update_integrity(max(0, min(max_integrity, atom_integrity + 1))) diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/simulacrum.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/simulacrum.dm index 07eeda0ce750..1334b50eb7f4 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/simulacrum.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/simulacrum.dm @@ -4,7 +4,8 @@ desc = "What are you hiding?!" icon_state = "static" density = TRUE - obj_integrity = 25 + uses_integrity = TRUE + max_integrity = 25 var/mob/living/mimicking /obj/effect/simulacrum/Initialize(mapload) diff --git a/yogstation/code/modules/antagonists/gang/gang.dm b/yogstation/code/modules/antagonists/gang/gang.dm index 7aba5234418a..d125285519a8 100644 --- a/yogstation/code/modules/antagonists/gang/gang.dm +++ b/yogstation/code/modules/antagonists/gang/gang.dm @@ -514,7 +514,7 @@ /datum/team/gang/proc/domination() domination_time = world.time + determine_domination_time()*10 - set_security_level("delta") + SSsecurity_level.set_level(SEC_LEVEL_DELTA) /datum/team/gang/proc/determine_domination_time() // calculates the value in seconds (this is the initial domination time!) var/total_territories = total_claimable_territories() diff --git a/yogstation/code/modules/antagonists/infiltrator/outfit.dm b/yogstation/code/modules/antagonists/infiltrator/outfit.dm index b5060a1ee3a9..fd1041e4c7e2 100644 --- a/yogstation/code/modules/antagonists/infiltrator/outfit.dm +++ b/yogstation/code/modules/antagonists/infiltrator/outfit.dm @@ -1,4 +1,4 @@ -/datum/outfit/infiltrator +/datum/outfit/infiltrator // RIP name = "Syndicate Infiltrator" uniform = /obj/item/clothing/under/chameleon/syndicate @@ -8,9 +8,9 @@ ears = /obj/item/radio/headset/chameleon/syndicate id = /obj/item/card/id/syndicate mask = /obj/item/clothing/mask/chameleon/syndicate - belt = /obj/item/pda/chameleon/syndicate - backpack_contents = list(/obj/item/storage/box/engineer=1,\ - /obj/item/kitchen/knife/combat/survival=1,\ + belt = /obj/item/modular_computer/tablet/pda/preset/syndicate + box = /obj/item/storage/box/survival/engineer + backpack_contents = list(/obj/item/kitchen/knife/combat/survival=1,\ /obj/item/gun/ballistic/automatic/pistol=1) /datum/outfit/infiltrator/post_equip(mob/living/carbon/human/H) diff --git a/yogstation/code/modules/antagonists/shadowling/special_shadowling_abilities.dm b/yogstation/code/modules/antagonists/shadowling/special_shadowling_abilities.dm index e76c1369df92..191d4c687865 100644 --- a/yogstation/code/modules/antagonists/shadowling/special_shadowling_abilities.dm +++ b/yogstation/code/modules/antagonists/shadowling/special_shadowling_abilities.dm @@ -205,7 +205,7 @@ H.invisibility = 60 //This is pretty bad, but is also necessary for the shuttle call to function properly H.forceMove(A) if(!SSticker.mode.shadowling_ascended) - set_security_level(SEC_LEVEL_GAMMA) + SSsecurity_level.set_level(SEC_LEVEL_GAMMA) SSshuttle.emergency_call_time = 1800 SSshuttle.emergency.request(null, 0.3) SSshuttle.emergency_no_recall = TRUE diff --git a/yogstation/code/modules/clothing/gloves/miscellaneous.dm b/yogstation/code/modules/clothing/gloves/miscellaneous.dm index 076f56947d07..f30b0e6b7063 100644 --- a/yogstation/code/modules/clothing/gloves/miscellaneous.dm +++ b/yogstation/code/modules/clothing/gloves/miscellaneous.dm @@ -9,8 +9,8 @@ armor = list(melee = 35, bullet = 50, laser = 45, energy = 30, bomb = 50, bio = 50, rad = 40) /obj/item/clothing/gloves/yogs/army - desc = "Gloves often seen used by military folk. These gloves are fire-resistant." name = "military gloves" + desc = "Gloves often seen used by military folk. These gloves are fire-resistant." icon_state = "armygloves" item_state = "armygloves" cold_protection = HANDS @@ -20,12 +20,12 @@ resistance_flags = NONE /obj/item/clothing/gloves/yogs/namgloves - desc = "nam gloves to help show people just exactly what war is good for." name = "nam gloves" + desc = "Nam gloves to help show people just exactly what war is good for." icon_state = "namgloves" item_state = "namgloves" cold_protection = HANDS min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT heat_protection = HANDS max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT - resistance_flags = NONE \ No newline at end of file + resistance_flags = NONE diff --git a/yogstation/code/modules/clothing/head/misc.dm b/yogstation/code/modules/clothing/head/misc.dm index 16af86af9c32..bfb6fa7996aa 100644 --- a/yogstation/code/modules/clothing/head/misc.dm +++ b/yogstation/code/modules/clothing/head/misc.dm @@ -56,6 +56,7 @@ worn_x_dimension = 64 worn_y_dimension = 64 resistance_flags = FLAMMABLE + clothing_flags = LARGE_WORN_ICON /obj/item/clothing/head/yogs/goatpope/equipped(mob/living/carbon/human/user, slot) ..() diff --git a/yogstation/code/modules/clothing/suits/armor.dm b/yogstation/code/modules/clothing/suits/armor.dm index 6877bd5e8e12..ba67ea89f6eb 100644 --- a/yogstation/code/modules/clothing/suits/armor.dm +++ b/yogstation/code/modules/clothing/suits/armor.dm @@ -55,7 +55,7 @@ /obj/item/clothing/suit/armor/vest/hosjacket name = "head of security jacket" - desc = "all the style of a jacket with all the protection of a armor vest!" + desc = "All the style of a jacket with all the protection of a armor vest!" mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi' icon = 'yogstation/icons/obj/clothing/suits.dmi' icon_state = "hos_jacket" @@ -63,7 +63,7 @@ /obj/item/clothing/suit/armor/vest/wardenjacket name = "warden's black jacket" - desc = "all the style of a jacket with all the protection of a armor vest!" + desc = "All the style of a jacket with all the protection of a armor vest!" mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi' icon = 'yogstation/icons/obj/clothing/suits.dmi' icon_state = "warden_jacket" @@ -71,7 +71,7 @@ /obj/item/clothing/suit/armor/hos/germancoat name = "padded german coat" - desc = "for those cold german winters or for those head of securitys that want to show their true colors." + desc = "For those cold german winters or those heads of security that want to show their true colors." mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi' icon = 'yogstation/icons/obj/clothing/suits.dmi' icon_state = "german_coat" diff --git a/yogstation/code/modules/clothing/suits/labcoat.dm b/yogstation/code/modules/clothing/suits/labcoat.dm index 594b408aad1d..e4afdff8b7e0 100644 --- a/yogstation/code/modules/clothing/suits/labcoat.dm +++ b/yogstation/code/modules/clothing/suits/labcoat.dm @@ -2,13 +2,13 @@ /obj/item/clothing/suit/toggle/labcoat/emt/explorer name = "mining medic's jacket" desc = "A protective jacket for medical emergencies on off-world planets. Has MM embossed into it." - armor = list(melee = 10, bullet = 10, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0, fire = 50, acid = 50) + armor = list(MELEE = 25, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 50, BIO = 100, RAD = 50, FIRE = 50, ACID = 50, WOUND = 10) allowed = list(/obj/item/analyzer,/obj/item/multitool/tricorder,/obj/item/stack/medical,/obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/autoinjector,/obj/item/healthanalyzer,/obj/item/flashlight/pen,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle,/obj/item/paper,/obj/item/melee/classic_baton/telescopic,/obj/item/soap,/obj/item/sensor_device,/obj/item/tank/internals, /obj/item/hypospray) /obj/item/clothing/suit/toggle/labcoat/explorer name = "mining medic's labcoat" desc = "A protective labcoat for medical emergencies on off-world planets." - armor = list(melee = 10, bullet = 10, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0, fire = 50, acid = 50) + armor = list(MELEE = 25, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 50, BIO = 100, RAD = 50, FIRE = 50, ACID = 50, WOUND = 10) allowed = list(/obj/item/analyzer,/obj/item/multitool/tricorder,/obj/item/stack/medical,/obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/autoinjector,/obj/item/healthanalyzer,/obj/item/flashlight/pen,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle,/obj/item/paper,/obj/item/melee/classic_baton/telescopic,/obj/item/soap,/obj/item/sensor_device,/obj/item/tank/internals, /obj/item/hypospray) mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi' icon_state = "labcoat_mining" diff --git a/yogstation/code/modules/clothing/suits/miscellaneous.dm b/yogstation/code/modules/clothing/suits/miscellaneous.dm index 5bf739e57c9f..ce8501efe69c 100644 --- a/yogstation/code/modules/clothing/suits/miscellaneous.dm +++ b/yogstation/code/modules/clothing/suits/miscellaneous.dm @@ -365,7 +365,7 @@ /obj/item/clothing/head/hooded/winterhood/northern name = "northern hat" - desc = "only this, and nothing more." + desc = "Only this, and nothing more." icon_state = "northern" item_state = "northern" diff --git a/yogstation/code/modules/clothing/under/jobs/civilian.dm b/yogstation/code/modules/clothing/under/jobs/civilian.dm index 7778dc455761..127028c6f74d 100644 --- a/yogstation/code/modules/clothing/under/jobs/civilian.dm +++ b/yogstation/code/modules/clothing/under/jobs/civilian.dm @@ -27,8 +27,8 @@ name = "recovery medic's jumpsuit" icon_state = "recovery" item_state = "recovery" - can_adjust = 0 + can_adjust = FALSE sensor_mode = 3 - random_sensor = 0 - armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 15, rad = 0) + random_sensor = FALSE + armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 15, RAD = 0, FIRE = 80, ACID = 0, WOUND = 10) mutantrace_variation = MUTANTRACE_VARIATION diff --git a/yogstation/code/modules/clothing/under/miscellaneous.dm b/yogstation/code/modules/clothing/under/miscellaneous.dm index 2de468450e1f..e0949e2a878f 100644 --- a/yogstation/code/modules/clothing/under/miscellaneous.dm +++ b/yogstation/code/modules/clothing/under/miscellaneous.dm @@ -566,3 +566,11 @@ icon_state = "cosby" item_state = "cosby" can_adjust = 0 + +/obj/item/clothing/under/yogs/hawaiian_skirt + name = "hawaiian skirt" + desc = "A traditional hawaiian skirt, often called a pa'u." + icon_state = "hawaiian_skirt" + item_state = "hawaiian_skirt" + fitted = FEMALE_UNIFORM_TOP //no hole in the skirt + can_adjust = 0 diff --git a/yogstation/code/modules/crafting/recipes.dm b/yogstation/code/modules/crafting/recipes.dm index cf8f4785e9f7..ccc26308afef 100644 --- a/yogstation/code/modules/crafting/recipes.dm +++ b/yogstation/code/modules/crafting/recipes.dm @@ -118,3 +118,23 @@ ) tool_paths = list(/obj/item/weldingtool) category = CAT_STRUCTURES + +/datum/crafting_recipe/pinapolantern + name = "Pinap-o'-Lantern" + result = /obj/item/clothing/under/yogs/hawaiian_skirt + time = 2 SECONDS + reqs = list ( + /obj/item/reagent_containers/food/snacks/grown/pineapple = 1, + /obj/item/flashlight/lantern = 1 + ) + category = CAT_MISC + +/datum/crafting_recipe/hawaiian_skirt + name = "Hawaiian Skirt" + result = /obj/item/clothing/under/yogs/hawaiian_skirt + time = 2 SECONDS + reqs = list ( + /obj/item/reagent_containers/food/snacks/grown/coconut = 1, + /obj/item/reagent_containers/food/snacks/grown/grass = 1 + ) + category = CAT_CLOTHING diff --git a/yogstation/code/modules/guardian/abilities/major/explosive.dm b/yogstation/code/modules/guardian/abilities/major/explosive.dm index bfac5e5dfad5..1f9bc887801c 100644 --- a/yogstation/code/modules/guardian/abilities/major/explosive.dm +++ b/yogstation/code/modules/guardian/abilities/major/explosive.dm @@ -19,7 +19,7 @@ GLOBAL_LIST_INIT(guardian_bomb_life, list( action_types = list(/datum/action/guardian/detonate_bomb) var/bomb_cooldown = 0 var/list/bombs = list() - var/static/list/boom_signals = list(COMSIG_PARENT_ATTACKBY, COMSIG_ATOM_BUMPED, COMSIG_ATOM_ATTACK_HAND) + var/static/list/boom_signals = list(COMSIG_ATOM_ATTACKBY, COMSIG_ATOM_BUMPED, COMSIG_ATOM_ATTACK_HAND) /datum/guardian_ability/major/explosive/Attack(atom/target) if (prob(40) && isliving(target)) @@ -84,7 +84,7 @@ GLOBAL_LIST_INIT(guardian_bomb_life, list( var/picked_bomb = input(user, "Pick which bomb to detonate", "Detonate Bomb") as null|anything in ability.bombs if (picked_bomb) ability.bombs -= picked_bomb - UnregisterSignal(picked_bomb, list(COMSIG_PARENT_ATTACKBY, COMSIG_ATOM_BUMPED, COMSIG_ATOM_ATTACK_HAND)); + UnregisterSignal(picked_bomb, list(COMSIG_ATOM_ATTACKBY, COMSIG_ATOM_BUMPED, COMSIG_ATOM_ATTACK_HAND)); UnregisterSignal(picked_bomb, COMSIG_ATOM_EXAMINE); log_bomber(user, "detonated a", picked_bomb) explosion(picked_bomb, -1, 1, 1, 1) diff --git a/yogstation/code/modules/guardian/abilities/major/healing.dm b/yogstation/code/modules/guardian/abilities/major/healing.dm index 1683af8a48fb..571f7b995681 100644 --- a/yogstation/code/modules/guardian/abilities/major/healing.dm +++ b/yogstation/code/modules/guardian/abilities/major/healing.dm @@ -40,12 +40,11 @@ guardian.med_hud_set_health() guardian.med_hud_set_status() return TRUE - else if (isobj(target)) - var/obj/O = target - guardian.do_attack_animation(O) - O.obj_integrity = min(O.obj_integrity + (O.max_integrity * 0.1), O.max_integrity) - var/obj/effect/temp_visual/heal/H = new /obj/effect/temp_visual/heal(get_turf(O)) - O.update_appearance(UPDATE_ICON) + else if (target.uses_integrity) + guardian.do_attack_animation(target) + target.update_integrity(min(target.get_integrity() + (target.max_integrity * 0.1), target.max_integrity)) + var/obj/effect/temp_visual/heal/H = new /obj/effect/temp_visual/heal(get_turf(target)) + target.update_appearance(UPDATE_ICON) if (guardian.namedatum) H.color = guardian.namedatum.color guardian.changeNext_move(CLICK_CD_MELEE) diff --git a/yogstation/code/modules/jobs/job_types/brig_physician.dm b/yogstation/code/modules/jobs/job_types/brig_physician.dm index e3d0bdf1eef4..21b06511b92c 100644 --- a/yogstation/code/modules/jobs/job_types/brig_physician.dm +++ b/yogstation/code/modules/jobs/job_types/brig_physician.dm @@ -7,7 +7,6 @@ total_positions = 1 spawn_positions = 1 supervisors = "the chief medical officer" - selection_color = "#d4ebf2" minimal_player_age = 5 //seriously stop griefing exp_requirements = 100 exp_type = EXP_TYPE_CREW @@ -47,7 +46,7 @@ name = "Brig Physician" jobtype = /datum/job/brigphysician - pda_type = /obj/item/modular_computer/tablet/pda/preset/paramed + pda_type = /obj/item/modular_computer/tablet/pda/preset/medical/paramed backpack_contents = list(/obj/item/roller = 1) belt = /obj/item/storage/belt/medical @@ -55,7 +54,7 @@ glasses = /obj/item/clothing/glasses/hud/health/sunglasses shoes = /obj/item/clothing/shoes/jackboots digitigrade_shoes = /obj/item/clothing/shoes/xeno_wraps/jackboots - uniform = /obj/item/clothing/under/yogs/rank/miner/medic + uniform = /obj/item/clothing/under/yogs/rank/physician/white uniform_skirt = /obj/item/clothing/under/yogs/rank/physician/white/skirt suit = /obj/item/clothing/suit/toggle/labcoat/emt/physician l_hand = /obj/item/storage/firstaid/regular @@ -65,6 +64,5 @@ backpack = /obj/item/storage/backpack/medic satchel = /obj/item/storage/backpack/satchel/med duffelbag = /obj/item/storage/backpack/duffelbag/med - box = /obj/item/storage/box/survival implants = list(/obj/item/implant/mindshield) diff --git a/yogstation/code/modules/jobs/job_types/clerk.dm b/yogstation/code/modules/jobs/job_types/clerk.dm index d7d9a2d4a114..230ee6c051ef 100644 --- a/yogstation/code/modules/jobs/job_types/clerk.dm +++ b/yogstation/code/modules/jobs/job_types/clerk.dm @@ -7,7 +7,6 @@ total_positions = 1 spawn_positions = 1 supervisors = "the head of personnel" - selection_color = "#dddddd" added_access = list() base_access = list(ACCESS_MANUFACTURING) alt_titles = list("Salesman", "Gift Shop Attendent", "Retail Worker") diff --git a/yogstation/code/modules/jobs/job_types/mining_medic.dm b/yogstation/code/modules/jobs/job_types/mining_medic.dm index 326c26a014f5..ffb8aad57cf4 100644 --- a/yogstation/code/modules/jobs/job_types/mining_medic.dm +++ b/yogstation/code/modules/jobs/job_types/mining_medic.dm @@ -7,7 +7,6 @@ total_positions = 1 spawn_positions = 1 supervisors = "the chief medical officer and the quartermaster" - selection_color = "#d4ebf2" minimal_player_age = 4 exp_requirements = 120 exp_type = EXP_TYPE_CREW @@ -23,6 +22,10 @@ /datum/job_department/medical, /datum/job_department/cargo, ) + + minimal_lightup_areas = list( + /area/construction/mining/aux_base + ) //if it's skeleton there's probably no paramedic to save spaced miners that jaunted away from danger added_access = list(ACCESS_SURGERY, ACCESS_CARGO, ACCESS_CLONING, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS) @@ -43,7 +46,7 @@ name = "Mining Medic" jobtype = /datum/job/miningmedic - pda_type = /obj/item/modular_computer/tablet/pda/preset/paramed + pda_type = /obj/item/modular_computer/tablet/pda/preset/medical/paramed backpack_contents = list(/obj/item/roller = 1,\ /obj/item/kitchen/knife/combat/survival = 1,\ @@ -64,5 +67,5 @@ backpack = /obj/item/storage/backpack/medic satchel = /obj/item/storage/backpack/satchel/med duffelbag = /obj/item/storage/backpack/duffelbag/med - box = /obj/item/storage/box/survival_mining + box = /obj/item/storage/box/survival/mining pda_slot = ITEM_SLOT_LPOCKET diff --git a/yogstation/code/modules/jobs/job_types/network_admin.dm b/yogstation/code/modules/jobs/job_types/network_admin.dm index b84aac807a57..d6bc0919d314 100644 --- a/yogstation/code/modules/jobs/job_types/network_admin.dm +++ b/yogstation/code/modules/jobs/job_types/network_admin.dm @@ -7,7 +7,6 @@ total_positions = 1 spawn_positions = 1 supervisors = "the chief engineer and research director" - selection_color = "#fff5cc" exp_requirements = 180 exp_type = EXP_TYPE_CREW alt_titles = list("AI Tech Support", "SysOp") @@ -15,9 +14,9 @@ outfit = /datum/outfit/job/network_admin added_access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_MAINT_TUNNELS) - base_access = list(ACCESS_TCOMSAT, ACCESS_TCOM_ADMIN, ACCESS_TECH_STORAGE, ACCESS_RC_ANNOUNCE, ACCESS_CONSTRUCTION, ACCESS_MECH_ENGINE, ACCESS_NETWORK, ACCESS_RESEARCH, ACCESS_MINISAT, ACCESS_RND) + base_access = list(ACCESS_TCOMSAT, ACCESS_TCOM_ADMIN, ACCESS_TECH_STORAGE, ACCESS_RC_ANNOUNCE, ACCESS_CONSTRUCTION, ACCESS_MECH_ENGINE, ACCESS_NETWORK, ACCESS_RESEARCH, ACCESS_MINISAT, ACCESS_RND, ACCESS_TOX) paycheck = PAYCHECK_MEDIUM - paycheck_department = ACCOUNT_ENG + paycheck_department = ACCOUNT_SCI display_order = JOB_DISPLAY_ORDER_NETWORK_ADMIN minimal_character_age = 22 //Feasibly same level as engineer, mostly a data engineer instead of a mechanical or construction-based one, though is still capable of making certain machines @@ -37,8 +36,9 @@ name = "Network Admin" jobtype = /datum/job/network_admin - pda_type = /obj/item/modular_computer/tablet/pda/preset/basic + pda_type = /obj/item/modular_computer/tablet/pda/preset/network_admin + l_hand = /obj/item/modular_computer/laptop/preset/network_admin belt = /obj/item/storage/belt/utility/full/engi ears = /obj/item/radio/headset/headset_network uniform = /obj/item/clothing/under/yogs/rank/network_admin @@ -47,11 +47,10 @@ gloves = /obj/item/clothing/gloves/color/black shoes = /obj/item/clothing/shoes/workboots digitigrade_shoes = /obj/item/clothing/shoes/xeno_wraps/engineering - backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1) backpack = /obj/item/storage/backpack/industrial satchel = /obj/item/storage/backpack/satchel/eng duffelbag = /obj/item/storage/backpack/duffelbag/engineering - box = /obj/item/storage/box/engineer + box = /obj/item/storage/box/survival/engineer pda_slot = ITEM_SLOT_LPOCKET diff --git a/yogstation/code/modules/jobs/job_types/paramedic.dm b/yogstation/code/modules/jobs/job_types/paramedic.dm index 9f8d3fbd6cfb..dd9e41ecd697 100644 --- a/yogstation/code/modules/jobs/job_types/paramedic.dm +++ b/yogstation/code/modules/jobs/job_types/paramedic.dm @@ -7,7 +7,6 @@ total_positions = 3 spawn_positions = 2 supervisors = "the chief medical officer" - selection_color = "#d4ebf2" alt_titles = list("EMT", "Paramedic Trainee", "Rapid Response Medic", "Space Search & Rescue") outfit = /datum/outfit/job/paramedic @@ -44,7 +43,7 @@ name = "Paramedic" jobtype = /datum/job/paramedic - pda_type = /obj/item/modular_computer/tablet/pda/preset/paramed + pda_type = /obj/item/modular_computer/tablet/pda/preset/medical/paramed backpack_contents = list(/obj/item/storage/firstaid/regular) ears = /obj/item/radio/headset/headset_med diff --git a/yogstation/code/modules/jobs/job_types/psychiatrist.dm b/yogstation/code/modules/jobs/job_types/psychiatrist.dm index 0fac1c0868ab..b7487fc5ea68 100644 --- a/yogstation/code/modules/jobs/job_types/psychiatrist.dm +++ b/yogstation/code/modules/jobs/job_types/psychiatrist.dm @@ -7,7 +7,6 @@ total_positions = 1 spawn_positions = 1 supervisors = "the chief medical officer" - selection_color = "#d4ebf2" alt_titles = list("Counsellor", "Therapist", "Mentalist") minimal_player_age = 5 //stop griefing diff --git a/yogstation/code/modules/jobs/job_types/tourist.dm b/yogstation/code/modules/jobs/job_types/tourist.dm index d5ebb5c1e177..ba5aab4c8fd1 100644 --- a/yogstation/code/modules/jobs/job_types/tourist.dm +++ b/yogstation/code/modules/jobs/job_types/tourist.dm @@ -6,7 +6,6 @@ total_positions = -1 spawn_positions = 0 supervisors = "the head of personnel" - selection_color = "#dddddd" added_access = list() base_access = list() alt_titles = list("Visitor", "Traveler", "Siteseer", "Fisher") diff --git a/yogstation/code/modules/jungleland/ghost_role_spawners.dm b/yogstation/code/modules/jungleland/ghost_role_spawners.dm index d5121959f4e7..7298935e07bc 100644 --- a/yogstation/code/modules/jungleland/ghost_role_spawners.dm +++ b/yogstation/code/modules/jungleland/ghost_role_spawners.dm @@ -101,3 +101,40 @@ resistance_flags = NONE armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 60, RAD = 0, FIRE = 80, ACID = 50, ELECTRIC = 100) enabled_areas = list(/area/ruin/powered/syndicate_lava_base) + +/obj/effect/mob_spawn/human/greedydemon + name = "Red Sleeper" + desc = "An ancient sleeper that could possibly not even be man made, housing a raging hell fire." + roundstart = FALSE + death = FALSE + random = TRUE + icon = 'icons/obj/machines/sleeper.dmi' + icon_state = "sleeper_s" + short_desc = "You are a hellish demon of greed, posted on a house of sin and gambling." + flavour_text = "Attract patrons to your terrible home, make cash, and prepare any facilities that are needed. Make sure your guests feel welcome, it is the best way to tempt them. In addition, do not give things away for free, everything has a price after all." + important_info = "Do not leave your establishment if possible, and do not leave the planet at all." + outfit = /datum/outfit/greedydemon + assignedrole = "Greedy Demon" + id_access_list = list(ACCESS_BAR,ACCESS_KITCHEN,ACCESS_HYDROPONICS) + +/obj/effect/mob_spawn/human/greedydemon/special(mob/living/new_spawn) + var/datum/antagonist/sinfuldemon/demon = new + demon.demonsin = "greed" + new_spawn.mind.add_antag_datum(demon) + demon.greet() + message_admins("[ADMIN_LOOKUPFLW(new_spawn)] has been made into a Sinful Demon by a ghost spawner.") + log_game("[key_name(new_spawn)] was spawned as a Sinful Demon by a ghost spawner.") + +/datum/outfit/greedydemon + name = "Greedy Demon" + uniform = /obj/item/clothing/under/suit_jacket/really_black + head = /obj/item/clothing/head/that + back = /obj/item/storage/backpack + suit = /obj/item/clothing/suit/armor/vest + mask = /obj/item/clothing/mask/cigarette/pipe + shoes = /obj/item/clothing/shoes/laceup + glasses = /obj/item/clothing/glasses/sunglasses/reagent + gloves = /obj/item/clothing/gloves/color/white + ears = /obj/item/radio/headset + id = /obj/item/card/id + implants = list(/obj/item/implant/teleporter/demon) //stay at your den of sin diff --git a/yogstation/code/modules/jungleland/jungle_items.dm b/yogstation/code/modules/jungleland/jungle_items.dm index 96d1cc3b3d7a..a21d9c8b1da5 100644 --- a/yogstation/code/modules/jungleland/jungle_items.dm +++ b/yogstation/code/modules/jungleland/jungle_items.dm @@ -574,7 +574,8 @@ var/damage_bonus = 0 var/cooldown_bonus = 0 var/current_state = 0 - var/timer = 0 + COOLDOWN_DECLARE(bonus_timer) + var/bonus_cooldown = 5 SECONDS /obj/item/crusher_trophy/jungleland/corrupted_dryad_branch/effect_desc() return "Gives a stacking (up to 5 times) decreases your shot delay and increases detonation damage when you detonate a mark. Lasts 5 seconds, extending on successful mark detonation. Missing resets the stacks." @@ -593,8 +594,7 @@ STOP_PROCESSING(SSprocessing,src) /obj/item/crusher_trophy/jungleland/corrupted_dryad_branch/on_mark_detonation(mob/living/target, mob/living/user, obj/item/kinetic_crusher/hammer_synced) - . = ..() - timer = 5 SECONDS + COOLDOWN_START(src, bonus_timer, bonus_cooldown) var/previous_state = current_state current_state = min(current_state + 1, 5) cooldown_bonus = 2 * current_state @@ -609,17 +609,15 @@ hammer_synced = loc user = hammer_synced.loc hammer_synced.detonation_damage -= damage_bonus - hammer_synced.charge_time -= cooldown_bonus + hammer_synced.charge_time += cooldown_bonus current_state = 0 cooldown_bonus = 0 damage_bonus = 0 user.clear_alert("glory_of_victory") /obj/item/crusher_trophy/jungleland/corrupted_dryad_branch/process(delta_time) - if(timer > 0) - timer -= delta_time - if(timer <= 0) - remove_bonuses() + if(COOLDOWN_FINISHED(src, bonus_timer)) + remove_bonuses() /obj/item/crusher_trophy/jungleland/mosquito_sack name = "Mosquito's bloodsack" diff --git a/yogstation/code/modules/jungleland/jungle_megafauna.dm b/yogstation/code/modules/jungleland/jungle_megafauna.dm index 0fd04488714f..bae38e3db2ce 100644 --- a/yogstation/code/modules/jungleland/jungle_megafauna.dm +++ b/yogstation/code/modules/jungleland/jungle_megafauna.dm @@ -352,6 +352,10 @@ /obj/effect/better_animated_temp_visual/tar_king_chaser_impale/Initialize(mapload, new_caster) . = ..() caster = new_caster + var/static/list/loc_connections = list( + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), + ) + AddElement(/datum/element/connect_loc, loc_connections) INVOKE_ASYNC(src, PROC_REF(blast)) /obj/effect/better_animated_temp_visual/tar_king_chaser_impale/proc/blast() @@ -365,8 +369,7 @@ sleep(0.1 SECONDS) bursting = FALSE -/obj/effect/better_animated_temp_visual/tar_king_chaser_impale/Crossed(atom/movable/AM) - ..() +/obj/effect/better_animated_temp_visual/tar_king_chaser_impale/proc/on_entered(datum/source, atom/movable/AM, ...) if(bursting) do_damage(get_turf(src)) diff --git a/yogstation/code/modules/jungleland/jungle_mobs.dm b/yogstation/code/modules/jungleland/jungle_mobs.dm index ea09f493b87c..147e4d8ec847 100644 --- a/yogstation/code/modules/jungleland/jungle_mobs.dm +++ b/yogstation/code/modules/jungleland/jungle_mobs.dm @@ -178,8 +178,8 @@ response_help = "pets" response_disarm = "gently pushes aside" response_harm = "hits" - maxHealth = 320 - health = 320 + maxHealth = 285 + health = 285 spacewalk = TRUE melee_damage_lower = 30 melee_damage_upper = 55 // ouch diff --git a/yogstation/code/modules/jungleland/jungle_turfs.dm b/yogstation/code/modules/jungleland/jungle_turfs.dm index 5404c7cfcaab..3b458852234e 100644 --- a/yogstation/code/modules/jungleland/jungle_turfs.dm +++ b/yogstation/code/modules/jungleland/jungle_turfs.dm @@ -55,6 +55,10 @@ Temperature: 126.85 °C (400 K) /area/jungleland/dying_forest name = "Dying Jungle" +/area/ruin/powered/sinden + name = "Den of Sin" + icon_state = "dk_yellow" + /turf/open/floor/plating/dirt/jungleland name = "generic jungle land turf" desc = "pain" diff --git a/yogstation/code/modules/jungleland/kinetic_javelin.dm b/yogstation/code/modules/jungleland/kinetic_javelin.dm index 1c48c6d4305d..d20f0be812a2 100644 --- a/yogstation/code/modules/jungleland/kinetic_javelin.dm +++ b/yogstation/code/modules/jungleland/kinetic_javelin.dm @@ -23,7 +23,7 @@ /obj/item/kinetic_javelin name = "kinetic javelin" - desc = "powerful thrown weapon best suited to exotic environments. It has a small piece of bluespace lodged inside of it's shaft, hitting a living being while in an exotic environment teleports it straight back to you." + desc = "Powerful thrown weapon best suited to exotic environments. It has a small piece of bluespace lodged inside of it's shaft, hitting a living being while in an exotic environment teleports it straight back to you." icon = 'yogstation/icons/obj/kinetic_javelin.dmi' lefthand_file = 'yogstation/icons/mob/inhands/lefthand.dmi' righthand_file = 'yogstation/icons/mob/inhands/righthand.dmi' diff --git a/yogstation/code/modules/mob/living/carbon/human/species_types/plantpeople.dm b/yogstation/code/modules/mob/living/carbon/human/species_types/plantpeople.dm index 3cff062abfbc..f13418885c8c 100644 --- a/yogstation/code/modules/mob/living/carbon/human/species_types/plantpeople.dm +++ b/yogstation/code/modules/mob/living/carbon/human/species_types/plantpeople.dm @@ -10,6 +10,7 @@ default_features = list("mcolor" = "#00FF00", "pod_hair" = "Cabbage", "pod_flower" = "Cabbage") rare_say_mod = list("rustles" = 10) attack_verb = "slash" + attack_effect = ATTACK_EFFECT_CLAW attack_sound = 'sound/weapons/slice.ogg' miss_sound = 'sound/weapons/slashmiss.ogg' burnmod = 2 @@ -57,6 +58,9 @@ C.faction -= "plants" C.faction -= "vines" +/datum/species/pod/get_butt_sprite() + return BUTT_SPRITE_FLOWERPOT + /datum/species/pod/spec_life(mob/living/carbon/human/H) if(H.stat == DEAD || H.stat == UNCONSCIOUS || (H.mind && H.mind.has_antag_datum(ANTAG_DATUM_THRALL))) return diff --git a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/organs.dm b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/organs.dm index 590e174bc205..17884cebb570 100644 --- a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/organs.dm +++ b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/organs.dm @@ -13,6 +13,7 @@ high_threshold_cleared = span_info("Your Preternis eyes have recharged enough to re-enable most functionality.") low_threshold_cleared = span_info("Your Preternis eyes have almost fully recharged.") actions_types = list(/datum/action/item_action/organ_action/use) + var/original_eye_color var/powered = TRUE var/night_vision = FALSE // This list is used as the color cutoff for the night vision @@ -20,36 +21,69 @@ // This variable is the actual night vision strength var/light_cutoff = LIGHTING_CUTOFF_HIGH +/obj/item/organ/eyes/robotic/preternis/Insert(mob/living/carbon/M, special, drop_if_replaced, initialising) + . = ..() + if(ishuman(owner)) + var/mob/living/carbon/human/H = owner + original_eye_color = H.eye_color + +/obj/item/organ/eyes/robotic/preternis/Remove(mob/living/carbon/M, special) + nv_off() + . = ..() + /obj/item/organ/eyes/robotic/preternis/ui_action_click() - if(damage > low_threshold) - //no nightvision if your eyes are hurt + if(damage > low_threshold || (powered && owner.nutrition <= NUTRITION_LEVEL_HUNGRY)) + //no nightvision if your eyes are low on power, whether internal or external return - sight_flags = initial(sight_flags) - night_vision = !night_vision if (night_vision) - color_cutoffs = colour_cutoff_list.Copy() - lighting_cutoff = light_cutoff + nv_off() else - color_cutoffs = null - lighting_cutoff = null + nv_on() + +/obj/item/organ/eyes/robotic/preternis/proc/nv_on() + night_vision = TRUE + color_cutoffs = colour_cutoff_list.Copy() + lighting_cutoff = light_cutoff + if(ishuman(owner)) + var/mob/living/carbon/human/H = owner + original_eye_color = H.eye_color + H.eye_color = "#8b60ff" + H.dna.update_ui_block(DNA_EYE_COLOR_BLOCK) + H.update_body() + owner.update_sight() + +/obj/item/organ/eyes/robotic/preternis/proc/nv_off() + night_vision = FALSE + color_cutoffs = null + lighting_cutoff = null + if(ishuman(owner) && original_eye_color) + var/mob/living/carbon/human/H = owner + H.eye_color = original_eye_color + H.dna.update_ui_block(DNA_EYE_COLOR_BLOCK) + H.update_body() owner.update_sight() /obj/item/organ/eyes/robotic/preternis/on_life() . = ..() if(!owner) return - if((owner.mob_biotypes & MOB_ROBOTIC) && !powered) + if((HAS_TRAIT(owner, TRAIT_POWERHUNGRY) || (owner.mob_biotypes & MOB_ROBOTIC)) && !powered) powered = TRUE to_chat(owner, span_notice("A battery icon disappears from your vision as your [src] switch to external power.")) - if(!(owner.mob_biotypes & MOB_ROBOTIC) && powered) //these eyes depend on being inside a preternis for power + if(!(HAS_TRAIT(owner, TRAIT_POWERHUNGRY) || (owner.mob_biotypes & MOB_ROBOTIC)) && powered) //these eyes depend on being inside a preternis for power powered = FALSE to_chat(owner, span_boldwarning("Your [src] flash warnings that they've lost their power source, and are running on emergency power!")) if(powered) //when powered, they recharge by healing owner.adjustOrganLoss(ORGAN_SLOT_EYES,-0.5) - else - //to simulate running out of power, they take damage - owner.adjustOrganLoss(ORGAN_SLOT_EYES,0.5) + if(night_vision) + owner.adjust_nutrition(-1) //consumes power to stay charged + if(owner.nutrition <= NUTRITION_LEVEL_HUNGRY) + nv_off() //if low on power, turn off + else if(night_vision) + owner.adjustOrganLoss(ORGAN_SLOT_EYES,0.5) //to simulate running out of power, they take damage + if(damage > low_threshold) + nv_off() //if low on power, turn off /obj/item/organ/eyes/robotic/preternis/examine(mob/user) . = ..() diff --git a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/power_suck.dm b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/power_suck.dm index b3c28f653baf..55c973b7dbc4 100644 --- a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/power_suck.dm +++ b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/power_suck.dm @@ -1,5 +1,5 @@ -/datum/species/preternis/proc/drain_power_from(mob/living/carbon/human/H, atom/A) +/datum/species/proc/drain_power_from(mob/living/carbon/human/H, atom/A) if(!istype(H) || !A) return @@ -31,7 +31,7 @@ draining = FALSE return - var/blocked = H.getarmor(H.held_index_to_body_zone(H.active_hand_index), ELECTRIC) + var/blocked = H.getarmor(H.held_index_to_hand(H.active_hand_index), ELECTRIC) siemens_coefficient *= (100 - blocked) / 100 if(blocked >= 100) to_chat(H, span_info("NOTICE: [H.gloves] prevent electrical contact - CONSUME protocol aborted.")) diff --git a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm index 8070ed0ce3e6..f96935341968 100644 --- a/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm +++ b/yogstation/code/modules/mob/living/carbon/human/species_types/preternis/preternis.dm @@ -59,7 +59,6 @@ var/lockdown = FALSE var/eating_msg_cooldown = FALSE var/emag_lvl = 0 - var/draining = FALSE var/soggy = FALSE var/low_power_warning = FALSE diff --git a/yogstation/code/modules/ninja/suit/ninja.dm b/yogstation/code/modules/ninja/suit/ninja.dm index 1e754cc4ce48..794382753fbc 100644 --- a/yogstation/code/modules/ninja/suit/ninja.dm +++ b/yogstation/code/modules/ninja/suit/ninja.dm @@ -28,14 +28,14 @@ var/lights_colour = "16be00" /obj/item/clothing/suit/space/space_ninja/worn_overlays(isinhands = FALSE) - .=..() + . = ..() if(!isinhands && lights_on) var/mutable_appearance/M = mutable_appearance(mob_overlay_icon, "s-ninja-overlay") M.color = lights_colour . += M /obj/item/clothing/mask/gas/space_ninja/worn_overlays(isinhands = FALSE) - .=..() + . = ..() if(!isinhands && lights_on) var/mutable_appearance/M = mutable_appearance(mob_overlay_icon, "s-ninja-overlay") M.color = lights_colour @@ -43,14 +43,14 @@ /obj/item/clothing/shoes/space_ninja/worn_overlays(isinhands = FALSE) - .=..() + . = ..() if(!isinhands && lights_on) var/mutable_appearance/M = mutable_appearance(mob_overlay_icon, "s-ninja-overlay") M.color = lights_colour . += M /obj/item/clothing/gloves/space_ninja/worn_overlays(isinhands = FALSE) - .=..() + . = ..() if(!isinhands && lights_on) var/mutable_appearance/M = mutable_appearance(mob_overlay_icon, "s-ninja-overlay") M.color = lights_colour @@ -64,7 +64,7 @@ to_chat(H, "[span_userdanger("ERROR")]: 10453 UNABLE TO LOCATE FACE MASK\nABORTING...") return FALSE - .=..() + . = ..() if(.) n_mask = H.wear_mask ADD_TRAIT(n_mask, TRAIT_NODROP, NINJA_SUIT_TRAIT) diff --git a/yogstation/code/modules/ruins/ivymen_den.dm b/yogstation/code/modules/ruins/ivymen_den.dm index 96e862f270af..f0158a24a890 100644 --- a/yogstation/code/modules/ruins/ivymen_den.dm +++ b/yogstation/code/modules/ruins/ivymen_den.dm @@ -47,7 +47,7 @@ else meat_counter++ H.gib() - obj_integrity = min(obj_integrity + max_integrity*0.05,max_integrity)//restores 5% hp of tree + update_integrity(min(atom_integrity + max_integrity * 0.05, max_integrity)) //restores 5% hp of tree for(var/mob/living/L in view(src, 5)) if(L.mind?.has_antag_datum(/datum/antagonist/ivymen)) SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "oogabooga", /datum/mood_event/sacrifice_good) diff --git a/yogstation/code/modules/spacepods/equipment.dm b/yogstation/code/modules/spacepods/equipment.dm index 37ea7cd2fb6b..844f3617c95a 100644 --- a/yogstation/code/modules/spacepods/equipment.dm +++ b/yogstation/code/modules/spacepods/equipment.dm @@ -291,11 +291,11 @@ /obj/item/spacepod_equipment/lock/on_install(obj/spacepod/SP) ..() - RegisterSignal(SP, COMSIG_PARENT_ATTACKBY, PROC_REF(spacepod_attackby)) + RegisterSignal(SP, COMSIG_ATOM_ATTACKBY, PROC_REF(spacepod_attackby)) SP.lock = src /obj/item/spacepod_equipment/lock/on_uninstall() - UnregisterSignal(spacepod, COMSIG_PARENT_ATTACKBY) + UnregisterSignal(spacepod, COMSIG_ATOM_ATTACKBY) if(spacepod.lock == src) spacepod.lock = null spacepod.locked = FALSE diff --git a/yogstation/code/modules/spacepods/prebuilt.dm b/yogstation/code/modules/spacepods/prebuilt.dm index a834b32c0fd8..db6c6ee9ee4b 100644 --- a/yogstation/code/modules/spacepods/prebuilt.dm +++ b/yogstation/code/modules/spacepods/prebuilt.dm @@ -60,5 +60,5 @@ internal_tank = new /obj/machinery/portable_atmospherics/canister/air(src) velocity_x = rand(-3, 3) velocity_y = rand(-3, 3) - obj_integrity = rand(100, max_integrity) + update_integrity(rand(100, max_integrity)) brakes = FALSE diff --git a/yogstation/code/modules/spacepods/spacepod.dm b/yogstation/code/modules/spacepods/spacepod.dm index 56a33745d3d9..a9aa7a13d297 100644 --- a/yogstation/code/modules/spacepods/spacepod.dm +++ b/yogstation/code/modules/spacepods/spacepod.dm @@ -157,17 +157,17 @@ GLOBAL_LIST_INIT(spacepods_list, list()) to_chat(user, span_notice("Turn the [L] on first.")) return TRUE if(W.tool_behaviour == TOOL_WELDER) - var/repairing = cell || internal_tank || equipment.len || (obj_integrity < max_integrity) || pilot || passengers.len + var/repairing = cell || internal_tank || equipment.len || (atom_integrity < max_integrity) || pilot || passengers.len if(!hatch_open) to_chat(user, span_warning("You must open the maintenance hatch before [repairing ? "attempting repairs" : "unwelding the armor"].")) return TRUE - if(repairing && obj_integrity >= max_integrity) + if(repairing && atom_integrity >= max_integrity) to_chat(user, span_warning("[src] is fully repaired!")) return TRUE to_chat(user, span_notice("You start [repairing ? "repairing [src]" : "slicing off [src]'s armor'"]")) if(W.use_tool(src, user, 50, amount=3, volume = 50)) if(repairing) - obj_integrity = min(max_integrity, obj_integrity + 10) + update_integrity(min(max_integrity, atom_integrity + 10)) update_appearance(UPDATE_ICON) to_chat(user, span_notice("You mend some [pick("dents","bumps","damage")] with [W]")) else if(!cell && !internal_tank && !equipment.len && !pilot && !passengers.len && construction_state == SPACEPOD_ARMOR_WELDED) @@ -233,13 +233,13 @@ GLOBAL_LIST_INIT(spacepods_list, list()) /obj/spacepod/proc/add_armor(obj/item/pod_parts/armor/armor) desc = armor.pod_desc max_integrity = armor.pod_integrity - obj_integrity = max_integrity - integrity_failure + obj_integrity + update_integrity(max_integrity - integrity_failure + atom_integrity) pod_armor = armor update_appearance(UPDATE_ICON) /obj/spacepod/proc/remove_armor() if(!pod_armor) - obj_integrity = min(integrity_failure, obj_integrity) + update_integrity(min(integrity_failure, atom_integrity)) max_integrity = integrity_failure desc = initial(desc) pod_armor = null @@ -299,7 +299,7 @@ GLOBAL_LIST_INIT(spacepods_list, list()) var/obj/spacepod/S = loc . += "" . += "Spacepod Charge: [S.cell ? "[round(S.cell.charge,0.1)]/[S.cell.maxcharge] KJ" : "NONE"]" - . += "Spacepod Integrity: [round(S.obj_integrity,0.1)]/[S.max_integrity]" + . += "Spacepod Integrity: [round(S.get_integrity(),0.1)]/[S.max_integrity]" . += "Spacepod Velocity: [round(sqrt(S.velocity_x*S.velocity_x+S.velocity_y*S.velocity_y), 0.1)] m/s" . += "" @@ -315,8 +315,9 @@ GLOBAL_LIST_INIT(spacepods_list, list()) if(prob(40)) take_damage(40, BRUTE, BOMB, 0) -/obj/spacepod/obj_break() - if(obj_integrity <= 0) +/obj/spacepod/atom_break() + . = ..() + if(atom_integrity <= 0) return // nah we'll let the other boy handle it if(construction_state < SPACEPOD_ARMOR_LOOSE) return @@ -422,9 +423,9 @@ GLOBAL_LIST_INIT(spacepods_list, list()) . += masked_armor return - if(obj_integrity <= max_integrity / 2) + if(atom_integrity <= max_integrity / 2) . += image(icon='goon/icons/obj/spacepods/2x2.dmi', icon_state="pod_damage") - if(obj_integrity <= max_integrity / 4) + if(atom_integrity <= max_integrity / 4) . += image(icon='goon/icons/obj/spacepods/2x2.dmi', icon_state="pod_fire") if(weapon && weapon.overlay_icon_state) diff --git a/yogstation/code/modules/vending/gift.dm b/yogstation/code/modules/vending/gift.dm index 596fdd4cd1cf..a08225e21103 100644 --- a/yogstation/code/modules/vending/gift.dm +++ b/yogstation/code/modules/vending/gift.dm @@ -62,7 +62,7 @@ /obj/item/flashlight/flare/signal = 1, /obj/item/storage/toolbox/mechanical = 1, /obj/item/stack/cable_coil/random = 4, - /obj/item/pda = 8, + /obj/item/pda = 8, //Keeping these so the clerk can still sell their amazing "antique PDAs" /obj/item/cartridge/engineering = 2, /obj/item/cartridge/atmos = 2, /obj/item/cartridge/medical = 2, diff --git a/yogstation/icons/mob/clothing/uniform/uniform.dmi b/yogstation/icons/mob/clothing/uniform/uniform.dmi index 07a8b03ffef5..28873ee41e52 100644 Binary files a/yogstation/icons/mob/clothing/uniform/uniform.dmi and b/yogstation/icons/mob/clothing/uniform/uniform.dmi differ diff --git a/yogstation/icons/obj/clothing/uniforms.dmi b/yogstation/icons/obj/clothing/uniforms.dmi index 37fe5b3845a2..8cba3615fc90 100644 Binary files a/yogstation/icons/obj/clothing/uniforms.dmi and b/yogstation/icons/obj/clothing/uniforms.dmi differ diff --git a/yogstation/icons/obj/items.dmi b/yogstation/icons/obj/items.dmi index 760a72ade1c9..4e7f7ea14b07 100644 Binary files a/yogstation/icons/obj/items.dmi and b/yogstation/icons/obj/items.dmi differ diff --git a/yogstation/icons/obj/special_slot_machine.dmi b/yogstation/icons/obj/special_slot_machine.dmi index b61bee707844..235e0236c9b0 100644 Binary files a/yogstation/icons/obj/special_slot_machine.dmi and b/yogstation/icons/obj/special_slot_machine.dmi differ