diff --git a/.editorconfig b/.editorconfig index df93ae3a16..13dcd5e029 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,3 +6,6 @@ indent_size = 4 [*.yml] indent_style = space indent_size = 2 + +[*.txt] +insert_final_newline = false diff --git a/README.md b/README.md index ed82fb08e6..2a1ffe65ec 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ - -##Citadel Station 13
-Based and maintained from /tg/station.
+## Citadel Station 13 +Based and maintained from /tg/station. [![forthebadge](http://forthebadge.com/images/badges/60-percent-of-the-time-works-every-time.svg)](https://forthebadge.com) [![forthebadge](http://forthebadge.com/images/badges/pretty-risque.svg)](https://forthebadge.com) [![forthebadge](http://forthebadge.com/images/badges/you-didnt-ask-for-this.svg)](http://forthebadge.com) @@ -10,18 +9,19 @@ Based and maintained from /tg/station.
[![Percentage of issues still open](http://isitmaintained.com/badge/open/Citadel-Station-13/Citadel-Station-13.svg)](http://isitmaintained.com/project/Citadel-Station-13/Citadel-Station-13 "Percentage of issues still open") [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/Citadel-Station-13/Citadel-Station-13.svg)](http://isitmaintained.com/project/Citadel-Station-13/Citadel-Station-13 "Average time to resolve an issue") -**Upstream Information**
-**Website:** http://www.tgstation13.org
-**Code:** https://github.com/tgstation/tgstation
-**Wiki** http://tgstation13.org/wiki/Main_Page
-**IRC:** irc://irc.rizon.net/coderbus or if you dont have an IRC client, you can click [here](https://kiwiirc.com/client/irc.rizon.net:6667/?&theme=cli#coderbus).
- -**Citadel Station Information**
-**Forums:** http://citadel-station.net/forum/
-**Ban Appeals:** http://citadel-station.net/forum/forumdisplay.php?fid=8
-**Code:** https://github.com/Citadel-Station-13/Citadel-Station-13
-**Discord:** [Here](https://discord.gg/E6SQuhz).
- +**Upstream Information** +**Website:** https://tgstation13.org +**Code:** https://github.com/tgstation/tgstation +**Wiki** https://tgstation13.org/wiki/Main_Page +**IRC:** irc://irc.rizon.net/coderbus or if you dont have an IRC client, you can click [here](https://kiwiirc.com/client/irc.rizon.net:6667/?&theme=cli#coderbus). + +**Citadel Station Information** +**Website:** http://citadel-station.net +**Forums:** http://citadel-station.net/forum +**Ban Appeals:** http://citadel-station.net/forum/forumdisplay.php?fid=8 +**Code:** https://github.com/Citadel-Station-13/Citadel-Station-13 +**Discord:** [Here](https://discord.gg/E6SQuhz) + ## DOWNLOADING There are a number of ways to download the source code. Some are described here, an alternative all-inclusive guide is also located at http://www.tgstation13.org/wiki/Downloading_the_source_code diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index cc1b474c49..4304af77f3 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -184,7 +184,7 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list( #define BODY_ZONE_PRECISE_R_FOOT "r_foot" //We will round to this value in damage calculations. -#define DAMAGE_PRECISION 0.1 +#define DAMAGE_PRECISION 0.01 //items total mass, used to calculate their attacks' stamina costs. If not defined, the cost will be (w_class * 1.25) #define TOTAL_MASS_TINY_ITEM 1.25 @@ -202,4 +202,4 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list( #define BULLET_ACT_HIT "HIT" //It's a successful hit, whatever that means in the context of the thing it's hitting. #define BULLET_ACT_BLOCK "BLOCK" //It's a blocked hit, whatever that means in the context of the thing it's hitting. #define BULLET_ACT_FORCE_PIERCE "PIERCE" //It pierces through the object regardless of the bullet being piercing by default. -#define BULLET_ACT_TURF "TURF" //It hit us but it should hit something on the same turf too. Usually used for turfs. \ No newline at end of file +#define BULLET_ACT_TURF "TURF" //It hit us but it should hit something on the same turf too. Usually used for turfs. diff --git a/code/__DEFINES/configuration.dm b/code/__DEFINES/configuration.dm index 3034876e36..6b70eb1e0f 100644 --- a/code/__DEFINES/configuration.dm +++ b/code/__DEFINES/configuration.dm @@ -1,6 +1,7 @@ //config files #define CONFIG_GET(X) global.config.Get(/datum/config_entry/##X) #define CONFIG_SET(X, Y) global.config.Set(/datum/config_entry/##X, ##Y) +#define CONFIG_GET_ENTRY(X) global.config.GetEntryDatum(/datum/config_entry/##X) #define CONFIG_MAPS_FILE "maps.txt" diff --git a/code/__DEFINES/reagents.dm b/code/__DEFINES/reagents.dm index 36ea64de2c..54f4648006 100644 --- a/code/__DEFINES/reagents.dm +++ b/code/__DEFINES/reagents.dm @@ -8,7 +8,7 @@ #define REAGENT_PURITY_ACCURACY 0.001 #define DEFAULT_SPECIFIC_HEAT 200 -// container_type defines +//reagents_holder_flags defines #define INJECTABLE (1<<0) // Makes it possible to add reagents through droppers and syringes. #define DRAWABLE (1<<1) // Makes it possible to remove reagents through syringes. @@ -29,6 +29,11 @@ #define PATCH 4 // patches #define INJECT 5 // injection +//container_flags +#define PH_WEAK (1 << 0) +#define TEMP_WEAK (1 << 1) +#define APTFT_VERB (1 << 2) //APTFT stands for "amount per transfer from this" +#define APTFT_ALTCLICK (1 << 3) //defines passed through to the on_reagent_change proc #define DEL_REAGENT 1 // reagent deleted (fully cleared) diff --git a/code/__HELPERS/_logging.dm b/code/__HELPERS/_logging.dm index 0aa9476fad..6ea1de0e2c 100644 --- a/code/__HELPERS/_logging.dm +++ b/code/__HELPERS/_logging.dm @@ -165,6 +165,12 @@ /proc/log_mapping(text) WRITE_LOG(GLOB.world_map_error_log, text) +/proc/log_reagent(text) + WRITE_LOG(GLOB.reagent_log, text) + +/proc/log_reagent_transfer(text) + log_reagent("TRANSFER: [text]") + /* For logging round startup. */ /proc/start_log(log) WRITE_LOG(log, "Starting up round ID [GLOB.round_id].\n-------------------------") diff --git a/code/__HELPERS/areas.dm b/code/__HELPERS/areas.dm index 3b1496bae0..d7378abfa6 100644 --- a/code/__HELPERS/areas.dm +++ b/code/__HELPERS/areas.dm @@ -227,6 +227,8 @@ /proc/get_sub_areas_contents(area/A, include_base = TRUE) if(ispath(A)) A = GLOB.areas_by_type[A] + else + A = get_area(A) //in case it's called on other atoms. if(!A) return if(A.base_area) diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index 59bf210853..605f7f8ae7 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -145,20 +145,6 @@ turfs += T return turfs - -//This is the new version of recursive_mob_check, used for say(). -//The other proc was left intact because morgue trays use it. -//Sped this up again for real this time -/proc/recursive_hear_check(O) - var/list/processing_list = list(O) - . = list() - while(processing_list.len) - var/atom/A = processing_list[1] - if(A.flags_1 & HEAR_1) - . += A - processing_list.Cut(1, 2) - processing_list += A.contents - /** recursive_organ_check * inputs: O (object to start with) * outputs: @@ -238,35 +224,30 @@ return found_mobs - /proc/get_hearers_in_view(R, atom/source) - // Returns a list of hearers in view(R) from source (ignoring luminosity). Used in saycode. var/turf/T = get_turf(source) . = list() - if(!T) return - - var/list/processing_list = list() - if (R == 0) // if the range is zero, we know exactly where to look for, we can skip view - processing_list += T.contents // We can shave off one iteration by assuming turfs cannot hear - else // A variation of get_hear inlined here to take advantage of the compiler's fastpath for obj/mob in view + var/list/processing = list() + if(R == 0) + processing += T.contents + else var/lum = T.luminosity - T.luminosity = 6 // This is the maximum luminosity - var/list/cachedview = view(R, T) - for(var/mob/M in cachedview) - processing_list += M - for(var/obj/O in cachedview) - processing_list += O + T.luminosity = 6 + var/list/cached_view = view(R, T) + for(var/mob/M in cached_view) + processing += M + for(var/obj/O in cached_view) + processing += O T.luminosity = lum - - while(processing_list.len) // recursive_hear_check inlined here - var/atom/A = processing_list[1] + var/i = 0 + while(i < length(processing)) + var/atom/A = processing[++i] if(A.flags_1 & HEAR_1) . += A - SEND_SIGNAL(A, COMSIG_ATOM_HEARER_IN_VIEW, processing_list, .) - processing_list.Cut(1, 2) - processing_list += A.contents + SEND_SIGNAL(A, COMSIG_ATOM_HEARER_IN_VIEW, processing, .) + processing += A.contents /proc/get_mobs_in_radio_ranges(list/obj/item/radio/radios) . = list() diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 8b86ce691d..2f960e350b 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -457,36 +457,35 @@ Turf and target are separate in case you want to teleport some distance from a t /atom/proc/GetAllContents(var/T) var/list/processing_list = list(src) - var/list/assembled = list() if(T) - while(processing_list.len) - var/atom/A = processing_list[1] - processing_list.Cut(1, 2) + . = list() + var/i = 0 + while(i < length(processing_list)) + var/atom/A = processing_list[++i] //Byond does not allow things to be in multiple contents, or double parent-child hierarchies, so only += is needed //This is also why we don't need to check against assembled as we go along processing_list += A.contents if(istype(A,T)) - assembled += A + . += A else - while(processing_list.len) - var/atom/A = processing_list[1] - processing_list.Cut(1, 2) + var/i = 0 + while(i < length(processing_list)) + var/atom/A = processing_list[++i] processing_list += A.contents - assembled += A - return assembled + return processing_list /atom/proc/GetAllContentsIgnoring(list/ignore_typecache) if(!length(ignore_typecache)) return GetAllContents() var/list/processing = list(src) - var/list/assembled = list() - while(processing.len) - var/atom/A = processing[1] - processing.Cut(1,2) + . = list() + var/i = 0 + while(i < length(processing)) + var/atom/A = processing[++i] if(!ignore_typecache[A.type]) processing += A.contents - assembled += A - return assembled + . += A + //Step-towards method of determining whether one atom can see another. Similar to viewers() /proc/can_see(atom/source, atom/target, length=5) // I couldnt be arsed to do actual raycasting :I This is horribly inaccurate. diff --git a/code/_globalvars/logging.dm b/code/_globalvars/logging.dm index a13a958ef7..2d5d2388ec 100644 --- a/code/_globalvars/logging.dm +++ b/code/_globalvars/logging.dm @@ -32,6 +32,8 @@ GLOBAL_VAR(world_map_error_log) GLOBAL_PROTECT(world_map_error_log) GLOBAL_VAR(subsystem_log) GLOBAL_PROTECT(subsystem_log) +GLOBAL_VAR(reagent_log) +GLOBAL_PROTECT(reagent_log) GLOBAL_VAR(world_crafting_log) GLOBAL_PROTECT(world_crafting_log) diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm index 4ce0ccf361..ad1f869057 100644 --- a/code/controllers/configuration/configuration.dm +++ b/code/controllers/configuration/configuration.dm @@ -193,6 +193,13 @@ stat("[name]:", statclick) /datum/controller/configuration/proc/Get(entry_type) + var/datum/config_entry/E = GetEntryDatum(entry_type) + if((E.protection & CONFIG_ENTRY_HIDDEN) && IsAdminAdvancedProcCall() && GLOB.LastAdminCalledProc == "Get" && GLOB.LastAdminCalledTargetRef == "[REF(src)]") + log_admin_private("Config access of [entry_type] attempted by [key_name(usr)]") + return + return E.config_entry_value + +/datum/controller/configuration/proc/GetEntryDatum(entry_type) var/datum/config_entry/E = entry_type var/entry_is_abstract = initial(E.abstract_type) == entry_type if(entry_is_abstract) @@ -200,10 +207,7 @@ E = entries_by_type[entry_type] if(!E) CRASH("Missing config entry for [entry_type]!") - if((E.protection & CONFIG_ENTRY_HIDDEN) && IsAdminAdvancedProcCall() && GLOB.LastAdminCalledProc == "Get" && GLOB.LastAdminCalledTargetRef == "[REF(src)]") - log_admin_private("Config access of [entry_type] attempted by [key_name(usr)]") - return - return E.config_entry_value + return E /datum/controller/configuration/proc/Set(entry_type, new_val) var/datum/config_entry/E = entry_type diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm index 6efc9eab12..a3bc47ac91 100644 --- a/code/controllers/configuration/entries/game_options.dm +++ b/code/controllers/configuration/entries/game_options.dm @@ -249,6 +249,18 @@ /datum/config_entry/number/movedelay/walk_delay +/datum/config_entry/number/movedelay/sprint_speed_increase + config_entry_value = 1 + +/datum/config_entry/number/movedelay/sprint_buffer_max + config_entry_value = 42 + +/datum/config_entry/number/movedelay/sprint_stamina_cost + config_entry_value = 0.7 + +/datum/config_entry/number/movedelay/sprint_buffer_regen_per_ds + config_entry_value = 0.3 + /////////////////////////////////////////////////Outdated move delay /datum/config_entry/number/outdated_movedelay deprecated_by = /datum/config_entry/keyed_list/multiplicative_movespeed diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 6b72f2fdfc..1c21fb9528 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -110,7 +110,7 @@ // Randomly pick a symptom to activate. /datum/disease/advance/stage_act() ..() - if(carrier) + if(carrier || QDELETED(src)) // Could be cured in parent call. return if(symptoms && symptoms.len) diff --git a/code/datums/traits/_quirk.dm b/code/datums/traits/_quirk.dm index 12e34b0c90..d68b11135f 100644 --- a/code/datums/traits/_quirk.dm +++ b/code/datums/traits/_quirk.dm @@ -15,6 +15,7 @@ /datum/quirk/New(mob/living/quirk_mob, spawn_effects) if(!quirk_mob || (human_only && !ishuman(quirk_mob)) || quirk_mob.has_quirk(type)) qdel(src) + return quirk_holder = quirk_mob SSquirks.quirk_objects += src to_chat(quirk_holder, gain_text) diff --git a/code/game/gamemodes/brother/traitor_bro.dm b/code/game/gamemodes/brother/traitor_bro.dm index df4a38cf60..718ed2c103 100644 --- a/code/game/gamemodes/brother/traitor_bro.dm +++ b/code/game/gamemodes/brother/traitor_bro.dm @@ -5,6 +5,7 @@ /datum/game_mode/traitor/bros name = "traitor+brothers" config_tag = "traitorbro" + required_players = 25 restricted_jobs = list("AI", "Cyborg") protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index f99fe5c3e4..b7003e4f1e 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -527,7 +527,7 @@ GLOBAL_LIST_EMPTY(possible_items) else if(targetinfo.check_special_completion(I))//Returns 1 by default. Items with special checks will return 1 if the conditions are fulfilled. return TRUE - if(targetinfo && I.type in targetinfo.altitems) //Ok, so you don't have the item. Do you have an alternative, at least? + if(targetinfo && (I.type in targetinfo.altitems)) //Ok, so you don't have the item. Do you have an alternative, at least? if(targetinfo.check_special_completion(I))//Yeah, we do! Don't return 0 if we don't though - then you could fail if you had 1 item that didn't pass and got checked first! return TRUE return FALSE diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index bef5effb54..22c1ff811c 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -319,7 +319,8 @@ if(status) change_msg = "reactivates" triggerCameraAlarm() - addtimer(CALLBACK(src, .proc/cancelCameraAlarm), 100) + if(!QDELETED(src)) //We'll be doing it anyway in destroy + addtimer(CALLBACK(src, .proc/cancelCameraAlarm), 100) if(displaymessage) if(user) visible_message("[user] [change_msg] [src]!") diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index a238c4a451..b007bc0161 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -119,6 +119,9 @@ if(istype(P, /obj/item/circuitboard/machine)) var/obj/item/circuitboard/machine/B = P + if(!B.build_path) + to_chat(user, "This circuitboard seems to be broken.") + return if(!anchored && B.needs_anchored) to_chat(user, "The frame needs to be secured first!") return diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index ad0f372530..9db98b8314 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -288,9 +288,10 @@ return operating = TRUE - do_animate("closing") layer = closingLayer + if(!safe) + crush() sleep(5) density = TRUE sleep(5) @@ -302,8 +303,6 @@ update_freelook_sight() if(safe) CheckForMobs() - else - crush() return 1 /obj/machinery/door/proc/CheckForMobs() diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 0e2363cb6a..5555e05eb0 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -198,7 +198,7 @@ return else if(W.force) //hit and turn it on ..() - var/area/A = get_area(src) + var/area/A = get_base_area(src) if(!A.fire) alarm() return diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 8f09827bd2..3d63f4a553 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -456,7 +456,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) if(!SSmapping.station_room_templates[t]) log_world("Station room spawner placed at ([T.x], [T.y], [T.z]) has invalid ruin name of \"[t]\" in its list") templates -= t - template_name = pickweight(templates) + template_name = pickweightAllowZero(templates) if(!template_name) GLOB.stationroom_landmarks -= src qdel(src) @@ -485,4 +485,4 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) // Landmark for the mining station /obj/effect/landmark/stationroom/lavaland/station templates = list("Public Mining Base" = 3) - icon = 'icons/rooms/Lavaland/Mining.dmi' \ No newline at end of file + icon = 'icons/rooms/Lavaland/Mining.dmi' diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 49985f5c23..1186ea8001 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -146,7 +146,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(!proximity || lit) //can't dip if cigarette is lit (it will heat the reagents in the glass instead) return if(istype(glass)) //you can dip cigarettes into beakers - if(glass.reagents.trans_to(src, chem_volume)) //if reagents were transfered, show the message + if(glass.reagents.trans_to(src, chem_volume, log = "cigar fill: dip cigarette")) //if reagents were transfered, show the message to_chat(user, "You dip \the [src] into \the [glass].") else //if not, either the beaker was empty, or the cigarette was full if(!glass.reagents.total_volume) @@ -154,7 +154,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM else to_chat(user, "[src] is full.") - /obj/item/clothing/mask/cigarette/proc/light(flavor_text = null) if(lit) return @@ -438,7 +437,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM packeditem = 1 name = "[O.name]-packed [initial(name)]" if(O.reagents) - O.reagents.trans_to(src, O.reagents.total_volume) + O.reagents.trans_to(src, O.reagents.total_volume, log = "cigar fill: pipe pack") qdel(O) else to_chat(user, "It has to be dried first!") @@ -687,7 +686,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(O.dry) var/obj/item/clothing/mask/cigarette/rollie/R = new /obj/item/clothing/mask/cigarette/rollie(user.loc) R.chem_volume = target.reagents.total_volume - target.reagents.trans_to(R, R.chem_volume) + target.reagents.trans_to(R, R.chem_volume, log = "cigar fill: rolling paper afterattack") qdel(target) qdel(src) user.put_in_active_hand(R) @@ -903,7 +902,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM //Transfer reagents and remove the plant user.show_message("You stuff the [DP] into the [src]'s bowl.", MSG_VISUAL) - DP.reagents.trans_to(src, 100) + DP.reagents.trans_to(src, 100, log = "cigar fill: bong") qdel(DP) return else diff --git a/code/game/objects/items/devices/desynchronizer.dm b/code/game/objects/items/devices/desynchronizer.dm index ff58af2405..0fa557f666 100644 --- a/code/game/objects/items/devices/desynchronizer.dm +++ b/code/game/objects/items/devices/desynchronizer.dm @@ -14,6 +14,7 @@ var/last_use = 0 var/next_use = 0 var/obj/effect/abstract/sync_holder/sync_holder + var/resync_timer /obj/item/desynchronizer/attack_self(mob/living/user) if(world.time < next_use) @@ -56,16 +57,20 @@ SEND_SIGNAL(AM, COMSIG_MOVABLE_SECLUDED_LOCATION) last_use = world.time icon_state = "desynchronizer-on" - addtimer(CALLBACK(src, .proc/resync), duration) + resync_timer = addtimer(CALLBACK(src, .proc/resync), duration , TIMER_STOPPABLE) /obj/item/desynchronizer/proc/resync() new /obj/effect/temp_visual/desynchronizer(sync_holder.drop_location()) QDEL_NULL(sync_holder) + if(resync_timer) + deltimer(resync_timer) + resync_timer = null icon_state = initial(icon_state) next_use = world.time + (world.time - last_use) // Could be 2*world.time-last_use but that would just be confusing /obj/item/desynchronizer/Destroy() - resync() + if(sync_holder) + resync() return ..() /obj/effect/abstract/sync_holder diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index e958345d4f..31dd6d32a3 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -309,6 +309,15 @@ GLOBAL_LIST_INIT(bamboo_recipes, list ( \ recipes = GLOB.bamboo_recipes return ..() +/obj/item/stack/sheet/mineral/bamboo/ten + amount = 10 + +/obj/item/stack/sheet/mineral/bamboo/twenty + amount = 20 + +/obj/item/stack/sheet/mineral/bamboo/fifty + amount = 50 + /* * Cloth */ diff --git a/code/game/objects/structures/barsigns.dm b/code/game/objects/structures/barsigns.dm index 053512a256..b72a4b816e 100644 --- a/code/game/objects/structures/barsigns.dm +++ b/code/game/objects/structures/barsigns.dm @@ -305,7 +305,7 @@ /datum/barsign/meow_mix name = "Meow Mix" - icon = "meow_mix" + icon = "Meow Mix" desc = "No, we don't serve catnip, officer!" /datum/barsign/hiddensigns diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 9a095bf69d..daf15832fb 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -532,7 +532,7 @@ /obj/structure/closet/CtrlShiftClick(mob/living/user) if(!HAS_TRAIT(user, TRAIT_SKITTISH)) return ..() - if(!user.canUseTopic(src) || !isturf(user.loc)) + if(!user.canUseTopic(src) || !isturf(user.loc) || !user.Adjacent(src) || !user.CanReach(src)) return dive_into(user) diff --git a/code/game/objects/structures/headpike.dm b/code/game/objects/structures/headpike.dm index ceed9cb759..81433b562d 100644 --- a/code/game/objects/structures/headpike.dm +++ b/code/game/objects/structures/headpike.dm @@ -42,8 +42,9 @@ if(.) return to_chat(user, "You take down [src].") - victim.forceMove(drop_location()) - victim = null + if(victim) + victim.forceMove(drop_location()) + victim = null spear.forceMove(drop_location()) spear = null qdel(src) \ No newline at end of file diff --git a/code/game/world.dm b/code/game/world.dm index 7afaf62bb8..8c3e848106 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -116,6 +116,7 @@ GLOBAL_LIST(topic_status_cache) GLOB.query_debug_log = "[GLOB.log_directory]/query_debug.log" GLOB.world_job_debug_log = "[GLOB.log_directory]/job_debug.log" GLOB.subsystem_log = "[GLOB.log_directory]/subsystem.log" + GLOB.reagent_log = "[GLOB.log_directory]/reagents.log" GLOB.world_crafting_log = "[GLOB.log_directory]/crafting.log" #ifdef UNIT_TESTS @@ -132,6 +133,7 @@ GLOBAL_LIST(topic_status_cache) start_log(GLOB.world_runtime_log) start_log(GLOB.world_job_debug_log) start_log(GLOB.subsystem_log) + start_log(GLOB.reagent_log) start_log(GLOB.world_crafting_log) GLOB.changelog_hash = md5('html/changelog.html') //for telling if the changelog has changed recently diff --git a/code/modules/VR/vr_sleeper.dm b/code/modules/VR/vr_sleeper.dm index b62c17832a..29d7224950 100644 --- a/code/modules/VR/vr_sleeper.dm +++ b/code/modules/VR/vr_sleeper.dm @@ -231,7 +231,7 @@ if (!vr_area) qdel(src) return - var/list/contents = get_sub_areas_contents(src) + var/list/contents = get_sub_areas_contents(vr_area) for (var/obj/item/ammo_casing/casing in contents) qdel(casing) for(var/obj/effect/decal/cleanable/C in contents) diff --git a/code/modules/antagonists/abductor/equipment/abduction_gear.dm b/code/modules/antagonists/abductor/equipment/abduction_gear.dm index e6af9fa487..332329a221 100644 --- a/code/modules/antagonists/abductor/equipment/abduction_gear.dm +++ b/code/modules/antagonists/abductor/equipment/abduction_gear.dm @@ -29,6 +29,11 @@ var/stealth_armor = list("melee" = 15, "bullet" = 15, "laser" = 15, "energy" = 15, "bomb" = 15, "bio" = 15, "rad" = 15, "fire" = 70, "acid" = 70) var/combat_armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 50, "bio" = 50, "rad" = 50, "fire" = 90, "acid" = 90) +/obj/item/clothing/suit/armor/abductor/vest/Initialize() + . = ..() + stealth_armor = getArmor(arglist(stealth_armor)) + combat_armor = getArmor(arglist(combat_armor)) + /obj/item/clothing/suit/armor/abductor/vest/proc/toggle_nodrop() if(HAS_TRAIT_FROM(src, TRAIT_NODROP, ABDUCTOR_VEST_TRAIT)) REMOVE_TRAIT(src, TRAIT_NODROP, ABDUCTOR_VEST_TRAIT) diff --git a/code/modules/antagonists/swarmer/swarmer.dm b/code/modules/antagonists/swarmer/swarmer.dm index ce455d9e67..f2296d239f 100644 --- a/code/modules/antagonists/swarmer/swarmer.dm +++ b/code/modules/antagonists/swarmer/swarmer.dm @@ -274,7 +274,8 @@ /obj/machinery/camera/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) S.DisIntegrate(src) - toggle_cam(S, 0) + if(!QDELETED(S)) //If it got blown up no need to turn it off. + toggle_cam(S, 0) return TRUE /obj/machinery/particle_accelerator/control_box/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) diff --git a/code/modules/atmospherics/machinery/components/binary_devices/relief_valve.dm b/code/modules/atmospherics/machinery/components/binary_devices/relief_valve.dm index 5835912cd3..bc58ef158f 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/relief_valve.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/relief_valve.dm @@ -5,6 +5,7 @@ icon_state = "relief_valve-t-map" can_unwrench = TRUE construction_type = /obj/item/pipe/binary + interaction_flags_machine = INTERACT_MACHINE_OFFLINE | INTERACT_MACHINE_WIRES_IF_OPEN | INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OPEN_SILICON | INTERACT_MACHINE_SET_MACHINE var/opened = FALSE var/open_pressure = ONE_ATMOSPHERE * 3 var/close_pressure = ONE_ATMOSPHERE @@ -50,9 +51,11 @@ if(!is_operational()) return - var/datum/gas_mixture/air_contents = airs[1] - var/our_pressure = air_contents.return_pressure() - if(opened && our_pressure < close_pressure) + var/datum/gas_mixture/air_one = airs[1] + var/datum/gas_mixture/air_two = airs[2] + var/air_one_pressure = air_one.return_pressure() + var/our_pressure = abs(air_one_pressure - air_two.return_pressure()) + if(opened && air_one_pressure < close_pressure) close() else if(!opened && our_pressure >= open_pressure) open() diff --git a/code/modules/atmospherics/machinery/components/unary_devices/relief_valve.dm b/code/modules/atmospherics/machinery/components/unary_devices/relief_valve.dm index 9da9e49e01..4b6a4a4c10 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/relief_valve.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/relief_valve.dm @@ -4,6 +4,7 @@ icon = 'icons/obj/atmospherics/components/relief_valve.dmi' icon_state = "relief_valve-e-map" can_unwrench = TRUE + interaction_flags_machine = INTERACT_MACHINE_OFFLINE | INTERACT_MACHINE_WIRES_IF_OPEN | INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OPEN_SILICON | INTERACT_MACHINE_SET_MACHINE var/opened = FALSE var/open_pressure = ONE_ATMOSPHERE * 3 var/close_pressure = ONE_ATMOSPHERE diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm index bd4e716357..8ceef76a06 100644 --- a/code/modules/awaymissions/capture_the_flag.dm +++ b/code/modules/awaymissions/capture_the_flag.dm @@ -7,8 +7,6 @@ #define AMMO_DROP_LIFETIME 300 #define CTF_REQUIRED_PLAYERS 4 - - /obj/item/twohanded/ctf name = "banner" icon = 'icons/obj/items_and_weapons.dmi' @@ -210,7 +208,6 @@ toggle_all_ctf(user) return - people_who_want_to_play |= user.ckey var/num = people_who_want_to_play.len var/remaining = CTF_REQUIRED_PLAYERS - num @@ -438,9 +435,9 @@ . = FALSE if(istype(target, /obj/structure/barricade/security/ctf)) . = TRUE - if(ishuman(target)) - var/mob/living/carbon/human/H = target - if(istype(H.wear_suit, /obj/item/clothing/suit/space/hardsuit/shielded/ctf)) + if(isliving(target)) + var/mob/living/H = target + if((RED_TEAM in H.faction) || (BLUE_TEAM in H.faction)) . = TRUE // RED TEAM GUNS diff --git a/code/modules/cargo/packs/armory.dm b/code/modules/cargo/packs/armory.dm index 372824c8e4..ea8ef8ba0f 100644 --- a/code/modules/cargo/packs/armory.dm +++ b/code/modules/cargo/packs/armory.dm @@ -201,22 +201,6 @@ var/item = pick(contains) new item(C) -/datum/supply_pack/security/armory/spinfusor - name = "Stormhammer Spinfusor Crate" - cost = 14000 - desc = "Got yourself a code red? Blob, nukies or even worst knocking on your door? Well with the Stormhammer Spinfusor you can stop crime in one shot, dont miss! Contains two Stormhammer Spinfusors (Note, guns may or may not be loaded). Requires Armory access to open." - contains = list(/obj/item/gun/ballistic/automatic/spinfusor, - /obj/item/gun/ballistic/automatic/spinfusor) - crate_name = "spinfusor crate" - -/datum/supply_pack/security/armory/spinfusorammo - name = "Spinfusor Disk Crate" - cost = 7000 - desc = "Need more ammo for a Stormhammer? Well we got some for a price! Contains two boxes of Spinfusor disks. Requires Armory access to open." - contains = list(/obj/item/ammo_box/aspinfusor, - /obj/item/ammo_box/aspinfusor) - crate_name = "spinfusor disk crate" - /datum/supply_pack/security/armory/swat name = "SWAT Crate" desc = "Contains two fullbody sets of tough, fireproof, pressurized suits designed in a joint effort by IS-ERI and Nanotrasen. Each set contains a suit, helmet, mask, combat belt, and combat gloves. Requires Armory access to open." diff --git a/code/modules/cargo/packs/costumes_toys.dm b/code/modules/cargo/packs/costumes_toys.dm index f41a43070d..4a64979502 100644 --- a/code/modules/cargo/packs/costumes_toys.dm +++ b/code/modules/cargo/packs/costumes_toys.dm @@ -3,7 +3,7 @@ // If you add something to this list, please group it by type and sort it alphabetically instead of just jamming it in like an animal // cost = 700- Minimum cost, or infinite points are possible. ////////////////////////////////////////////////////////////////////////////// -//////////////////////////// Costumes & Toys ///////////////////////////////// +////////////////////////////////// Toys ////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// /datum/supply_pack/costumes_toys @@ -98,40 +98,6 @@ /obj/item/ammo_box/magazine/toy/pistol) crate_name = "foam force crate" -/datum/supply_pack/costumes_toys/formalwear - name = "Formalwear Crate" - desc = "You're gonna like the way you look, I guaranteed it. Contains an asston of fancy clothing." - cost = 4750 //Lots of fancy clothing that can be sold back! - contains = list(/obj/item/clothing/under/blacktango, - /obj/item/clothing/under/assistantformal, - /obj/item/clothing/under/assistantformal, - /obj/item/clothing/under/lawyer/bluesuit, - /obj/item/clothing/suit/toggle/lawyer, - /obj/item/clothing/under/lawyer/purpsuit, - /obj/item/clothing/suit/toggle/lawyer/purple, - /obj/item/clothing/under/lawyer/blacksuit, - /obj/item/clothing/suit/toggle/lawyer/black, - /obj/item/clothing/accessory/waistcoat, - /obj/item/clothing/neck/tie/blue, - /obj/item/clothing/neck/tie/red, - /obj/item/clothing/neck/tie/black, - /obj/item/clothing/head/bowler, - /obj/item/clothing/head/fedora, - /obj/item/clothing/head/flatcap, - /obj/item/clothing/head/beret, - /obj/item/clothing/head/that, - /obj/item/clothing/shoes/laceup, - /obj/item/clothing/shoes/laceup, - /obj/item/clothing/shoes/laceup, - /obj/item/clothing/under/suit_jacket/charcoal, - /obj/item/clothing/under/suit_jacket/navy, - /obj/item/clothing/under/suit_jacket/burgundy, - /obj/item/clothing/under/suit_jacket/checkered, - /obj/item/clothing/under/suit_jacket/tan, - /obj/item/lipstick/random) - crate_name = "formalwear crate" - crate_type = /obj/structure/closet/crate/wooden - /datum/supply_pack/costumes_toys/clownpin name = "Hilarious Firing Pin Crate" desc = "I uh... I'm not really sure what this does. Wanna buy it?" @@ -173,47 +139,6 @@ contains = list(/obj/item/storage/box/lasertagpins) crate_name = "laser tag crate" -/datum/supply_pack/costumes_toys/costume_original - name = "Original Costume Crate" - desc = "Reenact Shakespearean plays with this assortment of outfits. Contains eight different costumes!" - cost = 1750 - contains = list(/obj/item/clothing/head/snowman, - /obj/item/clothing/suit/snowman, - /obj/item/clothing/head/chicken, - /obj/item/clothing/suit/chickensuit, - /obj/item/clothing/mask/gas/monkeymask, - /obj/item/clothing/suit/monkeysuit, - /obj/item/clothing/head/cardborg, - /obj/item/clothing/suit/cardborg, - /obj/item/clothing/head/xenos, - /obj/item/clothing/suit/xenos, - /obj/item/clothing/suit/hooded/ian_costume, - /obj/item/clothing/suit/hooded/carp_costume, - /obj/item/clothing/suit/hooded/bee_costume) - crate_name = "original costume crate" - crate_type = /obj/structure/closet/crate/wooden - -/datum/supply_pack/costumes_toys/costume - name = "Standard Costume Crate" - desc = "Supply the station's entertainers with the equipment of their trade with these Nanotrasen-approved costumes! Contains a full clown and mime outfit, along with a bike horn and a bottle of nothing." - cost = 1300 - access = ACCESS_THEATRE - contains = list(/obj/item/storage/backpack/clown, - /obj/item/clothing/shoes/clown_shoes, - /obj/item/clothing/mask/gas/clown_hat, - /obj/item/clothing/under/rank/clown, - /obj/item/bikehorn, - /obj/item/clothing/under/rank/mime, - /obj/item/clothing/shoes/sneakers/black, - /obj/item/clothing/gloves/color/white, - /obj/item/clothing/mask/gas/mime, - /obj/item/clothing/head/beret, - /obj/item/clothing/suit/suspenders, - /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing, - /obj/item/storage/backpack/mime) - crate_name = "standard costume crate" - crate_type = /obj/structure/closet/crate/wooden - /datum/supply_pack/costumes_toys/randomised/toys name = "Toy Crate" desc = "Who cares about pride and accomplishment? Skip the gaming and get straight to the sweet rewards with this product! Contains five random toys. Warranty void if used to prank research directors." @@ -284,6 +209,86 @@ crate_name = "plushie crate" crate_type = /obj/structure/closet/crate/wooden + +////////////////////////////////////////////////////////////////////////////// +///////////////////////////////// Costumes ////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// + +/datum/supply_pack/costumes_toys/formalwear + name = "Formalwear Crate" + desc = "You're gonna like the way you look, I guaranteed it. Contains an asston of fancy clothing." + cost = 4750 //Lots of fancy clothing that can be sold back! + contains = list(/obj/item/clothing/under/blacktango, + /obj/item/clothing/under/assistantformal, + /obj/item/clothing/under/assistantformal, + /obj/item/clothing/under/lawyer/bluesuit, + /obj/item/clothing/suit/toggle/lawyer, + /obj/item/clothing/under/lawyer/purpsuit, + /obj/item/clothing/suit/toggle/lawyer/purple, + /obj/item/clothing/under/lawyer/blacksuit, + /obj/item/clothing/suit/toggle/lawyer/black, + /obj/item/clothing/accessory/waistcoat, + /obj/item/clothing/neck/tie/blue, + /obj/item/clothing/neck/tie/red, + /obj/item/clothing/neck/tie/black, + /obj/item/clothing/head/bowler, + /obj/item/clothing/head/fedora, + /obj/item/clothing/head/flatcap, + /obj/item/clothing/head/beret, + /obj/item/clothing/head/that, + /obj/item/clothing/shoes/laceup, + /obj/item/clothing/shoes/laceup, + /obj/item/clothing/shoes/laceup, + /obj/item/clothing/under/suit_jacket/charcoal, + /obj/item/clothing/under/suit_jacket/navy, + /obj/item/clothing/under/suit_jacket/burgundy, + /obj/item/clothing/under/suit_jacket/checkered, + /obj/item/clothing/under/suit_jacket/tan, + /obj/item/lipstick/random) + crate_name = "formalwear crate" + crate_type = /obj/structure/closet/crate/wooden + +/datum/supply_pack/costumes_toys/costume_original + name = "Original Costume Crate" + desc = "Reenact Shakespearean plays with this assortment of outfits. Contains eight different costumes!" + cost = 1750 + contains = list(/obj/item/clothing/head/snowman, + /obj/item/clothing/suit/snowman, + /obj/item/clothing/head/chicken, + /obj/item/clothing/suit/chickensuit, + /obj/item/clothing/mask/gas/monkeymask, + /obj/item/clothing/suit/monkeysuit, + /obj/item/clothing/head/cardborg, + /obj/item/clothing/suit/cardborg, + /obj/item/clothing/head/xenos, + /obj/item/clothing/suit/xenos, + /obj/item/clothing/suit/hooded/ian_costume, + /obj/item/clothing/suit/hooded/carp_costume, + /obj/item/clothing/suit/hooded/bee_costume) + crate_name = "original costume crate" + crate_type = /obj/structure/closet/crate/wooden + +/datum/supply_pack/costumes_toys/costume + name = "Standard Costume Crate" + desc = "Supply the station's entertainers with the equipment of their trade with these Nanotrasen-approved costumes! Contains a full clown and mime outfit, along with a bike horn and a bottle of nothing." + cost = 1300 + access = ACCESS_THEATRE + contains = list(/obj/item/storage/backpack/clown, + /obj/item/clothing/shoes/clown_shoes, + /obj/item/clothing/mask/gas/clown_hat, + /obj/item/clothing/under/rank/clown, + /obj/item/bikehorn, + /obj/item/clothing/under/rank/mime, + /obj/item/clothing/shoes/sneakers/black, + /obj/item/clothing/gloves/color/white, + /obj/item/clothing/mask/gas/mime, + /obj/item/clothing/head/beret, + /obj/item/clothing/suit/suspenders, + /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing, + /obj/item/storage/backpack/mime) + crate_name = "standard costume crate" + crate_type = /obj/structure/closet/crate/wooden + /datum/supply_pack/costumes_toys/wizard name = "Wizard Costume Crate" desc = "Pretend to join the Wizard Federation with this full wizard outfit! Nanotrasen would like to remind its employees that actually joining the Wizard Federation is subject to termination of job and life." @@ -294,76 +299,3 @@ /obj/item/clothing/head/wizard/fake) crate_name = "wizard costume crate" crate_type = /obj/structure/closet/crate/wooden - -/datum/supply_pack/costumes_toys/wardrobes/autodrobe - name = "Autodrobe Supply Crate" - desc = "Autodrobe missing your favorite dress? Solve that issue today with this autodrobe refill." - cost = 1500 - contains = list(/obj/item/vending_refill/autodrobe) - crate_name = "autodrobe supply crate" - -/datum/supply_pack/costumes_toys/wardrobes/cargo - name = "Cargo Wardrobe Supply Crate" - desc = "This crate contains a refill for the CargoDrobe." - cost = 750 - contains = list(/obj/item/vending_refill/wardrobe/cargo_wardrobe) - crate_name = "cargo department supply crate" - -/datum/supply_pack/costumes_toys/wardrobes/engineering - name = "Engineering Wardrobe Supply Crate" - desc = "This crate contains refills for the EngiDrobe and AtmosDrobe." - cost = 1500 - contains = list(/obj/item/vending_refill/wardrobe/engi_wardrobe, - /obj/item/vending_refill/wardrobe/atmos_wardrobe) - crate_name = "engineering department wardrobe supply crate" - -/datum/supply_pack/costumes_toys/wardrobes/general - name = "General Wardrobes Supply Crate" - desc = "This crate contains refills for the CuraDrobe, BarDrobe, ChefDrobe, JaniDrobe, ChapDrobe." - cost = 3750 - contains = list(/obj/item/vending_refill/wardrobe/curator_wardrobe, - /obj/item/vending_refill/wardrobe/bar_wardrobe, - /obj/item/vending_refill/wardrobe/chef_wardrobe, - /obj/item/vending_refill/wardrobe/jani_wardrobe, - /obj/item/vending_refill/wardrobe/chap_wardrobe) - crate_name = "general wardrobes vendor refills" - -/datum/supply_pack/costumes_toys/wardrobes/hydroponics - name = "Hydrobe Supply Crate" - desc = "This crate contains a refill for the Hydrobe." - cost = 750 - contains = list(/obj/item/vending_refill/wardrobe/hydro_wardrobe) - crate_name = "hydrobe supply crate" - -/datum/supply_pack/costumes_toys/wardrobes/medical - name = "Medical Wardrobe Supply Crate" - desc = "This crate contains refills for the MediDrobe, ChemDrobe, GeneDrobe, and ViroDrobe." - cost = 3000 - contains = list(/obj/item/vending_refill/wardrobe/medi_wardrobe, - /obj/item/vending_refill/wardrobe/chem_wardrobe, - /obj/item/vending_refill/wardrobe/gene_wardrobe, - /obj/item/vending_refill/wardrobe/viro_wardrobe) - crate_name = "medical department wardrobe supply crate" - -/datum/supply_pack/costumes_toys/wardrobes/science - name = "Science Wardrobe Supply Crate" - desc = "This crate contains refills for the SciDrobe and RoboDrobe." - cost = 1500 - contains = list(/obj/item/vending_refill/wardrobe/robo_wardrobe, - /obj/item/vending_refill/wardrobe/science_wardrobe) - crate_name = "science department wardrobe supply crate" - -/datum/supply_pack/costumes_toys/wardrobes/security - name = "Security Wardrobe Supply Crate" - desc = "This crate contains refills for the SecDrobe and LawDrobe." - cost = 1500 - contains = list(/obj/item/vending_refill/wardrobe/sec_wardrobe, - /obj/item/vending_refill/wardrobe/law_wardrobe) - crate_name = "security department supply crate" - -/datum/supply_pack/costumes_toys/kinkmate - name = "Kinkmate construction kit" - cost = 2000 - contraband = TRUE - contains = list(/obj/item/vending_refill/kink, /obj/item/circuitboard/machine/kinkmate) - crate_name = "Kinkmate construction kit" diff --git a/code/modules/cargo/packs/emergency.dm b/code/modules/cargo/packs/emergency.dm index 747e820f52..e32811f2d0 100644 --- a/code/modules/cargo/packs/emergency.dm +++ b/code/modules/cargo/packs/emergency.dm @@ -11,11 +11,13 @@ /datum/supply_pack/emergency/vehicle name = "Biker Gang Kit" //TUNNEL SNAKES OWN THIS TOWN - desc = "TUNNEL SNAKES OWN THIS TOWN. Contains an unbranded All Terrain Vehicle, and a complete gang outfit -- consists of black gloves, a menacing skull bandanna, and a SWEET leather overcoat!" + desc = "TUNNEL SNAKES OWN THIS TOWN. Contains an unbranded All Terrain Vehicle, two cans of spraypaint, and a complete gang outfit -- consists of black gloves, a menacing skull bandanna, and a SWEET leather overcoat!" cost = 2500 contraband = TRUE contains = list(/obj/vehicle/ridden/atv, /obj/item/key, + /obj/item/toy/crayon/spraycan, + /obj/item/toy/crayon/spraycan, /obj/item/clothing/suit/jacket/leather/overcoat, /obj/item/clothing/gloves/color/black, /obj/item/clothing/head/soft, @@ -126,21 +128,6 @@ crate_name = "emergency rcds" crate_type = /obj/structure/closet/crate/internals -/datum/supply_pack/emergency/soft_suit - name = "Emergency Space Suit" - desc = "Are there bombs going off left and right? Are there meteors shooting around the station? Well then! Here's two fragile space suits for emergencies. Comes with air and masks." - cost = 1200 - contains = list(/obj/item/tank/internals/air, - /obj/item/tank/internals/air, - /obj/item/clothing/mask/gas, - /obj/item/clothing/mask/gas, - /obj/item/clothing/suit/space/fragile, - /obj/item/clothing/suit/space/fragile, - /obj/item/clothing/head/helmet/space/fragile, - /obj/item/clothing/head/helmet/space/fragile) - crate_name = "emergency crate" - crate_type = /obj/structure/closet/crate/internals - /datum/supply_pack/emergency/bomb name = "Explosive Emergency Crate" desc = "Science gone bonkers? Beeping behind the airlock? Buy now and be the hero the station des... I mean needs! (Time not included.)" @@ -208,7 +195,7 @@ crate_name = "metal foam grenade crate" /datum/supply_pack/emergency/mre - name = "MRE supply kit (emergency rations)" + name = "MRE Packs (Emergency Rations)" desc = "The lights are out. Oxygen's running low. You've run out of food except space weevils. Don't let this be you! Order our NT branded MRE kits today! This pack contains 5 MRE packs with a randomized menu and an oxygen tank." cost = 2000 contains = list(/obj/item/storage/box/mre/menu1/safe, @@ -296,6 +283,21 @@ crate_name = "space suit crate" crate_type = /obj/structure/closet/crate/secure +/datum/supply_pack/emergency/soft_suit + name = "Space Suits (Fragile)" + desc = "Are there bombs going off left and right? Are there meteors shooting around the station? Well then! Here's two fragile space suits for emergencies. Comes with air and masks." + cost = 1200 + contains = list(/obj/item/tank/internals/air, + /obj/item/tank/internals/air, + /obj/item/clothing/mask/gas, + /obj/item/clothing/mask/gas, + /obj/item/clothing/suit/space/fragile, + /obj/item/clothing/suit/space/fragile, + /obj/item/clothing/head/helmet/space/fragile, + /obj/item/clothing/head/helmet/space/fragile) + crate_name = "emergency crate" + crate_type = /obj/structure/closet/crate/internals + /datum/supply_pack/emergency/spacejets name = "Spare EVA Jetpacks" desc = "Contains three EVA grade jectpaks. Requires EVA access to open." diff --git a/code/modules/cargo/packs/engineering.dm b/code/modules/cargo/packs/engineering.dm index 6492df5215..22258d19a7 100644 --- a/code/modules/cargo/packs/engineering.dm +++ b/code/modules/cargo/packs/engineering.dm @@ -3,7 +3,7 @@ // If you add something to this list, please group it by type and sort it alphabetically instead of just jamming it in like an animal // cost = 700- Minimum cost, or infinite points are possible. ////////////////////////////////////////////////////////////////////////////// -//////////////////////////// Engineering ///////////////////////////////////// +///////////////////////////// Engineering //////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// /datum/supply_pack/engineering @@ -45,6 +45,7 @@ /obj/item/clothing/glasses/meson/engine, /obj/item/clothing/glasses/meson/engine) crate_name = "engineering gear crate" + crate_type = /obj/structure/closet/crate/secure/engineering /datum/supply_pack/engineering/engihardsuit name = "Engineering Hardsuit" @@ -55,6 +56,7 @@ /obj/item/clothing/mask/gas, /obj/item/clothing/suit/space/hardsuit/engine) crate_name = "engineering hardsuit" + crate_type = /obj/structure/closet/crate/secure/engineering /datum/supply_pack/engineering/atmoshardsuit name = "Atmospherics Hardsuit" @@ -114,6 +116,22 @@ crate_name = "PACMAN generator crate" crate_type = /obj/structure/closet/crate/engineering/electrical +/datum/supply_pack/engineering/airpump + name = "Portable Air Pump Crate" + desc = "We all know you work in a high pressure workplace. Keep it that way with two additional air pumps!" + cost = 3000 + contains = list(/obj/machinery/portable_atmospherics/pump, + /obj/machinery/portable_atmospherics/pump) + crate_name = "portable air pump crate" + +/datum/supply_pack/engineering/airscrubber + name = "Portable Scrubber Crate" + desc = "Miasma got you down? Plasma in the vents? Freshen up with these two brand-new air scrubbers!" + cost = 3000 + contains = list(/obj/machinery/portable_atmospherics/scrubber, + /obj/machinery/portable_atmospherics/scrubber) + crate_name = "portable scrubber crate" + /datum/supply_pack/engineering/power name = "Power Cell Crate" desc = "Looking for power overwhelming? Look no further. Contains three high-voltage power cells." diff --git a/code/modules/cargo/packs/medical.dm b/code/modules/cargo/packs/medical.dm index d4fcdab962..ea327ae820 100644 --- a/code/modules/cargo/packs/medical.dm +++ b/code/modules/cargo/packs/medical.dm @@ -10,6 +10,10 @@ group = "Medical" crate_type = /obj/structure/closet/crate/medical +////////////////////////////////////////////////////////////////////////////// +/////////////////////////////// Equipment //////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// + /datum/supply_pack/medical/bodybags name = "Bodybags" desc = "For when the bodies hit the floor. Contains 4 boxes of bodybags." @@ -20,24 +24,6 @@ /obj/item/storage/box/bodybags,) crate_name = "bodybag crate" -/datum/supply_pack/medical/firstaidbruises - name = "Bruise Treatment Kit Crate" - desc = "Contains three first aid kits focused on healing bruises and broken bones." - cost = 1000 - contains = list(/obj/item/storage/firstaid/brute, - /obj/item/storage/firstaid/brute, - /obj/item/storage/firstaid/brute) - crate_name = "brute treatment kit crate" - -/datum/supply_pack/medical/firstaidburns - name = "Burn Treatment Kit Crate" - desc = "Contains three first aid kits focused on healing severe burns." - cost = 1000 - contains = list(/obj/item/storage/firstaid/fire, - /obj/item/storage/firstaid/fire, - /obj/item/storage/firstaid/fire) - crate_name = "burn treatment kit crate" - /datum/supply_pack/medical/bloodpacks name = "Blood Pack Variety Crate" desc = "Contains nine different blood packs for reintroducing blood to patients, plus two universal synthetic blood packs." @@ -86,16 +72,6 @@ /obj/item/defibrillator/loaded) crate_name = "defibrillator crate" -/datum/supply_pack/medical/firstaid - name = "First Aid Kit Crate" - desc = "Contains four first aid kits for healing most types of wounds." - cost = 1000 - contains = list(/obj/item/storage/firstaid/regular, - /obj/item/storage/firstaid/regular, - /obj/item/storage/firstaid/regular, - /obj/item/storage/firstaid/regular) - crate_name = "first aid kit crate" - /datum/supply_pack/medical/iv_drip name = "IV Drip Crate" desc = "Contains a single IV drip stand for intravenous delivery." @@ -140,13 +116,57 @@ /obj/item/storage/pill_bottle/stimulant) crate_name = "medical supplies crate" -/datum/supply_pack/medical/vending - name = "Medical Vending Crate" - desc = "Contains refills for medical vending machines." - cost = 2000 - contains = list(/obj/item/vending_refill/medical, - /obj/item/vending_refill/wallmed) - crate_name = "medical vending crate" +/datum/supply_pack/medical/adv_surgery_tools + name = "Med-Co Advanced Surgery Tools" + desc = "A full set of Med-Co advanced surgery tools, this crate also comes with a spay of synth flesh as well as a can of . Requires Surgery access to open." + cost = 5500 + access = ACCESS_SURGERY + contains = list(/obj/item/storage/belt/medical/surgery_belt_adv, + /obj/item/reagent_containers/medspray/synthflesh, + /obj/item/reagent_containers/medspray/sterilizine) + crate_name = "medco surgery tools" + crate_type = /obj/structure/closet/crate/medical + +/datum/supply_pack/medical/surgery + name = "Surgical Supplies Crate" + desc = "Do you want to perform surgery, but don't have one of those fancy shmancy degrees? Just get started with this crate containing a medical duffelbag, Sterilizine spray and collapsible roller bed." + cost = 1300 + contains = list(/obj/item/storage/backpack/duffelbag/med/surgery, + /obj/item/reagent_containers/medspray/sterilizine, + /obj/item/roller) + crate_name = "surgical supplies crate" + +////////////////////////////////////////////////////////////////////////////// +///////////////////////////// Medical Kits /////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// + +/datum/supply_pack/medical/firstaidbruises + name = "Bruise Treatment Kit Crate" + desc = "Contains three first aid kits focused on healing bruises and broken bones." + cost = 1000 + contains = list(/obj/item/storage/firstaid/brute, + /obj/item/storage/firstaid/brute, + /obj/item/storage/firstaid/brute) + crate_name = "brute treatment kit crate" + +/datum/supply_pack/medical/firstaidburns + name = "Burn Treatment Kit Crate" + desc = "Contains three first aid kits focused on healing severe burns." + cost = 1000 + contains = list(/obj/item/storage/firstaid/fire, + /obj/item/storage/firstaid/fire, + /obj/item/storage/firstaid/fire) + crate_name = "burn treatment kit crate" + +/datum/supply_pack/medical/firstaid + name = "First Aid Kit Crate" + desc = "Contains four first aid kits for healing most types of wounds." + cost = 1000 + contains = list(/obj/item/storage/firstaid/regular, + /obj/item/storage/firstaid/regular, + /obj/item/storage/firstaid/regular, + /obj/item/storage/firstaid/regular) + crate_name = "first aid kit crate" /datum/supply_pack/medical/sprays name = "Medical Sprays" @@ -182,6 +202,15 @@ /obj/item/storage/firstaid/o2) crate_name = "oxygen deprivation kit crate" +/datum/supply_pack/medical/firstaidtoxins + name = "Toxin Treatment Kit Crate" + desc = "Contains three first aid kits focused on healing damage dealt by heavy toxins." + cost = 1000 + contains = list(/obj/item/storage/firstaid/toxin, + /obj/item/storage/firstaid/toxin, + /obj/item/storage/firstaid/toxin) + crate_name = "toxin treatment kit crate" + /datum/supply_pack/medical/advrad name = "Radiation Treatment Crate Deluxe" desc = "A crate for when radiation is out of hand... Contains two rad-b-gone kits, one bottle of anti radiation deluxe pills, as well as a radiation treatment deluxe pill bottle!" @@ -195,23 +224,9 @@ crate_name = "radiation protection crate" crate_type = /obj/structure/closet/crate/radiation -/datum/supply_pack/medical/surgery - name = "Surgical Supplies Crate" - desc = "Do you want to perform surgery, but don't have one of those fancy shmancy degrees? Just get started with this crate containing a medical duffelbag, Sterilizine spray and collapsible roller bed." - cost = 1300 - contains = list(/obj/item/storage/backpack/duffelbag/med/surgery, - /obj/item/reagent_containers/medspray/sterilizine, - /obj/item/roller) - crate_name = "surgical supplies crate" - -/datum/supply_pack/medical/firstaidtoxins - name = "Toxin Treatment Kit Crate" - desc = "Contains three first aid kits focused on healing damage dealt by heavy toxins." - cost = 1000 - contains = list(/obj/item/storage/firstaid/toxin, - /obj/item/storage/firstaid/toxin, - /obj/item/storage/firstaid/toxin) - crate_name = "toxin treatment kit crate" +////////////////////////////////////////////////////////////////////////////// +//////////////////////////////// Virology //////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// /datum/supply_pack/medical/virus name = "Virus Crate" @@ -255,4 +270,4 @@ /obj/item/storage/box/syringes, /obj/item/storage/box/beakers) crate_name = "virus containment unit crate" - crate_type = /obj/structure/closet/crate/secure/plasma + crate_type = /obj/structure/closet/crate/secure/plasma \ No newline at end of file diff --git a/code/modules/cargo/packs/misc.dm b/code/modules/cargo/packs/misc.dm index 898f82c6ce..b53b7761e5 100644 --- a/code/modules/cargo/packs/misc.dm +++ b/code/modules/cargo/packs/misc.dm @@ -13,16 +13,6 @@ //////////////////// Paperwork and Writing Supplies ////////////////////////// ////////////////////////////////////////////////////////////////////////////// -/datum/supply_pack/misc/abandonedcrate - name = "Loot Box" - desc = "Try your luck with these highly secure loot boxes! Solve the lock, win great prizes! WARNING: EXPLOSIVE FAILURE." - contraband = TRUE - cost = 15000 - contains = list(/obj/structure/closet/crate/secure/loot) - crate_name = "abandoned crate" - crate_type = /obj/structure/closet/crate/large - dangerous = TRUE - /datum/supply_pack/misc/artsupply name = "Art Supplies" desc = "Make some happy little accidents with six canvasses, two easels, two boxes of crayons, and a rainbow crayon!" @@ -214,10 +204,41 @@ for(var/i in 1 to 9) new /obj/item/coin/silver(.) +/datum/supply_pack/misc/dirtymags + name = "Dirty Magazines" + desc = "Get your mind out of the gutter operative, you have work to do. Three items per order. Possible Results: .357 Speedloaders, Kitchen Gun Mags, Stetchkin Mags." + hidden = TRUE + cost = 12000 + var/num_contained = 3 + contains = list(/obj/item/ammo_box/a357, + /obj/item/ammo_box/a357, + /obj/item/ammo_box/a357, + /obj/item/ammo_box/magazine/pistolm9mm, + /obj/item/ammo_box/magazine/pistolm9mm, + /obj/item/ammo_box/magazine/pistolm9mm, + /obj/item/ammo_box/magazine/m45/kitchengun, + /obj/item/ammo_box/magazine/m45/kitchengun) + crate_name = "crate" + +/datum/supply_pack/misc/dirtymags/fill(obj/structure/closet/crate/C) + var/list/L = contains.Copy() + for(var/i in 1 to num_contained) + var/item = pick_n_take(L) + new item(C) + ////////////////////////////////////////////////////////////////////////////// -//////////////////////////////// Misc Supplies /////////////////////////////// +///////////////////////////////// Misc Supplies ////////////////////////////// ////////////////////////////////////////////////////////////////////////////// +/datum/supply_pack/misc/candles + name = "Candle Crate" + desc = "Set up a romantic dinner or host a séance with these extra candles and crayons." + cost = 850 + contains = list(/obj/item/storage/fancy/candle_box, + /obj/item/storage/fancy/candle_box, + /obj/item/storage/box/matches) + crate_name = "candle crate" + /datum/supply_pack/misc/exoticfootwear name = "Exotic Footwear Crate" desc = "Popularised by lizards and exotic dancers, the footwear included in this shipment is sure to give your feet the breathing room they deserve. Sweet Kicks Inc. is not responsible for any damage, distress, or @r0u$a1 caused by this shipment." @@ -234,14 +255,6 @@ /obj/item/clothing/shoes/kindleKicks) crate_name = "footie crate" -/datum/supply_pack/misc/wrapping_paper - name = "Festive Wrapping Paper Crate" - desc = "Want to mail your loved ones gift-wrapped chocolates, stuffed animals, or the Clown's severed head? You can do all that, with this crate full of wrapping paper." - cost = 1000 - contains = list(/obj/item/stack/wrapping_paper) - crate_type = /obj/structure/closet/crate/wooden - crate_name = "festive wrapping paper crate" - /datum/supply_pack/misc/funeral name = "Funeral Supplies" desc = "Mourn your dead properly buy sending them off with love filled notes, clean clothes, and a proper ceremony. Contains two candle packs, funeral garb, flowers, a paperbin , and crayons to help aid in religious rituals. Coffin included." @@ -267,6 +280,16 @@ contains = list(/obj/machinery/jukebox) crate_name = "Jukebox" +/datum/supply_pack/misc/abandonedcrate + name = "Loot Box" + desc = "Try your luck with these highly secure loot boxes! Solve the lock, win great prizes! WARNING: EXPLOSIVE FAILURE." + contraband = TRUE + cost = 15000 + contains = list(/obj/structure/closet/crate/secure/loot) + crate_name = "abandoned crate" + crate_type = /obj/structure/closet/crate/large + dangerous = TRUE + /datum/supply_pack/misc/potted_plants name = "Potted Plants Crate" desc = "Spruce up the station with these lovely plants! Contains a random assortment of five potted plants from Nanotrasen's potted plant research division. Warranty void if thrown." diff --git a/code/modules/cargo/packs/organic.dm b/code/modules/cargo/packs/organic.dm index 2d0af18670..4aa991fc3f 100644 --- a/code/modules/cargo/packs/organic.dm +++ b/code/modules/cargo/packs/organic.dm @@ -3,22 +3,47 @@ // If you add something to this list, please group it by type and sort it alphabetically instead of just jamming it in like an animal // cost = 700- Minimum cost, or infinite points are possible. ////////////////////////////////////////////////////////////////////////////// -//////////////////////////// Organic ///////////////////////////////////////// +//////////////////////////////// Organic ///////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// /datum/supply_pack/organic group = "Food & Hydroponics" crate_type = /obj/structure/closet/crate/freezer +/datum/supply_pack/organic/randomized + var/num_contained = 15 + +/datum/supply_pack/organic/randomized/fill(obj/structure/closet/crate/C) + for(var/i in 1 to num_contained) + var/item = pick(contains) + new item(C) + ////////////////////////////////////////////////////////////////////////////// -/////////////////////////////// Food ///////////////////////////////////////// +//////////////////////////////// Meals /////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// -/datum/supply_pack/organic/candy/randomised +/datum/supply_pack/organic/combomeal2 + name = "Burger Combo #2" + desc = "We value our customers at the Greasy Griddle, so much so that we're willing to deliver -just for you.- This combo meal contains two burgers, a soda, fries, a toy, and some chicken nuggets." + cost = 3200 + contains = list(/obj/item/reagent_containers/food/snacks/burger/bigbite, + /obj/item/reagent_containers/food/snacks/burger/cheese, + /obj/item/reagent_containers/food/snacks/fries, + /obj/item/reagent_containers/food/condiment/pack/ketchup, + /obj/item/reagent_containers/food/condiment/pack/ketchup, + /obj/item/reagent_containers/food/snacks/nugget, + /obj/item/reagent_containers/food/snacks/nugget, + /obj/item/reagent_containers/food/snacks/nugget, + /obj/item/reagent_containers/food/snacks/nugget, + /obj/item/toy/plush/random) + crate_name = "combo meal w/toy" + crate_type = /obj/structure/closet/crate/wooden + +/datum/supply_pack/organic/randomized/candy name = "Candy Crate" desc = "For people that have an insatiable sweet tooth! Has ten candies to be eaten up.." cost = 2500 - var/num_contained = 10 //number of items picked to be contained in a randomised crate + num_contained = 10 contains = list(/obj/item/reagent_containers/food/snacks/candy, /obj/item/reagent_containers/food/snacks/lollipop, /obj/item/reagent_containers/food/snacks/gumball, @@ -47,97 +72,6 @@ /obj/item/storage/fancy/donut_box) crate_name = "candy crate" -/datum/supply_pack/organic/candy/randomised/fill(obj/structure/closet/crate/C) - var/list/L = contains.Copy() - for(var/i in 1 to num_contained) - var/item = pick_n_take(L) - new item(C) - -/datum/supply_pack/organic/randomized/chef - name = "Excellent Meat Crate" - desc = "The best cuts in the whole galaxy." - cost = 2000 - contains = list(/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime, - /obj/item/reagent_containers/food/snacks/meat/slab/killertomato, - /obj/item/reagent_containers/food/snacks/meat/slab/bear, - /obj/item/reagent_containers/food/snacks/meat/slab/xeno, - /obj/item/reagent_containers/food/snacks/meat/slab/spider, - /obj/item/reagent_containers/food/snacks/meat/rawbacon, - /obj/item/reagent_containers/food/snacks/spiderleg, - /obj/item/reagent_containers/food/snacks/carpmeat, - /obj/item/reagent_containers/food/snacks/meat/slab/human) - crate_name = "food crate" - -/datum/supply_pack/organic/randomized/chef/fill(obj/structure/closet/crate/C) - for(var/i in 1 to 15) - var/item = pick(contains) - new item(C) - -/datum/supply_pack/organic/exoticseeds - name = "Exotic Seeds Crate" - desc = "Any entrepreneuring botanist's dream. Contains twelve different seeds, including three replica-pod seeds and two mystery seeds!" - cost = 1500 - contains = list(/obj/item/seeds/nettle, - /obj/item/seeds/replicapod, - /obj/item/seeds/replicapod, - /obj/item/seeds/replicapod, - /obj/item/seeds/plump, - /obj/item/seeds/liberty, - /obj/item/seeds/amanita, - /obj/item/seeds/reishi, - /obj/item/seeds/banana, - /obj/item/seeds/bamboo, - /obj/item/seeds/eggplant/eggy, - /obj/item/seeds/random, - /obj/item/seeds/random) - crate_name = "exotic seeds crate" - crate_type = /obj/structure/closet/crate/hydroponics - -/datum/supply_pack/organic/food - name = "Food Crate" - desc = "Get things cooking with this crate full of useful ingredients! Contains a two dozen eggs, three bananas, and two bags of flour and rice, two cartons of milk, soymilk, as well as salt and pepper shakers, an enzyme and sugar bottle, and three slabs of monkeymeat." - cost = 1000 - contains = list(/obj/item/reagent_containers/food/condiment/flour, - /obj/item/reagent_containers/food/condiment/flour, - /obj/item/reagent_containers/food/condiment/rice, - /obj/item/reagent_containers/food/condiment/rice, - /obj/item/reagent_containers/food/condiment/milk, - /obj/item/reagent_containers/food/condiment/milk, - /obj/item/reagent_containers/food/condiment/soymilk, - /obj/item/reagent_containers/food/condiment/saltshaker, - /obj/item/reagent_containers/food/condiment/peppermill, - /obj/item/storage/fancy/egg_box, - /obj/item/storage/fancy/egg_box, - /obj/item/reagent_containers/food/condiment/enzyme, - /obj/item/reagent_containers/food/condiment/sugar, - /obj/item/reagent_containers/food/snacks/meat/slab/monkey, - /obj/item/reagent_containers/food/snacks/meat/slab/monkey, - /obj/item/reagent_containers/food/snacks/meat/slab/monkey, - /obj/item/reagent_containers/food/snacks/grown/banana, - /obj/item/reagent_containers/food/snacks/grown/banana, - /obj/item/reagent_containers/food/snacks/grown/banana) - crate_name = "food crate" - -/datum/supply_pack/organic/randomized/chef/fruits - name = "Fruit Crate" - desc = "Rich in vitamins, may contain oranges." - cost = 1500 - contains = list(/obj/item/reagent_containers/food/snacks/grown/citrus/lime, - /obj/item/reagent_containers/food/snacks/grown/citrus/orange, - /obj/item/reagent_containers/food/snacks/grown/banana, - /obj/item/reagent_containers/food/snacks/grown/watermelon, - /obj/item/reagent_containers/food/snacks/grown/apple, - /obj/item/reagent_containers/food/snacks/grown/berries, - /obj/item/reagent_containers/food/snacks/grown/citrus/lemon, - /obj/item/reagent_containers/food/snacks/grown/pineapple, - /obj/item/reagent_containers/food/snacks/grown/cherries, - /obj/item/reagent_containers/food/snacks/grown/grapes, - /obj/item/reagent_containers/food/snacks/grown/grapes/green, - /obj/item/reagent_containers/food/snacks/grown/eggplant, - /obj/item/reagent_containers/food/snacks/grown/peach, - /obj/item/reagent_containers/food/snacks/grown/strawberry) - crate_name = "food crate" - /datum/supply_pack/organic/fiestatortilla name = "Fiesta Crate" desc = "Spice up the kitchen with this fiesta themed food order! Contains 8 tortilla based food items, as well as a sombrero, moustache, and cloak!" @@ -157,102 +91,6 @@ /obj/item/reagent_containers/glass/bottle/capsaicin) crate_name = "fiesta crate" -/datum/supply_pack/organic/grill - name = "Grilling Starter Kit" - desc = "Hey dad I'm Hungry. Hi Hungry I'm THE NEW GRILLING STARTER KIT ONLY 5000 BUX GET NOW! Contains a cooking grill and five fuel coal sheets." - cost = 3000 - crate_type = /obj/structure/closet/crate - contains = list(/obj/item/stack/sheet/mineral/coal/five, - /obj/machinery/grill/unwrenched) - crate_name = "grilling starter kit crate" - -/datum/supply_pack/organic/grillfuel - name = "Grilling Fuel Kit" - desc = "Contains coal and coal accessories. (Note: only ten coal sheets.)" - cost = 1000 - crate_type = /obj/structure/closet/crate - contains = list(/obj/item/stack/sheet/mineral/coal/ten) - crate_name = "grilling fuel kit crate" - -/datum/supply_pack/organic/cream_piee - name = "High-yield Clown-grade Cream Pie Crate" - desc = "Designed by Aussec's Advanced Warfare Research Division, these high-yield, Clown-grade cream pies are powered by a synergy of performance and efficiency. Guaranteed to provide maximum results." - cost = 6000 - contains = list(/obj/item/storage/backpack/duffelbag/clown/cream_pie) - crate_name = "party equipment crate" - contraband = TRUE - access = ACCESS_THEATRE - crate_type = /obj/structure/closet/crate/secure - -/datum/supply_pack/organic/fakemeat - name = "Meat Crate" - desc = "Run outta meat already? Keep the lizards content with this freezer filled with cruelty-free chemically compounded meat! Contains 12 slabs of meat product, and 4 slabs of *carp*." - cost = 1200 // Buying 3 food crates nets you 9 meat for 900 points, plus like, 6 bags of rice, flour, and egg boxes. This is 12 for 500, but you -only- get meat and carp. - contains = list(/obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, - /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, - /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, - /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, - /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, - /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, - /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, - /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, - /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, - /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, - /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, - /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, - /obj/item/reagent_containers/food/snacks/carpmeat/imitation, - /obj/item/reagent_containers/food/snacks/carpmeat/imitation, - /obj/item/reagent_containers/food/snacks/carpmeat/imitation, - /obj/item/reagent_containers/food/snacks/carpmeat/imitation) - crate_name = "meaty crate" - crate_type = /obj/structure/closet/crate/freezer - -/datum/supply_pack/organic/monkeydripmeat - name = "*Meat* Crate" - desc = "Need some meat? With this do-it-yourself kit you'll be swimming in it! Contains a monkey cube, an IV drip, and some cryoxadone!" - cost = 2150 - contraband = TRUE - contains = list(/obj/item/reagent_containers/food/snacks/monkeycube, - /obj/item/restraints/handcuffs/cable, - /obj/machinery/iv_drip, - /obj/item/reagent_containers/glass/beaker/cryoxadone, - /obj/item/reagent_containers/glass/beaker/cryoxadone) - crate_name = "monkey meat crate" - -/datum/supply_pack/organic/mixedboxes - name = "Mixed Ingredient Boxes" - desc = "Get overwhelmed with inspiration by ordering these boxes of surprise ingredients! Get four boxes filled with an assortment of products!" - cost = 2300 - contains = list(/obj/item/storage/box/ingredients/wildcard, - /obj/item/storage/box/ingredients/wildcard, - /obj/item/storage/box/ingredients/wildcard, - /obj/item/storage/box/ingredients/wildcard) - crate_name = "wildcard food crate" - crate_type = /obj/structure/closet/crate/freezer - -/datum/supply_pack/organic/party - name = "Party Equipment" - desc = "Celebrate both life and death on the station with Nanotrasen's Party Essentials(tm)! Contains seven colored glowsticks, four beers, two ales, a drinking shaker, and a bottle of patron & goldschlager!" - cost = 2000 - contains = list(/obj/item/storage/box/drinkingglasses, - /obj/item/reagent_containers/food/drinks/shaker, - /obj/item/reagent_containers/food/drinks/bottle/patron, - /obj/item/reagent_containers/food/drinks/bottle/goldschlager, - /obj/item/reagent_containers/food/drinks/ale, - /obj/item/reagent_containers/food/drinks/ale, - /obj/item/reagent_containers/food/drinks/beer, - /obj/item/reagent_containers/food/drinks/beer, - /obj/item/reagent_containers/food/drinks/beer, - /obj/item/reagent_containers/food/drinks/beer, - /obj/item/flashlight/glowstick, - /obj/item/flashlight/glowstick/red, - /obj/item/flashlight/glowstick/blue, - /obj/item/flashlight/glowstick/cyan, - /obj/item/flashlight/glowstick/orange, - /obj/item/flashlight/glowstick/yellow, - /obj/item/flashlight/glowstick/pink) - crate_name = "party equipment crate" - /datum/supply_pack/organic/pizza name = "Pizza Crate" desc = "Best prices on this side of the galaxy. All deliveries are guaranteed to be 99% anomaly-free!" @@ -287,9 +125,129 @@ considered \[REDACTED\] and returned at your leisure. Note that objects the anomaly produces are specifically attuned exactly to the individual opening the anomaly; regardless \ of species, the individual will find the object edible and it will taste great according to their personal definitions, which vary significantly based on person and species.") -/datum/supply_pack/organic/randomized/chef/vegetables - name = "Vegetables Crate" - desc = "Grown in vats." +////////////////////////////////////////////////////////////////////////////// +//////////////////////////// Raw Ingredients ///////////////////////////////// +////////////////////////////////////////////////////////////////////////////// + +/datum/supply_pack/organic/food + name = "Food Crate" + desc = "Get things cooking with this crate full of useful ingredients! Contains a two dozen eggs, three bananas, and two bags of flour and rice, two cartons of milk, soymilk, as well as salt and pepper shakers, an enzyme and sugar bottle, and three slabs of monkeymeat." + cost = 1000 + contains = list(/obj/item/reagent_containers/food/condiment/flour, + /obj/item/reagent_containers/food/condiment/flour, + /obj/item/reagent_containers/food/condiment/rice, + /obj/item/reagent_containers/food/condiment/rice, + /obj/item/reagent_containers/food/condiment/milk, + /obj/item/reagent_containers/food/condiment/milk, + /obj/item/reagent_containers/food/condiment/soymilk, + /obj/item/reagent_containers/food/condiment/saltshaker, + /obj/item/reagent_containers/food/condiment/peppermill, + /obj/item/storage/fancy/egg_box, + /obj/item/storage/fancy/egg_box, + /obj/item/reagent_containers/food/condiment/enzyme, + /obj/item/reagent_containers/food/condiment/sugar, + /obj/item/reagent_containers/food/snacks/meat/slab/monkey, + /obj/item/reagent_containers/food/snacks/meat/slab/monkey, + /obj/item/reagent_containers/food/snacks/meat/slab/monkey, + /obj/item/reagent_containers/food/snacks/grown/banana, + /obj/item/reagent_containers/food/snacks/grown/banana, + /obj/item/reagent_containers/food/snacks/grown/banana) + crate_name = "food crate" + +/datum/supply_pack/organic/randomized/fruits + name = "Fruit Crate" + desc = "Rich in vitamins and possibly sugar. Contains 15 assorted fruits." + cost = 1500 + contains = list(/obj/item/reagent_containers/food/snacks/grown/citrus/lime, + /obj/item/reagent_containers/food/snacks/grown/citrus/orange, + /obj/item/reagent_containers/food/snacks/grown/banana, + /obj/item/reagent_containers/food/snacks/grown/watermelon, + /obj/item/reagent_containers/food/snacks/grown/apple, + /obj/item/reagent_containers/food/snacks/grown/berries, + /obj/item/reagent_containers/food/snacks/grown/citrus/lemon, + /obj/item/reagent_containers/food/snacks/grown/pineapple, + /obj/item/reagent_containers/food/snacks/grown/cherries, + /obj/item/reagent_containers/food/snacks/grown/grapes, + /obj/item/reagent_containers/food/snacks/grown/grapes/green, + /obj/item/reagent_containers/food/snacks/grown/eggplant, + /obj/item/reagent_containers/food/snacks/grown/peach, + /obj/item/reagent_containers/food/snacks/grown/strawberry) + crate_name = "fruit crate" + +/datum/supply_pack/organic/cream_piee + name = "High-yield Clown-grade Cream Pie Crate" + desc = "Designed by Aussec's Advanced Warfare Research Division, these high-yield, Clown-grade cream pies are powered by a synergy of performance and efficiency. Guaranteed to provide maximum results." + cost = 6000 + contains = list(/obj/item/storage/backpack/duffelbag/clown/cream_pie) + crate_name = "party equipment crate" + contraband = TRUE + access = ACCESS_THEATRE + crate_type = /obj/structure/closet/crate/secure + +/datum/supply_pack/organic/randomized + name = "Meat Crate (Exotic)" + desc = "The best cuts in the whole galaxy. Contains 15 assorted exotic meats." + cost = 2000 + contains = list(/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime, + /obj/item/reagent_containers/food/snacks/meat/slab/killertomato, + /obj/item/reagent_containers/food/snacks/meat/slab/bear, + /obj/item/reagent_containers/food/snacks/meat/slab/xeno, + /obj/item/reagent_containers/food/snacks/meat/slab/spider, + /obj/item/reagent_containers/food/snacks/meat/rawbacon, + /obj/item/reagent_containers/food/snacks/spiderleg, + /obj/item/reagent_containers/food/snacks/carpmeat, + /obj/item/reagent_containers/food/snacks/meat/slab/human) + crate_name = "exotic meat crate" + +/datum/supply_pack/organic/monkeydripmeat + name = "Meat Crate (Fresh)" + desc = "Need some meat? With this do-it-yourself kit you'll be swimming in it! Contains a monkey cube, an IV drip, and some cryoxadone!" + cost = 2150 + contraband = TRUE + contains = list(/obj/item/reagent_containers/food/snacks/monkeycube, + /obj/item/restraints/handcuffs/cable, + /obj/machinery/iv_drip, + /obj/item/reagent_containers/glass/beaker/cryoxadone, + /obj/item/reagent_containers/glass/beaker/cryoxadone) + crate_name = "monkey meat crate" + +/datum/supply_pack/organic/fakemeat + name = "Meat Crate 'Synthetic'" + desc = "Run outta meat already? Keep the lizards content with this freezer filled with cruelty-free chemically compounded meat! Contains 12 slabs of meat product, and 4 slabs of *carp*." + cost = 1200 // Buying 3 food crates nets you 9 meat for 900 points, plus like, 6 bags of rice, flour, and egg boxes. This is 12 for 500, but you -only- get meat and carp. + contains = list(/obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, + /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, + /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, + /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, + /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, + /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, + /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, + /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, + /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, + /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, + /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, + /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, + /obj/item/reagent_containers/food/snacks/carpmeat/imitation, + /obj/item/reagent_containers/food/snacks/carpmeat/imitation, + /obj/item/reagent_containers/food/snacks/carpmeat/imitation, + /obj/item/reagent_containers/food/snacks/carpmeat/imitation) + crate_name = "meaty crate" + crate_type = /obj/structure/closet/crate/freezer + +/datum/supply_pack/organic/mixedboxes + name = "Mixed Ingredient Boxes" + desc = "Get overwhelmed with inspiration by ordering these boxes of surprise ingredients! Get four boxes filled with an assortment of products!" + cost = 2300 + contains = list(/obj/item/storage/box/ingredients/wildcard, + /obj/item/storage/box/ingredients/wildcard, + /obj/item/storage/box/ingredients/wildcard, + /obj/item/storage/box/ingredients/wildcard) + crate_name = "wildcard food crate" + crate_type = /obj/structure/closet/crate/freezer + +/datum/supply_pack/organic/randomized/vegetables + name = "Vegetable Crate" + desc = "Grown in vats. Contains 15 assorted vegetables." cost = 1300 contains = list(/obj/item/reagent_containers/food/snacks/grown/chili, /obj/item/reagent_containers/food/snacks/grown/corn, @@ -299,7 +257,7 @@ /obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle, /obj/item/reagent_containers/food/snacks/grown/onion, /obj/item/reagent_containers/food/snacks/grown/pumpkin) - crate_name = "food crate" + crate_name = "veggie crate" ////////////////////////////////////////////////////////////////////////////// //////////////////////////// Hydroponics ///////////////////////////////////// @@ -331,25 +289,6 @@ crate_name = "beekeeping starter crate" crate_type = /obj/structure/closet/crate/hydroponics -/datum/supply_pack/organic/exoticseeds - name = "Exotic Seeds Crate" - desc = "Any entrepreneuring botanist's dream. Contains twelve different seeds, including three replica-pod seeds and two mystery seeds!" - cost = 1500 - contains = list(/obj/item/seeds/nettle, - /obj/item/seeds/replicapod, - /obj/item/seeds/replicapod, - /obj/item/seeds/replicapod, - /obj/item/seeds/plump, - /obj/item/seeds/liberty, - /obj/item/seeds/amanita, - /obj/item/seeds/reishi, - /obj/item/seeds/banana, - /obj/item/seeds/eggplant/eggy, - /obj/item/seeds/random, - /obj/item/seeds/random) - crate_name = "exotic seeds crate" - crate_type = /obj/structure/closet/crate/hydroponics - /datum/supply_pack/organic/hydroponics/hydrotank name = "Hydroponics Backpack Crate" desc = "Bring on the flood with this high-capacity backpack crate. Contains 500 units of life-giving H2O. Requires hydroponics access to open." @@ -402,10 +341,30 @@ /obj/item/seeds/sunflower, /obj/item/seeds/chanter, /obj/item/seeds/potato, - /obj/item/seeds/sugarcane) + /obj/item/seeds/sugarcane, + /obj/item/seeds/ambrosia) crate_name = "seeds crate" crate_type = /obj/structure/closet/crate/hydroponics +/datum/supply_pack/organic/exoticseeds + name = "Seeds Crate (Exotic)" + desc = "Any entrepreneuring botanist's dream. Contains twelve different seeds, including three replica-pod seeds and two mystery seeds!" + cost = 1500 + contains = list(/obj/item/seeds/nettle, + /obj/item/seeds/replicapod, + /obj/item/seeds/replicapod, + /obj/item/seeds/replicapod, + /obj/item/seeds/plump, + /obj/item/seeds/liberty, + /obj/item/seeds/amanita, + /obj/item/seeds/reishi, + /obj/item/seeds/banana, + /obj/item/seeds/eggplant/eggy, + /obj/item/seeds/random, + /obj/item/seeds/random) + crate_name = "exotic seeds crate" + crate_type = /obj/structure/closet/crate/hydroponics + ////////////////////////////////////////////////////////////////////////////// /////////////////////////////////// Misc ///////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// @@ -426,6 +385,29 @@ crate_name = "sporting crate" crate_type = /obj/structure/closet/crate/secure // Would have liked a wooden crate but access >:( +/datum/supply_pack/organic/party + name = "Party Equipment" + desc = "Celebrate both life and death on the station with Nanotrasen's Party Essentials(tm)! Contains seven colored glowsticks, four beers, two ales, a drinking shaker, and a bottle of patron & goldschlager!" + cost = 2000 + contains = list(/obj/item/storage/box/drinkingglasses, + /obj/item/reagent_containers/food/drinks/shaker, + /obj/item/reagent_containers/food/drinks/bottle/patron, + /obj/item/reagent_containers/food/drinks/bottle/goldschlager, + /obj/item/reagent_containers/food/drinks/ale, + /obj/item/reagent_containers/food/drinks/ale, + /obj/item/reagent_containers/food/drinks/beer, + /obj/item/reagent_containers/food/drinks/beer, + /obj/item/reagent_containers/food/drinks/beer, + /obj/item/reagent_containers/food/drinks/beer, + /obj/item/flashlight/glowstick, + /obj/item/flashlight/glowstick/red, + /obj/item/flashlight/glowstick/blue, + /obj/item/flashlight/glowstick/cyan, + /obj/item/flashlight/glowstick/orange, + /obj/item/flashlight/glowstick/yellow, + /obj/item/flashlight/glowstick/pink) + crate_name = "party equipment crate" + /datum/supply_pack/organic/vday name = "Surplus Valentine Crate" desc = "Turns out we got warehouses of this love-y dove-y crap. We're sending out small bargain buddle of Valentine gear. This crate has two boxes of chocolate, three poppy flowers, five candy hearts, and three cards." diff --git a/code/modules/cargo/packs/science.dm b/code/modules/cargo/packs/science.dm index a009c998a3..79675cf3ec 100644 --- a/code/modules/cargo/packs/science.dm +++ b/code/modules/cargo/packs/science.dm @@ -29,7 +29,7 @@ crate_name = "alien bro alloy crate" /datum/supply_pack/science/beakers - name = "Chemistry Beackers Crate" + name = "Chemistry Beakers Crate" desc = "Glassware for any chemistry lab! Contains four small beakers, three large, two plastic, and one metamaterial. As well as three droppers and two pairs of latex gloves." cost = 1500 contains = list(/obj/item/reagent_containers/glass/beaker, @@ -82,7 +82,7 @@ crate_name = "circuitry starter pack crate" /datum/supply_pack/science/glasswork - name = "Glass blower kit Crate" + name = "Glass Blower Kit Crate" desc = "Learn and make glassworks of usefull things for a profit! Contains glassworking tools and blowing rods. Glass not included." cost = 1000 contains = list(/obj/item/glasswork/glasskit, @@ -91,17 +91,6 @@ /obj/item/glasswork/blowing_rod) crate_name = "glassblower gear crate" -/datum/supply_pack/science/adv_surgery_tools - name = "Med-Co Advanced surgery tools" - desc = "A full set of Med-Co advanced surgery tools, this crate also comes with a spay of synth flesh as well as a can of . Requires Surgery access to open." - cost = 5500 - access = ACCESS_SURGERY - contains = list(/obj/item/storage/belt/medical/surgery_belt_adv, - /obj/item/reagent_containers/medspray/synthflesh, - /obj/item/reagent_containers/medspray/sterilizine) - crate_name = "medco newest surgery tools" - crate_type = /obj/structure/closet/crate/medical - /datum/supply_pack/science/monkey name = "Monkey Cube Crate" desc = "Stop monkeying around! Contains seven monkey cubes. Just add water!" diff --git a/code/modules/cargo/packs/security.dm b/code/modules/cargo/packs/security.dm index 69967d65d1..3b602d54d2 100644 --- a/code/modules/cargo/packs/security.dm +++ b/code/modules/cargo/packs/security.dm @@ -163,13 +163,6 @@ /obj/item/storage/box/handcuffs) crate_name = "security supply crate" -/datum/supply_pack/security/vending/security - name = "SecTech Supply Crate" - desc = "Officer Paul bought all the donuts? Then refill the security vendor with ths crate." - cost = 1500 - contains = list(/obj/machinery/vending/security) - crate_name = "SecTech supply crate" - /datum/supply_pack/security/firingpins name = "Standard Firing Pins Crate" desc = "Upgrade your arsenal with 10 standard firing pins. Requires Security access to open." diff --git a/code/modules/cargo/packs/service.dm b/code/modules/cargo/packs/service.dm index 34b8bbc249..942720dd6b 100644 --- a/code/modules/cargo/packs/service.dm +++ b/code/modules/cargo/packs/service.dm @@ -10,9 +10,24 @@ group = "Service" ////////////////////////////////////////////////////////////////////////////// -/////////////////////////////// Cargo //////////////////////////////////////// +//////////////////////////////// Cargo /////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// +/datum/supply_pack/service/wrapping_paper + name = "Cargo Packaging Crate" + desc = "Want to mail your loved ones gift-wrapped chocolates, stuffed animals, or the Clown's severed head? You can do all that, with this crate full of festive (and normal) wrapping paper. Also contains a hand labeler and a destination tagger for easy shipping!" + cost = 1000 + contains = list(/obj/item/stack/wrapping_paper, + /obj/item/stack/wrapping_paper, + /obj/item/stack/wrapping_paper, + /obj/item/stack/packageWrap, + /obj/item/stack/packageWrap, + /obj/item/stack/packageWrap, + /obj/item/destTagger, + /obj/item/hand_labeler) + crate_type = /obj/structure/closet/crate/wooden + crate_name = "wrapping paper crate" + /datum/supply_pack/service/cargo_supples name = "Cargo Supplies Crate" desc = "Sold everything that wasn't bolted down? You can get right back to work with this crate containing stamps, an export scanner, destination tagger, hand labeler and some package wrapping. Now with extra toner cartidges!" @@ -101,6 +116,23 @@ crate_name = "ice cream vat crate" crate_type = /obj/structure/closet/crate +/datum/supply_pack/service/grill + name = "Grilling Starter Kit" + desc = "Hey dad I'm Hungry. Hi Hungry I'm THE NEW GRILLING STARTER KIT ONLY 5000 BUX GET NOW! Contains a cooking grill and five fuel coal sheets." + cost = 3000 + contains = list(/obj/item/stack/sheet/mineral/coal/five, + /obj/machinery/grill/unwrenched) + crate_name = "grilling starter kit crate" + crate_type = /obj/structure/closet/crate + +/datum/supply_pack/service/grillfuel + name = "Grilling Fuel Kit" + desc = "Contains coal and coal accessories. (Note: only ten coal sheets.)" + cost = 1000 + contains = list(/obj/item/stack/sheet/mineral/coal/ten) + crate_name = "grilling fuel kit crate" + crate_type = /obj/structure/closet/crate + /datum/supply_pack/service/cutlery name = "Kitchen Cutlery Deluxe Set" desc = "Need to slice and dice away those \"Tomatoes\"? Well we got what you need! From a nice set of knifes, forks, plates, glasses, and a whetstone for when you got some grizzle that is a bit harder to slice then normal." @@ -240,45 +272,3 @@ crate_name = "janitorial cart crate" crate_type = /obj/structure/closet/crate/large -////////////////////////////////////////////////////////////////////////////// -//////////////////////////// Vendor Refills ////////////////////////////////// -////////////////////////////////////////////////////////////////////////////// - -/datum/supply_pack/service/vending/bartending - name = "Bartending Supply Crate" - desc = "Bring on the booze with vending machine refills, as well as a free book containing the well-kept secrets to the bartending trade!" - cost = 2000 - contains = list(/obj/item/vending_refill/boozeomat, - /obj/item/vending_refill/coffee, - /obj/item/book/granter/action/drink_fling) - crate_name = "bartending supply crate" - -/datum/supply_pack/service/vending/cigarette - name = "Cigarette Supply Crate" - desc = "Don't believe the reports - smoke today! Contains a cigarette vending machine refill." - cost = 1500 - contains = list(/obj/item/vending_refill/cigarette) - crate_name = "cigarette supply crate" - crate_type = /obj/structure/closet/crate - -/datum/supply_pack/service/vending/games - name = "Games Supply Crate" - desc = "Get your game on with this game vending machine refill." - cost = 1000 - contains = list(/obj/item/vending_refill/games) - crate_name = "games supply crate" - crate_type = /obj/structure/closet/crate - -/datum/supply_pack/service/vending/snack - name = "Snack Supply Crate" - desc = "One vending machine refill of cavity-bringin' goodness! The number one dentist recommended order!" - cost = 1500 - contains = list(/obj/item/vending_refill/snack) - crate_name = "snacks supply crate" - -/datum/supply_pack/service/vending/cola - name = "Softdrinks Supply Crate" - desc = "Got whacked by a toolbox, but you still have those pesky teeth? Get rid of those pearly whites with this soda machine refill, today!" - cost = 1500 - contains = list(/obj/item/vending_refill/cola) - crate_name = "soft drinks supply crate" diff --git a/code/modules/cargo/packs/vending.dm b/code/modules/cargo/packs/vending.dm new file mode 100644 index 0000000000..f9982d17b6 --- /dev/null +++ b/code/modules/cargo/packs/vending.dm @@ -0,0 +1,148 @@ + +//Reminders- +// If you add something to this list, please group it by type and sort it alphabetically instead of just jamming it in like an animal +// cost = 700- Minimum cost, or infinite points are possible. +////////////////////////////////////////////////////////////////////////////// +/////////////////////////////// Vending ////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// + +/datum/supply_pack/vending + group = "Vending" + +////////////////////////////////////////////////////////////////////////////// +///////////////////////// Service, Medical, Sec ////////////////////////////// +////////////////////////////////////////////////////////////////////////////// + +/datum/supply_pack/vending/bartending + name = "Bartending Supply Crate" + desc = "Bring on the booze with vending machine refills, as well as a free book containing the well-kept secrets to the bartending trade!" + cost = 2000 + contains = list(/obj/item/vending_refill/boozeomat, + /obj/item/vending_refill/coffee, + /obj/item/book/granter/action/drink_fling) + crate_name = "bartending supply crate" + +/datum/supply_pack/vending/cigarette + name = "Cigarette Supply Crate" + desc = "Don't believe the reports - smoke today! Contains a cigarette vending machine refill." + cost = 1500 + contains = list(/obj/item/vending_refill/cigarette) + crate_name = "cigarette supply crate" + crate_type = /obj/structure/closet/crate + +/datum/supply_pack/vending/games + name = "Games Supply Crate" + desc = "Get your game on with this game vending machine refill." + cost = 1000 + contains = list(/obj/item/vending_refill/games) + crate_name = "games supply crate" + crate_type = /obj/structure/closet/crate + +/datum/supply_pack/vending/kinkmate + name = "Kinkmate Supply and Construction Kit" + cost = 2000 + contraband = TRUE + contains = list(/obj/item/vending_refill/kink, /obj/item/circuitboard/machine/kinkmate) + crate_name = "Kinkmate construction kit" + +/datum/supply_pack/vending/medical + name = "Medical Vending Crate" + desc = "Contains refills for medical vending machines." + cost = 2000 + contains = list(/obj/item/vending_refill/medical, + /obj/item/vending_refill/wallmed) + crate_name = "medical vending crate" + crate_type = /obj/structure/closet/crate/medical + +/datum/supply_pack/vending/security + name = "SecTech Supply Crate" + desc = "Officer Paul bought all the donuts? Then refill the security vendor with ths crate. Requires Security Access to open." + cost = 1500 + access = ACCESS_SECURITY + contains = list(/obj/machinery/vending/security) + crate_name = "SecTech supply crate" + crate_type = /obj/structure/closet/crate/secure/gear + +/datum/supply_pack/vending/snack + name = "Snack Supply Crate" + desc = "One vending machine refill of cavity-bringin' goodness! The number one dentist recommended order!" + cost = 1500 + contains = list(/obj/item/vending_refill/snack) + crate_name = "snacks supply crate" + +/datum/supply_pack/vending/cola + name = "Softdrinks Supply Crate" + desc = "Got whacked by a toolbox, but you still have those pesky teeth? Get rid of those pearly whites with this soda machine refill, today!" + cost = 1500 + contains = list(/obj/item/vending_refill/cola) + crate_name = "soft drinks supply crate" + +////////////////////////////////////////////////////////////////////////////// +//////////////////////////// Wardrobe Vendors //////////////////////////////// +////////////////////////////////////////////////////////////////////////////// + +/datum/supply_pack/vending/wardrobes/autodrobe + name = "Autodrobe Supply Crate" + desc = "Autodrobe missing your favorite dress? Solve that issue today with this autodrobe refill." + cost = 1500 + contains = list(/obj/item/vending_refill/autodrobe) + crate_name = "autodrobe supply crate" + +/datum/supply_pack/vending/wardrobes/cargo + name = "Cargo Wardrobe Supply Crate" + desc = "This crate contains a refill for the CargoDrobe." + cost = 750 + contains = list(/obj/item/vending_refill/wardrobe/cargo_wardrobe) + crate_name = "cargo department supply crate" + +/datum/supply_pack/vending/wardrobes/engineering + name = "Engineering Wardrobe Supply Crate" + desc = "This crate contains refills for the EngiDrobe and AtmosDrobe." + cost = 1500 + contains = list(/obj/item/vending_refill/wardrobe/engi_wardrobe, + /obj/item/vending_refill/wardrobe/atmos_wardrobe) + crate_name = "engineering department wardrobe supply crate" + +/datum/supply_pack/vending/wardrobes/general + name = "General Wardrobes Supply Crate" + desc = "This crate contains refills for the CuraDrobe, BarDrobe, ChefDrobe, JaniDrobe, ChapDrobe." + cost = 3750 + contains = list(/obj/item/vending_refill/wardrobe/curator_wardrobe, + /obj/item/vending_refill/wardrobe/bar_wardrobe, + /obj/item/vending_refill/wardrobe/chef_wardrobe, + /obj/item/vending_refill/wardrobe/jani_wardrobe, + /obj/item/vending_refill/wardrobe/chap_wardrobe) + crate_name = "general wardrobes vendor refills" + +/datum/supply_pack/vending/wardrobes/hydroponics + name = "Hydrobe Supply Crate" + desc = "This crate contains a refill for the Hydrobe." + cost = 750 + contains = list(/obj/item/vending_refill/wardrobe/hydro_wardrobe) + crate_name = "hydrobe supply crate" + +/datum/supply_pack/vending/wardrobes/medical + name = "Medical Wardrobe Supply Crate" + desc = "This crate contains refills for the MediDrobe, ChemDrobe, GeneDrobe, and ViroDrobe." + cost = 3000 + contains = list(/obj/item/vending_refill/wardrobe/medi_wardrobe, + /obj/item/vending_refill/wardrobe/chem_wardrobe, + /obj/item/vending_refill/wardrobe/gene_wardrobe, + /obj/item/vending_refill/wardrobe/viro_wardrobe) + crate_name = "medical department wardrobe supply crate" + +/datum/supply_pack/vending/wardrobes/science + name = "Science Wardrobe Supply Crate" + desc = "This crate contains refills for the SciDrobe and RoboDrobe." + cost = 1500 + contains = list(/obj/item/vending_refill/wardrobe/robo_wardrobe, + /obj/item/vending_refill/wardrobe/science_wardrobe) + crate_name = "science department wardrobe supply crate" + +/datum/supply_pack/vending/wardrobes/security + name = "Security Wardrobe Supply Crate" + desc = "This crate contains refills for the SecDrobe and LawDrobe." + cost = 1500 + contains = list(/obj/item/vending_refill/wardrobe/sec_wardrobe, + /obj/item/vending_refill/wardrobe/law_wardrobe) + crate_name = "security department supply crate" diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm index 1532f50808..bdbac1165e 100644 --- a/code/modules/clothing/outfits/ert.dm +++ b/code/modules/clothing/outfits/ert.dm @@ -18,8 +18,9 @@ R.freqlock = TRUE var/obj/item/card/id/W = H.wear_id - W.registered_name = H.real_name - W.update_label(W.registered_name, W.assignment) + if(W) + W.registered_name = H.real_name + W.update_label(W.registered_name, W.assignment) /datum/outfit/ert/commander name = "ERT Commander" diff --git a/code/modules/clothing/suits/cloaks.dm b/code/modules/clothing/suits/cloaks.dm index b8287c7f4c..7d56fbe6dd 100644 --- a/code/modules/clothing/suits/cloaks.dm +++ b/code/modules/clothing/suits/cloaks.dm @@ -81,7 +81,7 @@ heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT - resistance_flags = FIRE_PROOF | ACID_PROOF + resistance_flags = FIRE_PROOF | ACID_PROOF | GOLIATH_RESISTANCE /obj/item/clothing/head/hooded/cloakhood/drake name = "drake helm" @@ -90,4 +90,4 @@ armor = list("melee" = 70, "bullet" = 30, "laser" = 50, "energy" = 40, "bomb" = 70, "bio" = 60, "rad" = 50, "fire" = 100, "acid" = 100) heat_protection = HEAD max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT - resistance_flags = FIRE_PROOF | ACID_PROOF + resistance_flags = FIRE_PROOF | ACID_PROOF | GOLIATH_RESISTANCE diff --git a/code/modules/events/meteor_wave.dm b/code/modules/events/meteor_wave.dm index a1a82ea5f7..4fc6f74bca 100644 --- a/code/modules/events/meteor_wave.dm +++ b/code/modules/events/meteor_wave.dm @@ -26,7 +26,6 @@ startWhen *= 1 - min(GLOB.singularity_counter * SINGULO_BEACON_DISTURBANCE, SINGULO_BEACON_MAX_DISTURBANCE) endWhen = startWhen + 60 - /datum/round_event/meteor_wave/New() ..() if(!wave_type) @@ -59,7 +58,7 @@ kill() /datum/round_event/meteor_wave/announce(fake) - priority_announce("Meteors have been detected on collision course with the station. Estimated time until impact: [round(startWhen/60)] minutes.[GLOB.singularity_counter ? " Warning: Anomalous gravity pulse detected, Syndicate technology interference likely." : ""]", "Meteor Alert", "meteors") + priority_announce("Meteors have been detected on collision course with the station. Estimated time until impact: [round((startWhen * SSevents.wait) / 10, 0.1)] seconds.[GLOB.singularity_counter ? " Warning: Anomalous gravity pulse detected, Syndicate technology interference likely." : ""]", "Meteor Alert", "meteors") /datum/round_event/meteor_wave/tick() if(ISMULTIPLE(activeFor, 3)) diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index c28ae3b4c5..f459e97814 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -186,8 +186,8 @@ obj/item/seeds/proc/is_gene_forbidden(typepath) product_name = parent.myseed.plantname if(getYield() >= 1) SSblackbox.record_feedback("tally", "food_harvested", getYield(), product_name) + parent.investigate_log("[user] harvested [getYield()] of [src], with seed traits [english_list(genes)] and reagents_add [english_list(reagents_add)] and potency [potency].", INVESTIGATE_BOTANY) parent.update_tray(user) - return result diff --git a/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm b/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm index 827f56b634..b0ed2000a6 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm @@ -599,6 +599,10 @@ name = "Scully" icon_state = "hair_scully" +/datum/sprite_accessory/hair/shaggy + name = "Shaggy" + icon_state = "hair_shaggy" + /datum/sprite_accessory/hair/shaved name = "Shaved" icon_state = "hair_shaved" diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index a6595100a1..d6f6b6d9ae 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -44,7 +44,8 @@ if(M.occupant == src) M.go_out() - dna.species.spec_death(gibbed, src) + if(!QDELETED(dna)) //The gibbed param is bit redundant here since dna won't exist at this point if they got deleted. + dna.species.spec_death(gibbed, src) if(SSticker.HasRoundStarted()) SSblackbox.ReportDeath(src) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 8edd5847de..ef8a745b89 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -385,20 +385,17 @@ else if(isobserver(user) && traitstring) . += "Traits: [traitstring]" - if(print_flavor_text()) - if(get_visible_name() == "Unknown") //Are we sure we know who this is? Don't show flavor text unless we can recognize them. Prevents certain metagaming with impersonation. - . += "...?" - else if(skipface) //Sometimes we're not unknown, but impersonating someone in a hardsuit, let's not reveal our flavor text then either. - . += "...?" - else - . += "[print_flavor_text()]" - if(print_flavor_text_2()) - if(get_visible_name() == "Unknown") //Are we sure we know who this is? Don't show flavor text unless we can recognize them. Prevents certain metagaming with impersonation. - . += "...?" - else if(skipface) //Sometimes we're not unknown, but impersonating someone in a hardsuit, let's not reveal our flavor text then either. - . += "...?" - else - . += "[print_flavor_text_2()]" + //No flavor text unless the face can be seen. Prevents certain metagaming with impersonation. + var/invisible_man = skipface || get_visible_name() == "Unknown" + if(invisible_man) + . += "...?" + else + var/flavor = print_flavor_text() + if(flavor) + . += flavor + var/temp_flavor = print_flavor_text_2() + if(temp_flavor) + . += temp_flavor . += "*---------*" /mob/living/proc/status_effect_examines(pronoun_replacement) //You can include this in any mob's examine() to show the examine texts of status effects! diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index 2a5ec51b55..eb1e194c0f 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -849,6 +849,8 @@ linked_mobs.Add(M) if(!selflink) to_chat(M, "You are now connected to [slimelink_owner.real_name]'s Slime Link.") + RegisterSignal(M, COMSIG_MOB_DEATH , .proc/unlink_mob) + RegisterSignal(M, COMSIG_PARENT_QDELETING, .proc/unlink_mob) var/datum/action/innate/linked_speech/action = new(src) linked_actions.Add(action) action.Grant(M) @@ -858,6 +860,7 @@ var/link_id = linked_mobs.Find(M) if(!(link_id)) return + UnregisterSignal(M, list(COMSIG_MOB_DEATH, COMSIG_PARENT_QDELETING)) var/datum/action/innate/linked_speech/action = linked_actions[link_id] action.Remove(M) to_chat(M, "You are no longer connected to [slimelink_owner.real_name]'s Slime Link.") @@ -890,18 +893,11 @@ Remove(H) return - if(QDELETED(H) || H.stat == DEAD) - species.unlink_mob(H) - return - if(message) var/msg = "\[[species.slimelink_owner.real_name]'s Slime Link\] [H]: [message]" log_directed_talk(H, species.slimelink_owner, msg, LOG_SAY, "slime link") for(var/X in species.linked_mobs) var/mob/living/M = X - if(QDELETED(M) || M.stat == DEAD) - species.unlink_mob(M) - continue to_chat(M, msg) for(var/X in GLOB.dead_mob_list) diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index 33b9dffaf0..e83f67f796 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -30,6 +30,9 @@ /mob/living/carbon/monkey/handle_mutations_and_radiation() if(radiation) + if(radiation > RAD_MOB_MUTATE && prob((radiation - RAD_MOB_MUTATE) / 25)) + gorillize() + return if(radiation > RAD_MOB_KNOCKDOWN && prob(RAD_MOB_KNOCKDOWN_PROB)) if(!IsKnockdown()) emote("collapse") @@ -41,10 +44,6 @@ randmutb() emote("gasp") domutcheck() - - if(radiation > RAD_MOB_MUTATE * 2 && prob(50)) - gorillize() - return if(radiation > RAD_MOB_VOMIT && prob(RAD_MOB_VOMIT_PROB)) vomit(10, TRUE) return ..() diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 630ce54261..33cc2c6e20 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -456,8 +456,10 @@ mob/visible_message(message, self_message, blind_message, vision_distance = DEFA return /mob/proc/transfer_ckey(mob/new_mob, send_signal = TRUE) - if(!ckey || !new_mob) - CRASH("transfer_ckey() called [ckey ? "" : "on a ckey-less mob[new_mob ? "" : " and "]"][new_mob ? "" : "without a valid mob target"]!") + if(!new_mob || (!ckey && new_mob.ckey)) + CRASH("transfer_ckey() called [new_mob ? "on ckey-less mob with a player mob as target" : "without a valid mob target"]!") + if(!ckey) + return SEND_SIGNAL(new_mob, COMSIG_MOB_PRE_PLAYER_CHANGE, new_mob, src) if (client && client.prefs && client.prefs.auto_ooc) if (client.prefs.chat_toggles & CHAT_OOC && isliving(new_mob)) @@ -964,4 +966,4 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0) /mob/setMovetype(newval) . = ..() - update_movespeed(FALSE) \ No newline at end of file + update_movespeed(FALSE) diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm index cfd028c4df..076d8b026a 100644 --- a/code/modules/paperwork/paperplane.dm +++ b/code/modules/paperwork/paperplane.dm @@ -34,7 +34,9 @@ /obj/item/paperplane/handle_atom_del(atom/A) if(A == internalPaper) + var/obj/item/paper/P = internalPaper internalPaper = null + P.moveToNullspace() //So we're not deleting it twice when deleting our contents. if(!QDELETED(src)) qdel(src) return ..() diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 5343256c8e..441eb27621 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -193,9 +193,9 @@ var/on = FALSE // 1 if on, 0 if off var/on_gs = FALSE var/static_power_used = 0 - var/brightness = 8 // luminosity when on, also used in power calculation + var/brightness = 11 // luminosity when on, also used in power calculation var/bulb_power = 0.75 // basically the alpha of the emitted light source - var/bulb_colour = "#FFEEDD" // befault colour of the light. + var/bulb_colour = "#FFF6ED" // befault colour of the light. var/status = LIGHT_OK // LIGHT_OK, _EMPTY, _BURNED or _BROKEN var/flickering = FALSE var/light_type = /obj/item/light/tube // the type of light item @@ -231,7 +231,7 @@ icon_state = "bulb" base_state = "bulb" fitting = "bulb" - brightness = 4 + brightness = 6 bulb_colour = "#FFDDBB" desc = "A small lighting fixture." light_type = /obj/item/light/bulb @@ -272,11 +272,11 @@ spawn(2) switch(fitting) if("tube") - brightness = 8 + brightness = 11 if(prob(2)) break_light_tube(1) if("bulb") - brightness = 4 + brightness = 6 if(prob(5)) break_light_tube(1) spawn(1) @@ -351,11 +351,11 @@ set_light(0) update_icon() - active_power_usage = (brightness * 10) + active_power_usage = (brightness * 7.2) if(on != on_gs) on_gs = on if(on) - static_power_used = brightness * 20 //20W per unit luminosity + static_power_used = brightness * 14.4 //20W per unit luminosity addStaticPower(static_power_used, STATIC_LIGHT) else removeStaticPower(static_power_used, STATIC_LIGHT) @@ -738,7 +738,7 @@ icon_state = "ltube" base_state = "ltube" item_state = "c_tube" - brightness = 8 + brightness = 11 /obj/item/light/tube/broken status = LIGHT_BROKEN @@ -751,7 +751,7 @@ item_state = "contvapour" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' - brightness = 4 + brightness = 6 /obj/item/light/bulb/broken status = LIGHT_BROKEN @@ -820,7 +820,7 @@ icon = 'icons/obj/lighting.dmi' base_state = "floor" // base description and icon_state icon_state = "floor" - brightness = 4 + brightness = 6 layer = 2.5 light_type = /obj/item/light/bulb fitting = "bulb" diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index ab9dd6d6a6..611f8c57bd 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -96,15 +96,20 @@ "Gold Trim" = "detective_gold", "The Peacemaker" = "detective_peacemaker" ) + var/list/safe_calibers + +/obj/item/gun/ballistic/revolver/detective/Initialize() + . = ..() + safe_calibers = magazine.caliber /obj/item/gun/ballistic/revolver/detective/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0) - if(magazine.caliber != initial(magazine.caliber)) + if(chambered && !(chambered.caliber in safe_calibers)) if(prob(70 - (magazine.ammo_count() * 10))) //minimum probability of 10, maximum of 60 playsound(user, fire_sound, 50, 1) to_chat(user, "[src] blows up in your face!") user.take_bodypart_damage(0,20) user.dropItemToGround(src) - return 0 + return FALSE ..() /obj/item/gun/ballistic/revolver/detective/screwdriver_act(mob/living/user, obj/item/I) diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index ecd906f2a9..1495ff61ba 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -374,14 +374,18 @@ desc = "Decreases the cooldown of a kinetic accelerator. Not rated for minebot use." modifier = 2.5 minebot_upgrade = FALSE + var/decreased /obj/item/borg/upgrade/modkit/cooldown/install(obj/item/gun/energy/kinetic_accelerator/KA, mob/user) . = ..() if(.) - KA.overheat_time -= modifier + var/old = KA.overheat_time + KA.overheat_time = max(0, KA.overheat_time - modifier) + decreased = old - KA.overheat_time + /obj/item/borg/upgrade/modkit/cooldown/uninstall(obj/item/gun/energy/kinetic_accelerator/KA) - KA.overheat_time += modifier + KA.overheat_time += decreased ..() /obj/item/borg/upgrade/modkit/cooldown/minebot diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index bf3c4220b4..95e104ba68 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -171,7 +171,7 @@ return master -/datum/reagents/proc/trans_to(obj/target, amount=1, multiplier=1, preserve_data=1, no_react = 0)//if preserve_data=0, the reagents data will be lost. Usefull if you use data for some strange stuff and don't want it to be transferred. +/datum/reagents/proc/trans_to(obj/target, amount = 1, multiplier = 1, preserve_data = 1, no_react = 0, log = FALSE)//if preserve_data=0, the reagents data will be lost. Usefull if you use data for some strange stuff and don't want it to be transferred. var/list/cached_reagents = reagent_list if(!target || !total_volume) return @@ -188,17 +188,23 @@ amount = min(min(amount, src.total_volume), R.maximum_volume-R.total_volume) var/part = amount / src.total_volume var/trans_data = null + var/list/transferred = list() for(var/reagent in cached_reagents) var/datum/reagent/T = reagent var/transfer_amount = T.volume * part if(preserve_data) trans_data = copy_data(T) - + transferred += "[T] - [transfer_amount]" R.add_reagent(T.type, transfer_amount * multiplier, trans_data, chem_temp, T.purity, pH, no_react = TRUE, ignore_pH = TRUE) //we only handle reaction after every reagent has been transfered. - remove_reagent(T.type, transfer_amount, ignore_pH = TRUE) + if(log && amount > 0) + var/atom/us = my_atom + var/atom/them = R.my_atom + var/location_string = "FROM [(us && "[us] ([REF(us)]) [COORD(us)]") || "NULL"] TO [(them && "[them] ([REF(them)]) [COORD(them)]") || "NULL"]" + log_reagent_transfer("[location_string] - [key_name(usr)][istext(log) ? " - [log]" : ""]: trans_to with arguments [target] [amount] [multiplier] [preserve_data] [no_react] and reagents [english_list(transferred)]") + update_total() R.update_total() if(!no_react) @@ -237,7 +243,7 @@ src.handle_reactions() return amount -/datum/reagents/proc/trans_id_to(obj/target, reagent, amount=1, preserve_data=1)//Not sure why this proc didn't exist before. It does now! /N +/datum/reagents/proc/trans_id_to(obj/target, reagent, amount = 1, preserve_data = TRUE, log = FALSE)//Not sure why this proc didn't exist before. It does now! /N var/list/cached_reagents = reagent_list if (!target) return @@ -257,8 +263,12 @@ if(preserve_data) trans_data = current_reagent.data R.add_reagent(current_reagent.type, amount, trans_data, chem_temp, current_reagent.purity, pH, no_react = TRUE) - remove_reagent(current_reagent.type, amount, 1) + if(log && amount > 0) + var/atom/us = my_atom + var/atom/them = R.my_atom + var/location_string = "FROM [(us && "[us] ([REF(us)]) [COORD(us)]") || "NULL"] TO [(them && "[them] ([REF(them)]) [COORD(them)]") || "NULL"]" + log_reagent_transfer("[location_string] - [key_name(usr)][istext(log) ? " - [log]" : ""]: trans_id_to with arguments [target] [reagent] [amount] [preserve_data]") break src.update_total() diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index ad3a2c90a4..a32cb94401 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -153,20 +153,37 @@ color = "#669900" // rgb: 102, 153, 0 toxpwr = 0.5 taste_description = "death" + var/fakedeath_active = FALSE pH = 13 /datum/reagent/toxin/zombiepowder/on_mob_metabolize(mob/living/L) ..() - L.fakedeath(type) + ADD_TRAIT(L, TRAIT_FAKEDEATH, type) /datum/reagent/toxin/zombiepowder/on_mob_end_metabolize(mob/living/L) L.cure_fakedeath(type) ..() -/datum/reagent/toxin/zombiepowder/on_mob_life(mob/living/carbon/M) - M.adjustOxyLoss(0.5*REM, 0) +/datum/reagent/toxin/zombiepowder/reaction_mob(mob/living/L, method=TOUCH, reac_volume) + L.adjustOxyLoss(0.5*REM, 0) + if(method == INGEST) + fakedeath_active = TRUE + L.fakedeath(type) + +/datum/reagent/toxin/zombiepowder/on_mob_life(mob/living/M) ..() - . = 1 + if(fakedeath_active) + return TRUE + switch(current_cycle) + if(1 to 5) + M.confused += 1 + M.drowsyness += 1 + M.slurring += 3 + if(5 to 8) + M.adjustStaminaLoss(40, 0) + if(9 to INFINITY) + fakedeath_active = TRUE + M.fakedeath(type) /datum/reagent/toxin/ghoulpowder name = "Ghoul Powder" diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm index e08fba604d..eb473950d5 100644 --- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm +++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm @@ -70,6 +70,14 @@ required_other = TRUE required_container = /obj/item/slime_extract/green +/datum/chemical_reaction/slime/slimemammal + name = "Mammal Mutation Toxin" + id = /datum/reagent/mutationtoxin/mammal + results = list(/datum/reagent/mutationtoxin/mammal = 1) + required_reagents = list(/datum/reagent/water = 1) + required_other = TRUE + required_container = /obj/item/slime_extract/green + //Metal /datum/chemical_reaction/slime/slimemetal name = "Slime Metal" diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index 5fb51ddaa9..23176f8a05 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -1,6 +1,3 @@ -#define PH_WEAK (1 << 0) -#define TEMP_WEAK (1 << 1) - /obj/item/reagent_containers name = "Container" desc = "..." @@ -9,14 +6,13 @@ w_class = WEIGHT_CLASS_TINY var/amount_per_transfer_from_this = 5 var/list/possible_transfer_amounts = list(5,10,15,20,25,30) - var/APTFT_altclick = TRUE //will the set amount_per_transfer_from_this proc be called on AltClick() ? var/volume = 30 - var/reagent_flags + var/reagent_flags //used to determine the reagent holder flags on add_initial_reagents() var/list/list_reagents = null var/spawned_disease = null var/disease_amount = 20 var/spillable = FALSE - var/beaker_weakness_bitflag = NONE//Bitflag! + var/container_flags = APTFT_ALTCLICK|APTFT_VERB //the container item flags var/container_HP = 2 var/cached_icon @@ -24,7 +20,7 @@ . = ..() if(isnum(vol) && vol > 0) volume = vol - if(length(possible_transfer_amounts)) + if(container_flags & APTFT_VERB && length(possible_transfer_amounts)) verbs += /obj/item/reagent_containers/proc/set_APTFT create_reagents(volume, reagent_flags) if(spawned_disease) @@ -37,12 +33,12 @@ . = ..() if(length(possible_transfer_amounts) > 1) . += "Currently transferring [amount_per_transfer_from_this] units per use." - if(APTFT_altclick && user.Adjacent(src)) + if(container_flags & APTFT_ALTCLICK && user.Adjacent(src)) . += "Alt-click it to set its transfer amount." /obj/item/reagent_containers/AltClick(mob/user) . = ..() - if(APTFT_altclick && length(possible_transfer_amounts) > 1 && user.canUseTopic(src, BE_CLOSE, NO_DEXTERY)) + if(container_flags & APTFT_ALTCLICK && length(possible_transfer_amounts) > 1 && user.canUseTopic(src, BE_CLOSE, NO_DEXTERY)) set_APTFT() return TRUE @@ -157,7 +153,7 @@ //melts plastic beakers /obj/item/reagent_containers/microwave_act(obj/machinery/microwave/M) reagents.expose_temperature(1000) - if(beaker_weakness_bitflag & TEMP_WEAK) + if(container_flags & TEMP_WEAK) var/list/seen = viewers(5, get_turf(src)) var/iconhtml = icon2html(src, seen) for(var/mob/H in seen) @@ -172,13 +168,13 @@ temp_check() /obj/item/reagent_containers/proc/temp_check() - if(beaker_weakness_bitflag & TEMP_WEAK) + if(container_flags & TEMP_WEAK) if(reagents.chem_temp >= 444)//assuming polypropylene START_PROCESSING(SSobj, src) //melts glass beakers /obj/item/reagent_containers/proc/pH_check() - if(beaker_weakness_bitflag & PH_WEAK) + if(container_flags & PH_WEAK) if((reagents.pH < 1.5) || (reagents.pH > 12.5)) START_PROCESSING(SSobj, src) else if((reagents.pH < -3) || (reagents.pH > 17)) @@ -192,7 +188,7 @@ cached_icon = icon_state var/damage var/cause - if(beaker_weakness_bitflag & PH_WEAK) + if(container_flags & PH_WEAK) if(reagents.pH < 2) damage = (2 - reagents.pH)/20 cause = "from the extreme pH" @@ -203,7 +199,7 @@ cause = "from the extreme pH" playsound(get_turf(src), 'sound/FermiChem/bufferadd.ogg', 50, 1) - if(beaker_weakness_bitflag & TEMP_WEAK) + if(container_flags & TEMP_WEAK) if(reagents.chem_temp >= 444) if(damage) damage += (reagents.chem_temp/444)/5 diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index b1b5f86e0e..db0aa8ce99 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -31,7 +31,8 @@ log_combat(user, M, "splashed", R) reagents.clear_reagents() else - if(M != user) + var/self_fed = M == user + if(!self_fed) M.visible_message("[user] attempts to feed something to [M].", \ "[user] attempts to feed something to you.") if(!do_mob(user, M)) @@ -44,7 +45,7 @@ to_chat(user, "You swallow a gulp of [src].") var/fraction = min(5/reagents.total_volume, 1) reagents.reaction(M, INGEST, fraction) - addtimer(CALLBACK(reagents, /datum/reagents.proc/trans_to, M, 5), 5) + addtimer(CALLBACK(reagents, /datum/reagents.proc/trans_to, M, 5, null, null, null, self_fed? "self swallowed" : "fed by [user]"), 5) playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1) /obj/item/reagent_containers/glass/afterattack(obj/target, mob/user, proximity) @@ -61,7 +62,7 @@ to_chat(user, "[target] is full.") return - var/trans = reagents.trans_to(target, amount_per_transfer_from_this) + var/trans = reagents.trans_to(target, amount_per_transfer_from_this, log = "reagentcontainer-glass afterattack transfer to") to_chat(user, "You transfer [trans] unit\s of the solution to [target].") else if(target.is_drainable()) //A dispenser. Transfer FROM it TO us. @@ -73,7 +74,7 @@ to_chat(user, "[src] is full.") return - var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this) + var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this, log = "reagentcontainer-glass afterattack fill from") to_chat(user, "You fill [src] with [trans] unit\s of the contents of [target].") else if(reagents.total_volume) @@ -96,7 +97,7 @@ to_chat(user, "[src] is full.") else to_chat(user, "You break [E] in [src].") - E.reagents.trans_to(src, E.reagents.total_volume) + E.reagents.trans_to(src, E.reagents.total_volume, log = "reagentcontainer-glass break egg in") qdel(E) return ..() @@ -110,7 +111,7 @@ item_state = "beaker" materials = list(MAT_GLASS=500) possible_transfer_amounts = list(5,10,15,20,25,30,50,60) - beaker_weakness_bitflag = PH_WEAK + container_flags = PH_WEAK|APTFT_ALTCLICK|APTFT_VERB /obj/item/reagent_containers/glass/beaker/Initialize() . = ..() @@ -203,11 +204,7 @@ volume = 180 amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5,10,15,20,25,30,40,50,60,120,180) - -/obj/item/reagent_containers/glass/beaker/plastic/Initialize() - beaker_weakness_bitflag &= ~PH_WEAK - beaker_weakness_bitflag |= TEMP_WEAK - . = ..() + container_flags = TEMP_WEAK|APTFT_ALTCLICK|APTFT_VERB /obj/item/reagent_containers/glass/beaker/plastic/update_icon() icon_state = "beakerlarge" // hack to lets us reuse the large beaker reagent fill states @@ -222,10 +219,7 @@ volume = 240 amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5,10,15,20,25,30,40,50,60,120,200,240) - -/obj/item/reagent_containers/glass/beaker/meta/Initialize() // why the fuck can't you just set the beaker weakness bitflags to nothing? fuck you - beaker_weakness_bitflag &= ~PH_WEAK - . = ..() + container_flags = APTFT_ALTCLICK|APTFT_VERB /obj/item/reagent_containers/glass/beaker/noreact name = "cryostasis beaker" @@ -236,13 +230,9 @@ reagent_flags = OPENCONTAINER | NO_REACT volume = 50 amount_per_transfer_from_this = 10 + container_flags = APTFT_ALTCLICK|APTFT_VERB container_HP = 10//shouldn't be needed -/obj/item/reagent_containers/glass/beaker/noreact/Initialize() - beaker_weakness_bitflag &= ~PH_WEAK - . = ..() - //reagents.set_reacting(FALSE) was this removed in a recent pr? - /obj/item/reagent_containers/glass/beaker/bluespace name = "bluespace beaker" desc = "A bluespace beaker, powered by experimental bluespace technology \ @@ -310,18 +300,15 @@ SLOT_L_STORE, SLOT_R_STORE,\ SLOT_GENERC_DEXTROUS_STORAGE ) + container_flags = APTFT_ALTCLICK|APTFT_VERB container_HP = 1 -/obj/item/reagent_containers/glass/bucket/Initialize() - beaker_weakness_bitflag |= TEMP_WEAK - . = ..() - /obj/item/reagent_containers/glass/bucket/attackby(obj/O, mob/user, params) if(istype(O, /obj/item/mop)) if(reagents.total_volume < 1) to_chat(user, "[src] is out of water!") else - reagents.trans_to(O, 5) + reagents.trans_to(O, 5, log = "reagentcontainer-bucket fill mop") to_chat(user, "You wet [O] in [src].") playsound(loc, 'sound/effects/slosh.ogg', 25, 1) else if(isprox(O)) @@ -365,12 +352,9 @@ volume = 50 amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5,10,15,20,25,30,50) + container_flags = TEMP_WEAK|APTFT_ALTCLICK|APTFT_VERB container_HP = 1 -/obj/item/reagent_containers/glass/beaker/waterbottle/Initialize() - beaker_weakness_bitflag |= TEMP_WEAK - . = ..() - /obj/item/reagent_containers/glass/beaker/waterbottle/empty list_reagents = list() diff --git a/code/modules/reagents/reagent_containers/hypovial.dm b/code/modules/reagents/reagent_containers/hypovial.dm index c0db92e0e8..db2d73c697 100644 --- a/code/modules/reagents/reagent_containers/hypovial.dm +++ b/code/modules/reagents/reagent_containers/hypovial.dm @@ -7,7 +7,7 @@ spillable = FALSE volume = 10 possible_transfer_amounts = list(1,2,5,10) - APTFT_altclick = FALSE + container_flags = APTFT_VERB obj_flags = UNIQUE_RENAME unique_reskin = list("hypovial" = "hypovial", "red hypovial" = "hypovial-b", @@ -25,9 +25,6 @@ if(!icon_state) icon_state = "hypovial" update_icon() -// beaker_weakness_bitflag |= PH_WEAK // fuck you if you're using these like beakers -// beaker_weakness_bitflag |= TEMP_WEAK - /obj/item/reagent_containers/glass/bottle/vial/on_reagent_change() update_icon() diff --git a/code/modules/reagents/reagent_containers/rags.dm b/code/modules/reagents/reagent_containers/rags.dm index 0fe30efd6b..59c956acd6 100644 --- a/code/modules/reagents/reagent_containers/rags.dm +++ b/code/modules/reagents/reagent_containers/rags.dm @@ -8,7 +8,7 @@ reagent_flags = REFILLABLE | DRAINABLE amount_per_transfer_from_this = 5 possible_transfer_amounts = list() - APTFT_altclick = FALSE + container_flags = APTFT_VERB volume = 5 spillable = FALSE var/wipe_sound diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index edaa5ce269..e8c8d14141 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -23,6 +23,7 @@ amount_per_transfer_from_this = 5 volume = 250 possible_transfer_amounts = list(5,10,15,20,25,30,50,100) + container_flags = NONE //APTFT is alternated between the initial value and stream_amount and shouldn't be exploited. /obj/item/reagent_containers/spray/afterattack(atom/A, mob/user) . = ..() diff --git a/config/game_options.txt b/config/game_options.txt index 9fc50fcd0f..97c5ff3a68 100644 --- a/config/game_options.txt +++ b/config/game_options.txt @@ -39,7 +39,7 @@ WALK_DELAY 4 ## 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 1 ##MULTIPLICATIVE_MOVESPEED /mob/living/silicon/robot 0 ##MULTIPLICATIVE_MOVESPEED /mob/living/carbon/monkey 0 ##MULTIPLICATIVE_MOVESPEED /mob/living/carbon/alien 0 diff --git a/html/changelog.html b/html/changelog.html index 60412299cf..349a8ce012 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,463 @@ -->
+

27 January 2020

+

4dplanner, CRITAWAKETS, XDTM, ninjanomnom updated:

+ +

AffectedArc07 updated:

+ +

Arkatos, Zxaber, Ghommie updated:

+ +

Arturlang updated:

+ +

Bhijn updated:

+ +

Bhijn helped updated:

+ +

BonniePandora updated:

+ +

CameronWoof updated:

+ +

Commandersand updated:

+ +

DeltaFire15 updated:

+ +

Denton, ported by Hatterhat updated:

+ +

Detective-Google updated:

+ +

EmeraldSundisk updated:

+ +

FantasticFwoosh, ported by Hatterhat updated:

+ +

Ghommie updated:

+ +

Ghommie (original PRs by Kevinz000, ShivCalez, 4dplanner, Barhandar, 81Denton, zxaber, Fox-McCloud) updated:

+ +

Hatterhat updated:

+ +

KathrinBailey updated:

+ +

KeRSedChaplain updated:

+ +

Kevinz000 updated:

+ +

Kraseo updated:

+ +

LetterN updated:

+ +

Linzolle updated:

+ +

MrJWhit updated:

+ +

Naksu updated:

+ +

Owai-Seek updated:

+ +

PersianXerxes updated:

+ +

Putnam updated:

+ +

Putnam3145 updated:

+ +

Ryll/Shaps, ported by Hatterhat updated:

+ +

Savotta updated:

+ +

Seris02 updated:

+ +

Skoglol updated:

+ +

SpaceManiac, bobbahbrown, ShizCalev, SpaceManiac (ported by Ghommie) updated:

+ +

Tlaltecuhtli, Nemvar, Trilby, Hatterhat updated:

+ +

Trilbyspaceclone updated:

+ +

Trilbyspaceclone, Ghommie updated:

+ +

Tupinambis updated:

+ +

Unit2E & JMoldy, ported by Hatterhat updated:

+ +

Xantholne updated:

+ +

dapnee updated:

+ +

deathride58 updated:

+ +

jakeramsay007 updated:

+ +

kappa-sama updated:

+ +

keronshb updated:

+ +

kevinz000 updated:

+ +

nik707 updated:

+ +

r4d6 updated:

+ +

timothyteakettle updated:

+ +

30 December 2019

AnturK updated:

- -

07 December 2019

-

AffectedArc07 updated:

- -

Anonymous updated:

- -

Arturlang updated:

- -

Bhijn updated:

- -

Coconutwarrior97 updated:

- -

Commandersand updated:

- -

DeltaFire15 updated:

- -

Fermis updated:

- -

Fox McCloud updated:

- -

Fox McCloud, Ghommie updated:

- -

Ghommie updated:

- -

Ghommie (original PR by Denton) updated:

- -

Ghommie (original PR by nicbn and Menshin) updated:

- -

Ghommie (original PRs by ShizCalev, CRTXBacon and Niknakflak) updated:

- -

Ghommie, porting lot of PRs by MrDoomBringer, AnturK, nemvar and coiax. updated:

- -

GrayRachnid updated:

- -

Hatterhat updated:

- -

Iroquois-Pliskin updated:

- -

Jerry Derpington, baldest of the balds, and nemvar. updated:

- -

KathrinBailey updated:

- -

Kevinz000, Cruix, MrStonedOne, Denton, Kmc2000, Anturk, MrDoomBringer, Dennok, TheChosenEvilOne, Ghommie updated:

- -

Knouli updated:

- -

Krysonism, Ghommie updated:

- -

Linzolle updated:

- -

Mickyy5 updated:

- -

MrJWhit updated:

- -

Naksu, ShizCalev updated:

- -

Owai-Seek updated:

- -

PersianXerxes updated:

- -

Putnam updated:

- -

Putnam3145 updated:

- -

Robustin, Subject217 updated:

- -

Seris02 updated:

- -

ShizCalev updated:

- -

Swindly updated:

- -

Tetr4 updated:

- -

Trilbyspaceclone updated:

- -

Ty-the-Smonk updated:

- -

Useroth updated:

- -

Weblure updated:

- -

XDTM, ShizCalev, Naksu, Skoglol, cacogen, Rohesie (ported by Ghommie) updated:

- -

Xantholne updated:

- -

YakumoChen updated:

- -

actioninja updated:

- -

dapnee updated:

- -

dzahlus updated:

- -

him updated:

- -

kappa-sama updated:

- -

kevinz000 updated:

- -

kiwedespars updated:

- -

nemvar updated:

- -

nemvar, ShizCalev, Qustinnus/Floyd, Ghommie updated:

- -

r4d6 updated:

-
GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index db9c8e6d08..464340ef24 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -23980,3 +23980,475 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. shellspeed1: - rscadd: Adds Insect markings - rscadd: Adds three new moth wings. +2020-01-27: + 4dplanner, CRITAWAKETS, XDTM, ninjanomnom: + - rscadd: sepia slime extract has a delay before activating + - balance: the user of a sepia slime extract is no longer immune to the time field + - balance: chilling sepia is now the support extract - it always freezes the user, + but not other marked people. give one to your golem! + - rscadd: burning sepia spawns the rewind camera. Take a selfie with someone and + give it to them to make sure they remember the moment forever! You don't actually + need to give them the photo, they'll remember anyway. Keep it as a reminder. + - rscadd: rewinding (deja vu) effect resets your location to the turf you were on + after 10 seconds as well as resetting limbs/mobs/objects damage to the point + it was added. + - rscadd: The deja vu effect cannot resurrect the dead, but will heal their corpse. + New limbs fall off, old ones re-attach + - rscadd: 'Regenerative sepia cores add a deja vu effect before healing instead + of a timestop remove: timefreeze camera is admin spawn only.' + - rscadd: recurring sepia recalls to the hand of the last person to touch it after + activating. Reusable timestop grenades! + - tweak: some special cameras don't prompt for customisation + - bugfix: timefreeze camera actually makes a photo + - bugfix: timestop stops pathing and mechs. + - bugfix: adds a check to make sure simple_animals don't get their AI toggled while + sentient + - bugfix: Adds the timestop overlay to frozen projectiles + - bugfix: Timestopped things have INFINITY move_resist as opposed to being anchored + - bugfix: Timestop will now unfreeze things that somehow leave it + - bugfix: mobs in the middle of a walk_to will have their walk stopped by timestop + - bugfix: mobs that are stunned will be stopped mid walk as well + - bugfix: pulling respects changes in move_force + - bugfix: swapping places respects move_force if the participant is not willing + - bugfix: timestop is properly defeated by antimagic. + - bugfix: timestop only checks antimagic once + - tweak: Time stop now applies its visual effect on floors, walls and static structures + (with no change otherwise) + - tweak: Movable structures are now anchored while time stopped. + - tweak: Timestop effects now prevent speech. + AffectedArc07: + - code_imp: All code files are now in the LF line format, please stick to it + - tweak: Added CI step to check for CRLF files + - code_imp: Line ending CI works now + Arkatos, Zxaber, Ghommie: + - rscadd: Certain AI abilities now dynamically show their remaining uses on the + mouse hover over their respective action buttons. + - bugfix: Malfunctioning AIs can no longer abuse the confirmation popup to create + extra (unstoppable) doomsdays. + - bugfix: Fixed AIs being able to use some of their abilities such as the doomsday + whilst dead, and the doomsday loading phase not halting upon AI death. + Arturlang: + - tweak: Vampires are no longer as tanky + - rscadd: Added modular computers to the loadout + Bhijn: + - rscadd: Limbs now regenerate their stamina faster while disabled + - rscadd: Limbs now have the same incoming stamina damage multiplier mechanics as + spacemen, where the more staminaloss they take while disabled, the less staminaloss + they'll take. + - balance: Limbs have had their base stamina regen rate doubled to match the doubled + stamina regen rate of standard spacemen. + - rscadd: Added a preference to make the sprint hotkey be a toggle instead of a + hold bind + - rscadd: Added a preference to bind the sprint hotkey to space instead of shift. + - bugfix: server_hop can no longer be used to remotely lobotomize a spaceman + Bhijn helped: + - bugfix: Fixes Dragon's Tooth Sword 50% armor penetration by making it 35% + BonniePandora: + - admin: 'Added another SDQL option. Using "UPDATE selectors SET #null=value" will + now resolve value and discard the return. This is useful if you only care about + the side effect of a proc.' + CameronWoof: + - rscadd: Ghost Cafe patrons now spawn with chameleon kits. Dress up! Be fancy! + - rscadd: Robots can now check the crew manifest from anywhere with the "View Crew + Manifest" verb. + - tweak: Lizard tails are now viable options for humans and anthromorphs. + Commandersand: + - bugfix: fixed some clothnig sprites + - balance: lightning bolt,tesla,forcewall,emp spells have lower cooldown + - balance: fireball has a 10 second starting cooldown + DeltaFire15: + - bugfix: Vitality matrixes now correctly succ slimes + Denton, ported by Hatterhat: + - tweak: Most upgradeable machines now show their upgrade status when examined while + standing right next to them. + - tweak: Added examine messages to teleporter stations that hint at their multitool/wirecutter + interactions. + - tweak: Renamed teleporter stations from station to teleporter station. + - code_imp: Changed the teleporter hub accurate var to accuracy; the old name misled + people into thinking that it was a boolean. + Detective-Google: + - tweak: replaced the sprites with new ones requested. + EmeraldSundisk: + - rscadd: Adds a sign outside MetaStation's custodial closet + FantasticFwoosh, ported by Hatterhat: + - rscadd: Both reagent universal enzyme & sacks of flour are now available for their + respective costs from the biogenerator. + - rscadd: New crafting recipies for donut boxes, eggboxes & candle boxes have been + added to cardboard recipes for the collective benefit of service personnel and + the station. + Ghommie: + - tweak: Attached kevlar/soft/plastic padding accessories are now stealthier and + will no longer be displayed on mob examine. + - refactor: Refactored that mess of a code for alternate worn clothing sprites for + digitigrade and taurs. + - bugfix: Fixed some issues with the aforementioned feature you may or may not have + experienced because it was pretty lame. + - bugfix: Fixed missing digi versions fishnet sprites and wrong digitigrade left + dir purple stockings sprite. + - imageadd: Add digitigrade versions for boxers and the long johns. + - bugfix: Fixed the secret sauce recipe being randomized every round. + - bugfix: Fixed singularity pulls duping rods out of engine floors. + - rscdel: Removed an old pair of zipties from the captain closet. + - bugfix: Chestbursters won't delete the host's brain somewhat anymore. + - bugfix: Fixed roundstart mushpeople being unable to MUSH PUUUUUUUUUUUUNCH!! + - bugfix: Lattices can be examined yet again. + - bugfix: Made reagent containers examine text less annoying. + - bugfix: Virus food dispensers dispense virus food again. + - bugfix: Borg hypos inputs do not display typepaths anymore. + - bugfix: Restored chem dispensers alphabetical order. + - bugfix: Sanitized cargo export messages for reagents. + - bugfix: Riot foam dart (not the ammo box) design cost is yet again consistent + with the result's material amount. + - bugfix: Fixed a little exploit with ventcrawlers being capable of escaping closed + turfs by printing scrubbers/vents into them. + - bugfix: deconstructing a rubber toolbox with the destructive analyzer won't "lock" + the machine anymore. + - bugfix: Something about empty hand combat mode right click waving hands defying + common sense and being spammy. + - imageadd: Towels are now "digitigrade-friendly". + - bugfix: The Barefoot drink and mousetraps will now work even if wearing certain + "feet-less shoes". + - rscadd: Refactored code to allow all living mobs to use shields and not only humans. + - tweak: Monkys will now retaliate against aliens attacking them (as if they even + posed a threat to start with). + - tweak: add a click cooldown to the overly spammable table slamming. + Ghommie (original PRs by Kevinz000, ShivCalez, 4dplanner, Barhandar, 81Denton, zxaber, Fox-McCloud): + - rscadd: All atom movables now have move force and move resist, and pull force + An atom can only pull another atom if its pull force is stronger than that atom's + move resist + - rscadd: 'Mobs with a higher move force than an atom''s move resist will automatically + try to force the atom out of its way. This might not always work, depending + on how snowflakey code is. experimental: As of right now, everything has a move + force and resist of 100, and a pull force of 101. Things take (resist - force) + damage when bumped into experimental: Failing to move onto a tile will now still + bump up your last move timer. However, successfully pushing something out of + your way will result in you automatically moving into where it was.' + - bugfix: Bolted AIs can no longer be teleported by launchpads. + - balance: Megafauna cannot teleport + Hatterhat: + - balance: Beakers are generally more useful now, with slight capacity increases. + - tweak: Transfer amounts are different now. Adjust your muscle memory to compensate. + - balance: ore redemption machines actually get affected by lasers again kthx + - tweak: crusher trophy drop chance on mining mobs increased to 1 in 4 (from 1 in + 20) + - bugfix: Blood-drunk buff from blood-drunk eye crusher trophy is less likely to + cripple its user. + - tweak: Forcefield projectors now fit on toolbelts. + - imageadd: New sprites for ATMOS holofan and forcefield projectors! + - tweak: tweaks some values around with beaker transfer amounts, adds a transfer + value verb (altclick) + - rscadd: 'Syndicate sleepers (read: the ones that''re red and have controls in + them) can now be recreated with a sufficient basis in nonstandard (read: illegal) + technologies!' + - bugfix: Explorer hoods on standard explorer suits can be reinforced with goliath + hide plates again. + - rscadd: A shipment of Staff Assistant jumpsuits from the Goon-operated stations + appear to have made their way into your loadout selections - and into the contraband + list from ClothesMates... + - balance: Dropped Exo-suit armor to put it more in line with being an explorer + suit sidegrade and not a straight upgrade for Lavaland usage. + - rscadd: You can now print .357 AP speedloaders from Security techfabs after you + pick up the Advanced Non-Standard Ballistics node. + - rscdel: Forensic scanner removed from Advanced Biotechnology node. + - tweak: Ash Drake armor now has goliath resistance, same as the Exo-suit. + KathrinBailey: + - rscadd: Empty engineering lockers for mappers. + - rscadd: Industrial welding tools to the engineer welding locker. + - rscdel: Removed the multitool, airlock painter, mechanical toolbox, brown sneakers, + hazard vest and airlock painter from the CE's locker. + KeRSedChaplain: + - imageadd: The clockwork cuirass can now support slithering taur bodies. + Kevinz000: + - bugfix: Fixes successful projectile hits also striking another atom on the same + turf should the first one be not the target the projectile was meant for. + - rscdel: Removes infinite reflector loops. + Kraseo: + - bugfix: Jelly donuts and pink jelly donuts will now properly display sprinkled + icon state. + - bugfix: Jelly donuts and its variants will properly spawn with berry juice. + - bugfix: Slime jelly donuts have slime jelly in them now. (thanks ghommie) + - bugfix: Virgo hairstyles no longer have those annoying quotation marks. Rejoice + for you will no longer have to use the scrollbar. + - imagedel: Got rid of some strange-looking hairstyles. (Tbob, fingerweave, etc.) + LetterN: + - rscadd: Doppler logs + - tweak: Shockcolar and electropack uses the new signaler ui + - tweak: Renaming shockcolar requires a pen + - rscadd: Adds banjo + Linzolle: + - bugfix: fixes matchboxes runtiming every time they spawn + MrJWhit: + - tweak: Increases plasma usage in radiation collectors + Naksu: + - code_imp: reagent IDs have been removed in favor using reagent typepaths where + applicable + - bugfix: mechas, borg hyposprays etc no longer display internal reagent ids to + the player + Owai-Seek: + - rscadd: Four New Bounties + - tweak: tweaked several bounties + - tweak: reorganised several bounties + - balance: balanced several bounties + - bugfix: added shady jims to vendor + - rscadd: Towel, Bedsheet, and Colored bedsheet bins to Dojo. Some lockers with + carpets and wood, another bathroom/shower, tons of cleaning supplies, some additional + trash cans, a tiny medical area, and some vendors/vendor resupplies. Also added + some Ambrosia Gaia seeds. + - tweak: Moved some lights around, extended the dojo a bit to make it feel more + spacious. + - rscdel: Cafe Newsfeed Frame + PersianXerxes: + - tweak: Reduces the range of the forcefield projector from 7 tiles to 2 tiles. + Putnam: + - rscadd: Alcohol intolerance trait, which forces vomiting on any alcohol ingestion + - rscdel: Arousal damage is gone, and with it the arousal damage heart on the UI. + - rscdel: As exhibitionist relied on arousal damage, that's gone too. + - rscdel: Bonermeter and electronic stimulation circuit modules are gone. + - rscdel: Masturbation is no longer an option in the climax menu. It was identical + to climax alone in every way but text. Emote it out. + - rscadd: Arousal on genitals can now be displayed manually, on a case-by-case basis. + - rscadd: '"Climax alone" and "climax with partner" now only display to the people + directly involved in the interaction. rework: Catnip tea, catnip, crocin, hexacrocin, + camphor, hexacamphor all had functions or bits of functions reworked.' + - tweak: '"Climax with partner" now requires consent from both parties--it can no + longer be used on mindless mobs, and it asks the mob getting climaxed with if + they consent first.' + - tweak: A lot of MKUltra behaviors have been moved to hypno checks or removed due + to reliance on maso/nympho/exhib. + - rscadd: Cold-blooded quirk + - rscadd: 'Two relief valves for atmospherics, available in your RPD today: a unary + one that opens to air and a binary one that connects two pipenets, like a manual + valve.' + - tweak: The atmos waste outlet injector on box has been replaced with an atmos + waste relief valve. + Putnam3145: + - rscadd: Dynamic storytellers, a new voting paradigm for dynamic + - rscadd: Support for approval voting and condorcet (ranked choice) voting in server + votes + - rscadd: Ghost cafe mobs can now ghostize + - rscadd: Ghost cafe now has a cremator + - rscadd: Ghost cafe mobs are now eligible for ghost roles + - refactor: Ghost roles now use an element for eligibility purposes + - bugfix: You can toggle some prefs properly now. + - bugfix: no ass slap is no longer the same thing as no aphro + - balance: Devastating bombs kills bomb armor'd mobs again + - rscadd: Added a sort of "game mode ban" by way of having people rank their game + modes favorite to least favorite after the secret/extended vote. + - bugfix: Turns out the schulze scoring was written wrong and it was setting things + to 0 that shouldn't have been, so that's fixed. + - config: Random engines are now weighted. + - rscadd: Ghost dojo now has an autoylathe. + - rscdel: Ghost dojo no longer has VR or modular computer access. + - tweak: Ghost dojo mobs are pacifists. + - tweak: Ghost dojo booze-o-mat is now all access. + - bugfix: Ghost dojo crematorium now has a button. + - bugfix: Traitor objectives don't take a dump when they try to add an assassinate + anymore + - admin: Objective removal with antag panel no longer commented out silently while + still being an option that gives useful feedback on stuff it's not doing in + any respect + - rscadd: Second, temporary flavor text! + - bugfix: Limb damage works now + - tweak: Score instead of ranked choice for mode tiers + - bugfix: Chemistry not :b:roke + - tweak: Ghost dojo spawns will dust if their owner suicides or uses the "ghost" + verb. + - admin: Crafting is logged in a file now + - bugfix: temporary flavor text now pops up properly + - code_imp: demodularized player panel code, mostly + - admin: added ghost role eligibility delay removal to player panel + - balance: Metabolic synthesis disables if user isn't well-fed rather than if user + is starving + - bugfix: Gibtonite no longer instantly explodes upon being pickaxe'd. + - balance: Cold-blooded costs -2 quirk points now + - config: Added suicide to the config. + - tweak: Ghost cafe mobs are super duper attached to the ghost cafe. + - bugfix: Meow Mix bar sign works + - bugfix: Fixed a few relief valve behaviors + Ryll/Shaps, ported by Hatterhat: + - rscadd: Point-blanking people with shotguns actually throws them backwards! + Savotta: + - rscadd: snout + - imageadd: snout + Seris02: + - tweak: made it so trait blacklisting removes random positives instead of removing + everything + - rscadd: added atmos holofirelocks and temperature blocking + - tweak: tweaked how atmos holofan looks + - rscadd: stunglasses + - rscadd: disabler sechuds + - rscadd: adds coconut + - rscadd: adds a coconut bong + - rscadd: Auto ooc + - admin: changed "assume direct control" from m.ckey = src.ckey to adminmob.transfer_ckey(M) + so it works with auto ooc + - rscadd: marshmallow + - rscadd: telescopic IV drip + - bugfix: cardboard box speed + - tweak: makes gorilla shuttle emag only + - tweak: changed where the observe verb is. + - tweak: the way chameleon clothes update on change + - bugfix: chameleon cloak icon + - balance: Explosions now cause knockdown instead of KOs, with the amount of time + scaling off bomb armor. Heavy explosions still cause a ~2 second KO for follow + up attacks. + - balance: Devastating explosions now no longer gib players with more than 50 bomb + armor. This used to be more or less random depending on the amount of bomb armor. + - code_imp: Removed reagent explosion code that would trigger for <1 amount reactions. + - rscadd: traitor tool for bowmanizing headsets + bowmanizing headsets + - rscadd: durathread winter coats from hyper station + - tweak: conveyor belt now are stacks instead of single item + - tweak: conveyor crate has 30 belts + - tweak: printing a conveyor costs 3000 metal + - rscadd: you can press the conveyor switch in hand to link any not deployed belts + to it + - tweak: sniffing sneezing etc doing anything if they don't breathe + - bugfix: probably fixes the make mentor button + - tweak: the sprites for the conveyor belts to look more directional + Skoglol: + - bugfix: Falsewalls now properly hide pipes and wires. + SpaceManiac, bobbahbrown, ShizCalev, SpaceManiac (ported by Ghommie): + - code_imp: It is now possible to set a different most-base-turf per z-level. + - spellcheck: Removed unlawful reference to Disney's Star Wars franchise in map + logging. + - tweak: Moved mapping related errors to their own log file. + - bugfix: Destruction on Lavaland will no longer reveal space in rare situations. + Tlaltecuhtli, Nemvar, Trilby, Hatterhat: + - rscadd: russian surplus crate, sec ammo crate, meat/veggie/fruit crate, rped crate, + bomb suit crate, bio suit crate, parrot crate, chem crate, db crate + - tweak: lowered price of some crates which are overpriced for no reason aka the + tablet crate and the mech circuits crates, track implant crate has also track + .38 ammo + - bugfix: sectech vendor has a refill pack + Trilbyspaceclone: + - bugfix: Fermi plushie can be made once again + - tweak: range on Engi Tray scanners and Rad-Scanners + - bugfix: issues with mapping done my Trilby + - rscadd: Grass now makes light beer when distilled + - tweak: allows bandoliers to hold any ammo type as long as it has a casing + - server: Cleans out the last years of changlogs + - bugfix: 'rouge cases of #$39; in bottle/pill/patch/condiments' + - tweak: Adds missing but needed flags to MASON RIG + - bugfix: missing sprites with crushed cans + - tweak: Halfs the nutriments in sugar + - rscadd: Glitter is now makeable with ground plastic and some crayons + - code_imp: Makes more folders and files for uplink. + - rscadd: Seed packs now have RnD points inside them + - rscadd: New tips that reflect the now use seed packs have for Rnd / Chems affect + on plants + - code_imp: Made the research file look nice rather then an eye harming list + - bugfix: Fixed fragile space suits breaking from weak and non-damaging "weapons" + (such as the Sord, toys and foam darts). + - rscadd: 'tip of the round: Cleanbot can withstand lava and burning hot ash. Its + a god' + - rscadd: more glassware + - rscadd: Few new packs and glassmaker kit! + - tweak: prices/chems of crates/autobottler + - bugfix: some crates ungettable as well as some broken crates + Trilbyspaceclone, Ghommie: + - rscadd: More types of glass can now be used to make a solar panel, with different + sturdiness and efficiency depending the type. + Tupinambis: + - tweak: Replaces new fire alarms with a slightly updated version of the old ones. + - bugfix: Fixed bug where Amber alert had no proper alert lights, and red alert + had amber lights. + - balance: RLDs now cost more to use, have reduced matter capacity, and sheets are + worth less when refilling them. + Unit2E & JMoldy, ported by Hatterhat: + - balance: the powerfist now punches people away at high velocity depending on setting. + - rscadd: the powerfist now leaks the gas it uses onto the tile you're on. + - tweak: Adds weak punch variations for empty and near-empty punching. + Xantholne: + - bugfix: Christmas clothes that where missing stuff should work again + - tweak: Christmas clothes moved from clothesmate and loadout to premium autodrobe, + hoodies and boots remain. + - rscadd: Botany bee pet, Bumbles + - rscadd: New bee models that aren't 1 tile big of 0 opacity pixels + - rscadd: Cheongsam and Qipao clothing added to loadout and clothesmates + dapnee: + - imageadd: new toxin's uniform and accessories + - imagedel: old toxin's uniform and accessories + deathride58: + - balance: The stamina buffer no longer uses stamina while recharging. + jakeramsay007: + - rscadd: The assorted .357 revolvers (except russian revolver) can now also load + .38, like real life. + kappa-sama: + - rscadd: loot crates in cargo contraband + - code_imp: modular_citadel file movement + - code_imp: modular citadel loses some files + - balance: dragnet snares can now be removed in 5 seconds + keronshb: + - rscadd: Adds new features for nanites + - bugfix: fixed the missing icons from Dermal Button nanites + - rscadd: Ports the special nanite remote, mood programs, and research generating + nanites + - balance: rebalances some nanites + - bugfix: fixed my messup + kevinz000: + - rscadd: throwing things no longer makes them randomly turned as long as you aren't + on harm intent + - rscadd: Custom holoforms have been added for pAIs and AIs. oh and cyborg holograms + of specific modules too. + - balance: pais are no longer indestructible-flagged while in card form. pai radios + now short out if they are forcefully collapsed from damage. + - bugfix: telescopic iv drips now have the proper sanity checks for deployment. + - bugfix: megafauna can hear again + - balance: Cargo passive gen is now 500 down from 750. + - config: Added a few more nightshift config entries + - rscadd: nightshift_public_area variable in areas to determine how public an area + is. + - rscadd: NIGHT_SHIFT_PUBLIC_AREAS_ONLY config entry allows the server to be configured + to only nightshift areas of that level and below (so areas that are more public) + - rscadd: Config entries added for requiring authorizations to toggle nightshift. + Defaults to only requiring on public areas as determined by above + - balance: nuclear fist buffed. + - balance: cogscarabs are now fulltile-hitbox. + - balance: emitters are now hitscan + - balance: monkies gorrilize easier now + - rscadd: Ghosting no longer stops abductors from using you. + - rscadd: guests can now looc + - tweak: tableslamming has 0.4 second cooldown instead of 0.8 + - bugfix: health analyzers now work + - code_imp: Mapping helpers added for power cables and atmos pipes. + - rscdel: Blood duplication is gone, but viruses now react up to 5 times, 1 time + per unit, for virus mix. + - rscadd: you can now block people on your PDA + - bugfix: Grenades can now have their timers adjusted. + - balance: Cloning has been nerfed. + - bugfix: hilbert hotel is now less of an exploity mess + - balance: Doorcrushes are once again instant. + nik707: + - tweak: engraving light_power from 1 to 0.3 + r4d6: + - rscadd: Added a Radiation Hardsuit + - rscadd: Added a Radiation Hardsuit crate + - rscadd: Added 3 SM Engine variations. + - rscadd: 'Added a way to make opaque plastic flaps change: Change the already existing + flap recipe to show that they are see-through' + - rscadd: Animations for the RCD + - bugfix: Said animations being pulled by the Singulo + - balance: Prevent Reinforced Doors from being RCD'ed + - bugfix: Deconstructing Floors now cost MUs like everything else + - tweak: changed the RCD's upgrades into flags + - rscadd: Allow RCDs to print APC, Firelocks and Fire Alarms with the right upgrade + - balance: Allow Engineers to print RCDs and RPDs from their protolathe without + needing to hack one. + - rscadd: Added a playback device + - bugfix: Made the Voice Analyzer actually care about languages + - bugfix: fixed SM's piping + - rscadd: Added a message when pulsing the open wire. + - bugfix: fixed being able to use a playback device and a voice analyzer to activate + each others + - rscadd: added passive vent to the arsenal of atmospheric devices. + - rscadd: Mining base now has a common area accessible via a new shuttle on the + medium-highpop maps, and a security office connecting the gulag and the mining + base. Gulag also has functional atmos. + - rscadd: Added more Cyborg Landmarks + - refactor: better code for passive vents + - bugfix: fixed a hole in Meta + - rscadd: Added the ability to easily add variations of the mining base + - bugfix: fixed a sprite + timothyteakettle: + - bugfix: fixed not being able to remove trait genes without a disk being inserted + into the dna manipulator diff --git a/html/changelogs/AutoChangeLog-pr-10073.yml b/html/changelogs/AutoChangeLog-pr-10073.yml deleted file mode 100644 index 6764500fe5..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10073.yml +++ /dev/null @@ -1,28 +0,0 @@ -author: "4dplanner, CRITAWAKETS, XDTM, ninjanomnom" -delete-after: True -changes: - - rscadd: "sepia slime extract has a delay before activating" - - balance: "the user of a sepia slime extract is no longer immune to the time field" - - balance: "chilling sepia is now the support extract - it always freezes the user, but not other marked people. give one to your golem!" - - rscadd: "burning sepia spawns the rewind camera. Take a selfie with someone and give it to them to make sure they remember the moment forever! You don't actually need to give them the photo, they'll remember anyway. Keep it as a reminder." - - rscadd: "rewinding (deja vu) effect resets your location to the turf you were on after 10 seconds as well as resetting limbs/mobs/objects damage to the point it was added." - - rscadd: "The deja vu effect cannot resurrect the dead, but will heal their corpse. New limbs fall off, old ones re-attach" - - rscadd: "Regenerative sepia cores add a deja vu effect before healing instead of a timestop -remove: timefreeze camera is admin spawn only." - - rscadd: "recurring sepia recalls to the hand of the last person to touch it after activating. Reusable timestop grenades!" - - tweak: "some special cameras don't prompt for customisation" - - bugfix: "timefreeze camera actually makes a photo" - - bugfix: "timestop stops pathing and mechs." - - bugfix: "adds a check to make sure simple_animals don't get their AI toggled while sentient" - - bugfix: "Adds the timestop overlay to frozen projectiles" - - bugfix: "Timestopped things have INFINITY move_resist as opposed to being anchored" - - bugfix: "Timestop will now unfreeze things that somehow leave it" - - bugfix: "mobs in the middle of a walk_to will have their walk stopped by timestop" - - bugfix: "mobs that are stunned will be stopped mid walk as well" - - bugfix: "pulling respects changes in move_force" - - bugfix: "swapping places respects move_force if the participant is not willing" - - bugfix: "timestop is properly defeated by antimagic." - - bugfix: "timestop only checks antimagic once" - - tweak: "Time stop now applies its visual effect on floors, walls and static structures (with no change otherwise)" - - tweak: "Movable structures are now anchored while time stopped." - - tweak: "Timestop effects now prevent speech." diff --git a/html/changelogs/AutoChangeLog-pr-10097.yml b/html/changelogs/AutoChangeLog-pr-10097.yml deleted file mode 100644 index 9b9a2c9a58..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10097.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Ghommie" -delete-after: True -changes: - - tweak: "Attached kevlar/soft/plastic padding accessories are now stealthier and will no longer be displayed on mob examine." diff --git a/html/changelogs/AutoChangeLog-pr-10112.yml b/html/changelogs/AutoChangeLog-pr-10112.yml deleted file mode 100644 index f09d8fa9ef..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10112.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Ghommie" -delete-after: True -changes: - - refactor: "Refactored that mess of a code for alternate worn clothing sprites for digitigrade and taurs." - - bugfix: "Fixed some issues with the aforementioned feature you may or may not have experienced because it was pretty lame." diff --git a/html/changelogs/AutoChangeLog-pr-10123.yml b/html/changelogs/AutoChangeLog-pr-10123.yml deleted file mode 100644 index 208b17b930..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10123.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "kevinz000" -delete-after: True -changes: - - rscadd: "throwing things no longer makes them randomly turned as long as you aren't on harm intent" diff --git a/html/changelogs/AutoChangeLog-pr-10125.yml b/html/changelogs/AutoChangeLog-pr-10125.yml deleted file mode 100644 index 951b69ccb3..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10125.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Kevinz000" -delete-after: True -changes: - - bugfix: "Fixes successful projectile hits also striking another atom on the same turf should the first one be not the target the projectile was meant for." - - rscdel: "Removes infinite reflector loops." diff --git a/html/changelogs/AutoChangeLog-pr-10165.yml b/html/changelogs/AutoChangeLog-pr-10165.yml deleted file mode 100644 index be6f9dedf7..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10165.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Ghommie" -delete-after: True -changes: - - bugfix: "Fixed missing digi versions fishnet sprites and wrong digitigrade left dir purple stockings sprite." - - imageadd: "Add digitigrade versions for boxers and the long johns." diff --git a/html/changelogs/AutoChangeLog-pr-10189.yml b/html/changelogs/AutoChangeLog-pr-10189.yml deleted file mode 100644 index 5889e127d2..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10189.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - rscadd: "Dynamic storytellers, a new voting paradigm for dynamic" - - rscadd: "Support for approval voting and condorcet (ranked choice) voting in server votes" diff --git a/html/changelogs/AutoChangeLog-pr-10191.yml b/html/changelogs/AutoChangeLog-pr-10191.yml deleted file mode 100644 index c1366727bd..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10191.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "kevinz000" -delete-after: True -changes: - - rscadd: "Custom holoforms have been added for pAIs and AIs. oh and cyborg holograms of specific modules too." - - balance: "pais are no longer indestructible-flagged while in card form. pai radios now short out if they are forcefully collapsed from damage." diff --git a/html/changelogs/AutoChangeLog-pr-10224.yml b/html/changelogs/AutoChangeLog-pr-10224.yml deleted file mode 100644 index b7d07abe5c..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10224.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Seris02" -delete-after: True -changes: - - tweak: "made it so trait blacklisting removes random positives instead of removing everything" diff --git a/html/changelogs/AutoChangeLog-pr-10238.yml b/html/changelogs/AutoChangeLog-pr-10238.yml deleted file mode 100644 index dda40c86c9..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10238.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: "SpaceManiac, bobbahbrown, ShizCalev, SpaceManiac (ported by Ghommie)" -delete-after: True -changes: - - code_imp: "It is now possible to set a different most-base-turf per z-level." - - spellcheck: "Removed unlawful reference to Disney's Star Wars franchise in map logging." - - tweak: "Moved mapping related errors to their own log file." - - bugfix: "Destruction on Lavaland will no longer reveal space in rare situations." diff --git a/html/changelogs/AutoChangeLog-pr-10247.yml b/html/changelogs/AutoChangeLog-pr-10247.yml deleted file mode 100644 index b78e5c415d..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10247.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Seris02" -delete-after: True -changes: - - rscadd: "added atmos holofirelocks and temperature blocking" - - tweak: "tweaked how atmos holofan looks" diff --git a/html/changelogs/AutoChangeLog-pr-10255.yml b/html/changelogs/AutoChangeLog-pr-10255.yml deleted file mode 100644 index ebaccd0af6..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10255.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Xantholne" -delete-after: True -changes: - - bugfix: "Christmas clothes that where missing stuff should work again" diff --git a/html/changelogs/AutoChangeLog-pr-10256.yml b/html/changelogs/AutoChangeLog-pr-10256.yml deleted file mode 100644 index eb14f716cc..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10256.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam" -delete-after: True -changes: - - rscadd: "Alcohol intolerance trait, which forces vomiting on any alcohol ingestion" diff --git a/html/changelogs/AutoChangeLog-pr-10270.yml b/html/changelogs/AutoChangeLog-pr-10270.yml deleted file mode 100644 index b47a249f9a..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10270.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Ghommie" -delete-after: True -changes: - - bugfix: "Fixed the secret sauce recipe being randomized every round." diff --git a/html/changelogs/AutoChangeLog-pr-10278.yml b/html/changelogs/AutoChangeLog-pr-10278.yml deleted file mode 100644 index 76ada12f20..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10278.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Trilbyspaceclone" -delete-after: True -changes: - - bugfix: "Fermi plushie can be made once again" diff --git a/html/changelogs/AutoChangeLog-pr-10285.yml b/html/changelogs/AutoChangeLog-pr-10285.yml deleted file mode 100644 index 89b0bbae43..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10285.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Ghommie" -delete-after: True -changes: - - bugfix: "Fixed singularity pulls duping rods out of engine floors." diff --git a/html/changelogs/AutoChangeLog-pr-10287.yml b/html/changelogs/AutoChangeLog-pr-10287.yml deleted file mode 100644 index f59cd0bd7f..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10287.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Ghommie" -delete-after: True -changes: - - rscdel: "Removed an old pair of zipties from the captain closet." diff --git a/html/changelogs/AutoChangeLog-pr-10301.yml b/html/changelogs/AutoChangeLog-pr-10301.yml deleted file mode 100644 index 2acac559e9..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10301.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Trilbyspaceclone" -delete-after: True -changes: - - tweak: "range on Engi Tray scanners and Rad-Scanners" diff --git a/html/changelogs/AutoChangeLog-pr-10306.yml b/html/changelogs/AutoChangeLog-pr-10306.yml deleted file mode 100644 index 9ab82dbda0..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10306.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Arturlang" -delete-after: True -changes: - - tweak: "Vampires are no longer as tanky" diff --git a/html/changelogs/AutoChangeLog-pr-10307.yml b/html/changelogs/AutoChangeLog-pr-10307.yml deleted file mode 100644 index 279dbe2840..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10307.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Seris02" -delete-after: True -changes: - - rscadd: "stunglasses" diff --git a/html/changelogs/AutoChangeLog-pr-10309.yml b/html/changelogs/AutoChangeLog-pr-10309.yml deleted file mode 100644 index a59ebff156..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10309.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Seris02" -delete-after: True -changes: - - rscadd: "disabler sechuds" diff --git a/html/changelogs/AutoChangeLog-pr-10319.yml b/html/changelogs/AutoChangeLog-pr-10319.yml deleted file mode 100644 index 88235aab8e..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10319.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Seris02" -delete-after: True -changes: - - rscadd: "adds coconut" - - rscadd: "adds a coconut bong" diff --git a/html/changelogs/AutoChangeLog-pr-10329.yml b/html/changelogs/AutoChangeLog-pr-10329.yml deleted file mode 100644 index e5d78ddf96..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10329.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Naksu" -delete-after: True -changes: - - code_imp: "reagent IDs have been removed in favor using reagent typepaths where applicable" - - bugfix: "mechas, borg hyposprays etc no longer display internal reagent ids to the player" diff --git a/html/changelogs/AutoChangeLog-pr-10330.yml b/html/changelogs/AutoChangeLog-pr-10330.yml deleted file mode 100644 index b2a46ef605..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10330.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "keronshb" -delete-after: True -changes: - - rscadd: "Adds new features for nanites" diff --git a/html/changelogs/AutoChangeLog-pr-10333.yml b/html/changelogs/AutoChangeLog-pr-10333.yml deleted file mode 100644 index b5c11a4646..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10333.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Trilbyspaceclone" -delete-after: True -changes: - - rscadd: "Grass now makes light beer when distilled" diff --git a/html/changelogs/AutoChangeLog-pr-10337.yml b/html/changelogs/AutoChangeLog-pr-10337.yml deleted file mode 100644 index 370a8fdc04..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10337.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Seris02" -delete-after: True -changes: - - rscadd: "Auto ooc" - - admin: "changed \"assume direct control\" from m.ckey = src.ckey to adminmob.transfer_ckey(M) so it works with auto ooc" diff --git a/html/changelogs/AutoChangeLog-pr-10339.yml b/html/changelogs/AutoChangeLog-pr-10339.yml deleted file mode 100644 index c313c4bf80..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10339.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Seris02" -delete-after: True -changes: - - rscadd: "telescopic IV drip" diff --git a/html/changelogs/AutoChangeLog-pr-10344.yml b/html/changelogs/AutoChangeLog-pr-10344.yml deleted file mode 100644 index e0381c6a43..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10344.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Ghommie" -delete-after: True -changes: - - bugfix: "Chestbursters won't delete the host's brain somewhat anymore." diff --git a/html/changelogs/AutoChangeLog-pr-10345.yml b/html/changelogs/AutoChangeLog-pr-10345.yml deleted file mode 100644 index a95653cdda..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10345.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Trilbyspaceclone" -delete-after: True -changes: - - tweak: "allows bandoliers to hold any ammo type as long as it has a casing" diff --git a/html/changelogs/AutoChangeLog-pr-10346.yml b/html/changelogs/AutoChangeLog-pr-10346.yml deleted file mode 100644 index 3a0cd6dae4..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10346.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "Bhijn" -delete-after: True -changes: - - rscadd: "Limbs now regenerate their stamina faster while disabled" - - rscadd: "Limbs now have the same incoming stamina damage multiplier mechanics as spacemen, where the more staminaloss they take while disabled, the less staminaloss they'll take." - - balance: "Limbs have had their base stamina regen rate doubled to match the doubled stamina regen rate of standard spacemen." diff --git a/html/changelogs/AutoChangeLog-pr-10347.yml b/html/changelogs/AutoChangeLog-pr-10347.yml deleted file mode 100644 index c0508aa279..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10347.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "deathride58" -delete-after: True -changes: - - balance: "The stamina buffer no longer uses stamina while recharging." diff --git a/html/changelogs/AutoChangeLog-pr-10349.yml b/html/changelogs/AutoChangeLog-pr-10349.yml deleted file mode 100644 index fad3179c6e..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10349.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "KathrinBailey" -delete-after: True -changes: - - rscadd: "Empty engineering lockers for mappers." - - rscadd: "Industrial welding tools to the engineer welding locker." - - rscdel: "Removed the multitool, airlock painter, mechanical toolbox, brown sneakers, hazard vest and airlock painter from the CE's locker." diff --git a/html/changelogs/AutoChangeLog-pr-10350.yml b/html/changelogs/AutoChangeLog-pr-10350.yml deleted file mode 100644 index 580f1d68cf..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10350.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - rscadd: "Ghost cafe mobs can now ghostize" - - rscadd: "Ghost cafe now has a cremator" - - rscadd: "Ghost cafe mobs are now eligible for ghost roles" - - refactor: "Ghost roles now use an element for eligibility purposes" diff --git a/html/changelogs/AutoChangeLog-pr-10356.yml b/html/changelogs/AutoChangeLog-pr-10356.yml deleted file mode 100644 index 1016b559ee..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10356.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Bhijn" -delete-after: True -changes: - - rscadd: "Added a preference to make the sprint hotkey be a toggle instead of a hold bind" - - rscadd: "Added a preference to bind the sprint hotkey to space instead of shift." diff --git a/html/changelogs/AutoChangeLog-pr-10357.yml b/html/changelogs/AutoChangeLog-pr-10357.yml deleted file mode 100644 index 048baa3041..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10357.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - bugfix: "You can toggle some prefs properly now." diff --git a/html/changelogs/AutoChangeLog-pr-10358.yml b/html/changelogs/AutoChangeLog-pr-10358.yml deleted file mode 100644 index a578e6e336..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10358.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Trilbyspaceclone" -delete-after: True -changes: - - server: "Cleans out the last years of changlogs" diff --git a/html/changelogs/AutoChangeLog-pr-10361.yml b/html/changelogs/AutoChangeLog-pr-10361.yml deleted file mode 100644 index 0224bdcb49..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10361.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "CameronWoof" -delete-after: True -changes: - - rscadd: "Ghost Cafe patrons now spawn with chameleon kits. Dress up! Be fancy!" diff --git a/html/changelogs/AutoChangeLog-pr-10362.yml b/html/changelogs/AutoChangeLog-pr-10362.yml deleted file mode 100644 index f92e16302a..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10362.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Trilbyspaceclone" -delete-after: True -changes: - - bugfix: "rouge cases of #$39; in bottle/pill/patch/condiments" diff --git a/html/changelogs/AutoChangeLog-pr-10364.yml b/html/changelogs/AutoChangeLog-pr-10364.yml deleted file mode 100644 index 8834c494ad..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10364.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "kevinz000" -delete-after: True -changes: - - bugfix: "telescopic iv drips now have the proper sanity checks for deployment." diff --git a/html/changelogs/AutoChangeLog-pr-10365.yml b/html/changelogs/AutoChangeLog-pr-10365.yml deleted file mode 100644 index f7ba047fc7..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10365.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - bugfix: "no ass slap is no longer the same thing as no aphro" diff --git a/html/changelogs/AutoChangeLog-pr-10366.yml b/html/changelogs/AutoChangeLog-pr-10366.yml deleted file mode 100644 index ec8d234edd..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10366.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Hatterhat" -delete-after: True -changes: - - balance: "Beakers are generally more useful now, with slight capacity increases." - - tweak: "Transfer amounts are different now. Adjust your muscle memory to compensate." diff --git a/html/changelogs/AutoChangeLog-pr-10368.yml b/html/changelogs/AutoChangeLog-pr-10368.yml deleted file mode 100644 index e6486f2815..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10368.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Hatterhat" -delete-after: True -changes: - - balance: "ore redemption machines actually get affected by lasers again kthx" diff --git a/html/changelogs/AutoChangeLog-pr-10369.yml b/html/changelogs/AutoChangeLog-pr-10369.yml deleted file mode 100644 index c292d948fb..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10369.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Hatterhat" -delete-after: True -changes: - - tweak: "crusher trophy drop chance on mining mobs increased to 1 in 4 (from 1 in 20)" diff --git a/html/changelogs/AutoChangeLog-pr-10370.yml b/html/changelogs/AutoChangeLog-pr-10370.yml deleted file mode 100644 index 6674fd2e17..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10370.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Hatterhat" -delete-after: True -changes: - - bugfix: "Blood-drunk buff from blood-drunk eye crusher trophy is less likely to cripple its user." diff --git a/html/changelogs/AutoChangeLog-pr-10371.yml b/html/changelogs/AutoChangeLog-pr-10371.yml deleted file mode 100644 index e4322d70f1..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10371.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "kappa-sama" -delete-after: True -changes: - - rscadd: "loot crates in cargo contraband" diff --git a/html/changelogs/AutoChangeLog-pr-10372.yml b/html/changelogs/AutoChangeLog-pr-10372.yml deleted file mode 100644 index 6bb60c3d8d..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10372.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Hatterhat" -delete-after: True -changes: - - tweak: "Forcefield projectors now fit on toolbelts." - - imageadd: "New sprites for ATMOS holofan and forcefield projectors!" diff --git a/html/changelogs/AutoChangeLog-pr-10374.yml b/html/changelogs/AutoChangeLog-pr-10374.yml deleted file mode 100644 index 376f49a4d4..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10374.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Bhijn helped" -delete-after: True -changes: - - bugfix: "Fixes Dragon's Tooth Sword 50% armor penetration by making it 35%" diff --git a/html/changelogs/AutoChangeLog-pr-10375.yml b/html/changelogs/AutoChangeLog-pr-10375.yml deleted file mode 100644 index 7d0cc2bf44..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10375.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "r4d6" -delete-after: True -changes: - - rscadd: "Added a Radiation Hardsuit" - - rscadd: "Added a Radiation Hardsuit crate" diff --git a/html/changelogs/AutoChangeLog-pr-10378.yml b/html/changelogs/AutoChangeLog-pr-10378.yml deleted file mode 100644 index c7ab7d42c1..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10378.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "EmeraldSundisk" -delete-after: True -changes: - - rscadd: "Adds a sign outside MetaStation's custodial closet" diff --git a/html/changelogs/AutoChangeLog-pr-10379.yml b/html/changelogs/AutoChangeLog-pr-10379.yml deleted file mode 100644 index 9623f815d6..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10379.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Ryll/Shaps, ported by Hatterhat" -delete-after: True -changes: - - rscadd: "Point-blanking people with shotguns actually throws them backwards!" diff --git a/html/changelogs/AutoChangeLog-pr-10380.yml b/html/changelogs/AutoChangeLog-pr-10380.yml deleted file mode 100644 index 4604329137..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10380.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "Unit2E & JMoldy, ported by Hatterhat" -delete-after: True -changes: - - balance: "the powerfist now punches people away at high velocity depending on setting." - - rscadd: "the powerfist now leaks the gas it uses onto the tile you're on." - - tweak: "Adds weak punch variations for empty and near-empty punching." diff --git a/html/changelogs/AutoChangeLog-pr-10383.yml b/html/changelogs/AutoChangeLog-pr-10383.yml deleted file mode 100644 index c6787bbafe..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10383.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "kevinz000" -delete-after: True -changes: - - bugfix: "megafauna can hear again" diff --git a/html/changelogs/AutoChangeLog-pr-10384.yml b/html/changelogs/AutoChangeLog-pr-10384.yml deleted file mode 100644 index 315a62dadd..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10384.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "Tlaltecuhtli, Nemvar, Trilby, Hatterhat" -delete-after: True -changes: - - rscadd: "russian surplus crate, sec ammo crate, meat/veggie/fruit crate, rped crate, bomb suit crate, bio suit crate, parrot crate, chem crate, db crate" - - tweak: "lowered price of some crates which are overpriced for no reason aka the tablet crate and the mech circuits crates, track implant crate has also track .38 ammo" - - bugfix: "sectech vendor has a refill pack" diff --git a/html/changelogs/AutoChangeLog-pr-10388.yml b/html/changelogs/AutoChangeLog-pr-10388.yml deleted file mode 100644 index fd06a5db3f..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10388.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "CameronWoof" -delete-after: True -changes: - - rscadd: "Robots can now check the crew manifest from anywhere with the \"View Crew Manifest\" verb." diff --git a/html/changelogs/AutoChangeLog-pr-10399.yml b/html/changelogs/AutoChangeLog-pr-10399.yml deleted file mode 100644 index cbdb00630c..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10399.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "kevinz000" -delete-after: True -changes: - - balance: "Cargo passive gen is now 500 down from 750." diff --git a/html/changelogs/AutoChangeLog-pr-10401.yml b/html/changelogs/AutoChangeLog-pr-10401.yml deleted file mode 100644 index 2aa8d91244..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10401.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "r4d6" -delete-after: True -changes: - - rscadd: "Added 3 SM Engine variations." diff --git a/html/changelogs/AutoChangeLog-pr-10403.yml b/html/changelogs/AutoChangeLog-pr-10403.yml deleted file mode 100644 index 321789a546..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10403.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "r4d6" -delete-after: True -changes: - - rscadd: "Added a way to make opaque plastic flaps -change: Change the already existing flap recipe to show that they are see-through" diff --git a/html/changelogs/AutoChangeLog-pr-10404.yml b/html/changelogs/AutoChangeLog-pr-10404.yml deleted file mode 100644 index 5f88a991ff..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10404.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Xantholne" -delete-after: True -changes: - - tweak: "Christmas clothes moved from clothesmate and loadout to premium autodrobe, hoodies and boots remain." diff --git a/html/changelogs/AutoChangeLog-pr-10410.yml b/html/changelogs/AutoChangeLog-pr-10410.yml deleted file mode 100644 index c6c9d24749..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10410.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "CameronWoof" -delete-after: True -changes: - - tweak: "Lizard tails are now viable options for humans and anthromorphs." diff --git a/html/changelogs/AutoChangeLog-pr-10412.yml b/html/changelogs/AutoChangeLog-pr-10412.yml deleted file mode 100644 index b838dbb680..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10412.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Linzolle" -delete-after: True -changes: - - bugfix: "fixes matchboxes runtiming every time they spawn" diff --git a/html/changelogs/AutoChangeLog-pr-10413.yml b/html/changelogs/AutoChangeLog-pr-10413.yml deleted file mode 100644 index 6d6378675b..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10413.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "nik707" -delete-after: True -changes: - - tweak: "engraving light_power from 1 to 0.3" diff --git a/html/changelogs/AutoChangeLog-pr-10414.yml b/html/changelogs/AutoChangeLog-pr-10414.yml new file mode 100644 index 0000000000..25750a889d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10414.yml @@ -0,0 +1,4 @@ +author: "CameronWoof" +delete-after: True +changes: + - tweak: "Lighting looks better now. I can say that because the PR wouldn't be merged and you wouldn't be reading this if it wasn't true." diff --git a/html/changelogs/AutoChangeLog-pr-10416.yml b/html/changelogs/AutoChangeLog-pr-10416.yml deleted file mode 100644 index 13432b283c..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10416.yml +++ /dev/null @@ -1,10 +0,0 @@ -author: "r4d6" -delete-after: True -changes: - - rscadd: "Animations for the RCD" - - bugfix: "Said animations being pulled by the Singulo" - - balance: "Prevent Reinforced Doors from being RCD'ed" - - bugfix: "Deconstructing Floors now cost MUs like everything else" - - tweak: "changed the RCD's upgrades into flags" - - rscadd: "Allow RCDs to print APC, Firelocks and Fire Alarms with the right upgrade" - - balance: "Allow Engineers to print RCDs and RPDs from their protolathe without needing to hack one." diff --git a/html/changelogs/AutoChangeLog-pr-10417.yml b/html/changelogs/AutoChangeLog-pr-10417.yml deleted file mode 100644 index 31ac154ac9..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10417.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: "kevinz000" -delete-after: True -changes: - - config: "Added a few more nightshift config entries" - - rscadd: "nightshift_public_area variable in areas to determine how public an area is." - - rscadd: "NIGHT_SHIFT_PUBLIC_AREAS_ONLY config entry allows the server to be configured to only nightshift areas of that level and below (so areas that are more public)" - - rscadd: "Config entries added for requiring authorizations to toggle nightshift. Defaults to only requiring on public areas as determined by above" diff --git a/html/changelogs/AutoChangeLog-pr-10420.yml b/html/changelogs/AutoChangeLog-pr-10420.yml deleted file mode 100644 index b719eca84c..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10420.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "MrJWhit" -delete-after: True -changes: - - tweak: "Increases plasma usage in radiation collectors" diff --git a/html/changelogs/AutoChangeLog-pr-10427.yml b/html/changelogs/AutoChangeLog-pr-10427.yml deleted file mode 100644 index 5f4fe73988..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10427.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Hatterhat" -delete-after: True -changes: - - tweak: "tweaks some values around with beaker transfer amounts, adds a transfer value verb (altclick)" diff --git a/html/changelogs/AutoChangeLog-pr-10428.yml b/html/changelogs/AutoChangeLog-pr-10428.yml deleted file mode 100644 index 2cd635d0a2..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10428.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - balance: "Devastating bombs kills bomb armor'd mobs again" diff --git a/html/changelogs/AutoChangeLog-pr-10429.yml b/html/changelogs/AutoChangeLog-pr-10429.yml deleted file mode 100644 index cc83f8abb6..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10429.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Trilbyspaceclone" -delete-after: True -changes: - - tweak: "Adds missing but needed flags to MASON RIG" diff --git a/html/changelogs/AutoChangeLog-pr-10430.yml b/html/changelogs/AutoChangeLog-pr-10430.yml deleted file mode 100644 index 4fd03a5b2b..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10430.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "kevinz000" -delete-after: True -changes: - - balance: "nuclear fist buffed." diff --git a/html/changelogs/AutoChangeLog-pr-10432.yml b/html/changelogs/AutoChangeLog-pr-10432.yml deleted file mode 100644 index a0b40baa45..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10432.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Trilbyspaceclone" -delete-after: True -changes: - - bugfix: "missing sprites with crushed cans" diff --git a/html/changelogs/AutoChangeLog-pr-10433.yml b/html/changelogs/AutoChangeLog-pr-10433.yml deleted file mode 100644 index 036e74a804..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10433.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "kevinz000" -delete-after: True -changes: - - balance: "cogscarabs are now fulltile-hitbox." diff --git a/html/changelogs/AutoChangeLog-pr-10435.yml b/html/changelogs/AutoChangeLog-pr-10435.yml deleted file mode 100644 index 6b684a57a5..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10435.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "FantasticFwoosh, ported by Hatterhat" -delete-after: True -changes: - - rscadd: "Both reagent universal enzyme & sacks of flour are now available for their respective costs from the biogenerator." - - rscadd: "New crafting recipies for donut boxes, eggboxes & candle boxes have been added to cardboard recipes for the collective benefit of service personnel and the station." diff --git a/html/changelogs/AutoChangeLog-pr-10437.yml b/html/changelogs/AutoChangeLog-pr-10437.yml deleted file mode 100644 index ee454f47b9..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10437.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Ghommie" -delete-after: True -changes: - - bugfix: "Fixed roundstart mushpeople being unable to MUSH PUUUUUUUUUUUUNCH!!" diff --git a/html/changelogs/AutoChangeLog-pr-10439.yml b/html/changelogs/AutoChangeLog-pr-10439.yml deleted file mode 100644 index 92b151b883..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10439.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "LetterN" -delete-after: True -changes: - - rscadd: "Doppler logs" diff --git a/html/changelogs/AutoChangeLog-pr-10440.yml b/html/changelogs/AutoChangeLog-pr-10440.yml deleted file mode 100644 index e942f4056f..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10440.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - rscadd: "Added a sort of \"game mode ban\" by way of having people rank their game modes favorite to least favorite after the secret/extended vote." - - bugfix: "Turns out the schulze scoring was written wrong and it was setting things to 0 that shouldn't have been, so that's fixed." diff --git a/html/changelogs/AutoChangeLog-pr-10450.yml b/html/changelogs/AutoChangeLog-pr-10450.yml deleted file mode 100644 index d2c5d8b40a..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10450.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "kevinz000" -delete-after: True -changes: - - balance: "emitters are now hitscan" diff --git a/html/changelogs/AutoChangeLog-pr-10452.yml b/html/changelogs/AutoChangeLog-pr-10452.yml deleted file mode 100644 index e51b9ff752..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10452.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Ghommie" -delete-after: True -changes: - - bugfix: "Lattices can be examined yet again." diff --git a/html/changelogs/AutoChangeLog-pr-10454.yml b/html/changelogs/AutoChangeLog-pr-10454.yml deleted file mode 100644 index d89603959e..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10454.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Commandersand" -delete-after: True -changes: - - bugfix: "fixed some clothnig sprites" diff --git a/html/changelogs/AutoChangeLog-pr-10456.yml b/html/changelogs/AutoChangeLog-pr-10456.yml deleted file mode 100644 index 4c94455e47..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10456.yml +++ /dev/null @@ -1,12 +0,0 @@ -author: "Putnam" -delete-after: True -changes: - - rscdel: "Arousal damage is gone, and with it the arousal damage heart on the UI." - - rscdel: "As exhibitionist relied on arousal damage, that's gone too." - - rscdel: "Bonermeter and electronic stimulation circuit modules are gone." - - rscdel: "Masturbation is no longer an option in the climax menu. It was identical to climax alone in every way but text. Emote it out." - - rscadd: "Arousal on genitals can now be displayed manually, on a case-by-case basis." - - rscadd: "\"Climax alone\" and \"climax with partner\" now only display to the people directly involved in the interaction. -rework: Catnip tea, catnip, crocin, hexacrocin, camphor, hexacamphor all had functions or bits of functions reworked." - - tweak: "\"Climax with partner\" now requires consent from both parties--it can no longer be used on mindless mobs, and it asks the mob getting climaxed with if they consent first." - - tweak: "A lot of MKUltra behaviors have been moved to hypno checks or removed due to reliance on maso/nympho/exhib." diff --git a/html/changelogs/AutoChangeLog-pr-10457.yml b/html/changelogs/AutoChangeLog-pr-10457.yml deleted file mode 100644 index 203842b0b6..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10457.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "r4d6" -delete-after: True -changes: - - rscadd: "Added a playback device" - - bugfix: "Made the Voice Analyzer actually care about languages" diff --git a/html/changelogs/AutoChangeLog-pr-10459.yml b/html/changelogs/AutoChangeLog-pr-10459.yml deleted file mode 100644 index 77de8eb193..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10459.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam" -delete-after: True -changes: - - rscadd: "Cold-blooded quirk" diff --git a/html/changelogs/AutoChangeLog-pr-10463.yml b/html/changelogs/AutoChangeLog-pr-10463.yml deleted file mode 100644 index 70e97975ce..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10463.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - config: "Random engines are now weighted." diff --git a/html/changelogs/AutoChangeLog-pr-10465.yml b/html/changelogs/AutoChangeLog-pr-10465.yml deleted file mode 100644 index 26dff901b2..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10465.yml +++ /dev/null @@ -1,8 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - rscadd: "Ghost dojo now has an autoylathe." - - rscdel: "Ghost dojo no longer has VR or modular computer access." - - tweak: "Ghost dojo mobs are pacifists." - - tweak: "Ghost dojo booze-o-mat is now all access." - - bugfix: "Ghost dojo crematorium now has a button." diff --git a/html/changelogs/AutoChangeLog-pr-10467.yml b/html/changelogs/AutoChangeLog-pr-10467.yml deleted file mode 100644 index 7fa379f088..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10467.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Seris02" -delete-after: True -changes: - - bugfix: "cardboard box speed" diff --git a/html/changelogs/AutoChangeLog-pr-10468.yml b/html/changelogs/AutoChangeLog-pr-10468.yml deleted file mode 100644 index 055411d0f2..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10468.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "kevinz000" -delete-after: True -changes: - - rscadd: "Ghosting no longer stops abductors from using you." diff --git a/html/changelogs/AutoChangeLog-pr-10472.yml b/html/changelogs/AutoChangeLog-pr-10472.yml deleted file mode 100644 index 9404d70b7b..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10472.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "keronshb" -delete-after: True -changes: - - bugfix: "fixed the missing icons from Dermal Button nanites" diff --git a/html/changelogs/AutoChangeLog-pr-10473.yml b/html/changelogs/AutoChangeLog-pr-10473.yml deleted file mode 100644 index f1821a3cce..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10473.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Bhijn" -delete-after: True -changes: - - bugfix: "server_hop can no longer be used to remotely lobotomize a spaceman" diff --git a/html/changelogs/AutoChangeLog-pr-10474.yml b/html/changelogs/AutoChangeLog-pr-10474.yml deleted file mode 100644 index ae7b5b3fcb..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10474.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - bugfix: "Traitor objectives don't take a dump when they try to add an assassinate anymore" - - admin: "Objective removal with antag panel no longer commented out silently while still being an option that gives useful feedback on stuff it's not doing in any respect" diff --git a/html/changelogs/AutoChangeLog-pr-10478.yml b/html/changelogs/AutoChangeLog-pr-10478.yml deleted file mode 100644 index b174a5e8ee..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10478.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Seris02" -delete-after: True -changes: - - tweak: "makes gorilla shuttle emag only" diff --git a/html/changelogs/AutoChangeLog-pr-10480.yml b/html/changelogs/AutoChangeLog-pr-10480.yml deleted file mode 100644 index 7ecfd7057e..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10480.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - rscadd: "Second, temporary flavor text!" diff --git a/html/changelogs/AutoChangeLog-pr-10481.yml b/html/changelogs/AutoChangeLog-pr-10481.yml deleted file mode 100644 index c884a45ec9..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10481.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "dapnee" -delete-after: True -changes: - - imageadd: "new toxin's uniform and accessories" - - imagedel: "old toxin's uniform and accessories" diff --git a/html/changelogs/AutoChangeLog-pr-10482.yml b/html/changelogs/AutoChangeLog-pr-10482.yml deleted file mode 100644 index e97c8870d4..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10482.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "kappa-sama" -delete-after: True -changes: - - code_imp: "modular_citadel file movement" diff --git a/html/changelogs/AutoChangeLog-pr-10483.yml b/html/changelogs/AutoChangeLog-pr-10483.yml deleted file mode 100644 index 1f016b1591..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10483.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - bugfix: "Limb damage works now" diff --git a/html/changelogs/AutoChangeLog-pr-10485.yml b/html/changelogs/AutoChangeLog-pr-10485.yml deleted file mode 100644 index 6bf082f8ba..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10485.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Detective-Google" -delete-after: True -changes: - - tweak: "replaced the sprites with new ones requested." diff --git a/html/changelogs/AutoChangeLog-pr-10486.yml b/html/changelogs/AutoChangeLog-pr-10486.yml deleted file mode 100644 index 448bbc162c..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10486.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Seris02" -delete-after: True -changes: - - tweak: "changed where the observe verb is." diff --git a/html/changelogs/AutoChangeLog-pr-10489.yml b/html/changelogs/AutoChangeLog-pr-10489.yml deleted file mode 100644 index 4e393bd4b1..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10489.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Seris02" -delete-after: True -changes: - - tweak: "the way chameleon clothes update on change" - - bugfix: "chameleon cloak icon" diff --git a/html/changelogs/AutoChangeLog-pr-10492.yml b/html/changelogs/AutoChangeLog-pr-10492.yml deleted file mode 100644 index de6ab309ab..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10492.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Trilbyspaceclone" -delete-after: True -changes: - - rscadd: "Glitter is now makeable with ground plastic and some crayons" diff --git a/html/changelogs/AutoChangeLog-pr-10493.yml b/html/changelogs/AutoChangeLog-pr-10493.yml deleted file mode 100644 index 201eaad5b5..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10493.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - tweak: "Score instead of ranked choice for mode tiers" diff --git a/html/changelogs/AutoChangeLog-pr-10495.yml b/html/changelogs/AutoChangeLog-pr-10495.yml deleted file mode 100644 index 02ffedf5fc..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10495.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "kevinz000" -delete-after: True -changes: - - rscadd: "guests can now looc" diff --git a/html/changelogs/AutoChangeLog-pr-10497.yml b/html/changelogs/AutoChangeLog-pr-10497.yml deleted file mode 100644 index 5acb6f8c47..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10497.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Trilbyspaceclone" -delete-after: True -changes: - - code_imp: "Makes more folders and files for uplink." diff --git a/html/changelogs/AutoChangeLog-pr-10498.yml b/html/changelogs/AutoChangeLog-pr-10498.yml deleted file mode 100644 index 986abc77c2..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10498.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "kevinz000" -delete-after: True -changes: - - tweak: "tableslamming has 0.4 second cooldown instead of 0.8" diff --git a/html/changelogs/AutoChangeLog-pr-10501.yml b/html/changelogs/AutoChangeLog-pr-10501.yml deleted file mode 100644 index 27e7ddbb8e..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10501.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Putnam" -delete-after: True -changes: - - rscadd: "Two relief valves for atmospherics, available in your RPD today: a unary one that opens to air and a binary one that connects two pipenets, like a manual valve." - - tweak: "The atmos waste outlet injector on box has been replaced with an atmos waste relief valve." diff --git a/html/changelogs/AutoChangeLog-pr-10503.yml b/html/changelogs/AutoChangeLog-pr-10503.yml deleted file mode 100644 index b067aa6c55..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10503.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "r4d6" -delete-after: True -changes: - - bugfix: "fixed SM's piping" diff --git a/html/changelogs/AutoChangeLog-pr-10504.yml b/html/changelogs/AutoChangeLog-pr-10504.yml deleted file mode 100644 index 7e35ac6e72..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10504.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Xantholne" -delete-after: True -changes: - - rscadd: "Botany bee pet, Bumbles" - - rscadd: "New bee models that aren't 1 tile big of 0 opacity pixels" diff --git a/html/changelogs/AutoChangeLog-pr-10505.yml b/html/changelogs/AutoChangeLog-pr-10505.yml deleted file mode 100644 index dd0932c50e..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10505.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "LetterN" -delete-after: True -changes: - - tweak: "Shockcolar and electropack uses the new signaler ui" - - tweak: "Renaming shockcolar requires a pen" diff --git a/html/changelogs/AutoChangeLog-pr-10507.yml b/html/changelogs/AutoChangeLog-pr-10507.yml deleted file mode 100644 index 70d82d9cf6..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10507.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "LetterN" -delete-after: True -changes: - - rscadd: "Adds banjo" diff --git a/html/changelogs/AutoChangeLog-pr-10509.yml b/html/changelogs/AutoChangeLog-pr-10509.yml deleted file mode 100644 index 4e1ede0631..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10509.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Ghommie" -delete-after: True -changes: - - bugfix: "Made reagent containers examine text less annoying." diff --git a/html/changelogs/AutoChangeLog-pr-10511.yml b/html/changelogs/AutoChangeLog-pr-10511.yml deleted file mode 100644 index 5f3bf739cb..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10511.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "kevinz000" -delete-after: True -changes: - - bugfix: "health analyzers now work" diff --git a/html/changelogs/AutoChangeLog-pr-10513.yml b/html/changelogs/AutoChangeLog-pr-10513.yml deleted file mode 100644 index 6428c4e281..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10513.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "r4d6" -delete-after: True -changes: - - rscadd: "Added a message when pulsing the open wire." diff --git a/html/changelogs/AutoChangeLog-pr-10516.yml b/html/changelogs/AutoChangeLog-pr-10516.yml deleted file mode 100644 index 39dd05a4db..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10516.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "BonniePandora" -delete-after: True -changes: - - admin: "Added another SDQL option. Using \"UPDATE selectors SET #null=value\" will now resolve value and discard the return. This is useful if you only care about the side effect of a proc." diff --git a/html/changelogs/AutoChangeLog-pr-10518.yml b/html/changelogs/AutoChangeLog-pr-10518.yml deleted file mode 100644 index 29de186e50..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10518.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "Seris02" -delete-after: True -changes: - - balance: "Explosions now cause knockdown instead of KOs, with the amount of time scaling off bomb armor. Heavy explosions still cause a ~2 second KO for follow up attacks." - - balance: "Devastating explosions now no longer gib players with more than 50 bomb armor. This used to be more or less random depending on the amount of bomb armor." - - code_imp: "Removed reagent explosion code that would trigger for <1 amount reactions." diff --git a/html/changelogs/AutoChangeLog-pr-10520.yml b/html/changelogs/AutoChangeLog-pr-10520.yml deleted file mode 100644 index ae23c082d8..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10520.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: "Denton, ported by Hatterhat" -delete-after: True -changes: - - tweak: "Most upgradeable machines now show their upgrade status when examined while standing right next to them." - - tweak: "Added examine messages to teleporter stations that hint at their multitool/wirecutter interactions." - - tweak: "Renamed teleporter stations from station to teleporter station." - - code_imp: "Changed the teleporter hub accurate var to accuracy; the old name misled people into thinking that it was a boolean." diff --git a/html/changelogs/AutoChangeLog-pr-10522.yml b/html/changelogs/AutoChangeLog-pr-10522.yml deleted file mode 100644 index b03b990762..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10522.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Hatterhat" -delete-after: True -changes: - - rscadd: "Syndicate sleepers (read: the ones that're red and have controls in them) can now be recreated with a sufficient basis in nonstandard (read: illegal) technologies!" diff --git a/html/changelogs/AutoChangeLog-pr-10523.yml b/html/changelogs/AutoChangeLog-pr-10523.yml deleted file mode 100644 index 999fc1dd92..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10523.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Hatterhat" -delete-after: True -changes: - - bugfix: "Explorer hoods on standard explorer suits can be reinforced with goliath hide plates again." diff --git a/html/changelogs/AutoChangeLog-pr-10526.yml b/html/changelogs/AutoChangeLog-pr-10526.yml deleted file mode 100644 index d5f9b8f1b0..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10526.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Seris02" -delete-after: True -changes: - - rscadd: "traitor tool for bowmanizing headsets + bowmanizing headsets" diff --git a/html/changelogs/AutoChangeLog-pr-10530.yml b/html/changelogs/AutoChangeLog-pr-10530.yml deleted file mode 100644 index 16cc66adb9..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10530.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "kappa-sama" -delete-after: True -changes: - - code_imp: "modular citadel loses some files" diff --git a/html/changelogs/AutoChangeLog-pr-10531.yml b/html/changelogs/AutoChangeLog-pr-10531.yml deleted file mode 100644 index 6c1125a687..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10531.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "Trilbyspaceclone" -delete-after: True -changes: - - rscadd: "Seed packs now have RnD points inside them" - - rscadd: "New tips that reflect the now use seed packs have for Rnd / Chems affect on plants" - - code_imp: "Made the research file look nice rather then an eye harming list" diff --git a/html/changelogs/AutoChangeLog-pr-10532.yml b/html/changelogs/AutoChangeLog-pr-10532.yml deleted file mode 100644 index cf742b47f7..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10532.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "Ghommie" -delete-after: True -changes: - - bugfix: "Virus food dispensers dispense virus food again." - - bugfix: "Borg hypos inputs do not display typepaths anymore." - - bugfix: "Restored chem dispensers alphabetical order." diff --git a/html/changelogs/AutoChangeLog-pr-10535.yml b/html/changelogs/AutoChangeLog-pr-10535.yml deleted file mode 100644 index db37120317..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10535.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Hatterhat" -delete-after: True -changes: - - rscadd: "A shipment of Staff Assistant jumpsuits from the Goon-operated stations appear to have made their way into your loadout selections - and into the contraband list from ClothesMates..." diff --git a/html/changelogs/AutoChangeLog-pr-10538.yml b/html/changelogs/AutoChangeLog-pr-10538.yml deleted file mode 100644 index 01119f886f..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10538.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - bugfix: "Chemistry not :b:roke" diff --git a/html/changelogs/AutoChangeLog-pr-10539.yml b/html/changelogs/AutoChangeLog-pr-10539.yml deleted file mode 100644 index 66a03ee573..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10539.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Savotta" -delete-after: True -changes: - - rscadd: "snout" - - imageadd: "snout" diff --git a/html/changelogs/AutoChangeLog-pr-10544.yml b/html/changelogs/AutoChangeLog-pr-10544.yml deleted file mode 100644 index a27ffad716..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10544.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "AffectedArc07" -delete-after: True -changes: - - code_imp: "All code files are now in the LF line format, please stick to it" diff --git a/html/changelogs/AutoChangeLog-pr-10546.yml b/html/changelogs/AutoChangeLog-pr-10546.yml deleted file mode 100644 index a49c2027e5..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10546.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "r4d6" -delete-after: True -changes: - - bugfix: "fixed being able to use a playback device and a voice analyzer to activate each others" diff --git a/html/changelogs/AutoChangeLog-pr-10547.yml b/html/changelogs/AutoChangeLog-pr-10547.yml deleted file mode 100644 index 41d255e991..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10547.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - tweak: "Ghost dojo spawns will dust if their owner suicides or uses the \"ghost\" verb." diff --git a/html/changelogs/AutoChangeLog-pr-10549.yml b/html/changelogs/AutoChangeLog-pr-10549.yml deleted file mode 100644 index 11a770945d..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10549.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Seris02" -delete-after: True -changes: - - rscadd: "durathread winter coats from hyper station" diff --git a/html/changelogs/AutoChangeLog-pr-10552.yml b/html/changelogs/AutoChangeLog-pr-10552.yml deleted file mode 100644 index 846667ea2a..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10552.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Tupinambis" -delete-after: True -changes: - - tweak: "Replaces new fire alarms with a slightly updated version of the old ones." - - bugfix: "Fixed bug where Amber alert had no proper alert lights, and red alert had amber lights." diff --git a/html/changelogs/AutoChangeLog-pr-10556.yml b/html/changelogs/AutoChangeLog-pr-10556.yml deleted file mode 100644 index af42a9eee6..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10556.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "AffectedArc07" -delete-after: True -changes: - - tweak: "Added CI step to check for CRLF files" diff --git a/html/changelogs/AutoChangeLog-pr-10557.yml b/html/changelogs/AutoChangeLog-pr-10557.yml deleted file mode 100644 index f5b37f6cee..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10557.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "timothyteakettle" -delete-after: True -changes: - - bugfix: "fixed not being able to remove trait genes without a disk being inserted into the dna manipulator" diff --git a/html/changelogs/AutoChangeLog-pr-10558.yml b/html/changelogs/AutoChangeLog-pr-10558.yml deleted file mode 100644 index 09186767f3..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10558.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "DeltaFire15" -delete-after: True -changes: - - bugfix: "Vitality matrixes now correctly succ slimes" diff --git a/html/changelogs/AutoChangeLog-pr-10563.yml b/html/changelogs/AutoChangeLog-pr-10563.yml deleted file mode 100644 index 5efc4cfdb1..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10563.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Trilbyspaceclone" -delete-after: True -changes: - - bugfix: "Fixed fragile space suits breaking from weak and non-damaging \"weapons\" (such as the Sord, toys and foam darts)." diff --git a/html/changelogs/AutoChangeLog-pr-10567.yml b/html/changelogs/AutoChangeLog-pr-10567.yml deleted file mode 100644 index 9d73d1d947..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10567.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Ghommie" -delete-after: True -changes: - - bugfix: "Sanitized cargo export messages for reagents." diff --git a/html/changelogs/AutoChangeLog-pr-10568.yml b/html/changelogs/AutoChangeLog-pr-10568.yml deleted file mode 100644 index 6916f1289f..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10568.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "r4d6" -delete-after: True -changes: - - rscadd: "added passive vent to the arsenal of atmospheric devices." diff --git a/html/changelogs/AutoChangeLog-pr-10569.yml b/html/changelogs/AutoChangeLog-pr-10569.yml deleted file mode 100644 index 0b9cb0b992..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10569.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "keronshb" -delete-after: True -changes: - - rscadd: "Ports the special nanite remote, mood programs, and research generating nanites" - - balance: "rebalances some nanites" diff --git a/html/changelogs/AutoChangeLog-pr-10570.yml b/html/changelogs/AutoChangeLog-pr-10570.yml deleted file mode 100644 index 9eaf2168a8..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10570.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "kevinz000" -delete-after: True -changes: - - code_imp: "Mapping helpers added for power cables and atmos pipes." diff --git a/html/changelogs/AutoChangeLog-pr-10571.yml b/html/changelogs/AutoChangeLog-pr-10571.yml deleted file mode 100644 index 1d6844aa53..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10571.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Ghommie" -delete-after: True -changes: - - bugfix: "Riot foam dart (not the ammo box) design cost is yet again consistent with the result's material amount." diff --git a/html/changelogs/AutoChangeLog-pr-10578.yml b/html/changelogs/AutoChangeLog-pr-10578.yml deleted file mode 100644 index a84fa5ba21..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10578.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "r4d6" -delete-after: True -changes: - - rscadd: "Mining base now has a common area accessible via a new shuttle on the medium-highpop maps, and a security office connecting the gulag and the mining base. Gulag also has functional atmos." diff --git a/html/changelogs/AutoChangeLog-pr-10579.yml b/html/changelogs/AutoChangeLog-pr-10579.yml deleted file mode 100644 index c428c0109d..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10579.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "r4d6" -delete-after: True -changes: - - rscadd: "Added more Cyborg Landmarks" diff --git a/html/changelogs/AutoChangeLog-pr-10580.yml b/html/changelogs/AutoChangeLog-pr-10580.yml deleted file mode 100644 index 6cb625d7af..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10580.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - admin: "Crafting is logged in a file now" diff --git a/html/changelogs/AutoChangeLog-pr-10582.yml b/html/changelogs/AutoChangeLog-pr-10582.yml deleted file mode 100644 index 2024088fb8..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10582.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - bugfix: "temporary flavor text now pops up properly" diff --git a/html/changelogs/AutoChangeLog-pr-10584.yml b/html/changelogs/AutoChangeLog-pr-10584.yml deleted file mode 100644 index e2c9f93ac8..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10584.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "AffectedArc07" -delete-after: True -changes: - - code_imp: "Line ending CI works now" diff --git a/html/changelogs/AutoChangeLog-pr-10586.yml b/html/changelogs/AutoChangeLog-pr-10586.yml deleted file mode 100644 index eb90213398..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10586.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Tupinambis" -delete-after: True -changes: - - balance: "RLDs now cost more to use, have reduced matter capacity, and sheets are worth less when refilling them." diff --git a/html/changelogs/AutoChangeLog-pr-10588.yml b/html/changelogs/AutoChangeLog-pr-10588.yml deleted file mode 100644 index d3771298b2..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10588.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "PersianXerxes" -delete-after: True -changes: - - tweak: "Reduces the range of the forcefield projector from 7 tiles to 2 tiles." diff --git a/html/changelogs/AutoChangeLog-pr-10590.yml b/html/changelogs/AutoChangeLog-pr-10590.yml new file mode 100644 index 0000000000..e59c8decf0 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10590.yml @@ -0,0 +1,11 @@ +author: "KathrinBailey" +delete-after: True +changes: + - bugfix: "Missing turf_decals in Cargo Office." + - bugfix: "Turns on the docking beacons on Box." + - bugfix: "Fixes Starboard Quarter maint room being spaced. It was never intended to be like how it was." + - bugfix: "The aforementioned maint room not having stuff in it." + - bugfix: "varedited photocopier sometimes not opening any UI." + - bugfix: "Atmos differences in Starboard Quarter maint." + - bugfix: "Atmos differences in destroyed shuttle/EVA bridge. Plating replaced with airless plating." + - bugfix: "Rotates AI satellite computers. These have probably been like this since computers had the old sprites and no directional ones. You shouldn't sit at a chair to operate a sideways computer." diff --git a/html/changelogs/AutoChangeLog-pr-10591.yml b/html/changelogs/AutoChangeLog-pr-10591.yml deleted file mode 100644 index ac8504ec9c..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10591.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "kevinz000" -delete-after: True -changes: - - rscdel: "Blood duplication is gone, but viruses now react up to 5 times, 1 time per unit, for virus mix." diff --git a/html/changelogs/AutoChangeLog-pr-10597.yml b/html/changelogs/AutoChangeLog-pr-10597.yml deleted file mode 100644 index 9f28c4f84c..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10597.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - code_imp: "demodularized player panel code, mostly" - - admin: "added ghost role eligibility delay removal to player panel" diff --git a/html/changelogs/AutoChangeLog-pr-10598.yml b/html/changelogs/AutoChangeLog-pr-10598.yml deleted file mode 100644 index 91b52b7043..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10598.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - balance: "Metabolic synthesis disables if user isn't well-fed rather than if user is starving" diff --git a/html/changelogs/AutoChangeLog-pr-10599.yml b/html/changelogs/AutoChangeLog-pr-10599.yml deleted file mode 100644 index 33435979c7..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10599.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - bugfix: "Gibtonite no longer instantly explodes upon being pickaxe'd." diff --git a/html/changelogs/AutoChangeLog-pr-10600.yml b/html/changelogs/AutoChangeLog-pr-10600.yml deleted file mode 100644 index ab0c5ac964..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10600.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "Kraseo" -delete-after: True -changes: - - bugfix: "Jelly donuts and pink jelly donuts will now properly display sprinkled icon state." - - bugfix: "Jelly donuts and its variants will properly spawn with berry juice." - - bugfix: "Slime jelly donuts have slime jelly in them now. (thanks ghommie)" diff --git a/html/changelogs/AutoChangeLog-pr-10602.yml b/html/changelogs/AutoChangeLog-pr-10602.yml deleted file mode 100644 index 9394c83671..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10602.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Ghommie" -delete-after: True -changes: - - bugfix: "Fixed a little exploit with ventcrawlers being capable of escaping closed turfs by printing scrubbers/vents into them." diff --git a/html/changelogs/AutoChangeLog-pr-10603.yml b/html/changelogs/AutoChangeLog-pr-10603.yml deleted file mode 100644 index 0f1acbf0be..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10603.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "KeRSedChaplain" -delete-after: True -changes: - - imageadd: "The clockwork cuirass can now support slithering taur bodies." diff --git a/html/changelogs/AutoChangeLog-pr-10606.yml b/html/changelogs/AutoChangeLog-pr-10606.yml deleted file mode 100644 index c6cc269cbe..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10606.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "r4d6" -delete-after: True -changes: - - refactor: "better code for passive vents" diff --git a/html/changelogs/AutoChangeLog-pr-10608.yml b/html/changelogs/AutoChangeLog-pr-10608.yml deleted file mode 100644 index 1c2015813e..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10608.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "kevinz000" -delete-after: True -changes: - - rscadd: "you can now block people on your PDA" diff --git a/html/changelogs/AutoChangeLog-pr-10609.yml b/html/changelogs/AutoChangeLog-pr-10609.yml deleted file mode 100644 index e28d929687..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10609.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - balance: "Cold-blooded costs -2 quirk points now" diff --git a/html/changelogs/AutoChangeLog-pr-10610.yml b/html/changelogs/AutoChangeLog-pr-10610.yml deleted file mode 100644 index e413574fa1..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10610.yml +++ /dev/null @@ -1,8 +0,0 @@ -author: "Owai-Seek" -delete-after: True -changes: - - rscadd: "Four New Bounties" - - tweak: "tweaked several bounties" - - tweak: "reorganised several bounties" - - balance: "balanced several bounties" - - bugfix: "added shady jims to vendor" diff --git a/html/changelogs/AutoChangeLog-pr-10614.yml b/html/changelogs/AutoChangeLog-pr-10614.yml deleted file mode 100644 index 4c4d8bfdbd..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10614.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - config: "Added suicide to the config." diff --git a/html/changelogs/AutoChangeLog-pr-10615.yml b/html/changelogs/AutoChangeLog-pr-10615.yml deleted file mode 100644 index f67392cd7f..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10615.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "keronshb" -delete-after: True -changes: - - bugfix: "fixed my messup" diff --git a/html/changelogs/AutoChangeLog-pr-10617.yml b/html/changelogs/AutoChangeLog-pr-10617.yml deleted file mode 100644 index 923913a043..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10617.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "kevinz000" -delete-after: True -changes: - - bugfix: "Grenades can now have their timers adjusted." diff --git a/html/changelogs/AutoChangeLog-pr-10619.yml b/html/changelogs/AutoChangeLog-pr-10619.yml deleted file mode 100644 index acb76034ac..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10619.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: "Seris02" -delete-after: True -changes: - - tweak: "conveyor belt now are stacks instead of single item" - - tweak: "conveyor crate has 30 belts" - - tweak: "printing a conveyor costs 3000 metal" - - rscadd: "you can press the conveyor switch in hand to link any not deployed belts to it" diff --git a/html/changelogs/AutoChangeLog-pr-10620.yml b/html/changelogs/AutoChangeLog-pr-10620.yml deleted file mode 100644 index 8f5c990234..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10620.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Hatterhat" -delete-after: True -changes: - - balance: "Dropped Exo-suit armor to put it more in line with being an explorer suit sidegrade and not a straight upgrade for Lavaland usage." diff --git a/html/changelogs/AutoChangeLog-pr-10621.yml b/html/changelogs/AutoChangeLog-pr-10621.yml deleted file mode 100644 index 0bb08dee2c..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10621.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Hatterhat" -delete-after: True -changes: - - rscadd: "You can now print .357 AP speedloaders from Security techfabs after you pick up the Advanced Non-Standard Ballistics node." diff --git a/html/changelogs/AutoChangeLog-pr-10622.yml b/html/changelogs/AutoChangeLog-pr-10622.yml deleted file mode 100644 index 3aa4159cb8..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10622.yml +++ /dev/null @@ -1,11 +0,0 @@ -author: "Owai-Seek" -delete-after: True -changes: - - rscadd: "Towel, Bedsheet, and Colored bedsheet bins to Dojo. Some lockers with carpets and wood, another bathroom/shower, tons of cleaning supplies, some additional trash cans, a tiny medical area, and some vendors/vendor resupplies. Also added some Ambrosia Gaia seeds." - - tweak: "Moved some lights around, extended the dojo a bit to make it feel more spacious." - - rscdel: "Cafe Newsfeed Frame" - - rscadd: "Towel, Bedsheet, and Colored bedsheet bins to Dojo. Some lockers with carpets and wood, another bathroom/shower, tons of cleaning supplies, some additional trash cans, a tiny medical area, and some vendors/vendor resupplies. Also added some Ambrosia Gaia seeds." - - tweak: "Moved some lights around, extended the dojo a bit to make it feel more spacious." - - rscdel: "Cafe Newsfeed Frame" - - rscadd: "Towel, Bedsheet, and Colored bedsheet bins to Dojo. Some lockers with carpets and wood, another bathroom/shower, tons of cleaning supplies, some additional trash cans, a tiny medical area, and some vendors/vendor resupplies. Also added some Ambrosia Gaia seeds." - - tweak: "Moved some lights around, extended the dojo a bit to make it feel more spacious." diff --git a/html/changelogs/AutoChangeLog-pr-10628.yml b/html/changelogs/AutoChangeLog-pr-10628.yml deleted file mode 100644 index f9d24a3a28..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10628.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Ghommie" -delete-after: True -changes: - - bugfix: "deconstructing a rubber toolbox with the destructive analyzer won't \"lock\" the machine anymore." diff --git a/html/changelogs/AutoChangeLog-pr-10630.yml b/html/changelogs/AutoChangeLog-pr-10630.yml deleted file mode 100644 index ca4e75fdf1..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10630.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "kevinz000" -delete-after: True -changes: - - balance: "Cloning has been nerfed." diff --git a/html/changelogs/AutoChangeLog-pr-10632.yml b/html/changelogs/AutoChangeLog-pr-10632.yml deleted file mode 100644 index 39d74002e4..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10632.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Commandersand" -delete-after: True -changes: - - balance: "lightning bolt,tesla,forcewall,emp spells have lower cooldown" - - balance: "fireball has a 10 second starting cooldown" diff --git a/html/changelogs/AutoChangeLog-pr-10635.yml b/html/changelogs/AutoChangeLog-pr-10635.yml deleted file mode 100644 index 66c90808d6..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10635.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Hatterhat" -delete-after: True -changes: - - rscdel: "Forensic scanner removed from Advanced Biotechnology node." diff --git a/html/changelogs/AutoChangeLog-pr-10636.yml b/html/changelogs/AutoChangeLog-pr-10636.yml deleted file mode 100644 index a6354ef6b5..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10636.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Trilbyspaceclone, Ghommie" -delete-after: True -changes: - - rscadd: "More types of glass can now be used to make a solar panel, with different sturdiness and efficiency depending the type." diff --git a/html/changelogs/AutoChangeLog-pr-10640.yml b/html/changelogs/AutoChangeLog-pr-10640.yml deleted file mode 100644 index f51f892d8d..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10640.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "r4d6" -delete-after: True -changes: - - bugfix: "fixed a hole in Meta" diff --git a/html/changelogs/AutoChangeLog-pr-10641.yml b/html/changelogs/AutoChangeLog-pr-10641.yml deleted file mode 100644 index 479729e1f2..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10641.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "jakeramsay007" -delete-after: True -changes: - - rscadd: "The assorted .357 revolvers (except russian revolver) can now also load .38, like real life." diff --git a/html/changelogs/AutoChangeLog-pr-10643.yml b/html/changelogs/AutoChangeLog-pr-10643.yml deleted file mode 100644 index 8fd496e0bc..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10643.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Trilbyspaceclone" -delete-after: True -changes: - - rscadd: "tip of the round: Cleanbot can withstand lava and burning hot ash. Its a god" diff --git a/html/changelogs/AutoChangeLog-pr-10645.yml b/html/changelogs/AutoChangeLog-pr-10645.yml deleted file mode 100644 index 16ef8b2056..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10645.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "r4d6" -delete-after: True -changes: - - rscadd: "Added the ability to easily add variations of the mining base" diff --git a/html/changelogs/AutoChangeLog-pr-10650.yml b/html/changelogs/AutoChangeLog-pr-10650.yml deleted file mode 100644 index d4794291d1..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10650.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Arturlang" -delete-after: True -changes: - - rscadd: "Added modular computers to the loadout" diff --git a/html/changelogs/AutoChangeLog-pr-10664.yml b/html/changelogs/AutoChangeLog-pr-10664.yml deleted file mode 100644 index e38ce50b24..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10664.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "kappa-sama" -delete-after: True -changes: - - balance: "dragnet snares can now be removed in 5 seconds" diff --git a/html/changelogs/AutoChangeLog-pr-10667.yml b/html/changelogs/AutoChangeLog-pr-10667.yml deleted file mode 100644 index 85a60c285a..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10667.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Ghommie" -delete-after: True -changes: - - bugfix: "Something about empty hand combat mode right click waving hands defying common sense and being spammy." diff --git a/html/changelogs/AutoChangeLog-pr-10670.yml b/html/changelogs/AutoChangeLog-pr-10670.yml deleted file mode 100644 index 699ed044da..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10670.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Seris02" -delete-after: True -changes: - - tweak: "sniffing sneezing etc doing anything if they don't breathe" diff --git a/html/changelogs/AutoChangeLog-pr-10674.yml b/html/changelogs/AutoChangeLog-pr-10674.yml deleted file mode 100644 index 9b1a4dc551..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10674.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Xantholne" -delete-after: True -changes: - - rscadd: "Cheongsam and Qipao clothing added to loadout and clothesmates" diff --git a/html/changelogs/AutoChangeLog-pr-10676.yml b/html/changelogs/AutoChangeLog-pr-10676.yml deleted file mode 100644 index c586123b12..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10676.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Kraseo" -delete-after: True -changes: - - bugfix: "Virgo hairstyles no longer have those annoying quotation marks. Rejoice for you will no longer have to use the scrollbar." - - imagedel: "Got rid of some strange-looking hairstyles. (Tbob, fingerweave, etc.)" diff --git a/html/changelogs/AutoChangeLog-pr-10677.yml b/html/changelogs/AutoChangeLog-pr-10677.yml deleted file mode 100644 index 060f4f4c62..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10677.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: "Arkatos, Zxaber, Ghommie" -delete-after: True -changes: - - rscadd: "Certain AI abilities now dynamically show their remaining uses on the mouse hover over their respective action buttons." - - bugfix: "Malfunctioning AIs can no longer abuse the confirmation popup to create extra (unstoppable) doomsdays." - - bugfix: "Fixed AIs being able to use some of their abilities such as the doomsday whilst dead, and the doomsday loading phase not halting upon AI death." diff --git a/html/changelogs/AutoChangeLog-pr-10680.yml b/html/changelogs/AutoChangeLog-pr-10680.yml deleted file mode 100644 index 2d3fba0931..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10680.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Ghommie" -delete-after: True -changes: - - imageadd: "Towels are now \"digitigrade-friendly\"." diff --git a/html/changelogs/AutoChangeLog-pr-10682.yml b/html/changelogs/AutoChangeLog-pr-10682.yml deleted file mode 100644 index bf7b0c0929..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10682.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Skoglol" -delete-after: True -changes: - - bugfix: "Falsewalls now properly hide pipes and wires." diff --git a/html/changelogs/AutoChangeLog-pr-10683.yml b/html/changelogs/AutoChangeLog-pr-10683.yml deleted file mode 100644 index 34941d30e8..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10683.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Ghommie" -delete-after: True -changes: - - bugfix: "The Barefoot drink and mousetraps will now work even if wearing certain \"feet-less shoes\"." diff --git a/html/changelogs/AutoChangeLog-pr-10688.yml b/html/changelogs/AutoChangeLog-pr-10688.yml deleted file mode 100644 index e648139889..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10688.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "kevinz000" -delete-after: True -changes: - - bugfix: "hilbert hotel is now less of an exploity mess" diff --git a/html/changelogs/AutoChangeLog-pr-10691.yml b/html/changelogs/AutoChangeLog-pr-10691.yml deleted file mode 100644 index 31eecae15e..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10691.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Seris02" -delete-after: True -changes: - - bugfix: "probably fixes the make mentor button" diff --git a/html/changelogs/AutoChangeLog-pr-10693.yml b/html/changelogs/AutoChangeLog-pr-10693.yml deleted file mode 100644 index 7d26bd31c8..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10693.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Seris02" -delete-after: True -changes: - - tweak: "the sprites for the conveyor belts to look more directional" diff --git a/html/changelogs/AutoChangeLog-pr-10698.yml b/html/changelogs/AutoChangeLog-pr-10698.yml deleted file mode 100644 index f08e006058..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10698.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Putnam3145" -delete-after: True -changes: - - tweak: "Ghost cafe mobs are super duper attached to the ghost cafe." diff --git a/html/changelogs/AutoChangeLog-pr-10706.yml b/html/changelogs/AutoChangeLog-pr-10706.yml new file mode 100644 index 0000000000..8bf1cd449c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10706.yml @@ -0,0 +1,5 @@ +author: "Ghommie" +delete-after: True +changes: + - bugfix: "Stopped the ellipsis question mark from being displayed twice in the examine message for masked/unknown human mobs." + - tweak: "Made the aforementioned ellipsis question mark display on flavor-text-less masked/unknown human mobs too for consistency." diff --git a/html/changelogs/AutoChangeLog-pr-10338.yml b/html/changelogs/AutoChangeLog-pr-10709.yml similarity index 50% rename from html/changelogs/AutoChangeLog-pr-10338.yml rename to html/changelogs/AutoChangeLog-pr-10709.yml index c4816a3fbe..8c9d74c5f1 100644 --- a/html/changelogs/AutoChangeLog-pr-10338.yml +++ b/html/changelogs/AutoChangeLog-pr-10709.yml @@ -1,4 +1,4 @@ author: "Seris02" delete-after: True changes: - - rscadd: "marshmallow" + - rscadd: "recipe for mammal mutation toxin" diff --git a/html/changelogs/AutoChangeLog-pr-10718.yml b/html/changelogs/AutoChangeLog-pr-10718.yml deleted file mode 100644 index c61959b81c..0000000000 --- a/html/changelogs/AutoChangeLog-pr-10718.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "r4d6" -delete-after: True -changes: - - bugfix: "fixed a sprite" diff --git a/html/changelogs/AutoChangeLog-pr-10733.yml b/html/changelogs/AutoChangeLog-pr-10733.yml new file mode 100644 index 0000000000..33e2ee216c --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10733.yml @@ -0,0 +1,4 @@ +author: "Hatterhat" +delete-after: True +changes: + - balance: "Zombie powder is now instant when ingested, but delayed when injected or applied through touch." diff --git a/html/changelogs/AutoChangeLog-pr-10737.yml b/html/changelogs/AutoChangeLog-pr-10737.yml new file mode 100644 index 0000000000..fa4023c148 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10737.yml @@ -0,0 +1,4 @@ +author: "Ghommie" +delete-after: True +changes: + - bugfix: "Stopped an APTFT exploit with spray bottles." diff --git a/html/changelogs/AutoChangeLog-pr-10742.yml b/html/changelogs/AutoChangeLog-pr-10742.yml new file mode 100644 index 0000000000..ece862d112 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10742.yml @@ -0,0 +1,4 @@ +author: "Ghommie" +delete-after: True +changes: + - bugfix: "Fixed the detective revolver being quite risky to use." diff --git a/html/changelogs/AutoChangeLog-pr-10743.yml b/html/changelogs/AutoChangeLog-pr-10743.yml new file mode 100644 index 0000000000..d9775f7bc3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10743.yml @@ -0,0 +1,4 @@ +author: "necromanceranne" +delete-after: True +changes: + - rscdel: "You can no longer order spinfusors or their ammo from cargo." diff --git a/html/changelogs/AutoChangeLog-pr-10317.yml b/html/changelogs/AutoChangeLog-pr-10748.yml similarity index 52% rename from html/changelogs/AutoChangeLog-pr-10317.yml rename to html/changelogs/AutoChangeLog-pr-10748.yml index 7db50240e3..a2afda81aa 100644 --- a/html/changelogs/AutoChangeLog-pr-10317.yml +++ b/html/changelogs/AutoChangeLog-pr-10748.yml @@ -1,4 +1,4 @@ author: "Trilbyspaceclone" delete-after: True changes: - - bugfix: "issues with mapping done my Trilby" + - bugfix: "Vault hallway door being all access" diff --git a/html/changelogs/AutoChangeLog-pr-10751.yml b/html/changelogs/AutoChangeLog-pr-10751.yml new file mode 100644 index 0000000000..c5b54bd4ed --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10751.yml @@ -0,0 +1,4 @@ +author: "kevinz000" +delete-after: True +changes: + - balance: "traitor+bro gamemode minimum population set to 25 until there can be more in depth configuration systems for gamemodes." diff --git a/html/changelogs/AutoChangeLog-pr-10752.yml b/html/changelogs/AutoChangeLog-pr-10752.yml new file mode 100644 index 0000000000..9bb50f1da1 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10752.yml @@ -0,0 +1,9 @@ +author: "Owai-Seek" +delete-after: True +changes: + - rscadd: "Burger, Cargo Packaging, Dirty Magazine, Air Pump, and Scrubber crates." + - rscdel: "Duplicate Crate, Festive Wrapping Paper Crate, Contraband Monkey Meat Crate" + - tweak: "Gave Seed Crate Ambrosia Seed, gave Biker Gang Crate Spraypaint." + - tweak: "Organised some crates with sub-categories. Also, moved all vendor refills to a new tab." + - tweak: "Moved Grill to Service Tab" + - bugfix: "Engineering Hardsuit Access" diff --git a/html/changelogs/AutoChangeLog-pr-10442.yml b/html/changelogs/AutoChangeLog-pr-10753.yml similarity index 56% rename from html/changelogs/AutoChangeLog-pr-10442.yml rename to html/changelogs/AutoChangeLog-pr-10753.yml index f407ae9e15..c1b3615c3d 100644 --- a/html/changelogs/AutoChangeLog-pr-10442.yml +++ b/html/changelogs/AutoChangeLog-pr-10753.yml @@ -1,4 +1,4 @@ author: "Trilbyspaceclone" delete-after: True changes: - - tweak: "Halfs the nutriments in sugar" + - server: "Updates change logs" diff --git a/html/changelogs/AutoChangeLog-pr-10754.yml b/html/changelogs/AutoChangeLog-pr-10754.yml new file mode 100644 index 0000000000..0537347443 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10754.yml @@ -0,0 +1,5 @@ +author: "MalricB" +delete-after: True +changes: + - rscadd: "\"Shaggy\" sprite from virgo" + - rscadd: "\"shaggy\" option in the character customization" diff --git a/html/changelogs/AutoChangeLog-pr-10764.yml b/html/changelogs/AutoChangeLog-pr-10764.yml new file mode 100644 index 0000000000..25dfebd5fb --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10764.yml @@ -0,0 +1,4 @@ +author: "deathride58" +delete-after: True +changes: + - bugfix: "Spacemen no longer run at lightspeed on local servers." diff --git a/html/changelogs/AutoChangeLog-pr-10765.yml b/html/changelogs/AutoChangeLog-pr-10765.yml new file mode 100644 index 0000000000..975a3ac5c5 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10765.yml @@ -0,0 +1,4 @@ +author: "kevinz000" +delete-after: True +changes: + - bugfix: "no more bluespace skittish locker diving," diff --git a/html/changelogs/AutoChangeLog-pr-9601.yml b/html/changelogs/AutoChangeLog-pr-9601.yml deleted file mode 100644 index c54279627f..0000000000 --- a/html/changelogs/AutoChangeLog-pr-9601.yml +++ /dev/null @@ -1,9 +0,0 @@ -author: "Ghommie (original PRs by Kevinz000, ShivCalez, 4dplanner, Barhandar, 81Denton, zxaber, Fox-McCloud)" -delete-after: True -changes: - - rscadd: "All atom movables now have move force and move resist, and pull force An atom can only pull another atom if its pull force is stronger than that atom's move resist" - - rscadd: "Mobs with a higher move force than an atom's move resist will automatically try to force the atom out of its way. This might not always work, depending on how snowflakey code is. -experimental: As of right now, everything has a move force and resist of 100, and a pull force of 101. Things take (resist - force) damage when bumped into -experimental: Failing to move onto a tile will now still bump up your last move timer. However, successfully pushing something out of your way will result in you automatically moving into where it was." - - bugfix: "Bolted AIs can no longer be teleported by launchpads." - - balance: "Megafauna cannot teleport" diff --git a/html/changelogs/AutoChangeLog-pr-9856.yml b/html/changelogs/AutoChangeLog-pr-9856.yml deleted file mode 100644 index 697c1c78f5..0000000000 --- a/html/changelogs/AutoChangeLog-pr-9856.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "Ghommie" -delete-after: True -changes: - - rscadd: "Refactored code to allow all living mobs to use shields and not only humans." - - tweak: "Monkys will now retaliate against aliens attacking them (as if they even posed a threat to start with)." diff --git a/html/changelogs/AutoChangeLog-pr-9878.yml b/html/changelogs/AutoChangeLog-pr-9878.yml deleted file mode 100644 index ef9c704003..0000000000 --- a/html/changelogs/AutoChangeLog-pr-9878.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Ghommie" -delete-after: True -changes: - - tweak: "add a click cooldown to the overly spammable table slamming." diff --git a/html/changelogs/AutoChangeLog-pr-9905.yml b/html/changelogs/AutoChangeLog-pr-9905.yml deleted file mode 100644 index a0330b8103..0000000000 --- a/html/changelogs/AutoChangeLog-pr-9905.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: "Trilbyspaceclone" -delete-after: True -changes: - - rscadd: "more glassware" - - rscadd: "Few new packs and glassmaker kit!" - - tweak: "prices/chems of crates/autobottler" - - bugfix: "some crates ungettable as well as some broken crates" diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi index a22901d3e2..6e95eae960 100644 Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ diff --git a/modular_citadel/code/_onclick/other_mobs.dm b/modular_citadel/code/_onclick/other_mobs.dm index 8b9f3b3184..6d9ffdd6ca 100644 --- a/modular_citadel/code/_onclick/other_mobs.dm +++ b/modular_citadel/code/_onclick/other_mobs.dm @@ -18,7 +18,7 @@ if(!has_active_hand()) to_chat(src, "You ponder your life choices and sigh.") return TRUE - var/list/src_viewers = get_hearers_in_view(DEFAULT_MESSAGE_RANGE, src) - src // src has a different message. + var/list/src_viewers = viewers(DEFAULT_MESSAGE_RANGE, src) - src // src has a different message. var/the_action = "waves to [A]" var/what_action = "waves to something you can't see" var/self_action = "wave to [A]" diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm index cf68666532..8b5e8f6522 100644 --- a/modular_citadel/code/modules/client/loadout/__donator.dm +++ b/modular_citadel/code/modules/client/loadout/__donator.dm @@ -305,7 +305,7 @@ datum/gear/darksabresheath /datum/gear/flagcape name = "US Flag Cape" category = SLOT_IN_BACKPACK - path = /obj/item/bedsheet/custom/flagcape + path = /obj/item/clothing/neck/flagcape ckeywhitelist = list("darnchacha") /datum/gear/luckyjack diff --git a/modular_citadel/code/modules/custom_loadout/custom_items.dm b/modular_citadel/code/modules/custom_loadout/custom_items.dm index eaf128626d..03a4a56147 100644 --- a/modular_citadel/code/modules/custom_loadout/custom_items.dm +++ b/modular_citadel/code/modules/custom_loadout/custom_items.dm @@ -364,10 +364,11 @@ worn_x_dimension = 64 worn_y_dimension = 34 -/obj/item/bedsheet/custom/flagcape +/obj/item/clothing/neck/flagcape name = "Flag Cape" desc = "A truly patriotic form of heroic attire." icon = 'icons/obj/custom.dmi' + resistance_flags = FLAMMABLE alternate_worn_icon = 'icons/mob/custom_w.dmi' icon_state = "flagcape" item_state = "flagcape" diff --git a/modular_citadel/code/modules/mob/living/carbon/human/human_movement.dm b/modular_citadel/code/modules/mob/living/carbon/human/human_movement.dm index 0b6903c9fe..bd43d96ba4 100644 --- a/modular_citadel/code/modules/mob/living/carbon/human/human_movement.dm +++ b/modular_citadel/code/modules/mob/living/carbon/human/human_movement.dm @@ -12,8 +12,11 @@ /mob/living/carbon/human/movement_delay() . = 0 - if(!resting && m_intent == MOVE_INTENT_RUN && !sprinting) - . += 1 + if(!resting && m_intent == MOVE_INTENT_RUN && sprinting) + var/static/datum/config_entry/number/movedelay/sprint_speed_increase/SSI + if(!SSI) + SSI = CONFIG_GET_ENTRY(number/movedelay/sprint_speed_increase) + . -= SSI.config_entry_value if(wrongdirmovedelay) . += 1 . += ..() diff --git a/modular_citadel/code/modules/mob/living/living.dm b/modular_citadel/code/modules/mob/living/living.dm index 513a80cae0..0caf548196 100644 --- a/modular_citadel/code/modules/mob/living/living.dm +++ b/modular_citadel/code/modules/mob/living/living.dm @@ -17,6 +17,12 @@ var/sprint_stamina_cost = 0.70 //stamina loss per tile while insufficient sprint buffer. //---End +/mob/living/update_config_movespeed() + . = ..() + sprint_buffer_max = CONFIG_GET(number/movedelay/sprint_buffer_max) + sprint_buffer_regen_ds = CONFIG_GET(number/movedelay/sprint_buffer_regen_per_ds) + sprint_stamina_cost = CONFIG_GET(number/movedelay/sprint_stamina_cost) + /mob/living/movement_delay(ignorewalk = 0) . = ..() if(resting) diff --git a/tgstation.dme b/tgstation.dme index ab157fd175..c34a93b3c8 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -1604,6 +1604,7 @@ #include "code\modules\cargo\packs\science.dm" #include "code\modules\cargo\packs\security.dm" #include "code\modules\cargo\packs\service.dm" +#include "code\modules\cargo\packs\vending.dm" #include "code\modules\chatter\chatter.dm" #include "code\modules\client\asset_cache.dm" #include "code\modules\client\client_colour.dm"