From bc6294baa9d1de6e3a884389abdd83405c7dcdb3 Mon Sep 17 00:00:00 2001 From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Thu, 9 Apr 2020 01:10:34 +0100 Subject: [PATCH 01/60] i too, like food quality. --- code/datums/components/crafting/craft.dm | 12 ++++++++++++ code/modules/food_and_drinks/food.dm | 8 ++++++-- code/modules/food_and_drinks/food/snacks.dm | 4 ++++ .../food_and_drinks/kitchen_machinery/processor.dm | 4 +++- 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/code/datums/components/crafting/craft.dm b/code/datums/components/crafting/craft.dm index 9b19cd0106..64bde5da29 100644 --- a/code/datums/components/crafting/craft.dm +++ b/code/datums/components/crafting/craft.dm @@ -201,6 +201,18 @@ var/atom/movable/I = new R.result (get_turf(user.loc)) I.CheckParts(parts, R) if(isitem(I)) + if(istype(I, /obj/item/reagent_containers/food)) + var/obj/item/reagent_containers/food/food_result = I + var/total_quality = 0 + var/total_items = 0 + for(var/obj/item/ingredient in parts) + var/obj/item/reagent_containers/food/food_ingredient = ingredient + total_items += 1 + total_quality += food_ingredient.food_quality + if(total_items == 0) + food_result.adjust_food_quality(50) + else + food_result.adjust_food_quality(total_quality / total_items) user.put_in_hands(I) if(send_feedback) SSblackbox.record_feedback("tally", "object_crafted", 1, I.type) diff --git a/code/modules/food_and_drinks/food.dm b/code/modules/food_and_drinks/food.dm index 2af24080cb..b1df946e34 100644 --- a/code/modules/food_and_drinks/food.dm +++ b/code/modules/food_and_drinks/food.dm @@ -16,6 +16,7 @@ resistance_flags = FLAMMABLE var/foodtype = NONE var/last_check_time + var/food_quality = 50 /obj/item/reagent_containers/food/Initialize(mapload) . = ..() @@ -23,6 +24,9 @@ pixel_x = rand(-5, 5) pixel_y = rand(-5, 5) +/obj/item/reagent_containers/food/proc/adjust_food_quality(new_quality) + food_quality = min(new_quality,100) + /obj/item/reagent_containers/food/proc/checkLiked(var/fraction, mob/M) if(last_check_time + 50 < world.time) if(ishuman(M)) @@ -32,11 +36,11 @@ to_chat(H,"What the hell was that thing?!") H.adjust_disgust(25 + 30 * fraction) SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "toxic_food", /datum/mood_event/disgusting_food) - else if(foodtype & H.dna.species.disliked_food) + else if((foodtype & H.dna.species.disliked_food) || food_quality <= 30) to_chat(H,"That didn't taste very good...") H.adjust_disgust(11 + 15 * fraction) SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "gross_food", /datum/mood_event/gross_food) - else if(foodtype & H.dna.species.liked_food) + else if((foodtype & H.dna.species.liked_food) || food_quality >= 70) to_chat(H,"I love this taste!") H.adjust_disgust(-5 + -2.5 * fraction) SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "fav_food", /datum/mood_event/favorite_food) diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index 0b277e328b..177dba0b86 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -296,6 +296,10 @@ All foods are distributed among various categories. Use common sense. var/obj/item/result if(cooked_type) result = new cooked_type(T) + //if the result is food, set its food quality to the original food item's quality + if(istype(result, /obj/item/reagent_containers/food)) + var/obj/item/reagent_containers/food/food_output = result + food_output.adjust_food_quality(food_quality) if(istype(M)) initialize_cooked_food(result, M.efficiency) else diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm index 3fa188fb94..113378fbb4 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm @@ -28,8 +28,10 @@ /obj/machinery/processor/proc/process_food(datum/food_processor_process/recipe, atom/movable/what) if (recipe.output && loc && !QDELETED(src)) + var/obj/item/reagent_containers/food/food_input = what for(var/i = 0, i < rating_amount, i++) - new recipe.output(drop_location()) + var/obj/item/reagent_containers/food/food_output = new recipe.output(drop_location()) + food_output.adjust_food_quality(food_input.food_quality) //output quality equals input quality for the food processor if (ismob(what)) var/mob/themob = what themob.gib(TRUE,TRUE,TRUE) From 792be6e1464484f3e1c691a0d96b3a1b664ea619 Mon Sep 17 00:00:00 2001 From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Thu, 9 Apr 2020 01:36:15 +0100 Subject: [PATCH 02/60] more food quality --- code/modules/food_and_drinks/food.dm | 2 +- code/modules/food_and_drinks/food/customizables.dm | 4 ++++ code/modules/food_and_drinks/food/snacks_bread.dm | 4 ++++ .../modules/food_and_drinks/kitchen_machinery/deep_fryer.dm | 6 ++++++ code/modules/reagents/chemistry/reagents/toxin_reagents.dm | 2 +- 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/code/modules/food_and_drinks/food.dm b/code/modules/food_and_drinks/food.dm index b1df946e34..de41d2dd23 100644 --- a/code/modules/food_and_drinks/food.dm +++ b/code/modules/food_and_drinks/food.dm @@ -25,7 +25,7 @@ pixel_y = rand(-5, 5) /obj/item/reagent_containers/food/proc/adjust_food_quality(new_quality) - food_quality = min(new_quality,100) + food_quality = clamp(new_quality,0,100) /obj/item/reagent_containers/food/proc/checkLiked(var/fraction, mob/M) if(last_check_time + 50 < world.time) diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm index bd20ad8d69..0e2bdc63c8 100644 --- a/code/modules/food_and_drinks/food/customizables.dm +++ b/code/modules/food_and_drinks/food/customizables.dm @@ -20,6 +20,7 @@ var/list/ingredients = list() var/ingredients_placement = INGREDIENTS_FILL var/customname = "custom" + var/total_quality = 0 //quality of all ingredients added together /obj/item/reagent_containers/food/snacks/customizable/examine(mob/user) . = ..() @@ -56,6 +57,9 @@ S.reagents.trans_to(src,min(S.reagents.total_volume, 15)) //limit of 15, we don't want our custom food to be completely filled by just one ingredient with large reagent volume. foodtype |= S.foodtype update_snack_overlays(S) + //quality of customised food is average of the ingredient's qualities + total_quality += S.food_quality + food_quality = total_quality / length(ingredients) to_chat(user, "You add the [I.name] to the [name].") update_name(S) else diff --git a/code/modules/food_and_drinks/food/snacks_bread.dm b/code/modules/food_and_drinks/food/snacks_bread.dm index 204e5ce455..11eedcd363 100644 --- a/code/modules/food_and_drinks/food/snacks_bread.dm +++ b/code/modules/food_and_drinks/food/snacks_bread.dm @@ -247,18 +247,22 @@ GLOBAL_LIST_INIT(frying_bad_chems, list( add_atom_colour(rgb(166,103,54), FIXED_COLOUR_PRIORITY) name = "lightly-fried [name]" desc = "[desc] It's been lightly fried in a deep fryer." + adjust_food_quality(food_quality - 5) if(16 to 49) add_atom_colour(rgb(103,63,24), FIXED_COLOUR_PRIORITY) name = "fried [name]" desc = "[desc] It's been fried, increasing its tastiness value by [rand(1, 75)]%." + adjust_food_quality(food_quality - 10) if(50 to 59) add_atom_colour(rgb(63,23,4), FIXED_COLOUR_PRIORITY) name = "deep-fried [name]" desc = "[desc] Deep-fried to perfection." + adjust_food_quality(food_quality) //we shouldn't punish perfection in the fried arts if(60 to INFINITY) add_atom_colour(rgb(33,19,9), FIXED_COLOUR_PRIORITY) name = "the physical manifestation of the very concept of fried foods" desc = "A heavily-fried...something. Who can tell anymore?" + adjust_food_quality(0) //good job, you're truly the best cook. filling_color = color foodtype |= FRIED diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm index 1215dd7ecb..2cd17a9020 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm @@ -104,6 +104,12 @@ God bless America. else if(!frying && user.transferItemToLoc(I, src)) to_chat(user, "You put [I] into [src].") frying = new/obj/item/reagent_containers/food/snacks/deepfryholder(src, I) + //setup food quality for item depending on if it's edible or not + if(istype(I, /obj/item/reagent_containers/food)) + /obj/item/reagent_containers/food/original_food = I + frying.adjust_food_quality(I.food_quality) //food quality remains unchanged until degree of frying is calculated + else + frying.food_quality = 10 //inedible fried item has low quality icon_state = "fryer_on" fry_loop.start() diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index 305d12b3c5..bd79ed5fb8 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -506,7 +506,7 @@ taste_description = "awful cooking" /datum/reagent/toxin/condensed_cooking_oil/on_mob_life(mob/living/carbon/M) - if(prob(15)) + if(prob(5)) M.vomit() else if(prob(40)) From a90f3d9d2b87ebb3dee16120153b807f7d2e367a Mon Sep 17 00:00:00 2001 From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Thu, 9 Apr 2020 01:46:47 +0100 Subject: [PATCH 03/60] woops --- code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm index 2cd17a9020..3e22070c00 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm @@ -106,8 +106,8 @@ God bless America. frying = new/obj/item/reagent_containers/food/snacks/deepfryholder(src, I) //setup food quality for item depending on if it's edible or not if(istype(I, /obj/item/reagent_containers/food)) - /obj/item/reagent_containers/food/original_food = I - frying.adjust_food_quality(I.food_quality) //food quality remains unchanged until degree of frying is calculated + var/obj/item/reagent_containers/food/original_food = I + frying.adjust_food_quality(original_food.food_quality) //food quality remains unchanged until degree of frying is calculated else frying.food_quality = 10 //inedible fried item has low quality icon_state = "fryer_on" From 20d41720305375d654f9ac4bc675c4dcd8631e43 Mon Sep 17 00:00:00 2001 From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Thu, 9 Apr 2020 02:10:00 +0100 Subject: [PATCH 04/60] more quality --- code/modules/food_and_drinks/kitchen_machinery/gibber.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm index 5117439049..4b5c7d34ad 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm @@ -14,6 +14,7 @@ var/gibtime = 40 // Time from starting until meat appears var/meat_produced = 0 var/ignore_clothing = FALSE + var/meat_quality = 35 //food_quality of meat produced /obj/machinery/gibber/Initialize() @@ -23,8 +24,10 @@ /obj/machinery/gibber/RefreshParts() gibtime = 40 meat_produced = 0 + meat_quality = 35 // unupgraded this means quality is 50, and max upgraded it is 95 for(var/obj/item/stock_parts/matter_bin/B in component_parts) meat_produced += B.rating + meat_quality += B.rating * 15 for(var/obj/item/stock_parts/manipulator/M in component_parts) gibtime -= 5 * M.rating if(M.rating >= 2) @@ -182,6 +185,7 @@ for (var/i=1 to meat_produced) var/obj/item/reagent_containers/food/snacks/meat/slab/newmeat = new typeofmeat newmeat.name = "[sourcename] [newmeat.name]" + newmeat.food_quality = meat_quality if(istype(newmeat)) newmeat.subjectname = sourcename newmeat.reagents.add_reagent (/datum/reagent/consumable/nutriment, sourcenutriment / meat_produced) // Thehehe. Fat guys go first From d985ea8c848b08ab878b50e72f9ae5602eddf74a Mon Sep 17 00:00:00 2001 From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Thu, 9 Apr 2020 02:51:32 +0100 Subject: [PATCH 05/60] more quality --- code/datums/components/butchering.dm | 9 ++++++++- .../modules/reagents/chemistry/reagents/food_reagents.dm | 6 ++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/code/datums/components/butchering.dm b/code/datums/components/butchering.dm index 06169f64bf..1477f7cbc5 100644 --- a/code/datums/components/butchering.dm +++ b/code/datums/components/butchering.dm @@ -69,6 +69,9 @@ H.apply_status_effect(/datum/status_effect/neck_slice) /datum/component/butchering/proc/Butcher(mob/living/butcher, mob/living/meat) + var/meat_quality = 30 + (bonus_modifier/10) //increases through quality of butchering tool, and through if it was butchered in the kitchen or not + if(istype(get_area(butcher), /area/crew_quarters/kitchen)) + meat_quality = meat_quality + 20 var/turf/T = meat.drop_location() var/final_effectiveness = effectiveness - meat.butcher_difficulty var/bonus_chance = max(0, (final_effectiveness - 100) + bonus_modifier) //so 125 total effectiveness = 25% extra chance @@ -83,7 +86,11 @@ if(butcher) to_chat(butcher, "You harvest some extra [initial(bones.name)] from [meat]!") for(var/i in 1 to 2) - new bones (T) + var/butcher_item = new bones (T) + if(istype(butcher_item, /obj/item/reagent_containers/food)) + var/obj/item/reagent_containers/food/butcher_food = butcher_item + butcher_food.adjust_food_quality(meat_quality) + else new bones (T) meat.butcher_results.Remove(bones) //in case you want to, say, have it drop its results on gib diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index fa30609c54..c555609992 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -777,6 +777,12 @@ can_synth = FALSE pH = 6.1 +/datum/reagent/consumable/secretsauce/reaction_obj(obj/O, reac_volume) + //splashing any amount above or equal to 1u of secret sauce onto a piece of food turns its quality to 100 + if(reac_volume >= 1 && istype(O, /obj/item/reagent_containers/food)) + var/obj/item/reagent_containers/food/splashed_food = O + splashed_food.adjust_food_quality(100) + /datum/reagent/consumable/char name = "Char" description = "Essence of the grill. Has strange properties when overdosed." From 7fba81f36e4ebe2862e9676292cce25726fb7e4e Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Thu, 9 Apr 2020 13:32:02 +0100 Subject: [PATCH 06/60] people are more picky about food --- code/modules/food_and_drinks/food.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/food_and_drinks/food.dm b/code/modules/food_and_drinks/food.dm index de41d2dd23..beaf5ed1ba 100644 --- a/code/modules/food_and_drinks/food.dm +++ b/code/modules/food_and_drinks/food.dm @@ -40,9 +40,9 @@ to_chat(H,"That didn't taste very good...") H.adjust_disgust(11 + 15 * fraction) SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "gross_food", /datum/mood_event/gross_food) - else if((foodtype & H.dna.species.liked_food) || food_quality >= 70) + else if((foodtype & H.dna.species.liked_food & food_quality >= 50) || food_quality >= 70) //you like food of high quality, and food of regular quality you have a preference for to_chat(H,"I love this taste!") - H.adjust_disgust(-5 + -2.5 * fraction) + H.adjust_disgust(-5 + (-2.5 * food_quality/50) + -2.5 * fraction) SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "fav_food", /datum/mood_event/favorite_food) else if(foodtype & H.dna.species.toxic_food) From 97dcb9ed846241fa63a0e2303c846ea850cd4f42 Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Thu, 9 Apr 2020 14:50:11 +0100 Subject: [PATCH 07/60] fried garbage is now better --- .../food_and_drinks/food/snacks_bread.dm | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks_bread.dm b/code/modules/food_and_drinks/food/snacks_bread.dm index 11eedcd363..a04766be5d 100644 --- a/code/modules/food_and_drinks/food/snacks_bread.dm +++ b/code/modules/food_and_drinks/food/snacks_bread.dm @@ -185,6 +185,7 @@ icon = 'icons/obj/food/food.dmi' icon_state = "" bitesize = 2 + var/fried_garbage = FALSE //did you really fry a fire extinguisher? GLOBAL_VAR_INIT(frying_hardmode, TRUE) GLOBAL_VAR_INIT(frying_bad_chem_add_volume, TRUE) @@ -215,21 +216,13 @@ GLOBAL_LIST_INIT(frying_bad_chems, list( item_flags = fried.item_flags obj_flags = fried.obj_flags - if(istype(fried, /obj/item/reagent_containers/food/snacks)) + if(istype(fried, /obj/item/reagent_containers/food)) fried.reagents.trans_to(src, fried.reagents.total_volume) qdel(fried) else fried.forceMove(src) trash = fried - if(!istype(fried, /obj/item/reagent_containers/food) && GLOB.frying_hardmode && GLOB.frying_bad_chems.len) - var/R = rand(1, GLOB.frying_bad_chems.len) - var/bad_chem = GLOB.frying_bad_chems[R] - var/bad_chem_amount = GLOB.frying_bad_chems[bad_chem] - if(GLOB.frying_bad_chem_add_volume) - reagents.maximum_volume += bad_chem_amount + 2 //Added room for condensed cooking oil - reagents.add_reagent(bad_chem, bad_chem_amount) - //All fried inedible items also get condensed cooking oil added, which induces minor vomiting and heart damage - reagents.add_reagent(/datum/reagent/toxin/condensed_cooking_oil, 2) + fried_garbage = TRUE /obj/item/reagent_containers/food/snacks/deepfryholder/Destroy() if(trash) @@ -237,6 +230,13 @@ GLOBAL_LIST_INIT(frying_bad_chems, list( . = ..() /obj/item/reagent_containers/food/snacks/deepfryholder/On_Consume(mob/living/eater) + if(fried_garbage && GLOB.frying_hardmode && GLOB.frying_bad_chems.len) + var/R = rand(1, GLOB.frying_bad_chems.len) + var/bad_chem = GLOB.frying_bad_chems[R] + var/bad_chem_amount = GLOB.frying_bad_chems[bad_chem] + eater.reagents.add_reagent(bad_chem, bad_chem_amount) + //All fried inedible items also get condensed cooking oil added, which induces minor vomiting and heart damage + eater.reagents.add_reagent(/datum/reagent/toxin/condensed_cooking_oil, 2) if(trash) QDEL_NULL(trash) ..() From 47be942c92e8e6bf9ba584bb9bcf2c4e3d96c809 Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Thu, 9 Apr 2020 15:29:10 +0100 Subject: [PATCH 08/60] more quality --- code/modules/food_and_drinks/food/snacks.dm | 11 +++++++++-- .../food_and_drinks/kitchen_machinery/microwave.dm | 4 +++- .../food_and_drinks/kitchen_machinery/processor.dm | 5 ++++- code/modules/food_and_drinks/recipes/food_mixtures.dm | 1 - 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index 177dba0b86..92f8d104a6 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -162,6 +162,13 @@ All foods are distributed among various categories. Use common sense. else . += "[src] was bitten multiple times!" + //examine text for quality + if(food_quality >= 70) + . += "It is of a high quality." + else + if(food_quality <= 30) + . += "It is of a low quality." + /obj/item/reagent_containers/food/snacks/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/storage)) @@ -291,7 +298,7 @@ All foods are distributed among various categories. Use common sense. else S.reagents.add_reagent(r_id, amount) -/obj/item/reagent_containers/food/snacks/microwave_act(obj/machinery/microwave/M) +/obj/item/reagent_containers/food/snacks/microwave_act(obj/machinery/microwave/M, var/quality_increase) var/turf/T = get_turf(src) var/obj/item/result if(cooked_type) @@ -299,7 +306,7 @@ All foods are distributed among various categories. Use common sense. //if the result is food, set its food quality to the original food item's quality if(istype(result, /obj/item/reagent_containers/food)) var/obj/item/reagent_containers/food/food_output = result - food_output.adjust_food_quality(food_quality) + food_output.adjust_food_quality(food_quality + quality_increase) if(istype(M)) initialize_cooked_food(result, M.efficiency) else diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm index 2adff414e8..9edcaf083c 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm @@ -19,6 +19,7 @@ var/broken = 0 // 0, 1 or 2 // How broken is it??? var/max_n_of_items = 10 var/efficiency = 0 + var/quality_increase = 5 // how much do we increase the quality of microwaved items var/datum/looping_sound/microwave/soundloop var/list/ingredients = list() // may only contain /atom/movables @@ -48,6 +49,7 @@ efficiency += M.rating for(var/obj/item/stock_parts/matter_bin/M in component_parts) max_n_of_items = 10 * M.rating + quality_increase = M.rating * 5 break /obj/machinery/microwave/examine(mob/user) @@ -308,7 +310,7 @@ var/metal = 0 for(var/obj/item/O in ingredients) - O.microwave_act(src) + O.microwave_act(src, quality_increase) if(O.custom_materials?.len) metal += O.custom_materials[SSmaterials.GetMaterialRef(/datum/material/iron)] diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm index 113378fbb4..9a3df0a92b 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm @@ -14,10 +14,13 @@ var/processing = FALSE var/rating_speed = 1 var/rating_amount = 1 + var/quality_increase = 5 /obj/machinery/processor/RefreshParts() + quality_increase = 0 for(var/obj/item/stock_parts/matter_bin/B in component_parts) rating_amount = B.rating + quality_increase += B.rating * 5 for(var/obj/item/stock_parts/manipulator/M in component_parts) rating_speed = M.rating @@ -31,7 +34,7 @@ var/obj/item/reagent_containers/food/food_input = what for(var/i = 0, i < rating_amount, i++) var/obj/item/reagent_containers/food/food_output = new recipe.output(drop_location()) - food_output.adjust_food_quality(food_input.food_quality) //output quality equals input quality for the food processor + food_output.adjust_food_quality(food_input.food_quality + quality_increase) if (ismob(what)) var/mob/themob = what themob.gib(TRUE,TRUE,TRUE) diff --git a/code/modules/food_and_drinks/recipes/food_mixtures.dm b/code/modules/food_and_drinks/recipes/food_mixtures.dm index c15c1cd2f5..ec96a4537c 100644 --- a/code/modules/food_and_drinks/recipes/food_mixtures.dm +++ b/code/modules/food_and_drinks/recipes/food_mixtures.dm @@ -8,7 +8,6 @@ parts |= reqs //////////////////////////////////////////FOOD MIXTURES//////////////////////////////////// - /datum/chemical_reaction/tofu name = "Tofu" id = "tofu" From 7fe5bb71d7c3ee7fe513af5b4cef001515aa7ead Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Thu, 9 Apr 2020 16:07:45 +0100 Subject: [PATCH 09/60] more quality --- code/datums/components/butchering.dm | 14 ++++++++------ .../food_and_drinks/kitchen_machinery/gibber.dm | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/code/datums/components/butchering.dm b/code/datums/components/butchering.dm index 1477f7cbc5..5c295b28cc 100644 --- a/code/datums/components/butchering.dm +++ b/code/datums/components/butchering.dm @@ -75,6 +75,7 @@ var/turf/T = meat.drop_location() var/final_effectiveness = effectiveness - meat.butcher_difficulty var/bonus_chance = max(0, (final_effectiveness - 100) + bonus_modifier) //so 125 total effectiveness = 25% extra chance + var/list/butchered_items = list() for(var/V in meat.butcher_results) var/obj/bones = V var/amount = meat.butcher_results[bones] @@ -86,20 +87,21 @@ if(butcher) to_chat(butcher, "You harvest some extra [initial(bones.name)] from [meat]!") for(var/i in 1 to 2) - var/butcher_item = new bones (T) - if(istype(butcher_item, /obj/item/reagent_containers/food)) - var/obj/item/reagent_containers/food/butcher_food = butcher_item - butcher_food.adjust_food_quality(meat_quality) + butchered_items += new bones (T) else - new bones (T) + butchered_items += new bones (T) meat.butcher_results.Remove(bones) //in case you want to, say, have it drop its results on gib for(var/V in meat.guaranteed_butcher_results) var/obj/sinew = V var/amount = meat.guaranteed_butcher_results[sinew] for(var/i in 1 to amount) - new sinew (T) + butchered_items += new sinew (T) meat.guaranteed_butcher_results.Remove(sinew) + for(var/butchered_item in butchered_items) + if(istype(butchered_item, /obj/item/reagent_containers/food)) + var/obj/item/reagent_containers/food/butchered_meat = butchered_item + butchered_meat.food_quality = meat_quality if(butcher) meat.visible_message("[butcher] butchers [meat].") ButcherEffects(meat) diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm index 4b5c7d34ad..f6cd44ace1 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm @@ -185,7 +185,6 @@ for (var/i=1 to meat_produced) var/obj/item/reagent_containers/food/snacks/meat/slab/newmeat = new typeofmeat newmeat.name = "[sourcename] [newmeat.name]" - newmeat.food_quality = meat_quality if(istype(newmeat)) newmeat.subjectname = sourcename newmeat.reagents.add_reagent (/datum/reagent/consumable/nutriment, sourcenutriment / meat_produced) // Thehehe. Fat guys go first @@ -211,6 +210,7 @@ skin.forceMove(loc) skin.throw_at(pick(nearby_turfs),meat_produced,3) for (var/i=1 to meat_produced) + allmeat[i].adjust_food_quality(meat_quality) var/obj/item/meatslab = allmeat[i] meatslab.forceMove(loc) meatslab.throw_at(pick(nearby_turfs),i,3) From cfec83b8a24962a675e7a9421c2bf68945b36b38 Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Thu, 9 Apr 2020 18:38:29 +0100 Subject: [PATCH 10/60] what if butchering didnt suck! --- code/datums/components/butchering.dm | 4 ++-- code/modules/food_and_drinks/kitchen_machinery/gibber.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/components/butchering.dm b/code/datums/components/butchering.dm index 5c295b28cc..cb9652e0db 100644 --- a/code/datums/components/butchering.dm +++ b/code/datums/components/butchering.dm @@ -69,9 +69,9 @@ H.apply_status_effect(/datum/status_effect/neck_slice) /datum/component/butchering/proc/Butcher(mob/living/butcher, mob/living/meat) - var/meat_quality = 30 + (bonus_modifier/10) //increases through quality of butchering tool, and through if it was butchered in the kitchen or not + var/meat_quality = 50 + (bonus_modifier/10) //increases through quality of butchering tool, and through if it was butchered in the kitchen or not if(istype(get_area(butcher), /area/crew_quarters/kitchen)) - meat_quality = meat_quality + 20 + meat_quality = meat_quality + 10 var/turf/T = meat.drop_location() var/final_effectiveness = effectiveness - meat.butcher_difficulty var/bonus_chance = max(0, (final_effectiveness - 100) + bonus_modifier) //so 125 total effectiveness = 25% extra chance diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm index f6cd44ace1..c94aba95b4 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm @@ -184,6 +184,7 @@ for (var/i=1 to meat_produced) var/obj/item/reagent_containers/food/snacks/meat/slab/newmeat = new typeofmeat + newmeat.adjust_food_quality(meat_quality) newmeat.name = "[sourcename] [newmeat.name]" if(istype(newmeat)) newmeat.subjectname = sourcename @@ -210,7 +211,6 @@ skin.forceMove(loc) skin.throw_at(pick(nearby_turfs),meat_produced,3) for (var/i=1 to meat_produced) - allmeat[i].adjust_food_quality(meat_quality) var/obj/item/meatslab = allmeat[i] meatslab.forceMove(loc) meatslab.throw_at(pick(nearby_turfs),i,3) From fe755a14249a8e23f6d0a1a5b65af74d3f971ce8 Mon Sep 17 00:00:00 2001 From: Artur Date: Thu, 9 Apr 2020 21:42:00 +0300 Subject: [PATCH 11/60] Tackling Working so far, working on the lunge now --- .../LavaRuins/lavaland_surface_alien_nest.dmm | 2 +- .../lavaland_surface_syndicate_base1.dmm | 6 +- _maps/RandomRuins/SpaceRuins/advancedlab.dmm | 4 +- _maps/RandomRuins/SpaceRuins/deepstorage.dmm | 4 +- _maps/RandomZLevels/Academy.dmm | 2 +- _maps/RandomZLevels/spacebattle.dmm | 2 +- _maps/map_files/generic/CentCom.dmm | 2 +- code/__DEFINES/dcs/signals.dm | 5 +- code/__DEFINES/traits.dm | 2 + code/_globalvars/lists/maintenance_loot.dm | 1 + code/_onclick/click.dm | 3 + code/datums/components/crafting/recipes.dm | 9 + code/datums/components/tackle.dm | 492 ++++++++++++++++++ code/datums/elements/squish.dm | 28 + code/datums/mutations/body.dm | 4 + code/game/atoms_movable.dm | 9 +- code/game/gamemodes/clown_ops/clown_ops.dm | 2 +- code/game/gamemodes/nuclear/nuclear.dm | 3 +- .../game/objects/effects/spawners/lootdrop.dm | 2 +- code/game/objects/items/storage/toolbox.dm | 4 +- .../crates_lockers/closets/gimmick.dm | 4 +- .../objects/structures/ghost_role_spawners.dm | 2 +- .../bloodsucker/powers/fortitude.dm | 32 +- .../antagonists/bloodsucker/powers/lunge.dm | 98 +--- code/modules/awaymissions/capture_the_flag.dm | 3 +- code/modules/awaymissions/corpse.dm | 4 +- code/modules/cargo/exports/gear.dm | 4 +- code/modules/cargo/packs/armory.dm | 6 +- code/modules/cargo/packs/security.dm | 6 +- code/modules/clothing/gloves/miscellaneous.dm | 4 +- code/modules/clothing/gloves/tacklers.dm | 100 ++++ code/modules/clothing/outfits/ert.dm | 4 +- code/modules/clothing/outfits/standard.dm | 10 +- code/modules/clothing/outfits/vr.dm | 2 +- code/modules/mob/living/carbon/carbon.dm | 2 +- .../carbon/human/species_types/dwarves.dm | 3 +- .../mob/living/simple_animal/corpse.dm | 10 +- .../hostile/mining_mobs/hivelord.dm | 2 +- .../chemistry/reagents/alcohol_reagents.dm | 2 +- code/modules/research/designs/misc_designs.dm | 24 + code/modules/ruins/lavaland_ruin_code.dm | 2 +- code/modules/vending/security.dm | 1 + icons/mob/clothing/hands.dmi | Bin 0 -> 11008 bytes tgstation.dme | 2 + 44 files changed, 760 insertions(+), 153 deletions(-) create mode 100644 code/datums/components/tackle.dm create mode 100644 code/datums/elements/squish.dm create mode 100644 code/modules/clothing/gloves/tacklers.dm create mode 100644 icons/mob/clothing/hands.dmi diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_alien_nest.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_alien_nest.dmm index 1ea3f19c62..862c745f81 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_alien_nest.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_alien_nest.dmm @@ -70,7 +70,7 @@ /obj/structure/alien/weeds, /obj/item/clothing/mask/facehugger/impregnated, /obj/item/clothing/glasses/night, -/obj/item/clothing/gloves/combat, +/obj/item/clothing/gloves/tackler/combat/insulated, /obj/effect/decal/cleanable/blood/old, /obj/item/clothing/under/syndicate/tacticool, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index 2ec5b88792..b22c9787ba 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -526,8 +526,8 @@ /obj/structure/closet/crate/secure/gear{ req_access_txt = "150" }, -/obj/item/clothing/gloves/combat, -/obj/item/clothing/gloves/combat, +/obj/item/clothing/gloves/tackler/combat/insulated, +/obj/item/clothing/gloves/tackler/combat/insulated, /obj/item/clothing/under/syndicate/combat, /obj/item/clothing/under/syndicate/combat, /obj/item/storage/belt/military, @@ -4197,7 +4197,7 @@ "kw" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, -/obj/item/clothing/gloves/combat{ +/obj/item/clothing/gloves/tackler/combat/insulated{ pixel_y = -6 }, /obj/item/tank/internals/emergency_oxygen{ diff --git a/_maps/RandomRuins/SpaceRuins/advancedlab.dmm b/_maps/RandomRuins/SpaceRuins/advancedlab.dmm index 66a3d4e55d..b553bb5c97 100644 --- a/_maps/RandomRuins/SpaceRuins/advancedlab.dmm +++ b/_maps/RandomRuins/SpaceRuins/advancedlab.dmm @@ -185,7 +185,7 @@ name = "Clothes" }, /obj/item/clothing/head/chameleon, -/obj/item/clothing/gloves/combat, +/obj/item/clothing/gloves/tackler/combat/insulated, /obj/item/clothing/suit/chameleon, /obj/item/clothing/under/chameleon, /obj/item/clothing/shoes/chameleon, @@ -221,7 +221,7 @@ }, /obj/item/clothing/under/rank/centcom/commander, /obj/item/clothing/head/centhat, -/obj/item/clothing/gloves/combat, +/obj/item/clothing/gloves/tackler/combat/insulated, /obj/item/clothing/suit/armor/vest, /obj/item/clothing/shoes/sneakers/brown, /turf/open/floor/wood, diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm index bf4f0dbfa6..a4c60023e8 100644 --- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm +++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm @@ -2202,11 +2202,11 @@ /area/ruin/space/has_grav/deepstorage/armory) "eO" = ( /obj/structure/table, -/obj/item/clothing/gloves/combat{ +/obj/item/clothing/gloves/tackler/combat/insulated{ pixel_x = -3; pixel_y = 4 }, -/obj/item/clothing/gloves/combat{ +/obj/item/clothing/gloves/tackler/combat/insulated{ pixel_x = 3; pixel_y = -2 }, diff --git a/_maps/RandomZLevels/Academy.dmm b/_maps/RandomZLevels/Academy.dmm index 97ebb80101..de0b7cc430 100644 --- a/_maps/RandomZLevels/Academy.dmm +++ b/_maps/RandomZLevels/Academy.dmm @@ -4322,7 +4322,7 @@ /turf/open/floor/plating/asteroid/snow, /area/awaymission/academy/academycellar) "mV" = ( -/obj/item/clothing/gloves/combat, +/obj/item/clothing/gloves/tackler/combat/insulated, /turf/open/floor/plating/asteroid/snow, /area/awaymission/academy/academycellar) "mW" = ( diff --git a/_maps/RandomZLevels/spacebattle.dmm b/_maps/RandomZLevels/spacebattle.dmm index 66d7f556b4..ca44e7d7b7 100644 --- a/_maps/RandomZLevels/spacebattle.dmm +++ b/_maps/RandomZLevels/spacebattle.dmm @@ -243,7 +243,7 @@ /area/awaymission/spacebattle/syndicate1) "bg" = ( /obj/structure/table/reinforced, -/obj/item/clothing/gloves/combat, +/obj/item/clothing/gloves/tackler/combat/insulated, /turf/open/floor/mineral/plastitanium/red, /area/awaymission/spacebattle/syndicate1) "bh" = ( diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index c9b81cefd9..5c054c0bb4 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -7639,7 +7639,7 @@ /obj/item/clothing/suit/space/hardsuit/deathsquad{ pixel_y = 5 }, -/obj/item/clothing/gloves/combat, +/obj/item/clothing/gloves/tackler/combat/insulated, /obj/item/clothing/shoes/combat/swat, /obj/item/clothing/mask/gas/sechailer/swat, /obj/effect/turf_decal/stripes/line, diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm index e75f832df3..70c2425f48 100644 --- a/code/__DEFINES/dcs/signals.dm +++ b/code/__DEFINES/dcs/signals.dm @@ -119,6 +119,8 @@ #define COMSIG_MOVABLE_UNCROSSED "movable_uncrossed" //from base of atom/movable/Uncrossed(): (/atom/movable) #define COMSIG_MOVABLE_BUMP "movable_bump" //from base of atom/movable/Bump(): (/atom) #define COMSIG_MOVABLE_IMPACT "movable_impact" //from base of atom/movable/throw_impact(): (/atom/hit_atom, /datum/thrownthing/throwingdatum) + #define COMPONENT_MOVABLE_IMPACT_FLIP_HITPUSH 1 ///if true, flip if the impact will push what it hits + #define COMPONENT_MOVABLE_IMPACT_NEVERMIND 2 ///return true if you destroyed whatever it was you're impacting and there won't be anything for hitby() to run on #define COMSIG_MOVABLE_IMPACT_ZONE "item_impact_zone" //from base of mob/living/hitby(): (mob/living/target, hit_zone) #define COMSIG_MOVABLE_BUCKLE "buckle" //from base of atom/movable/buckle_mob(): (mob, force) #define COMSIG_MOVABLE_UNBUCKLE "unbuckle" //from base of atom/movable/unbuckle_mob(): (mob, force) @@ -138,7 +140,6 @@ #define HEARING_SOURCE 8*/ #define COMSIG_MOVABLE_DISPOSING "movable_disposing" //called when the movable is added to a disposal holder object for disposal movement: (obj/structure/disposalholder/holder, obj/machinery/disposal/source) #define COMSIG_MOVABLE_TELEPORTED "movable_teleported" //from base of do_teleport(): (channel, turf/origin, turf/destination) - // /mind signals #define COMSIG_PRE_MIND_TRANSFER "pre_mind_transfer" //from base of mind/transfer_to() before it's done: (new_character, old_character) #define COMPONENT_STOP_MIND_TRANSFER 1 //stops the mind transfer from happening. @@ -148,6 +149,8 @@ #define COMSIG_MOB_EXAMINATE "mob_examinate" //from base of /mob/verb/examinate(): (atom/A) #define COMSIG_MOB_DEATH "mob_death" //from base of mob/death(): (gibbed) #define COMPONENT_BLOCK_DEATH_BROADCAST 1 //stops the death from being broadcasted in deadchat. +#define COMSIG_MOB_CLICKON "mob_clickon" //from base of mob/clickon(): (atom/A, params) + #define COMSIG_MOB_CANCEL_CLICKON 1 #define COMSIG_MOB_GHOSTIZE "mob_ghostize" //from base of mob/Ghostize(): (can_reenter_corpse, special, penalize) #define COMPONENT_BLOCK_GHOSTING (1<<0) #define COMPONENT_DO_NOT_PENALIZE_GHOSTING (1<<1) diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 476d99fd9b..9fc4847751 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -148,6 +148,8 @@ #define TRAIT_EXEMPT_HEALTH_EVENTS "exempt-health-events" #define TRAIT_NO_MIDROUND_ANTAG "no-midround-antag" //can't be turned into an antag by random events #define TRAIT_PASSTABLE "passtable" +#define TRAIT_GIANT "giant" +#define TRAIT_DWARF "dwarf" // mobility flag traits // IN THE FUTURE, IT WOULD BE NICE TO DO SOMETHING SIMILAR TO https://github.com/tgstation/tgstation/pull/48923/files (ofcourse not nearly the same because I have my.. thoughts on it) diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index e825233bca..7ad7d154d4 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -116,5 +116,6 @@ GLOBAL_LIST_INIT(maintenance_loot, list( /obj/item/autosurgeon/penis = 1, /obj/item/autosurgeon/testicles = 1, /obj/item/storage/box/marshmallow = 2, + /obj/item/clothing/gloves/tackler/offbrand = 1, "" = 3 )) diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 46c2c919f4..9ce96585d3 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -75,6 +75,9 @@ if(notransform) return + if(SEND_SIGNAL(src, COMSIG_MOB_CLICKON, A, params) & COMSIG_MOB_CANCEL_CLICKON) + return + var/list/modifiers = params2list(params) if(modifiers["shift"] && modifiers["middle"]) ShiftMiddleClickOn(A) diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm index 2b6f1a5b81..a87496a212 100644 --- a/code/datums/components/crafting/recipes.dm +++ b/code/datums/components/crafting/recipes.dm @@ -23,3 +23,12 @@ */ /datum/crafting_recipe/proc/check_requirements(mob/user, list/collected_requirements) return TRUE + +/datum/crafting_recipe/gripperoffbrand + name = "Improvised Gripper Gloves" + reqs = list( + /obj/item/clothing/gloves/fingerless = 1 + // /obj/item/stack/sticky_tape = 1 + ) + result = /obj/item/clothing/gloves/tackler/offbrand + category = CAT_CLOTHING diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm new file mode 100644 index 0000000000..28dd469041 --- /dev/null +++ b/code/datums/components/tackle.dm @@ -0,0 +1,492 @@ +#define MAX_TABLE_MESSES 8 // how many things can we knock off a table at once? + +/** + *#tackle.dm + * + * For when you want to throw a person at something and have fun stuff happen + * + * This component is made for carbon mobs (really, humans), and allows its parent to throw themselves and perform tackles. This is done by enabling throw mode, then clicking on your + * intended target with an empty hand. You will then launch toward your target. If you hit a carbon, you'll roll to see how hard you hit them. If you hit a solid non-mob, you'll + * roll to see how badly you just messed yourself up. If, along your journey, you hit a table, you'll slam onto it and send up to MAX_TABLE_MESSES (8) /obj/items on the table flying, + * and take a bit of extra damage and stun for each thing launched. + * + * There are 2 """skill rolls""" involved here, which are handled and explained in sack() and rollTackle() (for roll 1, carbons), and splat() (for roll 2, walls and solid objects) +*/ +/datum/component/tackler + dupe_mode = COMPONENT_DUPE_UNIQUE + + ///If we're currently tackling or are on cooldown. Actually, shit, if I use this to handle cooldowns, then getting thrown by something while on cooldown will count as a tackle..... whatever, i'll fix that next commit + var/tackling = TRUE + ///How much stamina it takes to launch a tackle + var/stamina_cost + ///Launching a tackle calls Knockdown on you for this long, so this is your cooldown. Once you stand back up, you can tackle again. + var/base_knockdown + ///Your max range for how far you can tackle. + var/range + ///How fast you sail through the air. Standard tackles are 1 speed, but gloves that throw you faster come at a cost: higher speeds make it more likely you'll be badly injured if you fly into a non-mob obstacle. + var/speed + ///A flat modifier to your roll against your target, as described in [rollTackle()][/datum/component/tackler/proc/rollTackle]. Slightly misleading, skills aren't relevant here, this is a matter of what type of gloves (or whatever) is granting you the ability to tackle. + var/skill_mod + ///Some gloves, generally ones that increase mobility, may have a minimum distance to fly. Rocket gloves are especially dangerous with this, be sure you'll hit your target or have a clear background if you miss, or else! + var/min_distance + ///The throwdatum we're currently dealing with, if we need it + var/datum/thrownthing/tackle + +/datum/component/tackler/Initialize(stamina_cost = 25, base_knockdown = 1 SECONDS, range = 4, speed = 1, skill_mod = 0, min_distance = min_distance) + if(!iscarbon(parent)) + return COMPONENT_INCOMPATIBLE + + src.stamina_cost = stamina_cost + src.base_knockdown = base_knockdown + src.range = range + src.speed = speed + src.skill_mod = skill_mod + src.min_distance = min_distance + + var/mob/P = parent + to_chat(P, "You are now able to launch tackles! You can do so by activating throw intent, and clicking on your target with an empty hand.") + + addtimer(CALLBACK(src, .proc/resetTackle), base_knockdown, TIMER_STOPPABLE) + +/datum/component/tackler/Destroy() + var/mob/P = parent + to_chat(P, "You can no longer tackle.") + ..() + +/datum/component/tackler/RegisterWithParent() + RegisterSignal(parent, COMSIG_MOB_CLICKON, .proc/checkTackle) + RegisterSignal(parent, COMSIG_MOVABLE_IMPACT, .proc/sack) + RegisterSignal(parent, COMSIG_MOVABLE_POST_THROW, .proc/registerTackle) + +/datum/component/tackler/UnregisterFromParent() + UnregisterSignal(parent, list(COMSIG_MOB_CLICKON, COMSIG_MOVABLE_IMPACT, COMSIG_MOVABLE_MOVED, COMSIG_MOVABLE_POST_THROW)) + +///Store the thrownthing datum for later use +/datum/component/tackler/proc/registerTackle(mob/living/carbon/user, datum/thrownthing/TT) + tackle = TT + +///See if we can tackle or not. If we can, leap! +/datum/component/tackler/proc/checkTackle(mob/living/carbon/user, atom/A, params) + if(!user.in_throw_mode || user.get_active_held_item() || user.pulling || user.buckling) + return + + if(HAS_TRAIT(user, TRAIT_HULK)) + to_chat(user, "You're too angry to remember how to tackle!") + return + + if(user.restrained()) + to_chat(user, "You need free use of your hands to tackle!") + return + + if(!(user.mobility_flags & MOBILITY_STAND)) + to_chat(user, "You must be standing to tackle!") + return + + if(tackling) + to_chat(user, "You're not ready to tackle!") + return + + if(user.has_movespeed_modifier(MOVESPEED_ID_SHOVE)) // can't tackle if you just got shoved + to_chat(user, "You're too off balance to tackle!") + return + + user.face_atom(A) + + var/list/modifiers = params2list(params) + if(modifiers["alt"] || modifiers["shift"] || modifiers["ctrl"] || modifiers["middle"]) + return + + tackling = TRUE + RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/checkObstacle) + playsound(user, 'sound/weapons/thudswoosh.ogg', 40, TRUE, -1) + + if(can_see(user, A, 7)) + user.visible_message("[user] leaps at [A]!", "You leap at [A]!") + else + user.visible_message("[user] leaps!", "You leap!") + + if(get_dist(user, A) < min_distance) + A = get_ranged_target_turf(user, get_dir(user, A), min_distance) //TODO: this only works in cardinals/diagonals, make it work with in-betweens too! + + user.Knockdown(base_knockdown, TRUE, TRUE) + user.adjustStaminaLoss(stamina_cost) + user.throw_at(A, range, speed, user, FALSE) + user.toggle_throw_mode() + addtimer(CALLBACK(src, .proc/resetTackle), base_knockdown, TIMER_STOPPABLE) + return(COMSIG_MOB_CANCEL_CLICKON) + +/** + * sack() + * + * sack() is called when you actually smack into something, assuming we're mid-tackle. First it deals with smacking into non-carbons, in two cases: + * * If it's a non-carbon mob, we don't care, get out of here and do normal thrown-into-mob stuff + * * Else, if it's something dense (walls, machinery, structures, most things other than the floor), go to splat() and get ready for some high grade shit + * + * If it's a carbon we hit, we'll call rollTackle() which rolls a die and calculates modifiers for both the tackler and target, then gives us a number. Negatives favor the target, while positives favor the tackler. + * Check [rollTackle()][/datum/component/tackler/proc/rollTackle] for a more thorough explanation on the modifiers at play. + * + * Then, we figure out what effect we want, and we get to work! Note that with standard gripper gloves and no modifiers, the range of rolls is (-3, 3). The results are as follows, based on what we rolled: + * * -inf to -5: Seriously botched tackle, tackler suffers a concussion, brute damage, and a 3 second paralyze, target suffers nothing + * * -4 to -2: weak tackle, tackler gets 3 second knockdown, target gets shove slowdown but is otherwise fine + * * -1 to 0: decent tackle, tackler gets up a bit quicker than the target + * * 1: solid tackle, tackler has more of an advantage getting up quicker + * * 2 to 4: expert tackle, tackler has sizeable advantage and lands on their feet with a free passive grab + * * 5 to inf: MONSTER tackle, tackler gets up immediately and gets a free aggressive grab, target takes sizeable stamina damage from the hit and is paralyzed for one and a half seconds and knocked down for three seconds + * + * Finally, we return a bitflag to [COMSIG_MOVABLE_IMPACT] that forces the hitpush to false so that we don't knock them away. +*/ +/datum/component/tackler/proc/sack(mob/living/carbon/user, atom/hit) + if(!tackling || !tackle) + return + + if(!iscarbon(hit)) + if(hit.density) + return splat(user, hit) + return + + var/mob/living/carbon/target = hit + var/mob/living/carbon/human/T = target + var/mob/living/carbon/human/S = user + + var/roll = rollTackle(target) + tackling = FALSE + + switch(roll) + if(-INFINITY to -5) + user.visible_message("[user] botches [user.p_their()] tackle and slams [user.p_their()] head into [target], knocking [user.p_them()]self silly!", "You botch your tackle and slam your head into [target], knocking yourself silly!", target) + to_chat(target, "[user] botches [user.p_their()] tackle and slams [user.p_their()] head into you, knocking [user.p_them()]self silly!") + + user.Paralyze(30) + var/obj/item/bodypart/head/hed = user.get_bodypart(BODY_ZONE_HEAD) + if(hed) + hed.receive_damage(brute=20, updating_health=TRUE) + user.gain_trauma(/datum/brain_trauma/mild/concussion) + + if(-4 to -2) // glancing blow at best + user.visible_message("[user] lands a weak tackle on [target], briefly knocking [target.p_them()] off-balance!", "You land a weak tackle on [target], briefly knocking [target.p_them()] off-balance!", target) + to_chat(target, "[user] lands a weak tackle on you, briefly knocking you off-balance!") + + user.Knockdown(30) + if(ishuman(target) && !T.has_movespeed_modifier(MOVESPEED_ID_SHOVE)) + T.add_movespeed_modifier(MOVESPEED_ID_SHOVE, multiplicative_slowdown = SHOVE_SLOWDOWN_STRENGTH) // maybe define a slightly more severe/longer slowdown for this + addtimer(CALLBACK(T, /mob/living/carbon/human/proc/clear_shove_slowdown), SHOVE_SLOWDOWN_LENGTH) + + if(-1 to 0) // decent hit, both parties are about equally inconvenienced + user.visible_message("[user] lands a passable tackle on [target], sending them both tumbling!", "You land a passable tackle on [target], sending you both tumbling!", target) + to_chat(target, "[user] lands a passable tackle on you, sending you both tumbling!") + + target.adjustStaminaLoss(stamina_cost) + target.Paralyze(5) + user.Knockdown(20) + target.Knockdown(25) + + if(1 to 2) // solid hit, tackler has a slight advantage + user.visible_message("[user] lands a solid tackle on [target], knocking them both down hard!", "You land a solid tackle on [target], knocking you both down hard!", target) + to_chat(target, "[user] lands a solid tackle on you, knocking you both down hard!") + + target.adjustStaminaLoss(30) + target.Paralyze(5) + user.Knockdown(10) + target.Knockdown(20) + + if(3 to 4) // really good hit, the target is definitely worse off here. Without positive modifiers, this is as good a tackle as you can land + user.visible_message("[user] lands an expert tackle on [target], knocking [target.p_them()] down hard while landing on [user.p_their()] feet with a passive grip!", "You land an expert tackle on [target], knocking [target.p_them()] down hard while landing on your feet with a passive grip!", target) + to_chat(target, "[user] lands an expert tackle on you, knocking you down hard and maintaining a passive grab!") + + user.SetKnockdown(0) + user.forceMove(get_turf(target)) + target.adjustStaminaLoss(40) + target.Paralyze(5) + target.Knockdown(30) + if(ishuman(target) && ishuman(user)) + S.dna.species.grab(S, T) + S.setGrabState(GRAB_PASSIVE) + + if(5 to INFINITY) // absolutely BODIED + user.visible_message("[user] lands a monster tackle on [target], knocking [target.p_them()] senseless and applying an aggressive pin!", "You land a monster tackle on [target], knocking [target.p_them()] senseless and applying an aggressive pin!", target) + to_chat(target, "[user] lands a monster tackle on you, knocking you senseless and aggressively pinning you!") + + user.SetKnockdown(0) + user.forceMove(get_turf(target)) + target.adjustStaminaLoss(40) + target.Paralyze(5) + target.Knockdown(30) + if(ishuman(target) && ishuman(user)) + S.dna.species.grab(S, T) + S.setGrabState(GRAB_AGGRESSIVE) + + + return COMPONENT_MOVABLE_IMPACT_FLIP_HITPUSH + +/** + * rollTackle() + * + * This handles all of the modifiers for the actual carbon-on-carbon tackling, and gets its own proc because of how many there are (with plenty more in mind!) + * + * The base roll is between (-3, 3), with negative numbers favoring the target, and positive numbers favoring the tackler. The target and the tackler are both assessed for + * how easy they are to knock over, with clumsiness and dwarfiness being strong maluses for each, and gigantism giving a bonus for each. These numbers and ideas + * are absolutely subject to change. + + * In addition, after subtracting the defender's mod and adding the attacker's mod to the roll, the component's base (skill) mod is added as well. Some sources of tackles + * are better at taking people down, like the bruiser and rocket gloves, while the dolphin gloves have a malus in exchange for better mobility. +*/ +/datum/component/tackler/proc/rollTackle(mob/living/carbon/target) + var/defense_mod = 0 + var/attack_mod = 0 + + // DE-FENSE + if(target.drunkenness > 60) // drunks are easier to knock off balance + defense_mod -= 3 + else if(target.drunkenness > 30) + defense_mod -= 1 + if(HAS_TRAIT(target, TRAIT_CLUMSY)) + defense_mod -= 2 + if(HAS_TRAIT(target, TRAIT_FAT)) // chonkers are harder to knock over + defense_mod += 1 + //if(HAS_TRAIT(target, TRAIT_GRABWEAKNESS)) Todo, port the pushover trait + //defense_mod -= 2 + if(HAS_TRAIT(target, TRAIT_DWARF)) + defense_mod -= 2 + if(HAS_TRAIT(target, TRAIT_GIANT)) + defense_mod += 2 + + if(ishuman(target)) + var/mob/living/carbon/human/T = target + var/suit_slot = T.get_item_by_slot(ITEM_SLOT_OCLOTHING) + + if(isnull(T.wear_suit) && isnull(T.w_uniform)) // who honestly puts all of their effort into tackling a naked guy? + defense_mod += 2 + if(suit_slot && (istype(suit_slot,/obj/item/clothing/suit/space/hardsuit))) + defense_mod += 1 + if(T.is_shove_knockdown_blocked()) // riot armor and such + defense_mod += 5 + if(T.is_holding_item_of_type(/obj/item/shield)) + defense_mod += 2 + + if(islizard(T)) + if(!T.getorganslot(ORGAN_SLOT_TAIL)) // lizards without tails are off-balance + defense_mod -= 1 + else if(T.dna.species.is_wagging_tail()) // lizard tail wagging is robust and can swat away assailants! + defense_mod += 1 + + // OF-FENSE + var/mob/living/carbon/sacker = parent + + if(sacker.drunkenness > 60) // you're far too drunk to hold back! + attack_mod += 1 + else if(sacker.drunkenness > 30) // if you're only a bit drunk though, you're just sloppy + attack_mod -= 1 + if(HAS_TRAIT(sacker, TRAIT_CLUMSY)) + attack_mod -= 2 + if(HAS_TRAIT(sacker, TRAIT_DWARF)) + attack_mod -= 2 + if(HAS_TRAIT(sacker, TRAIT_GIANT)) + attack_mod += 2 + + if(ishuman(target)) + var/mob/living/carbon/human/S = sacker + + var/suit_slot = S.get_item_by_slot(ITEM_SLOT_OCLOTHING) + if(suit_slot && (istype(suit_slot,/obj/item/clothing/suit/armor/riot))) // tackling in riot armor is more effective, but tiring + attack_mod += 2 + sacker.adjustStaminaLoss(20) + + var/r = rand(-3, 3) - defense_mod + attack_mod + skill_mod + return r + + +/** + * splat() + * + * This is where we handle diving into dense atoms, generally with effects ranging from bad to REALLY bad. This works as a percentile roll that is modified in two steps as detailed below. The higher + * the roll, the more severe the result. + * + * Mod 1: Speed + * * Base tackle speed is 1, which is what normal gripper gloves use. For other sources with higher speed tackles, like dolphin and ESPECIALLY rocket gloves, we obey Newton's laws and hit things harder. + * * For every unit of speed above 1, move the lower bound of the roll up by 15. Unlike Mod 2, this only serves to raise the lower bound, so it can't be directly counteracted by anything you can control. + * + * Mod 2: Misc + * -Flat modifiers, these take whatever you rolled and add/subtract to it, with the end result capped between the minimum from Mod 1 and 100. Note that since we can't roll higher than 100 to start with, + * wearing a helmet should be enough to remove any chance of permanently paralyzing yourself and dramatically lessen knocking yourself unconscious, even with rocket gloves. Will expand on maybe + * * Wearing a helmet: -6 + * * Wearing armor: -6 + * * Clumsy: +6 + * + * Effects: Below are the outcomes based off your roll, in order of increasing severity + * * 1-63: Knocked down for a few seconds and a bit of brute and stamina damage + * * 64-83: Knocked silly, gain some confusion as well as the above + * * 84-93: Cranial trauma, get a concussion and more confusion, plus more damage + * * 94-98: Knocked unconscious, significant chance to get a random mild brain trauma, as well as a fair amount of damage + * * 99-100: Break your spinal cord, get paralyzed, take a bunch of damage too. Very unlucky! +*/ +/datum/component/tackler/proc/splat(mob/living/carbon/user, atom/hit) + if(istype(hit, /obj/structure/window)) + var/obj/structure/window/W = hit + splatWindow(user, W) + if(QDELETED(W)) + return COMPONENT_MOVABLE_IMPACT_NEVERMIND + return + + var/oopsie_mod = 0 + var/danger_zone = (speed - 1) * 15 // for every extra speed we have over 1, take away 15 of the safest chance + danger_zone = max(min(danger_zone, 100), 1) + + if(ishuman(user)) + var/mob/living/carbon/human/S = user + var/head_slot = S.get_item_by_slot(ITEM_SLOT_HEAD) + var/suit_slot = S.get_item_by_slot(ITEM_SLOT_OCLOTHING) + if(head_slot && (istype(head_slot,/obj/item/clothing/head/helmet) || istype(head_slot,/obj/item/clothing/head/hardhat))) + oopsie_mod -= 6 + if(suit_slot && (istype(suit_slot,/obj/item/clothing/suit/armor/))) + oopsie_mod -= 6 + + if(HAS_TRAIT(user, TRAIT_CLUMSY)) + oopsie_mod += 6 //honk! + + var/oopsie = rand(danger_zone, 100) + if(oopsie >= 94 && oopsie_mod < 0) // good job avoiding getting paralyzed! gold star! + to_chat(user, "You're really glad you're wearing protection!") + oopsie += oopsie_mod + + switch(oopsie) + if(99 to INFINITY) + // can you imagine standing around minding your own business when all of the sudden some guy fucking launches himself into a wall at full speed and irreparably paralyzes himself? + user.visible_message("[user] slams face-first into [hit] at an awkward angle, severing [user.p_their()] spinal column with a sickening crack! Holy shit!", "You slam face-first into [hit] at an awkward angle, severing your spinal column with a sickening crack! Holy shit!") + user.adjustStaminaLoss(30) + user.adjustBruteLoss(30) + playsound(user, 'sound/effects/blobattack.ogg', 60, TRUE) + playsound(user, 'sound/effects/splat.ogg', 70, TRUE) + user.emote("scream") + user.gain_trauma(/datum/brain_trauma/severe/paralysis/paraplegic) // oopsie indeed! + shake_camera(user, 7, 7) + user.overlay_fullscreen("flash", /obj/screen/fullscreen/flash) + user.clear_fullscreen("flash", 4.5) + + if(94 to 98) + user.visible_message("[user] slams face-first into [hit] with a concerning squish, immediately going limp!", "You slam face-first into [hit], and immediately lose consciousness!") + user.adjustStaminaLoss(30) + user.adjustBruteLoss(30) + user.Unconscious(100) + user.gain_trauma_type(BRAIN_TRAUMA_MILD) + user.playsound_local(get_turf(user), 'sound/weapons/flashbang.ogg', 100, TRUE, 8, 0.9) + shake_camera(user, 6, 6) + user.overlay_fullscreen("flash", /obj/screen/fullscreen/flash) + user.clear_fullscreen("flash", 3.5) + + if(84 to 93) + user.visible_message("[user] slams head-first into [hit], suffering major cranial trauma!", "You slam head-first into [hit], and the world explodes around you!") + user.adjustStaminaLoss(30) + user.adjustBruteLoss(30) + user.confused += 15 + if(prob(80)) + user.gain_trauma(/datum/brain_trauma/mild/concussion) + user.playsound_local(get_turf(user), 'sound/weapons/flashbang.ogg', 100, TRUE, 8, 0.9) + user.Knockdown(40) + shake_camera(user, 5, 5) + user.overlay_fullscreen("flash", /obj/screen/fullscreen/flash) + user.clear_fullscreen("flash", 2.5) + + if(64 to 83) + user.visible_message("[user] slams hard into [hit], knocking [user.p_them()] senseless!", "You slam hard into [hit], knocking yourself senseless!") + user.adjustStaminaLoss(30) + user.adjustBruteLoss(10) + user.confused += 10 + user.Knockdown(30) + shake_camera(user, 3, 4) + + if(1 to 63) + user.visible_message("[user] slams into [hit]!", "You slam into [hit]!") + user.adjustStaminaLoss(20) + user.adjustBruteLoss(10) + user.Knockdown(30) + shake_camera(user, 2, 2) + + playsound(user, 'sound/weapons/smash.ogg', 70, TRUE) + + +/datum/component/tackler/proc/resetTackle() + tackling = FALSE + QDEL_NULL(tackle) + UnregisterSignal(parent, COMSIG_MOVABLE_MOVED) + +///A special case for splatting for handling windows +/datum/component/tackler/proc/splatWindow(mob/living/carbon/user, obj/structure/window/W) + playsound(user, "sound/effects/Glasshit.ogg", 140, TRUE) + + if(W.type in list(/obj/structure/window, /obj/structure/window/fulltile, /obj/structure/window/unanchored, /obj/structure/window/fulltile/unanchored)) // boring unreinforced windows + for(var/i = 0, i < speed, i++) + var/obj/item/shard/shard = new /obj/item/shard(get_turf(user)) + //shard.embedding = list(embed_chance = 100, ignore_throwspeed_threshold = TRUE, impact_pain_mult=3, pain_chance=5) + //shard.AddElement(/datum/element/embed, shard.embedding) + user.hitby(shard, skipcatch = TRUE, hitpush = FALSE) + //shard.embedding = list() + //shard.AddElement(/datum/element/embed, shard.embedding) + W.obj_destruction() + user.adjustStaminaLoss(10 * speed) + user.Paralyze(30) + user.visible_message("[user] slams into [W] and shatters it, shredding [user.p_them()]self with glass!", "You slam into [W] and shatter it, shredding yourself with glass!") + + else + user.visible_message("[user] slams into [W] like a bug, then slowly slides off it!", "You slam into [W] like a bug, then slowly slide off it!") + user.Paralyze(10) + user.Knockdown(30) + W.take_damage(20 * speed) + user.adjustStaminaLoss(10 * speed) + user.adjustBruteLoss(5 * speed) + +/datum/component/tackler/proc/delayedSmash(obj/structure/window/W) + if(W) + W.obj_destruction() + playsound(W, "shatter", 70, TRUE) + +///Check to see if we hit a table, and if so, make a big mess! +/datum/component/tackler/proc/checkObstacle(mob/living/carbon/owner) + if(!tackling) + return + + var/turf/T = get_turf(owner) + var/obj/structure/table/kevved = locate(/obj/structure/table) in T.contents + if(!kevved) + return + + var/list/messes = list() + + // we split the mess-making into two parts (check what we're gonna send flying, intermission for dealing with the tackler, then actually send stuff flying) for the benefit of making sure the face-slam text + // comes before the list of stuff that goes flying, but can still adjust text + damage to how much of a mess it made + for(var/obj/item/I in T.contents) + if(!I.anchored) + messes += I + if(messes.len >= MAX_TABLE_MESSES) + break + + /// for telling HOW big of a mess we just made + var/HOW_big_of_a_miss_did_we_just_make = "" + if(messes.len) + if(messes.len < MAX_TABLE_MESSES / 4) + HOW_big_of_a_miss_did_we_just_make = ", making a mess" + else if(messes.len < MAX_TABLE_MESSES / 2) + HOW_big_of_a_miss_did_we_just_make = ", making a big mess" + else if(messes.len < MAX_TABLE_MESSES) + HOW_big_of_a_miss_did_we_just_make = ", making a giant mess" + else + HOW_big_of_a_miss_did_we_just_make = ", making a ginormous mess!" // an extra exclamation point!! for emphasis!!! + + owner.visible_message("[owner] trips over [kevved] and slams into it face-first[HOW_big_of_a_miss_did_we_just_make]!", "You trip over [kevved] and slam into it face-first[HOW_big_of_a_miss_did_we_just_make]!") + owner.adjustStaminaLoss(20 + messes.len * 2) + owner.adjustBruteLoss(10 + messes.len) + owner.Paralyze(5 * messes.len) // half a second of paralyze for each thing you knock around + owner.Knockdown(20 + 5 * messes.len) // 2 seconds of knockdown after the paralyze + + for(var/obj/item/I in messes) + var/dist = rand(1, 3) + var/sp = 2 + if(prob(25 * (src.speed - 1))) // if our tackle speed is higher than 1, with chance (speed - 1 * 25%), throw the thing at our tackle speed + 1 + sp = speed + 1 + I.throw_at(get_ranged_target_turf(I, pick(GLOB.alldirs), range = dist), range = dist, speed = sp) + I.visible_message("[I] goes flying[sp > 3 ? " dangerously fast" : ""]!") // standard embed speed + + playsound(owner, 'sound/weapons/smash.ogg', 70, TRUE) + tackle.finalize(hit=TRUE) + resetTackle() + +#undef MAX_TABLE_MESSES diff --git a/code/datums/elements/squish.dm b/code/datums/elements/squish.dm new file mode 100644 index 0000000000..823d391e14 --- /dev/null +++ b/code/datums/elements/squish.dm @@ -0,0 +1,28 @@ +#define SHORT 5/7 +#define TALL 7/5 + +/datum/element/squish + element_flags = ELEMENT_DETACH + +/datum/element/squish/Attach(datum/target, duration) + . = ..() + if(!iscarbon(target)) + return ELEMENT_INCOMPATIBLE + + var/mob/living/carbon/C = target + var/was_lying = (C.lying != 0) + addtimer(CALLBACK(src, .proc/Detach, C, was_lying), duration) + + C.transform = C.transform.Scale(TALL, SHORT) + +/datum/element/squish/Detach(mob/living/carbon/C, was_lying) + . = ..() + if(istype(C)) + var/is_lying = (C.lying != 0) + if(was_lying == is_lying) + C.transform = C.transform.Scale(SHORT, TALL) + else + C.transform = C.transform.Scale(TALL, SHORT) + +#undef SHORT +#undef TALL diff --git a/code/datums/mutations/body.dm b/code/datums/mutations/body.dm index ab7fe986fb..9f8c74e2db 100644 --- a/code/datums/mutations/body.dm +++ b/code/datums/mutations/body.dm @@ -81,6 +81,7 @@ /datum/mutation/human/dwarfism/on_acquiring(mob/living/carbon/human/owner) if(..()) return + ADD_TRAIT(owner, TRAIT_DWARF, GENETIC_MUTATION) owner.transform = owner.transform.Scale(1, 0.8) passtable_on(owner, GENETIC_MUTATION) owner.visible_message("[owner] suddenly shrinks!", "Everything around you seems to grow..") @@ -88,6 +89,7 @@ /datum/mutation/human/dwarfism/on_losing(mob/living/carbon/human/owner) if(..()) return + REMOVE_TRAIT(owner, TRAIT_DWARF, GENETIC_MUTATION) owner.transform = owner.transform.Scale(1, 1.25) passtable_off(owner, GENETIC_MUTATION) owner.visible_message("[owner] suddenly grows!", "Everything around you seems to shrink..") @@ -339,6 +341,7 @@ /datum/mutation/human/gigantism/on_acquiring(mob/living/carbon/human/owner) if(..()) return + ADD_TRAIT(owner, TRAIT_GIANT, GENETIC_MUTATION) owner.resize = 1.25 owner.update_transform() owner.visible_message("[owner] suddenly grows!", "Everything around you seems to shrink..") @@ -346,6 +349,7 @@ /datum/mutation/human/gigantism/on_losing(mob/living/carbon/human/owner) if(..()) return + REMOVE_TRAIT(owner, TRAIT_GIANT, GENETIC_MUTATION) owner.resize = 0.8 owner.update_transform() owner.visible_message("[owner] suddenly shrinks!", "Everything around you seems to grow..") diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 6089d11d6c..cc6f84a18f 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -251,8 +251,13 @@ /atom/movable/proc/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) set waitfor = 0 - SEND_SIGNAL(src, COMSIG_MOVABLE_IMPACT, hit_atom, throwingdatum) - return hit_atom.hitby(src, throwingdatum=throwingdatum) + var/hitpush = TRUE + var/impact_signal = SEND_SIGNAL(src, COMSIG_MOVABLE_IMPACT, hit_atom, throwingdatum) + if(impact_signal & COMPONENT_MOVABLE_IMPACT_FLIP_HITPUSH) + hitpush = FALSE // hacky, tie this to something else or a proper workaround later + + if(impact_signal & ~COMPONENT_MOVABLE_IMPACT_NEVERMIND) // in case a signal interceptor broke or deleted the thing before we could process our hit + return hit_atom.hitby(src, throwingdatum = throwingdatum, hitpush = hitpush) /atom/movable/hitby(atom/movable/AM, skipcatch, hitpush = TRUE, blocked, datum/thrownthing/throwingdatum) if(!anchored && hitpush && (!throwingdatum || (throwingdatum.force >= (move_resist * MOVE_FORCE_PUSH_RATIO)))) diff --git a/code/game/gamemodes/clown_ops/clown_ops.dm b/code/game/gamemodes/clown_ops/clown_ops.dm index 11898701fa..d0914b8d8f 100644 --- a/code/game/gamemodes/clown_ops/clown_ops.dm +++ b/code/game/gamemodes/clown_ops/clown_ops.dm @@ -37,7 +37,7 @@ uniform = /obj/item/clothing/under/syndicate shoes = /obj/item/clothing/shoes/clown_shoes/combat mask = /obj/item/clothing/mask/gas/clown_hat - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat/insulated back = /obj/item/storage/backpack/clown ears = /obj/item/radio/headset/syndicate/alt l_pocket = /obj/item/pinpointer/nuke/syndicate diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 48a298984c..5da95bbd3a 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -120,8 +120,7 @@ uniform = /obj/item/clothing/under/syndicate shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat - back = /obj/item/storage/backpack + gloves = /obj/item/clothing/gloves/tackler/combat/insulated ears = /obj/item/radio/headset/syndicate/alt l_pocket = /obj/item/pinpointer/nuke/syndicate id = /obj/item/card/id/syndicate diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index d79fba7172..8aa2627825 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -518,6 +518,6 @@ /obj/item/gun/ballistic/automatic/toy/pistol = 5, /obj/item/firing_pin = 5, /obj/item/grenade/empgrenade = 15, - /obj/item/clothing/gloves/combat = 10, + /obj/item/clothing/gloves/tackler/combat/insulated = 10, /obj/item/clothing/shoes/sneakers/noslip = 10 ) diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index 50620b90fe..64e0a6b492 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -138,7 +138,7 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons) new /obj/item/crowbar/red(src) new /obj/item/wirecutters(src, "red") new /obj/item/multitool(src) - new /obj/item/clothing/gloves/combat(src) + new /obj/item/clothing/gloves/tackler/combat/insulated(src) /obj/item/storage/toolbox/drone name = "mechanical toolbox" @@ -311,7 +311,7 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons) new /obj/item/crowbar/red(src) new /obj/item/wirecutters(src, "red") new /obj/item/multitool/ai_detect(src) - new /obj/item/clothing/gloves/combat(src) + new /obj/item/clothing/gloves/tackler/combat/insulated(src) /obj/item/storage/toolbox/gold_real/ComponentInitialize() . = ..() diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm index 83827b56b6..0da502283b 100644 --- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm +++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm @@ -37,8 +37,8 @@ ..() new /obj/item/clothing/glasses/eyepatch(src) new /obj/item/clothing/glasses/sunglasses(src) - new /obj/item/clothing/gloves/combat(src) - new /obj/item/clothing/gloves/combat(src) + new /obj/item/clothing/gloves/tackler/combat(src) + new /obj/item/clothing/gloves/tackler/combat(src) new /obj/item/clothing/head/helmet/swat(src) new /obj/item/clothing/head/helmet/swat(src) new /obj/item/clothing/mask/gas/sechailer/swat(src) diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index c918e7b867..e794e12ad7 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -453,7 +453,7 @@ name = "Syndicate Operative Empty" uniform = /obj/item/clothing/under/syndicate shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat/insulated ears = /obj/item/radio/headset/syndicate/alt back = /obj/item/storage/backpack implants = list(/obj/item/implant/weapons_auth) diff --git a/code/modules/antagonists/bloodsucker/powers/fortitude.dm b/code/modules/antagonists/bloodsucker/powers/fortitude.dm index f0724f8204..d1df049dd1 100644 --- a/code/modules/antagonists/bloodsucker/powers/fortitude.dm +++ b/code/modules/antagonists/bloodsucker/powers/fortitude.dm @@ -3,7 +3,7 @@ /datum/action/bloodsucker/fortitude - name = "Fortitude"//"Cellular Emporium" + name = "Fortitude" desc = "Withstand egregious physical wounds and walk away from attacks that would stun, pierce, and dismember lesser beings. You cannot run while active." button_icon_state = "power_fortitude" bloodcost = 30 @@ -12,43 +12,39 @@ amToggle = TRUE warn_constant_cost = TRUE - var/this_resist // So we can raise and lower your brute resist based on what your level_current WAS. + var/fortitude_resist // So we can raise and lower your brute resist based on what your level_current WAS. /datum/action/bloodsucker/fortitude/ActivatePower() - var/datum/antagonist/bloodsucker/bloodsuckerdatum = owner.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + var/datum/antagonist/bloodsucker/B = owner.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) var/mob/living/user = owner to_chat(user, "Your flesh, skin, and muscles become as steel.") // Traits & Effects ADD_TRAIT(user, TRAIT_PIERCEIMMUNE, "fortitude") ADD_TRAIT(user, TRAIT_NODISMEMBER, "fortitude") ADD_TRAIT(user, TRAIT_STUNIMMUNE, "fortitude") - ADD_TRAIT(user, TRAIT_NORUNNING, "fortitude") if(ishuman(owner)) var/mob/living/carbon/human/H = owner - this_resist = max(0.3, 0.7 - level_current * 0.1) - H.physiology.brute_mod *= this_resist//0.5 - H.physiology.burn_mod *= this_resist//0.5 - // Stop Running (Taken from /datum/quirk/nyctophobia in negative.dm) + fortitude_resist = max(0.3, 0.7 - level_current * 0.1) + H.physiology.brute_mod *= fortitude_resist + H.physiology.burn_mod *= fortitude_resist var/was_running = (user.m_intent == MOVE_INTENT_RUN) if(was_running) user.toggle_move_intent() - while(bloodsuckerdatum && ContinueActive(user) || user.m_intent == MOVE_INTENT_RUN) + while(B && ContinueActive(user) && !(user.m_intent == MOVE_INTENT_RUN)) // Pay Blood Toll (if awake) if(user.stat == CONSCIOUS) - bloodsuckerdatum.AddBloodVolume(-0.5) // Used to be 0.3 blood per 2 seconds, but we're making it more expensive to keep on. + B.AddBloodVolume(-0.5) sleep(20) // Check every few ticks that we haven't disabled this power // Return to Running (if you were before) - if(was_running && user.m_intent != MOVE_INTENT_RUN) - user.toggle_move_intent() - + /datum/action/bloodsucker/fortitude/DeactivatePower(mob/living/user = owner, mob/living/target) ..() // Restore Traits & Effects REMOVE_TRAIT(user, TRAIT_PIERCEIMMUNE, "fortitude") REMOVE_TRAIT(user, TRAIT_NODISMEMBER, "fortitude") REMOVE_TRAIT(user, TRAIT_STUNIMMUNE, "fortitude") - REMOVE_TRAIT(user, TRAIT_NORUNNING, "fortitude") - if(ishuman(owner)) - var/mob/living/carbon/human/H = owner - H.physiology.brute_mod /= this_resist//0.5 - H.physiology.burn_mod /= this_resist//0.5 + if(!ishuman(owner)) + return + var/mob/living/carbon/human/H = owner + H.physiology.brute_mod /= fortitude_resist + H.physiology.burn_mod /= fortitude_resist diff --git a/code/modules/antagonists/bloodsucker/powers/lunge.dm b/code/modules/antagonists/bloodsucker/powers/lunge.dm index f6dfc8ba72..e1e8f4363a 100644 --- a/code/modules/antagonists/bloodsucker/powers/lunge.dm +++ b/code/modules/antagonists/bloodsucker/powers/lunge.dm @@ -1,88 +1,28 @@ -// Level 1: Grapple level 2 -// Level 2: Grapple 3 from Behind -// Level 3: Grapple 3 from Shadows -/datum/action/bloodsucker/targeted/lunge + + +/datum/action/bloodsucker/lunge name = "Predatory Lunge" desc = "Spring at your target and aggressively grapple them without warning. Attacks from concealment or the rear may even knock them down." button_icon_state = "power_lunge" bloodcost = 10 - cooldown = 120 - target_range = 3 - power_activates_immediately = TRUE - message_Trigger = "Whom will you ensnare within your grasp?" - must_be_capacitated = TRUE + cooldown = 30 bloodsucker_can_buy = TRUE + warn_constant_cost = TRUE + amToggle = TRUE -/datum/action/bloodsucker/targeted/lunge/CheckCanUse(display_error) - if(!..(display_error))// DEFAULT CHECKS - return FALSE - // Being Grabbed - if(owner.pulledby && owner.pulledby.grab_state >= GRAB_AGGRESSIVE) - if(display_error) - to_chat(owner, "You're being grabbed!") - return FALSE - if(!owner.has_gravity(owner.loc))//TODO figure out how to check if theyre able to move while in nograv - if(display_error) - to_chat(owner, "You cant lunge while floating!") - return FALSE - return TRUE +/datum/action/bloodsucker/lunge/ActivatePower() + var/mob/living/user = owner + var/datum/antagonist/bloodsucker/B = user.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + user.LoadComponent(/datum/component/tackler, stamina_cost = 50, base_knockdown = 3 SECONDS, range = 4, speed = 0.8, skill_mod = 5, min_distance = 2) + active = TRUE + while(B && ContinueActive(user) && CHECK_MOBILITY(user, MOBILITY_STAND)) + B.AddBloodVolume(-0.1) + sleep(5) -/datum/action/bloodsucker/targeted/lunge/CheckValidTarget(atom/A) - return iscarbon(A) +/datum/action/bloodsucker/lunge/ContinueActive(mob/living/user) + return ..() -/datum/action/bloodsucker/targeted/lunge/CheckCanTarget(atom/A, display_error) - // Check: Self - if(target == owner) - return FALSE - // Check: Range - //if (!(target in view(target_range, get_turf(owner)))) - // if (display_error) - // to_chat(owner, "Your victim is too far away.") - // return FALSE - // DEFAULT CHECKS (Distance) - if(!..()) - return FALSE - // Check: Turf - var/mob/living/L = A - if(!isturf(L.loc)) - return FALSE - return TRUE - -/datum/action/bloodsucker/targeted/lunge/FireTargetedPower(atom/A) - // set waitfor = FALSE <---- DONT DO THIS!We WANT this power to hold up ClickWithPower(), so that we can unlock the power when it's done. - var/mob/living/carbon/target = A - var/turf/T = get_turf(target) - var/mob/living/L = owner - // Clear Vars - owner.pulling = null - // Will we Knock them Down? - var/do_knockdown = !is_A_facing_B(target,owner) || owner.alpha <= 0 || istype(owner.loc, /obj/structure/closet) - // CAUSES: Target has their back to me, I'm invisible, or I'm in a Closet - // Step One: Heatseek toward Target's Turf - addtimer(CALLBACK(GLOBAL_PROC, .proc/_walk, owner, 0), 2 SECONDS) - target.playsound_local(get_turf(owner), 'sound/bloodsucker/lunge_warn.ogg', 60, FALSE, pressure_affected = FALSE) // target-only telegraphing - owner.playsound_local(owner, 'sound/bloodsucker/lunge_warn.ogg', 60, FALSE, pressure_affected = FALSE) // audio feedback to the user - if(do_mob(owner, owner, 7, TRUE, TRUE)) - walk_towards(owner, T, 0.1, 10) // yes i know i shouldn't use this but i don't know how to work in anything better - if(get_turf(owner) != T && !(isliving(target) && target.Adjacent(owner)) && owner.incapacitated() && !CHECK_MOBILITY(L, MOBILITY_STAND)) - var/send_dir = get_dir(owner, T) - new /datum/forced_movement(owner, get_ranged_target_turf(owner, send_dir, 1), 1, FALSE) - owner.spin(10) - // Step Two: Check if I'm at/adjectent to Target's CURRENT turf (not original...that was just a destination) - for(var/i in 1 to 6) - if (target.Adjacent(owner)) - // LEVEL 2: If behind target, mute or unconscious! - if(do_knockdown) // && level_current >= 1) - target.Knockdown(15 + 10 * level_current,1) - target.adjustStaminaLoss(40 + 10 * level_current) - // Cancel Walk (we were close enough to contact them) - walk(owner, 0) - target.Stun(10,1) //Without this the victim can just walk away - target.grabbedby(owner) // Taken from mutations.dm under changelings - target.grippedby(owner, instant = TRUE) //instant aggro grab - break - sleep(3) - -/datum/action/bloodsucker/targeted/lunge/DeactivatePower(mob/living/user = owner, mob/living/target) +/datum/action/bloodsucker/lunge/DeactivatePower(mob/living/user = owner) ..() // activate = FALSE - user.update_mobility() + var/datum/component/tackler + tackler.RemoveComponent() diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm index 0d96c125a1..f841ae20ca 100644 --- a/code/modules/awaymissions/capture_the_flag.dm +++ b/code/modules/awaymissions/capture_the_flag.dm @@ -487,8 +487,7 @@ suit = /obj/item/clothing/suit/space/hardsuit/shielded/ctf toggle_helmet = FALSE // see the whites of their eyes shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat - id = /obj/item/card/id/syndicate + gloves = /obj/item/clothing/gloves/tackler/combat belt = /obj/item/gun/ballistic/automatic/pistol/deagle/ctf l_pocket = /obj/item/ammo_box/magazine/recharge/ctf r_pocket = /obj/item/ammo_box/magazine/recharge/ctf diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 50dd1e5608..ab0c9eb691 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -488,7 +488,7 @@ glasses = /obj/item/clothing/glasses/eyepatch mask = /obj/item/clothing/mask/cigarette/cigar/cohiba head = /obj/item/clothing/head/centhat - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat shoes = /obj/item/clothing/shoes/combat/swat r_pocket = /obj/item/lighter id = /obj/item/card/id @@ -505,7 +505,7 @@ uniform = /obj/item/clothing/under/rank/security/officer suit = /obj/item/clothing/suit/armor/vest shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat mask = /obj/item/clothing/mask/gas/sechailer/swat head = /obj/item/clothing/head/helmet/swat/nanotrasen back = /obj/item/storage/backpack/security diff --git a/code/modules/cargo/exports/gear.dm b/code/modules/cargo/exports/gear.dm index 10b3d4f707..cefa705b0d 100644 --- a/code/modules/cargo/exports/gear.dm +++ b/code/modules/cargo/exports/gear.dm @@ -309,7 +309,7 @@ /datum/export/gear/combatgloves cost = 80 unit_name = "combat gloves" - export_types = list(/obj/item/clothing/gloves/combat, /obj/item/clothing/gloves/rapid, /obj/item/clothing/gloves/krav_maga) + export_types = list(/obj/item/clothing/gloves/tackler/combat/insulated, /obj/item/clothing/gloves/rapid, /obj/item/clothing/gloves/krav_maga) include_subtypes = TRUE /datum/export/gear/bonegloves @@ -797,4 +797,4 @@ datum/export/gear/glasses //glasses are not worth selling export_types = list(/obj/item/clothing/head/chameleon, /obj/item/clothing/mask/chameleon, /obj/item/clothing/under/chameleon, /obj/item/clothing/suit/chameleon, /obj/item/clothing/glasses/chameleon,\ /obj/item/clothing/gloves/chameleon, /obj/item/clothing/head/chameleon, /obj/item/clothing/shoes/chameleon, /obj/item/storage/backpack/chameleon, \ /obj/item/storage/belt/chameleon, /obj/item/radio/headset/chameleon, /obj/item/pda/chameleon, /obj/item/stamp/chameleon, /obj/item/clothing/neck/cloak/chameleon) - include_subtypes = TRUE \ No newline at end of file + include_subtypes = TRUE diff --git a/code/modules/cargo/packs/armory.dm b/code/modules/cargo/packs/armory.dm index d832200201..501b1426ae 100644 --- a/code/modules/cargo/packs/armory.dm +++ b/code/modules/cargo/packs/armory.dm @@ -175,7 +175,7 @@ /obj/item/clothing/suit/armor/vest/russian, /obj/item/clothing/head/helmet/rus_helmet, /obj/item/clothing/shoes/russian, - /obj/item/clothing/gloves/combat, + /obj/item/clothing/gloves/tackler/combat/insulated, /obj/item/clothing/under/syndicate/rus_army, /obj/item/clothing/under/costume/soviet, /obj/item/clothing/mask/russian_balaclava, @@ -201,8 +201,8 @@ /obj/item/clothing/mask/gas/sechailer/swat, /obj/item/storage/belt/military/assault, /obj/item/storage/belt/military/assault, - /obj/item/clothing/gloves/combat, - /obj/item/clothing/gloves/combat) + /obj/item/clothing/gloves/tackler/combat/insulated, + /obj/item/clothing/gloves/tackler/combat/insulated) crate_name = "swat crate" /datum/supply_pack/security/armory/wt550 diff --git a/code/modules/cargo/packs/security.dm b/code/modules/cargo/packs/security.dm index aea7b95742..ee750b8df7 100644 --- a/code/modules/cargo/packs/security.dm +++ b/code/modules/cargo/packs/security.dm @@ -91,8 +91,8 @@ /obj/item/clothing/suit/armor/bulletproof, /obj/item/clothing/head/helmet/alt, /obj/item/clothing/head/helmet/alt, - /obj/item/clothing/gloves/combat, - /obj/item/clothing/gloves/combat, + /obj/item/clothing/gloves/tackler/combat/insulated, + /obj/item/clothing/gloves/tackler/combat/insulated, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas) crate_name = "surplus russian clothing" @@ -109,7 +109,7 @@ /obj/item/clothing/head/ushanka, /obj/item/clothing/suit/armor/bulletproof, /obj/item/clothing/head/helmet/alt, - /obj/item/clothing/gloves/combat, + /obj/item/clothing/gloves/tackler/combat/insulated, /obj/item/clothing/mask/gas, /obj/item/gun/ballistic/shotgun/boltaction, /obj/item/ammo_box/a762) diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 9f4b89f607..eb53beb139 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -26,7 +26,7 @@ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 30) strip_mod = 0.9 -/obj/item/clothing/gloves/combat +/obj/item/clothing/gloves/tackler/combat/insulated name = "combat gloves" desc = "These tactical gloves are fireproof and shock resistant." icon_state = "combat" @@ -117,4 +117,4 @@ strip_delay = 80 transfer_prints = FALSE strip_mod = 5 - strip_silence = TRUE \ No newline at end of file + strip_silence = TRUE diff --git a/code/modules/clothing/gloves/tacklers.dm b/code/modules/clothing/gloves/tacklers.dm new file mode 100644 index 0000000000..95c7739bd8 --- /dev/null +++ b/code/modules/clothing/gloves/tacklers.dm @@ -0,0 +1,100 @@ +/obj/item/clothing/gloves/tackler + name = "gripper gloves" + desc = "Special gloves that manipulate the blood vessels in the wearer's hands, granting them the ability to launch headfirst into walls." + icon_state = "tackle" + item_state = "tackle" + transfer_prints = TRUE + cold_protection = HANDS + min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT + resistance_flags = NONE + //custom_premium_price = 350 + /// For storing our tackler datum so we can remove it after + var/datum/component/tackler + /// See: [/datum/component/tackler/var/stamina_cost] + var/tackle_stam_cost = 25 + /// See: [/datum/component/tackler/var/base_knockdown] + var/base_knockdown = 1 SECONDS + /// See: [/datum/component/tackler/var/range] + var/tackle_range = 4 + /// See: [/datum/component/tackler/var/min_distance] + var/min_distance = 0 + /// See: [/datum/component/tackler/var/speed] + var/tackle_speed = 1 + /// See: [/datum/component/tackler/var/skill_mod] + var/skill_mod = 0 + +/obj/item/clothing/gloves/tackler/equipped(mob/user, slot) + . = ..() + if(!ishuman(user)) + return + if(slot == ITEM_SLOT_GLOVES) + var/mob/living/carbon/human/H = user + tackler = H.AddComponent(/datum/component/tackler, stamina_cost=tackle_stam_cost, base_knockdown = base_knockdown, range = tackle_range, speed = tackle_speed, skill_mod = skill_mod, min_distance = min_distance) + +/obj/item/clothing/gloves/tackler/dropped(mob/user) + . = ..() + if(!ishuman(user)) + return + var/mob/living/carbon/human/H = user + if(H.get_item_by_slot(ITEM_SLOT_GLOVES) == src) + qdel(tackler) + +/obj/item/clothing/gloves/tackler/dolphin + name = "dolphin gloves" + desc = "Sleek, aerodynamic gripper gloves that are less effective at actually performing takedowns, but more effective at letting the user sail through the hallways and cause accidents." + icon_state = "tackledolphin" + item_state = "tackledolphin" + + tackle_stam_cost = 15 + base_knockdown = 0.5 SECONDS + tackle_range = 5 + tackle_speed = 2 + min_distance = 2 + skill_mod = -2 + +/obj/item/clothing/gloves/tackler/combat + name = "gorilla gloves" + desc = "Premium quality combative gloves, heavily reinforced to give the user an edge in close combat tackles, though they are more taxing to use than normal gripper gloves. Fireproof to boot!" + icon_state = "black" + item_state = "blackgloves" + + tackle_stam_cost = 35 + base_knockdown = 1.5 SECONDS + tackle_range = 5 + skill_mod = 2 + + cold_protection = HANDS + min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT + heat_protection = HANDS + max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT + resistance_flags = NONE + +/obj/item/clothing/gloves/tackler/combat/insulated + name = "guerilla gloves" + desc = "Superior quality combative gloves, good for performing tackle takedowns as well as absorbing electrical shocks." + siemens_coefficient = 0 + permeability_coefficient = 0.05 + +/obj/item/clothing/gloves/tackler/rocket + name = "rocket gloves" + desc = "The ultimate in high risk, high reward, perfect for when you need to stop a criminal from fifty feet away or die trying. Banned in most Spinward gridiron football and rugby leagues." + icon_state = "tacklerocket" + item_state = "tacklerocket" + + tackle_stam_cost = 50 + base_knockdown = 2 SECONDS + tackle_range = 10 + min_distance = 7 + tackle_speed = 6 + skill_mod = 7 + +/obj/item/clothing/gloves/tackler/offbrand + name = "improvised gripper gloves" + desc = "Ratty looking fingerless gloves wrapped with sticky tape. Beware anyone wearing these, for they clearly have no shame and nothing to lose." + icon_state = "fingerless" + item_state = "fingerless" + + tackle_stam_cost = 30 + base_knockdown = 1.75 SECONDS + min_distance = 2 + skill_mod = -1 diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm index 48cc92db61..43df2eec2f 100644 --- a/code/modules/clothing/outfits/ert.dm +++ b/code/modules/clothing/outfits/ert.dm @@ -3,7 +3,7 @@ uniform = /obj/item/clothing/under/rank/centcom/officer shoes = /obj/item/clothing/shoes/combat/swat - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat/insulated ears = /obj/item/radio/headset/headset_cent/alt /datum/outfit/ert/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source) @@ -69,7 +69,7 @@ id = /obj/item/card/id/ert/Security suit = /obj/item/clothing/suit/space/hardsuit/ert/sec glasses = /obj/item/clothing/glasses/hud/security/sunglasses - back = /obj/item/storage/backpack/security + gloves = /obj/item/clothing/gloves/tackler/combat/insulated belt = /obj/item/storage/belt/security/full backpack_contents = list(/obj/item/storage/box/engineer=1,\ /obj/item/storage/box/handcuffs=1,\ diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm index b1f6e7696d..d692f9c3fb 100644 --- a/code/modules/clothing/outfits/standard.dm +++ b/code/modules/clothing/outfits/standard.dm @@ -205,7 +205,7 @@ uniform = /obj/item/clothing/under/rank/centcom/commander suit = /obj/item/clothing/suit/armor/bulletproof shoes = /obj/item/clothing/shoes/combat/swat - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat/insulated ears = /obj/item/radio/headset/headset_cent/commander glasses = /obj/item/clothing/glasses/eyepatch mask = /obj/item/clothing/mask/cigarette/cigar/cohiba @@ -234,7 +234,7 @@ uniform = /obj/item/clothing/under/syndicate suit = /obj/item/clothing/suit/space/officer shoes = /obj/item/clothing/shoes/combat/swat - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat/insulated glasses = /obj/item/clothing/glasses/thermal/eyepatch ears = /obj/item/radio/headset/headset_cent/commander mask = /obj/item/clothing/mask/cigarette/cigar/havana @@ -316,7 +316,7 @@ uniform = /obj/item/clothing/under/costume/soviet head = /obj/item/clothing/head/pirate/captain shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat/insulated ears = /obj/item/radio/headset/headset_cent glasses = /obj/item/clothing/glasses/thermal/eyepatch suit = /obj/item/clothing/suit/pirate/captain @@ -372,7 +372,7 @@ uniform = /obj/item/clothing/under/color/green suit = /obj/item/clothing/suit/space/hardsuit/deathsquad shoes = /obj/item/clothing/shoes/combat/swat - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat/insulated mask = /obj/item/clothing/mask/gas/sechailer/swat glasses = /obj/item/clothing/glasses/hud/toggle/thermal back = /obj/item/storage/backpack/security @@ -431,7 +431,7 @@ glasses = /obj/item/clothing/glasses/debug ears = /obj/item/radio/headset/headset_cent/commander mask = /obj/item/clothing/mask/gas/welding/up - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat/insulated belt = /obj/item/storage/belt/utility/chief/full l_pocket = /obj/item/gun/magic/wand/resurrection/debug r_pocket = /obj/item/gun/magic/wand/death/debug diff --git a/code/modules/clothing/outfits/vr.dm b/code/modules/clothing/outfits/vr.dm index ee350e3891..7a057eda41 100644 --- a/code/modules/clothing/outfits/vr.dm +++ b/code/modules/clothing/outfits/vr.dm @@ -17,7 +17,7 @@ name = "Syndicate VR Operative - Basic" uniform = /obj/item/clothing/under/syndicate shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat/insulated back = /obj/item/storage/backpack id = /obj/item/card/id/syndicate belt = /obj/item/gun/ballistic/automatic/pistol diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index fc85fc25c4..cb3833b7f6 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -110,7 +110,7 @@ var/mob/living/carbon/victim = hit_atom if(victim.movement_type & FLYING) return - if(hurt) + if(hurt && !GetComponent(/datum/component/tackler)) victim.take_bodypart_damage(10) take_bodypart_damage(10) victim.DefaultCombatKnockdown(20) diff --git a/code/modules/mob/living/carbon/human/species_types/dwarves.dm b/code/modules/mob/living/carbon/human/species_types/dwarves.dm index bb2c08aa9b..112962f7e6 100644 --- a/code/modules/mob/living/carbon/human/species_types/dwarves.dm +++ b/code/modules/mob/living/carbon/human/species_types/dwarves.dm @@ -6,7 +6,7 @@ GLOBAL_LIST_INIT(dwarf_last, world.file2list("strings/names/dwarf_last.txt")) // name = "Dwarf" id = "dwarf" //Also called Homo sapiens pumilionis default_color = "FFFFFF" - species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,NO_UNDERWEAR) + species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,NO_UNDERWEAR,TRAIT_DWARF) inherent_traits = list() limbs_id = "human" use_skintones = 1 @@ -36,7 +36,6 @@ GLOBAL_LIST_INIT(dwarf_last, world.file2list("strings/names/dwarf_last.txt")) // H.transform = H.transform.Scale(1, 0.8) //We use scale, and yeah. Dwarves can become gnomes with DWARFISM. RegisterSignal(C, COMSIG_MOB_SAY, .proc/handle_speech) //We register handle_speech is being used. - /datum/species/dwarf/on_species_loss(mob/living/carbon/H, datum/species/new_species) . = ..() H.transform = H.transform.Scale(1, 1.25) //And we undo it. diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm index 2e0e9dadb4..585bf58d95 100644 --- a/code/modules/mob/living/simple_animal/corpse.dm +++ b/code/modules/mob/living/simple_animal/corpse.dm @@ -20,7 +20,7 @@ uniform = /obj/item/clothing/under/syndicate suit = /obj/item/clothing/suit/armor/vest shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat/insulated ears = /obj/item/radio/headset mask = /obj/item/clothing/mask/gas head = /obj/item/clothing/head/helmet/swat @@ -39,7 +39,7 @@ uniform = /obj/item/clothing/under/syndicate suit = /obj/item/clothing/suit/space/hardsuit/syndi shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat/insulated ears = /obj/item/radio/headset mask = /obj/item/clothing/mask/gas/syndicate back = /obj/item/tank/jetpack/oxygen @@ -59,7 +59,7 @@ uniform = /obj/item/clothing/under/syndicate suit = /obj/item/clothing/suit/space/hardsuit/syndi/elite shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat ears = /obj/item/radio/headset mask = /obj/item/clothing/mask/gas/syndicate back = /obj/item/tank/jetpack/oxygen/harness @@ -130,7 +130,7 @@ uniform = /obj/item/clothing/under/syndicate/camo suit = /obj/item/clothing/suit/armor/bulletproof shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat ears = /obj/item/radio/headset head = /obj/item/clothing/head/helmet/alt mask = /obj/item/clothing/mask/balaclava @@ -177,7 +177,7 @@ uniform = /obj/item/clothing/under/rank/security/officer suit = /obj/item/clothing/suit/armor/vest shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat ears = /obj/item/radio/headset mask = /obj/item/clothing/mask/gas/sechailer/swat head = /obj/item/clothing/head/helmet/swat/nanotrasen diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 89d9919981..8487564c98 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -200,7 +200,7 @@ /mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/proc/infest(mob/living/carbon/human/H) visible_message("[name] burrows into the flesh of [H]!") var/mob/living/simple_animal/hostile/asteroid/hivelord/legion/L - if(H.dna.check_mutation(DWARFISM)) //dwarf legions aren't just fluff! + if(HAS_TRAIT(H, TRAIT_DWARF)) //dwarf legions aren't just fluff! L = new /mob/living/simple_animal/hostile/asteroid/hivelord/legion/dwarf(H.loc) else L = new(H.loc) diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index b7f32421aa..5f3c06642f 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -728,7 +728,7 @@ All effects don't start immediately, but rather get worse over time; the rate is var/real_dorf = isdwarf(M) //_species(H, /datum/species/dwarf) if(ishuman(M)) var/mob/living/carbon/human/H = M - if(H.dna.check_mutation(DWARFISM) || HAS_TRAIT(H, TRAIT_ALCOHOL_TOLERANCE) || real_dorf) + if(HAS_TRAIT(H, TRAIT_DWARF) || HAS_TRAIT(H, TRAIT_ALCOHOL_TOLERANCE || real_dorf)) to_chat(H, "Now THAT is MANLY!") if(real_dorf) boozepwr = 100 // Don't want dwarves to die because of a low booze power diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index c18c33b04b..b734931de2 100644 --- a/code/modules/research/designs/misc_designs.dm +++ b/code/modules/research/designs/misc_designs.dm @@ -614,3 +614,27 @@ build_path = /obj/item/circuitboard/computer/sat_control category = list("Computer Boards") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + + + +///////////////////////////////////////// +////////////Tackle Gloves//////////////// +///////////////////////////////////////// + +/datum/design/tackle_dolphin + name = "Dolphin Gloves" + id = "tackle_dolphin" + build_type = PROTOLATHE + materials = list(/datum/material/plastic = 2500) + build_path = /obj/item/clothing/gloves/tackler/dolphin + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_SECURITY + +/datum/design/tackle_rocket + name = "Rocket Gloves" + id = "tackle_rocket" + build_type = PROTOLATHE + materials = list(/datum/material/plasma = 1000, /datum/material/plastic = 2000) + build_path = /obj/item/clothing/gloves/tackler/rocket + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_SECURITY diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm index d09c1ce86f..2192b2fddb 100644 --- a/code/modules/ruins/lavaland_ruin_code.dm +++ b/code/modules/ruins/lavaland_ruin_code.dm @@ -142,7 +142,7 @@ uniform = /obj/item/clothing/under/syndicate suit = /obj/item/clothing/suit/toggle/labcoat shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat + gloves = /obj/item/clothing/gloves/tackler/combat/insulated ears = /obj/item/radio/headset/syndicate/alt back = /obj/item/storage/backpack r_pocket = /obj/item/gun/ballistic/automatic/pistol diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm index 09681def64..ec741ef574 100644 --- a/code/modules/vending/security.dm +++ b/code/modules/vending/security.dm @@ -21,6 +21,7 @@ /obj/item/clothing/head/helmet/blueshirt = 1, /obj/item/clothing/suit/armor/vest/blueshirt = 1, /obj/item/clothing/under/rank/security/officer/blueshirt = 1, + /obj/item/clothing/gloves/tackler = 5, /obj/item/ssword_kit = 1) armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50) resistance_flags = FIRE_PROOF diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi new file mode 100644 index 0000000000000000000000000000000000000000..cb4251fd3c6240b89b7d7340c5c03331577990d9 GIT binary patch literal 11008 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 literal 0 HcmV?d00001 diff --git a/tgstation.dme b/tgstation.dme index d56d8489cc..b557a75627 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -415,6 +415,7 @@ #include "code\datums\components\stationloving.dm" #include "code\datums\components\summoning.dm" #include "code\datums\components\swarming.dm" +#include "code\datums\components\tackle.dm" #include "code\datums\components\tactical.dm" #include "code\datums\components\thermite.dm" #include "code\datums\components\uplink.dm" @@ -1722,6 +1723,7 @@ #include "code\modules\clothing\gloves\color.dm" #include "code\modules\clothing\gloves\miscellaneous.dm" #include "code\modules\clothing\gloves\ring.dm" +#include "code\modules\clothing\gloves\tacklers.dm" #include "code\modules\clothing\head\_head.dm" #include "code\modules\clothing\head\beanie.dm" #include "code\modules\clothing\head\cit_hats.dm" From 1ffea14ee88288e99c24ab97436f03252a0ff0be Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Thu, 9 Apr 2020 19:53:14 +0100 Subject: [PATCH 12/60] makes descriptions work --- code/modules/food_and_drinks/food/snacks.dm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index 92f8d104a6..889ec42185 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -153,6 +153,12 @@ All foods are distributed among various categories. Use common sense. /obj/item/reagent_containers/food/snacks/examine(mob/user) . = ..() + if(food_quality >= 70) + . += "It is of a high quality." + else + if(food_quality <= 30) + . += "It is of a low quality." + if(bitecount == 0) return else if(bitecount == 1) @@ -162,13 +168,6 @@ All foods are distributed among various categories. Use common sense. else . += "[src] was bitten multiple times!" - //examine text for quality - if(food_quality >= 70) - . += "It is of a high quality." - else - if(food_quality <= 30) - . += "It is of a low quality." - /obj/item/reagent_containers/food/snacks/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/storage)) From 951732c36132490ac7b6e9f0813b1149300bac7d Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Thu, 9 Apr 2020 20:12:02 +0100 Subject: [PATCH 13/60] make secret sauce work on customizables --- code/modules/reagents/chemistry/reagents/food_reagents.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index c555609992..cf6c3789ec 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -782,7 +782,11 @@ if(reac_volume >= 1 && istype(O, /obj/item/reagent_containers/food)) var/obj/item/reagent_containers/food/splashed_food = O splashed_food.adjust_food_quality(100) - + // if it's a customisable food, we need to edit its total quality too, to prevent its quality resetting from adding more ingredients! + if(istype(O, obj/item/reagent_containers/food/customizable)) + var/obj/item/reagent_containers/food/customizable/splashed_custom_food = O + splashed_custom_food.total_quality += 10000 +r /datum/reagent/consumable/char name = "Char" description = "Essence of the grill. Has strange properties when overdosed." From 4c4e11037522b6eb04dd635b6d354145bedb3d4a Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Thu, 9 Apr 2020 20:16:55 +0100 Subject: [PATCH 14/60] imagine making it compile --- code/modules/reagents/chemistry/reagents/food_reagents.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index cf6c3789ec..654d69a599 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -783,8 +783,8 @@ var/obj/item/reagent_containers/food/splashed_food = O splashed_food.adjust_food_quality(100) // if it's a customisable food, we need to edit its total quality too, to prevent its quality resetting from adding more ingredients! - if(istype(O, obj/item/reagent_containers/food/customizable)) - var/obj/item/reagent_containers/food/customizable/splashed_custom_food = O + if(istype(O, /obj/item/reagent_containers/food/snacks/customizable)) + var/obj/item/reagent_containers/food/snacks/customizable/splashed_custom_food = O splashed_custom_food.total_quality += 10000 r /datum/reagent/consumable/char From ea8d43281ebf2c788cfe43446854810598de504d Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Fri, 10 Apr 2020 03:21:06 +0100 Subject: [PATCH 15/60] swap & for && woops Co-Authored-By: Lin --- code/modules/food_and_drinks/food.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/food_and_drinks/food.dm b/code/modules/food_and_drinks/food.dm index beaf5ed1ba..203eb3eef6 100644 --- a/code/modules/food_and_drinks/food.dm +++ b/code/modules/food_and_drinks/food.dm @@ -40,7 +40,7 @@ to_chat(H,"That didn't taste very good...") H.adjust_disgust(11 + 15 * fraction) SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "gross_food", /datum/mood_event/gross_food) - else if((foodtype & H.dna.species.liked_food & food_quality >= 50) || food_quality >= 70) //you like food of high quality, and food of regular quality you have a preference for + else if(((foodtype & H.dna.species.liked_food) && food_quality >= 50) || food_quality >= 70) //you like food of high quality, and food of regular quality you have a preference for to_chat(H,"I love this taste!") H.adjust_disgust(-5 + (-2.5 * food_quality/50) + -2.5 * fraction) SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "fav_food", /datum/mood_event/favorite_food) @@ -52,4 +52,4 @@ SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "breakfast", /datum/mood_event/breakfast) last_check_time = world.time -#undef STOP_SERVING_BREAKFAST \ No newline at end of file +#undef STOP_SERVING_BREAKFAST From f481be14968a80330ea50debef067a91563d369e Mon Sep 17 00:00:00 2001 From: Artur Date: Fri, 10 Apr 2020 20:53:28 +0300 Subject: [PATCH 16/60] Makin stuff nice and dandy --- code/__DEFINES/dcs/signals.dm | 2 +- code/datums/components/tackle.dm | 40 ++++++++----------- .../antagonists/bloodsucker/powers/lunge.dm | 28 ++++++++----- code/modules/mob/living/carbon/carbon.dm | 4 +- .../mob/living/carbon/carbon_defines.dm | 1 + 5 files changed, 41 insertions(+), 34 deletions(-) diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm index 70c2425f48..5f08bd21a1 100644 --- a/code/__DEFINES/dcs/signals.dm +++ b/code/__DEFINES/dcs/signals.dm @@ -214,7 +214,7 @@ // /mob/living/carbon signals #define COMSIG_CARBON_SOUNDBANG "carbon_soundbang" //from base of mob/living/carbon/soundbang_act(): (list(intensity)) #define COMSIG_CARBON_IDENTITY_TRANSFERRED_TO "carbon_id_transferred_to" //from datum/dna/transfer_identity(): (datum/dna, transfer_SE) - +#define COMSIG_CARBON_TACKLED "carbon_tackled" //sends from tackle.dm on tackle completion // /mob/living/simple_animal/hostile signals #define COMSIG_HOSTILE_ATTACKINGTARGET "hostile_attackingtarget" #define COMPONENT_HOSTILE_NO_ATTACK 1 diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm index 28dd469041..17d2773b60 100644 --- a/code/datums/components/tackle.dm +++ b/code/datums/components/tackle.dm @@ -14,9 +14,6 @@ */ /datum/component/tackler dupe_mode = COMPONENT_DUPE_UNIQUE - - ///If we're currently tackling or are on cooldown. Actually, shit, if I use this to handle cooldowns, then getting thrown by something while on cooldown will count as a tackle..... whatever, i'll fix that next commit - var/tackling = TRUE ///How much stamina it takes to launch a tackle var/stamina_cost ///Launching a tackle calls Knockdown on you for this long, so this is your cooldown. Once you stand back up, you can tackle again. @@ -43,14 +40,15 @@ src.skill_mod = skill_mod src.min_distance = min_distance - var/mob/P = parent + var/mob/living/carbon/P = parent to_chat(P, "You are now able to launch tackles! You can do so by activating throw intent, and clicking on your target with an empty hand.") - + P.tackling = TRUE addtimer(CALLBACK(src, .proc/resetTackle), base_knockdown, TIMER_STOPPABLE) /datum/component/tackler/Destroy() - var/mob/P = parent + var/mob/living/carbon/P = parent to_chat(P, "You can no longer tackle.") + P.tackling = FALSE ..() /datum/component/tackler/RegisterWithParent() @@ -82,12 +80,12 @@ to_chat(user, "You must be standing to tackle!") return - if(tackling) + if(user.tackling) to_chat(user, "You're not ready to tackle!") return - if(user.has_movespeed_modifier(MOVESPEED_ID_SHOVE)) // can't tackle if you just got shoved - to_chat(user, "You're too off balance to tackle!") + if(user.has_status_effect(STATUS_EFFECT_TASED)) // can't tackle if you just got shoved + to_chat(user, "You cant tackle while you are tased!") return user.face_atom(A) @@ -96,7 +94,7 @@ if(modifiers["alt"] || modifiers["shift"] || modifiers["ctrl"] || modifiers["middle"]) return - tackling = TRUE + user.tackling = TRUE RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/checkObstacle) playsound(user, 'sound/weapons/thudswoosh.ogg', 40, TRUE, -1) @@ -136,7 +134,7 @@ * Finally, we return a bitflag to [COMSIG_MOVABLE_IMPACT] that forces the hitpush to false so that we don't knock them away. */ /datum/component/tackler/proc/sack(mob/living/carbon/user, atom/hit) - if(!tackling || !tackle) + if(!user.tackling || !tackle) return if(!iscarbon(hit)) @@ -149,13 +147,12 @@ var/mob/living/carbon/human/S = user var/roll = rollTackle(target) - tackling = FALSE + user.tackling = FALSE switch(roll) if(-INFINITY to -5) user.visible_message("[user] botches [user.p_their()] tackle and slams [user.p_their()] head into [target], knocking [user.p_them()]self silly!", "You botch your tackle and slam your head into [target], knocking yourself silly!", target) to_chat(target, "[user] botches [user.p_their()] tackle and slams [user.p_their()] head into you, knocking [user.p_them()]self silly!") - user.Paralyze(30) var/obj/item/bodypart/head/hed = user.get_bodypart(BODY_ZONE_HEAD) if(hed) @@ -165,11 +162,8 @@ if(-4 to -2) // glancing blow at best user.visible_message("[user] lands a weak tackle on [target], briefly knocking [target.p_them()] off-balance!", "You land a weak tackle on [target], briefly knocking [target.p_them()] off-balance!", target) to_chat(target, "[user] lands a weak tackle on you, briefly knocking you off-balance!") - user.Knockdown(30) - if(ishuman(target) && !T.has_movespeed_modifier(MOVESPEED_ID_SHOVE)) - T.add_movespeed_modifier(MOVESPEED_ID_SHOVE, multiplicative_slowdown = SHOVE_SLOWDOWN_STRENGTH) // maybe define a slightly more severe/longer slowdown for this - addtimer(CALLBACK(T, /mob/living/carbon/human/proc/clear_shove_slowdown), SHOVE_SLOWDOWN_LENGTH) + target.apply_status_effect(STATUS_EFFECT_TASED_WEAK, 6 SECONDS) if(-1 to 0) // decent hit, both parties are about equally inconvenienced user.visible_message("[user] lands a passable tackle on [target], sending them both tumbling!", "You land a passable tackle on [target], sending you both tumbling!", target) @@ -183,7 +177,6 @@ if(1 to 2) // solid hit, tackler has a slight advantage user.visible_message("[user] lands a solid tackle on [target], knocking them both down hard!", "You land a solid tackle on [target], knocking you both down hard!", target) to_chat(target, "[user] lands a solid tackle on you, knocking you both down hard!") - target.adjustStaminaLoss(30) target.Paralyze(5) user.Knockdown(10) @@ -192,8 +185,8 @@ if(3 to 4) // really good hit, the target is definitely worse off here. Without positive modifiers, this is as good a tackle as you can land user.visible_message("[user] lands an expert tackle on [target], knocking [target.p_them()] down hard while landing on [user.p_their()] feet with a passive grip!", "You land an expert tackle on [target], knocking [target.p_them()] down hard while landing on your feet with a passive grip!", target) to_chat(target, "[user] lands an expert tackle on you, knocking you down hard and maintaining a passive grab!") - user.SetKnockdown(0) + user.set_resting(FALSE, TRUE, FALSE) user.forceMove(get_turf(target)) target.adjustStaminaLoss(40) target.Paralyze(5) @@ -205,8 +198,8 @@ if(5 to INFINITY) // absolutely BODIED user.visible_message("[user] lands a monster tackle on [target], knocking [target.p_them()] senseless and applying an aggressive pin!", "You land a monster tackle on [target], knocking [target.p_them()] senseless and applying an aggressive pin!", target) to_chat(target, "[user] lands a monster tackle on you, knocking you senseless and aggressively pinning you!") - user.SetKnockdown(0) + user.set_resting(FALSE, TRUE, FALSE) user.forceMove(get_turf(target)) target.adjustStaminaLoss(40) target.Paralyze(5) @@ -215,7 +208,7 @@ S.dna.species.grab(S, T) S.setGrabState(GRAB_AGGRESSIVE) - + SEND_SIGNAL(user, COMSIG_CARBON_TACKLED, "tackle completed") return COMPONENT_MOVABLE_IMPACT_FLIP_HITPUSH /** @@ -405,7 +398,8 @@ /datum/component/tackler/proc/resetTackle() - tackling = FALSE + var/mob/living/carbon/P = parent + P.tackling = FALSE QDEL_NULL(tackle) UnregisterSignal(parent, COMSIG_MOVABLE_MOVED) @@ -441,7 +435,7 @@ ///Check to see if we hit a table, and if so, make a big mess! /datum/component/tackler/proc/checkObstacle(mob/living/carbon/owner) - if(!tackling) + if(!owner.tackling) return var/turf/T = get_turf(owner) diff --git a/code/modules/antagonists/bloodsucker/powers/lunge.dm b/code/modules/antagonists/bloodsucker/powers/lunge.dm index e1e8f4363a..d40627f493 100644 --- a/code/modules/antagonists/bloodsucker/powers/lunge.dm +++ b/code/modules/antagonists/bloodsucker/powers/lunge.dm @@ -2,27 +2,37 @@ /datum/action/bloodsucker/lunge name = "Predatory Lunge" - desc = "Spring at your target and aggressively grapple them without warning. Attacks from concealment or the rear may even knock them down." + desc = "Prepare the strenght to grapple your prey." button_icon_state = "power_lunge" bloodcost = 10 cooldown = 30 bloodsucker_can_buy = TRUE warn_constant_cost = TRUE amToggle = TRUE + var/leap_skill_mod = 5 + +/datum/action/bloodsucker/lunge/New() + . = ..() + RegisterSignal(owner, COMSIG_CARBON_TACKLED, .proc/Delayed_DeactivatePower) /datum/action/bloodsucker/lunge/ActivatePower() var/mob/living/user = owner var/datum/antagonist/bloodsucker/B = user.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) - user.LoadComponent(/datum/component/tackler, stamina_cost = 50, base_knockdown = 3 SECONDS, range = 4, speed = 0.8, skill_mod = 5, min_distance = 2) + var/datum/component/tackler/T = user.LoadComponent(/datum/component/tackler) + T.stamina_cost = 50 + T.base_knockdown = 3 SECONDS + T.range = 4 + T.speed = 0.8 + T.skill_mod = 5 + T.min_distance = 2 active = TRUE - while(B && ContinueActive(user) && CHECK_MOBILITY(user, MOBILITY_STAND)) + while(B && ContinueActive(user)) B.AddBloodVolume(-0.1) sleep(5) - -/datum/action/bloodsucker/lunge/ContinueActive(mob/living/user) - return ..() + +/datum/action/bloodsucker/lunge/proc/Delayed_DeactivatePower() + addtimer(CALLBACK(src, .proc/DeactivatePower), 1 SECONDS, TIMER_UNIQUE) /datum/action/bloodsucker/lunge/DeactivatePower(mob/living/user = owner) - ..() // activate = FALSE - var/datum/component/tackler - tackler.RemoveComponent() + . = ..() + qdel(user.GetComponent(/datum/component/tackler)) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index cb3833b7f6..dcaa1e5b8c 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -98,6 +98,8 @@ /mob/living/carbon/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) . = ..() var/hurt = TRUE + if(src.GetComponent(/datum/component/tackler)) + return if(throwingdatum?.thrower && iscyborg(throwingdatum.thrower)) var/mob/living/silicon/robot/R = throwingdatum.thrower if(!R.emagged) @@ -110,7 +112,7 @@ var/mob/living/carbon/victim = hit_atom if(victim.movement_type & FLYING) return - if(hurt && !GetComponent(/datum/component/tackler)) + if(hurt) victim.take_bodypart_damage(10) take_bodypart_damage(10) victim.DefaultCombatKnockdown(20) diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm index 689ab56842..15413f76d4 100644 --- a/code/modules/mob/living/carbon/carbon_defines.dm +++ b/code/modules/mob/living/carbon/carbon_defines.dm @@ -63,3 +63,4 @@ var/damageoverlaytemp = 0 var/drunkenness = 0 //Overall drunkenness - check handle_alcohol() in life.dm for effects + var/tackling = FALSE //Whether or not we are tackling, this will prevent the knock into effects for carbons From 38d1634e13905096dac34764da7026822901c286 Mon Sep 17 00:00:00 2001 From: Artur Date: Fri, 10 Apr 2020 21:07:15 +0300 Subject: [PATCH 17/60] Weh --- code/datums/components/tackle.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm index 17d2773b60..0af2d8f78c 100644 --- a/code/datums/components/tackle.dm +++ b/code/datums/components/tackle.dm @@ -168,7 +168,6 @@ if(-1 to 0) // decent hit, both parties are about equally inconvenienced user.visible_message("[user] lands a passable tackle on [target], sending them both tumbling!", "You land a passable tackle on [target], sending you both tumbling!", target) to_chat(target, "[user] lands a passable tackle on you, sending you both tumbling!") - target.adjustStaminaLoss(stamina_cost) target.Paralyze(5) user.Knockdown(20) @@ -205,8 +204,8 @@ target.Paralyze(5) target.Knockdown(30) if(ishuman(target) && ishuman(user)) - S.dna.species.grab(S, T) - S.setGrabState(GRAB_AGGRESSIVE) + target.grabbedby(user) + target.grippedby(user, instant = TRUE) //instant aggro grab SEND_SIGNAL(user, COMSIG_CARBON_TACKLED, "tackle completed") return COMPONENT_MOVABLE_IMPACT_FLIP_HITPUSH From e02439396266570b1e64fe2d4b41148c2c0a5526 Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Mon, 13 Apr 2020 17:12:40 +0100 Subject: [PATCH 18/60] secret sauce doesn't give a second moodlet because that's dumb --- code/modules/reagents/chemistry/reagents/food_reagents.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 654d69a599..b3ca6a720d 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -32,8 +32,6 @@ SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "quality_drink", /datum/mood_event/quality_verygood) if (DRINK_FANTASTIC) SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "quality_drink", /datum/mood_event/quality_fantastic) - if (FOOD_AMAZING) - SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "quality_food", /datum/mood_event/amazingtaste) return ..() /datum/reagent/consumable/nutriment @@ -772,7 +770,6 @@ nutriment_factor = 2 * REAGENTS_METABOLISM color = "#792300" taste_description = "indescribable" - quality = FOOD_AMAZING taste_mult = 100 can_synth = FALSE pH = 6.1 From 325c011142eee40dcafd914d006974731106910a Mon Sep 17 00:00:00 2001 From: Artur Date: Tue, 14 Apr 2020 09:07:37 +0300 Subject: [PATCH 19/60] Comsigs are hard... --- code/datums/components/tackle.dm | 14 ++++++-------- .../antagonists/bloodsucker/powers/lunge.dm | 12 +++++++++--- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm index 0af2d8f78c..754be9d817 100644 --- a/code/datums/components/tackle.dm +++ b/code/datums/components/tackle.dm @@ -143,8 +143,6 @@ return var/mob/living/carbon/target = hit - var/mob/living/carbon/human/T = target - var/mob/living/carbon/human/S = user var/roll = rollTackle(target) user.tackling = FALSE @@ -190,9 +188,9 @@ target.adjustStaminaLoss(40) target.Paralyze(5) target.Knockdown(30) - if(ishuman(target) && ishuman(user)) - S.dna.species.grab(S, T) - S.setGrabState(GRAB_PASSIVE) + if(ishuman(target) && iscarbon(user)) + target.grabbedby(user) + target.grippedby(user, instant = TRUE) if(5 to INFINITY) // absolutely BODIED user.visible_message("[user] lands a monster tackle on [target], knocking [target.p_them()] senseless and applying an aggressive pin!", "You land a monster tackle on [target], knocking [target.p_them()] senseless and applying an aggressive pin!", target) @@ -203,11 +201,11 @@ target.adjustStaminaLoss(40) target.Paralyze(5) target.Knockdown(30) - if(ishuman(target) && ishuman(user)) + if(ishuman(target) && iscarbon(user)) target.grabbedby(user) - target.grippedby(user, instant = TRUE) //instant aggro grab + target.grippedby(user, instant = TRUE) - SEND_SIGNAL(user, COMSIG_CARBON_TACKLED, "tackle completed") + SEND_SIGNAL(user, COMSIG_CARBON_TACKLED, roll) return COMPONENT_MOVABLE_IMPACT_FLIP_HITPUSH /** diff --git a/code/modules/antagonists/bloodsucker/powers/lunge.dm b/code/modules/antagonists/bloodsucker/powers/lunge.dm index d40627f493..b8dcc29022 100644 --- a/code/modules/antagonists/bloodsucker/powers/lunge.dm +++ b/code/modules/antagonists/bloodsucker/powers/lunge.dm @@ -13,7 +13,11 @@ /datum/action/bloodsucker/lunge/New() . = ..() - RegisterSignal(owner, COMSIG_CARBON_TACKLED, .proc/Delayed_DeactivatePower) + + +/datum/action/bloodsucker/lunge/Destroy() + . = ..() + UnregisterSignal(owner, COMSIG_CARBON_TACKLED) /datum/action/bloodsucker/lunge/ActivatePower() var/mob/living/user = owner @@ -26,13 +30,15 @@ T.skill_mod = 5 T.min_distance = 2 active = TRUE + RegisterSignal(user, COMSIG_CARBON_TACKLED, .proc/DeactivatePower) while(B && ContinueActive(user)) B.AddBloodVolume(-0.1) sleep(5) -/datum/action/bloodsucker/lunge/proc/Delayed_DeactivatePower() +/*/datum/action/bloodsucker/lunge/proc/Delayed_DeactivatePower() addtimer(CALLBACK(src, .proc/DeactivatePower), 1 SECONDS, TIMER_UNIQUE) - +*/ /datum/action/bloodsucker/lunge/DeactivatePower(mob/living/user = owner) . = ..() qdel(user.GetComponent(/datum/component/tackler)) + UnregisterSignal(user, COMSIG_CARBON_TACKLED) From 20c3c648ce3262538efcea7f4f0739567963880d Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Tue, 14 Apr 2020 21:50:39 -0700 Subject: [PATCH 20/60] Update living.dm --- code/modules/mob/living/living.dm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 5fa64e5ab5..4e1f37fdf7 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -646,6 +646,11 @@ // Return as we should only resist one thing at a time. Give clickdelay if the grab wasn't passive. return old_gs? TRUE : FALSE + if(CHECK_MOBILITY(src, MOBILITY_USE) && resist_embedded()) //Citadel Change for embedded removal memes - requires being able to use items. + // DO NOT GIVE DEFAULT CLICKDELAY - This is a combat action. + changeNext_move(CLICK_CD_MELEE) + return FALSE + // unbuckling yourself. stops the chain if you try it. if(buckled && last_special <= world.time) log_combat(src, buckled, "resisted buckle") @@ -676,10 +681,7 @@ resist_restraints() //trying to remove cuffs. // DO NOT GIVE CLICKDELAY - last_special handles this. return FALSE - if(CHECK_MOBILITY(src, MOBILITY_USE) && resist_embedded()) //Citadel Change for embedded removal memes - requires being able to use items. - // DO NOT GIVE DEFAULT CLICKDELAY - This is a combat action. - changeNext_move(CLICK_CD_MELEE) - return FALSE + /// Proc to resist a grab. moving_resist is TRUE if this began by someone attempting to move. Return FALSE if still grabbed/failed to break out. Use this instead of resist_grab() directly. /mob/proc/attempt_resist_grab(moving_resist, forced, log = TRUE) From 375c62175f6ec75c4f2da473fea1c7101e6220c2 Mon Sep 17 00:00:00 2001 From: Artur Date: Wed, 15 Apr 2020 12:04:25 +0300 Subject: [PATCH 21/60] Finishing touches, fixes icons --- code/datums/components/tackle.dm | 1 - .../antagonists/bloodsucker/powers/lunge.dm | 12 +++++++----- code/modules/clothing/gloves/tacklers.dm | 4 ++-- icons/mob/clothing/hands.dmi | Bin 11008 -> 11611 bytes icons/obj/clothing/gloves.dmi | Bin 15403 -> 16341 bytes 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm index 754be9d817..8ffa6c5452 100644 --- a/code/datums/components/tackle.dm +++ b/code/datums/components/tackle.dm @@ -190,7 +190,6 @@ target.Knockdown(30) if(ishuman(target) && iscarbon(user)) target.grabbedby(user) - target.grippedby(user, instant = TRUE) if(5 to INFINITY) // absolutely BODIED user.visible_message("[user] lands a monster tackle on [target], knocking [target.p_them()] senseless and applying an aggressive pin!", "You land a monster tackle on [target], knocking [target.p_them()] senseless and applying an aggressive pin!", target) diff --git a/code/modules/antagonists/bloodsucker/powers/lunge.dm b/code/modules/antagonists/bloodsucker/powers/lunge.dm index b8dcc29022..88e39920d4 100644 --- a/code/modules/antagonists/bloodsucker/powers/lunge.dm +++ b/code/modules/antagonists/bloodsucker/powers/lunge.dm @@ -20,7 +20,7 @@ UnregisterSignal(owner, COMSIG_CARBON_TACKLED) /datum/action/bloodsucker/lunge/ActivatePower() - var/mob/living/user = owner + var/mob/living/carbon/user = owner var/datum/antagonist/bloodsucker/B = user.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) var/datum/component/tackler/T = user.LoadComponent(/datum/component/tackler) T.stamina_cost = 50 @@ -30,14 +30,16 @@ T.skill_mod = 5 T.min_distance = 2 active = TRUE - RegisterSignal(user, COMSIG_CARBON_TACKLED, .proc/DeactivatePower) + user.toggle_throw_mode() + RegisterSignal(user, COMSIG_CARBON_TACKLED, .proc/DelayedDeactivatePower) while(B && ContinueActive(user)) B.AddBloodVolume(-0.1) sleep(5) - -/*/datum/action/bloodsucker/lunge/proc/Delayed_DeactivatePower() + +//Without this, the leap component would get removed too early, causing the normal crash into effects. +/datum/action/bloodsucker/lunge/proc/DelayedDeactivatePower() addtimer(CALLBACK(src, .proc/DeactivatePower), 1 SECONDS, TIMER_UNIQUE) -*/ + /datum/action/bloodsucker/lunge/DeactivatePower(mob/living/user = owner) . = ..() qdel(user.GetComponent(/datum/component/tackler)) diff --git a/code/modules/clothing/gloves/tacklers.dm b/code/modules/clothing/gloves/tacklers.dm index 95c7739bd8..f11c7ccd6b 100644 --- a/code/modules/clothing/gloves/tacklers.dm +++ b/code/modules/clothing/gloves/tacklers.dm @@ -21,7 +21,7 @@ /// See: [/datum/component/tackler/var/speed] var/tackle_speed = 1 /// See: [/datum/component/tackler/var/skill_mod] - var/skill_mod = 0 + var/skill_mod = 1 /obj/item/clothing/gloves/tackler/equipped(mob/user, slot) . = ..() @@ -61,7 +61,7 @@ tackle_stam_cost = 35 base_knockdown = 1.5 SECONDS tackle_range = 5 - skill_mod = 2 + skill_mod = 3 cold_protection = HANDS min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi index cb4251fd3c6240b89b7d7340c5c03331577990d9..f1ae2afed728e482394121a41faf6a3c66ac7679 100644 GIT binary patch literal 11611 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QU8F8|9&OUOfp9_@1Xi!M%!tmiCTQq5 z3lbFIId<$doxEOa7>@Bv!5{CB;!f9y{c0KrM3HT!w0FkAq5WAZ$APOv6sBP6)wvHd zW1k(1$HK#JQf*Y=g)walqZZim0=*XzXZ zVVK!Mqe~E9rV<9k(E(y2Ia?vxm#xHKEcGi7(tKV0NDmjnM7E23nmV%E!hiPSVoJ0K zj9Cv?*ROcOUh)z6!Wx(DT}+lzvM_-=36scUm)2(oyunu5m;2X)uwbYHE>`evZy3Rm zG0>Tt1PCrFtWMGud~Oj4g|0jcd7QOKfb9~v>bCM>TRiK_9l40KH4e9xq$`mfXw_BH zOn+OUiqdcx?0Q-d;y1kX!BFpoO!HA^DkfujYgp~sz-L7)tBq6C3JC%a40C!jK+bXL zh^@~Am|zL7#Hn2H^C7ZS3=jA>+N-zKT+_}CRazZ&DRC^jBH(=j!gHg`dNE<>{iqfa zm-c(aspGTwbLXCyl{wBD8Xmp`du#Gsar+AK^DMr^nSYTL*^ffZbo9nV=*a7T6KanI z_ruBZ1=&> ziXayC^IB0CBSg9`N1EXn0L~C<0&@?~*H_Si2B&X-N$8OiKXZ+V^@>P_* zhkJmKp$FV@PqFFYy&ZfYU~r=Cd2XQ{w|`;LphfC<8Kx5WphYUQ+cc8z&m$?J1Vj4Z zS7^RIede4J!-OgTVn|r$gK8}oM_id0g*4v|=YvNH7QI6$gwZ8x1bwZRTt^PGp?($F z;0}(fXzzL?Bemn+57p*PTXVz!6r9P*vh)YApYnyeKDU&W>v8ZWcJE9H8s4v^3$+za zxI(J81R>fs3Wrh_uaApX^C{*X8NpdhC7MHHIty&?P+rD7=|TDd_(?wol64mhV-C0rmgp+xt-y_a2lf_Ai)Ty|wfFIx zFnSo0P>iTp-YX1YAfLn1p|3D9pfIX#e+%&h> zL=*UD@1tKSsSF33w9vFS%cdba+{r0g>7zlP%GQ<%_Rw zdZy=L6c)?w?W^s_IYolQsRg;y!PqwrK7L<-R#RJ1%*^BiagZYTH%*hFUBCz2$ldrj z^~Ms6{)#MSg5`g?e|m&yShtIzzaaN!c60NtFs@gGwQc9~7lcpP&^&pEoIC8wyTM(a zTVF*6R{0^IXY=uPx&Lt_>1XD5X@;-6$mRtuepLe4S1QONftsDDzU|kFJtv%3OK{cd z4@fs?w}oNWPOgK)=ZY1M*=)0K^Va*@>Z8FyzLh}V-r+OEXp~nuGH?&)4P0;q6&lv$ z+oOxG{nQ>ive(FW!VFK`_lVhfqVnOc8>ZJ z0}tRxzsg17`YU3pqb7In0?Ww}q@xs%tcz@w#S?O#&0H`YL1_z0sGs_OmtOy5m=RRo>Cmpq9pne&+t#@aP{>`sl#%-7@d%B^ic>D=dNrLD<4=71 z0CHd7^NM;dcPceY!LYT#1Phwhu8m(CxN#>2*lRW+R>K!tfpLu=1J5qC4MtSbBbn

rp%FWRCykb()%{-* zFDWFGTxZAL+1iZJI6qdqtC7}wp2G~>H;|6%uv)zvLyfyO22_(N7HvFrdC)C8Lv2U4 zXK2X9nGGp}mTd5Eov3(6Oiw>G$S5b`Wk7yM%{ejcHtLD=1cRracz4fT!`_xQf_)g~ zxV5oP9ZFJ?7BlHdmlBIFs=IE{7D2)6#?43WYDV zOA6rG%q+`j|3qsLcAk1}|4^e8ZKjE|nRoXXJ};eFioR|3mXvvBVE>09ZD(m2r2A$A zxskld5c{yCkJnsVC+(bPcEIhCYaFCYTzlP0qmzdJthdp3ii}?qS^bYDQTp=L*wrSc zFLvch2~|e)kxd28|EG>h-RP|V$*m*d21k)<;Vg{xch5S?T{QPuO3vqdzQTSTDSZtH zR3a39VC_Xtl;rfLmj7Z6kCUVt%rFpG#QaKnX-bgL3jGqAD>bGaIMM`j;=H0?VRT-m zW|vTMu*Z!|$-55J2~!Gd4Iw-#>RE56wj_(V2a!#YS_A|{X9UjSA70BN?3 z-{g%9Vo~f;hv=PpT!0J)ArmM!hDs-LB5PC8f@kV;G~%i#XyXsJ7Yl9K-_@ zmCECp#6qPB+`PmcKYF3pk0M3}G)zLPSST}f#Wn~N=_ssWo+@AP;yJ%DdhSY2GN%ib+W9nZ*`Zn{% zR`s>DL%WS-6<6#8_tHMD_`cibGmcs5JTL!5$Ms3-+We|iD)blavmT@)TIp2kK9M7j zM&XW(Po$Lr7!;qAl6y};Blyv_u%55V!_K)dS37*MMnRG9*V}a_k8{dK;yuo2&1~C# zMfbR@pB{Dx0BqlmH_%!752<^J5GU)y>WL4d&*lqX{n! z4~=H2xcsyULl)QnD4zPuO!m0-K z`BX8}FvyGSLv3uUpqYVgdP4lyxpVzLG~ zwO}8gk~+M3y?y#g(oJnrz>{2rnYnoc<8$wRp0cv?6JaK|rm9K!cQrw98EO?AY5 zmt1fw+?m{_jH=le75&u-$VC7DfdIrow);0HnVV0si4GAIz^YnCQOA0mEH5R4*=t`X zr&X}Nr&Ltz-QDwn6`@X{Wga@xk#+~f;tl&#dT_*$);y(I%i$Ui!*m-k{18eU8$k#e zj?jJ-&H$g63D~n#{v;u&rgF9zk!qCbjxY1z$5^;DyS4-Q5eO9CmY=u|6>f}nfzvDD;|WQHr9(SuaV{MtkcTO3kSRSo?pc04s* z(Ym6s(Qa`lZ(W0gE^0iks)}m>Qr%_>uoad}a3=%-6iq~Iyg>?UC#3NG>EiS9`lL$W z4)9Grd*M}IOn^+x|9CpKPEG-FAcu{j6ZY%r!=&>6!pHeLq*pHh;cTPL39rj(fq{V= zBj&1<0|j5-w_CQYG~!BkgdqZ1=asAU|RNfXG|p@_j86gJ9=*-_owG{>HL9J-_pX z@4k(nLV%A39qOIt8ATC}9XH)$#@L9D3*#`rtP{(;k8Vkio7~f?|G;$M{e+`6Zfy>i zE?shNiwrI-sliWE9BpmqW1fui%ezsCn%rad4>^JjFH9ax-FPU_7m_1~OM40bcIO4w zwv*1U03NYU1y=&R6*hB;+NvAz}MryM*3N&_nrp-u(w@245`V1Rbh zb9o$o3UKpmZPVrV&3MY+tZrE9t}HJ%1@_TF(4iFsZXqevd%$b6xl^gYfaeTSZuv{ z+Q!JrWfy97gu`r0;J!70hh z0?NMbbs!N6hdhwXxx@&^t{)muPqR}~FxlsaqcTD5`L(R}@7Mo|BS1IWxjPhcy!IXE z;9Sn)qJ$L-(R;{}01(-*2O&Gl%TGnxl9jQ-?FB@-|Dm@Gma0k(mfTw+zMwmB`qyDL(jE2-h-x&NAQYBLcf0zA#+W+nFb}y(pHE#BDnx4Af$x7-= zJ-DkTP)^eAtlI1FPe3^9MAX6Hfw_?taPR`oJI|CL*!ck1kwJ6TNvZPwY{+ z$?2?GmhFqDf3sU5DP4`{hBTv39aIyJ<(6N4|4prd1Ae~2r;gRiQ{Z`lgrIKuWm@Tp zYp5M=Pzc*%Ad)}M{$;RtZ?ZlR_A}qH?VGve&Cqu=_#!;)s%$(x>keT#P~PlZ=MOQU zvq4#t4O^XoAt7UJBu;BJkaQ?h419Ha>C+xTCdy4KPPUy0v6W4EWP3P>fKcDDt3oCZ zq24G@%H10FHPd_`eqMD}Hi;=PIbEtRUDHC$=*h)89o4x?JNbK;onmwvPz1Tf_Cs1D{!YVQ7?RZvCiPiEdbNXZ(R04_&`xhy2;{^@$_f!K01+fV%ZD9Eb~INTF7!t3AExoWXlLn(+ei>unLw49Wpw z&Ovq`+Oy>!n&yA%q962s?IgQ`*Kn_1$b~J(xZ&UW9n+TX~BTc#sW zLuOjBV(?g%euP=tMha!&Fcg@oiq1tC=8(85N^Lg7{&o#T*IcN6j_!I_3Ab-?FBJ$& zB$2=KZZbsCN*wZrs8A>*X`PQugJj-6Wwcr%P)zRl7hhA1V}`r z6ObCIQGq}R5J*U3Na6p*-CudX^WL7f@BDMlH#2wUPQ9PGGjs1eGc(cWIehvs7Z(?g z!3{lgF0LQm0pIJN4gx9KBTZ5O;T&aoJ4DYd*d@p-AjHexkBciJCw^Shuk+$ju8&hX zPm%_ucKTL}Zs5bkkcwVODTI`#JZ#1DtjfHB5BT~MlHf~V9g(90f8J4(PL5qv0 zn_?oXD#XL4Te~4`SgXWK+dB@f2d-h8c^-asv9NJWTRYu^sHk}N`;^MYx^r>au|qHX z2!$CF&-L0)*cyJ0dn5Ye`mN{kBy%Ixw@B9~OFzZFvoksW)XDx!adeGwUK zoOoGT+%h{a$@9pweNOFX?5ll;?+!hky7XiJKB+X=9UJ8_+0-wPPtQevw(u#7%T(9( zc*S;Zt}7zP8LPB)fAl$vDlCxNCtSRyRU>jToT*or`LJR?cyh6f4ppGbk1(!fRMWVFvRG?qkD^TGM^~t zol-_j-rJRRO$sS+hpXkUityE__}{%rQsLq{%VnT<#WEsieFhxiK!q%C4GYX&S1M$7 zeaeV`8_jM1srHv29(oF{UU*hxd-Q%wh%QTP+u&@P*hd{N$40OBI_vJKB_>lDKc~!n zo;x_|5qR~Y6i>&Y12do0x=k+r9J|RskfKm4UpT{}@iEkpFO`=Ca|;Es>BLC#EBze^ zI-f*(sRhbic=jV8{J-(ryfao}toibiW~1L6(q%86GkJdw85(z~JJ7fU4~9woKDZUd z-GZAk8DBE|)NvgJa-D^o z+QfWycvg1k;FkkBVQa4%eP>EWN6qz#O4@&x#wGHt{1%SZ(9jU9BCV`^3^P!oSa3XZ zPcfi_CyLI}XFwN|Cebm3A-Ye=S)Mun-FLs86&T(Xd$T`Rij*#9z^$Ph#gY8QxP5%; zVfq#$`?7Bk+Y@65Omt}>+WyLr60^^_6G2ar4sd@Ie9CpfP~m{ zhlBEXh)dtL3fF7&U5-OpFe%305cXfP{)W8mcjR(qX3O#q1g5D~MPZ9AorBpFJ~KJ+ zl9lD0LY;r>Bw_7XWja4w>AxEupXDKX`pg;Qdv|`T@w9Z@YHqwgl~Nn-;!^nRap&sF zn&kzVfm`1ZR9;gv@-0{0iFB53F9%aJV5IOGc!zD$i|rJxQjp>e>XiZrtgJ!1FgaMf zU8#e$<*re+$gIeCiGwXrt96*C`TKU+^0vrXJ#sL=jFj0x^5ylY^@+6hOj$=i>C*J_ zg++nTP`U=ZZyYF#Z1zroveqnC)yBNyS*X1_68QBnJR+^OB%!F8F{rN7!6~N6?fkYD z+nQBxg(XxiAG)3NIF=w153g)vFHK!(JU-~r#^Ce}E)~X!qlG>GP&(lvh{LFB{h#6QZ zm55{bZr0Azjylna1g^BA<(Ol)^n>fLLAVfQRU#u_Zy(0f$9JMbH%_ohJ7Ohi+Rk2~ zjO98Dfa*2fzNka|RZO{G03_LzQL6F{zafF9-*-$hF`S0Embk|SM)bEpkzdA7JLZEgNKqVrMEWX3m@OivYp;XMkUuP2{q!A(J1vN{d>V$0mJ|F#=+38Lhv!U}wAUV!+nxAKm z!oKa`(CY!+Z5+D4rq=z-Xd$f#v-S1$gvrLHCgSIg*i)8JMQ%P}OG87$&+6s%_4PlZ zaN5k7iPPa>uj{)Prt5H1KA}#F3V(v=M@IlxeS^+wk{>yKazNr zx3{7XwmNiTPe3K*<$alvqq!uk(UrqN-(}E3nv`**qJV!)DZ+ViK#MTM{Wmc7Kd?R+ zbSVaNarG*b=4~~XX3#n;lvpT@XC_#d9GnMvB+8k1tN8sq#0Qw3EayOQ!@B7{pA=tOLcr0BwX+ zR$#4sWhD*2tR-2S$c+KDZl!@zAm1F#f3>~_O+Yo5MO!+9jgwN`q62TWl=lvgh(EcD z4Q|%q0zufKlx-Woi!ms_V#YT0#q|T?%q-{bekLVU1~cZ|a*m*Nye7!$31h%2crczP z7z1CjN{B+(Il1}Wf91monh>lDa_V}FHwcHqVJTET(crdunPsaV8*$p8`j?ju;M;A; zm^=}?geY)%-*~hFJGK{CHfBu6TMlp5l8RmC*ij35nL3vX-`ye=i>s5+5V*ZQawh~H z{w^45pl09IKDEpXD)nCtA3u?mfcimbeJz!cUM&{_jnKShVg0(x;(5L2&5<%#b$jzH zv<8CGKDhmPA!Y?!;#=8vmNqj1dcE>n#+#{(or5oL2Ip#9 z4IE-a9X&jMvpR6sl(EHm9G1VaZ8?*9QDa*BwUDF7_VxTG;qz08{NUr)YxFW!>yFgF zRaU%j+zcv;6i+UqLSNY&yVV@?ExF;X@|&HteOq*RexiMNFz*{k?-d=Rq((Ls+c@@^9?VOkEj=K?7oG;=WB;oyPJ-wEQg{pVV8H;)Nx9_E=vb$aC2L{>G&rhUIr+?Tnjv$ zMt)u<-8lvSX=!CW)iIAe^OfD7Xoo~r_J;bJ^p3v&>VV;0CPakim$GU;)apw24NMYp zph9Y6N^9V)wZ|s3ZDyA0cwZj0tL}IwD(tgSqRH}hg_weU&3$?gtTd*V1z^&sNEyDT zPp`9dS0GJJUPzOWRn1}279=m7B5mY%HxEjNQ(^|48ru4|8|f<^{=)g2z`EZ%b{#Q4=%U2kGpz9HFjG0KWfq9%;tR)Tagvbg(V+91l69v^aWABq`N}o zd_gg-nTD4(@$YK4o-^0rn2r(hE zlF@T=68?BCst9P!+fNc=?C)Uvr3~rx4UM8wbr(BhTn~QDtqtmYj{a7pQ0IoozVvM; zoX_*~u3+G-65UXxyZ=aEKaUjWV|JcLpOb3mZHBGl-2TX*4={ zns}y0C12^<3xxTXHgV}@S5!sG7gjX?#3Vd|pvceOidt}c`+k@8K#JWfa^V+}`EL0_ zwRauaMY=4vf;{1K!gnXFl$A`bMs^%+!^s--S66D#2Rh8Y5dF5qeYE-%@A>F>)XG$d z8SE#i%8=k^B((HtNC63J(6y1SrRPI(p;plTL2*?uiG1~NIzErNbmvo+O8P@Ir%$mKi@8`Z z>L8^c7Rq~cNaKn~>%3wN^NAvxs$GoyO1^K?z+j9zs-9d$Y2FMW#%Gk;`mr9n>43on zI+kZf2w~w3U*3*4YrWC5)~|mvV$Zo@Bik_e?6|p2rseHTrZex;TE5=1;sf74Q8T1u zf6ZC{@T|i&HgDnTCHxP!--fgVNk3N(fM46%?=Ri97NvhmB^nc>s2xX_34~i&o1m9F z$R1WQBV&+_&ETl!$B5RhqaopC>?ND@l~uE_u8?6RF^ipoMEGmGV)|r^=eUu0gH6TP zhyFj(I&HSzsTvuqPjsSAqBc%i*zFc{z;w26;cA22PnFe+6@Azerjkfzlc8=2G&e}w z?9n!?_}FOSu?032k;6avtgwAgrNvao z%vf#L6ms=u30pLG$tH|& zA{`o1OfE4Ew8=@YsuZA{sB$c;TzO?5B3IFT)mjaXYSf|TZ&+jJzi`*5rSWE9u2H-8s5+?O#Q(PYy?;oBW*`dAmVEW(*PL!wE0d@!tmm?Aj7GhS5K4@-F7p_Qh_ zNo(zzz`{aZ>a+MWRgIIA6baB$+@1FmR;!v&y;4=b0P4B4O4h5&wrCp>Cxc1J*5<41 z(uCHXJNoxA%SIdHK}#p}L)Or27-IMA{oNT{FKn%+01Dx9lkE#yBZ_%l#e&6{x)=7x zA=4s|T@!I;l{XqIS+ajrW|>i{XP;ORjS!g+90M;J(H6{9fxED556UD(BBWiv7W8;D zXm*ZUrn6D_qYuJq=lMehJ+~*3E+= z=8jfq<^zYy#Sjw(V7K-})dSGWlmxF=RT+R@o>vrVvDgWMqvw*S2ZD}d%meo@6tPNo7 zu(WonzO8)Pp_iQAQ9ZoP3UO28-;~Yw_Y7>{)EUk<@0rmw0W(_O($fc6k0>ZoF(<26 zHjno=18=}$ar}&`-FY<1Z6M>8GsUoW-t_*gXG25dL4K(Q;hb5d(Lny%ywd^Yu^44j z*!Vw4l`({5i~JZ_vbD(urZ)DZ1GAu?&Az>Hwb!(J0Jzo#p#6kF(`!9Jr>>%$l@3Vt zvXPN2Pw;3@PvW0PymsfmocI4-=5i`>z}slfO~t*|M^Xv2Sgg+V`F(inr6BN66OPs{ zeyYbcm=bdN`+w$28oxe}HID2X5}|Xkri*u7!^QQI$)gn1;g*|`ENpVGGhwu1TW!txVPva zA%>It%^sr2B6N8WsTb_-`1PB7q_px2BaQ{n*!MCvqMbbsn?GQt7d_My z{YVwaCE>RUF;Lm?bBjzBpnJ23?4HES%$nIJNq=7B_pq%c)w0Siaz%yu6f01QG;s*P zUb_fwk3Ke*X!^kYrq2IPsDHt=jQE$lmBe>r<>#=VImWvu@{7e6#yCL-)Q8u*dwod& z)8Kk{e&A>>$a zSEWI@t(JU#QxZ-7@Fu;w!C3o7LTPYj9+uH32(QBSFFPGBYO>j5lF0`f#Ca1Pu~EqV zv!1qDO2m{RP{0+AyPEZUj&0_Tw5K4CNpY7A6#;ObdYydBS#s(Zs>lrYm+#HK1hZq+ zHY>vX$8ai>6_-IhTjxRyl?TT0%PXYQM5_kyOk^%-G&OgBhW1zwF3PxXV_$5WlAsJ} z!M{Ds4{aL8+Z=U%Gla|9IJ*Qui9+$i6_SYAM7`I;?TrL_^Sn>Y?gQk4_9;E6VjHJ? z`3p5)>k5j~z)<&ox!4T%dbwD38Rv+JV6?U}1<^I2DfK%H7+~P?Ll`7U)H<7TzZT;W zJLY5vIkhe8$7E`oA}M3(Urr!m-ZBXN0n)v;Vc~Rw$TU(A-7yJt8Hm-lw)(%H(&YoG zhCkrp9=Z)wyifDTGw0Q(M<+5v5}|8gS(hbW!fN*Henu=g@v{?{slHe12u{vv_cQqq z1N#>FAs+}N_H`-t;+1GFch?w%$k3syC7Atxfuz68N{Xxu;R`@9$fqVxGtnZP?nK3} zJ8oZ%xRMB0%TGo#j`(0cs@|4t11_eVUX)7R;fWAPyq~?c{T0^;7@={ZZjbhM=ikv8 ziaU#PY z1=_$E7GxjLoKk77eErraW_NS-5WAQKj64e|PElzpdB1fAjH$eesVX;{OJSgJJnJ!~ zj-iHlpP9Uq>(Oj#5oHIKX;k|%7lE$!1>0FRxuR(3u?@o^$yHg(GmQZj&GIS^H-)Iw z@(7)i6M|zhtIG}dG56y$-LAPEwt1*w9F%v1RO9XRG%E1&2rW;GIVU^icg{`?hS)56L zbi2*gTbpe#&CbUmLg`u?7h>kL6Yck?+*X>g8d#S4LfWb+BJd7-4sPFe8=xTTj6oBZ zbiJ2;oLFffpa~kP!I|sjk2hkc_pP66h7boz8XGU~yg#Cl1G_;xqRShI9j{(8N)$*xe##EJuzTiXVp13OV6}h4v zj3yNXNka1^Z+7(@_(Wn4|1-UN$NS>-L~A0nsvTSD&G29)QZx5!$SF6_WJtdgsmJk? zJu|TtYJq@Rl{L{s@&jl$h#Qf!(=9&vL;y%8VFK&34Z~ZxLDIC`RCWpSt=balrpNNz zdP-H8O^_N>Nweq{XhsM->YmZz|J7{@6Kjd zv%6a@%=O8wt-(H;L)Dth>$&%<;smsgeEsc4;I|*a+$^TE{K*?|vp8$wEdxruo%s`7 zivnk@)w-u#xV@Er%?4xR0VrX+|pek@ya@*w= z>5ESoJSQAUfqG#?ARx8XpII*t;@~M03M*{izte$`;84;xqS5Y$ z&3|SJ(cDR!#*k0h)X!1H@W2sCH^g0~)>kuBBLk>Z5`@0|IrGUOw|wn2S;GuxEHhU2 zJZInjUM<~?5<#3nd|NPu?5?#I_|=3*_=41i-*q9gu(|9X1ocMCIwyXGo#jQ}n(_#) zV(j35hiN(cbG`d@meZOdvK!_>BS2krT!z^G`5WQnn9fb}<-3i@WC%uQ&OfY|-X=Cx zxZ^Pz=RBl3`@_CowL)PJBzk|S)v_C^01`L<>_FtH%ZjItcmD9x+4DT@b%B%;QiIwlWQN9W$KBDm9~1ckrX7w%ek?Wg6a;$Yfhp zSQ~r(Dp_J$bz_GLtj+*6!3Z7TRC}jI?sm{R#(ih}ur{Sr-vN8D4|ODZwY)ThJ{QhZ zv6$8d|=`Z32x9}XqueR_q&BfE{W1dKgb zix0JbLj?Lx1#$4DSp*EkF-o+L&ffDFvMb}WR6&3rA$x|KPnpSkKK&FgA4)(qaTjr* znzF8WQxblJJs{#=VsvaAYMQT8_2$i+;P79|1+}9rElN!$2xFxXOcUus?geRSvK-*^ zQ#43ovVWU->x2hh0aWYUrhF>ARCl*MnsLztNnvM6-MF$59@;S2+w=U&Kg{2YS}H0k z?u#y6Xa9Uj&|e?DzNCIXRr&v)ltBZs3^t$J^a4!#XJE6*lwZN)gP zod&lrR{jeba?cD}HLlaq3TJr^zy+ffr=mnsPEl6T(AC%ETP5rV-IxMn1~uc` zol*+3EE$(e8Gb%(gZ0h#U``;Ei{*-1KDQa2COpn^|>4TccT#?cvxxb<{k2s==4G+!wZNg z0Jn-^z7wM3${Q-#gp8yW~_aB42fr%@s^Y8}XG`Zfoa_E+-GH zvE?<_=R~KT)`W6V#jZ?N&5lRbYjWn>sTLs^Uvoik-!}O19c+*XMFuf!5gOrd^>c* z>vl| znw*KE{w8%yxc!1#Nup6EhrPMNIa8gnr3pAPfe8Ax2@5xjr_Tvpy}pj;`660d4O%WJxm zSA#VSvP_l6;gxZ|@tH7qh4e&pnVaSA9`~M7)%Neu`mW>lj5ItA{7(J*_{WVzVDcFG z(=4Um0o`QPGdp3~!x}J^=mijU*@CTYj*0&hZb6yZGWi>SYPHvUwevq)szAaO_mrB| z$y3ena#{IJIS}kD7`zlJVak1HX2i+#?v=ydCAeH+))?v!WH6FJt-X$zHBkUMhiaQ_ z9%AZucX>EoxVuI75OqXWFQR3{(HIlYS&}^N>W|o$RbEkOpE5M}kL<(`WXB1;dkoYc z`4XWeaT|87Yx)JSv%QhP;KG}z3>-@rd#y~p0Csb5$QfMopf8O+Q=f5e4CKV@l zq_!}&TMWDSEa21kjZ5ZM|5+3ef~U9>s8-4dhsf z-^KLt7^~q1j11)lz88H>2NxVEwtE}Ue@{+IY6R$)kV;4^pjz@~1**NHf;_%uZ^Ai{Xa?dzmEU_ diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index e937842275bc88367426079b90389858133d04e6..166da38adc5ea097eb5d0f7716e3931b1afa9490 100644 GIT binary patch literal 16341 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 literal 15403 zcmb8WbyOTd*FHEn1ef3v+%0Hu4Xz1p3GNac1}C_?yCe`?!{8d+-95OwZIk!i?{{|3 z{_*Xck)EpVu3NWm-ManUr$Ut#rBL4xz5#(is4~(Ls=)6W@M%Yc2fj)C>}EkAC@GK6 znobfXjz-@s?42y^Y(XHmjL4~B+fFtVgi{W$FvOAcYv&^qXa(Z6w=wBWp;FQeeTApj z{7#$P^9>UBKO3aZcOV%F(a&xfN12}B&(ke`+xS!ENvZr|VBM{2fY~e_1orCpN8$q z>Rhj(zl-H6)8V}NZm2shbcmj#9P$1IY6&ym92sj1R<2z-cRMdQKcqRr0taE2Qz2(MeX5qtI*JWpoLh#e$#V9NB$*rTe zb35;ISA)TaTUK!RO(ZI=z?$G-A`f0a{C&EutEv6dvvmk(+JL&mu#8 zC-{mnd3hA%fg+Q&G4V^=-$FAoi1V{B#HMCvqwkY3n7utb_&_!`HjTRF?4fqF^Lnn! zYVNCEH>suSQQrey;)d_0q1ahHC%*I;kYE^*=Vlro%#>lvC9`m8yfq?UzfQNqW`mjeo1aeW{hO|E(*A*wGz|9eMM+it<4BJ-xnU$qw zNCJCsz>vqyvMU)fE)(0p&Cz0C60;85Ai{cIo5z*qmo18cUuKCzi<8liZC%aZiDB5@ z|H^LqmAvD=BO{>amXw46ugY(XMBLV(k1QL)E6sXCa6(>p+q&G0s6XIG*3PIlT#$=& zy{S92YED5N#5wrhw}pw#!%k~V%fr*U;>dkBnItM;`Z%@sB_%(8I0Yr^{Fu{4oeMXA z$kk;@2GKDy!->65Z_O_vz#8Dgx{#r}DJ?4_NrHXfT4a%skPz5i@$)AX{I;B&oYBru zDmlBAm6eRFEObtBF#`U|oN`!$#U#xlpK9lDI!|zd6yNj1Nt=%*mh4&5$e-FWO6mx8 zDOHC~VJ4(Pw`hU$5E~NuueE$}s6^Z-a-HcfR**Fq&2{aLgq#&f22!^Jv|gvaKo(Nt zGSq-NIEZfz=iQsN;MJDIhRkHBUEdm}TtA;iSC;6qB}_-Kc=L4Obz(u__&$nq)o;GM zKukyuOR`)_)3;uk0t@ZAev@Y#)+$>(F=bs{;)^+D)0Tn)s<^ngA3uNQHa5|ouRqA|AzM)4ie9}~VY)F}!Hn6)nqV=%D3 z9JIOSBXzp2m!oTl&?Go|I%54{2Y1&l-EBSZ)``+HC~$uUbxlkcHj6sX&9TXgBo9){ z%E@(Y#Z^!y&XYGhJbCc^C@6qcn3SlMr`nvInqsqCw1A6o3&8eG! zlZ(s7%|j&nk0o@cJH>1v1w}6D0TRcXCg3Z+iJ2DY@tf=qcI8CYuH6i@_hvd&{ zYEV@&Zj0CHJ&}yEexKOfX@;VtE`4W9kyAo?joNEM3W|z8Mx>{t;8Pg< zIx7S}Tpw{1gu=P|OEOfHlo)pS!&%Q)fA@O0uCkacikbh+p(8D|VmM7D*HuYca zo9^h*W<2(U-~7Z7P5Lfq=DV%*O^JeGDyNZ#~K`(8otdr|G}w zmDECt-ovPVdU>5r*~_z4TJpXi^bFyPfxa5t_V(w`e7PmEqk%>9pT*k&&#R)U>c4tY z{QGz6(2)G2cUzgRP&RtStel=+=FXLe_yG0%{CsbyfvT#Qqaz0}VtHe+8|l;u6liaS zX=#Hei#i?Z+5l2!EeNhz|xBuF*j z<0Qu|svfDgRe(NR2S1>#dKc2rYWv3Ae~>wA)EObz=%0;c8`Mxy5p{QW|BPwUa&<6k z1$bl3XrJ}Y@8qx5bFJ&94x?dj*Ur`)A@p?8y_@rqeV=~nsDYO0?V)**rrg26Tvb1w z%l*CF1``z{>+2mIY~h>#)-+VBan*kF%&Eq(M|jgEd;P^-z>T7t2WW0@idH=@lvnxW z{sBf?vXG--sT~m5rWZpQ@oUCoVPRn}5(~rygCSYqt}J`-;7aw=C!?uEEWm8OIXc?h z)P%F%+<3I4um(tkqvJapMWP3&YDse1B}?D^vUxR&=~4|M+J&9rbkwtB$cfP6(>o{C z9;Q5ZNUF4+44?IsbTW<84SntBx#m5v}(BC)1S)#gIE zhIKI37!Q8=Fa4%~v>E&=m2dHc7wUD5+ zS^fOJP0@?autD`TZwOj6ZF{r(;D;@te%HgMoE@3BH6cYuy$)!9@LV1f6}@&Q|GJ=s zH8_2JXDuw=et+*#1{lZEk}g;%J62Q#ucD|3-m!??h$Le0mvJJS>aymBTx#$8)*)kH zO)&@w$q9FTdAczgaT<@Y(V~v%U0XIX#exD^Xid^-`9s9n6MP}~PY`?Y7A(Z0%twMBHUMBh;YhZELmup!2tOGZ@tVqONi&`-L^&Vw4J3 zH-N`%B|~8%WtGg4~hZWeG>U`4weoJ!>$8w<}WkT`;?-A+14yL&lK(PSeh{ zA?C^Hk%naojr8GGIA@e&Lq?Z^dBf*=Gv)>(5j4uyOmJ+k12A>II-7V_A)-`%TST*g zV0W0rtRQS81UuUD@JF!Z<9+McyvE>M#+eeOuysYSbwy=#ee4do_#2hDkZ+BLuw?6U zsQJMd>~0pmCqg->q4wSTYqt|%CqGbHX3T0e2<`~qNdP|8&bB_QanpJ7BACQrFV5)2>FHm=Njmm>;+A*Lb-e<*Qx5|WQEDCd|$y588vgcU6I(EgW z>|bE}-}v@_{nH~AuJRCnFUcZC%2VIq4W7+@shmZ4)QN7hoMxbW<`@;=I6fnLc{HSa z&SyO&xVd#@{ll~IVrXDAbQXLiIvke@r?VwyTqOD}@AZ2%AY*8 zv?O3T829rwU{0nUxL<5`w%wGKwKXv|(h-&C<3+e+e{DxG=X3@i4-M9WjLVHbScQ#! z{Ku}vL8Mk^itrW%9tEw@X-k6|p8Nn0Gxi2N>9;u-(vi&I8O5h3^N_#aeoNTevPeNg zprp?rF$XYN*}8ps&50s^VZ6UO&C(JxwC?sE4J|nj2IKmil};b(tGuWA7jy#tvA4dc zh=!2piqj& zcqTmyE}ll@9ioMd{r)eO^#UX|E|@s1wN5y5L3ECqbujBCtP_$Fx&XEd6~#iCQe%S! zKfO2JhYuf!j~0y(fxnP5!jGX51?N#`fO8*wGx__esq z+0K?fCFw+5$0`&7easrjhql&LR0l6%OWcmk3E|7a)|ku4&Hj94z78I{I#SsIw!il` zy-d&WGtjE}0e0)+8Ys*b1$*^dO&*_-niu>E#Ef>^^4Z762G1a^4J#t zJBViWOdW}o#C!XyS!=q|-TfsU&2w#3Pa!?R|7iQp$wKpyx?=itGPNsSIm~sKYj$oX z7VBdvrTcECYY=rV&Pfx|QT8L#iXj4PuC<0_7>@AK`hCnThwE}DU^PMD*bThqa#wK^ z@Mz?sd&8ZH>2cHdsoi}bcI@~lwsE4b@_(Opa_2-JZcxU(!RlR?=9+F`dJ~4_J)TbH z_^4K@9%@zon}(*!a68Sa9Em{uRXZwlPGLRz)) zCU{46kQ!QVy|7YrbkDwB#;NYkKu?d9%3K?seGL|T?G$8~b@R6a+ra<|9&>Agywfgr73L>0eJsbvU1*N^mb}1M@qrQi2u@wk>q*8swpkd-QcAAQzk`4D7Pc~jHwvXxDQk|{_~-jOeY{c33RmVMY5B35 zuZGZ<1|Zl=9kkL0bj8~aPsPz3MTFZ0XQ+b^rd($)F-P3+j|J3I!0-^C-3R_eXYDw- z;kfE+QdX6y0grFUooQ=pOMAKXS8i5h611P()BrMFgPW!>#+eLiZ&jOED zKRmG+ePJT_I|<2VVU=}O=$++C>vPbdW|D+&@zCr@D>OZ>6AwjJ8=xTD2jHvVIK<6gRDovxx6By++>$`B4sdOL+2=v#uT*PZcmY#ydhG2kIE>x`y& z|7FAljT_6U{bZ!`THWnNfcQ9Iz_GFmhBd>VCjf&CT~7${S}bFDN#@r9%z(Aoie0^< zjP!g;xsoPntHFNPCf+Jj`jXwzP`hMbvgUU9_6V-k>;yxuHBXWpruv=X@0y;4x>{Mf z#mH^dK($uQW9upx<}x7gDm%hIfU$HKBlB(5mzEBkl6UJt?m!+}g)xiD9d0B((|Ko4 znx?QRR)*fR2n9ufxOX-NCbsExl8{2y{TuxJt{Wyw(cB^m%*-}(1!cycyvD^m&bxAe zT_n^TID*dpypZY_^Oix1v9-BIvb7|WrQQCH zkwe+{yw!-9XZOLDz#D@D6G=naFo(FkBant}K^cbUjBuTJRzB0S)lhMQf zaS_fQA$&(Jsw8ZVx3;xBh z$?|ey z97CcRx5c{1p7*IDXy$UogS!{%tbX6Dc&75$t)xibl3?um*?!@&hrXq;uO5 zhSxd$0!xxCZh(CFA~ZDMzwew+_%hf)*#se{Ca~2-q}5rQ^_jpcewxUPNrfBXb=zkC zJN{)kI*-g}ZeJR{rvd-`1B*dGN@mx|0RkBdLl2Ce&=@3Zmz7t>-a88!)#shT5smk}M(T^#oW4Yp;M=mukN7~{N7xf5aU<}_forVn;NY}nD$|}N{9tN%NYEDJP zS@z#^s3B-?6l=I|@B>7Cv;>7nRZI zWKmpVR{Vz-?L67=cF0UEZ=!farw!H~KWKWR8h3Zil7)CbVjg8E-xFZ++`w-TQ(waA zi|}vsINTBXp9p^+bQr)m7ABkPdT~3KHEPx%%lNpoMASHTia?xP0ktMp+50EZ(aW>f zMBdGEtstE{tnH}~tkYl%mji*MXFqPyeoTsA^f`~uj>*Uv;;3jF(P3?M8&5r572PW2 zb5N9CL*9Kjh2h|Xc_g|Q?S=CCOHhSu4!r~7@RMmj5D_|kihX8!CWvL9hVmNICJuyM z<6a~6a{L$^|7-8@!RD!2mSe3`)N0OZ7Tas zHakI7E4nwUu~H!9S=49bINf%Pru~y}H24wCN)(u>yaIB`KYU!ckVZx)c^=?ib(O@C z?!nr);EdGJ#)^_VFfb69aPkO8JM|nG+JjDbG6?p3o!-c}38Cu%BChOMfyLAmisyZ1 z{>M8m_6_~^eRrm7^;Iv?-tqBAQ~v(98oIfF=_m@^t_28Oj*;jlA`sneOLr20NxG*C z6*o4pQdYA>yp+gR>OltLWR_lcn;a=I8&t=YWU&eD_cuDyA}2|``O$D>p!m`9Gh zwM};%g^>IY+r(w9ih^BUn26BX{-F+NG;a{H%1Ljr@0A1)jdKQXr^9bSj?a>n#&8A2 z;yD4*XF8vTQS5qRfXVNmn)e7Q@ehl$>@wO4OPqWu; zg}3y97CC(?1`dPlh9FrLK7x^O$UDkp8NGoM78DC9V+`WOkC9(tAqA|^b?XL~l8h%n^eLm5~5be=G$DNL5)j!ffhoEl$t4p6rLSAiz3Srd9zOT=+Us_u;E)aQVp~`Gx zQq)B33Jw^OLS2XJI|8ThIno_Dw^s3dPkmP6N=}UtjABRTP0WWP0iFI(a1Lk_r zR5O8m2r>rXDBcjwoL^NGpUoMOfB^58PkKp@!I~pS`{G5a3Fx=dm6oYVCYc$_)0L35 z5S)!LvtJXqfE+kTf~=wI@O{SxG7o4x2z)SG5q-;{+2-8>6y?u^e(!ll=tr43wmjb# ztLO&z)aAOZSl}xAe%Zml8&(voY|jnl;r~QsOjY$&oe!>EA}1AbIYYA%UKBfnZ(bMk1dEOE0sh+X%8*{(0$a7ME~^#$sb|Mz-{yU$_m8@;2!PCzQnah_5m?iWplv zXB!SuE6A^=*TzeghTUx@N3TUhAB9g8;7{C#d>! z){*z!uBH9`yE>BRTj!Jv)6d~=6$0*h?$hX7XSn^BhkGYHu_rID*s&kpiSUq+HA~`A z*Shil>6h*10_^DJ8Yi>;I3R}bYoSFbdCs6im9aJicK-T_-3Vna=X{^+OQqi64NDn1Zg4?!#&ztdayc)cnEQ3 z9`8;?kBSoDye<06ktgMQl0OQ6L?HV31^e@}LE{Fg*ZXZ(1OLuZu{LzV)!>W|W8OF! zzwNhpiRVy?C$CJ>lfhVg&(IabzC$1E&*#7Po$P%V*66&FYxmrT751sh9Nhg|liix+ z66kyT{8=&kF9kVQcyYGifQe(%+?hAY&5~YsRs7gIs#g4ZV#8sy@Zoz2p997zgklG$ z;~VJ~LnNta(n7aoFZrg;*@9&^R+c{cMf8?ems@U!zS?+X!l%DFFp_BkToIeb1LI3H zsrYw(vshVue}2;*P50H>Zg7htk@Kh+%MT0zRE?~cTgydlw!?G^}B z&`4tom<4qlh@^kb4`|2Gj%#);9@1fk_cRNerl!`!aj?o$z3S~}kkey4>LyX7T=|p@Faz_#(WAMs(GF;ZeQpprt*7zQ zE)RqA5!N(OyX(5D(7)V-i@*=PU><_;tHW6Nz-?o+U$HXmpZdPu@HhD?=<~YaGoaT` zuE0FkR8|m<)Mrpo{*K@8vXBp(I70a#@h|jwT`}f$i^(IJt30S?Plp<+QLTLV?|>mk zi8y+uX~dQQJ#9cNWIj&#Eq=}r1&&=3z`lPFZ-(E4K-q}xZ_4W ze)+sn(MmGDiXJRz--^w*m|OQY15HyC+5wG@Rc5#BW`Uk1Xkvcv^ReBoR9kC^&iF^B zNW-NR#60vyVmg?(_zc}?qBT({lFisXR`Ic5p+POsrD*T!2Xik9L~i8DD3(ufu%e9q zzf_+>gwJj&pD^1wcFu%dKIApvy;uFJ+9Y)I$(y?Qn)Y_mZ!X%P|7zCH-J1V-b&m>G z^b%+JAvfa_OdlD7F8ce5Si6$hKXcONH`Kx^%`yoz$wXHrkkVcWG5&saK_QhPW>>;1!V+jB%2%d{ z0nShwkLF2=r#w}})$YshQIgOP-a}*)iq$}7G&Vloh-rjA5J2rFmzGf2EGZUbXa-pa z`7Nv;axC~B2rqB*sq-?8s~=@2>tSFPzh3^MdhCXN@2#gPi`zeD_;Ohdv{Kz{|Gajw z8%=tcn=9+XwDIE~DnFXW-Z<N-Uvb3@aeucx!sjuY@q>=KcV+Gpyyq%;ZhyS@rbAy#8R%=y1z4y8tchu2HK(JvH z>o!ayrRy8e+w@WZTz6O}eq|-d%0}F%QYcJzZoN0-4|RrM_-||&24YYovFtfE^oDB| z5Tbc_o>AZ;wITc?HHdfu$Jul%REDvZyi9W1s68Q?RJvEU60dxUu!;s+!#Mk=a0(iL z|DZN_>0%Uf8mXXI<>X8+=V!p34dwKcLRR{Ry=eg$B&U&lzC?x|nCbHsx=EKsMO&MY zCK*ifa|rGC^2rU1GLT^}vY^nW0ayq^=4oi{dUA^I69SFMSN;56jAHGXwyY*Dsap+S zkN7<*rJ~8gfy!(p1442@KnRyUlb+yQK7`U$HYCtA3b3MeH_#LNdf*|pnA%%1>ugeX zq(G(-ivL4u_|dm}A<1NCVbQUB5u2JCI(xt+Q7b-hBRc6Mo~Bs|;K#q2PN*IT)9!L) zUdU6-J`GFXp|Q~^FwIRT9_fazs0sSAtlwDUhQ^+AStJH=R(;XXsE?<`RbAGTj92dm z#*e(l9q70e`ZfMUx4)j=yyE&J6)>rY1?Re|JtxIYKZ(bj-zlQVVk5gaoA7IKT$bmZ zbms(OvW>J=WCoQme=gX%cTE65N0cfFr65`5(QYBrz-v*Xf$OL z=eR_|)r|j)IeoHbk5zZ8U=4VBS#2xyyNV{diE6HpajLHRYQB9}pA{juN& z#em1Cz(Udgxm7pQDtiNq0w>Uhv#VwA|6Fn^h@sKK>Gphv2Ms zGs(b!U=}=lb%!kQVhsLsXZG|g4twd*(pwOQBd@RTtNgnFJOcx;O{S)%@SWvkWlsU( z30R0z!RY3Axqfd-;HM!jko`AwEweKa=NLVS;&J9j=+R;0;o0XByC?|LlDKdQU9M~W zc!`AP*zhSVnao5OG4nHfxcLf86=X(ZS+A!&YnXglkzU{8oBNbi;J+mQf52{3H7FMw z8}vOF*|VJ_{(J*UP9@8fSE|CC-U0v446W`EaM{W)cK`+_^^LhWxue~5#-yhC&A^Ze zh<_9PbegROyn&7hjIO$fjOGPq`5*z~<^_z~%=EOy@87?HUfBbz5K5gpu#lytC7T%^ zhgb;42NU%K6Cj0H-zjTM^V%0{my3X+J-|zlIu?ZoSr0ONaz8B8 znIy6izK>6&Ne&*i<+eyX+@Fv5FK})CN1nT3iGUm8e)$C*QeO}74XSE^(;42!52xV? zLH_dR%9;GP?9Dm99Gi*g=HtVHMONF9FUyv%`HJwu=qJt5wo?85-Dx|i*3Y>0BD=@S zkUGH36l9H#E&W;Y>vXgY4D1kT3lp(sfN`?<_=J>FIe<5q$vjhDcoqC^G13Hgiot-% zwO$i~tBzy>sT%Uv{(qp{TFRy1s-=0uBW-Q!griBz~P=dUBz;s^VfwP9Mrq^77`UmkxT7yS1uJwOzT+Ss4`?x;-U|bAW6L2^C z4z_!x4(K|&zMT%7N&J7E_8G2of8g2>S7~LQqUse7KThFq2H^0IXTMfo>RCl8X(La{ z0TBuHC)!?2#W>ca+g{{c=&3(^vUqFOY}=G%5O{^a1El)pFv~U~W))`tq1rB!|4?n- zWv8dFJ}>`E06WCLDP89*cFhWXnW0Et295q9x#Ibe(&yQG3ti-FHd?E-b_zDXIltzF zk~Q~;Y>NRW8CuxwJe-1=3u@N-Y43o5zRAwBbQGLIW;KQAN%dXK;pb@pZ5!Qtn%l0e z2P-k8AB|LZ3*rr7LN7X)4RtO^e0&eRci54r`7?0CLqnX;pI1+Aq8}YAR*=H{4NBL}SKvc86M3H6D!3k$GdKGq3>lDEp^Q(w{d1QJ1A zh4qXvINyAHQ+vKyf6CqHEqUEP}6W@E7K(9$Zizifhc`B!syla$USa5oI86O3AC z$_0#?U5mzt6CT}(1$AwvtOT<^ke;K;YB;U7^)@>$<8~w54{AyfpT9Gnsga#oT$Iz$ z&;YogGc)S1T+r3~$%}K%Z~Hi)lM$8zNO5w!fUl2Y+@eGgE7V(zo5ohDcd3qiU;3n@_su@$cZDpNa{wj*s^@zqpdM@d;NK zPusW^h{*S6n;AnQa3WWqu6ttmkW#bpC*{zCz>+sM#7xtIZ%9AjtIo1}dI#bTv`pFD z9k-_oip!X%LlwFa5D;KC$n7;XHRZiAU+~dfR(0PPX3l`a_~vimwM7RAXY8R*N}HY* z!RL_H3rEiOq9416Z`yFE8g7Ss*yFR(o2j&liz|#p8A%qpNc%TBP+)GkFHT3OzlOD~ zzh+cuQ1E7{3php^tl-#>{4B;%rsuEZwWGNCbit2)QN|uOI<>7UKkh{oAXOhUEt7(c z61wbq`(=)THEMoK`E#p-NH;m8026L#Xb8t;BQgP?YQ|MI8`p<8sY>#7Py+%I|Aj^~ zCF6iO>T$x-FFDJ10F*`$H*m-^aU07PeFO5|Ix&1cKWOBj_Vd*Dj?dB&van9i&H%ya zt;L3zlU@Ku{a%$*Pv}#_1z=(9TNe=%DPu9COggJyrM9Ls;1SC_mH(zzF$Cv5JUjnj zu}JYXA~&$JW5q}hbfH~UrfvL%9ePYE=*>jCUP$Oe*O8ZqPTTsHekCp;u+jzrawP{P z2j7$(M@^5!BqI}J(uKvI#Gc*E%ewdX&}bmRxb=Fh%#f)s$SascYyekbprd@hgSgK( z5X0S{MnZ%>8;3@Fc0%6H&aS&@$7M^CEiLeTE1p*Vo2q&GxT3w4o)*iZ1+PcMp1Zq> zQm34tH)qF3%GOl#jnu)y!1JqQj!&KYC~U?Jm$9g%HeHl(8}gfLVhrQG;BeWiy4$Vo z(0fYe$F+XeuyJBaZOL$|EG>D)4oV$IV##fypQRpj6E2%#&00bq$`6i?xTvZr4(^`3 z%SuZb3v}aBQlvFB@LF10jE#-)fuKO>PLZ1{HX}jWRjI-OODp!O#4^epFdeZ0>VBEf z3~S3g!1{lGuZfst@OIkL990xzM1VYWZpEi8#vFaz1Oyy@WW`P0iuh^e!cBnv_;q%-4F00i%(xp3#zkT zE8Wkv7J28VB)Z0p$d_5%H~M9eA*;_m2WR9?c|A*I#9`9sP`yKcAGcszGg7hQ1FOcy z=kZ*=>QC(YgaiKTpmGDn3H3&~VVk_~&@=Xh%H@5kiDL$G{XG1bnHruB>pqd*7!iGKJ|P!nRCSp%wz|*Q2=Lkwisadj@Xu;#r5!P}gCd>5oaDqjGs#9BB`fTQF%& z$`-`i{a_ETv!aHWRvDwdH8Au3=1)EnmjDZRJN)yf8xuYN%xgD>IycpQmOX( z^CS7~^qu!n=r5|TNr;H?tXL4peT414Z%VI3)KFf&gTu;D8~AE>0X^%{aLzyhywBkp z_5py9Z6gcPR zd?!zL!JWFj6*y=fZnpipFdsKrM4hcLt&Vq1XIMC0{DB{>6cV3%$`Kh`4{=iZL2eQf z@>8H!M1y-FlTB8nrxKs_XHa;;7y}s_1;BI7Cjb7d7Pv=ab5Ld#_2m@OZO{6b`bzvW z9Si*3ERN|`iaix{TGd^8ySYyhr|~rmbSl|Oz+Ba)ACGE2M%o;U&GZ=}cY@bK$S6%R0f|8ZnA zo+OaGBPxZA6;nNiU@YGI_MnHPwg`gE(^>}~8Fy>q5xU)E%o7iRCrO8=C#YdMR)2`HZ?Pp#Th)cWXT_O+e8w1C4# z-ESUVAY z_C%(6ezekI>aiq`aYnu_y>Y1+u>&>L)k7woY5&j!Ne85a>pf@>>>6`ig(aeB=~-f3 z%nD(99`_t^j?!85(7Re)^PLqx16bK^x%k{R9J%ZGbA|q_q12?BLoY~b=JA5cNfhBm z8B1NoXEjNHOzn{g#lWqBE++GW&SKg7N&0ybqrU8aTu<9Y z?a{1$-jTZ-#eeFin6}q!YD(bwfmVS&BuLd=UXWFPL@~X(cSzaqXR)v_fKH>726oz*TUe-I z>5EB#Ia@@PkTDom>yX36wy-Ir{iR9k(2f6SaD|Q5{4DV=VbBwU*dBmN)yuF{-__`j z4;;oUK6wiRn<1JnC**!<*D+W=9v)gdq!#U+=MuD$mz|UB+Zhfzd2Q^PegA%YuQV3P zw(mq4!D11apRRCs2dqRfnVEtN;rVnQ5j>$BlfqNAwNt=8<-d?)?Ks*0ao3TJFvrVB zeBBa~4~|gBXG+vcyVJO=+zzYyew39J0)%aRZGhi^SJhlt2$ww?JX>0!wdMlRsxgf$ z3j~lQ3QEcVpe5pO@E?*=WDq)IDu_C&y5-S61T?GjPR_C7qny`tis`$;x{Z!YiW|~^ zPChibEn}_$@;W&=VW7Y#1}5XHaO9}9cJ=9WZt-WONMt`eKNBiU7VcguDnV zW(SR;1$%)L=jyERY#aCuJyl!3ut`fvA?P5Rt{n)!8cGz@nI-WuF`!4Q4wQU-Il1te z@o}hjtM4513E9yVFR)xuw%+QRe;f(+g4|TadJ4t2I&?<9sl+6az26B>xQhx$`>{+& zvASs2#tZ^>Ru}$FwcFcQ1uXgCB-GnWdBE)LS^c7I zKCpp@D!pS3?#8O3C5g*w24ufz(?Bo*Y&}BvEza_I<7+aQRAn{GlI6aW8j>w4OD(w+ z6D#`hBlL??Z8~!2VA3O)810EM9$4M~{{8z!{3E=Dg#~ZBCLs$mb7XBT=i(C%8CpHT z*yQ-1kp^#U?sY7R)mR&HgRMc96N%pZW4l*&J^s z{)81(=dz3lUkq_9l>#emyLVRP9TJ%{L>urpHkFMuY9p>Wi>jkTyrKOWY^R~lj zT!#yFjQdrC@<{+Yk%FSV=n>p1%>FiYFG#GOx+ZhTJ4`P66eXobmv@mUvf<@&EPm-S zbTnvSb{=+RHMn0xR~M!I#OK8ml*DSF2!LUBZBO-$$4v)@_hpRKue0>CbvY^B^fo(< za>=E&>B=tP4n<9zyQ|mrVK@hAO@0A_zoL?!0$(+H&79lZ7y47u44$0oWhVI;kprfZpVKm^t$# z>#txl4#<5~cU(%LpXlAM2?@f!BcPxES=b9W&s(&F99yI}c~jSioQIF-&sY>XVGq$= zVmQgOg$9>d#bEOXTsOLrfV Date: Wed, 15 Apr 2020 12:12:06 +0300 Subject: [PATCH 22/60] Comment because why the heck not --- code/modules/antagonists/bloodsucker/powers/lunge.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/bloodsucker/powers/lunge.dm b/code/modules/antagonists/bloodsucker/powers/lunge.dm index 88e39920d4..db7868fa8a 100644 --- a/code/modules/antagonists/bloodsucker/powers/lunge.dm +++ b/code/modules/antagonists/bloodsucker/powers/lunge.dm @@ -27,7 +27,7 @@ T.base_knockdown = 3 SECONDS T.range = 4 T.speed = 0.8 - T.skill_mod = 5 + T.skill_mod = 5 //Monstrous tackling T.min_distance = 2 active = TRUE user.toggle_throw_mode() From ddcfcb5cd8fe7bbb8361c2a541cd1908add46296 Mon Sep 17 00:00:00 2001 From: Artur Date: Wed, 15 Apr 2020 12:33:59 +0300 Subject: [PATCH 23/60] Conflicts sure are !!FUN!! Also adds dolphin gloves to the glove crate, and fixes fortitude --- .../bloodsucker/powers/fortitude.dm | 9 +++++++-- code/modules/cargo/exports/gear.dm | 2 +- icons/mob/clothing/hands.dmi | Bin 10110 -> 10734 bytes icons/obj/clothing/gloves.dmi | Bin 16697 -> 17824 bytes 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/code/modules/antagonists/bloodsucker/powers/fortitude.dm b/code/modules/antagonists/bloodsucker/powers/fortitude.dm index 9a31258d9d..bae802c176 100644 --- a/code/modules/antagonists/bloodsucker/powers/fortitude.dm +++ b/code/modules/antagonists/bloodsucker/powers/fortitude.dm @@ -11,6 +11,7 @@ bloodsucker_can_buy = TRUE amToggle = TRUE warn_constant_cost = TRUE + var/was_running var/fortitude_resist // So we can raise and lower your brute resist based on what your level_current WAS. @@ -27,10 +28,11 @@ fortitude_resist = max(0.3, 0.7 - level_current * 0.1) H.physiology.brute_mod *= fortitude_resist H.physiology.burn_mod *= fortitude_resist - var/was_running = (user.m_intent == MOVE_INTENT_RUN) + was_running = (user.m_intent == MOVE_INTENT_RUN) if(was_running) user.toggle_move_intent() - while(bloodsuckerdatum && ContinueActive(user) || user.m_intent == MOVE_INTENT_RUN) + was_running = TRUE + while(B && ContinueActive(user) || user.m_intent == MOVE_INTENT_RUN) if(istype(user.buckled, /obj/vehicle)) //We dont want people using fortitude being able to use vehicles var/obj/vehicle/V = user.buckled var/datum/component/riding/VRD = V.GetComponent(/datum/component/riding) @@ -57,3 +59,6 @@ var/mob/living/carbon/human/H = owner H.physiology.brute_mod /= fortitude_resist H.physiology.burn_mod /= fortitude_resist + if(was_running && user.m_intent == MOVE_INTENT_WALK) + user.toggle_move_intent() + diff --git a/code/modules/cargo/exports/gear.dm b/code/modules/cargo/exports/gear.dm index 3ad1756346..8dba7f69da 100644 --- a/code/modules/cargo/exports/gear.dm +++ b/code/modules/cargo/exports/gear.dm @@ -309,7 +309,7 @@ /datum/export/gear/combatgloves cost = 80 unit_name = "combat gloves" - export_types = list(/obj/item/clothing/gloves/combat, /obj/item/clothing/gloves/fingerless/pugilist/rapid, /obj/item/clothing/gloves/krav_maga) + export_types = list(/obj/item/clothing/gloves/tackler/combat, /obj/item/clothing/gloves/tackler/dolphin, /obj/item/clothing/gloves/fingerless/pugilist/rapid, /obj/item/clothing/gloves/krav_maga) include_subtypes = TRUE /datum/export/gear/bonegloves diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi index 74aabf6021997fb06b02afbf89f03b8861865232..3860fa4b7eac912bee2713ae969ad9b993a3f28e 100644 GIT binary patch literal 10734 zcmb_?2UJt()+jTKI#%Y6C;|c&ihzprW{eF1X-W$nrMD0%A=F@JPywa)NG~BodQDKO zbRmQuP^tk!fDmF5lDxy*`TzCaTkqa?XT8T-hcDm$_Bm&t-M(*^=zGSxM-Pb{;^X5x zs;_t3l#lPHk9*gz`vHimRDA$2@eDP$3cT$a;Oy`DD9{t;%f}a-nMC~L+j`~5{;vUS z!IO3qzdZ9+IPNjWhkZQVneTAZR8v+A)^bY*DkMm?A{!97T+-!loDILLZQQ^zs${hD zG>e(@c;sWd=i!NctBhI+5Mr( zU63s47TG2)%gm->`;_5?^&)53;Oj=TjZpQMB-FioqHo=&mM!N5tE0JXUPUvV3dbzF zZNTyIHfQC!w5AS(NEDsJ`+tzkjxP+$Q+s^jRN2YH!Ud=A2#=uMU+8ID-8cpvx$G_D zeDhZBONEY%nCa~rFuFh8F?Xu6$nM&F>$oQNRq$8;U%}opG1iKX z{jpL>N`u7O@*^SP*ZHUDURA7sS8YiVC;KYw_9ae9YFywdT!_~1-$xVE=~oUKNSRVq zj?T*4I^*V(D-nuh!EIWl*8j|Z@Q)kkK0P-5UjRM$8-I^-@OUIz(QUQRD5G|CYz$VT?M5gxvW-!!?Q-$L zXJqewK3!6aqGi=^p#ikjn5Eri@Rh337U){6CXXr5*N;`76i+B&`i5?u56GWH4ltGn zLGEu9_a0J+$In<&Sgg=0PlB}bn+lM$8I82Ppu413bKpr3<RO(!-PluDDZC9t0;-$-d+4q>;8su&h#?}@pHaj_4dMSRON0<)rwp$1rNZ#tIpMhF$- zF7W>iQU6<1vXiFRhoG1~sAGzFM5!I-=uy@R z_(*vL0Qxf49ACC4sERFr`$&stqa0Y)sEM4Hx3`fa4C~a;;6+^<>5LK8#n{{0dgs3T z!)9ty@Yns&nC_8qbr5lMR0ON6TS{3DC*Zi`0R(|?TZ^|CFPofr-m@itzvx)6e|Mt( z%G<#9rPOy`{fQ%#b6|tvY(bjt3b{Uh5NoI8;2vw;hyIO^?0N`tqkxYbaSE@E3A7= z!g8L=sf~qBw>Scm|57q%#o0h?WFswsS)Iw#UuoeFubG_L#9A^Wz@8)LDVpWn*G&n# z>k0F_fp){Sk|5RbHA0L_O`QcBJVq$9KTn&Fa&jvRi28G+h%kpupioQ+1_L*r>Q6Q7 zH_?qK+Fg?&t)kX<14j@&W5`lhbIQi#oSR|cQc)h>ENxWa-^%uHEPnmTJ73~*{eySW zOD?jOsYQkSy4#}}us6ZsPKM-ary4cXy)fN644|Q4QxoN$fg$BVaKY$t=;#+zSeB+K z#mb?a*}4cJw{fUp*Z#>B-IZt>c=yx*uU&%&hr``A=Q_MRJnq@rW@IB-z77q|y*XPUgEfhz`hLwULu4i4qJyWzH7%gf7X;Q6|7;$lL~ zJm1Ihf%%lW=m&%+=e34+qA|{ty9n-ev8*m*dUea@_2KXqNi?oy^J589I+Qm2 zttIjkktM-p3te43dwh`BqJg_$e-h(+bBHXcPdJFL19po~{Y;mUP3I}kh0e+_YK zeH4NmP%mk0)T;6#$|PniDh&ZPY1>snq%9kF-iLKyu%#0)j?*(0XZ|g{cg-zc>^k?|w<~*L9k6SLn52T^?IN~I8M6Z86P-QBKKC3drrA;( z*QEjpfzFG+xN3!-;OXa4w4TTt7aYDj{1pL6`Wx2mcN$}f|dLX@$F`c5TR zLVlaBE>-)=w7@8iGbEE@s9;JL-j}Xj@G*$6EO@(c;r6-GivxtY+@DEx9;Fqa;K!C%{3UhsGZm8-`dUr8jTgT^uES@7C>EukmmFC2}$fGpzar7Y9&f(>>>OovY4I^rTt8&(zfEVXYp5;GViWyyQW-NhJ4&#?>l65%WTpWZu{U!-$( zWqN-lsgQnoRhhr`cw}^H*8A0EN8dCy_2MY68Kd`lP(V{8BjG%0qa&PzgyvXA4*3&% zg}|^hY`CnWkfjd1xnp8n?{=xZAhAY1&&E>QpZh`dYvt3MFMduw7Sv8>=TRENL$fi_ zcK1$k7dXyhT3=@JoJqI=Es6J6emA{=_&&1a&d5bVb?}}PGO-H^QX&l(Fn82p+H$XG zDv>>s{TWK+>g>x|iWBsgu&#*Lh3N+FhT_|kH7A&EGl}}?VAps6^J;HT(}Q=dQVAnr zW%^m{84H(h{$;eGV%nk!E zvt3`fFP0Qvd5^zk|BC8su~F${ORK!5KCz7)zf2e@xH-?=O&NIe{d*UwNDbVSVeqxb z)Om7VDXQ_r;cZW2isTsRNW5rbYw}jIvDxyH)KbxGTo~;Jp7*5j|=6k z&2N`1U7C7OnxK5=OA)2KNJ>15y0Z4B39y%}tYMnyRFc@C;-I0=%r@W0lud`lo&8Co zl_Lai^F&wbF_qIl+WeqT9Fi7wd}2gPm1l}5T~l^36tXg_J`Z9$W%8W?TK77V6kIk= z0&M1RsdQoy?N#ox*ywitbo*0AS~G{M4(GjUKY*$Pz@-NlWk-d~5h&piZ#lpi1k(kR zD)W>!#bqr$U=Kdj*?EdM6RFeH^Z~mPB3;ggF0EK9*e} z*qt;7>ao99o||NlROiwC-r3M3*+vI?yz- zVccYhK%qr$(Q$zzrk2-N$Yz_82Fh}6>5VQM8Quh9QGi1Km`%VpC6k*6th_JV1+5n_ zmF%A_E5r4lxS7ASxY`{b%E~W$EE9LVsWG3yfS34q>2200dec;18qZwBZ%ze?!6+8k zY0@wBZM{n}`N~BaP3*+{U^}fKyUF?*GYJWC&B*bikHXy1uPXV|ZBz4z%YxcoUw7l} zlJ4A;JNTTA3~0)$IH;>N-_uO zY~v&NQ}CCpk?BRQJ=G(R4nQ7->DBG;g+&F_R;l;Gi`VOnCVnYxF3Cg%JgZ091Z7#NaIi0{VMMl2h5#3728_2SC(%Af9&%66e= z{ecGkW^VBCwkE_dKt(Ow0be$E(fXkQDa@q42Nv3L>yxLZR^7lvjqb|qb4-ALf&N(> zyRm6Ef9sa1O7YTlD{Y4Ufmu(n%nY$FVJ(zl2xcsjZ12&6wZZbXaI-<(J>t9U@Qo}> z%CwB?fmTzM@!7lsGvh-A&QMZmc1D4GvNl>X;H5dzP0tolL(Z~aFOQN4KQ&g4%c^`j z&=qxaIL%#;V(*8mLo95b$D8SeA9RHo6y-I&@|NE+x_H{$SL6HlUit2ozL>?8It(;+ zi<+)JVR-C0afVP7`Ga)B1YBkuzJvIH3%h3$-Ie1I@sq1Yw|_b2v$|QXb$sG*sKALm zZ!fE0HkiY&#cj9Ib-a0SsolkOS%bB8w^A$T>F*tJV*cA5vExZ~>1E2&@^-%wKSl0} znhfgBRkh@Rq{O2_>H8ADN%rcOCFCcLh84G`+zVyYp{d}E(-8+dUcGc#{6#DxM9Mnr zx?kd7_OFgHe*^wTAUWZgLV3j-Nu6_h+qI|46!;8Ia^|mL!i{_)^UG4DGO3V-rP7E|Ti=K_(>nT4GghiQ|xBdP&Kmys9=EE7>QE}7YhqzF5@B6O zMAWl^#E(mziTcZ4nkQbM{IaSWrtcZrpdXDes<2=an+j7Sahua-^PK^}8F_7o-1#Vk zKg{2Tu(Q8@(a2fnoT($$JXL5!XIa-GBMUY>~hwCdd@TH4IF>eaP#?q<|9cC%- zFTL8-lG57zo)yZL81xMxH0i#tn6^7%l3hl2b*+s>Ian6XbtjzY?a%t{uUr83BxZy0 z!*I|9^3whqV+)+Drm4l1Ka2$DY$f^RaWc8zFoq>N%JIjiCQ*4*E z7L$cp*3%uTMJ-EFE}BAP+l<7u0R1yk#^PXUN%3Bz=esV`+Y2%h%c~2U&Nt^Orf+{{ z0C^}T$nkF|+`mOVGan97qUtX-#ak-~Ydepku3l60y}H~)?)F9b9!Xgq3vW?o9B}il zQJhU<^V9lT)qRLaw{N0uU+XtBsf9945siv=*^V^aw;BDVZhk`lQHHS+19}0_0Q^y@ z{~b&0N7$kZhx3EYkOw~~`YyC~IT{=NAME#DitsQ z5Lt%A{I^X1PZr-e5>X{r_AY0Tn%NeZ@@EEtS8c#x6>0MbXWp*wS0bgnc}H-}Ul}w{ zRS;+@W2Q$#NzB3o}E~|Z{_Hmv}*g*RbOWcps zbvX;wA6>8^uJz4NKp|Nn13(G~xS$HYbay#Jr@q^tO_mP!iqy)0XN8ZYAb_Qarmsa| z96}cA$Z}*b>LtyQGv4|}o9C;(`i^MfVNQhGa|(O%y!(JfYMvk6VfElDUlp;-5lUaVi~yH`@%x_7oZsxcmpM zVzbuiCJ3ZbCU1!SZ8t8R3zV4u1H<{L@aQ_B`Qk%QkJskq`~GB)%)z;qwC)(wkHUXe02>F2}{mgV`7{STZh1Trx{N^5s zVkbAearNo@53707^2gU}e+LQPxs>Ihnfoe@neFaF{SfKL8Fe&NGMQbY?BCq(e@Mf$ zq`IJ&NWD+p!lF{hMFExK&Y$8`dDRd2+dps@@k!DOEmrZ{Juh1-=m$opXCkc}kQIAy zSGS1t~$}BLVcUNz8;M1lNJi8dHvey)s!qm{LZSYgHpFr zEshqeM)feIKh>PX6?G(J4nk~~XvAbDsp1-_@lyGNTAZJl5vH`~-ATwVrZbZ34kuM! z%l};3L&kdRUa<`gw6$x|9z}Q^E7^YgH3-!CG{yVc=_&)FgLsPUooT)nWlg8@0eIbe z$nySvgtV@ymN1aavsAu6wmMm&x1I2P5Zy>TyrdTo&@e0oXG}FtHRP`&y=k$9H|EVM zC>Z<6jX7UZ;8a`f7Oau-(7Ww*Qw;!>br&ddb0{fY9%KO8OQbEMfmx9%YRavwwRp%P z(!3BDVxL9Sc5>FOQ0u{}NU!5}b)2di<}KJYL8sRUAMpV0)dmAZ6TsbGRgXmUr3_ry<{Ew%Jln&uz5F5^VZYEbOXRJ*l4fnxfhU#63XZv+AARk zBDYjz(0i;;9vDUg6B4k-VM zm$`i!wzXKD+BQ8RI$oE8czkQD4Lw=1721E`u8&tb=737;k{hGmP9#PzTt5czv+a{DlQ#0Ov)t;f&3PbL>Fa;{#ak#F{aWGia(2~9GdSjlRE^}nE zy>{ZX3b4U_I2g;awNE;32~}Au_JFFCm7aEYzSA>1Gvv%}#p5w!TS}4j*_q|hK%oem z(1kk4FY&A}m;A^|owV~|aXUBr6d`b&t;(EKU)dwfw2~Rqk>V8Z>N7Kx56p+h@b{@9 zKqyl{y>yfuo}s=yX1;$LS8x_%ed;bV7GQ3*+e5usTajVaq#d=dG=n|75WKJ+C*wgt zlj>ahxV;Q;`Vy_5ae)3PTL1n#0zM^KBi+)Z4fk2?o;RM^C#^lIBTzmeEFnU9OaTsz zGedc$nIA^$=&>R;0PlI4!@gA=L*7zqE$Dz}odeRraNjQ%Nr=|F(+4NX6D5-#R-#kv zG1uZfPoLjB=`l`QGrwHyFdd!WnDe9NEVE)LzZKnt&l!;a)x%HcdYrlrH1gmgMVf4{ zqpE%ch@A+^SVWwCRk9w!4;7y>#PK)j1Xh zp?an@`KjxP+m)*B8=Uv5x>J4S31I9ff2iJYzl?fY>bgo3E6$JbOnBqBZsVA<88ZcW zu5qlWgy6NE{Och7yq=2>Xa7j-_qXQ}q3 z*O(~n%-z8=zjrl7JP#>-`A*T+)tD3T{F-r$aB#D5$QzgWe_Y`EN|5mzTUhvq+nisq zI>JtUb!7BJm`A&I!;QFya2kK)_?Eax!|X`LFMJ=hi$DX_%u@uihT3($>z%?sz7Kbc z6-@d4Cr5<;1I}ezzk~*#4x`TgaYxPy1mm#%wbob;7iSqz-w59QCIIR;aQjpMk?J4c zn!HoBSQCR^=1(u9ljJC@pR66ESz3OBU|r4OzLn7tKuK+lDlXIFs<^JlA%VqhH4f{KB!o zC1ELjN9x*|x#aJgAc>Fd-$MCM_a2qK52>PG&&5v^cuQe4nUf+_24gJTKeWCPJ2Vn5 zufTA-iS(haC`tVmZih)(4j82do%Fdn-U(f_qV4R>b()w;cc zwJ70SRZxs+qo~ndaY71B1?t+3ZaWwF_jkJ8D}RTjb+j)9^PhI530LcfkjiSa zSaktXNyQfO^tbsFHnJt{tJ99WIT_23|+un?627hp2upo4#h-g-V(#TE%*O834^R z`vEl*Jy1ta?_O!b(qWw)uIQ&Z$!7xfH;r~fO^4f% z-QOL;)k-6vJ6!Xfntj`IRYQB>&FjHC#K|vT!v;KTL`A|;0Au62h*^tP+uAduE*iB8 zr=F?hwilXRk}cGh!j-j?X5WrsG)rL7MbM|}2FX(1UsgFGTXM(wu2g7-c3u5?>>j^b zRtiRQ((TO~iHup#37G(lCTr$xwnMU{8kp~~f-!Qx6*Pz(d)D!BLz_>MFso5uqKG({ zuh7EBCtdH7@fMXa`>27BFJCO<`2WEe{wC<{PuYr{Z?*}yWQE_;c}5B z2J?O@$XWjw?FY~8%AMV;l`c62i~R09L=Co0Fn?3m;LpXW&Maxou=c&p>6{`RLp%n0 zN2KN{$~Bv#3V)M`e}T@s>ikBS++rfBzW>=0_fb0_!8BR3!twNFpnt;9!Xl{wd|DA$ zlg0GMe0pC}R;D5)B~_T8-)@O%uSiNtk_F1BgyXNWR^+YmV?a!A+($py5uQd(h{Gxm zj_^jVGJj~<)?|qTy%)yH*(JOZSVOlL8#H^H19xOsVpyyA9aqPJ$i}U#o$W6m1S>hC zY{#mPVJ7cafh{Rf1l~}4vc9r%cw}TG*#8C|AO--rE%l|vs(nmTc2Do=xf>9vF~?Ns z;C%Zd#34j_$hIlaiHtX@WZ&OUU zdQ0@@P;4{`xI+~yQv(+tc)IVk3VbE-MOEb`nfX@hiP4b~Ld}Cuxrwyn^vorJ)6@bF zhl+pFlo!&GJsP7XM)=eZ^ZI51(N14&MVHqe^F^8s6*|i=r@ zJpTkJx0N^Dz7yYbs30=j?Z^DffI%Ub9d!ne?Tpos0NN2;IEg3jS~nyFmVw?MSj{j& zhp>BYCal2~j;8nlzs!E4m?5V8D6k#30lq8m_Pu0(a>jnXYqxPck94sG?=6H_Y1t8q!+TwartK^m+NJ~Kz|0`;|L(7g?Pb{}pfE7!{2M~|QeG+nhGUGfGp1O9Ecp0pAKVymHJlmA6CNC5GGH^h1I7%Wm zbhl$UGw*dA)J&Jq6&mpKUkyprC|!R^eME<-q<-Awsj8K)H}r?WQ9WG|K$7iuFhe=) zOv|#ZO|4ahm0{Ih@6=$a279EwkYlTKEwcUS2j0yUU!l!8-wPz>t&kAJqH0Sh`&*ha zyjM4D+szw|nUAD#*^OsT5(EY_OLVAs<#ihF`(Do#Lp}zJzUAM{bsXwq)scl_+2IPI zTLi!fObOugysx3$SH}f{sKgd9!s+JXyxCf|uyP+r*-axe*DpK7nGAVFyY=5bSEx@$`*VhEnA-)Hv4>pMXpd6STQbi5YDup1| x#&HlHcRD(-?kBz;|L7uqJyu`pK-T!PT(;xFw~W5i(diMo zuD4?}HC|iw?o@}C)X#71(Ol80q%V!D9+cg_m;-H-H1}(mE&JhYegu{$zNl-Ir1mvj z=l$1cb!Q0$ncUnOT!e_o?;?h`u3Lo{&}U+T9au5cjUl+0=M`ySiVMEG=l6?eWl~g9 zeEObTZ>(AV>(3k?39`lauU|!g&o9OwYd1}sCcXM{Q`@*VFVymvbMEn`k2VeV{tBx< zecAkxjLapiq=?$;``r&X*PE-{Q<>AC`G9i~=SWdhr-8d2&eZv9ceb|p(Q#O15@kjg zc2@}bzjH`Q%gD5xgf{zF!ZPdH=Eet_aW3ANd<3uORAn=g!JkZ4lZK{Dc0@FI`uH?jqwDI1 zeaIb?C!jv*__1hhASXk|hF<9vW+Ehgch&0e65@P6Jb-UvG7GKR9W z=bPM$eb6C#P##d+-VQKD>XXbcC17NYupz4-+%vW@iCDW0j?Mdvqnb*+a6EYupmjXi z(^D_ZXrc65u@Z;_q?ic!t^i6hf;Ybv9Y#<6zPOwhY_{{HdTt0W|7BoY({r5MQ`~bX zHSGOHvliXgYvgpkc=Y!#r+p{uZ!0J$G^Y)*qtzleVH5_x3hlg&KH}x?-x3lX6@_j# z0x0>RyLp^`C7ixEuk?nok@4jc&&Xm|NTUxrXqwvVp=&n z`*#ff)QkZp*BwAH1zXa1wnimZ7Kmce%sd|lHDv|M)8)n^_wu3L6`BwWR5I_BVHBZX zzOwYF5fE#H4~GjCrq_~Mc6W7ACXmom(|MQ_?FbXjbK!x@J_T*8W7OHq_D&QMi5l@F zSa~si*hxy33OXBf`LXKopV&lUa-9Sw)Tm(?Qt=VSG4q1Uno;%)ujAF+B@k|oml3Ji z`t@!uhHH!;K#ec_crra}>-1MeXE~n!c&JfZla?j*7UOmb7+EHKdJ zA4+EWDO#g*CwCCMzzEz)z7j6><4$$w9HmTF592X&mabFyAsG$hkuB$V!8bp#@Os+lGF&!GKx`oiB!FDE9e+C6$3q4VOi_-NpI898FR`f@rr z?L5-1f;|RXT3Kq^MHaV2n|Z-t@r;Mc`7Vi?n^Y(FG;3X(m;RV&RtT3ApRR}WFBu0B zI8fFnj(p4kYMfVrAR%F2Lom%kQ&Y3NsOTn$PXptsJKYAPVM6G7dyRZa?bb5de!--n zTk~Sw$|sVg%C5vE^t!*E@@kKED>q`e|8ZQcHYB>4nmz_QXWgHdt4>iX_fm>l_x?M+ zLh>gL_&EdAG$^Qp;;iiK%0GU*0l`TfKVDH^Z-Gmb%|FJO^LvsR+&HJvbV|>w@dII?w zL06T|&&$Kk2-*ine$ALb_={k@Or;9QDoB?B4mPY$sVkCU9~9IuH8tfUJ3Tg5vbeZd z4#R%WRB#(sFixRB>oq}H5mJaX@0il#j`g4V(d*I9+`mIDIf&i***`?!_g&&3delkrIzLP(mm&i$ z`O&>!TjiMhSuy7B_{W4hfCRI(%fiKioWSrz$WR&9%P)5W5L7i)x%fKQ!)_*rOb~avn)eClYHbwyswQvy{ zh{3LE%s?0wNhzi90T&qGC|;H;_7JGn4sU?~4b^hETrRZBjT=<8C`9fRdjyhUS}s(n zD!Ybm6O*YQV^wxgX=&+b8kLAnC9;JXA1bA>~pp&;y<96Y7*q5 zwqQf&%8O9WlxY%RsqQSW(Ip}2&tG~a_63j2i20<;(3ZtZay|ZdGx+Jr4t4Ns^YYAn zYY)|nNnQfHoI%WVxw2v1<1d7Eryt1?0R-~6nqj0HIA5vrb4_R8-Ao$I0@q#YGk%fF z2vK}_G(&Q5xK0p*U3PjjPImnzqikQhE^)_S;Da`suUIx+)d|YF%1bK3&_^{pN&D|? z5;;rh^-DYh!8+J9E-bOC;IH<$rVlXkjg|pvJ%J;CNq`me9q;E-`37aTtTJ}hqXDFo51PhEK1*PnIc%MM+{4qbPR?GvYeG)%Q~T|O z#iyBNfTN;-(aB{GpNprg&K>(w(O|@qVtlLFG%)gurApqhdM!0JE@h%yQ}TaYugBKxBt8hf5o z1p0C)(kgl{$e{%Vo5_^J;b0seU0@P7z%Z{03#*Ljb+@EDz5F2#KN+|jmkf2FCbJ2vXN8hHTA5$Ndro-e?D);Y$M2kNL_>0xHtLp6ob^IQ_BttR z@hRvB&gRNFW$ib~7>k-&2@T;`@$F}d(qhkRzqw{ONYfVUN^5JL*4eN3j@IelxKV7J6Aaj%1XdrJ)+Wib>73r2@%|9yFX+oHK1DP7*%AWqVei+ z9QWt#jfxdVeFwYmoU!0%mialz5?^rZ7zQK}+haJ%{r3T*Szr9qLzb58_BJa98tU;T z4RGk-+6FK#Y8xJ+e@pL(MS%Zz=A!%7+gPY|q37E2c&TiRdgn;ibGEj>ZiSI}I7Ooly`YW>{p1M`eZfm3nC$S*_n`&I4UKDNu?rni(u z3B+Dpbn^6e%23{c(Ks&Y`_kkyB+Xg}hw>fE;}JE4d?aZ=A&|%_!B#r@`eWY34~9PP z9SkMiyr7UBdws99RC)30h(_d#afh1vZTSs4FPkLzD{0(8f2FC%dOSa~-B>KDohgoR zeNH`Ac24fg`>%2e>_+8q>+?X$VUH$O8Xk;ZY5UM#faWPhO)dNR6~CAkYj2_X1ZjQSjr>O z>%`~#gC80OPh8HpbuDOa_|;tJC2cwDbC-Fq9Pb~ob}YMA7yl+wtiRTYaQO?V(EOfN zZ))#3Zt?vY^849Y^k>XjrE`XDs@iYjF>)b1x9rNgC9ucrg!_`;loDZ@Ueo-W5C<)qXQ_#+Yi8s0p21*B&o%zb55iSH@Z#kwpA?u#W7|{_Ux< zxNBs>kb8IiBRE9X#xp~KC2?104_Gdq&Acm5U%U4?<>isz&QlgW55U{)qL=w*aE~=x z>0LvqE_(Y_@vR$x*c(%g)exlIPh1`wgrSWBMf2o`2vZDWSrkyL)(B=HarHRI9fPQ27jkPd)v7F3Ckb$gg9*n9G;KMWQWtX8NO`{|_qp8O zB!)GDla4wr&1gnHYyQ{<;Eo(0+Pt%SvHSXU%|kbgZt?9_HaCrpe=)Co-(k^k>^=TZ zfavw6&u4qlZY4!^U&X~;vle^yLzYNkBi6Bf29Em&`w4p`25W#Lvx+`&q?+V&<_8pM zq15U`=G*H{`#w%JIRltZ+v_tkPxPa)2F^{feDSp#VlhN6OKq26v${^9-dt<)9*-^8 z{EydfKYWk_u8$4M$*z63rt?lYHjLN}Oj3=q+!Gsp!xG8U^wr288*4|VI#CdtFPtCd zcLCcM%Nvvm4{fCaWBbGQO-a}%tF~UF+&Z&#;q>#VzQu+xwVXSeS(3fn-oRs!Cm7OdBq@e#C|Pf*VLcMl3db_ zHdjJ8u6;ND<3mSI)r_8jvy-892T4j0Ev!5zahHC znf%}2?mWSN2n<|b2zi}ReD@ajv*Mgb6~$&0Qi6_JrwE|Np{#u(J^FjlVyc~=)NyHs zaJa?8_+VD=hk?gs^ZRI}Rwr#yjV2F2Jn+Y*NwAl~G}N}zsUOOQkkL!2|C`>bXsP1tR+=4 z>8>c>qT~0nKGn1eZpUmblzYUYvhJ0EZj z5DI(su*XG^^E*O`r_Jr>)pPFFR%O9cS3YktN^fDLfE>>=i~RV9tEC{r-&M@yK#B_TeWuTORx`|bC3))d{07uwvu?(!XRBg2{pI|h z^sWCT+waTK2I}%gi@KSUzn|2FY83$Vb^O$YAr0OS>6h}FIv$M$3ZmQ~)t4y<0g%D_ z*5X5qjopB_eQ(7Vtd%ICW7;po2d1AvV#AmTU{e~#$_;! z03+#>PN)o_I0yNif%QAFJpOi;e61z3FZ7_%+z+3jA*%$(*sb~tfu$&%dsJ+R`pPCc z+q&gAH&U1raKF%{ijCwfPCZhIU2nzIEpO)$9#4$r=tv~8QXMJd-^9|F^SzTB^y6kE z)*T^rMklj zt!jCETqT}K&T$1ekIbG0m8P?_!hc*<{hxu+{{w)Ivyw1hmzlm$asy)vb6({$rI_X;Twgz;b zDOJvXdx7EJologBp{Cn_@^@N!D@ufAB#k$`6z4Q3VCOft*$e2}zWGNuMMUHUDpKO{ zsUiEZKhuPQ%HUyI+ZWu5YR~?>BSYVxie=M2|CG~E*)n5s>2<#L{>)^F^=Ssyy_qP@ zpmQi1hkP&Up1nl$b~>rz?*VplM}W5V;KFk{84`6b%P=i>Kc`&J+pdT`Pu1-j-W){6 zApE6xCaAa)hUHgY`YPk`jyKY&AcRVxC&&i^W`+2%1{83vnDrQ-yR7~kHAs3edO*3{ zYsm9z)pGxqYiEZ|WaWJ>#9ss59(C-X4y5GPTj!XhPp^8w?;b6hC>-Hqh+!8pzT1B8 z&jmbQe?x8hd+JV@Gl~Tj2$EofoUmxI@c#ul?ja_^2W?{K(DLgl^If#y{geMg^M1}# zXgs8-6bjG8bwcxNr=Ad9pO^KE&z?wRMg;q|sqtGmPl$bok~HARB(51}68sY$VZ!$q zm4f}R2FE@6HYGA5iZK6~mhN)`exX5Zo@5+oa^mQvlS14@>Zi3=A6RSl~mjpM}%HA!|*vxzcpn z1v%Lcd~X7}+U3wj**lo8fsp=%ks|BJR;!8ID!si}8WxVe&SR$4a?l`^dTU0!%TY-fSYB~cPRp=FX*lU};Bjj^(_YYq&uKc9}FH_}h zaLJbYmHlUIQ1mSG)Clb~o*rrPtJ-+<6}J|zPCZpfO52{;DEm(i$Th#~sG&o7{@~=| z5OsApvcj#tX1s}zv7$7Iv<>l=8i1Yiot%8DEG^d@(h_vLt7}X+%dYNH=(aApX(J2R zPG2qcS)hb&S&ntvvOR=U!l0Zf>1iNQ)!{oNrqoMH)k@d`dt+Kj_czLhL*mQ}!$&=+ zg?k`#!r5Kh!em_S{O#S@w#k|81iroQAqfu;ikhD`V&)y%Q7GMoywX4~OLSnzz`$z2 zq)WfVx;ruZd%P)Rp7}O1CiaV7t!HwqO^l)afGYr$C8`->&)Ss1jD{`?**u7S{@<^e z!l_Nm$6x6RO~Of-5vNgqJl})a6^D>m*c6;lF}V_T3f||5XzoPD&exo@oq~_KkCIq3bSe zoLei%lp=~J(_`#MraV2j6MfUPOx2bZwoTad1=$DntM|RXQQe=Fdx2`tcyu^1iXY}r zgyug>IHi43>q9_XrT6B?iu43o$?Eh3YZ%q1|2{{zoh#H!?O-OvX;GM(CTMQJkc^Pc z9~z$Dpw;pV@KgKotO~EO;e4qZE>`ST0)}j;fuvIF&<@So0EMr^v$ir z_X9#~%*->lvDk*dr(Rkk#;TkCHT2OjplIafRGw8g1Qte!qi9!HHFY|y6+e`*uP(+Z z5RG2Y^bJvVj0DOddqyK^MW4m62foEAkOI6kQfT@OQR^qPfjOrSWvq;zsG~XRI0=Kg zt9YCrMQ_A+JH3A(r_M{KP4rc);KXRMaQ`#jWClP1_0{qwvf7TPgM0JqO90)OyalQ;h97P4Wq`knU>DDtECMQISh2lhsp} zg0^wI;J}%Pj%kCOQtuNd8%!6OAl&ykW=Yg*nPrnRLgNptt;sP&BSB1~qYnT21 zEC9|{ShwU>+K}94QuqsMag(dJ5BV(@6Sl)O4Jx-$0xk-%_^$qY@3MuPPfQSOlDnu# zVeB!HjW^Mr{d2O~UKbT{-ljmgR0cmb;4ds0n&Q)BSEtwDJPDBS$XoYTfzh_ z4%+}NZAYUeQ|~}&^LL7d?}vr8kSFU1!&giBQz36FefyElK?9nYd11I{=X&0GZFSY= z+>s5S{QJ?bk-HB(Z)Y3Cx?7K#td>!z)@4lr8X(%-&clGO#LrjrRhQN}*aa+nX`+H5 zmdk;S^&p1|bQme)9qe!5orRQ?ciBXUSf2i-o;M$GlAy?VrldS@G#%$dveW;+%hO>+ zLSuv~wPNvwwQn}JD&g*75s|%9yWawYY=&TRrcU`kne)-_(mIdIC$b5G(D-8YChsP> z>?^jF3Rw~G?Mfubvq^q!7~_Zy41S1Z4C+=dF1mpuJ^cK};9+FiA90i#XFEDB%EHfr zCf)v<8*F!OL%^+qxhCnMe-uIo@$$7HJROecZgrMEwLBn`Ep+gRmR0p5EeFuTsx4+n z$}+o1Vx6g|l;ycvK2XYME(XOH7v{fGGIMWUKJ1%q=3DEU>11iLRc-@l`c40B=$f{3 zOa5I`)6^!P$@)gs?!MP54PIVe4#agR!#I-KM2*H0g1VLm)OJgwQlu}^{b&HdyEqH7}vNOAdh54G^fo?y&>~q%0573nPs2x1wZA9j$ zhLiHLcV35gD~2b!*wrU=>gOn-)c1&3<`;$a-&_^ZbRk3x5$!no--P8%onwYbQ& z?mC_ShRED*HUipzUjUpoX^!3F(l&qFrQX3r@ht`4taz8;e-Ke%r4)IF3-|HPOvAGi z^$+vSnl%k^F8Rt-3Iyg`1FLoxvGb}Y(I1QbO+;iweNx{t--rLpzw-0{Q~m2hjP9Je zoo%Z??@JzX2MtVw2^dCeeJN*bYDW4%-qMnnrHzeSZ*Q*; z(MS&B=m-zp@c;rVCukUpg{a-K`@93vx<8w<^CK76&qxKSgJKsiLz>`nNIJ(%1L4oh z@NW}_ut16nABPD=S98;2=%LPoaV48@HuDE%h6?ekm^ylyGE_bP8B6JVT8PUkFyPC02U_2}B_^U{J?WsVA z#O99b&*P439yQ4*G#Svi;CmaARtm=!)eT$kq;+=-SK=8JhpN=vung>+CR6fhHYErl zgwtWphOVxz2vTYayDXq18XZ=3ln6ue5NaZKxzREEgo^cFJ7DpeQ-}Q8Z`{ee@NER7 z2jT`4aq`vrPI<`kwo0AD^z{jxa&Gxw#yXta0P@K%MXA;9qaE%cGsTf4<099Y27up- zBGD!K)k4u~a{oz@lKS@^pm1)89bP;(P@{giMA;>9Gui5JSlns3yttvI)*@b%4URA< zZyXT(J^&mmEGmhJY~LY?__u%C3Nu$w2r#$}!^wMO%?)T+V<5Eo^pyqLxT~y3R-~?3 zF=SBt=Gsn2j<$%2>l}GcNmsJ&dy|Fq6$Q>voz``%d|X=A<;`KG^lN*5mk{pmbL@K* zVC9@53H{Q9TDs)^9n@f`wYB@L+&?|^u{$7#KQ?sC-xPCq84Yin-Kx3q;OYMWn+y7_ diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index d53f53c0292a70b8f8344c1f36a31ff6b4b5baf6..2a6ce77f38b9613fcb3aa28d5d5edded152b710a 100644 GIT binary patch literal 17824 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 Date: Fri, 17 Apr 2020 01:32:42 +0100 Subject: [PATCH 24/60] change clamp to CLAMP requested change, and i don't plan on subtypes with different effects based on food quality Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com> --- code/modules/food_and_drinks/food.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/food.dm b/code/modules/food_and_drinks/food.dm index 203eb3eef6..1342b1fcbf 100644 --- a/code/modules/food_and_drinks/food.dm +++ b/code/modules/food_and_drinks/food.dm @@ -25,7 +25,7 @@ pixel_y = rand(-5, 5) /obj/item/reagent_containers/food/proc/adjust_food_quality(new_quality) - food_quality = clamp(new_quality,0,100) + food_quality = CLAMP(new_quality,0,100) /obj/item/reagent_containers/food/proc/checkLiked(var/fraction, mob/M) if(last_check_time + 50 < world.time) From aa6d6883e310d241c2152b56b46ae1d3e1f4b0b3 Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Fri, 17 Apr 2020 01:34:46 +0100 Subject: [PATCH 25/60] remove a random 'r' --- code/modules/reagents/chemistry/reagents/food_reagents.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index b3ca6a720d..b94ea9601e 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -783,7 +783,7 @@ if(istype(O, /obj/item/reagent_containers/food/snacks/customizable)) var/obj/item/reagent_containers/food/snacks/customizable/splashed_custom_food = O splashed_custom_food.total_quality += 10000 -r + /datum/reagent/consumable/char name = "Char" description = "Essence of the grill. Has strange properties when overdosed." From a4cc54781f381e9fb9c1d1192d60cff660756ad1 Mon Sep 17 00:00:00 2001 From: timothyteakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Fri, 17 Apr 2020 01:45:15 +0100 Subject: [PATCH 26/60] implements isfood helper --- code/__DEFINES/is_helpers.dm | 2 ++ code/datums/components/butchering.dm | 2 +- code/datums/components/crafting/craft.dm | 2 +- code/modules/food_and_drinks/food/snacks.dm | 2 +- code/modules/food_and_drinks/food/snacks_bread.dm | 2 +- code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm | 2 +- code/modules/reagents/chemistry/reagents/food_reagents.dm | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index 55bfcaff79..d961d6ac79 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -240,6 +240,8 @@ GLOBAL_LIST_INIT(pointed_types, typecacheof(list( #define isgun(A) (istype(A, /obj/item/gun)) +#define isfood(A) (istype(A, /obj/item/reagent_containers/food)) + //Assemblies #define isassembly(O) (istype(O, /obj/item/assembly)) diff --git a/code/datums/components/butchering.dm b/code/datums/components/butchering.dm index cb9652e0db..e5625dee6a 100644 --- a/code/datums/components/butchering.dm +++ b/code/datums/components/butchering.dm @@ -99,7 +99,7 @@ butchered_items += new sinew (T) meat.guaranteed_butcher_results.Remove(sinew) for(var/butchered_item in butchered_items) - if(istype(butchered_item, /obj/item/reagent_containers/food)) + if(isfood(butchered_item)) var/obj/item/reagent_containers/food/butchered_meat = butchered_item butchered_meat.food_quality = meat_quality if(butcher) diff --git a/code/datums/components/crafting/craft.dm b/code/datums/components/crafting/craft.dm index 64bde5da29..a5333499dd 100644 --- a/code/datums/components/crafting/craft.dm +++ b/code/datums/components/crafting/craft.dm @@ -201,7 +201,7 @@ var/atom/movable/I = new R.result (get_turf(user.loc)) I.CheckParts(parts, R) if(isitem(I)) - if(istype(I, /obj/item/reagent_containers/food)) + if(isfood(I)) var/obj/item/reagent_containers/food/food_result = I var/total_quality = 0 var/total_items = 0 diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index 889ec42185..6274a70d0e 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -303,7 +303,7 @@ All foods are distributed among various categories. Use common sense. if(cooked_type) result = new cooked_type(T) //if the result is food, set its food quality to the original food item's quality - if(istype(result, /obj/item/reagent_containers/food)) + if(isfood(result)) var/obj/item/reagent_containers/food/food_output = result food_output.adjust_food_quality(food_quality + quality_increase) if(istype(M)) diff --git a/code/modules/food_and_drinks/food/snacks_bread.dm b/code/modules/food_and_drinks/food/snacks_bread.dm index a04766be5d..777fd3875c 100644 --- a/code/modules/food_and_drinks/food/snacks_bread.dm +++ b/code/modules/food_and_drinks/food/snacks_bread.dm @@ -216,7 +216,7 @@ GLOBAL_LIST_INIT(frying_bad_chems, list( item_flags = fried.item_flags obj_flags = fried.obj_flags - if(istype(fried, /obj/item/reagent_containers/food)) + if(isfood(fried)) fried.reagents.trans_to(src, fried.reagents.total_volume) qdel(fried) else diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm index 3e22070c00..e42ad07c26 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm @@ -105,7 +105,7 @@ God bless America. to_chat(user, "You put [I] into [src].") frying = new/obj/item/reagent_containers/food/snacks/deepfryholder(src, I) //setup food quality for item depending on if it's edible or not - if(istype(I, /obj/item/reagent_containers/food)) + if(isfood(I)) var/obj/item/reagent_containers/food/original_food = I frying.adjust_food_quality(original_food.food_quality) //food quality remains unchanged until degree of frying is calculated else diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index b94ea9601e..ba0b3ea37d 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -776,7 +776,7 @@ /datum/reagent/consumable/secretsauce/reaction_obj(obj/O, reac_volume) //splashing any amount above or equal to 1u of secret sauce onto a piece of food turns its quality to 100 - if(reac_volume >= 1 && istype(O, /obj/item/reagent_containers/food)) + if(reac_volume >= 1 && isfood(O)) var/obj/item/reagent_containers/food/splashed_food = O splashed_food.adjust_food_quality(100) // if it's a customisable food, we need to edit its total quality too, to prevent its quality resetting from adding more ingredients! From dcd112c379ce409eb64a4017206b300448e58aa8 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Fri, 17 Apr 2020 13:34:34 +0200 Subject: [PATCH 27/60] Hm yes maybe no ratting out would be nice What it says on the tin. --- code/game/gamemodes/gangs/gang.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/gangs/gang.dm b/code/game/gamemodes/gangs/gang.dm index fa25701ac4..b65804a723 100644 --- a/code/game/gamemodes/gangs/gang.dm +++ b/code/game/gamemodes/gangs/gang.dm @@ -31,7 +31,7 @@ /datum/antagonist/gang/farewell() if(ishuman(owner.current)) owner.current.visible_message("[owner.current] looks like [owner.current.p_theyve()] just remembered [owner.current.p_their()] real allegiance!", null, null, null, owner.current) - to_chat(owner, "You are no longer a gangster!") + to_chat(owner, "You are no longer a gangster! Your memories from the time you were in a gang are hazy... You don't seem to be able to recall the names of your previous allies, not even your bosses...") /datum/antagonist/gang/on_gain() if(!gang) From 9d312d7fef6d54cd63aef7b1bbfbd450bf853fb0 Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Fri, 17 Apr 2020 13:59:48 +0100 Subject: [PATCH 28/60] small refactor to some stuff quality_increase no longer passed to microwave_act because it's defined in obj/machinery/microwave deepfryer code uses adjust_food_quality in a place where it didn't before --- code/modules/food_and_drinks/food/snacks.dm | 4 ++-- code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm | 2 +- code/modules/food_and_drinks/kitchen_machinery/microwave.dm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index 6274a70d0e..7b914e2e2f 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -297,7 +297,7 @@ All foods are distributed among various categories. Use common sense. else S.reagents.add_reagent(r_id, amount) -/obj/item/reagent_containers/food/snacks/microwave_act(obj/machinery/microwave/M, var/quality_increase) +/obj/item/reagent_containers/food/snacks/microwave_act(obj/machinery/microwave/M) var/turf/T = get_turf(src) var/obj/item/result if(cooked_type) @@ -305,7 +305,7 @@ All foods are distributed among various categories. Use common sense. //if the result is food, set its food quality to the original food item's quality if(isfood(result)) var/obj/item/reagent_containers/food/food_output = result - food_output.adjust_food_quality(food_quality + quality_increase) + food_output.adjust_food_quality(food_quality + M.quality_increase) if(istype(M)) initialize_cooked_food(result, M.efficiency) else diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm index e42ad07c26..0a3d172bb0 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm @@ -109,7 +109,7 @@ God bless America. var/obj/item/reagent_containers/food/original_food = I frying.adjust_food_quality(original_food.food_quality) //food quality remains unchanged until degree of frying is calculated else - frying.food_quality = 10 //inedible fried item has low quality + frying.adjust_food_quality(10) //inedible fried item has low quality icon_state = "fryer_on" fry_loop.start() diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm index 9edcaf083c..3b0ae52578 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm @@ -310,7 +310,7 @@ var/metal = 0 for(var/obj/item/O in ingredients) - O.microwave_act(src, quality_increase) + O.microwave_act(src) if(O.custom_materials?.len) metal += O.custom_materials[SSmaterials.GetMaterialRef(/datum/material/iron)] From eafc69aa6513ad135aee36f8120d8b13e0789bca Mon Sep 17 00:00:00 2001 From: Artur Date: Fri, 17 Apr 2020 16:22:15 +0300 Subject: [PATCH 29/60] Reviewer suggestion, reduces paralyze And ports that commit that ghommie said --- code/datums/components/crafting/recipes.dm | 8 ------- .../crafting/recipes/recipes_clothing.dm | 13 +++++++++++ code/datums/components/tackle.dm | 23 ++++++++++--------- code/game/gamemodes/clown_ops/clown_ops.dm | 2 +- code/game/gamemodes/nuclear/nuclear.dm | 2 +- .../bloodsucker/powers/fortitude.dm | 1 - code/modules/clothing/gloves/miscellaneous.dm | 2 +- code/modules/clothing/gloves/tacklers.dm | 2 +- code/modules/clothing/outfits/ert.dm | 2 +- code/modules/mob/living/carbon/carbon.dm | 2 +- .../uplink/uplink_items/uplink_clothing.dm | 9 +++++++- 11 files changed, 39 insertions(+), 27 deletions(-) diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm index a87496a212..bc76082f0a 100644 --- a/code/datums/components/crafting/recipes.dm +++ b/code/datums/components/crafting/recipes.dm @@ -24,11 +24,3 @@ /datum/crafting_recipe/proc/check_requirements(mob/user, list/collected_requirements) return TRUE -/datum/crafting_recipe/gripperoffbrand - name = "Improvised Gripper Gloves" - reqs = list( - /obj/item/clothing/gloves/fingerless = 1 - // /obj/item/stack/sticky_tape = 1 - ) - result = /obj/item/clothing/gloves/tackler/offbrand - category = CAT_CLOTHING diff --git a/code/datums/components/crafting/recipes/recipes_clothing.dm b/code/datums/components/crafting/recipes/recipes_clothing.dm index b9e3c379b4..b065ce2f25 100644 --- a/code/datums/components/crafting/recipes/recipes_clothing.dm +++ b/code/datums/components/crafting/recipes/recipes_clothing.dm @@ -303,3 +303,16 @@ /obj/item/stack/cable_coil = 10) time = 100 //Takes awhile to put all the garlics on the coil and knot it. category = CAT_CLOTHING + +/datum/crafting_recipe/gripperoffbrand + name = "Improvised Gripper Gloves" + reqs = list( + /obj/item/clothing/gloves/fingerless = 1, + // /obj/item/stack/sticky_tape = 1 + /obj/item/stack/cable_coil = 5, + /obj/item/stack/sheet/cloth = 2, + ) + result = /obj/item/clothing/gloves/tackler/offbrand + category = CAT_CLOTHING + tools = list(TOOL_WIRECUTTER) + time = 20 diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm index 8ffa6c5452..1134f310aa 100644 --- a/code/datums/components/tackle.dm +++ b/code/datums/components/tackle.dm @@ -84,8 +84,8 @@ to_chat(user, "You're not ready to tackle!") return - if(user.has_status_effect(STATUS_EFFECT_TASED)) // can't tackle if you just got shoved - to_chat(user, "You cant tackle while you are tased!") + if(user.has_status_effect(STATUS_EFFECT_TASED)) // can't tackle if you just got tased + to_chat(user, "You can't tackle while tased!") return user.face_atom(A) @@ -353,7 +353,7 @@ if(94 to 98) user.visible_message("[user] slams face-first into [hit] with a concerning squish, immediately going limp!", "You slam face-first into [hit], and immediately lose consciousness!") - user.adjustStaminaLoss(30) + user.adjustStaminaLoss(100) user.adjustBruteLoss(30) user.Unconscious(100) user.gain_trauma_type(BRAIN_TRAUMA_MILD) @@ -370,7 +370,7 @@ if(prob(80)) user.gain_trauma(/datum/brain_trauma/mild/concussion) user.playsound_local(get_turf(user), 'sound/weapons/flashbang.ogg', 100, TRUE, 8, 0.9) - user.Knockdown(40) + user.DefaultCombatKnockdown(40) shake_camera(user, 5, 5) user.overlay_fullscreen("flash", /obj/screen/fullscreen/flash) user.clear_fullscreen("flash", 2.5) @@ -380,14 +380,14 @@ user.adjustStaminaLoss(30) user.adjustBruteLoss(10) user.confused += 10 - user.Knockdown(30) + user.DefaultCombatKnockdown(30) shake_camera(user, 3, 4) if(1 to 63) user.visible_message("[user] slams into [hit]!", "You slam into [hit]!") user.adjustStaminaLoss(20) user.adjustBruteLoss(10) - user.Knockdown(30) + user.DefaultCombatKnockdown(30) shake_camera(user, 2, 2) playsound(user, 'sound/weapons/smash.ogg', 70, TRUE) @@ -413,13 +413,14 @@ //shard.AddElement(/datum/element/embed, shard.embedding) W.obj_destruction() user.adjustStaminaLoss(10 * speed) - user.Paralyze(30) + user.DefaultCombatKnockdown(40) + user.Paralyze(5) user.visible_message("[user] slams into [W] and shatters it, shredding [user.p_them()]self with glass!", "You slam into [W] and shatter it, shredding yourself with glass!") else user.visible_message("[user] slams into [W] like a bug, then slowly slides off it!", "You slam into [W] like a bug, then slowly slide off it!") - user.Paralyze(10) - user.Knockdown(30) + user.Paralyze(2) + user.DefaultCombatKnockdown(20) W.take_damage(20 * speed) user.adjustStaminaLoss(10 * speed) user.adjustBruteLoss(5 * speed) @@ -464,8 +465,8 @@ owner.visible_message("[owner] trips over [kevved] and slams into it face-first[HOW_big_of_a_miss_did_we_just_make]!", "You trip over [kevved] and slam into it face-first[HOW_big_of_a_miss_did_we_just_make]!") owner.adjustStaminaLoss(20 + messes.len * 2) owner.adjustBruteLoss(10 + messes.len) - owner.Paralyze(5 * messes.len) // half a second of paralyze for each thing you knock around - owner.Knockdown(20 + 5 * messes.len) // 2 seconds of knockdown after the paralyze + owner.Paralyze(2 * messes.len) + owner.DefaultCombatKnockdown(20 + 5 * messes.len) // 2 seconds of knockdown after the paralyze for(var/obj/item/I in messes) var/dist = rand(1, 3) diff --git a/code/game/gamemodes/clown_ops/clown_ops.dm b/code/game/gamemodes/clown_ops/clown_ops.dm index d0914b8d8f..11898701fa 100644 --- a/code/game/gamemodes/clown_ops/clown_ops.dm +++ b/code/game/gamemodes/clown_ops/clown_ops.dm @@ -37,7 +37,7 @@ uniform = /obj/item/clothing/under/syndicate shoes = /obj/item/clothing/shoes/clown_shoes/combat mask = /obj/item/clothing/mask/gas/clown_hat - gloves = /obj/item/clothing/gloves/tackler/combat/insulated + gloves = /obj/item/clothing/gloves/combat back = /obj/item/storage/backpack/clown ears = /obj/item/radio/headset/syndicate/alt l_pocket = /obj/item/pinpointer/nuke/syndicate diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 5da95bbd3a..93852e917c 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -120,7 +120,7 @@ uniform = /obj/item/clothing/under/syndicate shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/tackler/combat/insulated + gloves = /obj/item/clothing/gloves/combat ears = /obj/item/radio/headset/syndicate/alt l_pocket = /obj/item/pinpointer/nuke/syndicate id = /obj/item/card/id/syndicate diff --git a/code/modules/antagonists/bloodsucker/powers/fortitude.dm b/code/modules/antagonists/bloodsucker/powers/fortitude.dm index bae802c176..76f3cc77a4 100644 --- a/code/modules/antagonists/bloodsucker/powers/fortitude.dm +++ b/code/modules/antagonists/bloodsucker/powers/fortitude.dm @@ -31,7 +31,6 @@ was_running = (user.m_intent == MOVE_INTENT_RUN) if(was_running) user.toggle_move_intent() - was_running = TRUE while(B && ContinueActive(user) || user.m_intent == MOVE_INTENT_RUN) if(istype(user.buckled, /obj/vehicle)) //We dont want people using fortitude being able to use vehicles var/obj/vehicle/V = user.buckled diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 8bdaeefb8b..a37dc8b638 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -154,7 +154,7 @@ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 30) strip_mod = 0.9 -/obj/item/clothing/gloves/tackler/combat/insulated +/obj/item/clothing/gloves/combat name = "combat gloves" desc = "These tactical gloves are fireproof and shock resistant." icon_state = "combat" diff --git a/code/modules/clothing/gloves/tacklers.dm b/code/modules/clothing/gloves/tacklers.dm index f11c7ccd6b..54a7b28d5f 100644 --- a/code/modules/clothing/gloves/tacklers.dm +++ b/code/modules/clothing/gloves/tacklers.dm @@ -70,7 +70,7 @@ resistance_flags = NONE /obj/item/clothing/gloves/tackler/combat/insulated - name = "guerilla gloves" + name = "guerrilla gloves" desc = "Superior quality combative gloves, good for performing tackle takedowns as well as absorbing electrical shocks." siemens_coefficient = 0 permeability_coefficient = 0.05 diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm index 43df2eec2f..7cd2e9b394 100644 --- a/code/modules/clothing/outfits/ert.dm +++ b/code/modules/clothing/outfits/ert.dm @@ -69,8 +69,8 @@ id = /obj/item/card/id/ert/Security suit = /obj/item/clothing/suit/space/hardsuit/ert/sec glasses = /obj/item/clothing/glasses/hud/security/sunglasses - gloves = /obj/item/clothing/gloves/tackler/combat/insulated belt = /obj/item/storage/belt/security/full + back = /obj/item/storage/backpack/security backpack_contents = list(/obj/item/storage/box/engineer=1,\ /obj/item/storage/box/handcuffs=1,\ /obj/item/clothing/mask/gas/sechailer=1,\ diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index a1fc5edcd3..75908888f2 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -98,7 +98,7 @@ /mob/living/carbon/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) . = ..() var/hurt = TRUE - if(src.GetComponent(/datum/component/tackler)) + if(GetComponent(/datum/component/tackler)) return if(throwingdatum?.thrower && iscyborg(throwingdatum.thrower)) var/mob/living/silicon/robot/R = throwingdatum.thrower diff --git a/code/modules/uplink/uplink_items/uplink_clothing.dm b/code/modules/uplink/uplink_items/uplink_clothing.dm index d6336bd982..014e0452b5 100644 --- a/code/modules/uplink/uplink_items/uplink_clothing.dm +++ b/code/modules/uplink/uplink_items/uplink_clothing.dm @@ -89,4 +89,11 @@ name = "Wall Walking Boots" desc = "Through bluespace magic stolen from an organisation that hoards technology, these boots simply allow you to slip through the atoms that make up anything, but only while walking, for safety reasons. As well as this, they unfortunately cause minor breath loss as the majority of atoms in your lungs are sucked out into any solid object you walk through." item = /obj/item/clothing/shoes/wallwalkers - cost = 6 \ No newline at end of file + cost = 6 + +/datum/uplink_item/device_tools/guerillagloves + name = "Guerilla Gloves" + desc = "A pair of highly robust combat gripper gloves that excels at performing takedowns at close range, with an added lining of insulation. Careful not to hit a wall!" + item = /obj/item/clothing/gloves/tackler/combat/insulated + include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops) + cost = 2 From 14a5985891de882a99539a41ffacfe071329a181 Mon Sep 17 00:00:00 2001 From: Putnam Date: Fri, 17 Apr 2020 23:00:05 -0700 Subject: [PATCH 30/60] Adds more service stuff to lathes. --- code/modules/research/designs/misc_designs.dm | 29 ++++++++++++++++--- code/modules/research/techweb/all_nodes.dm | 4 +-- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index c18c33b04b..04b7bbc668 100644 --- a/code/modules/research/designs/misc_designs.dm +++ b/code/modules/research/designs/misc_designs.dm @@ -293,20 +293,20 @@ name = "Broom" desc = "Just your everyday standard broom." id = "broom" - build_type = PROTOLATHE + build_type = PROTOLATHE | AUTOLATHE materials = list(/datum/material/iron = 1000, /datum/material/glass = 600) build_path = /obj/item/twohanded/broom - category = list("Equipment") + category = list("initial", "Equipment", "Misc") departmental_flags = DEPARTMENTAL_FLAG_SERVICE /datum/design/mop name = "Mop" desc = "Just your everyday standard mop." id = "mop" - build_type = PROTOLATHE + build_type = PROTOLATHE | AUTOLATHE materials = list(/datum/material/iron = 1200, /datum/material/glass = 100) build_path = /obj/item/mop - category = list("Equipment") + category = list("initial", "Equipment", "Misc") departmental_flags = DEPARTMENTAL_FLAG_SERVICE /datum/design/advmop @@ -329,6 +329,16 @@ category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_SERVICE +/datum/design/normtrash + name = "Trashbag" + desc = "It's a bag for trash, you put garbage in it." + id = "normtrash" + build_type = PROTOLATHE + materials = list(/datum/material/plastic = 2000) + build_path = /obj/item/storage/bag/trash + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_SERVICE + /datum/design/blutrash name = "Trashbag of Holding" desc = "An advanced trash bag with bluespace properties; capable of holding a plethora of garbage." @@ -349,6 +359,17 @@ category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_SERVICE +/datum/design/paint_remover + name = "Paint Remover" + desc = "Removes stains from the floor, and not much else." + id = "paint_remover" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 1000) + reagents_list = list(/datum/reagent/acetone = 60) + build_path = /obj/item/paint/paint_remover + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_SERVICE + /datum/design/spraybottle name = "Spray Bottle" desc = "A spray bottle, with an unscrewable top." diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index dafa119873..285be25f9b 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -544,7 +544,7 @@ display_name = "Basic Tools" description = "Basic mechanical, electronic, surgical and botanical tools." prereq_ids = list("base") - design_ids = list("screwdriver", "wrench", "wirecutters", "crowbar", "multitool", "welding_tool", "tscanner", "analyzer", "cable_coil", "pipe_painter", "airlock_painter", "scalpel", "circular_saw", "surgicaldrill", "retractor", "cautery", "hemostat", "cultivator", "plant_analyzer", "shovel", "spade", "hatchet", "mop", "broom") + design_ids = list("screwdriver", "wrench", "wirecutters", "crowbar", "multitool", "welding_tool", "tscanner", "analyzer", "cable_coil", "pipe_painter", "airlock_painter", "scalpel", "circular_saw", "surgicaldrill", "retractor", "cautery", "hemostat", "cultivator", "plant_analyzer", "shovel", "spade", "hatchet", "mop", "broom", "normtrash") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 500) /datum/techweb_node/basic_mining @@ -568,7 +568,7 @@ display_name = "Advanced Sanitation Technology" description = "Clean things better, faster, stronger, and harder!" prereq_ids = list("adv_engi") - design_ids = list("advmop", "buffer", "light_replacer", "spraybottle", "beartrap", "ci-janitor") + design_ids = list("advmop", "buffer", "light_replacer", "spraybottle", "beartrap", "ci-janitor", "paint_remover") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1750) // No longer has its bag /datum/techweb_node/botany From 85c5548d1a0c5d23a02345f0b671d02ae2e03914 Mon Sep 17 00:00:00 2001 From: Artur Date: Sat, 18 Apr 2020 13:49:06 +0300 Subject: [PATCH 31/60] Ports https://github.com/tgstation/tgstation/pull/50521/ --- code/datums/components/tackle.dm | 38 ++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm index 1134f310aa..0f5cd7039c 100644 --- a/code/datums/components/tackle.dm +++ b/code/datums/components/tackle.dm @@ -98,10 +98,11 @@ RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/checkObstacle) playsound(user, 'sound/weapons/thudswoosh.ogg', 40, TRUE, -1) + var/leap_word = isfelinid(user) ? "pounce" : "leap" ///If cat, "pounce" instead of "leap". if(can_see(user, A, 7)) - user.visible_message("[user] leaps at [A]!", "You leap at [A]!") + user.visible_message("[user] [leap_word]s at [A]!", "You [leap_word] at [A]!") else - user.visible_message("[user] leaps!", "You leap!") + user.visible_message("[user] [leap_word]s!", "You [leap_word]!") if(get_dist(user, A) < min_distance) A = get_ranged_target_turf(user, get_dir(user, A), min_distance) //TODO: this only works in cardinals/diagonals, make it work with in-betweens too! @@ -143,14 +144,18 @@ return var/mob/living/carbon/target = hit + var/mob/living/carbon/human/T = target + var/mob/living/carbon/human/S = user + var/tackle_word = isfelinid(user) ? "pounce" : "tackle" ///If cat, "pounce" instead of "tackle". var/roll = rollTackle(target) user.tackling = FALSE switch(roll) if(-INFINITY to -5) - user.visible_message("[user] botches [user.p_their()] tackle and slams [user.p_their()] head into [target], knocking [user.p_them()]self silly!", "You botch your tackle and slam your head into [target], knocking yourself silly!", target) - to_chat(target, "[user] botches [user.p_their()] tackle and slams [user.p_their()] head into you, knocking [user.p_them()]self silly!") + user.visible_message("[user] botches [user.p_their()] [tackle_word] and slams [user.p_their()] head into [target], knocking [user.p_them()]self silly!", "You botch your [tackle_word] and slam your head into [target], knocking yourself silly!", target) + to_chat(target, "[user] botches [user.p_their()] [tackle_word] and slams [user.p_their()] head into you, knocking [user.p_them()]self silly!") + user.Paralyze(30) var/obj/item/bodypart/head/hed = user.get_bodypart(BODY_ZONE_HEAD) if(hed) @@ -158,30 +163,34 @@ user.gain_trauma(/datum/brain_trauma/mild/concussion) if(-4 to -2) // glancing blow at best - user.visible_message("[user] lands a weak tackle on [target], briefly knocking [target.p_them()] off-balance!", "You land a weak tackle on [target], briefly knocking [target.p_them()] off-balance!", target) - to_chat(target, "[user] lands a weak tackle on you, briefly knocking you off-balance!") + user.visible_message("[user] lands a weak [tackle_word] on [target], briefly knocking [target.p_them()] off-balance!", "You land a weak [tackle_word] on [target], briefly knocking [target.p_them()] off-balance!", target) + to_chat(target, "[user] lands a weak [tackle_word] on you, briefly knocking you off-balance!") + user.Knockdown(30) target.apply_status_effect(STATUS_EFFECT_TASED_WEAK, 6 SECONDS) if(-1 to 0) // decent hit, both parties are about equally inconvenienced - user.visible_message("[user] lands a passable tackle on [target], sending them both tumbling!", "You land a passable tackle on [target], sending you both tumbling!", target) - to_chat(target, "[user] lands a passable tackle on you, sending you both tumbling!") + user.visible_message("[user] lands a passable [tackle_word] on [target], sending them both tumbling!", "You land a passable [tackle_word] on [target], sending you both tumbling!", target) + to_chat(target, "[user] lands a passable [tackle_word] on you, sending you both tumbling!") + target.adjustStaminaLoss(stamina_cost) target.Paralyze(5) user.Knockdown(20) target.Knockdown(25) if(1 to 2) // solid hit, tackler has a slight advantage - user.visible_message("[user] lands a solid tackle on [target], knocking them both down hard!", "You land a solid tackle on [target], knocking you both down hard!", target) - to_chat(target, "[user] lands a solid tackle on you, knocking you both down hard!") + user.visible_message("[user] lands a solid [tackle_word] on [target], knocking them both down hard!", "You land a solid [tackle_word] on [target], knocking you both down hard!", target) + to_chat(target, "[user] lands a solid [tackle_word] on you, knocking you both down hard!") + target.adjustStaminaLoss(30) target.Paralyze(5) user.Knockdown(10) target.Knockdown(20) if(3 to 4) // really good hit, the target is definitely worse off here. Without positive modifiers, this is as good a tackle as you can land - user.visible_message("[user] lands an expert tackle on [target], knocking [target.p_them()] down hard while landing on [user.p_their()] feet with a passive grip!", "You land an expert tackle on [target], knocking [target.p_them()] down hard while landing on your feet with a passive grip!", target) - to_chat(target, "[user] lands an expert tackle on you, knocking you down hard and maintaining a passive grab!") + user.visible_message("[user] lands an expert [tackle_word] on [target], knocking [target.p_them()] down hard while landing on [user.p_their()] feet with a passive grip!", "You land an expert [tackle_word] on [target], knocking [target.p_them()] down hard while landing on your feet with a passive grip!", target) + to_chat(target, "[user] lands an expert [tackle_word] on you, knocking you down hard and maintaining a passive grab!") + user.SetKnockdown(0) user.set_resting(FALSE, TRUE, FALSE) user.forceMove(get_turf(target)) @@ -192,8 +201,9 @@ target.grabbedby(user) if(5 to INFINITY) // absolutely BODIED - user.visible_message("[user] lands a monster tackle on [target], knocking [target.p_them()] senseless and applying an aggressive pin!", "You land a monster tackle on [target], knocking [target.p_them()] senseless and applying an aggressive pin!", target) - to_chat(target, "[user] lands a monster tackle on you, knocking you senseless and aggressively pinning you!") + user.visible_message("[user] lands a monster [tackle_word] on [target], knocking [target.p_them()] senseless and applying an aggressive pin!", "You land a monster [tackle_word] on [target], knocking [target.p_them()] senseless and applying an aggressive pin!", target) + to_chat(target, "[user] lands a monster [tackle_word] on you, knocking you senseless and aggressively pinning you!") + user.SetKnockdown(0) user.set_resting(FALSE, TRUE, FALSE) user.forceMove(get_turf(target)) From edb7b1d61c7feefb818b5e29aff4f2f2bd71965e Mon Sep 17 00:00:00 2001 From: Artur Date: Sat, 18 Apr 2020 13:52:27 +0300 Subject: [PATCH 32/60] Fixes catstuffs --- code/datums/components/tackle.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm index 0f5cd7039c..ddc47d59a1 100644 --- a/code/datums/components/tackle.dm +++ b/code/datums/components/tackle.dm @@ -98,7 +98,7 @@ RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/checkObstacle) playsound(user, 'sound/weapons/thudswoosh.ogg', 40, TRUE, -1) - var/leap_word = isfelinid(user) ? "pounce" : "leap" ///If cat, "pounce" instead of "leap". + var/leap_word = iscatperson(user) ? "pounce" : "leap" ///If cat, "pounce" instead of "leap". if(can_see(user, A, 7)) user.visible_message("[user] [leap_word]s at [A]!", "You [leap_word] at [A]!") else @@ -144,9 +144,7 @@ return var/mob/living/carbon/target = hit - var/mob/living/carbon/human/T = target - var/mob/living/carbon/human/S = user - var/tackle_word = isfelinid(user) ? "pounce" : "tackle" ///If cat, "pounce" instead of "tackle". + var/tackle_word = iscatperson(user) ? "pounce" : "tackle" ///If cat, "pounce" instead of "tackle". var/roll = rollTackle(target) user.tackling = FALSE From f0823bc2b6bc4b2772b54d610d62e8e4400572ad Mon Sep 17 00:00:00 2001 From: Artur Date: Sat, 18 Apr 2020 13:57:34 +0300 Subject: [PATCH 33/60] Combat looks better --- code/modules/clothing/gloves/tacklers.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/gloves/tacklers.dm b/code/modules/clothing/gloves/tacklers.dm index 54a7b28d5f..47f4aca974 100644 --- a/code/modules/clothing/gloves/tacklers.dm +++ b/code/modules/clothing/gloves/tacklers.dm @@ -55,7 +55,7 @@ /obj/item/clothing/gloves/tackler/combat name = "gorilla gloves" desc = "Premium quality combative gloves, heavily reinforced to give the user an edge in close combat tackles, though they are more taxing to use than normal gripper gloves. Fireproof to boot!" - icon_state = "black" + icon_state = "combat" item_state = "blackgloves" tackle_stam_cost = 35 From 8ca7bb753552e681c41c5d7d7c3a6e6b7c4c1ee2 Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Sat, 18 Apr 2020 09:46:56 -0400 Subject: [PATCH 34/60] Right... --- code/__DEFINES/construction.dm | 2 + code/datums/components/crafting/craft.dm | 5 +- .../crafting/recipes/recipes_misc.dm | 134 +++++++++++------- code/game/objects/items/signs.dm | 10 +- 4 files changed, 87 insertions(+), 64 deletions(-) diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm index 5a2096d862..92f00fbf38 100644 --- a/code/__DEFINES/construction.dm +++ b/code/__DEFINES/construction.dm @@ -73,6 +73,8 @@ #define CAT_AMMO "Ammunition" #define CAT_ROBOT "Robots" #define CAT_MISC "Misc" +#define CAT_TOOL "Tools & Storage" +#define CAT_FURNITURE "Furniture" #define CAT_PRIMAL "Tribal" #define CAT_CLOTHING "Clothing" #define CAT_FOOD "Foods" diff --git a/code/datums/components/crafting/craft.dm b/code/datums/components/crafting/craft.dm index d35daaf59c..c1f7904e77 100644 --- a/code/datums/components/crafting/craft.dm +++ b/code/datums/components/crafting/craft.dm @@ -23,7 +23,10 @@ CAT_AMMO, ), CAT_ROBOT = CAT_NONE, - CAT_MISC = CAT_NONE, + CAT_MISC = list( + CAT_TOOL, + CAT_FURNITURE, + ), CAT_PRIMAL = CAT_NONE, CAT_FOOD = list( CAT_BREAD, diff --git a/code/datums/components/crafting/recipes/recipes_misc.dm b/code/datums/components/crafting/recipes/recipes_misc.dm index ee72745016..b454ef134f 100644 --- a/code/datums/components/crafting/recipes/recipes_misc.dm +++ b/code/datums/components/crafting/recipes/recipes_misc.dm @@ -8,6 +8,7 @@ /obj/item/stack/sheet/plastic = 2, /obj/item/stack/rods = 1) result = /obj/structure/curtain + subcategory = CAT_FURNITURE category = CAT_MISC /datum/crafting_recipe/guillotine @@ -42,6 +43,7 @@ /obj/item/pipe = 3, /obj/item/stack/cable_coil = 30) category = CAT_MISC + subcategory = CAT_TOOL tools = list(TOOL_WRENCH, TOOL_WELDER, TOOL_WIRECUTTER) /datum/crafting_recipe/goldenbox @@ -53,6 +55,23 @@ /obj/item/stack/sheet/mineral/gold = 1, /datum/reagent/water = 15) time = 40 + subcategory = CAT_TOOL + category = CAT_MISC + +/datum/crafting_recipe/papersack + name = "Paper Sack" + result = /obj/item/storage/box/papersack + time = 10 + reqs = list(/obj/item/paper = 5) + subcategory = CAT_TOOL + category = CAT_MISC + +/datum/crafting_recipe/smallcarton + name = "Small Carton" + result = /obj/item/reagent_containers/food/drinks/sillycup/smallcarton + time = 10 + reqs = list(/obj/item/stack/sheet/cardboard = 1) + subcategory = CAT_TOOL category = CAT_MISC /datum/crafting_recipe/bronze_driver @@ -64,6 +83,7 @@ /obj/item/stack/tile/bronze = 1, /datum/reagent/water = 15) time = 40 + subcategory = CAT_TOOL category = CAT_MISC /datum/crafting_recipe/bronze_welder @@ -75,6 +95,7 @@ /obj/item/stack/tile/bronze = 1, /datum/reagent/water = 15) time = 40 + subcategory = CAT_TOOL category = CAT_MISC /datum/crafting_recipe/bronze_wirecutters @@ -86,6 +107,7 @@ /obj/item/stack/tile/bronze = 1, /datum/reagent/water = 15) time = 40 + subcategory = CAT_TOOL category = CAT_MISC /datum/crafting_recipe/bronze_crowbar @@ -97,6 +119,7 @@ /obj/item/stack/tile/bronze = 1, /datum/reagent/water = 15) time = 40 + subcategory = CAT_TOOL category = CAT_MISC /datum/crafting_recipe/bronze_wrench @@ -108,6 +131,7 @@ /obj/item/stack/tile/bronze = 1, /datum/reagent/water = 15) time = 40 + subcategory = CAT_TOOL category = CAT_MISC /datum/crafting_recipe/rcl @@ -116,6 +140,16 @@ time = 40 tools = list(TOOL_WELDER, TOOL_SCREWDRIVER, TOOL_WRENCH) reqs = list(/obj/item/stack/sheet/metal = 15) + subcategory = CAT_TOOL + category = CAT_MISC + +/datum/crafting_recipe/picket_sign + name = "Picket Sign" + result = /obj/item/picket_sign + reqs = list(/obj/item/stack/rods = 1, + /obj/item/stack/sheet/cardboard = 2) + time = 80 + subcategory = CAT_TOOL category = CAT_MISC //////////// @@ -210,13 +244,6 @@ /obj/item/stack/rods = 1) category = CAT_MISC -/datum/crafting_recipe/papersack - name = "Paper Sack" - result = /obj/item/storage/box/papersack - time = 10 - reqs = list(/obj/item/paper = 5) - category = CAT_MISC - /datum/crafting_recipe/flashlight_eyes name = "Flashlight Eyes" result = /obj/item/organ/eyes/robotic/flashlight @@ -227,13 +254,6 @@ ) category = CAT_MISC -/datum/crafting_recipe/smallcarton - name = "Small Carton" - result = /obj/item/reagent_containers/food/drinks/sillycup/smallcarton - time = 10 - reqs = list(/obj/item/stack/sheet/cardboard = 1) - category = CAT_MISC - /datum/crafting_recipe/pressureplate name = "Pressure Plate" result = /obj/item/pressure_plate @@ -269,6 +289,14 @@ reqs = list(/obj/item/folder/paperwork = 1) category = CAT_MISC +/datum/crafting_recipe/coconut_bong + name = "Coconut Bong" + result = /obj/item/bong/coconut + reqs = list(/obj/item/stack/sheet/mineral/bamboo = 2, + /obj/item/reagent_containers/food/snacks/grown/coconut = 1) + time = 70 + category = CAT_MISC + ////////////// //Banners///// ////////////// @@ -279,6 +307,7 @@ time = 40 reqs = list(/obj/item/stack/rods = 2, /obj/item/clothing/under/rank/captain/parade = 1) + subcategory = CAT_FURNITURE category = CAT_MISC /datum/crafting_recipe/engineering_banner @@ -287,6 +316,7 @@ time = 40 reqs = list(/obj/item/stack/rods = 2, /obj/item/clothing/under/rank/engineering/engineer = 1) + subcategory = CAT_FURNITURE category = CAT_MISC /datum/crafting_recipe/cargo_banner @@ -295,6 +325,7 @@ time = 40 reqs = list(/obj/item/stack/rods = 2, /obj/item/clothing/under/rank/cargo/tech = 1) + subcategory = CAT_FURNITURE category = CAT_MISC /datum/crafting_recipe/science_banner @@ -303,6 +334,7 @@ time = 40 reqs = list(/obj/item/stack/rods = 2, /obj/item/clothing/under/rank/rnd/scientist = 1) + subcategory = CAT_FURNITURE category = CAT_MISC /datum/crafting_recipe/medical_banner @@ -311,6 +343,7 @@ time = 40 reqs = list(/obj/item/stack/rods = 2, /obj/item/clothing/under/rank/medical/doctor = 1) + subcategory = CAT_FURNITURE category = CAT_MISC /datum/crafting_recipe/security_banner @@ -319,50 +352,43 @@ time = 40 reqs = list(/obj/item/stack/rods = 2, /obj/item/clothing/under/rank/security/officer = 1) + subcategory = CAT_FURNITURE category = CAT_MISC - /datum/crafting_recipe/bloodsucker/vassalrack - name = "Persuasion Rack" - //desc = "For converting crewmembers into loyal Vassals." - result = /obj/structure/bloodsucker/vassalrack - tools = list(/obj/item/weldingtool, - ///obj/item/screwdriver, - /obj/item/wrench +/datum/crafting_recipe/bloodsucker/vassalrack + name = "Persuasion Rack" + //desc = "For converting crewmembers into loyal Vassals." + result = /obj/structure/bloodsucker/vassalrack + tools = list(/obj/item/weldingtool, + //obj/item/screwdriver, + /obj/item/wrench ) - reqs = list(/obj/item/stack/sheet/mineral/wood = 3, - /obj/item/stack/sheet/metal = 2, - /obj/item/restraints/handcuffs/cable = 2, - ///obj/item/storage/belt = 1 - ///obj/item/stack/sheet/animalhide = 1, // /obj/item/stack/sheet/leather = 1, - ///obj/item/stack/sheet/plasteel = 5 - ) + reqs = list(/obj/item/stack/sheet/mineral/wood = 3, + /obj/item/stack/sheet/metal = 2, + /obj/item/restraints/handcuffs/cable = 2, + //obj/item/storage/belt = 1, + //obj/item/stack/sheet/animalhide = 1, + //obj/item/stack/sheet/leather = 1, + //obj/item/stack/sheet/plasteel = 5 + ) //parts = list(/obj/item/storage/belt = 1 // ) - - time = 150 - category = CAT_MISC - always_availible = FALSE // Disabled til learned + time = 150 + category = CAT_MISC + always_availible = FALSE // Disabled til learned - /datum/crafting_recipe/bloodsucker/candelabrum - name = "Candelabrum" - //desc = "For converting crewmembers into loyal Vassals." - result = /obj/structure/bloodsucker/candelabrum - tools = list(/obj/item/weldingtool, - /obj/item/wrench - ) - reqs = list(/obj/item/stack/sheet/metal = 3, - /obj/item/stack/rods = 1, - /obj/item/candle = 1 - ) - time = 100 - category = CAT_MISC - always_availible = FALSE // Disabled til learned - -/datum/crafting_recipe/coconut_bong - name = "Coconut Bong" - result = /obj/item/bong/coconut - reqs = list(/obj/item/stack/sheet/mineral/bamboo = 2, - /obj/item/reagent_containers/food/snacks/grown/coconut = 1) - time = 70 - category = CAT_MISC \ No newline at end of file +/datum/crafting_recipe/bloodsucker/candelabrum + name = "Candelabrum" + //desc = "For converting crewmembers into loyal Vassals." + result = /obj/structure/bloodsucker/candelabrum + tools = list(/obj/item/weldingtool, + /obj/item/wrench + ) + reqs = list(/obj/item/stack/sheet/metal = 3, + /obj/item/stack/rods = 1, + /obj/item/candle = 1 + ) + time = 100 + category = CAT_MISC + always_availible = FALSE // Disabled til learned diff --git a/code/game/objects/items/signs.dm b/code/game/objects/items/signs.dm index 2b00114ef8..cf7373b700 100644 --- a/code/game/objects/items/signs.dm +++ b/code/game/objects/items/signs.dm @@ -40,12 +40,4 @@ user.visible_message("[user] waves around \the \"[label]\" sign.") else user.visible_message("[user] waves around blank sign.") - user.changeNext_move(CLICK_CD_MELEE) - -/datum/crafting_recipe/picket_sign - name = "Picket Sign" - result = /obj/item/picket_sign - reqs = list(/obj/item/stack/rods = 1, - /obj/item/stack/sheet/cardboard = 2) - time = 80 - category = CAT_MISC \ No newline at end of file + user.changeNext_move(CLICK_CD_MELEE) \ No newline at end of file From 42bb01057f6a691dd902dfc58d30ad377bc93c0c Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Sat, 18 Apr 2020 10:09:15 -0400 Subject: [PATCH 35/60] now with working code! --- code/datums/components/crafting/craft.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/datums/components/crafting/craft.dm b/code/datums/components/crafting/craft.dm index c1f7904e77..e0bf084ac2 100644 --- a/code/datums/components/crafting/craft.dm +++ b/code/datums/components/crafting/craft.dm @@ -15,7 +15,7 @@ /datum/component/personal_crafting var/busy - var/viewing_category = 1 //typical powergamer starting on the Weapons tab + var/viewing_category = 1 var/viewing_subcategory = 1 var/list/categories = list( CAT_WEAPONRY = list( @@ -24,6 +24,7 @@ ), CAT_ROBOT = CAT_NONE, CAT_MISC = list( + CAT_MISC, CAT_TOOL, CAT_FURNITURE, ), From cc16027d1ad55613af082eea0e1b9ac46e831294 Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Sat, 18 Apr 2020 19:30:14 +0200 Subject: [PATCH 36/60] Nerfing the bonus reagents from upgraded microwaves. --- code/modules/food_and_drinks/food/snacks.dm | 2 +- .../kitchen_machinery/microwave.dm | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index 0b277e328b..052e786a81 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -285,7 +285,7 @@ All foods are distributed among various categories. Use common sense. reagents.trans_to(S, reagents.total_volume) if(S.bonus_reagents && S.bonus_reagents.len) for(var/r_id in S.bonus_reagents) - var/amount = S.bonus_reagents[r_id] * cooking_efficiency + var/amount = round(S.bonus_reagents[r_id] * cooking_efficiency) if(r_id == /datum/reagent/consumable/nutriment || r_id == /datum/reagent/consumable/nutriment/vitamin) S.reagents.add_reagent(r_id, amount, tastes) else diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm index a8bb6dc187..c707b9ef64 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm @@ -19,6 +19,7 @@ var/broken = 0 // 0, 1 or 2 // How broken is it??? var/max_n_of_items = 10 var/efficiency = 0 + var/productivity = 0 var/datum/looping_sound/microwave/soundloop var/list/ingredients = list() // may only contain /atom/movables @@ -43,12 +44,14 @@ . = ..() /obj/machinery/microwave/RefreshParts() - efficiency = 0 + efficiency = 0.6 + productivity = 0 + max_n_of_items = 5 for(var/obj/item/stock_parts/micro_laser/M in component_parts) - efficiency += M.rating + efficiency += M.rating * 0.4 + productivity += M.rating for(var/obj/item/stock_parts/matter_bin/M in component_parts) - max_n_of_items = 10 * M.rating - break + max_n_of_items += M.rating * 5 /obj/machinery/microwave/examine(mob/user) . = ..() @@ -83,7 +86,7 @@ if(!(stat & (NOPOWER|BROKEN))) . += "The status display reads:" . += "- Capacity: [max_n_of_items] items." - . += "- Cook time reduced by [(efficiency - 1) * 25]%." + . += "- Cook time reduced by [(productivity - 1) * 25]%." /obj/machinery/microwave/update_icon_state() if(broken) @@ -240,7 +243,7 @@ playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0) return - if(prob(max((5 / efficiency) - 5, dirty * 5))) //a clean unupgraded microwave has no risk of failure + if(prob(dirty * 5 - (5 / efficiency - 5)) //a clean unupgraded microwave has no risk of failure muck() return for(var/obj/O in ingredients) @@ -285,7 +288,7 @@ update_icon() loop(MICROWAVE_MUCK, 4) -/obj/machinery/microwave/proc/loop(type, time, wait = max(12 - 2 * efficiency, 2)) // standard wait is 10 +/obj/machinery/microwave/proc/loop(type, time, wait = max(12 - 2 * productivity, 2)) // standard wait is 10 if(stat & (NOPOWER|BROKEN)) if(type == MICROWAVE_PRE) pre_fail() From 811f65e48bb6ef52f131c2ba9dd5f0261fdff07e Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Sat, 18 Apr 2020 19:51:09 +0200 Subject: [PATCH 37/60] Removing troublesome and filler uplink items. --- .../uplink/uplink_items/uplink_badass.dm | 15 -------------- .../uplink/uplink_items/uplink_dangerous.dm | 11 ---------- .../uplink/uplink_items/uplink_roles.dm | 20 ++----------------- 3 files changed, 2 insertions(+), 44 deletions(-) diff --git a/code/modules/uplink/uplink_items/uplink_badass.dm b/code/modules/uplink/uplink_items/uplink_badass.dm index 681efea5b3..840f100611 100644 --- a/code/modules/uplink/uplink_items/uplink_badass.dm +++ b/code/modules/uplink/uplink_items/uplink_badass.dm @@ -24,13 +24,6 @@ Radio headset does not include encryption key. No gun included." item = /obj/item/storage/box/syndie_kit/centcom_costume -/datum/uplink_item/badass/claymore - name = "Claymore" - cost = 8 - player_minimum = 25 - desc = "A claymore. We don't know why you'd do this." - item = /obj/item/claymore - /datum/uplink_item/badass/costumes/clown name = "Clown Costume" desc = "Nothing is more terrifying than clowns with fully automatic weaponry." @@ -84,11 +77,3 @@ limited_stock = 1 cant_discount = TRUE include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops) - -/datum/uplink_item/badass/shades - name = "Big Sunglasses" - desc = "Prevents flashes and looks badbass with some Smokes." - item = /obj/item/clothing/glasses/sunglasses/big - cost = 1 - surplus = 5 - illegal_tech = FALSE diff --git a/code/modules/uplink/uplink_items/uplink_dangerous.dm b/code/modules/uplink/uplink_items/uplink_dangerous.dm index c798aa5cd9..99c9c505c0 100644 --- a/code/modules/uplink/uplink_items/uplink_dangerous.dm +++ b/code/modules/uplink/uplink_items/uplink_dangerous.dm @@ -117,17 +117,6 @@ /datum/uplink_item/dangerous/doublesword/get_discount() return pick(4;0.8,2;0.65,1;0.5) -/datum/uplink_item/dangerous/cxneb - name = "Dragon's Tooth Non-Eutactic Blade" - desc = "An illegal modification of a weapon that is functionally identical to the energy sword, \ - the Non-Eutactic Blade (NEB) forges a hardlight blade on-demand, \ - generating an extremely sharp, unbreakable edge that is guaranteed to satisfy your every need. \ - This particular model has a polychromic hardlight generator, allowing you to murder in style! \ - The illegal modifications bring this weapon up to par with the classic energy sword, and also gives it the energy sword's distinctive sounds." - item = /obj/item/melee/transforming/energy/sword/cx/traitor - cost = 8 - exclude_modes = list(/datum/game_mode/nuclear/clown_ops) - /datum/uplink_item/dangerous/sword name = "Energy Sword" desc = "The energy sword is an edged weapon with a blade of pure energy. The sword is small enough to be \ diff --git a/code/modules/uplink/uplink_items/uplink_roles.dm b/code/modules/uplink/uplink_items/uplink_roles.dm index 778edf8cc8..28479f8da7 100644 --- a/code/modules/uplink/uplink_items/uplink_roles.dm +++ b/code/modules/uplink/uplink_items/uplink_roles.dm @@ -64,14 +64,6 @@ restricted_roles = list("Clown") */ -/datum/uplink_item/role_restricted/clumsyDNA - name = "Clumsy Clown DNA" - desc = "A DNA injector that has been loaded with the clown gene that makes people clumsy.. \ - Making someone clumsy will allow them to use clown firing pins as well as Reverse Revolvers. For a laugh try using this on the HOS to see how many times they shoot themselves in the foot!" - cost = 1 - item = /obj/item/dnainjector/clumsymut - restricted_roles = list("Clown") - /datum/uplink_item/role_restricted/haunted_magic_eightball name = "Haunted Magic Eightball" desc = "Most magic eightballs are toys with dice inside. Although identical in appearance to the harmless toys, this occult device reaches into the spirit world to find its answers. \ @@ -116,19 +108,11 @@ cost = 4 restricted_roles = list("Cook", "Botanist", "Clown", "Mime") -/datum/uplink_item/role_restricted/strange_seeds - name = "Pack of strange seeds" - desc = "Mysterious seeds as strange as their name implies. Spooky." - item = /obj/item/seeds/random - cost = 2 - restricted_roles = list("Botanist") - illegal_tech = FALSE - /datum/uplink_item/role_restricted/strange_seeds_10pack - name = "Pack of strange seeds x10" + name = "Pack of strange seeds" desc = "Mysterious seeds as strange as their name implies. Spooky. These come in bulk" item = /obj/item/storage/box/strange_seeds_10pack - cost = 20 + cost = 10 restricted_roles = list("Botanist") /datum/uplink_item/role_restricted/ez_clean_bundle From 957e92ed8f4e2397be948cd1c8bded86d99f24d8 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Sat, 18 Apr 2020 19:53:31 +0200 Subject: [PATCH 38/60] Update microwave.dm --- code/modules/food_and_drinks/kitchen_machinery/microwave.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm index c707b9ef64..3e0c9cb4b5 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm @@ -243,7 +243,7 @@ playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0) return - if(prob(dirty * 5 - (5 / efficiency - 5)) //a clean unupgraded microwave has no risk of failure + if(prob(dirty * 5 / (5 * efficiency))) //a clean unupgraded microwave has no risk of failure muck() return for(var/obj/O in ingredients) From cb39ba34918ba002cd70b196ced8c2b2be2004fd Mon Sep 17 00:00:00 2001 From: necromanceranne Date: Sun, 19 Apr 2020 04:25:41 +1000 Subject: [PATCH 39/60] Replaces the Scarp stamina mod, adds tased resistance which I forgot to do for almost a month even though I kind of made it with scarp in mind, fixes the capitalization of armwraps --- code/datums/components/crafting/recipes/recipes_clothing.dm | 4 ++-- code/datums/martial/sleeping_carp.dm | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/datums/components/crafting/recipes/recipes_clothing.dm b/code/datums/components/crafting/recipes/recipes_clothing.dm index 6fc84409e4..8f52e06f30 100644 --- a/code/datums/components/crafting/recipes/recipes_clothing.dm +++ b/code/datums/components/crafting/recipes/recipes_clothing.dm @@ -41,7 +41,7 @@ category = CAT_CLOTHING /datum/crafting_recipe/armwraps - name = "armwraps" + name = "Armwraps" result = /obj/item/clothing/gloves/fingerless/pugilist time = 60 tools = list(TOOL_WIRECUTTER) @@ -51,7 +51,7 @@ category = CAT_CLOTHING /datum/crafting_recipe/armwrapsplusone - name = "armwraps of mighty fists" + name = "Armwraps of Mighty Fists" result = /obj/item/clothing/gloves/fingerless/pugilist/magic time = 300 tools = list(TOOL_WIRECUTTER, /obj/item/book/codex_gigas, /obj/item/clothing/head/wizard, /obj/item/clothing/suit/wizrobe) diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index ae5fa98acb..dd55800bc0 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -140,8 +140,10 @@ ADD_TRAIT(H, TRAIT_NOGUNS, SLEEPING_CARP_TRAIT) ADD_TRAIT(H, TRAIT_PIERCEIMMUNE, SLEEPING_CARP_TRAIT) ADD_TRAIT(H, TRAIT_NODISMEMBER, SLEEPING_CARP_TRAIT) + ADD_TRAIT(H, TRAIT_TASED_RESISTANCE, SLEEP_CARP_TRAIT) H.physiology.brute_mod *= 0.4 //brute is really not gonna cut it H.physiology.burn_mod *= 0.7 //burn is distinctly more useful against them than brute but they're still resistant + H.physiology.stamina_mod *= 0.5 //You take less stamina damage overall, but you do not reduce the damage from stun batons H.physiology.stun_mod *= 0.3 //for those rare stuns H.physiology.pressure_mod *= 0.3 //go hang out with carp H.physiology.cold_mod *= 0.3 //cold mods are different to burn mods, they do stack however @@ -154,8 +156,10 @@ REMOVE_TRAIT(H, TRAIT_NOGUNS, SLEEPING_CARP_TRAIT) REMOVE_TRAIT(H, TRAIT_PIERCEIMMUNE, SLEEPING_CARP_TRAIT) REMOVE_TRAIT(H, TRAIT_NODISMEMBER, SLEEPING_CARP_TRAIT) + REMOVE_TRAIT(H, TRAIT_TASED_RESISTANCE, SLEEP_CARP_TRAIT) H.physiology.brute_mod = initial(H.physiology.brute_mod) H.physiology.burn_mod = initial(H.physiology.burn_mod) + H.physiology.stamina_mod = initial(H.physiology.stamina_mod) H.physiology.stun_mod = initial(H.physiology.stun_mod) H.physiology.pressure_mod = initial(H.physiology.pressure_mod) //no more carpies H.physiology.cold_mod = initial(H.physiology.cold_mod) From 97bd52f03eb00ce7e50470baa8f63f1f74946fba Mon Sep 17 00:00:00 2001 From: necromanceranne Date: Sun, 19 Apr 2020 04:49:11 +1000 Subject: [PATCH 40/60] haha me too --- code/datums/martial/sleeping_carp.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index dd55800bc0..d2e11ee843 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -140,7 +140,7 @@ ADD_TRAIT(H, TRAIT_NOGUNS, SLEEPING_CARP_TRAIT) ADD_TRAIT(H, TRAIT_PIERCEIMMUNE, SLEEPING_CARP_TRAIT) ADD_TRAIT(H, TRAIT_NODISMEMBER, SLEEPING_CARP_TRAIT) - ADD_TRAIT(H, TRAIT_TASED_RESISTANCE, SLEEP_CARP_TRAIT) + ADD_TRAIT(H, TRAIT_TASED_RESISTANCE, SLEEPING_CARP_TRAIT) H.physiology.brute_mod *= 0.4 //brute is really not gonna cut it H.physiology.burn_mod *= 0.7 //burn is distinctly more useful against them than brute but they're still resistant H.physiology.stamina_mod *= 0.5 //You take less stamina damage overall, but you do not reduce the damage from stun batons @@ -156,7 +156,7 @@ REMOVE_TRAIT(H, TRAIT_NOGUNS, SLEEPING_CARP_TRAIT) REMOVE_TRAIT(H, TRAIT_PIERCEIMMUNE, SLEEPING_CARP_TRAIT) REMOVE_TRAIT(H, TRAIT_NODISMEMBER, SLEEPING_CARP_TRAIT) - REMOVE_TRAIT(H, TRAIT_TASED_RESISTANCE, SLEEP_CARP_TRAIT) + REMOVE_TRAIT(H, TRAIT_TASED_RESISTANCE, SLEEPING_CARP_TRAIT) H.physiology.brute_mod = initial(H.physiology.brute_mod) H.physiology.burn_mod = initial(H.physiology.burn_mod) H.physiology.stamina_mod = initial(H.physiology.stamina_mod) From a5b7f506f980b14b3294547b97abb5d12fb61959 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sat, 18 Apr 2020 16:42:46 -0400 Subject: [PATCH 41/60] Update chem_dispenser.dm --- code/modules/reagents/chemistry/machinery/chem_dispenser.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index eb2a6ad162..7f57dd1723 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -508,7 +508,6 @@ upgrade_reagents3 = list( /datum/reagent/drug/mushroomhallucinogen, /datum/reagent/consumable/nothing, - /datum/reagent/medicine/cryoxadone, /datum/reagent/consumable/peachjuice ) emagged_reagents = list( @@ -516,7 +515,8 @@ /datum/reagent/consumable/ethanol/changelingsting, /datum/reagent/consumable/ethanol/whiskey_cola, /datum/reagent/toxin/mindbreaker, - /datum/reagent/toxin/staminatoxin + /datum/reagent/toxin/staminatoxin, + /datum/reagent/medicine/cryoxadone ) /obj/machinery/chem_dispenser/drinks/fullupgrade //fully ugpraded stock parts, emagged @@ -722,4 +722,4 @@ component_parts += new /obj/item/stock_parts/manipulator/femto(null) component_parts += new /obj/item/stack/sheet/glass(null) component_parts += new /obj/item/stock_parts/cell/bluespace(null) - RefreshParts() \ No newline at end of file + RefreshParts() From d5a43be181932795f71f0bf5285d29bc4e7bfe84 Mon Sep 17 00:00:00 2001 From: Ghommie <42542238+Ghommie@users.noreply.github.com> Date: Sun, 19 Apr 2020 03:07:45 +0200 Subject: [PATCH 42/60] Removes that one in a thousands chance of being spawned in the syndicate infiltrator roundstart. --- code/controllers/subsystem/job.dm | 2 ++ code/game/objects/effects/landmarks.dm | 2 ++ 2 files changed, 4 insertions(+) diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index 91d0db85d1..7c48adef24 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -428,6 +428,8 @@ SUBSYSTEM_DEF(job) if(!joined_late) var/obj/S = null for(var/obj/effect/landmark/start/sloc in GLOB.start_landmarks_list) + if(!sloc.job_spawnpoint) + continue if(sloc.name != rank) S = sloc //so we can revert to spawning them on top of eachother if something goes wrong continue diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 4ed6dc9dc9..04f14692e3 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -36,6 +36,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark) var/jobspawn_override = FALSE var/delete_after_roundstart = TRUE var/used = FALSE + var/job_spawnpoint = TRUE //Is it a potential job spawnpoint or should we skip it? /obj/effect/landmark/start/proc/after_round_start() if(delete_after_roundstart) @@ -281,6 +282,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) name = "bomb or clown beacon spawner" var/nukie_path = /obj/item/sbeacondrop/bomb var/clown_path = /obj/item/sbeacondrop/clownbomb + job_spawnpoint = FALSE /obj/effect/landmark/start/nuclear_equipment/after_round_start() var/npath = nukie_path From 8e3f48a76146bbe5c6e453b572ff7d28538777d1 Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Sun, 19 Apr 2020 17:13:19 -0400 Subject: [PATCH 43/60] Reduces (or gives) weight classes to several items. --- code/modules/recycling/conveyor2.dm | 2 +- modular_citadel/code/modules/arousal/organs/breasts.dm | 1 + modular_citadel/code/modules/arousal/organs/penis.dm | 1 + modular_citadel/code/modules/arousal/organs/testicles.dm | 1 + modular_citadel/code/modules/arousal/organs/vagina.dm | 1 + modular_citadel/code/modules/arousal/organs/womb.dm | 1 + 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index 425c94cd65..600ee4ad14 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -330,7 +330,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) desc = "A conveyor control switch assembly." icon = 'icons/obj/recycling.dmi' icon_state = "switch-off" - w_class = WEIGHT_CLASS_BULKY + w_class = WEIGHT_CLASS_NORMAL var/id = "" //inherited by the switch /obj/item/conveyor_switch_construct/Initialize() diff --git a/modular_citadel/code/modules/arousal/organs/breasts.dm b/modular_citadel/code/modules/arousal/organs/breasts.dm index c936eb9dc4..82c4f616bb 100644 --- a/modular_citadel/code/modules/arousal/organs/breasts.dm +++ b/modular_citadel/code/modules/arousal/organs/breasts.dm @@ -6,6 +6,7 @@ desc = "Female milk producing organs." icon_state = "breasts" icon = 'modular_citadel/icons/obj/genitals/breasts.dmi' + w_class = WEIGHT_CLASS_SMALL zone = BODY_ZONE_CHEST slot = ORGAN_SLOT_BREASTS size = BREASTS_SIZE_DEF // "c". Refer to the breast_values static list below for the cups associated number values diff --git a/modular_citadel/code/modules/arousal/organs/penis.dm b/modular_citadel/code/modules/arousal/organs/penis.dm index c05549aaa0..387e687389 100644 --- a/modular_citadel/code/modules/arousal/organs/penis.dm +++ b/modular_citadel/code/modules/arousal/organs/penis.dm @@ -3,6 +3,7 @@ desc = "A male reproductive organ." icon_state = "penis" icon = 'modular_citadel/icons/obj/genitals/penis.dmi' + w_class = WEIGHT_CLASS_SMALL zone = BODY_ZONE_PRECISE_GROIN slot = ORGAN_SLOT_PENIS masturbation_verb = "stroke" diff --git a/modular_citadel/code/modules/arousal/organs/testicles.dm b/modular_citadel/code/modules/arousal/organs/testicles.dm index a8946294b1..bcc5def02a 100644 --- a/modular_citadel/code/modules/arousal/organs/testicles.dm +++ b/modular_citadel/code/modules/arousal/organs/testicles.dm @@ -3,6 +3,7 @@ desc = "A male reproductive organ." icon_state = "testicles" icon = 'modular_citadel/icons/obj/genitals/testicles.dmi' + w_class = WEIGHT_CLASS_SMALL zone = BODY_ZONE_PRECISE_GROIN slot = ORGAN_SLOT_TESTICLES size = BALLS_SIZE_MIN diff --git a/modular_citadel/code/modules/arousal/organs/vagina.dm b/modular_citadel/code/modules/arousal/organs/vagina.dm index cdc7dc4927..bc89418ece 100644 --- a/modular_citadel/code/modules/arousal/organs/vagina.dm +++ b/modular_citadel/code/modules/arousal/organs/vagina.dm @@ -3,6 +3,7 @@ desc = "A female reproductive organ." icon = 'modular_citadel/icons/obj/genitals/vagina.dmi' icon_state = ORGAN_SLOT_VAGINA + w_class = WEIGHT_CLASS_SMALL zone = BODY_ZONE_PRECISE_GROIN slot = "vagina" size = 1 //There is only 1 size right now diff --git a/modular_citadel/code/modules/arousal/organs/womb.dm b/modular_citadel/code/modules/arousal/organs/womb.dm index 7f91310e3e..8bd3dddd7e 100644 --- a/modular_citadel/code/modules/arousal/organs/womb.dm +++ b/modular_citadel/code/modules/arousal/organs/womb.dm @@ -3,6 +3,7 @@ desc = "A female reproductive organ." icon = 'modular_citadel/icons/obj/genitals/vagina.dmi' icon_state = "womb" + w_class = WEIGHT_CLASS_SMALL zone = BODY_ZONE_PRECISE_GROIN slot = ORGAN_SLOT_WOMB genital_flags = GENITAL_INTERNAL|GENITAL_FUID_PRODUCTION From b8ff1b16bd9648a7b83e31fd49b5d93f76fa1b7b Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Sun, 19 Apr 2020 17:28:07 -0400 Subject: [PATCH 44/60] Better. --- modular_citadel/code/modules/arousal/genitals.dm | 2 +- modular_citadel/code/modules/arousal/organs/breasts.dm | 1 - modular_citadel/code/modules/arousal/organs/penis.dm | 1 - modular_citadel/code/modules/arousal/organs/testicles.dm | 1 - modular_citadel/code/modules/arousal/organs/vagina.dm | 1 - modular_citadel/code/modules/arousal/organs/womb.dm | 1 - 6 files changed, 1 insertion(+), 6 deletions(-) diff --git a/modular_citadel/code/modules/arousal/genitals.dm b/modular_citadel/code/modules/arousal/genitals.dm index 68e9259183..e0e1b37a3d 100644 --- a/modular_citadel/code/modules/arousal/genitals.dm +++ b/modular_citadel/code/modules/arousal/genitals.dm @@ -1,6 +1,6 @@ /obj/item/organ/genital color = "#fcccb3" - w_class = WEIGHT_CLASS_NORMAL + w_class = WEIGHT_CLASS_SMALL var/shape var/sensitivity = 1 // wow if this were ever used that'd be cool but it's not but i'm keeping it for my unshit code var/genital_flags //see citadel_defines.dm diff --git a/modular_citadel/code/modules/arousal/organs/breasts.dm b/modular_citadel/code/modules/arousal/organs/breasts.dm index 82c4f616bb..c936eb9dc4 100644 --- a/modular_citadel/code/modules/arousal/organs/breasts.dm +++ b/modular_citadel/code/modules/arousal/organs/breasts.dm @@ -6,7 +6,6 @@ desc = "Female milk producing organs." icon_state = "breasts" icon = 'modular_citadel/icons/obj/genitals/breasts.dmi' - w_class = WEIGHT_CLASS_SMALL zone = BODY_ZONE_CHEST slot = ORGAN_SLOT_BREASTS size = BREASTS_SIZE_DEF // "c". Refer to the breast_values static list below for the cups associated number values diff --git a/modular_citadel/code/modules/arousal/organs/penis.dm b/modular_citadel/code/modules/arousal/organs/penis.dm index 387e687389..c05549aaa0 100644 --- a/modular_citadel/code/modules/arousal/organs/penis.dm +++ b/modular_citadel/code/modules/arousal/organs/penis.dm @@ -3,7 +3,6 @@ desc = "A male reproductive organ." icon_state = "penis" icon = 'modular_citadel/icons/obj/genitals/penis.dmi' - w_class = WEIGHT_CLASS_SMALL zone = BODY_ZONE_PRECISE_GROIN slot = ORGAN_SLOT_PENIS masturbation_verb = "stroke" diff --git a/modular_citadel/code/modules/arousal/organs/testicles.dm b/modular_citadel/code/modules/arousal/organs/testicles.dm index bcc5def02a..a8946294b1 100644 --- a/modular_citadel/code/modules/arousal/organs/testicles.dm +++ b/modular_citadel/code/modules/arousal/organs/testicles.dm @@ -3,7 +3,6 @@ desc = "A male reproductive organ." icon_state = "testicles" icon = 'modular_citadel/icons/obj/genitals/testicles.dmi' - w_class = WEIGHT_CLASS_SMALL zone = BODY_ZONE_PRECISE_GROIN slot = ORGAN_SLOT_TESTICLES size = BALLS_SIZE_MIN diff --git a/modular_citadel/code/modules/arousal/organs/vagina.dm b/modular_citadel/code/modules/arousal/organs/vagina.dm index bc89418ece..cdc7dc4927 100644 --- a/modular_citadel/code/modules/arousal/organs/vagina.dm +++ b/modular_citadel/code/modules/arousal/organs/vagina.dm @@ -3,7 +3,6 @@ desc = "A female reproductive organ." icon = 'modular_citadel/icons/obj/genitals/vagina.dmi' icon_state = ORGAN_SLOT_VAGINA - w_class = WEIGHT_CLASS_SMALL zone = BODY_ZONE_PRECISE_GROIN slot = "vagina" size = 1 //There is only 1 size right now diff --git a/modular_citadel/code/modules/arousal/organs/womb.dm b/modular_citadel/code/modules/arousal/organs/womb.dm index 8bd3dddd7e..7f91310e3e 100644 --- a/modular_citadel/code/modules/arousal/organs/womb.dm +++ b/modular_citadel/code/modules/arousal/organs/womb.dm @@ -3,7 +3,6 @@ desc = "A female reproductive organ." icon = 'modular_citadel/icons/obj/genitals/vagina.dmi' icon_state = "womb" - w_class = WEIGHT_CLASS_SMALL zone = BODY_ZONE_PRECISE_GROIN slot = ORGAN_SLOT_WOMB genital_flags = GENITAL_INTERNAL|GENITAL_FUID_PRODUCTION From 5376ca81b5bb7b355903627207383061a742730d Mon Sep 17 00:00:00 2001 From: Detective Google <48196179+Detective-Google@users.noreply.github.com> Date: Sun, 19 Apr 2020 16:57:02 -0500 Subject: [PATCH 45/60] Turns chaplain null rod selection into a radial function(port TG#50512) --- code/game/objects/items/holy_weapons.dm | 35 ++++++++++++++++++++----- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index c262920ec5..5c926e4ca9 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -239,23 +239,31 @@ if(user.mind && (user.mind.isholy) && !reskinned) reskin_holy_weapon(user) +/** + * reskin_holy_weapon: Shows a user a list of all available nullrod reskins and based on his choice replaces the nullrod with the reskinned version + * + * Arguments: + * * M The mob choosing a nullrod reskin + */ /obj/item/nullrod/proc/reskin_holy_weapon(mob/living/L) if(GLOB.holy_weapon_type) return - var/obj/item/holy_weapon - var/list/holy_weapons_list = subtypesof(/obj/item/nullrod) + list(HOLY_WEAPONS) var/list/display_names = list() - for(var/V in holy_weapons_list) + var/list/nullrod_icons = list() + for(var/V in typesof(/obj/item/nullrod)) var/obj/item/nullrod/rodtype = V if (initial(rodtype.chaplain_spawnable)) display_names[initial(rodtype.name)] = rodtype + nullrod_icons += list(initial(rodtype.name) = image(icon = initial(rodtype.icon), icon_state = initial(rodtype.icon_state))) - var/choice = input(L, "What theme would you like for your holy weapon?","Holy Weapon Theme") as null|anything in display_names - if(QDELETED(src) || !choice || !in_range(L, src) || !CHECK_MOBILITY(L, MOBILITY_USE) || reskinned) + nullrod_icons = sortList(nullrod_icons) + + var/choice = show_radial_menu(L, src , nullrod_icons, custom_check = CALLBACK(src, .proc/check_menu, L), radius = 42, require_near = TRUE) + if(!choice || !check_menu(L)) return var/A = display_names[choice] // This needs to be on a separate var as list member access is not allowed for new - holy_weapon = new A + var/obj/item/nullrod/holy_weapon = new A GLOB.holy_weapon_type = holy_weapon.type @@ -266,6 +274,21 @@ qdel(src) L.put_in_active_hand(holy_weapon) +/** + * check_menu: Checks if we are allowed to interact with a radial menu + * + * Arguments: + * * user The mob interacting with a menu + */ +/obj/item/nullrod/proc/check_menu(mob/user) + if(!istype(user)) + return FALSE + if(QDELETED(src) || reskinned) + return FALSE + if(user.incapacitated() || !user.is_holding(src)) + return FALSE + return TRUE + /obj/item/nullrod/proc/jedi_spin(mob/living/user) for(var/i in list(NORTH,SOUTH,EAST,WEST,EAST,SOUTH,NORTH,SOUTH,EAST,WEST,EAST,SOUTH)) user.setDir(i) From 0c2f0a99d538781347ae4d8d8a666b0a844af175 Mon Sep 17 00:00:00 2001 From: Detective Google <48196179+Detective-Google@users.noreply.github.com> Date: Sun, 19 Apr 2020 17:18:40 -0500 Subject: [PATCH 46/60] fixes the fact that some citadel null rods aren't null rod subtypes --- code/game/objects/items/holy_weapons.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index 5c926e4ca9..171b5a465a 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -248,9 +248,11 @@ /obj/item/nullrod/proc/reskin_holy_weapon(mob/living/L) if(GLOB.holy_weapon_type) return + var/obj/item/holy_weapon + var/list/holy_weapons_list = subtypesof(/obj/item/nullrod) + list(HOLY_WEAPONS) var/list/display_names = list() var/list/nullrod_icons = list() - for(var/V in typesof(/obj/item/nullrod)) + for(var/V in holy_weapons_list) var/obj/item/nullrod/rodtype = V if (initial(rodtype.chaplain_spawnable)) display_names[initial(rodtype.name)] = rodtype @@ -263,7 +265,7 @@ return var/A = display_names[choice] // This needs to be on a separate var as list member access is not allowed for new - var/obj/item/nullrod/holy_weapon = new A + holy_weapon = new A GLOB.holy_weapon_type = holy_weapon.type From 31d7fad1b47c38774a5cc880336b52fbf50027a1 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Mon, 20 Apr 2020 02:39:40 +0200 Subject: [PATCH 47/60] Update time_track.dm --- code/controllers/subsystem/time_track.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/subsystem/time_track.dm b/code/controllers/subsystem/time_track.dm index cd53c8f0ba..2f4949fc1e 100644 --- a/code/controllers/subsystem/time_track.dm +++ b/code/controllers/subsystem/time_track.dm @@ -23,7 +23,7 @@ SUBSYSTEM_DEF(time_track) var/time_dilation_text /datum/controller/subsystem/time_track/fire() - stat_time_text = "Server Time: [time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss")]\n\nRound Time: [WORLDTIME2TEXT("hh:mm:ss")]\n\nStation Time: [STATION_TIME_TIMESTAMP("hh:mm:ss", world.time)]\n\n[time_dilation_text]" + stat_time_text = "Server Time: [time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss")]\n\nRound Time: [DisplayTimeText(world.time - SSticker.round_start_time, 1)] \n\nStation Time: [STATION_TIME_TIMESTAMP("hh:mm:ss", world.time)]\n\n[time_dilation_text]" if(++last_measurement == measurement_delay) last_measurement = 0 From 6fcec77e9ba22cb73f1804ba7dcd96b3de8970e4 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sun, 19 Apr 2020 23:18:17 -0400 Subject: [PATCH 48/60] Update shields.dm --- code/game/objects/items/shields.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm index 22767a66ea..6d8e582c29 100644 --- a/code/game/objects/items/shields.dm +++ b/code/game/objects/items/shields.dm @@ -360,7 +360,6 @@ obj/item/shield/riot/bullet_proof desc = "A massive shield that can block a lot of attacks and can take a lot of abuse before breaking." //It cant break unless it is removed from the implant item_state = "metal" icon_state = "metal" - icon = 'icons/obj/items_and_weapons.dmi' block_chance = 30 //May be big but hard to move around to block. slowdown = 1 shield_flags = SHIELD_FLAGS_DEFAULT From 10d8ef79db9ef7ad9ddd88ce2db09341c408cb80 Mon Sep 17 00:00:00 2001 From: EmeraldSundisk Date: Sun, 19 Apr 2020 20:33:35 -0700 Subject: [PATCH 49/60] Update CogStation.dmm --- _maps/map_files/CogStation/CogStation.dmm | 5092 +++++++++++++-------- 1 file changed, 3166 insertions(+), 1926 deletions(-) diff --git a/_maps/map_files/CogStation/CogStation.dmm b/_maps/map_files/CogStation/CogStation.dmm index 28eded5c85..dbc857dfd7 100644 --- a/_maps/map_files/CogStation/CogStation.dmm +++ b/_maps/map_files/CogStation/CogStation.dmm @@ -705,6 +705,7 @@ /obj/item/circuitboard/machine/vending/donksofttoyvendor, /obj/item/storage/pill_bottle/happy, /obj/effect/decal/cleanable/dirt, +/obj/item/paper/fluff/cogstation/cluwne, /turf/open/floor/plating, /area/crew_quarters/theatre/clown) "abJ" = ( @@ -800,24 +801,11 @@ /turf/closed/wall/r_wall, /area/router/aux) "abX" = ( -/obj/machinery/computer/secure_data, -/obj/effect/turf_decal/tile/red{ - dir = 4 +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-2" }, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/machinery/camera{ - c_tag = "Security Checkpoint"; - pixel_x = 22 - }, -/obj/machinery/newscaster/security_unit{ - pixel_y = 32 - }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/security/checkpoint) "abY" = ( /obj/structure/grille, @@ -1523,9 +1511,9 @@ dir = 1 }, /obj/structure/closet, -/obj/item/clothing/under/staffassistant, -/obj/item/clothing/under/staffassistant, -/obj/item/clothing/under/staffassistant, +/obj/item/clothing/under/misc/staffassistant, +/obj/item/clothing/under/misc/staffassistant, +/obj/item/clothing/under/misc/staffassistant, /turf/open/floor/plasteel, /area/crew_quarters/lounge) "adK" = ( @@ -3511,9 +3499,9 @@ c_tag = "Clown's Office"; pixel_x = 22 }, -/obj/item/clothing/under/rank/yellowclown, -/obj/item/clothing/under/rank/blueclown, -/obj/item/clothing/under/rank/greenclown, +/obj/item/clothing/under/rank/civilian/clown/yellow, +/obj/item/clothing/under/rank/civilian/clown/blue, +/obj/item/clothing/under/rank/civilian/clown/green, /obj/item/toy/crayon/spraycan/lubecan, /obj/item/megaphone/clown, /turf/open/floor/plating, @@ -4141,20 +4129,12 @@ /turf/open/floor/plasteel, /area/construction/secondary) "akd" = ( -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, +/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "0-4" }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plasteel, +/obj/structure/cable, +/turf/open/floor/plating, /area/security/checkpoint) "ake" = ( /obj/machinery/firealarm{ @@ -4809,6 +4789,7 @@ /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/item/paper/guides/cogstation/letter_sec, /turf/open/floor/plasteel, /area/security/warden) "alG" = ( @@ -6070,8 +6051,27 @@ /turf/open/floor/plasteel/dark/corner, /area/hallway/secondary/entry) "aoy" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, +/obj/machinery/computer/secure_data, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/camera{ + c_tag = "Security Checkpoint"; + pixel_x = 22 + }, +/obj/machinery/newscaster/security_unit{ + pixel_y = 32 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, /area/security/checkpoint) "aoz" = ( /obj/structure/closet, @@ -7342,7 +7342,7 @@ pixel_y = 26 }, /obj/effect/landmark/start/bartender, -/obj/item/clothing/under/janimaid, +/obj/item/clothing/under/costume/maid, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/grimy, /area/crew_quarters/bar) @@ -8418,6 +8418,7 @@ /obj/item/storage/bag/tray, /obj/item/clothing/gloves/color/white, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/item/paper/guides/cogstation/cooks, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "atP" = ( @@ -9400,12 +9401,19 @@ /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/barbershop) "avY" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "AIShutter"; - name = "AI Core Shutters" +/obj/machinery/newscaster/security_unit{ + pixel_y = 32 }, -/turf/open/floor/plating, +/obj/machinery/turretid{ + name = "AI Chamber turret control"; + pixel_x = 5; + pixel_y = -24 + }, +/obj/machinery/door/window/westleft{ + name = "AI Core Access"; + req_access_txt = "65" + }, +/turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "avZ" = ( /obj/effect/landmark/start/cook, @@ -9528,13 +9536,15 @@ /turf/closed/wall/r_wall, /area/maintenance/solars/port) "awn" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "AIShutter"; - name = "AI Core Shutters" +/obj/machinery/light{ + dir = 1; + light_color = "#e8eaff" }, /obj/structure/disposalpipe/segment, -/turf/open/floor/plating, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "awo" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -10387,11 +10397,16 @@ /turf/open/floor/plasteel, /area/hydroponics/lobby) "axZ" = ( -/obj/machinery/light{ - dir = 1; - light_color = "#e8eaff" +/obj/machinery/requests_console{ + department = "AI"; + departmentType = 5; + pixel_x = 0; + pixel_y = 28 + }, +/obj/machinery/door/window/eastright{ + name = "AI Core Access"; + req_access_txt = "65" }, -/obj/structure/disposalpipe/segment, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "aya" = ( @@ -11286,9 +11301,9 @@ "azR" = ( /obj/structure/closet/secure_closet/bar, /obj/structure/disposalpipe/segment, -/obj/item/clothing/under/janimaid, +/obj/item/clothing/under/costume/maid, /obj/item/stack/spacecash/c10, -/obj/item/clothing/under/waiter, +/obj/item/clothing/under/suit/waiter, /turf/open/floor/plasteel/grimy, /area/crew_quarters/bar) "azS" = ( @@ -11768,27 +11783,31 @@ /turf/closed/wall, /area/crew_quarters/toilet) "aAP" = ( -/obj/effect/turf_decal/tile/red, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/security/brig) +"aAQ" = ( /obj/effect/turf_decal/tile/red{ dir = 4 }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/structure/cable{ + icon_state = "2-8" }, /turf/open/floor/plasteel, -/area/security/brig) -"aAQ" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" - }, -/obj/effect/turf_decal/delivery, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/security/main) +/area/security/checkpoint) "aAR" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/cyan/hidden, @@ -12361,11 +12380,20 @@ /turf/open/floor/plating, /area/security/main) "aCb" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/plating, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/plasteel, /area/security/brig) "aCc" = ( /obj/structure/closet/secure_closet/security/sec, @@ -12680,6 +12708,7 @@ /obj/item/stack/packageWrap, /obj/item/hand_labeler, /obj/item/book/manual/wiki/security_space_law, +/obj/item/paper/guides/cogstation/letter_sec, /turf/open/floor/carpet/red, /area/security/brig) "aCM" = ( @@ -12867,9 +12896,11 @@ /area/crew_quarters/barbershop) "aDb" = ( /obj/effect/spawner/structure/window/reinforced, -/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "0-4" + }, /turf/open/floor/plating, -/area/security/main) +/area/security/checkpoint) "aDc" = ( /obj/machinery/firealarm{ dir = 4; @@ -12972,16 +13003,19 @@ /turf/open/floor/plasteel/freezer, /area/crew_quarters/toilet) "aDm" = ( -/obj/structure/table, -/obj/machinery/recharger, +/obj/machinery/computer/security{ + dir = 1 + }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/structure/cable{ - icon_state = "1-4" +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/plasteel, /area/security/checkpoint) "aDn" = ( @@ -13176,19 +13210,23 @@ /area/maintenance/port/fore) "aDF" = ( /obj/structure/table, -/obj/machinery/firealarm{ - pixel_y = 26 - }, +/obj/machinery/recharger, +/obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ - dir = 4 + dir = 8 }, -/obj/effect/turf_decal/tile/red{ - dir = 1 +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/item/paper_bin, -/obj/item/pen, /turf/open/floor/plasteel, -/area/security/main) +/area/security/checkpoint) "aDG" = ( /obj/machinery/holopad, /turf/open/floor/plasteel, @@ -13340,18 +13378,26 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "aEc" = ( -/obj/structure/closet{ - name = "Evidence Closet 5" +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security/glass{ + name = "Security Office"; + req_access_txt = "63" }, -/obj/machinery/light_switch{ - pixel_y = -24 - }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/red{ - dir = 8 +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-8" }, /turf/open/floor/plasteel, /area/security/brig) @@ -13839,7 +13885,7 @@ "aFc" = ( /obj/structure/table, /obj/item/clothing/suit/toggle/owlwings, -/obj/item/clothing/under/owl, +/obj/item/clothing/under/costume/owl, /obj/item/clothing/mask/gas/owl_mask, /turf/open/floor/plating/asteroid, /area/hydroponics/garden{ @@ -13904,12 +13950,11 @@ /turf/closed/wall/r_wall, /area/crew_quarters/heads/hos) "aFk" = ( -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/plasteel, -/area/security/main) +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/structure/cable, +/turf/open/floor/plating, +/area/security/checkpoint) "aFl" = ( /obj/structure/chair/sofa/right, /obj/effect/turf_decal/tile/green{ @@ -14215,10 +14260,18 @@ /turf/open/floor/plasteel, /area/storage/emergency/generic) "aFP" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plating, -/area/security/checkpoint) +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security/glass{ + name = "Security Office"; + req_access_txt = "63" + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/plasteel, +/area/security/main) "aFQ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -14241,11 +14294,17 @@ /turf/open/floor/plasteel, /area/storage/emergency/generic) "aFT" = ( -/obj/structure/cable{ - icon_state = "0-2"; - pixel_y = 1 +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 }, -/turf/closed/wall, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, /area/security/brig) "aFU" = ( /obj/machinery/atmospherics/components/binary/circulator/cold{ @@ -15134,17 +15193,14 @@ /turf/open/floor/plasteel/dark, /area/bridge) "aHE" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/drinkingglass{ - pixel_x = -6; - pixel_y = 2 +/obj/structure/cable{ + icon_state = "2-4" }, -/obj/item/reagent_containers/food/drinks/drinkingglass{ - pixel_x = 6; - pixel_y = 3 +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 4 }, -/turf/open/floor/plasteel/dark, -/area/bridge) +/turf/open/floor/plating/airless, +/area/space/nearstation) "aHF" = ( /turf/open/floor/plasteel/dark, /area/bridge) @@ -15191,7 +15247,7 @@ }, /area/chapel/main) "aHK" = ( -/obj/structure/piano, +/obj/structure/musician/piano, /turf/open/floor/carpet{ icon_state = "carpetsymbol" }, @@ -15630,34 +15686,71 @@ /turf/open/floor/plasteel, /area/hallway/secondary/civilian) "aIC" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "0-8" }, -/turf/open/floor/plasteel/grimy, -/area/security/detectives_office) +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/security/main) "aID" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-8" }, -/turf/open/floor/plasteel/grimy, -/area/security/detectives_office) +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/security/main) "aIE" = ( /turf/open/floor/carpet/royalblue, /area/bridge) "aIF" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/segment{ +/obj/structure/table, +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/noticeboard{ + pixel_y = 28 + }, +/obj/effect/turf_decal/tile/red{ dir = 4 }, -/turf/open/floor/plasteel/grimy, -/area/security/detectives_office) +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/recharger, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/security/main) "aIG" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/disposalpipe/segment{ +/obj/structure/table, +/obj/machinery/firealarm{ + pixel_y = 26 + }, +/obj/effect/turf_decal/tile/red{ dir = 4 }, -/turf/open/floor/plating, -/area/security/detectives_office) +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/item/paper_bin, +/obj/item/pen, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/security/main) "aIH" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 6 @@ -15752,14 +15845,42 @@ /turf/open/floor/plasteel, /area/hydroponics) "aIS" = ( +/obj/structure/disposalpipe/segment, /obj/effect/landmark/start/ai, +/obj/item/radio/intercom{ + freerange = 1; + frequency = 1447; + name = "Private Channel"; + pixel_x = 27; + pixel_y = -7 + }, +/obj/item/radio/intercom{ + freerange = 1; + name = "Common Channel"; + pixel_x = 27; + pixel_y = 5 + }, /obj/machinery/button/door{ id = "AIShutter"; layer = 3.6; name = "AI Core Shutter Control"; - pixel_x = 24 + pixel_x = 24; + pixel_y = -24 + }, +/obj/item/radio/intercom{ + freerange = 1; + listening = 0; + name = "Custom Channel"; + pixel_x = -24; + pixel_y = -8 + }, +/obj/machinery/button/door{ + id = "AIChamberShutter"; + layer = 3.6; + name = "AI Chamber Shutter Control"; + pixel_x = -24; + pixel_y = -24 }, -/obj/structure/disposalpipe/segment, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "aIT" = ( @@ -15918,14 +16039,23 @@ /turf/open/floor/plasteel/dark, /area/chapel/office) "aJj" = ( -/obj/machinery/light{ - dir = 1 +/obj/structure/chair{ + dir = 4 }, -/obj/machinery/light_switch{ - pixel_y = 24 +/obj/structure/cable, +/obj/structure/cable{ + icon_state = "1-4" }, -/turf/open/floor/plasteel/dark, -/area/chapel/office) +/obj/machinery/power/apc{ + areastring = "/area/maintenance/aft"; + dir = 8; + name = "Chapel APC"; + pixel_x = -26 + }, +/turf/open/floor/plasteel{ + icon_state = "chapel" + }, +/area/chapel/main) "aJk" = ( /obj/structure/table/wood, /obj/item/candle, @@ -16429,11 +16559,21 @@ /turf/open/floor/carpet/red, /area/security/brig) "aKi" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plasteel/grimy, -/area/security/detectives_office) +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel, +/area/security/main) "aKj" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 6 @@ -17300,25 +17440,12 @@ /turf/open/floor/plasteel, /area/security/brig) "aLX" = ( -/obj/structure/table, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/noticeboard{ - pixel_y = 28 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/machinery/recharger, +/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ - icon_state = "2-8" + icon_state = "0-2" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/turf/open/floor/plasteel, +/obj/structure/cable, +/turf/open/floor/plating, /area/security/main) "aLY" = ( /obj/effect/turf_decal/tile/red, @@ -17718,13 +17845,12 @@ /turf/open/floor/plasteel, /area/hallway/secondary/civilian) "aMN" = ( -/obj/effect/turf_decal/tile/red{ +/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/red{ - dir = 1 +/obj/structure/cable{ + icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/open/floor/plasteel, /area/security/main) "aMO" = ( @@ -17909,9 +18035,7 @@ /turf/open/floor/plasteel, /area/bridge) "aNh" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, +/obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "aNi" = ( @@ -17990,37 +18114,13 @@ /turf/open/floor/plasteel, /area/crew_quarters/bar) "aNo" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +/obj/structure/disposalpipe/segment, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "AIShutter"; + name = "AI Core Shutters" }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/item/aiModule/supplied/oxygen{ - pixel_x = 2; - pixel_y = 10 - }, -/obj/item/aiModule/supplied/quarantine{ - pixel_x = 1; - pixel_y = 8 - }, -/obj/item/aiModule/zeroth/oneHuman{ - pixel_y = 4 - }, -/obj/effect/spawner/lootdrop/aimodule_harmful{ - pixel_x = -1; - pixel_y = 2 - }, -/obj/item/aiModule/supplied/protectStation{ - pixel_x = -2 - }, -/obj/structure/window/reinforced/spawner/north, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/ai_monitored/turret_protected/ai) "aNp" = ( /obj/effect/turf_decal/delivery, @@ -18038,17 +18138,11 @@ /turf/open/floor/plasteel/dark, /area/chapel/office) "aNr" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/structure/window/reinforced/spawner/north, -/turf/open/floor/plasteel, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "aNs" = ( /obj/effect/turf_decal/tile/yellow{ @@ -18119,21 +18213,10 @@ }, /area/chapel/main) "aNz" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ + dir = 5 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/machinery/door/window/northleft{ - name = "AI Chamber"; - req_one_access_txt = "65" - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/plasteel, +/turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "aNA" = ( /obj/machinery/door/firedoor, @@ -18407,6 +18490,9 @@ "aOe" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, +/obj/structure/cable{ + icon_state = "0-4" + }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/ai) "aOf" = ( @@ -18682,16 +18768,15 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "aOI" = ( -/obj/structure/chair/stool, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ + dir = 10 }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/machinery/flasher{ + id = "ID"; + pixel_x = 8; + pixel_y = 24 }, -/obj/structure/window/reinforced/spawner/north, -/turf/open/floor/plasteel, +/turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "aOJ" = ( /turf/closed/wall/r_wall, @@ -18784,7 +18869,7 @@ /obj/effect/turf_decal/bot, /obj/item/clothing/accessory/armband/hydro, /obj/item/encryptionkey/headset_service, -/obj/item/clothing/under/rank/vice, +/obj/item/clothing/under/misc/vice_officer, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ dir = 4 }, @@ -18859,21 +18944,13 @@ name = "Engine Room" }) "aPf" = ( -/obj/machinery/computer/upload/ai{ - dir = 8 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 6 }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/structure/window/reinforced/spawner/north, -/turf/open/floor/plasteel, +/turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) "aPg" = ( /obj/structure/grille, @@ -18976,15 +19053,15 @@ }, /area/hallway/primary/central) "aPs" = ( -/obj/structure/closet/secure_closet/hop, -/obj/machinery/light{ - dir = 1; - light_color = "#e8eaff" +/obj/effect/turf_decal/tile/red{ + dir = 4 }, -/obj/item/clothing/under/gimmick/rank/head_of_personnel/suit, -/obj/item/clothing/under/gimmick/rank/head_of_personnel/suit/skirt, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/heads/hop) +/obj/effect/turf_decal/tile/red, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/security/main) "aPt" = ( /obj/structure/table/wood, /obj/machinery/recharger, @@ -19101,6 +19178,9 @@ pixel_y = 6 }, /obj/item/clothing/glasses/meson, +/obj/machinery/status_display{ + pixel_x = -32 + }, /turf/open/floor/plasteel, /area/ai_monitored/turret_protected/ai) "aPF" = ( @@ -19245,30 +19325,40 @@ /turf/open/floor/plasteel/white, /area/crew_quarters/fitness/cogpool) "aPT" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-02" +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 4 }, -/turf/open/floor/plasteel/dark, -/area/bridge) +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plating/airless, +/area/space/nearstation) "aPU" = ( -/obj/structure/table/wood, -/obj/item/paper_bin, -/obj/machinery/camera{ - c_tag = "Bridge - Port Quarter"; - dir = 1 +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-2" }, -/obj/machinery/keycard_auth{ - pixel_y = -24 - }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plating, /area/bridge) "aPV" = ( -/obj/machinery/photocopier, -/turf/open/floor/plasteel/dark, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating, /area/bridge) "aPW" = ( -/obj/structure/reagent_dispensers/water_cooler, -/turf/open/floor/plasteel/dark, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating, /area/bridge) "aPX" = ( /obj/structure/table, @@ -20551,9 +20641,20 @@ /turf/open/floor/plasteel, /area/hallway/secondary/civilian) "aSJ" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/crew_quarters/heads/captain) +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security/glass{ + name = "Security Office"; + req_access_txt = "63" + }, +/obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel, +/area/security/main) "aSK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -20819,11 +20920,16 @@ /turf/open/floor/plating, /area/maintenance/department/eva) "aTo" = ( -/obj/effect/landmark/start/captain, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/structure/cable{ + icon_state = "0-4" }, -/area/crew_quarters/heads/captain) +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/security/detectives_office) "aTp" = ( /obj/structure/chair{ dir = 4 @@ -20856,17 +20962,24 @@ }, /area/chapel/main) "aTr" = ( -/obj/structure/table/wood, -/obj/machinery/recharger, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/captain) +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/security/detectives_office) "aTs" = ( /turf/closed/wall, /area/maintenance/department/eva) "aTt" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/crew_quarters/heads/hop) +/obj/structure/closet/secure_closet/detective, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/grimy, +/area/security/detectives_office) "aTu" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command/glass{ @@ -20962,14 +21075,16 @@ /turf/closed/wall, /area/router/public) "aTH" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, /obj/structure/cable{ - icon_state = "2-4" + icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 +/obj/structure/cable{ + icon_state = "0-2" }, -/turf/open/floor/plating/airless, -/area/space/nearstation) +/turf/open/floor/plating, +/area/bridge) "aTI" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/line, @@ -20985,16 +21100,12 @@ /turf/open/floor/plasteel, /area/router/public) "aTJ" = ( -/obj/structure/table/wood, -/obj/item/paper_bin, -/obj/item/pen/fourcolor, -/obj/item/pen/fountain{ - pixel_x = 2; - pixel_y = 6 +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/structure/cable{ + icon_state = "1-4" }, -/obj/item/stamp/hop, -/turf/open/floor/carpet/green, -/area/crew_quarters/heads/hop) +/turf/open/floor/plasteel/grimy, +/area/security/detectives_office) "aTK" = ( /obj/machinery/door/firedoor, /obj/structure/cable{ @@ -21551,9 +21662,13 @@ /turf/open/floor/plasteel, /area/science/mixing) "aVa" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plating, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/grimy, /area/security/detectives_office) "aVb" = ( /obj/structure/pool/Rboard, @@ -22108,9 +22223,12 @@ /turf/open/floor/plasteel, /area/gateway) "aWn" = ( -/obj/structure/closet/secure_closet/detective, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "aWo" = ( @@ -22197,27 +22315,40 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "aWw" = ( -/obj/structure/table/wood, -/obj/item/pinpointer/nuke, -/obj/item/card/id/captains_spare, -/obj/item/hand_tele, -/obj/item/disk/nuclear, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/heads/captain) -"aWx" = ( -/obj/structure/table/wood, -/obj/machinery/light, -/obj/item/storage/photo_album/Captain, -/obj/item/camera{ - pixel_y = -6 +/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/item/stamp/captain, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/heads/captain) +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/grimy, +/area/security/detectives_office) +"aWx" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/security/detectives_office) "aWy" = ( -/obj/machinery/suit_storage_unit/captain, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/heads/captain) +/obj/structure/disposalpipe/segment, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/plasteel/grimy, +/area/security/detectives_office) "aWz" = ( /obj/machinery/door/firedoor, /obj/structure/cable{ @@ -23026,9 +23157,12 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/nuke_storage) "aYm" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/ai_monitored/storage/eva) +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/grimy, +/area/security/detectives_office) "aYn" = ( /obj/structure/table, /obj/effect/turf_decal/stripes/line{ @@ -23188,30 +23322,40 @@ /turf/open/floor/plating, /area/maintenance/starboard/central) "aYD" = ( -/obj/structure/table, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high/plus, -/turf/open/floor/plasteel, -/area/ai_monitored/storage/eva) -"aYE" = ( -/obj/item/beacon, -/turf/open/floor/plasteel, -/area/ai_monitored/storage/eva) -"aYF" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, /obj/structure/cable{ - icon_state = "2-4" + icon_state = "1-2" }, -/turf/open/floor/plasteel/checker, -/area/ai_monitored/storage/eva) +/turf/open/floor/plasteel/grimy, +/area/security/detectives_office) +"aYE" = ( +/obj/structure/closet/crate/trashcart, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/disposalpipe/junction, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/grimy, +/area/security/detectives_office) +"aYF" = ( +/obj/structure/table/wood, +/obj/item/storage/box/evidence, +/obj/item/hand_labeler, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/grimy, +/area/security/detectives_office) "aYG" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -23229,14 +23373,17 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "aYI" = ( -/obj/machinery/light{ - dir = 4; - light_color = "#e8eaff" +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 }, -/turf/open/floor/plasteel/dark/side{ - dir = 4 +/obj/machinery/photocopier, +/obj/structure/extinguisher_cabinet{ + pixel_y = -32 }, -/area/hallway/primary/central) +/obj/item/paper/guides/cogstation/letter_sec, +/turf/open/floor/plasteel, +/area/security/main) "aYJ" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, @@ -23584,7 +23731,7 @@ /obj/effect/turf_decal/bot_white/left, /obj/item/stack/sheet/mineral/diamond, /obj/item/gun/ballistic/revolver/mateba, -/obj/item/clothing/under/soviet, +/obj/item/clothing/under/costume/soviet, /obj/item/clothing/suit/armor/vest/russian_coat, /obj/item/clothing/head/helmet/rus_helmet, /obj/machinery/light, @@ -23857,6 +24004,9 @@ /obj/item/aiModule/core/full/custom{ pixel_x = -4 }, +/obj/machinery/status_display{ + pixel_x = 32 + }, /turf/open/floor/plasteel, /area/ai_monitored/turret_protected/ai) "aZQ" = ( @@ -23884,10 +24034,18 @@ /turf/open/floor/plasteel/dark/corner, /area/ai_monitored/storage/eva) "aZT" = ( -/obj/structure/table/wood, -/obj/item/stack/packageWrap, -/turf/open/floor/carpet/royalblue, -/area/bridge) +/obj/structure/closet/secure_closet/hos, +/obj/machinery/light_switch{ + pixel_y = 24 + }, +/obj/machinery/light{ + dir = 4; + light_color = "#e8eaff" + }, +/obj/item/storage/box/deputy, +/obj/item/paper/guides/cogstation/letter_hos, +/turf/open/floor/plasteel/grimy, +/area/crew_quarters/heads/hos) "aZU" = ( /obj/structure/chair, /obj/machinery/light{ @@ -24280,8 +24438,8 @@ "baP" = ( /obj/structure/closet/secure_closet/captains, /obj/item/reagent_containers/food/drinks/flask/gold, -/obj/item/clothing/under/gimmick/rank/captain/suit, -/obj/item/clothing/under/gimmick/rank/captain/suit/skirt, +/obj/item/clothing/under/rank/captain/suit, +/obj/item/clothing/under/rank/captain/suit/skirt, /obj/machinery/airalarm{ pixel_y = 24 }, @@ -24349,11 +24507,39 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "baW" = ( -/obj/structure/grille, -/obj/structure/cable{ - icon_state = "0-2" +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/turf/open/floor/plating, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/item/aiModule/core/full/asimov{ + pixel_x = 2; + pixel_y = 10 + }, +/obj/effect/spawner/lootdrop/aimodule_neutral{ + pixel_x = 1; + pixel_y = 8 + }, +/obj/effect/spawner/lootdrop/aimodule_harmless{ + pixel_y = 6 + }, +/obj/item/aiModule/core/freeformcore{ + pixel_x = -1; + pixel_y = 2 + }, +/obj/item/aiModule/supplied/freeform{ + pixel_x = -2 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel, /area/ai_monitored/turret_protected/ai) "baX" = ( /obj/effect/turf_decal/tile/yellow, @@ -25772,36 +25958,12 @@ /turf/open/floor/plasteel/dark, /area/chapel/office) "beu" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 8 +/obj/structure/grille, +/obj/structure/cable{ + icon_state = "0-2" }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/item/aiModule/core/full/asimov{ - pixel_x = 2; - pixel_y = 10 - }, -/obj/effect/spawner/lootdrop/aimodule_neutral{ - pixel_x = 1; - pixel_y = 8 - }, -/obj/effect/spawner/lootdrop/aimodule_harmless{ - pixel_y = 6 - }, -/obj/item/aiModule/core/freeformcore{ - pixel_x = -1; - pixel_y = 2 - }, -/obj/item/aiModule/supplied/freeform{ - pixel_x = -2 - }, -/turf/open/floor/plasteel, +/obj/structure/cable, +/turf/open/floor/plating, /area/ai_monitored/turret_protected/ai) "bev" = ( /obj/structure/cable{ @@ -25943,7 +26105,11 @@ /area/security/courtroom/jury) "beQ" = ( /obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel/grimy, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/closed/wall, /area/security/detectives_office) "beR" = ( /obj/structure/chair{ @@ -26304,23 +26470,19 @@ /turf/open/floor/plating, /area/quartermaster/warehouse) "bfH" = ( -/obj/structure/chair{ - dir = 4 +/obj/machinery/light{ + dir = 1 }, -/obj/structure/cable, -/obj/structure/cable{ - icon_state = "1-4" +/obj/machinery/light_switch{ + pixel_y = 24 }, -/obj/machinery/power/apc{ - areastring = "/area/maintenance/aft"; - dir = 8; - name = "Chapel APC"; - pixel_x = -24 +/obj/machinery/button/crematorium{ + id = "foo"; + pixel_x = 8; + pixel_y = 24 }, -/turf/open/floor/plasteel{ - icon_state = "chapel" - }, -/area/chapel/main) +/turf/open/floor/plasteel/dark, +/area/chapel/office) "bfI" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -26349,6 +26511,10 @@ /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, +/obj/item/paper/fluff/cogstation/letter_chap{ + pixel_x = 10; + pixel_y = 2 + }, /turf/open/floor/carpet{ icon_state = "carpetsymbol" }, @@ -26549,18 +26715,13 @@ /turf/open/floor/plating, /area/quartermaster/warehouse) "bgh" = ( -/obj/machinery/conveyor_switch{ - id = "EngiCargoConveyer" +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/violet/hidden{ + icon_state = "pipe11-2"; + dir = 6 }, -/obj/structure/cable, -/obj/machinery/power/apc{ - areastring = "/area/quartermaster/sorting"; - dir = 8; - name = "Delivery Office APC"; - pixel_x = -24 - }, -/turf/open/floor/plasteel, -/area/quartermaster/sorting) +/turf/open/space/basic, +/area/space/nearstation) "bgi" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 @@ -27190,18 +27351,15 @@ /turf/open/floor/plasteel, /area/quartermaster/sorting) "bhB" = ( -/obj/structure/closet/secure_closet/quartermaster, -/obj/effect/turf_decal/tile/brown{ - dir = 1 +/obj/structure/table/wood, +/obj/item/stack/packageWrap, +/obj/item/paper/fluff/cogstation/bsrb, +/obj/item/paper/fluff/cogstation/survey{ + pixel_x = -4; + pixel_y = 2 }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown, -/obj/item/clothing/suit/space/eva, -/obj/item/clothing/head/helmet/space/eva, -/turf/open/floor/plasteel, -/area/quartermaster/qm) +/turf/open/floor/carpet/royalblue, +/area/bridge) "bhC" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/orange/hidden, @@ -27517,16 +27675,12 @@ /turf/open/floor/plating, /area/quartermaster/storage) "bik" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, /obj/structure/cable{ - icon_state = "2-4" + icon_state = "0-2" }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, +/turf/open/floor/plating, /area/bridge) "bil" = ( /obj/effect/turf_decal/stripes/line{ @@ -27573,14 +27727,16 @@ /turf/open/floor/plasteel, /area/quartermaster/qm) "biq" = ( -/obj/machinery/computer/cargo/request{ - dir = 1 +/obj/structure/closet/secure_closet/hop, +/obj/machinery/light{ + dir = 1; + light_color = "#e8eaff" }, -/obj/machinery/keycard_auth{ - pixel_x = 24; - pixel_y = -8 +/obj/item/clothing/under/rank/civilian/head_of_personnel/suit, +/obj/item/clothing/under/rank/civilian/head_of_personnel/suit/skirt{ + name = "head of personnel's suitskirt" }, -/turf/open/floor/carpet/green, +/turf/open/floor/plasteel/dark, /area/crew_quarters/heads/hop) "bir" = ( /obj/effect/turf_decal/tile/brown{ @@ -28094,17 +28250,25 @@ /turf/open/floor/plating, /area/security/courtroom/jury) "bjw" = ( -/obj/machinery/computer/card{ - dir = 8 +/obj/item/storage/secure/safe{ + pixel_x = 4; + pixel_y = 32 }, -/obj/machinery/keycard_auth{ - pixel_x = 8; - pixel_y = -24 +/obj/structure/disposalpipe/segment{ + dir = 5 }, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" +/obj/effect/decal/cleanable/cobweb{ + icon_state = "cobweb2" }, -/area/crew_quarters/heads/captain) +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/maintenance/starboard/central) "bjx" = ( /obj/structure/table/optable, /obj/effect/turf_decal/bot, @@ -28136,21 +28300,13 @@ /turf/open/floor/plating, /area/maintenance/department/eva) "bjB" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/item/folder/red, -/turf/open/floor/plasteel, -/area/security/checkpoint/supply) +/obj/structure/cable, +/turf/open/floor/plating, +/area/security/brig) "bjC" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -28193,9 +28349,18 @@ }, /area/engine/atmos) "bjF" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/security/checkpoint/supply) +/obj/machinery/power/apc{ + areastring = "/area/maintenance/aft"; + dir = 8; + name = "Head of Personnel APC"; + pixel_x = -24 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable, +/turf/open/floor/carpet/green, +/area/crew_quarters/heads/hop) "bjG" = ( /obj/structure/rack, /turf/open/floor/plasteel, @@ -28350,21 +28515,24 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bjV" = ( +/obj/structure/closet{ + name = "Evidence Closet 5" + }, +/obj/machinery/light_switch{ + pixel_y = -24 + }, /obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, /obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/structure/chair{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-2" }, /turf/open/floor/plasteel, -/area/security/checkpoint/supply) +/area/security/brig) "bjW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -28642,12 +28810,12 @@ /turf/open/floor/plasteel, /area/quartermaster/warehouse) "bkC" = ( -/obj/machinery/modular_computer/console/preset/research{ - dir = 8 +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-4" }, -/obj/item/reagent_containers/food/drinks/coffee, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/heads/hor) +/turf/open/floor/plating, +/area/crew_quarters/heads/captain) "bkD" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -29496,13 +29664,12 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bmj" = ( -/obj/structure/closet/secure_closet/RD, -/obj/machinery/light{ - dir = 4; - light_color = "#c1caff" +/obj/machinery/vending/wardrobe/cap_wardrobe, +/obj/structure/cable{ + icon_state = "2-8" }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/heads/hor) +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/captain) "bmk" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, @@ -29914,6 +30081,7 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, +/obj/item/paper/guides/cogstation/cdn_chap, /turf/open/floor/plasteel/dark, /area/chapel/office) "bmY" = ( @@ -30540,9 +30708,17 @@ /turf/closed/wall/r_wall, /area/crew_quarters/fitness/cogpool) "boj" = ( -/obj/structure/rack, -/obj/item/caution, -/obj/item/caution, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/quartermaster/warehouse) "bok" = ( @@ -31307,17 +31483,10 @@ name = "Aft Air Hookup" }) "bpW" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, +/turf/closed/wall, /area/security/brig) "bpX" = ( /obj/machinery/disposal/bin, @@ -32621,12 +32790,9 @@ /turf/open/floor/plating, /area/maintenance/disposal) "bsz" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supplymain/visible, -/obj/machinery/atmospherics/pipe/simple/violet/visible{ +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/violet/hidden{ + icon_state = "pipe11-2"; dir = 4 }, /turf/open/space/basic, @@ -32770,15 +32936,11 @@ /turf/open/floor/plasteel/dark, /area/chapel/office) "bsT" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/violet/hidden{ + icon_state = "pipe11-2"; + dir = 10 }, -/obj/structure/transit_tube/crossing/horizontal, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supplymain/visible, /turf/open/space/basic, /area/space/nearstation) "bsU" = ( @@ -33505,19 +33667,25 @@ /turf/open/floor/plating, /area/maintenance/department/chapel) "buM" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/crew_quarters/heads/cmo) +/obj/structure/table/wood, +/obj/machinery/recharger, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/captain) "buN" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/closed/wall/rust, /area/chapel/main) "buO" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/closed/wall, -/area/security/detectives_office) +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/crew_quarters/heads/captain) "buP" = ( /obj/item/trash/plate, /obj/item/lighter/greyscale, @@ -33535,22 +33703,15 @@ /turf/open/floor/plasteel/dark, /area/chapel/office) "buR" = ( -/obj/item/storage/secure/safe{ - pixel_x = 4; - pixel_y = 32 - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/effect/decal/cleanable/cobweb{ - icon_state = "cobweb2" +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-4" }, /obj/structure/cable{ - icon_state = "2-8" + icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/open/floor/plating, -/area/maintenance/starboard/central) +/area/crew_quarters/heads/hop) "buS" = ( /turf/closed/wall/r_wall, /area/crew_quarters/heads/cmo) @@ -34517,7 +34678,7 @@ dir = 8 }, /obj/structure/table, -/obj/item/clothing/under/rank/mailman, +/obj/item/clothing/under/misc/mailman, /obj/item/clothing/head/mailman, /obj/item/wirecutters, /obj/item/stack/packageWrap, @@ -34620,8 +34781,8 @@ /obj/structure/disposalpipe/segment, /obj/item/clothing/gloves/color/purple, /obj/item/clothing/gloves/color/purple, -/obj/item/clothing/under/janimaid, -/obj/item/clothing/under/janimaid, +/obj/item/clothing/under/costume/maid, +/obj/item/clothing/under/costume/maid, /obj/structure/sign/poster/official/bless_this_spess{ pixel_x = -32 }, @@ -35067,13 +35228,19 @@ /turf/open/floor/engine/vacuum, /area/science/mixing) "byd" = ( -/obj/machinery/computer/crew, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/structure/table/wood, +/obj/item/paper_bin, +/obj/item/pen/fourcolor, +/obj/item/pen/fountain{ + pixel_x = 2; + pixel_y = 6 }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/heads/cmo) +/obj/item/stamp/hop, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/carpet/green, +/area/crew_quarters/heads/hop) "bye" = ( /obj/structure/safe/floor, /obj/effect/turf_decal/tile/green, @@ -35615,19 +35782,16 @@ /turf/open/floor/plating/airless, /area/quartermaster/miningoffice) "bzw" = ( -/obj/effect/turf_decal/stripes/end{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 9 }, -/obj/machinery/conveyor{ - dir = 4; - id = "MiningConveyer" +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ + dir = 9 }, -/obj/machinery/door/poddoor{ - id = "MiningConveyerBlastDoor"; - name = "Asteroid Mining Load Door" - }, -/turf/open/floor/plating/airless, -/area/quartermaster/miningoffice) +/obj/effect/landmark/start/cargo_technician, +/turf/open/floor/plasteel, +/area/quartermaster/warehouse) "bzx" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security{ @@ -35701,45 +35865,10 @@ /turf/open/floor/plasteel/dark, /area/science/robotics/lab) "bzH" = ( -/obj/structure/table, -/obj/machinery/light{ - dir = 4; - light_color = "#c1caff" - }, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high/plus, -/obj/item/stock_parts/cell/high/plus{ - pixel_y = 8 - }, -/obj/item/stock_parts/cell/high/plus{ - pixel_y = 8 - }, -/obj/item/assembly/flash{ - pixel_x = -8; - pixel_y = 4 - }, -/obj/item/assembly/flash{ - pixel_x = -8; - pixel_y = 4 - }, -/obj/item/assembly/flash{ - pixel_x = -8; - pixel_y = 4 - }, -/obj/item/assembly/flash{ - pixel_x = -8; - pixel_y = 4 - }, -/obj/item/assembly/flash{ - pixel_x = -8; - pixel_y = 4 - }, -/obj/item/assembly/flash{ - pixel_x = -8; - pixel_y = 4 - }, -/turf/open/floor/plasteel/dark, -/area/science/robotics/lab) +/obj/structure/disposalpipe/segment, +/obj/structure/grille/broken, +/turf/open/floor/plating, +/area/maintenance/disposal) "bzI" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/yellow{ @@ -35995,17 +36124,20 @@ /turf/open/floor/plasteel, /area/router) "bAn" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plasteel/dark/side{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 4 }, -/area/gateway) +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/carpet/green, +/area/crew_quarters/heads/hop) "bAo" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -36131,12 +36263,13 @@ /area/science/mixing) "bAA" = ( /obj/structure/lattice, -/obj/structure/disposalpipe/segment, -/obj/machinery/camera{ - c_tag = "Supply - Warehouse Exterior"; - dir = 1 +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/violet/hidden{ + icon_state = "pipe11-2"; + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, /turf/open/space/basic, /area/space/nearstation) "bAB" = ( @@ -36327,16 +36460,22 @@ /turf/closed/wall, /area/hallway/secondary/exit) "bAX" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ +/obj/structure/table/wood, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, -/obj/machinery/photocopier, -/obj/structure/extinguisher_cabinet{ - pixel_y = -32 +/obj/structure/cable{ + icon_state = "1-8" }, -/turf/open/floor/plasteel, -/area/security/main) +/obj/item/paper/fluff/cogstation/letter_cap{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/flashlight/lamp, +/turf/open/floor/carpet{ + icon_state = "carpetsymbol" + }, +/area/crew_quarters/heads/captain) "bAY" = ( /obj/machinery/status_display, /turf/closed/wall, @@ -36520,17 +36659,16 @@ /turf/open/floor/plasteel, /area/science/robotics/lab) "bBt" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-4" }, -/turf/open/floor/carpet/green, -/area/crew_quarters/heads/hop) +/turf/open/floor/carpet{ + icon_state = "carpetsymbol" + }, +/area/crew_quarters/heads/captain) "bBu" = ( /turf/open/floor/plasteel/showroomfloor, /area/medical/morgue) @@ -36827,11 +36965,14 @@ /turf/open/floor/plasteel, /area/router/eva) "bCd" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 +/obj/effect/landmark/start/captain, +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/open/floor/plasteel/white, -/area/gateway) +/turf/open/floor/carpet{ + icon_state = "carpetsymbol" + }, +/area/crew_quarters/heads/captain) "bCe" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -36996,7 +37137,7 @@ }, /obj/effect/turf_decal/tile/yellow, /obj/structure/closet/secure_closet/engineering_personal, -/obj/item/clothing/under/overalls, +/obj/item/clothing/under/misc/overalls, /obj/structure/window/reinforced/spawner/east, /turf/open/floor/plasteel, /area/storage/primary) @@ -37007,9 +37148,11 @@ /turf/open/floor/plasteel, /area/hallway/secondary/exit) "bCB" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/grille/broken, /obj/effect/decal/cleanable/dirt, +/obj/structure/disposaloutlet, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/disposal) "bCC" = ( @@ -37038,8 +37181,11 @@ /turf/open/floor/plating, /area/router/eva) "bCF" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 9 }, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/ai) @@ -37376,11 +37522,8 @@ "bDw" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ - id = "AIShutter"; - name = "AI Core Shutters" - }, -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ - dir = 10 + id = "AIChamberShutter"; + name = "AI Chamber Shutters" }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/ai) @@ -37580,13 +37723,11 @@ /turf/open/floor/plasteel, /area/medical/chemistry) "bDU" = ( +/obj/machinery/atmospherics/pipe/simple/supplymain/hidden, /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ - id = "AIShutter"; - name = "AI Core Shutters" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 6 + id = "AIChamberShutter"; + name = "AI Chamber Shutters" }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/ai) @@ -37594,13 +37735,16 @@ /turf/open/floor/plasteel/stairs/left, /area/crew_quarters/bar) "bDW" = ( +/obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command/glass{ + name = "AI Chamber"; + req_access_txt = "65" }, -/turf/open/floor/circuit, +/turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/ai) "bDX" = ( /turf/open/floor/plasteel/stairs/right, @@ -37797,18 +37941,22 @@ /turf/closed/wall/r_wall, /area/maintenance/solars/starboard/fore) "bEq" = ( -/obj/machinery/computer/security{ - dir = 1 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ +/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ dir = 8 }, -/obj/effect/turf_decal/tile/red{ - dir = 1 +/obj/structure/cable{ + icon_state = "1-8" }, -/turf/open/floor/plasteel, -/area/security/checkpoint) +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/carpet{ + icon_state = "carpetsymbol" + }, +/area/crew_quarters/heads/captain) "bEr" = ( /obj/structure/cable, /obj/machinery/power/apc{ @@ -38011,23 +38159,13 @@ /turf/open/floor/plating, /area/maintenance/fore) "bEL" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/security/brig) +/obj/effect/decal/cleanable/dirt, +/obj/structure/grille/broken, +/turf/open/floor/plating, +/area/maintenance/disposal) "bEM" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -38178,12 +38316,12 @@ /turf/open/floor/plating, /area/router) "bEZ" = ( +/obj/machinery/atmospherics/pipe/simple/orange/hidden, /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ - id = "AIShutter"; - name = "AI Core Shutters" + id = "AIChamberShutter"; + name = "AI Chamber Shutters" }, -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden, /turf/open/floor/plating, /area/ai_monitored/turret_protected/ai) "bFa" = ( @@ -38221,13 +38359,36 @@ /turf/open/floor/plating, /area/maintenance/starboard/central) "bFf" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "AIShutter"; - name = "AI Core Shutters" +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plating, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/item/aiModule/supplied/oxygen{ + pixel_x = 2; + pixel_y = 10 + }, +/obj/item/aiModule/supplied/quarantine{ + pixel_x = 1; + pixel_y = 8 + }, +/obj/item/aiModule/zeroth/oneHuman{ + pixel_y = 4 + }, +/obj/effect/spawner/lootdrop/aimodule_harmful{ + pixel_x = -1; + pixel_y = 2 + }, +/obj/item/aiModule/supplied/protectStation{ + pixel_x = -2 + }, +/turf/open/floor/plasteel, /area/ai_monitored/turret_protected/ai) "bFg" = ( /obj/effect/turf_decal/tile/brown, @@ -38329,8 +38490,16 @@ /turf/open/floor/plating, /area/medical/chemistry) "bFv" = ( -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden, -/turf/open/floor/circuit, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/plasteel, /area/ai_monitored/turret_protected/ai) "bFw" = ( /obj/machinery/monkey_recycler, @@ -38352,27 +38521,22 @@ /turf/open/floor/plasteel, /area/medical/chemistry) "bFy" = ( -/obj/structure/cable, -/obj/machinery/power/apc{ - areastring = "/area/maintenance/aft"; - dir = 8; - name = "Head of Personnel APC"; - pixel_x = -24 +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 4 }, -/turf/open/floor/carpet/green, -/area/crew_quarters/heads/hop) -"bFz" = ( /obj/structure/cable{ - icon_state = "2-8" + icon_state = "4-8" }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 +/turf/open/floor/carpet{ + icon_state = "carpetsymbol" }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plasteel/dark/side{ - dir = 8 - }, -/area/gateway) +/area/crew_quarters/heads/captain) +"bFz" = ( +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/item/paper/guides/cogstation/janitor, +/turf/open/floor/plasteel, +/area/janitor) "bFA" = ( /obj/structure/chair/stool, /obj/effect/turf_decal/tile/neutral, @@ -38760,11 +38924,17 @@ /turf/open/floor/plasteel, /area/security/main) "bGg" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/circuit, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/supplymain/hidden, +/turf/open/floor/plasteel, /area/ai_monitored/turret_protected/ai) "bGh" = ( /obj/structure/lattice, @@ -38967,11 +39137,10 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, +/obj/structure/disposalpipe/segment, /obj/structure/cable{ - icon_state = "2-4" + icon_state = "1-8" }, -/obj/structure/window/reinforced/spawner/north, -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden, /turf/open/floor/plasteel, /area/ai_monitored/turret_protected/ai) "bGC" = ( @@ -38991,7 +39160,6 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/structure/window/reinforced/spawner/north, /obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/open/floor/plasteel, /area/ai_monitored/turret_protected/ai) @@ -39103,9 +39271,9 @@ /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/item/clothing/under/staffassistant, -/obj/item/clothing/under/staffassistant, -/obj/item/clothing/under/staffassistant, +/obj/item/clothing/under/misc/staffassistant, +/obj/item/clothing/under/misc/staffassistant, +/obj/item/clothing/under/misc/staffassistant, /turf/open/floor/plasteel, /area/crew_quarters/locker) "bGS" = ( @@ -39372,7 +39540,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/item/clothing/under/staffassistant, +/obj/item/clothing/under/misc/staffassistant, /turf/open/floor/plasteel, /area/crew_quarters/locker) "bHw" = ( @@ -39384,7 +39552,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/obj/item/clothing/under/staffassistant, +/obj/item/clothing/under/misc/staffassistant, /turf/open/floor/plasteel, /area/crew_quarters/locker) "bHx" = ( @@ -39901,17 +40069,15 @@ /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "bIC" = ( -/obj/structure/cable{ - icon_state = "0-4" +/obj/machinery/conveyor/auto{ + id = "disposal" }, -/obj/machinery/power/apc{ - areastring = "/area/maintenance/aft"; - dir = 8; - name = "Aft Maintenance APC"; - pixel_x = -24 +/obj/structure/disposalpipe/segment{ + dir = 4 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, -/area/maintenance/aft) +/area/maintenance/disposal) "bID" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral{ @@ -40061,16 +40227,11 @@ name = "Research Sector" }) "bIT" = ( -/obj/structure/lattice/catwalk, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/violet/visible{ +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/supplymain/visible{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supplymain/visible, -/obj/machinery/atmospherics/pipe/simple/violet/hidden{ - icon_state = "pipe11-2"; - dir = 8 - }, +/obj/machinery/atmospherics/pipe/simple/violet/hidden, /turf/open/space/basic, /area/space/nearstation) "bIU" = ( @@ -40121,12 +40282,9 @@ /turf/open/floor/plasteel, /area/maintenance/department/chapel) "bIY" = ( -/obj/machinery/atmospherics/pipe/simple/violet/visible{ - dir = 10 - }, -/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/violet/hidden, /turf/open/space/basic, -/area/space/nearstation) +/area/space) "bIZ" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -40749,16 +40907,13 @@ /turf/open/floor/plating, /area/quartermaster/miningoffice) "bKp" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/structure/cable{ + icon_state = "0-2" }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/caution/stand_clear{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/science/xenobiology) +/turf/open/floor/plating, +/area/crew_quarters/heads/hop) "bKq" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -40932,12 +41087,18 @@ /turf/open/floor/engine, /area/science/xenobiology) "bKG" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/computer/cargo/request{ + dir = 1 }, -/turf/open/floor/plating, -/area/science/xenobiology) +/obj/machinery/keycard_auth{ + pixel_x = 24; + pixel_y = -8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/carpet/green, +/area/crew_quarters/heads/hop) "bKH" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 4 @@ -40952,25 +41113,23 @@ /turf/open/floor/engine, /area/science/mixing) "bKJ" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 4 +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-4" }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/turf/open/floor/plasteel/dark, -/area/science/xenobiology) +/obj/structure/cable, +/turf/open/floor/plating, +/area/crew_quarters/heads/hop) "bKK" = ( -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-4" }, -/obj/effect/turf_decal/tile/purple{ - dir = 1 +/obj/structure/cable{ + icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plasteel/dark, -/area/science/xenobiology) +/turf/open/floor/plating, +/area/crew_quarters/heads/hop) "bKL" = ( /obj/structure/cable{ icon_state = "2-4" @@ -41191,12 +41350,13 @@ /turf/open/floor/engine, /area/science/xenobiology) "bLe" = ( -/obj/machinery/door/window/westright{ - name = "Containment Pen"; - req_one_access_txt = "55" +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/structure/cable{ + icon_state = "0-8" }, -/turf/open/floor/engine, -/area/science/xenobiology) +/turf/open/floor/plating, +/area/crew_quarters/heads/hop) "bLf" = ( /obj/machinery/door/window/eastleft{ name = "Containment Pen"; @@ -41218,8 +41378,23 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bLh" = ( -/turf/open/floor/plasteel/dark, -/area/science/xenobiology) +/obj/structure/bed, +/obj/item/radio/intercom{ + name = "Station Intercom (Common)"; + pixel_y = -28 + }, +/obj/item/bedsheet/captain, +/obj/effect/landmark/start/captain, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/carpet{ + icon_state = "carpetsymbol" + }, +/area/crew_quarters/heads/captain) "bLi" = ( /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ @@ -41237,12 +41412,16 @@ /turf/open/floor/plasteel, /area/science/xenobiology) "bLk" = ( -/obj/machinery/door/window/eastleft{ - name = "Containment Pen"; - req_one_access_txt = "55" +/obj/machinery/atmospherics/pipe/manifold/orange/hidden{ + dir = 1 }, -/turf/open/floor/engine, -/area/science/xenobiology) +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/carpet{ + icon_state = "carpetsymbol" + }, +/area/crew_quarters/heads/captain) "bLl" = ( /obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ dir = 4 @@ -41703,11 +41882,23 @@ /turf/open/floor/plasteel/white, /area/medical/genetics) "bMh" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/plasteel/dark, -/area/science/xenobiology) +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/carpet{ + icon_state = "carpetsymbol" + }, +/area/crew_quarters/heads/captain) "bMi" = ( /obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ @@ -41731,7 +41922,7 @@ "bMm" = ( /obj/structure/table/wood, /obj/machinery/light, -/obj/item/clothing/under/assistantformal{ +/obj/item/clothing/under/misc/assistantformal{ pixel_y = 4 }, /turf/open/floor/carpet{ @@ -41979,10 +42170,14 @@ /turf/open/floor/plasteel/white, /area/medical/virology) "bMK" = ( -/obj/machinery/atmospherics/pipe/simple/violet/visible{ +/obj/structure/lattice, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/violet/hidden{ + icon_state = "pipe11-2"; dir = 5 }, -/obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) "bML" = ( @@ -42100,9 +42295,13 @@ /turf/open/floor/plating, /area/router) "bMX" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/pipe/simple/violet/visible, -/obj/machinery/atmospherics/pipe/simple/supplymain/visible{ +/obj/structure/lattice, +/obj/structure/sign/warning{ + name = "\improper KEEP CLEAR: HIGH SPEED DELIVERIES"; + pixel_y = -32 + }, +/obj/machinery/atmospherics/pipe/simple/violet/hidden{ + icon_state = "pipe11-2"; dir = 4 }, /turf/open/space/basic, @@ -42879,15 +43078,17 @@ /turf/open/floor/plasteel, /area/science/xenobiology) "bOJ" = ( -/obj/structure/table/reinforced, -/obj/structure/window/reinforced{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 9 }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/open/floor/plasteel, -/area/science/xenobiology) +/mob/living/simple_animal/pet/cat/space, +/turf/open/floor/carpet{ + icon_state = "carpetsymbol" + }, +/area/crew_quarters/heads/captain) "bOK" = ( /obj/effect/turf_decal/delivery, /obj/machinery/door/window/northright{ @@ -42897,18 +43098,20 @@ /turf/open/floor/plasteel, /area/science/xenobiology) "bOL" = ( -/obj/structure/table/reinforced, -/obj/structure/window/reinforced{ - dir = 8; - layer = 2.9 +/obj/machinery/computer/card{ + dir = 8 }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/machinery/keycard_auth{ + pixel_x = 8; + pixel_y = -24 }, -/obj/item/clothing/mask/gas, -/obj/item/clothing/glasses/science, -/turf/open/floor/plasteel, -/area/science/xenobiology) +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/carpet{ + icon_state = "carpetsymbol" + }, +/area/crew_quarters/heads/captain) "bOM" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/stripes/line{ @@ -42938,22 +43141,47 @@ /turf/open/floor/plating, /area/science/xenobiology) "bOQ" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/general/visible, -/turf/open/floor/plating, -/area/science/xenobiology) -"bOR" = ( -/obj/machinery/door/window/southright{ - name = "Secure Xenobiological Containment"; - req_one_access_txt = "55" +/obj/structure/cable{ + icon_state = "1-4" }, -/turf/open/floor/engine, -/area/science/xenobiology) +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 5 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/heads/captain) +"bOR" = ( +/obj/structure/table/wood, +/obj/item/pinpointer/nuke, +/obj/item/card/id/captains_spare, +/obj/item/hand_tele, +/obj/item/disk/nuclear, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/heads/captain) "bOS" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/science/xenobiology) +/obj/structure/table/wood, +/obj/machinery/light, +/obj/item/storage/photo_album/Captain, +/obj/item/camera{ + pixel_y = -6 + }, +/obj/item/stamp/captain, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/heads/captain) "bOT" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/on{ dir = 1 @@ -43048,15 +43276,14 @@ /turf/open/floor/engine, /area/science/xenobiology) "bPh" = ( -/obj/machinery/light{ - dir = 1 +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/violet/hidden{ + icon_state = "pipe11-2"; + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden, -/obj/machinery/portable_atmospherics/scrubber, -/turf/open/floor/engine, -/area/engine/secure_construction{ - name = "Engineering Construction Area" - }) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/space/basic, +/area/space/nearstation) "bPi" = ( /obj/structure/chair{ dir = 8 @@ -43070,8 +43297,8 @@ /area/science/xenobiology) "bPk" = ( /obj/structure/table/reinforced, -/obj/item/clothing/under/staffassistant, -/obj/item/clothing/under/staffassistant, +/obj/item/clothing/under/misc/staffassistant, +/obj/item/clothing/under/misc/staffassistant, /obj/item/clothing/suit/apron/surgical, /obj/item/clothing/suit/apron/surgical, /turf/open/floor/engine, @@ -43141,10 +43368,14 @@ /turf/open/floor/plating, /area/maintenance/disposal) "bPr" = ( -/obj/structure/lattice, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/violet/visible{ - dir = 10 +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supplymain/visible, +/obj/machinery/atmospherics/pipe/simple/violet/hidden{ + icon_state = "pipe11-2"; + dir = 4 }, /turf/open/space/basic, /area/space/nearstation) @@ -43329,9 +43560,15 @@ /turf/open/floor/plasteel, /area/engine/atmos) "bPK" = ( -/obj/structure/window/reinforced/spawner/north, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plasteel/dark, +/obj/structure/chair/stool, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/plasteel, /area/ai_monitored/turret_protected/ai) "bPL" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -43445,18 +43682,13 @@ /turf/open/floor/plasteel, /area/quartermaster/qm) "bPX" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering{ - name = "Engineering Foyer"; - req_one_access_txt = "10;24" +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/violet/hidden{ + icon_state = "pipe11-2"; + dir = 9 }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/engine/break_room) +/turf/open/space/basic, +/area/space/nearstation) "bPY" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/orange/hidden, @@ -43502,7 +43734,8 @@ dir = 1; name = "AI Chamber turret control"; pixel_x = 5; - pixel_y = 24 + pixel_y = 24; + req_access_txt = "65" }, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ dir = 6 @@ -44084,11 +44317,9 @@ /turf/open/floor/carpet/blue, /area/crew_quarters/heads/captain) "bRc" = ( +/obj/machinery/suit_storage_unit/captain, /obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 5 + icon_state = "4-8" }, /turf/open/floor/plasteel/dark, /area/crew_quarters/heads/captain) @@ -44187,36 +44418,26 @@ /turf/open/floor/plasteel/white, /area/science/mixing) "bRn" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering{ - name = "Engineering Foyer"; - req_one_access_txt = "10;24" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/structure/lattice/catwalk, /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/engine/break_room) -"bRo" = ( -/obj/structure/lattice, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/violet/visible{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/supplymain/visible, +/obj/machinery/atmospherics/pipe/simple/violet/hidden{ + icon_state = "pipe11-2"; + dir = 8 }, /turf/open/space/basic, /area/space/nearstation) +"bRo" = ( +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/violet/hidden, +/turf/open/space/basic, +/area/space/nearstation) "bRp" = ( -/obj/structure/lattice/catwalk, -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/violet/hidden{ + icon_state = "pipe11-2"; + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/violet/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supplymain/visible, /turf/open/space/basic, /area/space/nearstation) "bRq" = ( @@ -44325,20 +44546,14 @@ /turf/open/floor/plasteel, /area/quartermaster/miningoffice) "bRA" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering/glass{ - name = "Engineering Access"; - req_one_access_txt = "10;24" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ +/obj/machinery/light{ dir = 1 }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/engine/break_room) +/obj/machinery/atmospherics/pipe/simple/supplymain/hidden, +/turf/open/floor/engine, +/area/engine/secure_construction{ + name = "Engineering Construction Area" + }) "bRB" = ( /obj/item/radio/intercom{ name = "Station Intercom (Common)"; @@ -44356,14 +44571,20 @@ /turf/open/floor/plasteel, /area/engine/atmos) "bRD" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/drinkingglass{ + pixel_x = -6; + pixel_y = 2 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass{ + pixel_x = 6; + pixel_y = 3 + }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, -/turf/open/floor/plating/airless, -/area/space/nearstation) +/turf/open/floor/plasteel/dark, +/area/bridge) "bRE" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -45375,17 +45596,13 @@ /turf/open/floor/engine/plasma, /area/engine/atmos) "bTJ" = ( -/obj/effect/turf_decal/stripes/line{ +/obj/structure/lattice, +/obj/machinery/atmospherics/pipe/simple/violet/hidden{ + icon_state = "pipe11-2"; dir = 8 }, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 23 - }, -/turf/open/floor/plasteel, -/area/engine/secure_construction{ - name = "Engineering Construction Area" - }) +/turf/open/space/basic, +/area/space/nearstation) "bTK" = ( /turf/open/floor/engine/co2, /area/engine/atmos) @@ -45704,15 +45921,15 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "bUt" = ( -/obj/structure/grille, -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/light{ + dir = 4; + light_color = "#e8eaff" }, -/turf/open/floor/plating, -/area/science/server{ - name = "Computer Core" - }) +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plasteel/dark/side{ + dir = 4 + }, +/area/hallway/primary/central) "bUu" = ( /obj/structure/grille, /obj/structure/disposalpipe/segment{ @@ -45972,23 +46189,19 @@ /turf/open/floor/plasteel, /area/quartermaster/warehouse) "bUS" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/photocopier, -/obj/structure/disposalpipe/segment{ +/obj/structure/closet/secure_closet/quartermaster, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown{ dir = 4 }, -/obj/machinery/requests_console{ - department = "Cargo Bay"; - departmentType = 2; - name = "Cargo RC"; - pixel_y = 30 - }, -/obj/machinery/camera{ - c_tag = "Supply - Delivery Office Aft"; - network = list("ss13","rd") - }, +/obj/effect/turf_decal/tile/brown, +/obj/item/clothing/suit/space/eva, +/obj/item/clothing/head/helmet/space/eva, +/obj/item/paper/fluff/cogstation/letter_qm, /turf/open/floor/plasteel, -/area/quartermaster/sorting) +/area/quartermaster/qm) "bUT" = ( /obj/effect/turf_decal/delivery, /obj/machinery/light{ @@ -46009,13 +46222,14 @@ /turf/open/floor/plasteel, /area/ai_monitored/turret_protected/ai_upload_foyer) "bUV" = ( -/obj/effect/turf_decal/stripes/white/full, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 +/obj/structure/lattice, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/violet/hidden{ + icon_state = "pipe11-2"; + dir = 10 }, -/turf/open/floor/plasteel, -/area/engine/atmos) +/turf/open/space/basic, +/area/space/nearstation) "bUW" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 @@ -46032,12 +46246,13 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "bUX" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/obj/structure/disposalpipe/segment{ - dir = 10 +/obj/structure/transit_tube/station/reverse/flipped{ + dir = 1 }, -/turf/open/floor/plasteel, -/area/engine/atmos) +/turf/open/floor/engine, +/area/engine/secure_construction{ + name = "Engineering Construction Area" + }) "bUY" = ( /obj/structure/cable{ icon_state = "1-2" @@ -46068,21 +46283,15 @@ /turf/open/floor/plasteel, /area/router) "bVb" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering/glass{ - name = "Engineering Access"; - req_one_access_txt = "10;24" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/effect/turf_decal/stripes/line, +/obj/structure/transit_tube/horizontal, /turf/open/floor/plasteel, -/area/engine/break_room) +/area/engine/secure_construction{ + name = "Engineering Construction Area" + }) "bVc" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -46157,17 +46366,12 @@ /turf/open/floor/plasteel, /area/maintenance/department/chapel) "bVj" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/obj/machinery/conveyor/auto{ + id = "disposal" }, -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/quartermaster/office) +/turf/open/floor/plating, +/area/maintenance/disposal) "bVk" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ @@ -46477,9 +46681,13 @@ name = "Research Sector" }) "bVN" = ( -/obj/structure/closet/l3closet/scientist, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/heads/hor) +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/crew_quarters/heads/captain) "bVO" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -47522,30 +47730,15 @@ /turf/open/floor/plasteel, /area/hydroponics) "bXI" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/machinery/computer/security{ - dir = 8 +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-4" }, /obj/structure/cable{ icon_state = "0-8" }, -/obj/machinery/power/apc{ - areastring = "/area/security/checkpoint/supply"; - dir = 4; - name = "Cargo Security Checkpoint APC"; - pixel_x = 24 - }, -/turf/open/floor/plasteel, -/area/security/checkpoint/supply) +/turf/open/floor/plating, +/area/crew_quarters/heads/captain) "bXJ" = ( /obj/structure/chair{ dir = 8 @@ -47769,15 +47962,13 @@ /turf/open/floor/plating, /area/router) "bYg" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-8" +/obj/machinery/door/poddoor{ + id = "toxinsdriver"; + name = "toxins launcher bay door" }, +/obj/structure/fans/tiny, /turf/open/floor/plating, -/area/maintenance/starboard/aft) +/area/science/mixing) "bYh" = ( /obj/structure/cable{ icon_state = "1-8" @@ -48328,10 +48519,11 @@ /turf/open/floor/plating, /area/quartermaster/warehouse) "bZe" = ( -/obj/effect/spawner/structure/window/reinforced, +/obj/structure/grille, /obj/structure/disposalpipe/segment, +/obj/structure/cable, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "0-2" }, /turf/open/floor/plating, /area/science/server{ @@ -48748,17 +48940,11 @@ /turf/open/floor/plasteel/white, /area/science/mixing) "caf" = ( +/obj/structure/lattice, /obj/structure/disposalpipe/segment, -/obj/structure/lattice/catwalk, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supplymain/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/violet/hidden{ + icon_state = "pipe11-2"; + dir = 5 }, /turf/open/space/basic, /area/space/nearstation) @@ -49168,15 +49354,16 @@ /turf/open/floor/plating, /area/science/storage) "cbi" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-4" }, /obj/structure/cable{ - icon_state = "2-4" + icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plasteel/white, -/area/science/xenobiology) +/obj/structure/cable, +/turf/open/floor/plating, +/area/crew_quarters/heads/captain) "cbj" = ( /obj/structure/cable{ icon_state = "1-8" @@ -49237,12 +49424,13 @@ /turf/open/floor/plasteel, /area/science/xenobiology) "cbp" = ( +/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "0-8" }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plasteel/white, -/area/science/xenobiology) +/obj/structure/cable, +/turf/open/floor/plating, +/area/crew_quarters/heads/captain) "cbq" = ( /obj/structure/table/reinforced, /obj/item/clipboard, @@ -49304,20 +49492,12 @@ /turf/open/floor/engine, /area/science/explab) "cbA" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/caution/stand_clear{ - dir = 1 - }, +/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plasteel, -/area/science/xenobiology) +/turf/open/floor/plating, +/area/ai_monitored/storage/eva) "cbB" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -49361,21 +49541,16 @@ /turf/open/space/basic, /area/space/nearstation) "cbH" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/structure/cable{ + icon_state = "0-4" }, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "0-2" }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plasteel/dark, -/area/science/xenobiology) +/turf/open/floor/plating, +/area/ai_monitored/storage/eva) "cbI" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -50097,11 +50272,16 @@ /turf/open/floor/plasteel, /area/quartermaster/warehouse) "cda" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 +/obj/structure/table, +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, -/obj/effect/landmark/event_spawn, -/turf/open/floor/plasteel/dark/corner, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high/plus, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "cdb" = ( /obj/structure/disposalpipe/trunk{ @@ -50202,13 +50382,20 @@ /turf/open/floor/plasteel, /area/engine/break_room) "cdm" = ( -/obj/structure/closet/secure_closet/CMO, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/photocopier, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 5 + }, +/obj/effect/turf_decal/tile/red{ dir = 1 }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/heads/cmo) +/obj/item/paper/guides/cogstation/disposals, +/turf/open/floor/plasteel, +/area/engine/break_room) "cdn" = ( /obj/structure/cable{ icon_state = "1-4" @@ -50233,10 +50420,14 @@ /turf/open/floor/plating/airless, /area/space/nearstation) "cdp" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/violet/visible, -/obj/machinery/atmospherics/pipe/simple/supplymain/visible{ - dir = 4 +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supplymain/visible, +/obj/machinery/atmospherics/pipe/simple/violet/hidden{ + icon_state = "pipe11-2"; + dir = 8 }, /turf/open/space/basic, /area/space/nearstation) @@ -50572,14 +50763,24 @@ /turf/closed/wall/r_wall, /area/medical/medbay/lobby) "cea" = ( -/obj/machinery/computer/cloning, -/obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/segment, -/obj/item/paper/guides/jobs/medical/cloning{ - pixel_x = -4 +/obj/effect/turf_decal/delivery, +/obj/machinery/photocopier, +/obj/structure/disposalpipe/segment{ + dir = 4 }, +/obj/machinery/requests_console{ + department = "Cargo Bay"; + departmentType = 2; + name = "Cargo RC"; + pixel_y = 30 + }, +/obj/machinery/camera{ + c_tag = "Supply - Delivery Office Aft"; + network = list("ss13","rd") + }, +/obj/item/paper/guides/cogstation/disposals, /turf/open/floor/plasteel, -/area/medical/medbay/central) +/area/quartermaster/sorting) "ceb" = ( /obj/structure/table, /obj/effect/turf_decal/stripes/line, @@ -51327,10 +51528,18 @@ name = "Engineering Construction Area" }) "cfx" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible, -/obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 23 + }, +/obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/plasteel, -/area/engine/atmos) +/area/engine/secure_construction{ + name = "Engineering Construction Area" + }) "cfy" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -51815,18 +52024,10 @@ /turf/open/floor/plasteel, /area/quartermaster/warehouse) "cgt" = ( -/obj/effect/landmark/start/cargo_technician, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-8" - }, +/obj/structure/rack, +/obj/item/caution, +/obj/item/caution, /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ - dir = 4 - }, /turf/open/floor/plasteel, /area/quartermaster/warehouse) "cgu" = ( @@ -52674,13 +52875,23 @@ /turf/open/floor/plating, /area/maintenance/disposal) "cij" = ( -/obj/structure/disposalpipe/trunk{ - dir = 1 +/obj/structure/table/reinforced, +/obj/item/paper_bin, +/obj/item/pen, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/disposaloutlet, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating, -/area/maintenance/disposal) +/obj/effect/turf_decal/delivery, +/obj/machinery/door/window/westleft{ + name = "Science Desk"; + req_access_txt = "0"; + req_one_access_txt = "29;47" + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/science/lab) "cik" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -52827,17 +53038,10 @@ /turf/open/floor/plating/airless, /area/maintenance/port/fore) "ciC" = ( -/obj/structure/closet/secure_closet/hos, -/obj/machinery/light_switch{ - pixel_y = 24 - }, -/obj/machinery/light{ - dir = 4; - light_color = "#e8eaff" - }, -/obj/item/storage/box/deputy, -/turf/open/floor/plasteel/grimy, -/area/crew_quarters/heads/hos) +/obj/structure/table, +/obj/item/paper/pamphlet/gateway, +/turf/open/floor/plasteel/white, +/area/gateway) "ciD" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -52848,26 +53052,13 @@ /turf/open/floor/plasteel/dark, /area/engine/teg_cold) "ciE" = ( -/obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/structure/table, -/obj/machinery/recharger, -/obj/machinery/requests_console{ - department = "Security"; - departmentType = 5; - name = "Security RC"; - pixel_x = 32 - }, +/obj/effect/turf_decal/tile/red, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/open/floor/plasteel, -/area/security/checkpoint/supply) +/area/quartermaster/office) "ciF" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -53087,15 +53278,13 @@ /turf/open/floor/plasteel, /area/quartermaster/warehouse) "cjb" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ - dir = 9 +/obj/structure/cable{ + icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/effect/landmark/start/shaft_miner, /turf/open/floor/plasteel, -/area/quartermaster/warehouse) +/area/quartermaster/miningoffice) "cjc" = ( /obj/structure/fans/tiny, /obj/structure/plasticflaps, @@ -53196,15 +53385,16 @@ /turf/closed/wall/rust, /area/maintenance/port/central) "cjr" = ( -/obj/structure/table, -/obj/machinery/airalarm{ - pixel_y = 24 +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "0-2" }, -/obj/item/hand_labeler, -/obj/item/reagent_containers/glass/bottle/formaldehyde, -/obj/item/paper/guides/jobs/medical/morgue, -/turf/open/floor/plasteel/showroomfloor, -/area/medical/morgue) +/obj/structure/cable, +/turf/open/floor/plating, +/area/science/server{ + name = "Computer Core" + }) "cjs" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 @@ -53344,13 +53534,11 @@ /turf/open/space/basic, /area/space/nearstation) "cjG" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/structure/window/reinforced/spawner, /turf/open/floor/plasteel, -/area/science/xenobiology) +/area/ai_monitored/storage/eva) "cjH" = ( /obj/structure/lattice, /obj/structure/sign/warning/electricshock{ @@ -53581,13 +53769,12 @@ /turf/open/floor/plasteel, /area/crew_quarters/heads/chief) "cjZ" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/item/beacon, +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/structure/window/reinforced/spawner/north, /turf/open/floor/plasteel, -/area/science/xenobiology) +/area/ai_monitored/storage/eva) "cka" = ( /obj/item/beacon, /obj/structure/cable{ @@ -53651,22 +53838,15 @@ name = "Research Sector" }) "ckg" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/machinery/light{ - dir = 8; - light_color = "#e8eaff" +/obj/effect/turf_decal/tile/yellow{ + dir = 4 }, +/obj/effect/landmark/event_spawn, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plasteel/dark, -/area/science/xenobiology) +/turf/open/floor/plasteel/dark/corner, +/area/ai_monitored/storage/eva) "ckh" = ( /obj/machinery/light_switch{ pixel_x = -24 @@ -53971,7 +54151,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/purple, -/obj/item/clothing/under/rank/miner, +/obj/item/clothing/under/rank/cargo/miner, /turf/open/floor/plasteel, /area/quartermaster/miningoffice) "ckL" = ( @@ -53983,7 +54163,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/purple, -/obj/item/clothing/under/rank/miner, +/obj/item/clothing/under/rank/cargo/miner, /turf/open/floor/plasteel, /area/quartermaster/miningoffice) "ckM" = ( @@ -53995,7 +54175,7 @@ dir = 8 }, /obj/effect/turf_decal/tile/purple, -/obj/item/clothing/under/rank/miner, +/obj/item/clothing/under/rank/cargo/miner, /turf/open/floor/plasteel, /area/quartermaster/miningoffice) "ckN" = ( @@ -54116,26 +54296,25 @@ /turf/open/floor/plasteel/dark, /area/science/xenobiology) "ckY" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 1 +/obj/effect/turf_decal/tile/yellow{ + dir = 4 }, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/tile/yellow{ dir = 8 }, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/manifold/orange/hidden{ - dir = 8 +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/open/floor/plasteel/dark, -/area/science/xenobiology) +/turf/open/floor/plasteel/checker, +/area/ai_monitored/storage/eva) "ckZ" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/open/floor/plasteel/dark, -/area/science/xenobiology) +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/ai_monitored/storage/eva) "cla" = ( /obj/structure/cable{ icon_state = "4-8" @@ -54975,12 +55154,26 @@ /turf/open/floor/plasteel, /area/medical/chemistry) "cmT" = ( -/obj/machinery/door/poddoor{ - id = "toxinsdriver"; - name = "toxins launcher bay door" +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 }, -/turf/open/floor/plating, -/area/science/mixing) +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/item/folder/red, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/machinery/door/window/northright{ + name = "Security Checkpoint"; + req_access_txt = "1" + }, +/turf/open/floor/plasteel, +/area/security/checkpoint/supply) "cmU" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -55181,12 +55374,12 @@ /turf/open/floor/plasteel/dark, /area/science/xenobiology) "cnm" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-2" }, -/turf/open/floor/plasteel/grimy, -/area/security/detectives_office) +/turf/open/floor/plating, +/area/gateway) "cnn" = ( /obj/structure/cable{ icon_state = "2-4" @@ -55331,10 +55524,10 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/chair{ + dir = 4 }, -/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/open/floor/plasteel, /area/security/checkpoint/supply) "cnC" = ( @@ -56486,19 +56679,14 @@ /turf/open/floor/plasteel, /area/engine/teg_hot) "cpM" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/turretid{ - control_area = "area/science/server"; - icon_state = "control_stun"; - name = "Computer Core turret control"; - pixel_x = -3; - pixel_y = -23 +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/effect/turf_decal/bot, +/obj/machinery/light{ + dir = 1; + light_color = "#e8eaff" }, /turf/open/floor/plasteel, -/area/ai_monitored/turret_protected/ai_upload_foyer) +/area/engine/atmos) "cpN" = ( /obj/structure/closet/secure_closet/atmospherics, /obj/item/cartridge/atmos, @@ -56947,24 +57135,16 @@ /turf/open/floor/plasteel, /area/engine/teg_cold) "cqB" = ( -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/bottle/absinthe, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, -/obj/effect/turf_decal/tile/red{ - dir = 4 +/obj/structure/cable{ + icon_state = "2-4" }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/machinery/computer/secure_data{ - dir = 8 - }, -/obj/machinery/newscaster/security_unit{ - pixel_x = 30 - }, -/turf/open/floor/plasteel, -/area/security/checkpoint/supply) +/turf/open/floor/plasteel/dark, +/area/crew_quarters/heads/hor) "cqC" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel, @@ -57777,7 +57957,11 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/machinery/holopad, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/open/floor/plasteel, /area/security/checkpoint/supply) "csi" = ( @@ -57804,15 +57988,15 @@ /turf/open/floor/plasteel, /area/science/explab) "csl" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 }, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "0-8" }, -/obj/machinery/holopad, -/turf/open/floor/plasteel/white, -/area/science/xenobiology) +/turf/open/floor/plating, +/area/crew_quarters/heads/hor) "csm" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -57918,37 +58102,33 @@ /turf/open/floor/plasteel, /area/engine/teg_cold) "csu" = ( -/obj/structure/table, -/obj/machinery/computer/med_data/laptop, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/effect/turf_decal/tile/yellow{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/requests_console{ - announcementConsole = 1; - department = "Chief Medical Officer's Desk"; - departmentType = 5; - name = "Chief Medical Officer RC"; - pixel_y = 32 +/turf/open/floor/plasteel/dark/side{ + dir = 8 }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/heads/cmo) +/area/gateway) "csv" = ( -/obj/machinery/computer/card/minor/cmo{ - dir = 1 +/obj/structure/table, +/obj/effect/turf_decal/tile/brown{ + dir = 8 }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/effect/turf_decal/tile/brown, +/obj/item/storage/toolbox/mechanical, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/machinery/keycard_auth{ - pixel_x = -24 - }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/heads/cmo) +/obj/item/paper/guides/cogstation/letter_supp, +/turf/open/floor/plasteel, +/area/quartermaster/sorting) "csw" = ( /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ @@ -57960,19 +58140,17 @@ /turf/open/floor/plasteel, /area/security/main) "csx" = ( -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 +/obj/structure/closet/secure_closet/RD, +/obj/machinery/light{ + dir = 4; + light_color = "#c1caff" }, -/obj/machinery/photocopier, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 5 +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/turf/open/floor/plasteel, -/area/engine/break_room) +/obj/item/paper/fluff/cogstation/letter_rd, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/heads/hor) "csy" = ( /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 @@ -58325,17 +58503,22 @@ /turf/open/floor/plasteel, /area/quartermaster/sorting) "ctn" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/brown, -/obj/item/storage/toolbox/mechanical, -/obj/structure/disposalpipe/segment{ +/obj/structure/closet/secure_closet/engineering_chief, +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/airalarm{ + dir = 1; + locked = 0; + pixel_y = -22 + }, +/obj/item/paper/guides/cogstation/letter_chief, /turf/open/floor/plasteel, -/area/quartermaster/sorting) +/area/crew_quarters/heads/chief) "cto" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/tile/brown, @@ -58388,14 +58571,20 @@ /area/quartermaster/sorting) "ctu" = ( /obj/structure/table, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/purple{ +/obj/effect/turf_decal/bot, +/obj/machinery/camera{ + c_tag = "Supply - Cargo Office"; dir = 1 }, +/obj/machinery/newscaster{ + pixel_y = -28 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/item/storage/box/disks, /turf/open/floor/plasteel, -/area/quartermaster/miningoffice) +/area/quartermaster/office) "ctv" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/tile/brown, @@ -59209,7 +59398,9 @@ /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, -/obj/effect/landmark/event_spawn, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/white, /area/gateway) "cuR" = ( @@ -59732,13 +59923,15 @@ /turf/open/floor/plasteel, /area/hallway/primary/aft) "cvM" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/drinks/bottle/absinthe, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/heads/hor) +/obj/effect/landmark/event_spawn, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/white, +/area/gateway) "cvN" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -60186,20 +60379,13 @@ /turf/closed/wall/r_wall, /area/engine/atmos) "cwx" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/structure/transit_tube/station/reverse/flipped{ - dir = 1 - }, -/obj/structure/transit_tube_pod{ - dir = 8 +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 }, +/obj/effect/turf_decal/stripes/white/full, /turf/open/floor/plasteel, -/area/engine/secure_construction{ - name = "Engineering Construction Area" - }) +/area/engine/atmos) "cwy" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/transit_tube/horizontal, @@ -60238,24 +60424,19 @@ /turf/open/floor/plasteel, /area/engine/workshop) "cwF" = ( -/obj/structure/lattice, -/obj/structure/transit_tube/curved{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/turf/open/space/basic, -/area/space/nearstation) +/turf/open/floor/plasteel, +/area/engine/atmos) "cwG" = ( -/obj/structure/lattice, -/obj/structure/disposalpipe/segment, -/obj/structure/transit_tube/horizontal, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/effect/landmark/event_spawn, +/obj/structure/disposalpipe/segment{ + dir = 10 }, -/turf/open/space/basic, -/area/space/nearstation) +/turf/open/floor/plasteel, +/area/engine/atmos) "cwH" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden, /turf/closed/wall, @@ -60283,6 +60464,9 @@ dir = 4 }, /obj/structure/transit_tube/station/reverse/flipped, +/obj/structure/transit_tube_pod{ + dir = 8 + }, /turf/open/floor/plasteel, /area/engine/atmos) "cwN" = ( @@ -60828,19 +61012,15 @@ /area/quartermaster/miningoffice) "cxT" = ( /obj/structure/table, -/obj/effect/turf_decal/bot, -/obj/machinery/camera{ - c_tag = "Supply - Cargo Office"; +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ dir = 1 }, -/obj/machinery/newscaster{ - pixel_y = -28 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, +/obj/item/paper/guides/cogstation/letter_supp, /turf/open/floor/plasteel, -/area/quartermaster/office) +/area/quartermaster/miningoffice) "cxU" = ( /obj/effect/turf_decal/tile/brown{ dir = 4 @@ -60881,10 +61061,15 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "cxZ" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/turf_decal/delivery, +/obj/machinery/button/door{ + id = "MiningConveyorBlastDoor"; + name = "Mining Conveyor Access"; + pixel_x = 8; + pixel_y = -24; + req_access_txt = "0"; + req_one_access_txt = "10;24;48" }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/open/floor/plasteel, /area/quartermaster/miningoffice) "cya" = ( @@ -61497,19 +61682,19 @@ /turf/open/floor/plasteel, /area/hallway/secondary/exit) "czf" = ( -/obj/structure/chair/office/light{ +/obj/effect/turf_decal/tile/yellow{ dir = 4 }, -/obj/effect/turf_decal/tile/blue, -/obj/effect/turf_decal/tile/blue{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 }, -/obj/effect/landmark/start/chief_medical_officer, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark/side{ dir = 4 }, -/turf/open/floor/plasteel/white, -/area/crew_quarters/heads/cmo) +/area/gateway) "czg" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -61708,26 +61893,32 @@ /turf/open/floor/plasteel, /area/hallway/secondary/exit) "czz" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue, /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command/glass{ - name = "CMO's Office"; - req_access_txt = "40" + name = "Gateway Chamber"; + req_access_txt = "62" + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/engine, +/area/gateway) +"czA" = ( +/obj/machinery/modular_computer/console/preset/research{ + dir = 8 + }, +/obj/item/reagent_containers/food/drinks/coffee, +/obj/structure/cable{ + icon_state = "2-4" }, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plasteel/white, -/area/crew_quarters/heads/cmo) -"czA" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plating, -/area/crew_quarters/heads/cmo) +/turf/open/floor/plasteel/dark, +/area/crew_quarters/heads/hor) "czB" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance{ @@ -62159,9 +62350,23 @@ /turf/open/floor/plating, /area/maintenance/disposal) "cAo" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/door/window/northright{ + name = "Medbay Desk"; + req_access_txt = "5" + }, +/obj/item/clipboard, +/obj/item/clothing/glasses/hud/health, /obj/machinery/atmospherics/pipe/simple/orange/hidden, -/turf/open/floor/plasteel, -/area/janitor) +/obj/item/paper/fluff/cogstation/sleepers, +/obj/item/pen, +/obj/item/clothing/glasses/hud/health, +/turf/open/floor/plasteel/white, +/area/medical/medbay/lobby) "cAp" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ @@ -62480,16 +62685,12 @@ /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "cAQ" = ( -/obj/structure/closet/crate/trashcart, -/obj/machinery/light/small{ - dir = 4 +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-8" }, -/obj/structure/disposalpipe/junction, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 10 - }, -/turf/open/floor/plasteel/grimy, -/area/security/detectives_office) +/turf/open/floor/plating, +/area/crew_quarters/heads/hor) "cAR" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 @@ -62499,13 +62700,20 @@ }, /area/chapel/office) "cAS" = ( -/obj/structure/table/wood, -/obj/item/storage/box/evidence, -/obj/item/hand_labeler, -/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plasteel/grimy, -/area/security/detectives_office) +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/dark/side{ + dir = 8 + }, +/area/gateway) "cAT" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden, @@ -62778,15 +62986,12 @@ name = "Aft Air Hookup" }) "cBt" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Security Office"; - req_access_txt = "63" +/obj/structure/closet/l3closet/scientist, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/plasteel, -/area/security/main) +/turf/open/floor/plasteel/dark, +/area/crew_quarters/heads/hor) "cBu" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -63668,11 +63873,19 @@ /turf/open/floor/plasteel/stairs/left, /area/hallway/primary/central) "cCO" = ( -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ - dir = 4 +/obj/structure/table, +/obj/machinery/airalarm{ + pixel_y = 24 }, -/turf/open/floor/plasteel, -/area/security/main) +/obj/item/hand_labeler, +/obj/item/reagent_containers/glass/bottle/formaldehyde, +/obj/item/paper/guides/jobs/medical/morgue, +/obj/item/paper/guides/cogstation/cdn_med{ + pixel_x = -6; + pixel_y = 1 + }, +/turf/open/floor/plasteel/showroomfloor, +/area/medical/morgue) "cCP" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -63832,21 +64045,19 @@ /turf/open/floor/plating, /area/quartermaster/sorting) "cDh" = ( -/obj/structure/closet/secure_closet/engineering_chief, -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 +/obj/machinery/computer/card/minor/cmo{ + dir = 1 }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, -/obj/machinery/airalarm{ - dir = 1; - locked = 0; - pixel_y = -22 +/obj/machinery/keycard_auth{ + pixel_x = -24 }, -/turf/open/floor/plasteel, -/area/crew_quarters/heads/chief) +/obj/item/paper/guides/cogstation/letter_cmo, +/turf/open/floor/plasteel/white, +/area/crew_quarters/heads/cmo) "cDi" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -63861,11 +64072,18 @@ /turf/open/floor/plasteel, /area/storage/primary) "cDj" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/carpet{ + icon_state = "carpetsymbol" }, -/turf/open/floor/plating, /area/crew_quarters/heads/hor) "cDk" = ( /obj/machinery/door/firedoor, @@ -63996,9 +64214,21 @@ /turf/closed/wall/r_wall, /area/crew_quarters/heads/captain) "cDv" = ( -/obj/machinery/vending/wardrobe/cap_wardrobe, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/captain) +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -26 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/heads/hor) "cDw" = ( /obj/structure/cable{ icon_state = "1-2" @@ -64019,35 +64249,39 @@ /turf/open/floor/carpet/blue, /area/crew_quarters/heads/captain) "cDy" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/crew_quarters/heads/hor) +"cDz" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/security/checkpoint/supply) +"cDA" = ( +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/computer/secure_data{ + dir = 8 + }, +/obj/machinery/newscaster/security_unit{ + pixel_x = 30 + }, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ - dir = 8 - }, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, -/area/crew_quarters/heads/captain) -"cDz" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 - }, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, -/area/crew_quarters/heads/captain) -"cDA" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, -/area/crew_quarters/heads/captain) +/turf/open/floor/plasteel, +/area/security/checkpoint/supply) "cDB" = ( /obj/item/storage/secure/safe{ pixel_x = -24 @@ -64072,49 +64306,64 @@ }, /area/crew_quarters/heads/captain) "cDD" = ( -/obj/structure/bed, -/obj/item/radio/intercom{ - name = "Station Intercom (Common)"; - pixel_y = -28 - }, -/obj/item/bedsheet/captain, -/obj/effect/landmark/start/captain, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, -/area/crew_quarters/heads/captain) -"cDE" = ( -/obj/machinery/atmospherics/pipe/manifold/orange/hidden{ - dir = 1 - }, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, -/area/crew_quarters/heads/captain) -"cDF" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" +/obj/effect/turf_decal/tile/red{ + dir = 4 }, -/area/crew_quarters/heads/captain) +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/computer/security{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/apc{ + areastring = "/area/security/checkpoint/supply"; + dir = 4; + name = "Cargo Security Checkpoint APC"; + pixel_x = 24 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel, +/area/security/checkpoint/supply) +"cDE" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/crew_quarters/heads/cmo) +"cDF" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/crew_quarters/heads/cmo) "cDG" = ( -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 9 +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-4" }, -/mob/living/simple_animal/pet/cat/space, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" +/obj/structure/cable, +/obj/structure/cable{ + icon_state = "0-2" }, -/area/crew_quarters/heads/captain) +/turf/open/floor/plating, +/area/crew_quarters/heads/cmo) "cDH" = ( /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 8 @@ -64128,16 +64377,19 @@ /turf/open/floor/plasteel, /area/gateway) "cDJ" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 4 +/obj/machinery/computer/crew, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 +/obj/structure/cable{ + icon_state = "1-4" }, -/turf/open/floor/plasteel/dark/side{ - dir = 4 +/obj/structure/cable{ + icon_state = "4-8" }, -/area/gateway) +/turf/open/floor/plasteel/white, +/area/crew_quarters/heads/cmo) "cDK" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command/glass{ @@ -64286,29 +64538,35 @@ }, /area/crew_quarters/heads/hor) "cDZ" = ( +/obj/structure/table, +/obj/machinery/computer/med_data/laptop, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/requests_console{ + announcementConsole = 1; + department = "Chief Medical Officer's Desk"; + departmentType = 5; + name = "Chief Medical Officer RC"; + pixel_y = 32 + }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 - }, -/turf/open/floor/carpet{ - icon_state = "carpetsymbol" - }, -/area/crew_quarters/heads/hor) +/turf/open/floor/plasteel/white, +/area/crew_quarters/heads/cmo) "cEa" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -26 - }, +/obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "0-4" }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel/dark, -/area/crew_quarters/heads/hor) +/obj/structure/cable, +/turf/open/floor/plating, +/area/crew_quarters/heads/cmo) "cEb" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ @@ -64726,22 +64984,17 @@ /turf/open/floor/plasteel, /area/science/lab) "cEE" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin, -/obj/item/pen, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/cable{ + icon_state = "0-4" }, -/obj/effect/turf_decal/delivery, -/obj/machinery/door/window/westleft{ - name = "Science Desk"; - req_access_txt = "29;47" +/obj/machinery/power/apc{ + areastring = "/area/maintenance/aft"; + dir = 8; + name = "Aft Maintenance APC"; + pixel_x = -26 }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/science/lab) +/turf/open/floor/plating, +/area/maintenance/aft) "cEF" = ( /obj/effect/turf_decal/tile/purple{ dir = 8 @@ -66706,23 +66959,20 @@ /turf/open/floor/plasteel/white, /area/medical/genetics) "cHV" = ( -/obj/structure/disposalpipe/segment{ - dir = 6 +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 }, -/obj/structure/cable{ - icon_state = "0-4" +/obj/effect/turf_decal/tile/red{ + dir = 4 }, -/obj/machinery/power/apc{ - areastring = "/area/medical/genetics"; - dir = 8; - name = "Genetics Lab APC"; - pixel_x = -24 +/obj/effect/turf_decal/tile/red{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ - dir = 6 - }, -/turf/open/floor/plating, -/area/maintenance/aft) +/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/turf/open/floor/plasteel, +/area/security/checkpoint/supply) "cHW" = ( /obj/machinery/rnd/production/circuit_imprinter, /obj/item/reagent_containers/glass/beaker, @@ -68061,21 +68311,14 @@ /turf/open/floor/plasteel/dark, /area/science/robotics/lab) "cKj" = ( -/obj/structure/table/reinforced, +/obj/structure/closet/secure_closet/CMO, +/obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/turf_decal/tile/blue, -/obj/machinery/door/window/northright{ - name = "Medbay Desk"; - req_access_txt = "5" - }, -/obj/item/clipboard, -/obj/item/pen, -/obj/item/clothing/glasses/hud/health, -/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/item/paper/guides/cogstation/letter_cmo, /turf/open/floor/plasteel/white, -/area/medical/medbay/lobby) +/area/crew_quarters/heads/cmo) "cKk" = ( /obj/structure/chair/office/light{ dir = 1; @@ -68258,20 +68501,22 @@ /turf/open/floor/plasteel/dark, /area/science/xenobiology) "cKC" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/landmark/start/chief_medical_officer, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 }, /obj/structure/cable{ icon_state = "1-8" }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/orange/hidden{ - dir = 9 - }, -/turf/open/floor/plasteel/dark, -/area/science/xenobiology) +/turf/open/floor/plasteel/white, +/area/crew_quarters/heads/cmo) "cKD" = ( /obj/machinery/atmospherics/pipe/manifold/orange/hidden{ dir = 8 @@ -68550,7 +68795,7 @@ dir = 8 }, /obj/structure/closet/secure_closet/engineering_personal, -/obj/item/clothing/under/overalls, +/obj/item/clothing/under/misc/overalls, /turf/open/floor/plasteel, /area/storage/primary) "cLo" = ( @@ -68633,7 +68878,7 @@ "cLz" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/secure_closet/engineering_personal, -/obj/item/clothing/under/overalls, +/obj/item/clothing/under/misc/overalls, /turf/open/floor/plasteel, /area/storage/primary) "cLA" = ( @@ -70405,6 +70650,1037 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +"cPz" = ( +/obj/structure/lattice, +/obj/structure/transit_tube/curved{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/turf/open/space/basic, +/area/space/nearstation) +"cPA" = ( +/obj/structure/lattice, +/obj/structure/disposalpipe/segment, +/obj/structure/transit_tube/horizontal, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/turf/open/space/basic, +/area/space/nearstation) +"cPB" = ( +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/transit_tube/crossing/horizontal, +/obj/machinery/atmospherics/pipe/simple/supplymain/visible, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 8 + }, +/turf/open/space/basic, +/area/space/nearstation) +"cPC" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/transit_tube/horizontal, +/turf/open/floor/plasteel, +/area/engine/atmos) +"cPD" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plasteel, +/area/engine/atmos) +"cPE" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supplymain/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/space/basic, +/area/space/nearstation) +"cPF" = ( +/obj/structure/lattice, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/space/basic, +/area/space/nearstation) +"cPG" = ( +/obj/structure/lattice, +/obj/structure/disposalpipe/segment, +/obj/machinery/camera{ + c_tag = "Supply - Warehouse Exterior"; + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/space/basic, +/area/space/nearstation) +"cPH" = ( +/obj/machinery/conveyor_switch{ + id = "EngiCargoConveyer" + }, +/obj/structure/cable, +/obj/machinery/power/apc{ + areastring = "/area/quartermaster/sorting"; + dir = 8; + name = "Delivery Office APC"; + pixel_x = -26 + }, +/turf/open/floor/plasteel, +/area/quartermaster/sorting) +"cPI" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering{ + name = "Engineering Foyer"; + req_one_access_txt = "10;24" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/engine/break_room) +"cPJ" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering{ + name = "Engineering Foyer"; + req_one_access_txt = "10;24" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/engine/break_room) +"cPK" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering Access"; + req_one_access_txt = "10;24" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/engine/break_room) +"cPL" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering Access"; + req_one_access_txt = "10;24" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/engine/break_room) +"cPM" = ( +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/structure/table, +/obj/machinery/recharger, +/obj/machinery/requests_console{ + department = "Security"; + departmentType = 5; + name = "Security RC"; + pixel_x = 32 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/security/checkpoint/supply) +"cPN" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 5 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"cPO" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 10 + }, +/turf/open/floor/plating, +/area/maintenance/starboard/aft) +"cPP" = ( +/obj/structure/table, +/obj/machinery/light{ + dir = 4; + light_color = "#c1caff" + }, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high/plus{ + pixel_y = 8 + }, +/obj/item/stock_parts/cell/high/plus{ + pixel_y = 8 + }, +/obj/item/assembly/flash/handheld{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/item/assembly/flash/handheld{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/item/assembly/flash/handheld{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/item/assembly/flash/handheld{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/item/assembly/flash/handheld{ + pixel_x = -8; + pixel_y = 4 + }, +/obj/item/assembly/flash/handheld{ + pixel_x = -8; + pixel_y = 4 + }, +/turf/open/floor/plasteel/dark, +/area/science/robotics/lab) +"cPQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/power/apc{ + areastring = "/area/medical/genetics"; + dir = 8; + name = "Genetics Lab APC"; + pixel_x = -26 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden{ + dir = 6 + }, +/turf/open/floor/plating, +/area/maintenance/aft) +"cPR" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/crew_quarters/heads/cmo) +"cPS" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/command/glass{ + name = "CMO's Office"; + req_access_txt = "40" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plasteel/white, +/area/crew_quarters/heads/cmo) +"cPT" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/crew_quarters/heads/cmo) +"cPU" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/plasteel/white, +/area/science/xenobiology) +"cPV" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/holopad, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/plasteel/white, +/area/science/xenobiology) +"cPW" = ( +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/plasteel/white, +/area/science/xenobiology) +"cPX" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/white, +/area/science/xenobiology) +"cPY" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/caution/stand_clear{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/plasteel, +/area/science/xenobiology) +"cPZ" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/caution/stand_clear{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/science/xenobiology) +"cQa" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/science/xenobiology) +"cQb" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) +"cQc" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) +"cQd" = ( +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) +"cQe" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/window/reinforced/spawner, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/button/door{ + id = "xenobio2"; + name = "Containment Blast Doors"; + pixel_y = 4; + req_access_txt = "55" + }, +/turf/open/floor/plasteel, +/area/science/xenobiology) +"cQf" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/science/xenobiology) +"cQg" = ( +/obj/machinery/door/window/westright{ + name = "Containment Pen"; + req_one_access_txt = "55" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio1"; + name = "containment blast door" + }, +/turf/open/floor/engine, +/area/science/xenobiology) +"cQh" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) +"cQi" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) +"cQj" = ( +/obj/machinery/door/window/eastleft{ + name = "Containment Pen"; + req_one_access_txt = "55" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio2"; + name = "containment blast door" + }, +/turf/open/floor/engine, +/area/science/xenobiology) +"cQk" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/science/xenobiology) +"cQl" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/window/reinforced/spawner/north, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/button/door{ + id = "xenobio1"; + name = "Containment Blast Doors"; + pixel_y = 4; + req_access_txt = "55" + }, +/turf/open/floor/plasteel, +/area/science/xenobiology) +"cQm" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) +"cQn" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) +"cQo" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/plating, +/area/science/xenobiology) +"cQp" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) +"cQq" = ( +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) +"cQr" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/window/reinforced/spawner, +/obj/machinery/button/door{ + id = "xenobio4"; + name = "Containment Blast Doors"; + pixel_y = 4; + req_access_txt = "55" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/science/xenobiology) +"cQs" = ( +/obj/machinery/door/window/westright{ + name = "Containment Pen"; + req_one_access_txt = "55" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio3"; + name = "containment blast door" + }, +/turf/open/floor/engine, +/area/science/xenobiology) +"cQt" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) +"cQu" = ( +/obj/machinery/door/window/eastleft{ + name = "Containment Pen"; + req_one_access_txt = "55" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio4"; + name = "containment blast door" + }, +/turf/open/floor/engine, +/area/science/xenobiology) +"cQv" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/window/reinforced/spawner/north, +/obj/machinery/button/door{ + id = "xenobio3"; + name = "Containment Blast Doors"; + pixel_y = 4; + req_access_txt = "55" + }, +/turf/open/floor/plasteel, +/area/science/xenobiology) +"cQw" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/machinery/light{ + dir = 8; + light_color = "#e8eaff" + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) +"cQx" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/window/reinforced/spawner, +/obj/machinery/button/door{ + id = "xenobio6"; + name = "Containment Blast Doors"; + pixel_y = 4; + req_access_txt = "55" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/science/xenobiology) +"cQy" = ( +/obj/machinery/door/window/westright{ + name = "Containment Pen"; + req_one_access_txt = "55" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio5"; + name = "containment blast door" + }, +/turf/open/floor/engine, +/area/science/xenobiology) +"cQz" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/orange/hidden{ + dir = 8 + }, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) +"cQA" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) +"cQB" = ( +/obj/machinery/door/window/eastleft{ + name = "Containment Pen"; + req_one_access_txt = "55" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio6"; + name = "containment blast door" + }, +/turf/open/floor/engine, +/area/science/xenobiology) +"cQC" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/window/reinforced/spawner/north, +/obj/machinery/button/door{ + id = "xenobio5"; + name = "Containment Blast Doors"; + pixel_y = 4; + req_access_txt = "55" + }, +/turf/open/floor/plasteel, +/area/science/xenobiology) +"cQD" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) +"cQE" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) +"cQF" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 9 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) +"cQG" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel/dark, +/area/science/xenobiology) +"cQH" = ( +/obj/structure/table/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/button/door{ + id = "xenobio7"; + name = "Containment Blast Doors"; + pixel_y = 4; + req_access_txt = "55" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/science/xenobiology) +"cQI" = ( +/obj/structure/table/reinforced, +/obj/structure/window/reinforced{ + dir = 8; + layer = 2.9 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/item/clothing/mask/gas, +/obj/item/clothing/glasses/science, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/science/xenobiology) +"cQJ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/science/xenobiology) +"cQK" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/general/visible, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/science/xenobiology) +"cQL" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/science/xenobiology) +"cQM" = ( +/obj/machinery/door/window/southright{ + name = "Secure Xenobiological Containment"; + req_one_access_txt = "55" + }, +/obj/machinery/door/poddoor/preopen{ + id = "xenobio7"; + name = "containment blast door" + }, +/turf/open/floor/engine, +/area/science/xenobiology) +"cQN" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/science/xenobiology) +"cQO" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/science/xenobiology) +"cQP" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/science/xenobiology) +"cQQ" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/bridge) +"cQR" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/dark, +/area/bridge) +"cQS" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/bridge) +"cQT" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/bridge) +"cQU" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/bridge) +"cQV" = ( +/obj/item/twohanded/required/kirbyplants{ + icon_state = "plant-02" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/plasteel/dark, +/area/bridge) +"cQW" = ( +/obj/structure/table/wood, +/obj/item/paper_bin, +/obj/machinery/camera{ + c_tag = "Bridge - Port Quarter"; + dir = 1 + }, +/obj/machinery/keycard_auth{ + pixel_y = -24 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/bridge) +"cQX" = ( +/obj/machinery/photocopier, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/bridge) +"cQY" = ( +/obj/structure/reagent_dispensers/water_cooler, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel/dark, +/area/bridge) +"cQZ" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/dark, +/area/bridge) +"cRa" = ( +/obj/effect/turf_decal/stripes/end{ + dir = 4 + }, +/obj/machinery/conveyor{ + dir = 4; + id = "MiningConveyer" + }, +/obj/machinery/door/poddoor{ + id = "MiningConveyorBlastDoor"; + name = "Asteroid Mining Load Door" + }, +/turf/open/floor/plating/airless, +/area/quartermaster/miningoffice) +"cRb" = ( +/obj/machinery/computer/cloning, +/obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/segment, +/obj/item/paper/guides/jobs/medical/cloning{ + pixel_x = -4 + }, +/obj/item/paper/fluff/cogstation/cloner{ + pixel_x = 6 + }, +/turf/open/floor/plasteel, +/area/medical/medbay/central) +"cRc" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/machinery/door/airlock/research{ + name = "Aft Observatory"; + req_access_txt = "47" + }, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab{ + name = "Research Observatory" + }) +"cRd" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/cyan/hidden, +/obj/machinery/door/airlock/research{ + name = "Aft Observatory"; + req_access_txt = "47" + }, +/turf/open/floor/plasteel/dark, +/area/science/misc_lab{ + name = "Research Observatory" + }) +"cRe" = ( +/obj/machinery/computer/upload/ai{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/ai_monitored/turret_protected/ai) +"cRf" = ( +/obj/structure/window/reinforced/spawner/north, +/obj/machinery/atmospherics/pipe/simple/orange/hidden, +/obj/machinery/flasher{ + id = "ID"; + pixel_x = 24; + pixel_y = 0 + }, +/turf/open/floor/plasteel/dark, +/area/ai_monitored/turret_protected/ai) +"cRg" = ( +/obj/machinery/atmospherics/pipe/simple/supplymain/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible, +/obj/machinery/portable_atmospherics/pump, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/light, +/turf/open/floor/plasteel/white/corner, +/area/engine/atmos) +"cRh" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/turretid{ + control_area = "area/science/server"; + icon_state = "control_stun"; + name = "Computer Core turret control"; + pixel_x = -3; + pixel_y = -23; + req_access_txt = "65" + }, +/turf/open/floor/plasteel, +/area/ai_monitored/turret_protected/ai_upload_foyer) "cVq" = ( /obj/machinery/atmospherics/pipe/simple/orange/visible{ dir = 4 @@ -70697,16 +71973,6 @@ /obj/machinery/atmospherics/pipe/simple/violet/visible, /turf/open/space/basic, /area/space) -"kxL" = ( -/obj/structure/lattice, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/violet/visible{ - dir = 4 - }, -/turf/open/space/basic, -/area/space/nearstation) "kzb" = ( /obj/machinery/atmospherics/pipe/manifold/orange/hidden{ dir = 4 @@ -70881,17 +72147,6 @@ /obj/machinery/atmospherics/pipe/simple/supplymain/visible, /turf/open/space/basic, /area/space/nearstation) -"qnM" = ( -/obj/structure/lattice, -/obj/structure/sign/warning{ - name = "\improper KEEP CLEAR: HIGH SPEED DELIVERIES"; - pixel_y = -32 - }, -/obj/machinery/atmospherics/pipe/simple/violet/visible{ - dir = 4 - }, -/turf/open/space/basic, -/area/space/nearstation) "qvB" = ( /obj/machinery/atmospherics/components/unary/thermomachine/heater{ dir = 8 @@ -70911,14 +72166,6 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) -"rbJ" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/violet/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/space/basic, -/area/space/nearstation) "rdF" = ( /obj/machinery/atmospherics/pipe/simple/dark/visible{ dir = 6 @@ -71123,13 +72370,6 @@ /obj/item/pen, /turf/open/floor/plasteel, /area/engine/atmos) -"xqa" = ( -/obj/structure/lattice, -/obj/machinery/atmospherics/pipe/simple/violet/visible{ - dir = 5 - }, -/turf/open/space/basic, -/area/space/nearstation) "xCy" = ( /obj/machinery/atmospherics/components/binary/pump, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ @@ -84607,7 +85847,7 @@ aaU aaa aaU aEa -aTH +aHE bab aaa aaa @@ -84864,7 +86104,7 @@ aaU aaU aaU aEb -bRD +aPT aaU aaU aye @@ -85121,7 +86361,7 @@ aaU aaa aaU aEa -bRD +aPT aaU aaa aaa @@ -85378,7 +86618,7 @@ aaa aaa aaU aEa -bRD +aPT aaU aaa aaa @@ -85635,7 +86875,7 @@ aaa aaa aaU aEa -bRD +aPT aaU aaa aaa @@ -85892,7 +87132,7 @@ aaa aaa aaU aEa -bRD +aPT aaU aaa aaa @@ -86149,7 +87389,7 @@ aaa aaa aaU aEa -bRD +aPT aaU aaa aaa @@ -86406,7 +87646,7 @@ aaa aaa aaU aEa -bRD +aPT aaU aaa aaa @@ -86663,7 +87903,7 @@ aaa aaa aaU aEa -bRD +aPT aaU aaa aaa @@ -86920,7 +88160,7 @@ aaa aaa aaU aEb -bRD +aPT aaU aaa aaa @@ -87177,7 +88417,7 @@ aaa aaa aaU aEa -bRD +aPT aaU aaa aaa @@ -87434,7 +88674,7 @@ aaa aaa aaU aEa -bRD +aPT aaU aaa aaa @@ -87691,7 +88931,7 @@ aaa aaa aaU aEa -bRD +aPT aaU aaa aaa @@ -87948,7 +89188,7 @@ aaa aaa aaU aEa -bRD +aPT aaU aaa aaa @@ -88205,7 +89445,7 @@ aaa aaa aaU aEa -bRD +aPT aaU aaa aaa @@ -88462,19 +89702,19 @@ aaa aaa aaU aEa -bRD +aPT aaU aaU aaa aaU -aGn -aGn -aGn -aGn -aGn -aGn -aGn -aGn +aPV +bik +bik +bik +bik +bik +bik +cQT aaU aaa aaU @@ -88547,22 +89787,22 @@ bFt bJs bJV bxT -bKG -bLe -bFl +cQa +cQg +cQk bxT -bKG -bLe -bFl +cQa +cQs +cQk bxT -bKG -bLe -bFl +cQa +cQy +cQk bxT cvz cKA bOH -bFl +cQJ bxT bKM bKM @@ -88719,21 +89959,21 @@ aaU aaU aaU aEa -bRD +aPT aaU aaU -aGn -aGn -aGn +aPV +bik +cQS aIA aJe aLE aLy aMQ aNF -aGn -aGn -aGn +cQU +bik +cQT aaU aaa aaa @@ -88806,20 +90046,20 @@ bJW bxT cbo bLf -cjZ +cQl bxT cbo bLf -cjZ +cQv bxT cbo bLf -cjZ +cQC bxT ctT cKB bOI -bOQ +cQK bOT bKM bKM @@ -88976,10 +90216,10 @@ abh abh abh aEb -bRD +aPT aaU aaU -aGn +aPW aHD aIg aHF @@ -88989,8 +90229,8 @@ aHF aJn aHF aPp -aPT -aGn +cQV +cQS aaU aaa aaa @@ -89058,25 +90298,25 @@ bxT bFo bHV bYz -cbi -cbp -cbA -cbH -cjP -cjP -ckg -cjP -cjP -cjP -ckg -cjP -ckY -cjP +cPU +cPW +cPY +cQb +cQh +cQm +cQh +cQh +cQh +cQh +cQw +cQh +cQz +cQD cjP ctR -cKC -bOJ -bFl +cQF +cQH +cQL bKM bKM bKM @@ -89233,11 +90473,11 @@ aaU aaU aaU aEa -bRD +aPT aaU -aGn -aGn -aHE +aPU +aTH +bRD aHF aHF aIE @@ -89246,7 +90486,7 @@ aIE aIE csD aHF -aPU +cQW aGq aaU aaa @@ -89315,25 +90555,25 @@ bxT cdD bHW bIG -csl -bzy -bKp -bKJ -bLh -bLh -bLh -bLh -bMh -bLh -bLh -bLh -ckZ -bLh +cPV +cPX +cPZ +cQc +cQi +cQn +cQi +cQp +cQt +cQi +cQi +cQp +cQA +cQE cbF cnl cla bOK -bOR +cQM bKM bKM bPa @@ -89494,21 +90734,21 @@ aLK aGq aGq aKH -aHF +cQQ aHF aIE aJu aKA -aZT +bhB aMX aIE aHF -aPV +cQX aQW -aSJ -aSJ +bkC +bkC aQW -aSJ +bkC aQW aaU aaa @@ -89575,22 +90815,22 @@ bIH cGA bJX bKq -bKK +cQd bLi bLi bLF -bLi +cQq bMi bLi -bLF bLi +cQq bLi bLi cvV ckS -cla -bOL -bFl +cQG +cQI +cQN bKM bKM bKM @@ -89751,7 +90991,7 @@ aUz bDP aGq aGL -aHF +cQQ aHF aIH aJz @@ -89760,16 +91000,16 @@ aLI aMX aIE aHF -aPW +cQY aQW -cDv -cjQ +bmj +bBt cDB -cDD +bLh aQW aQW -aSJ -aSJ +bkC +bVN aaa aaa aaa @@ -89804,7 +91044,7 @@ aaa bcw bde bcw -cmT +bYg bcy bfp cwY @@ -89832,22 +91072,22 @@ bII cGB bFw bxT -cjG +cQe bLj ckN bxT -cjG +cQr bLj ckN bxT -cjG +cQx bLj ckN bxT bOy cla bOM -bOS +cQO bOU bKM bKM @@ -90008,7 +91248,7 @@ aZq bDQ hcR aGM -aHF +cQQ aHF aII aJu @@ -90017,16 +91257,16 @@ aRe aXS bbb aHF -aHF +cQQ aQW baP -aTo +bCd cjQ -cDE +bLk aVP cpt -aWw -aSJ +bOR +bXI aaa aaa aaa @@ -90073,7 +91313,7 @@ bAN bKH cbh clc -csR +cGJ cGJ cGO cGU @@ -90089,22 +91329,22 @@ bIJ cGC bXO bxT -bFl -bLk -bKG +cQf +cQj +cQo bxT -bFl -bLk -bKG +cQf +cQu +cQo bxT -bFl -bLk -bKG +cQf +cQB +cQo bxT ctU ckX bON -bFl +cQP bxT bKM bKM @@ -90265,7 +91505,7 @@ bdz bDR aKF aLm -aMi +cQR aMi aQh aQN @@ -90274,16 +91514,16 @@ aRl aXT bbc bbD -bik +cQZ cDt cDw -cDy +bEq cps -cDF +bMh bRb -bRc -aWx -aSJ +bOQ +bOS +cbi aaa aaa aaa @@ -90534,13 +91774,13 @@ bbG bit cDu cDx -cDz +bFy cDC -cDG +bOJ aVR bBj -aWy -aSJ +bRc +bXI aaa aaa aaa @@ -90790,14 +92030,14 @@ aSW aHM biF aQW -aTr -cDA +buM +bAX bEN -bjw +bOL aQW aQW -aSJ -aSJ +buO +cbp aaa aaa aaa @@ -90845,7 +92085,7 @@ bcy cbC cnO cnO -cnO +csR cGQ cGW cGV @@ -91047,10 +92287,10 @@ aSW aHM bju aQW -aSJ -aSJ +buO +buO aQW -aSJ +buO aQW aaU aaa @@ -91818,9 +93058,9 @@ csr aNR blf aNR -aTt -aTt -aTt +buR +bKp +bKJ aaa bdg bdg @@ -92074,10 +93314,10 @@ aGq aNR aNR bly -bFy -aTJ +bjF +byd aUB -aTt +bKK aaa bdg beN @@ -92329,12 +93569,12 @@ aKS aSW cDs aNR -aPs +biq blA bqh buG bIW -aTt +bKK aaa bdg beR @@ -92591,7 +93831,7 @@ aYR csE bvJ aUF -aTt +bKK aaa bdg beJ @@ -92832,7 +94072,7 @@ aAv aOO aCl aFj -ciC +aZT aGv bLp bEV @@ -92846,9 +94086,9 @@ bbf bsf bnI aRo -bBt -biq -aTt +bAn +bKG +bLe aaa bdg beJ @@ -93696,7 +94936,7 @@ ckT ckT ckT ckV -cHK +cRc clg ctc cua @@ -93921,8 +95161,8 @@ csN biA biA csL -cDZ -bgX +cDj +cDy bPl bXx bXT @@ -93953,7 +95193,7 @@ ckQ ckU ckQ ckW -cHL +cRd csX ctP cuk @@ -94178,8 +95418,8 @@ cve bky biA biA -cDZ -bgX +cDj +cDy bWT bXh bYa @@ -94431,11 +95671,11 @@ aaU aaU bgW biI -cvM -bkC -bVN -bmj -cEa +cqB +czA +cBt +csx +cDv bgW bWU bXl @@ -94688,8 +95928,8 @@ aaU aUk bgW bgW -cDj -bgX +csl +cAQ bgW bgW cEb @@ -96426,10 +97666,10 @@ aQg akv aew azf -bpW -aAP -aEc +aCb aFT +bjV +bpW aZO aXu aZX @@ -96487,8 +97727,8 @@ aaU aTV aVk bfu -bAn -bFz +csu +cAS cDV cDX cEg @@ -96682,9 +97922,9 @@ alU aQA aSZ aew -abS -bEL -aCb +aAP +aEc +bjB asL asL bfm @@ -96729,7 +97969,7 @@ aZy beJ bfd bjg -aYI +bUt bai baV cKF @@ -96744,7 +97984,7 @@ aaU aTV aVq bfx -bCd +cuQ cpP aTV bVR @@ -96999,9 +98239,9 @@ aaa aaa aaU aUi -aVq +ciC bzz -cuQ +cvM cts aTV bVM @@ -97258,7 +98498,7 @@ aaU aTV aYf beo -bCd +cuQ cwe aTV bVS @@ -97453,7 +98693,7 @@ awS azB aBC atc -aLX +aIF aJv aJZ aLY @@ -97515,7 +98755,7 @@ aaU aTV bHH aWp -cDJ +czf coI aTV bVT @@ -97710,10 +98950,10 @@ awT aAk cjN atc -aDF +aIG aRU aDX -bAX +aYI atc aVQ aWa @@ -97771,8 +99011,8 @@ aaa aaU aUk aUk -aUi -cDK +cnm +czz aUk aUk bWa @@ -97966,9 +99206,9 @@ bGf bHh cqd cBb -cBt +aFP +aKi aMN -cCO aQw coU atc @@ -98223,9 +99463,9 @@ avL axw cqH bhN -aDb +aIC aDP -aFk +aPs aGh csn atc @@ -98303,7 +99543,7 @@ bRJ bth bTB cek -cKj +cAo cKk cKl cKm @@ -98480,9 +99720,9 @@ avM avL csw aBK -aCa -aCa -aAQ +aID +aLX +aSJ aHZ atc atc @@ -98808,7 +100048,7 @@ cEn bWR bSH bSG -cEE +cij bSG bSC bSC @@ -100054,9 +101294,9 @@ aWB bsl cjJ aXH -aYm -aYm -aYm +cbA +cbH +ckZ aZv bRP aWB @@ -100101,9 +101341,9 @@ ceY bst cyG bst -buM -buM -buM +cDE +cDG +cEa buS buS bFX @@ -100312,7 +101552,7 @@ aWK aXo aXI aYn -aYD +cda aZj aZw bRQ @@ -100358,11 +101598,11 @@ bqm cdW cyG cdY -buM -byd -czf -csv -buM +cDF +cDJ +cKC +cDh +cPR bFJ cFa cFk @@ -100569,7 +101809,7 @@ aWM aXr aXJ aXr -aXr +cjG aXr aXr bRU @@ -100616,10 +101856,10 @@ cmU cyG cdX buS -csu +cDZ czg czt -czz +cPS czD cFb bEl @@ -100826,7 +102066,7 @@ aWO bPz bQf aYs -aYE +cjZ aYs aYs bSV @@ -100876,7 +102116,7 @@ buS bAJ czh czu -czA +cPT czE cFc bEl @@ -101083,7 +102323,7 @@ aWP aXy aXN aXy -cda +ckg aXy aXy aXy @@ -101132,7 +102372,7 @@ bqm buS caR czi -cdm +cKj buS bFY cEX @@ -101340,7 +102580,7 @@ aWQ aXz aXU aYu -aYF +ckY aZn aZx bEs @@ -102380,7 +103620,7 @@ ajO ajO ajO ajO -ajO +aQa ajO ajO aRy @@ -102633,13 +103873,13 @@ ajO aGi axI axI -axI aGi -aNo -aPE -beu ajO +bFf +aPE baW +aYZ +beu beK bTX bWI @@ -102889,10 +104129,10 @@ avv ajO bCv axI -bCF -axI -axI -aNr +aNh +aNz +bDw +bFv bHp bLm ajO @@ -103144,12 +104384,12 @@ aSt brs avv ajO -axI avY -bDw -bEZ -bFv -bGB +ajO +ajO +aOI +bDU +bGg bIF bLz bNe @@ -103193,7 +104433,7 @@ bqq cPx cFh bJe -cea +cRb cHP bKA bKV @@ -103401,12 +104641,12 @@ bns aya avy alo -axZ awn aIS -awn +aNo aJp -aNz +bDW +bGB aHq bki bPp @@ -103423,11 +104663,11 @@ cwd bYZ bZc cgQ -bUt -bUt -bUt -bUt bZe +bZe +bZe +bZe +cjr brL brL bVW @@ -103658,19 +104898,19 @@ aSt brs avv ajO -axI -avY -bDU -bFf -bGg +axZ +ajO +ajO +aPf +bEZ bGD bJk bLC -bPK +cRf bPV bQT bVq -cpM +cRh bfh cbY cdn @@ -103917,10 +105157,10 @@ avv ajO aze azJ -bDW -azJ -aNh -aOI +aNr +bCF +bDw +bPK bKx bmv ajO @@ -103958,7 +105198,7 @@ cpI csK cKi cvR -bzH +cPP bts bCY bHJ @@ -104175,9 +105415,9 @@ ajO aGi axI aIX -axI aGi -aPf +ajO +cRe aZP bmH aYZ @@ -104481,7 +105721,7 @@ bJi bDa czw byQ -cHV +cPQ cIc cIc cIp @@ -104986,7 +106226,7 @@ bpE bpE cyQ byQ -cjr +cCO czx czC czG @@ -105196,19 +106436,19 @@ bUp cci btZ aSq -rTW -kxw -kxw -tpQ -kxw -tpQ -kxw -kxw -kxw -kxw -kxw -kxw -xqa +bgh +bIY +bIY +bRo +bIY +bRo +bIY +bIY +bIY +bIY +bIY +bIY +bRp aaa aaU bWv @@ -105453,7 +106693,7 @@ bUL btT btT cjE -opd +bsz aaU aaU cdV @@ -105495,7 +106735,7 @@ bZk bZn bZq bZh -bIC +cEE bpD cmL cyS @@ -105710,7 +106950,7 @@ bUY ccj aSw aaW -opd +bsz aaa aaa aaa @@ -105967,7 +107207,7 @@ bVa btT aaU aby -opd +bsz aaa aaa aaa @@ -106224,7 +107464,7 @@ bVu bvB aaU aby -opd +bsz aaa aaa aaa @@ -106481,7 +107721,7 @@ bVA btT aaU aby -opd +bsz aaa aaa aaa @@ -106738,8 +107978,8 @@ bXp btT aaU abH -aZp -kxL +bAA +bMK aZp ceq cet @@ -106996,7 +108236,7 @@ bvB bWq acY adz -opd +bsz aaa aaU cdt @@ -107253,7 +108493,7 @@ btT btT btT cjF -qnM +bMX cdt cdt cdt @@ -107510,7 +108750,7 @@ ccn ccA ccy aTl -opd +bsz cdG cer cew @@ -107767,7 +109007,7 @@ cco ccE btZ aTl -opd +bsz cdU ces ces @@ -107792,7 +109032,7 @@ csQ cqs cqG crt -csx +cdm ctl cuL cvd @@ -108024,7 +109264,7 @@ btT btT btT cjF -qnM +bMX cdt cdt cdt @@ -108281,7 +109521,7 @@ btT aaU aVt adN -opd +bsz aaa aaU cdt @@ -108538,7 +109778,7 @@ aaU aaU aTl qeq -rbJ +bPh guK hXk hXk @@ -108742,11 +109982,11 @@ aFr aKg ahO aml -aoy -aoy +abX +akd aoA awt -aoy +aDb aqL anB alS @@ -108795,7 +110035,7 @@ cuy cuD cuG eUF -opd +bsz aej agc agT @@ -108822,12 +110062,12 @@ bwR cBx cCR cdz -bPX +cPI cdJ cdM cdJ cdO -bRA +cPK bbY cIM bZl @@ -109000,10 +110240,10 @@ apv aiF amr aqL -abX +aoy aoD aoj -bEq +aDm aqL aji aKs @@ -109052,7 +110292,7 @@ aQJ aRZ aVK cxa -bsz +bPr sVC aNH bbQ @@ -109257,11 +110497,11 @@ apv ajb amt anH -akd +aAQ aoG bvp -aDm -aFP +aDF +aFk aHh aKB aNu @@ -109309,7 +110549,7 @@ aaU aSu aYU cxb -opd +bsz aej agC aoJ @@ -109336,12 +110576,12 @@ bEW bQF cah cdA -bRn +cPJ cdL cmv cdL cdQ -bVb +cPL bUD cIV coN @@ -109563,10 +110803,10 @@ aaa aaa aaa aaa -rTW -aTl -cdp -wPS +bgh +bGQ +bIT +bPX aaU atF atF @@ -109820,7 +111060,7 @@ aaa aaa aaa aaa -opd +bsz aTl cxc aaa @@ -110077,7 +111317,7 @@ aaa aaa aaa aaa -opd +bsz aTl cxc aaa @@ -110334,7 +111574,7 @@ aaa aWR aaa aaU -opd +bsz aTl cxc atF @@ -110591,7 +111831,7 @@ cgd bwW beE bwW -opd +bsz aTl cxc atF @@ -110625,7 +111865,7 @@ biQ bXf bkG cwP -cDh +ctn bob bib bXX @@ -110824,9 +112064,9 @@ aIN aMK aOc aSA -aVa -aWn -bsR +aTo +aTt +aTJ bsR bCG bCK @@ -110848,7 +112088,7 @@ cgX chC cik bwW -bGh +bsT bGQ bHe bHA @@ -111081,9 +112321,9 @@ aKj aVy aRx aSF -aHA +aTr arH -aIC +aVa aIK aKk aTU @@ -111340,7 +112580,7 @@ aND aWH aHx asc -aID +aWn bvG aKl bCQ @@ -111597,7 +112837,7 @@ bkT aWJ aHz btb -aID +aWn bvR bCI bDJ @@ -111854,14 +113094,14 @@ aci aXQ aHy bDc -aIF -aKi +aWw +aWy +aYm +aYD +aYE +aYF beQ -cnm -cAQ -cAS -buO -buR +bjw bwu bAd aMo @@ -112111,8 +113351,8 @@ aWX aZF anK aHz -aIG -aHA +aWx +aTr boA cAF bCL @@ -112136,7 +113376,7 @@ aMD arp bCk aqk -bIT +bRn qlJ qlJ bcG @@ -112393,9 +113633,9 @@ bwW ciV bwW aaU -bIY -bHg -bMK +bsT +bRo +bRp anr bcI bgw @@ -112652,10 +113892,10 @@ bwW aaU aaa aaa -bJv +bsz cJx cJF -bPh +bRA cJJ bsX cJM @@ -112909,11 +114149,11 @@ bwW aaU aaa aaa -bJv +bsz anr bcI sdp -bgw +bUX bgw uwK bhm @@ -113166,12 +114406,12 @@ bwW aaU aaa aaa -bJv +bsz anr bcI aXp -cwx -bTJ +bVb +cfx bhs bmm bcI @@ -113397,7 +114637,7 @@ aCJ bFn bFn aJd -aJj +bfH bdq bet bmu @@ -113423,7 +114663,7 @@ bwW aaU aaa aaa -bJv +bsz anr bcI bcI @@ -113680,13 +114920,13 @@ bwW aaU aaa aaa -bJv +bsz anr aaU aaa cwz aaa -bfW +jyu aaa aaa aaU @@ -113937,13 +115177,13 @@ bwW aMD bwW aaa -bIY -bMX -tpQ -xqa +bsT +bHe +bRo +bRp aaa cwD -bfW +jyu aaa aaa aaU @@ -114197,10 +115437,10 @@ bwW aaU bdR cJr -opd +bTJ aaa aaa -cwF +cPz aaa aaa aaU @@ -114222,11 +115462,11 @@ bUR cfO cja cja -cgt +boj cxq cxv bgf -bVj +brQ cxC bgq bhX @@ -114423,7 +115663,7 @@ aNy aSd aTq aVY -bfH +aJj aJd btm bdo @@ -114454,10 +115694,10 @@ cwv bAQ bAQ cJs -bPr -bRo +bUV +caf bam -cwG +cPA bam bYl bam @@ -114479,7 +115719,7 @@ cdx cga cgq cgq -cjb +bzw cxr cxw cxx @@ -114712,9 +115952,9 @@ bsu bsx cJt sVC -bRp +cdp sVC -bsT +cPB sVC bZp sVC @@ -114738,7 +115978,7 @@ bZd cfX ciP cjB -boj +cgt bcl bfc bgs @@ -114952,7 +116192,7 @@ aMA czU czY cAe -cAo +bFz cAs cAx bhU @@ -114973,11 +116213,11 @@ bRv bsD bww bsD -caf -bsD -bsD -bsD -bAA +cPE +cPF +cPF +cPF +cPG bBL bBL bCm @@ -115003,7 +116243,7 @@ cxC bhX biJ bjQ -cxT +ctu biZ btz bPm @@ -115263,7 +116503,7 @@ cxQ cxU cxW cxX -bPm +cPN clX bZu cmM @@ -115473,7 +116713,7 @@ aMB bzn bjz cgZ -bmS +bzH bJS bmW bmW @@ -115499,7 +116739,7 @@ bbT bbT bkm brV -bgh +cPH bfU bFD bgO @@ -115988,7 +117228,7 @@ bzn bwW bxF aMD -cih +bEL bAK bjz aMI @@ -116034,7 +117274,7 @@ bGC bpQ bpQ cOa -bYg +cPO cya cya cya @@ -116245,8 +117485,8 @@ bzn bwW byW bCB -ciX -cij +bIC +bVj cip cpE aaa @@ -116502,7 +117742,7 @@ bzn aMD bzh bwW -ciV +cih aMI aMI aMI @@ -116534,7 +117774,7 @@ bLu bVr cth cje -ctn +csv bcV bby bck @@ -117044,7 +118284,7 @@ bgk bbT bkd bbT -bUS +cea bVG cgn cje @@ -117055,13 +118295,13 @@ bcA bdM bdM cNA -bhP -biv -bjB -bjV +bhb +ciE +cmT cnB csh -ciE +cHV +cPM bjn btI buc @@ -117283,8 +118523,8 @@ bMY bMY bPB xoj -cwB -cwM +cwx +cPC cww cbN cww @@ -117314,9 +118554,9 @@ bdM bdM bhP biv -bjF -cqB -bXI +cDz +cDA +cDD bnX bjn bjn @@ -117540,8 +118780,8 @@ bMZ bMZ bPC uAY -cwB -bUV +cwF +cwM cww cge cww @@ -117793,12 +119033,12 @@ aaa bJv bMp cww -bNa +cpM bNa bPJ bRC -cfx -bUX +cwG +cPD bVE cbT cww @@ -117830,7 +119070,7 @@ ccv boS boI bqZ -ctu +cxT bMH btN buy @@ -118090,7 +119330,7 @@ cxR cxV cxV cxV -cxZ +cjb cxV cyb cyc @@ -118314,7 +119554,7 @@ qgO chO cpN bWG -cJo +cRg jiZ bhI cLY @@ -118349,7 +119589,7 @@ btd btd bDy bxR -btS +cxZ boI bBA bFh @@ -118582,7 +119822,7 @@ anr aaa aaU bfC -bhB +bUS bAv bPW cBz @@ -119377,7 +120617,7 @@ boI cre cow boI -bzw +cRa boI aaa aaa From dc97b65681f843ac9f3435015c9652eb7a26f17a Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Mon, 20 Apr 2020 04:03:13 -0700 Subject: [PATCH 50/60] Revert "Revert "Update mobs.dm"" This reverts commit d8d6ae8555e8d5b6f9a61d9e19860475dd7a4622. --- code/__DEFINES/mobs.dm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index b4735cd0d8..e5f817614b 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -36,16 +36,16 @@ #define BLOODCRAWL_EAT 2 //Mob bio-types flags -#define MOB_ORGANIC 1 << 0 -#define MOB_MINERAL 1 << 1 -#define MOB_ROBOTIC 1 << 2 -#define MOB_UNDEAD 1 << 3 -#define MOB_HUMANOID 1 << 4 -#define MOB_BUG 1 << 5 -#define MOB_BEAST 1 << 6 -#define MOB_EPIC 1 << 7 //megafauna -#define MOB_REPTILE 1 << 8 -#define MOB_SPIRIT 1 << 9 +#define MOB_ORGANIC (1 << 0) +#define MOB_MINERAL (1 << 1) +#define MOB_ROBOTIC (1 << 2) +#define MOB_UNDEAD (1 << 3) +#define MOB_HUMANOID (1 << 4) +#define MOB_BUG (1 << 5) +#define MOB_BEAST (1 << 6) +#define MOB_EPIC (1 << 7) //megafauna +#define MOB_REPTILE (1 << 8) +#define MOB_SPIRIT (1 << 9) //Organ defines for carbon mobs #define ORGAN_ORGANIC 1 From 9919a239665ed2944b4baa6257b2aeebbdef0c64 Mon Sep 17 00:00:00 2001 From: necromanceranne Date: Tue, 21 Apr 2020 00:36:54 +1000 Subject: [PATCH 51/60] This fixes everyone being a pugilist holy fuck --- code/datums/martial/_martial.dm | 4 +++- code/datums/martial/boxing.dm | 1 + code/datums/martial/cqc.dm | 1 + code/datums/martial/krav_maga.dm | 1 + code/datums/martial/plasma_fist.dm | 1 + code/datums/martial/rising_bass.dm | 1 + code/datums/martial/sleeping_carp.dm | 1 + 7 files changed, 9 insertions(+), 1 deletion(-) diff --git a/code/datums/martial/_martial.dm b/code/datums/martial/_martial.dm index d8a888871e..e54a80bd81 100644 --- a/code/datums/martial/_martial.dm +++ b/code/datums/martial/_martial.dm @@ -10,6 +10,7 @@ var/help_verb var/pacifism_check = TRUE //are the martial arts combos/attacks unable to be used by pacifist. var/allow_temp_override = TRUE //if this martial art can be overridden by temporary martial arts + var/pugilist = FALSE /datum/martial_art/proc/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) return FALSE @@ -61,7 +62,8 @@ if(help_verb) H.verbs += help_verb H.mind.martial_art = src - ADD_TRAIT(H, TRAIT_PUGILIST, MARTIAL_ARTIST_TRAIT) + if(pugilist) + ADD_TRAIT(H, TRAIT_PUGILIST, MARTIAL_ARTIST_TRAIT) return TRUE /datum/martial_art/proc/store(datum/martial_art/M,mob/living/carbon/human/H) diff --git a/code/datums/martial/boxing.dm b/code/datums/martial/boxing.dm index 93d70c12cc..848fdc6a41 100644 --- a/code/datums/martial/boxing.dm +++ b/code/datums/martial/boxing.dm @@ -2,6 +2,7 @@ name = "Boxing" id = MARTIALART_BOXING pacifism_check = FALSE //Let's pretend pacifists can boxe the heck out of other people, it only deals stamina damage right now. + pugilist = TRUE /datum/martial_art/boxing/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) to_chat(A, "Can't disarm while boxing!") diff --git a/code/datums/martial/cqc.dm b/code/datums/martial/cqc.dm index 4b19ae25ca..96ba7bf965 100644 --- a/code/datums/martial/cqc.dm +++ b/code/datums/martial/cqc.dm @@ -9,6 +9,7 @@ id = MARTIALART_CQC help_verb = /mob/living/carbon/human/proc/CQC_help block_chance = 75 + pugilist = TRUE var/old_grab_state = null /datum/martial_art/cqc/reset_streak(mob/living/carbon/human/new_target) diff --git a/code/datums/martial/krav_maga.dm b/code/datums/martial/krav_maga.dm index 6b3e2d3dc8..4332b09ac6 100644 --- a/code/datums/martial/krav_maga.dm +++ b/code/datums/martial/krav_maga.dm @@ -1,6 +1,7 @@ /datum/martial_art/krav_maga name = "Krav Maga" id = MARTIALART_KRAVMAGA + pugilist = TRUE var/datum/action/neck_chop/neckchop = new/datum/action/neck_chop() var/datum/action/leg_sweep/legsweep = new/datum/action/leg_sweep() var/datum/action/lung_punch/lungpunch = new/datum/action/lung_punch() diff --git a/code/datums/martial/plasma_fist.dm b/code/datums/martial/plasma_fist.dm index c751d3b146..16ffb381aa 100644 --- a/code/datums/martial/plasma_fist.dm +++ b/code/datums/martial/plasma_fist.dm @@ -6,6 +6,7 @@ name = "Plasma Fist" id = MARTIALART_PLASMAFIST help_verb = /mob/living/carbon/human/proc/plasma_fist_help + pugilist = TRUE /datum/martial_art/plasma_fist/proc/check_streak(mob/living/carbon/human/A, mob/living/carbon/human/D) diff --git a/code/datums/martial/rising_bass.dm b/code/datums/martial/rising_bass.dm index 087867a9c1..0d77644c86 100644 --- a/code/datums/martial/rising_bass.dm +++ b/code/datums/martial/rising_bass.dm @@ -9,6 +9,7 @@ id = MARTIALART_RISINGBASS allow_temp_override = FALSE help_verb = /mob/living/carbon/human/proc/rising_bass_help + pugilist = TRUE var/datum/action/risingbassmove/sidekick = new/datum/action/risingbassmove/sidekick() var/datum/action/risingbassmove/deftswitch = new/datum/action/risingbassmove/deftswitch() var/repulsecool = 0 diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index d2e11ee843..82ddd90b42 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -7,6 +7,7 @@ id = MARTIALART_SLEEPINGCARP allow_temp_override = FALSE help_verb = /mob/living/carbon/human/proc/sleeping_carp_help + pugilist = TRUE /datum/martial_art/the_sleeping_carp/proc/check_streak(mob/living/carbon/human/A, mob/living/carbon/human/D) if(findtext(streak,STRONG_PUNCH_COMBO)) From 5df4287c8d4360f0a2dee544e3cf9c6a95e00fca Mon Sep 17 00:00:00 2001 From: Putnam Date: Mon, 20 Apr 2020 11:10:43 -0700 Subject: [PATCH 52/60] Fixes a runtime in livers. --- code/modules/surgery/organs/liver.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/surgery/organs/liver.dm b/code/modules/surgery/organs/liver.dm index 117a45cdbc..6e5ea0e111 100755 --- a/code/modules/surgery/organs/liver.dm +++ b/code/modules/surgery/organs/liver.dm @@ -52,7 +52,7 @@ /obj/item/organ/liver/applyOrganDamage(d, maximum = maxHealth) . = ..() - if(!.) + if(!. || QDELETED(owner)) return if(damage >= high_threshold) var/move_calc = 1+((round(damage) - high_threshold)/(high_threshold/3)) From 096a182a84259e5594912079f66189028ab84367 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Mon, 20 Apr 2020 11:44:59 -0700 Subject: [PATCH 53/60] Update living.dm --- code/modules/mob/living/living.dm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 4e1f37fdf7..abb18bab24 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -645,11 +645,6 @@ attempt_resist_grab(FALSE) // Return as we should only resist one thing at a time. Give clickdelay if the grab wasn't passive. return old_gs? TRUE : FALSE - - if(CHECK_MOBILITY(src, MOBILITY_USE) && resist_embedded()) //Citadel Change for embedded removal memes - requires being able to use items. - // DO NOT GIVE DEFAULT CLICKDELAY - This is a combat action. - changeNext_move(CLICK_CD_MELEE) - return FALSE // unbuckling yourself. stops the chain if you try it. if(buckled && last_special <= world.time) @@ -673,10 +668,17 @@ resist_fire() //stop, drop, and roll // Give clickdelay return TRUE + if(resting) //cit change - allows resisting out of resting resist_a_rest() // ditto // DO NOT GIVE CLCIKDELAY - resist_a_rest() handles spam prevention. Somewhat. return FALSE + + if(CHECK_MOBILITY(src, MOBILITY_USE) && resist_embedded()) //Citadel Change for embedded removal memes - requires being able to use items. + // DO NOT GIVE DEFAULT CLICKDELAY - This is a combat action. + changeNext_move(CLICK_CD_MELEE) + return FALSE + if(last_special <= world.time) resist_restraints() //trying to remove cuffs. // DO NOT GIVE CLICKDELAY - last_special handles this. From a984fc5e3d9dfe11a159981a6bf5df5696bbe2ee Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Mon, 20 Apr 2020 11:45:22 -0700 Subject: [PATCH 54/60] Update living.dm --- code/modules/mob/living/living.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index abb18bab24..22a0da2cf6 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -684,7 +684,6 @@ // DO NOT GIVE CLICKDELAY - last_special handles this. return FALSE - /// Proc to resist a grab. moving_resist is TRUE if this began by someone attempting to move. Return FALSE if still grabbed/failed to break out. Use this instead of resist_grab() directly. /mob/proc/attempt_resist_grab(moving_resist, forced, log = TRUE) if(!pulledby) //not being grabbed From 4d55f169d57950324dedf5bb205e3e09e4c411c7 Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Mon, 20 Apr 2020 17:05:03 -0400 Subject: [PATCH 55/60] oh god oh fuck --- code/__DEFINES/construction.dm | 1 + .../crafting/recipes/recipes_misc.dm | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm index 92f00fbf38..2f54d066a0 100644 --- a/code/__DEFINES/construction.dm +++ b/code/__DEFINES/construction.dm @@ -73,6 +73,7 @@ #define CAT_AMMO "Ammunition" #define CAT_ROBOT "Robots" #define CAT_MISC "Misc" +#define CAT_MISCELLANEOUS "Miscellaneous" #define CAT_TOOL "Tools & Storage" #define CAT_FURNITURE "Furniture" #define CAT_PRIMAL "Tribal" diff --git a/code/datums/components/crafting/recipes/recipes_misc.dm b/code/datums/components/crafting/recipes/recipes_misc.dm index b454ef134f..e9990d5620 100644 --- a/code/datums/components/crafting/recipes/recipes_misc.dm +++ b/code/datums/components/crafting/recipes/recipes_misc.dm @@ -19,6 +19,7 @@ /obj/item/stack/sheet/mineral/wood = 20, /obj/item/stack/cable_coil = 10) tools = list(TOOL_SCREWDRIVER, TOOL_WRENCH, TOOL_WELDER) + subcategory = CAT_MISCELLANEOUS category = CAT_MISC /datum/crafting_recipe/femur_breaker @@ -28,6 +29,7 @@ reqs = list(/obj/item/stack/sheet/metal = 20, /obj/item/stack/cable_coil = 30) tools = list(TOOL_SCREWDRIVER, TOOL_WRENCH, TOOL_WELDER) + subcategory = CAT_MISCELLANEOUS category = CAT_MISC /////////////////// @@ -162,6 +164,7 @@ reqs = list(/obj/item/stack/sheet/plasteel = 2, /obj/item/stack/rods = 8) time = 100 + subcategory = CAT_MISCELLANEOUS category = CAT_MISC /datum/crafting_recipe/skateboard @@ -170,6 +173,7 @@ time = 60 reqs = list(/obj/item/stack/sheet/metal = 5, /obj/item/stack/rods = 10) + subcategory = CAT_MISCELLANEOUS category = CAT_MISC /datum/crafting_recipe/scooter @@ -178,6 +182,7 @@ time = 65 reqs = list(/obj/item/stack/sheet/metal = 5, /obj/item/stack/rods = 12) + subcategory = CAT_MISCELLANEOUS category = CAT_MISC ///////// @@ -188,18 +193,21 @@ name = "Toy Sword" reqs = list(/obj/item/light/bulb = 1, /obj/item/stack/cable_coil = 1, /obj/item/stack/sheet/plastic = 4) result = /obj/item/toy/sword + subcategory = CAT_MISCELLANEOUS category = CAT_MISC /datum/crafting_recipe/extendohand name = "Extendo-Hand" reqs = list(/obj/item/bodypart/r_arm/robot = 1, /obj/item/clothing/gloves/boxing = 1) result = /obj/item/extendohand + subcategory = CAT_MISCELLANEOUS category = CAT_MISC /datum/crafting_recipe/toyneb name = "Non-Euplastic Blade" reqs = list(/obj/item/light/tube = 1, /obj/item/stack/cable_coil = 1, /obj/item/stack/sheet/plastic = 4) result = /obj/item/toy/sword/cx + subcategory = CAT_MISCELLANEOUS category = CAT_MISC //////////// @@ -210,6 +218,7 @@ name = "Black Carpet" reqs = list(/obj/item/stack/tile/carpet = 50, /obj/item/toy/crayon/black = 1) result = /obj/item/stack/tile/carpet/black/fifty + subcategory = CAT_MISCELLANEOUS category = CAT_MISC /datum/crafting_recipe/paperframes @@ -217,6 +226,7 @@ result = /obj/item/stack/sheet/paperframes/five time = 10 reqs = list(/obj/item/stack/sheet/mineral/wood = 5, /obj/item/paper = 20) + subcategory = CAT_MISCELLANEOUS category = CAT_MISC /datum/crafting_recipe/naturalpaper @@ -225,6 +235,7 @@ reqs = list(/datum/reagent/water = 50, /obj/item/stack/sheet/mineral/wood = 1) tools = list(/obj/item/hatchet) result = /obj/item/paper_bin/bundlenatural + subcategory = CAT_MISCELLANEOUS category = CAT_MISC /datum/crafting_recipe/bluespacehonker @@ -234,6 +245,7 @@ reqs = list(/obj/item/stack/ore/bluespace_crystal = 1, /obj/item/toy/crayon/blue = 1, /obj/item/bikehorn = 1) + subcategory = CAT_MISCELLANEOUS category = CAT_MISC /datum/crafting_recipe/mousetrap @@ -242,6 +254,7 @@ time = 10 reqs = list(/obj/item/stack/sheet/cardboard = 1, /obj/item/stack/rods = 1) + subcategory = CAT_MISCELLANEOUS category = CAT_MISC /datum/crafting_recipe/flashlight_eyes @@ -252,6 +265,7 @@ /obj/item/flashlight = 2, /obj/item/restraints/handcuffs/cable = 1 ) + subcategory = CAT_MISCELLANEOUS category = CAT_MISC /datum/crafting_recipe/pressureplate @@ -262,6 +276,7 @@ /obj/item/stack/tile/plasteel = 1, /obj/item/stack/cable_coil = 2, /obj/item/assembly/igniter = 1) + subcategory = CAT_MISCELLANEOUS category = CAT_MISC /datum/crafting_recipe/gold_horn @@ -270,6 +285,7 @@ time = 20 reqs = list(/obj/item/stack/sheet/mineral/bananium = 5, /obj/item/bikehorn = 1) + subcategory = CAT_MISCELLANEOUS category = CAT_MISC /datum/crafting_recipe/spooky_camera @@ -279,6 +295,7 @@ reqs = list(/obj/item/camera = 1, /datum/reagent/water/holywater = 10) parts = list(/obj/item/camera = 1) + subcategory = CAT_MISCELLANEOUS category = CAT_MISC /datum/crafting_recipe/paperwork @@ -287,6 +304,7 @@ time = 10 //Takes time for people to file and complete paper work! tools = list(/obj/item/pen) reqs = list(/obj/item/folder/paperwork = 1) + subcategory = CAT_MISCELLANEOUS category = CAT_MISC /datum/crafting_recipe/coconut_bong @@ -295,6 +313,7 @@ reqs = list(/obj/item/stack/sheet/mineral/bamboo = 2, /obj/item/reagent_containers/food/snacks/grown/coconut = 1) time = 70 + subcategory = CAT_MISCELLANEOUS category = CAT_MISC ////////////// @@ -374,6 +393,7 @@ //parts = list(/obj/item/storage/belt = 1 // ) time = 150 + subcategory = CAT_MISCELLANEOUS category = CAT_MISC always_availible = FALSE // Disabled til learned @@ -390,5 +410,6 @@ /obj/item/candle = 1 ) time = 100 + subcategory = CAT_MISCELLANEOUS category = CAT_MISC always_availible = FALSE // Disabled til learned From 747e27007f9c265b27864374ef5d32c0cc9ef6fb Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Mon, 20 Apr 2020 17:26:22 -0400 Subject: [PATCH 56/60] ***ahhhh*** --- code/datums/components/crafting/craft.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/components/crafting/craft.dm b/code/datums/components/crafting/craft.dm index e0bf084ac2..56de6eff23 100644 --- a/code/datums/components/crafting/craft.dm +++ b/code/datums/components/crafting/craft.dm @@ -24,7 +24,7 @@ ), CAT_ROBOT = CAT_NONE, CAT_MISC = list( - CAT_MISC, + CAT_MISCELLANEOUS, CAT_TOOL, CAT_FURNITURE, ), From 58cb5e391ef485ff4f07a74d48a62cb9bca6ea7d Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Mon, 20 Apr 2020 18:22:13 -0400 Subject: [PATCH 57/60] *scream* --- .../crafting/recipes/recipes_misc.dm | 119 ++++++++++++------ .../bloodsucker/objects/bloodsucker_coffin.dm | 36 ------ 2 files changed, 79 insertions(+), 76 deletions(-) diff --git a/code/datums/components/crafting/recipes/recipes_misc.dm b/code/datums/components/crafting/recipes/recipes_misc.dm index e9990d5620..1a40787463 100644 --- a/code/datums/components/crafting/recipes/recipes_misc.dm +++ b/code/datums/components/crafting/recipes/recipes_misc.dm @@ -32,6 +32,85 @@ subcategory = CAT_MISCELLANEOUS category = CAT_MISC +// Blood Sucker stuff // +/datum/crafting_recipe/bloodsucker/blackcoffin + name = "Black Coffin" + result = /obj/structure/closet/crate/coffin/blackcoffin + tools = list(/obj/item/weldingtool, + /obj/item/screwdriver) + reqs = list(/obj/item/stack/sheet/cloth = 1, + /obj/item/stack/sheet/mineral/wood = 5, + /obj/item/stack/sheet/metal = 1) + ///obj/item/stack/packageWrap = 8, + ///obj/item/pipe = 2) + time = 150 + subcategory = CAT_FURNITURE + category = CAT_MISC + always_availible = TRUE + +/datum/crafting_recipe/bloodsucker/meatcoffin + name = "Meat Coffin" + result =/obj/structure/closet/crate/coffin/meatcoffin + tools = list(/obj/item/kitchen/knife, + /obj/item/kitchen/rollingpin) + reqs = list(/obj/item/reagent_containers/food/snacks/meat/slab = 5, + /obj/item/restraints/handcuffs/cable = 1) + time = 150 + subcategory = CAT_FURNITURE + category = CAT_MISC + always_availible = TRUE + +/datum/crafting_recipe/bloodsucker/metalcoffin + name = "Metal Coffin" + result =/obj/structure/closet/crate/coffin/metalcoffin + tools = list(/obj/item/weldingtool, + /obj/item/screwdriver) + reqs = list(/obj/item/stack/sheet/metal = 5) + time = 100 + subcategory = CAT_FURNITURE + category = CAT_MISC + always_availible = TRUE + +/datum/crafting_recipe/bloodsucker/vassalrack + name = "Persuasion Rack" + //desc = "For converting crewmembers into loyal Vassals." + result = /obj/structure/bloodsucker/vassalrack + tools = list(/obj/item/weldingtool, + //obj/item/screwdriver, + /obj/item/wrench + ) + reqs = list(/obj/item/stack/sheet/mineral/wood = 3, + /obj/item/stack/sheet/metal = 2, + /obj/item/restraints/handcuffs/cable = 2, + //obj/item/storage/belt = 1, + //obj/item/stack/sheet/animalhide = 1, + //obj/item/stack/sheet/leather = 1, + //obj/item/stack/sheet/plasteel = 5 + ) + //parts = list(/obj/item/storage/belt = 1 + // ) + time = 150 + subcategory = CAT_MISCELLANEOUS + category = CAT_MISC + always_availible = FALSE // Disabled til learned + + +/datum/crafting_recipe/bloodsucker/candelabrum + name = "Candelabrum" + //desc = "For converting crewmembers into loyal Vassals." + result = /obj/structure/bloodsucker/candelabrum + tools = list(/obj/item/weldingtool, + /obj/item/wrench + ) + reqs = list(/obj/item/stack/sheet/metal = 3, + /obj/item/stack/rods = 1, + /obj/item/candle = 1 + ) + time = 100 + subcategory = CAT_MISCELLANEOUS + category = CAT_MISC + always_availible = FALSE // Disabled til learned + /////////////////// //Tools & Storage// /////////////////// @@ -373,43 +452,3 @@ /obj/item/clothing/under/rank/security/officer = 1) subcategory = CAT_FURNITURE category = CAT_MISC - -/datum/crafting_recipe/bloodsucker/vassalrack - name = "Persuasion Rack" - //desc = "For converting crewmembers into loyal Vassals." - result = /obj/structure/bloodsucker/vassalrack - tools = list(/obj/item/weldingtool, - //obj/item/screwdriver, - /obj/item/wrench - ) - reqs = list(/obj/item/stack/sheet/mineral/wood = 3, - /obj/item/stack/sheet/metal = 2, - /obj/item/restraints/handcuffs/cable = 2, - //obj/item/storage/belt = 1, - //obj/item/stack/sheet/animalhide = 1, - //obj/item/stack/sheet/leather = 1, - //obj/item/stack/sheet/plasteel = 5 - ) - //parts = list(/obj/item/storage/belt = 1 - // ) - time = 150 - subcategory = CAT_MISCELLANEOUS - category = CAT_MISC - always_availible = FALSE // Disabled til learned - - -/datum/crafting_recipe/bloodsucker/candelabrum - name = "Candelabrum" - //desc = "For converting crewmembers into loyal Vassals." - result = /obj/structure/bloodsucker/candelabrum - tools = list(/obj/item/weldingtool, - /obj/item/wrench - ) - reqs = list(/obj/item/stack/sheet/metal = 3, - /obj/item/stack/rods = 1, - /obj/item/candle = 1 - ) - time = 100 - subcategory = CAT_MISCELLANEOUS - category = CAT_MISC - always_availible = FALSE // Disabled til learned diff --git a/code/modules/antagonists/bloodsucker/objects/bloodsucker_coffin.dm b/code/modules/antagonists/bloodsucker/objects/bloodsucker_coffin.dm index debeee3775..e85d3af5a0 100644 --- a/code/modules/antagonists/bloodsucker/objects/bloodsucker_coffin.dm +++ b/code/modules/antagonists/bloodsucker/objects/bloodsucker_coffin.dm @@ -200,39 +200,3 @@ to_chat(resident, "You fix the mechanism and lock it.") broken = FALSE locked = TRUE - -// Look up recipes.dm OR pneumaticCannon.dm -/datum/crafting_recipe/bloodsucker/blackcoffin - name = "Black Coffin" - result = /obj/structure/closet/crate/coffin/blackcoffin - tools = list(/obj/item/weldingtool, - /obj/item/screwdriver) - reqs = list(/obj/item/stack/sheet/cloth = 1, - /obj/item/stack/sheet/mineral/wood = 5, - /obj/item/stack/sheet/metal = 1) - ///obj/item/stack/packageWrap = 8, - ///obj/item/pipe = 2) - time = 150 - category = CAT_MISC - always_availible = TRUE - -/datum/crafting_recipe/bloodsucker/meatcoffin - name = "Meat Coffin" - result =/obj/structure/closet/crate/coffin/meatcoffin - tools = list(/obj/item/kitchen/knife, - /obj/item/kitchen/rollingpin) - reqs = list(/obj/item/reagent_containers/food/snacks/meat/slab = 5, - /obj/item/restraints/handcuffs/cable = 1) - time = 150 - category = CAT_MISC - always_availible = TRUE - -/datum/crafting_recipe/bloodsucker/metalcoffin - name = "Metal Coffin" - result =/obj/structure/closet/crate/coffin/metalcoffin - tools = list(/obj/item/weldingtool, - /obj/item/screwdriver) - reqs = list(/obj/item/stack/sheet/metal = 5) - time = 100 - category = CAT_MISC - always_availible = TRUE From c3fc1332824d24a91178e0f74f1fcd6785e7f2c3 Mon Sep 17 00:00:00 2001 From: TrilbySpaceClone Date: Mon, 20 Apr 2020 18:28:57 -0400 Subject: [PATCH 58/60] *crys* --- code/datums/components/crafting/recipes/recipes_misc.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/datums/components/crafting/recipes/recipes_misc.dm b/code/datums/components/crafting/recipes/recipes_misc.dm index 1a40787463..cf0e1bdec9 100644 --- a/code/datums/components/crafting/recipes/recipes_misc.dm +++ b/code/datums/components/crafting/recipes/recipes_misc.dm @@ -44,7 +44,7 @@ ///obj/item/stack/packageWrap = 8, ///obj/item/pipe = 2) time = 150 - subcategory = CAT_FURNITURE + subcategory = CAT_FURNITURE category = CAT_MISC always_availible = TRUE @@ -56,7 +56,7 @@ reqs = list(/obj/item/reagent_containers/food/snacks/meat/slab = 5, /obj/item/restraints/handcuffs/cable = 1) time = 150 - subcategory = CAT_FURNITURE + subcategory = CAT_FURNITURE category = CAT_MISC always_availible = TRUE @@ -67,7 +67,7 @@ /obj/item/screwdriver) reqs = list(/obj/item/stack/sheet/metal = 5) time = 100 - subcategory = CAT_FURNITURE + subcategory = CAT_FURNITURE category = CAT_MISC always_availible = TRUE From 685546551c761112c6a4fc5117b4821023901dbb Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Mon, 20 Apr 2020 20:26:50 -0700 Subject: [PATCH 59/60] Update SDQL_2_wrappers.dm --- code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm index 24149e7e6c..b0cc4fdfa9 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm @@ -4,7 +4,7 @@ return abs(A) /proc/_animate(atom/A, set_vars, time = 10, loop = 1, easing = LINEAR_EASING, flags = null) - var/mutable_appearance/MA = new() + var/mutable_appearance/MA = new(A) for(var/v in set_vars) MA.vars[v] = set_vars[v] animate(A, appearance = MA, time, loop, easing, flags) @@ -33,6 +33,9 @@ /proc/_cos(X) return cos(X) +/proc/_filter(type, ...) + return filter(arglist(args.Copy())) + /proc/_get_dir(Loc1, Loc2) return get_dir(Loc1, Loc2) @@ -234,3 +237,4 @@ for(var/turf/T in v) . += T return pick(.) +t From 055606b81bf489dd4926c8f445cc0e0d56047d46 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Mon, 20 Apr 2020 20:27:18 -0700 Subject: [PATCH 60/60] Revert "Update SDQL_2_wrappers.dm" This reverts commit 685546551c761112c6a4fc5117b4821023901dbb. --- code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm index b0cc4fdfa9..24149e7e6c 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm @@ -4,7 +4,7 @@ return abs(A) /proc/_animate(atom/A, set_vars, time = 10, loop = 1, easing = LINEAR_EASING, flags = null) - var/mutable_appearance/MA = new(A) + var/mutable_appearance/MA = new() for(var/v in set_vars) MA.vars[v] = set_vars[v] animate(A, appearance = MA, time, loop, easing, flags) @@ -33,9 +33,6 @@ /proc/_cos(X) return cos(X) -/proc/_filter(type, ...) - return filter(arglist(args.Copy())) - /proc/_get_dir(Loc1, Loc2) return get_dir(Loc1, Loc2) @@ -237,4 +234,3 @@ for(var/turf/T in v) . += T return pick(.) -t