From 67c14309ff3af29638a70594fe25dbd7d2883d82 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 28 Mar 2021 22:50:27 -0400 Subject: [PATCH 01/38] Trait Rebalance and Refactor - New typepaths added for Positive, Neutral, and Negative Traits - Tweaked the cost of many positive and negative traits. Some negative traits were moved to neutral traits. - Some traits were outright removed. - Custom species now start with 2 trait points The overall goal of this refactor is to basically remove extreme values, both negative and positive (This is why most traits that were removed were removed), and to basically enable some form of customization without rewarding min/maxing. --- code/__defines/misc_vr.dm | 2 +- code/_helpers/global_lists_vr.dm | 6 +- code/modules/mob/living/carbon/human/life.dm | 2 +- .../species/station/traits_vr/negative.dm | 106 ++-------- .../species/station/traits_vr/neutral.dm | 187 ++++++++++-------- .../species/station/traits_vr/positive.dm | 145 +++++++------- .../human/species/station/traits_vr/trait.dm | 3 +- vorestation.dme | 2 +- 8 files changed, 207 insertions(+), 246 deletions(-) diff --git a/code/__defines/misc_vr.dm b/code/__defines/misc_vr.dm index 46d8a347e8..d450fbbb08 100644 --- a/code/__defines/misc_vr.dm +++ b/code/__defines/misc_vr.dm @@ -19,7 +19,7 @@ #define ANNOUNCER_NAME "Facility PA" //For custom species -#define STARTING_SPECIES_POINTS 1 +#define STARTING_SPECIES_POINTS 2 #define MAX_SPECIES_TRAITS 5 // Xenochimera thing mostly diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index 5024a1b1a1..64a137ccc4 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -490,10 +490,10 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN, var/datum/trait/instance = new path() if(!instance.name) continue //A prototype or something - var/cost = instance.cost - traits_costs[path] = cost + var/category = instance.category + traits_costs[path] = category all_traits[path] = instance - switch(cost) + switch(category) if(-INFINITY to -0.1) negative_traits[path] = instance if(0) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index cebfda00c0..08672caf32 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1268,7 +1268,7 @@ //VOREStation Add - Vampire hunger alert else if(get_species() == SPECIES_CUSTOM) var/datum/species/custom/C = species - if(/datum/trait/bloodsucker in C.traits) + if(/datum/trait/neutral/bloodsucker in C.traits) fat_alert = /obj/screen/alert/fat/vampire hungry_alert = /obj/screen/alert/hungry/vampire starving_alert = /obj/screen/alert/starving/vampire diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm index 3340c627be..e85cda5315 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm @@ -1,150 +1,86 @@ #define ORGANICS 1 #define SYNTHETICS 2 -/datum/trait/speed_slow +/datum/trait/negative + category = -1 + +/datum/trait/negative/speed_slow name = "Slowdown" desc = "Allows you to move slower on average than baseline." - cost = -2 + cost = -3 var_changes = list("slowdown" = 0.5) -/datum/trait/speed_slow_plus - name = "Major Slowdown" - desc = "Allows you to move MUCH slower on average than baseline." - cost = -3 - var_changes = list("slowdown" = 1.0) - -/datum/trait/weakling +/datum/trait/negative/weakling name = "Weakling" desc = "Causes heavy equipment to slow you down more when carried." - cost = -1 + cost = -3 var_changes = list("item_slowdown_mod" = 1.5) -/datum/trait/weakling_plus - name = "Major Weakling" - desc = "Allows you to carry heavy equipment with much more slowdown." - cost = -2 - var_changes = list("item_slowdown_mod" = 2.0) - -/datum/trait/endurance_low +/datum/trait/negative/endurance_low name = "Low Endurance" - desc = "Reduces your maximum total hitpoints to 75." + desc = "Reduces your maximum total hitpoints to 85." cost = -2 - var_changes = list("total_health" = 75) + var_changes = list("total_health" = 85) apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.setMaxHealth(S.total_health) -/datum/trait/endurance_very_low - name = "Extremely Low Endurance" - desc = "Reduces your maximum total hitpoints to 50." - cost = -3 //Teshari HP. This makes the person a lot more suseptable to getting stunned, killed, etc. - var_changes = list("total_health" = 50) - - apply(var/datum/species/S,var/mob/living/carbon/human/H) - ..(S,H) - H.setMaxHealth(S.total_health) - -/datum/trait/minor_brute_weak +/datum/trait/negative/minor_brute_weak name = "Minor Brute Weakness" desc = "Increases damage from brute damage sources by 15%" cost = -1 var_changes = list("brute_mod" = 1.15) -/datum/trait/brute_weak +/datum/trait/negative/brute_weak name = "Brute Weakness" desc = "Increases damage from brute damage sources by 25%" cost = -2 var_changes = list("brute_mod" = 1.25) -/datum/trait/brute_weak_plus - name = "Major Brute Weakness" - desc = "Increases damage from brute damage sources by 50%" - cost = -3 - var_changes = list("brute_mod" = 1.5) - -/datum/trait/minor_burn_weak +/datum/trait/negative/minor_burn_weak name = "Minor Burn Weakness" desc = "Increases damage from burn damage sources by 15%" cost = -1 var_changes = list("burn_mod" = 1.15) -/datum/trait/burn_weak +/datum/trait/negative/burn_weak name = "Burn Weakness" desc = "Increases damage from burn damage sources by 25%" cost = -2 var_changes = list("burn_mod" = 1.25) -/datum/trait/burn_weak_plus - name = "Major Burn Weakness" - desc = "Increases damage from burn damage sources by 50%" - cost = -3 - var_changes = list("burn_mod" = 1.5) - -/datum/trait/conductive +/datum/trait/negative/conductive name = "Conductive" desc = "Increases your susceptibility to electric shocks by 50%" cost = -1 var_changes = list("siemens_coefficient" = 1.5) //This makes you a lot weaker to tasers. -/datum/trait/conductive_plus - name = "Major Conductive" - desc = "Increases your susceptibility to electric shocks by 100%" - cost = -2 - var_changes = list("siemens_coefficient" = 2.0) //This makes you extremely weak to tasers. - -/datum/trait/haemophilia +/datum/trait/negative/haemophilia name = "Haemophilia - Organics only" desc = "When you bleed, you bleed a LOT." cost = -2 var_changes = list("bloodloss_rate" = 2) can_take = ORGANICS -/datum/trait/hollow +/datum/trait/negative/hollow name = "Hollow Bones/Aluminum Alloy" desc = "Your bones and robot limbs are much easier to break." cost = -2 //I feel like this should be higher, but let's see where it goes -/datum/trait/hollow/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/negative/hollow/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) for(var/obj/item/organ/external/O in H.organs) O.min_broken_damage *= 0.5 O.min_bruised_damage *= 0.5 -/datum/trait/lightweight +/datum/trait/negative/lightweight name = "Lightweight" desc = "Your light weight and poor balance make you very susceptible to unhelpful bumping. Think of it like a bowling ball versus a pin." - cost = -2 + cost = -1 var_changes = list("lightweight" = 1) - -/datum/trait/colorblind/mono - name = "Colorblindness (Monochromancy)" - desc = "You simply can't see colors at all, period. You are 100% colorblind." - cost = -1 - -/datum/trait/colorblind/mono/apply(var/datum/species/S,var/mob/living/carbon/human/H) - ..(S,H) - H.add_modifier(/datum/modifier/trait/colorblind_monochrome) - -/datum/trait/colorblind/para_vulp - name = "Colorblindness (Para Vulp)" - desc = "You have a severe issue with green colors and have difficulty recognizing them from red colors." - cost = -1 - -/datum/trait/colorblind/para_vulp/apply(var/datum/species/S,var/mob/living/carbon/human/H) - ..(S,H) - H.add_modifier(/datum/modifier/trait/colorblind_vulp) - -/datum/trait/colorblind/para_taj - name = "Colorblindness (Para Taj)" - desc = "You have a minor issue with blue colors and have difficulty recognizing them from red colors." - cost = -1 - -/datum/trait/colorblind/para_taj/apply(var/datum/species/S,var/mob/living/carbon/human/H) - ..(S,H) - H.add_modifier(/datum/modifier/trait/colorblind_taj) -/datum/trait/neural_hypersensitivity +/datum/trait/negative/neural_hypersensitivity name = "Neural Hypersensitivity" desc = "Your nerves are particularly sensitive to physical changes, leading to experiencing twice the intensity of pain and pleasure alike. Doubles traumatic shock." cost = -1 diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm index 952bd47006..011059a9e0 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm @@ -1,42 +1,42 @@ #define ORGANICS 1 #define SYNTHETICS 2 -/datum/trait/metabolism_up +/datum/trait/neutral/metabolism_up name = "Fast Metabolism" desc = "You process ingested and injected reagents faster, but get hungry faster (Teshari speed)." cost = 0 var_changes = list("metabolic_rate" = 1.2, "hunger_factor" = 0.2, "metabolism" = 0.06) // +20% rate and 4x hunger (Teshari level) - excludes = list(/datum/trait/metabolism_down, /datum/trait/metabolism_apex) + excludes = list(/datum/trait/neutral/metabolism_down, /datum/trait/neutral/metabolism_apex) -/datum/trait/metabolism_down +/datum/trait/neutral/metabolism_down name = "Slow Metabolism" desc = "You process ingested and injected reagents slower, but get hungry slower." cost = 0 var_changes = list("metabolic_rate" = 0.8, "hunger_factor" = 0.04, "metabolism" = 0.0012) // -20% of default. - excludes = list(/datum/trait/metabolism_up, /datum/trait/metabolism_apex) + excludes = list(/datum/trait/neutral/metabolism_up, /datum/trait/neutral/metabolism_apex) -/datum/trait/metabolism_apex +/datum/trait/neutral/metabolism_apex name = "Apex Metabolism" desc = "Finally a proper excuse for your predatory actions. Essentially doubles the fast trait rates. Good for characters with big appetites." cost = 0 var_changes = list("metabolic_rate" = 1.4, "hunger_factor" = 0.4, "metabolism" = 0.012) // +40% rate and 8x hunger (Double Teshari) - excludes = list(/datum/trait/metabolism_up, /datum/trait/metabolism_down) + excludes = list(/datum/trait/neutral/metabolism_up, /datum/trait/neutral/metabolism_down) -/datum/trait/coldadapt +/datum/trait/neutral/coldadapt name = "Cold-Adapted" desc = "You are able to withstand much colder temperatures than other species, and can even be comfortable in extremely cold environments. You are also more vulnerable to hot environments, and have a lower body temperature as a consequence of these adaptations." cost = 0 var_changes = list("cold_level_1" = 200, "cold_level_2" = 150, "cold_level_3" = 90, "breath_cold_level_1" = 180, "breath_cold_level_2" = 100, "breath_cold_level_3" = 60, "cold_discomfort_level" = 210, "heat_level_1" = 330, "heat_level_2" = 380, "heat_level_3" = 700, "breath_heat_level_1" = 360, "breath_heat_level_2" = 400, "breath_heat_level_3" = 850, "heat_discomfort_level" = 295, "body_temperature" = 290) - excludes = list(/datum/trait/hotadapt) + excludes = list(/datum/trait/neutral/hotadapt) -/datum/trait/hotadapt +/datum/trait/neutral/hotadapt name = "Heat-Adapted" desc = "You are able to withstand much hotter temperatures than other species, and can even be comfortable in extremely hot environments. You are also more vulnerable to cold environments, and have a higher body temperature as a consequence of these adaptations." cost = 0 var_changes = list("heat_level_1" = 420, "heat_level_2" = 460, "heat_level_3" = 1100, "breath_heat_level_1" = 440, "breath_heat_level_2" = 510, "breath_heat_level_3" = 1500, "heat_discomfort_level" = 390, "cold_level_1" = 280, "cold_level_2" = 220, "cold_level_3" = 140, "breath_cold_level_1" = 260, "breath_cold_level_2" = 240, "breath_cold_level_3" = 120, "cold_discomfort_level" = 280, "body_temperature" = 330) - excludes = list(/datum/trait/coldadapt) + excludes = list(/datum/trait/neutral/coldadapt) -/datum/trait/autohiss_unathi +/datum/trait/neutral/autohiss_unathi name = "Autohiss (Unathi)" desc = "You roll your S's and x's" cost = 0 @@ -49,9 +49,9 @@ ), autohiss_exempt = list("Sinta'unathi")) - excludes = list(/datum/trait/autohiss_tajaran) + excludes = list(/datum/trait/neutral/autohiss_tajaran) -/datum/trait/autohiss_tajaran +/datum/trait/neutral/autohiss_tajaran name = "Autohiss (Tajaran)" desc = "You roll your R's." cost = 0 @@ -60,74 +60,74 @@ "r" = list("rr", "rrr", "rrrr") ), autohiss_exempt = list("Siik")) - excludes = list(/datum/trait/autohiss_unathi) + excludes = list(/datum/trait/neutral/autohiss_unathi) -/datum/trait/bloodsucker +/datum/trait/neutral/bloodsucker name = "Bloodsucker" desc = "Makes you unable to gain nutrition from anything but blood. To compenstate, you get fangs that can be used to drain blood from prey." cost = 0 custom_only = FALSE var_changes = list("organic_food_coeff" = 0) //The verb is given in human.dm -/datum/trait/bloodsucker/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/bloodsucker/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.verbs |= /mob/living/carbon/human/proc/bloodsuck -/datum/trait/succubus_drain +/datum/trait/neutral/succubus_drain name = "Succubus Drain" desc = "Makes you able to gain nutrition from draining prey in your grasp." cost = 0 custom_only = FALSE -/datum/trait/succubus_drain/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/succubus_drain/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.verbs |= /mob/living/carbon/human/proc/succubus_drain H.verbs |= /mob/living/carbon/human/proc/succubus_drain_finalize H.verbs |= /mob/living/carbon/human/proc/succubus_drain_lethal -/datum/trait/feeder +/datum/trait/neutral/feeder name = "Feeder" desc = "Allows you to feed your prey using your own body." cost = 0 custom_only = FALSE -/datum/trait/feeder/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/feeder/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.verbs |= /mob/living/carbon/human/proc/slime_feed -/datum/trait/hard_vore +/datum/trait/neutral/hard_vore name = "Brutal Predation" desc = "Allows you to tear off limbs & tear out internal organs." cost = 0 custom_only = FALSE -/datum/trait/hard_vore/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/hard_vore/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.verbs |= /mob/living/proc/shred_limb -/datum/trait/trashcan +/datum/trait/neutral/trashcan name = "Trash Can" desc = "Allows you to dispose of some garbage on the go instead of having to look for a bin or littering like an animal." cost = 0 custom_only = FALSE var_changes = list("trashcan" = 1) -/datum/trait/trashcan/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/trashcan/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.verbs |= /mob/living/proc/eat_trash -/datum/trait/gem_eater +/datum/trait/neutral/gem_eater name = "Expensive Taste" desc = "You only gain nutrition from raw ore and refined minerals. There's nothing that sates the appetite better than precious gems, exotic or rare minerals and you have damn fine taste. Anything else is beneath you." cost = 0 custom_only = FALSE var_changes = list("organic_food_coeff" = 0, "eat_minerals" = 1) -/datum/trait/gem_eater/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/gem_eater/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.verbs |= /mob/living/proc/eat_minerals - -/datum/trait/synth_chemfurnace + +/datum/trait/neutral/synth_chemfurnace name = "Biofuel Processor" desc = "You are able to gain energy through consuming and processing normal food. Energy-dense foods such as protein bars and survival food will yield the best results." cost = 0 @@ -135,101 +135,101 @@ can_take = SYNTHETICS var_changes = list("organic_food_coeff" = 0, "synthetic_food_coeff" = 0.25) -/datum/trait/glowing_eyes +/datum/trait/neutral/glowing_eyes name = "Glowing Eyes" desc = "Your eyes show up above darkness. SPOOKY! And kinda edgey too." cost = 0 custom_only = FALSE var_changes = list("has_glowing_eyes" = 1) -/datum/trait/glowing_body +/datum/trait/neutral/glowing_body name = "Glowing Body" desc = "Your body glows about as much as a PDA light! Settable color and toggle in Abilities tab ingame." cost = 0 custom_only = FALSE -/datum/trait/glowing_body/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/glowing_body/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.verbs |= /mob/living/proc/glow_toggle H.verbs |= /mob/living/proc/glow_color //Allergen traits! Not available to any species with a base allergens var. -/datum/trait/allergy +/datum/trait/neutral/allergy name = "Allergy: Gluten" desc = "You're highly allergic to gluten proteins, which are found in most common grains." cost = 0 custom_only = FALSE var/allergen = GRAINS -/datum/trait/allergy/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/allergy/apply(var/datum/species/S,var/mob/living/carbon/human/H) S.allergens |= allergen ..(S,H) -/datum/trait/allergy/meat +/datum/trait/neutral/allergy/meat name = "Allergy: Meat" desc = "You're highly allergic to just about any form of meat. You're probably better off just sticking to vegetables. NB: By taking this trait, you acknowledge there is a risk your character may suffer a fatal reaction if exposed to this substance." cost = 0 custom_only = FALSE allergen = MEAT -/datum/trait/allergy/fish +/datum/trait/neutral/allergy/fish name = "Allergy: Fish" desc = "You're highly allergic to fish. It's probably best to avoid seafood in general. NB: By taking this trait, you acknowledge there is a risk your character may suffer a fatal reaction if exposed to this substance." cost = 0 custom_only = FALSE allergen = FISH -/datum/trait/allergy/fruit +/datum/trait/neutral/allergy/fruit name = "Allergy: Fruit" desc = "You're highly allergic to fruit. Vegetables are fine, but you should probably read up on how to tell the difference. Remember, tomatoes are a fruit. NB: By taking this trait, you acknowledge there is a risk your character may suffer a fatal reaction if exposed to this substance." cost = 0 custom_only = FALSE allergen = FRUIT -/datum/trait/allergy/vegetable +/datum/trait/neutral/allergy/vegetable name = "Allergy: Vegetable" desc = "You're highly allergic to vegetables. Fruit are fine, but you should probably read up on how to tell the difference. NB: By taking this trait, you acknowledge there is a risk your character may suffer a fatal reaction if exposed to this substance." cost = 0 custom_only = FALSE allergen = VEGETABLE -/datum/trait/allergy/nuts +/datum/trait/neutral/allergy/nuts name = "Allergy: Nuts" desc = "You're highly allergic to hard-shell seeds, such as peanuts. NB: By taking this trait, you acknowledge there is a risk your character may suffer a fatal reaction if exposed to this substance." cost = 0 custom_only = FALSE allergen = SEEDS -/datum/trait/allergy/soy +/datum/trait/neutral/allergy/soy name = "Allergy: Soy" desc = "You're highly allergic to soybeans, and some other kinds of bean. NB: By taking this trait, you acknowledge there is a risk your character may suffer a fatal reaction if exposed to this substance." cost = 0 custom_only = FALSE allergen = BEANS -/datum/trait/allergy/dairy +/datum/trait/neutral/allergy/dairy name = "Allergy: Lactose" desc = "You're highly allergic to lactose, and consequently, just about all forms of dairy. NB: By taking this trait, you acknowledge there is a risk your character may suffer a fatal reaction if exposed to this substance." cost = 0 custom_only = FALSE allergen = DAIRY -/datum/trait/allergy/fungi +/datum/trait/neutral/allergy/fungi name = "Allergy: Fungi" desc = "You're highly allergic to fungi such as mushrooms. NB: By taking this trait, you acknowledge there is a risk your character may suffer a fatal reaction if exposed to this substance." cost = 0 custom_only = FALSE allergen = FUNGI -/datum/trait/allergy/coffee +/datum/trait/neutral/allergy/coffee name = "Allergy: Coffee" desc = "You're highly allergic to coffee in specific. NB: By taking this trait, you acknowledge there is a risk your character may suffer a fatal reaction if exposed to this substance." cost = 0 custom_only = FALSE allergen = COFFEE - -/datum/trait/allergen_reduced_effect + +/datum/trait/neutral/allergen_reduced_effect name = "Reduced Allergen Reaction" desc = "This trait halves the lethality of allergen reactions. If you don't have any allergens set, it does nothing. It does not apply to nonlethal reactions or special reactions (such as unathi drowsiness from sugars)." cost = 0 @@ -237,42 +237,42 @@ var_changes = list("allergen_damage_severity" = 0.6) // Spicy Food Traits, from negative to positive. -/datum/trait/spice_intolerance_extreme +/datum/trait/neutral/spice_intolerance_extreme name = "Extreme Spice Intolerance" desc = "Spicy (and chilly) peppers are three times as strong. (This does not affect pepperspray.)" cost = 0 custom_only = FALSE var_changes = list("spice_mod" = 3) // 300% as effective if spice_mod is set to 1. If it's not 1 in species.dm, update this! -/datum/trait/spice_intolerance_basic +/datum/trait/neutral/spice_intolerance_basic name = "Heavy Spice Intolerance" desc = "Spicy (and chilly) peppers are twice as strong. (This does not affect pepperspray.)" cost = 0 custom_only = FALSE var_changes = list("spice_mod" = 2) // 200% as effective if spice_mod is set to 1. If it's not 1 in species.dm, update this! -/datum/trait/spice_intolerance_slight +/datum/trait/neutral/spice_intolerance_slight name = "Slight Spice Intolerance" desc = "You have a slight struggle with spicy foods. Spicy (and chilly) peppers are one and a half times stronger. (This does not affect pepperspray.)" cost = 0 custom_only = FALSE var_changes = list("spice_mod" = 1.5) // 150% as effective if spice_mod is set to 1. If it's not 1 in species.dm, update this! -/datum/trait/spice_tolerance_basic +/datum/trait/neutral/spice_tolerance_basic name = "Spice Tolerance" desc = "Spicy (and chilly) peppers are only three-quarters as strong. (This does not affect pepperspray.)" cost = 0 custom_only = FALSE var_changes = list("spice_mod" = 0.75) // 75% as effective if spice_mod is set to 1. If it's not 1 in species.dm, update this! -/datum/trait/spice_tolerance_advanced +/datum/trait/neutral/spice_tolerance_advanced name = "Strong Spice Tolerance" desc = "Spicy (and chilly) peppers are only half as strong. (This does not affect pepperspray.)" cost = 0 custom_only = FALSE var_changes = list("spice_mod" = 0.5) // 50% as effective if spice_mod is set to 1. If it's not 1 in species.dm, update this! -/datum/trait/spice_immunity +/datum/trait/neutral/spice_immunity name = "Extreme Spice Tolerance" desc = "Spicy (and chilly) peppers are basically ineffective! (This does not affect pepperspray.)" cost = 0 @@ -280,42 +280,42 @@ var_changes = list("spice_mod" = 0.25) // 25% as effective if spice_mod is set to 1. If it's not 1 in species.dm, update this! // Alcohol Traits Start Here, from negative to positive. -/datum/trait/alcohol_intolerance_advanced +/datum/trait/neutral/alcohol_intolerance_advanced name = "Liver of Air" desc = "The only way you can hold a drink is if it's in your own two hands, and even then you'd best not inhale too deeply near it. Drinks are three times as strong." cost = 0 custom_only = FALSE var_changes = list("alcohol_mod" = 3) // 300% as effective if alcohol_mod is set to 1. If it's not 1 in species.dm, update this! -/datum/trait/alcohol_intolerance_basic +/datum/trait/neutral/alcohol_intolerance_basic name = "Liver of Lilies" desc = "You have a hard time with alcohol. Maybe you just never took to it, or maybe it doesn't agree with you... either way, drinks are twice as strong." cost = 0 custom_only = FALSE var_changes = list("alcohol_mod" = 2) // 200% as effective if alcohol_mod is set to 1. If it's not 1 in species.dm, update this! -/datum/trait/alcohol_intolerance_slight +/datum/trait/neutral/alcohol_intolerance_slight name = "Liver of Tulips" desc = "You have a slight struggle with alcohol. Drinks are one and a half times stronger." cost = 0 custom_only = FALSE var_changes = list("alcohol_mod" = 1.5) // 150% as effective if alcohol_mod is set to 1. If it's not 1 in species.dm, update this! -/datum/trait/alcohol_tolerance_basic +/datum/trait/neutral/alcohol_tolerance_basic name = "Liver of Iron" desc = "You can hold drinks much better than those lily-livered land-lubbers! Arr! Drinks are only three-quarters as strong." cost = 0 custom_only = FALSE var_changes = list("alcohol_mod" = 0.75) // 75% as effective if alcohol_mod is set to 1. If it's not 1 in species.dm, update this! -/datum/trait/alcohol_tolerance_advanced +/datum/trait/neutral/alcohol_tolerance_advanced name = "Liver of Steel" desc = "Drinks tremble before your might! You can hold your alcohol twice as well as those blue-bellied barnacle boilers! Drinks are only half as strong." cost = 0 custom_only = FALSE var_changes = list("alcohol_mod" = 0.5) // 50% as effective if alcohol_mod is set to 1. If it's not 1 in species.dm, update this! -/datum/trait/alcohol_immunity +/datum/trait/neutral/alcohol_immunity name = "Liver of Durasteel" desc = "You've drunk so much that most booze doesn't even faze you. It takes something like a Pan-Galactic or a pint of Deathbell for you to even get slightly buzzed." cost = 0 @@ -323,99 +323,126 @@ var_changes = list("alcohol_mod" = 0.25) // 25% as effective if alcohol_mod is set to 1. If it's not 1 in species.dm, update this! // Alcohol Traits End Here. +/datum/trait/neutral/colorblind/mono + name = "Colorblindness (Monochromancy)" + desc = "You simply can't see colors at all, period. You are 100% colorblind." + cost = 0 + +/datum/trait/neutral/colorblind/mono/apply(var/datum/species/S,var/mob/living/carbon/human/H) + ..(S,H) + H.add_modifier(/datum/modifier/trait/colorblind_monochrome) + +/datum/trait/neutral/colorblind/para_vulp + name = "Colorblindness (Para Vulp)" + desc = "You have a severe issue with green colors and have difficulty recognizing them from red colors." + cost = 0 + +/datum/trait/neutral/colorblind/para_vulp/apply(var/datum/species/S,var/mob/living/carbon/human/H) + ..(S,H) + H.add_modifier(/datum/modifier/trait/colorblind_vulp) + +/datum/trait/neutral/colorblind/para_taj + name = "Colorblindness (Para Taj)" + desc = "You have a minor issue with blue colors and have difficulty recognizing them from red colors." + cost = 0 + +/datum/trait/neutral/colorblind/para_taj/apply(var/datum/species/S,var/mob/living/carbon/human/H) + ..(S,H) + H.add_modifier(/datum/modifier/trait/colorblind_taj) + // Body shape traits -/datum/trait/taller +/datum/trait/neutral/taller name = "Tall" desc = "Your body is taller than average." cost = 0 custom_only = FALSE var_changes = list("icon_scale_y" = 1.09) - excludes = list(/datum/trait/tall, /datum/trait/short, /datum/trait/shorter) + excludes = list(/datum/trait/neutral/tall, /datum/trait/neutral/short, /datum/trait/neutral/shorter) -/datum/trait/taller/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/taller/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.update_transform() -/datum/trait/tall +/datum/trait/neutral/tall name = "Slightly Tall" desc = "Your body is a bit taller than average." cost = 0 custom_only = FALSE var_changes = list("icon_scale_y" = 1.05) - excludes = list(/datum/trait/taller, /datum/trait/short, /datum/trait/shorter) + excludes = list(/datum/trait/neutral/taller, /datum/trait/neutral/short, /datum/trait/neutral/shorter) -/datum/trait/tall/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/tall/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.update_transform() -/datum/trait/short +/datum/trait/neutral/short name = "Slightly Short" desc = "Your body is a bit shorter than average." cost = 0 custom_only = FALSE var_changes = list("icon_scale_y" = 0.95) - excludes = list(/datum/trait/taller, /datum/trait/tall, /datum/trait/shorter) + excludes = list(/datum/trait/neutral/taller, /datum/trait/neutral/tall, /datum/trait/neutral/shorter) -/datum/trait/short/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/short/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.update_transform() -/datum/trait/shorter +/datum/trait/neutral/shorter name = "Short" desc = "Your body is shorter than average." cost = 0 custom_only = FALSE var_changes = list("icon_scale_y" = 0.915) - excludes = list(/datum/trait/taller, /datum/trait/tall, /datum/trait/short) + excludes = list(/datum/trait/neutral/taller, /datum/trait/neutral/tall, /datum/trait/neutral/short) -/datum/trait/shorter/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/shorter/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.update_transform() -/datum/trait/obese +/datum/trait/neutral/obese name = "Very Bulky" desc = "Your body is much wider than average." cost = 0 custom_only = FALSE var_changes = list("icon_scale_x" = 1.095) - excludes = list(/datum/trait/fat, /datum/trait/thin, /datum/trait/thinner) + excludes = list(/datum/trait/neutral/fat, /datum/trait/neutral/thin, /datum/trait/neutral/thinner) -/datum/trait/obese/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/obese/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.update_transform() -/datum/trait/fat +/datum/trait/neutral/fat name = "Bulky" desc = "Your body is wider than average." cost = 0 custom_only = FALSE var_changes = list("icon_scale_x" = 1.054) - excludes = list(/datum/trait/obese, /datum/trait/thin, /datum/trait/thinner) + excludes = list(/datum/trait/neutral/obese, /datum/trait/neutral/thin, /datum/trait/neutral/thinner) -/datum/trait/fat/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/fat/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.update_transform() -/datum/trait/thin +/datum/trait/neutral/thin name = "Thin" desc = "Your body is thinner than average." cost = 0 custom_only = FALSE var_changes = list("icon_scale_x" = 0.945) - excludes = list(/datum/trait/fat, /datum/trait/obese, /datum/trait/thinner) + excludes = list(/datum/trait/neutral/fat, /datum/trait/neutral/obese, /datum/trait/neutral/thinner) -/datum/trait/thin/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/thin/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.update_transform() -/datum/trait/thinner +/datum/trait/neutral/thinner name = "Very Thin" desc = "Your body is much thinner than average." cost = 0 custom_only = FALSE var_changes = list("icon_scale_x" = 0.905) - excludes = list(/datum/trait/fat, /datum/trait/obese, /datum/trait/thin) + excludes = list(/datum/trait/neutral/fat, /datum/trait/neutral/obese, /datum/trait/neutral/thin) -/datum/trait/thinner/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/thinner/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.update_transform() diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm index 4b86afc141..423fb12cf9 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm @@ -1,152 +1,149 @@ #define ORGANICS 1 #define SYNTHETICS 2 -/datum/trait/speed_fast +/datum/trait/positive + category = 1 + +/datum/trait/positive/speed_fast name = "Haste" desc = "Allows you to move faster on average than baseline." cost = 4 var_changes = list("slowdown" = -0.5) -/datum/trait/hardy +/datum/trait/positive/hardy name = "Hardy" desc = "Allows you to carry heavy equipment with less slowdown." - cost = 1 + cost = 4 var_changes = list("item_slowdown_mod" = 0.5) -/datum/trait/hardy_plus - name = "Major Hardy" - desc = "Allows you to carry heavy equipment with almost no slowdown." - cost = 2 - var_changes = list("item_slowdown_mod" = 0.1) - -/datum/trait/endurance_high +/datum/trait/positive/endurance_high name = "High Endurance" - desc = "Increases your maximum total hitpoints to 125" - cost = 4 - var_changes = list("total_health" = 125) + desc = "Increases your maximum total hitpoints to 120" + cost = 3 + var_changes = list("total_health" = 120) apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.setMaxHealth(S.total_health) -/datum/trait/nonconductive +/datum/trait/positive/nonconductive name = "Non-Conductive" + desc = "Decreases your susceptibility to electric shocks by a 10% amount." + cost = 1 //This effects tasers! + var_changes = list("siemens_coefficient" = 0.9) + +/datum/trait/positive/nonconductive_plus + name = "Major Non-Conductive" desc = "Decreases your susceptibility to electric shocks by a 25% amount." - cost = 2 //This effects tasers! + cost = 2 //Let us not forget this effects tasers! var_changes = list("siemens_coefficient" = 0.75) -/datum/trait/nonconductive_plus - name = "Major Non-Conductive" - desc = "Decreases your susceptibility to electric shocks by a 50% amount." - cost = 3 //Let us not forget this effects tasers! - var_changes = list("siemens_coefficient" = 0.5) - -/datum/trait/darksight +/datum/trait/positive/darksight name = "Darksight" desc = "Allows you to see a short distance in the dark." cost = 1 - var_changes = list("darksight" = 5, "flash_mod" = 2.0) + var_changes = list("darksight" = 4, "flash_mod" = 1.1) -/datum/trait/darksight_plus +/datum/trait/positive/darksight_plus name = "Darksight (Major)" desc = "Allows you to see in the dark for the whole screen." cost = 2 - var_changes = list("darksight" = 8, "flash_mod" = 3.0) + var_changes = list("darksight" = 7, "flash_mod" = 1.2) -/datum/trait/melee_attack +/datum/trait/positive/melee_attack name = "Sharp Melee" desc = "Provides sharp melee attacks that do slightly more damage." - cost = 1 + cost = 0 var_changes = list("unarmed_types" = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp)) -/datum/trait/melee_attack_fangs +/datum/trait/positive/melee_attack_fangs name = "Sharp Melee & Numbing Fangs" desc = "Provides sharp melee attacks that do slightly more damage, along with fangs that makes the person bit unable to feel their body or pain." - cost = 2 + cost = 1 var_changes = list("unarmed_types" = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp, /datum/unarmed_attack/bite/sharp/numbing)) -/datum/trait/fangs +/datum/trait/positive/fangs name = "Numbing Fangs" desc = "Provides fangs that makes the person bit unable to feel their body or pain." - cost = 1 + cost = 0 var_changes = list("unarmed_types" = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/punch, /datum/unarmed_attack/bite/sharp/numbing)) -/datum/trait/minor_brute_resist +/datum/trait/positive/minor_brute_resist name = "Minor Brute Resist" - desc = "Adds 15% resistance to brute damage sources." - cost = 2 - var_changes = list("brute_mod" = 0.85) - -/datum/trait/brute_resist - name = "Brute Resist" - desc = "Adds 25% resistance to brute damage sources." - cost = 3 - var_changes = list("brute_mod" = 0.75) - excludes = list(/datum/trait/minor_burn_resist,/datum/trait/burn_resist) - -/datum/trait/minor_burn_resist - name = "Minor Burn Resist" - desc = "Adds 15% resistance to burn damage sources." - cost = 2 - var_changes = list("burn_mod" = 0.85) - -/datum/trait/burn_resist - name = "Burn Resist" - desc = "Adds 25% resistance to burn damage sources." - cost = 3 - var_changes = list("burn_mod" = 0.75) - excludes = list(/datum/trait/minor_brute_resist,/datum/trait/brute_resist) - -/datum/trait/photoresistant - name = "Photoresistant" - desc = "Decreases stun duration from flashes and other light-based stuns and disabilities by 50%" + desc = "Adds 10% resistance to brute damage sources." cost = 1 - var_changes = list("flash_mod" = 0.5) + var_changes = list("brute_mod" = 0.9) -/datum/trait/winged_flight +/datum/trait/positive/brute_resist + name = "Brute Resist" + desc = "Adds 20% resistance to brute damage sources." + cost = 3 + var_changes = list("brute_mod" = 0.8) + excludes = list(/datum/trait/positive/minor_burn_resist,/datum/trait/positive/burn_resist) + +/datum/trait/positive/minor_burn_resist + name = "Minor Burn Resist" + desc = "Adds 10% resistance to burn damage sources." + cost = 1 + var_changes = list("burn_mod" = 0.9) + +/datum/trait/positive/burn_resist + name = "Burn Resist" + desc = "Adds 20% resistance to burn damage sources." + cost = 3 + var_changes = list("burn_mod" = 0.8) + excludes = list(/datum/trait/positive/minor_brute_resist,/datum/trait/positive/brute_resist) + +/datum/trait/positive/photoresistant + name = "Photoresistant" + desc = "Decreases stun duration from flashes and other light-based stuns and disabilities by 20%" + cost = 0 + var_changes = list("flash_mod" = 0.8) + +/datum/trait/positive/winged_flight name = "Winged Flight" desc = "Allows you to fly by using your wings. Don't forget to bring them!" - cost = 1 + cost = 0 -/datum/trait/winged_flight/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/positive/winged_flight/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) H.verbs |= /mob/living/proc/flying_toggle H.verbs |= /mob/living/proc/start_wings_hovering -/datum/trait/hardfeet +/datum/trait/positive/hardfeet name = "Hard Feet" desc = "Makes your nice clawed, scaled, hooved, armored, or otherwise just awfully calloused feet immune to glass shards." - cost = 1 + cost = 0 var_changes = list("flags" = NO_MINOR_CUT) //Checked the flag is only used by shard stepping. -/datum/trait/antiseptic_saliva +/datum/trait/positive/antiseptic_saliva name = "Antiseptic Saliva" desc = "Your saliva has especially strong antiseptic properties that can be used to heal small wounds." - cost = 1 + cost = 0 -/datum/trait/antiseptic_saliva/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/positive/antiseptic_saliva/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..() H.verbs |= /mob/living/carbon/human/proc/lick_wounds -/datum/trait/traceur +/datum/trait/positive/traceur name = "Traceur" desc = "You're capable of parkour and can *flip over low objects (most of the time)." cost = 2 var_changes = list("agility" = 90) -/datum/trait/snowwalker +/datum/trait/positive/snowwalker name = "Snow Walker" desc = "You are able to move unhindered on snow." - cost = 1 + cost = 0 var_changes = list("snow_movement" = -2) -/datum/trait/weaver +/datum/trait/positive/weaver name = "Weaver" desc = "You can produce silk and create various articles of clothing and objects." - cost = 2 + cost = 1 var_changes = list("is_weaver" = 1) -/datum/trait/weaver/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/positive/weaver/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..() H.verbs |= /mob/living/carbon/human/proc/check_silk_amount H.verbs |= /mob/living/carbon/human/proc/toggle_silk_production diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/trait.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/trait.dm index 52b2e3b9f5..9c841429d0 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/trait.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/trait.dm @@ -5,7 +5,8 @@ var/name var/desc = "Contact a developer if you see this trait." - var/cost = 0 // 0 is neutral, negative cost means negative, positive cost means positive. + var/cost = 0 + var/category = 0 // What category this trait is. -1 is Negative, 0 is Neutral, 1 is Positive var/list/var_changes // A list to apply to the custom species vars. var/list/excludes // Store a list of paths of traits to exclude, but done automatically if they change the same vars. var/can_take = ORGANICS|SYNTHETICS // Can freaking synths use those. diff --git a/vorestation.dme b/vorestation.dme index 15caeedeed..50f134b80a 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2662,6 +2662,7 @@ #include "code\modules\mob\living\carbon\human\species\station\station_special_abilities_vr.dm" #include "code\modules\mob\living\carbon\human\species\station\station_special_vr.dm" #include "code\modules\mob\living\carbon\human\species\station\station_vr.dm" +#include "code\modules\mob\living\carbon\human\species\station\teshari.dm" #include "code\modules\mob\living\carbon\human\species\station\xenochimera_hud_vr.dm" #include "code\modules\mob\living\carbon\human\species\station\xenochimera_trait_vr.dm" #include "code\modules\mob\living\carbon\human\species\station\protean_vr\protean_blob.dm" @@ -2673,7 +2674,6 @@ #include "code\modules\mob\living\carbon\human\species\station\traits_vr\trait.dm" #include "code\modules\mob\living\carbon\human\species\station\traits_vr\weaver_objs.dm" #include "code\modules\mob\living\carbon\human\species\station\traits_vr\weaver_recipies.dm" -#include "code\modules\mob\living\carbon\human\species\station\teshari.dm" #include "code\modules\mob\living\carbon\human\species\virtual_reality\avatar.dm" #include "code\modules\mob\living\carbon\human\species\virtual_reality\opaque_form.dm" #include "code\modules\mob\living\carbon\human\species\xenomorphs\alien_powers.dm" From 588a6912f14fc39fcfe430fde7d9f54b6b28fa19 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 28 Mar 2021 23:33:25 -0400 Subject: [PATCH 02/38] 3 is a bit too much. --- .../living/carbon/human/species/station/traits_vr/negative.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm index e85cda5315..e4f017dcd8 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm @@ -13,7 +13,7 @@ /datum/trait/negative/weakling name = "Weakling" desc = "Causes heavy equipment to slow you down more when carried." - cost = -3 + cost = -2 var_changes = list("item_slowdown_mod" = 1.5) /datum/trait/negative/endurance_low From 22f632db42980df1d04e200b8b92c3aa49cafdf4 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 29 Mar 2021 00:01:15 -0400 Subject: [PATCH 03/38] Hardy to 3 --- .../living/carbon/human/species/station/traits_vr/positive.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm index 423fb12cf9..d814c62bf1 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm @@ -13,7 +13,7 @@ /datum/trait/positive/hardy name = "Hardy" desc = "Allows you to carry heavy equipment with less slowdown." - cost = 4 + cost = 3 var_changes = list("item_slowdown_mod" = 0.5) /datum/trait/positive/endurance_high From 339048ec7bb8a4d5b27a5c263fed521549bd84ff Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 29 Mar 2021 01:17:00 -0400 Subject: [PATCH 04/38] Partial revert. --- .../species/station/traits_vr/negative.dm | 42 +++++++++++++++++-- .../species/station/traits_vr/positive.dm | 24 +++++------ 2 files changed, 50 insertions(+), 16 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm index e4f017dcd8..89ac837b83 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm @@ -7,20 +7,42 @@ /datum/trait/negative/speed_slow name = "Slowdown" desc = "Allows you to move slower on average than baseline." - cost = -3 + cost = -2 var_changes = list("slowdown" = 0.5) +/datum/trait/negative/speed_slow_plus + name = "Major Slowdown" + desc = "Allows you to move MUCH slower on average than baseline." + cost = -3 + var_changes = list("slowdown" = 1.0) + /datum/trait/negative/weakling name = "Weakling" desc = "Causes heavy equipment to slow you down more when carried." - cost = -2 + cost = -1 var_changes = list("item_slowdown_mod" = 1.5) +/datum/trait/negative/weakling_plus + name = "Major Weakling" + desc = "Allows you to carry heavy equipment with much more slowdown." + cost = -2 + var_changes = list("item_slowdown_mod" = 2.0) + /datum/trait/negative/endurance_low name = "Low Endurance" - desc = "Reduces your maximum total hitpoints to 85." + desc = "Reduces your maximum total hitpoints to 75." cost = -2 - var_changes = list("total_health" = 85) + var_changes = list("total_health" = 75) + + apply(var/datum/species/S,var/mob/living/carbon/human/H) + ..(S,H) + H.setMaxHealth(S.total_health + +/datum/trait/negative/endurance_very_low + name = "Extremely Low Endurance" + desc = "Reduces your maximum total hitpoints to 50." + cost = -3 //Teshari HP. This makes the person a lot more suseptable to getting stunned, killed, etc. + var_changes = list("total_health" = 50) apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) @@ -38,6 +60,12 @@ cost = -2 var_changes = list("brute_mod" = 1.25) +/datum/trait/negative/brute_weak_plus + name = "Major Brute Weakness" + desc = "Increases damage from brute damage sources by 50%" + cost = -3 + var_changes = list("brute_mod" = 1.5) + /datum/trait/negative/minor_burn_weak name = "Minor Burn Weakness" desc = "Increases damage from burn damage sources by 15%" @@ -50,6 +78,12 @@ cost = -2 var_changes = list("burn_mod" = 1.25) +/datum/trait/negative/burn_weak_plus + name = "Major Burn Weakness" + desc = "Increases damage from burn damage sources by 50%" + cost = -3 + var_changes = list("burn_mod" = 1.5) + /datum/trait/negative/conductive name = "Conductive" desc = "Increases your susceptibility to electric shocks by 50%" diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm index d814c62bf1..db31c8d127 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm @@ -13,14 +13,14 @@ /datum/trait/positive/hardy name = "Hardy" desc = "Allows you to carry heavy equipment with less slowdown." - cost = 3 + cost = 2 var_changes = list("item_slowdown_mod" = 0.5) /datum/trait/positive/endurance_high name = "High Endurance" - desc = "Increases your maximum total hitpoints to 120" - cost = 3 - var_changes = list("total_health" = 120) + desc = "Increases your maximum total hitpoints to 125" + cost = 4 + var_changes = list("total_health" = 125) apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) @@ -71,27 +71,27 @@ /datum/trait/positive/minor_brute_resist name = "Minor Brute Resist" desc = "Adds 10% resistance to brute damage sources." - cost = 1 - var_changes = list("brute_mod" = 0.9) + cost = 2 + var_changes = list("brute_mod" = 0.85) /datum/trait/positive/brute_resist name = "Brute Resist" desc = "Adds 20% resistance to brute damage sources." cost = 3 - var_changes = list("brute_mod" = 0.8) + var_changes = list("brute_mod" = 0.75) excludes = list(/datum/trait/positive/minor_burn_resist,/datum/trait/positive/burn_resist) /datum/trait/positive/minor_burn_resist name = "Minor Burn Resist" desc = "Adds 10% resistance to burn damage sources." - cost = 1 - var_changes = list("burn_mod" = 0.9) + cost = 2 + var_changes = list("burn_mod" = 0.85) /datum/trait/positive/burn_resist name = "Burn Resist" desc = "Adds 20% resistance to burn damage sources." cost = 3 - var_changes = list("burn_mod" = 0.8) + var_changes = list("burn_mod" = 0.75) excludes = list(/datum/trait/positive/minor_brute_resist,/datum/trait/positive/brute_resist) /datum/trait/positive/photoresistant @@ -119,7 +119,7 @@ /datum/trait/positive/antiseptic_saliva name = "Antiseptic Saliva" desc = "Your saliva has especially strong antiseptic properties that can be used to heal small wounds." - cost = 0 + cost = 1 /datum/trait/positive/antiseptic_saliva/apply(var/datum/species/S,var/mob/living/carbon/human/H) ..() @@ -128,7 +128,7 @@ /datum/trait/positive/traceur name = "Traceur" desc = "You're capable of parkour and can *flip over low objects (most of the time)." - cost = 2 + cost = 1 var_changes = list("agility" = 90) /datum/trait/positive/snowwalker From 62a3ded94ad6b2522af1fe3cb41cfcff80bd0f93 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 29 Mar 2021 01:17:40 -0400 Subject: [PATCH 05/38] How did that dissapear --- .../living/carbon/human/species/station/traits_vr/negative.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm index 89ac837b83..e714c52372 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm @@ -36,7 +36,7 @@ apply(var/datum/species/S,var/mob/living/carbon/human/H) ..(S,H) - H.setMaxHealth(S.total_health + H.setMaxHealth(S.total_health) /datum/trait/negative/endurance_very_low name = "Extremely Low Endurance" From 103411bd6a3b0a2e29f713f0c8eb6af0e816068c Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 29 Mar 2021 01:20:15 -0400 Subject: [PATCH 06/38] Part two of the revert --- .../human/species/station/traits_vr/negative.dm | 2 +- .../human/species/station/traits_vr/positive.dm | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm index e714c52372..a6e033f8c6 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm @@ -111,7 +111,7 @@ /datum/trait/negative/lightweight name = "Lightweight" desc = "Your light weight and poor balance make you very susceptible to unhelpful bumping. Think of it like a bowling ball versus a pin." - cost = -1 + cost = -2 var_changes = list("lightweight" = 1) /datum/trait/negative/neural_hypersensitivity diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm index db31c8d127..e8ce4fa599 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm @@ -70,26 +70,26 @@ /datum/trait/positive/minor_brute_resist name = "Minor Brute Resist" - desc = "Adds 10% resistance to brute damage sources." + desc = "Adds 15% resistance to brute damage sources." cost = 2 var_changes = list("brute_mod" = 0.85) /datum/trait/positive/brute_resist name = "Brute Resist" - desc = "Adds 20% resistance to brute damage sources." + desc = "Adds 25% resistance to brute damage sources." cost = 3 var_changes = list("brute_mod" = 0.75) excludes = list(/datum/trait/positive/minor_burn_resist,/datum/trait/positive/burn_resist) /datum/trait/positive/minor_burn_resist name = "Minor Burn Resist" - desc = "Adds 10% resistance to burn damage sources." + desc = "Adds 15% resistance to burn damage sources." cost = 2 var_changes = list("burn_mod" = 0.85) /datum/trait/positive/burn_resist name = "Burn Resist" - desc = "Adds 20% resistance to burn damage sources." + desc = "Adds 25% resistance to burn damage sources." cost = 3 var_changes = list("burn_mod" = 0.75) excludes = list(/datum/trait/positive/minor_brute_resist,/datum/trait/positive/brute_resist) @@ -128,7 +128,7 @@ /datum/trait/positive/traceur name = "Traceur" desc = "You're capable of parkour and can *flip over low objects (most of the time)." - cost = 1 + cost = 2 var_changes = list("agility" = 90) /datum/trait/positive/snowwalker @@ -140,7 +140,7 @@ /datum/trait/positive/weaver name = "Weaver" desc = "You can produce silk and create various articles of clothing and objects." - cost = 1 + cost = 2 var_changes = list("is_weaver" = 1) /datum/trait/positive/weaver/apply(var/datum/species/S,var/mob/living/carbon/human/H) From 1e9dc40f24938798f75d937878801774af5d7d1a Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 29 Mar 2021 01:25:22 -0400 Subject: [PATCH 07/38] Tweaks can_take for neural hypersensitivity --- .../living/carbon/human/species/station/traits_vr/negative.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm index a6e033f8c6..b6590fe54c 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm @@ -119,4 +119,4 @@ desc = "Your nerves are particularly sensitive to physical changes, leading to experiencing twice the intensity of pain and pleasure alike. Doubles traumatic shock." cost = -1 var_changes = list("trauma_mod" = 2) - + can_take = ORGANICS From b7b4c534bf81f2d291b05716641342ad08018847 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 29 Mar 2021 13:07:17 -0400 Subject: [PATCH 08/38] Readds conductive plus --- .../carbon/human/species/station/traits_vr/negative.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm index b6590fe54c..fa822196b1 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm @@ -90,6 +90,12 @@ cost = -1 var_changes = list("siemens_coefficient" = 1.5) //This makes you a lot weaker to tasers. +/datum/trait/negative/conductive_plus + name = "Major Conductive" + desc = "Increases your susceptibility to electric shocks by 100%" + cost = -1 + var_changes = list("siemens_coefficient" = 2.0) //This makes you extremely weak to tasers. + /datum/trait/negative/haemophilia name = "Haemophilia - Organics only" desc = "When you bleed, you bleed a LOT." From 1dd83452654c38329d0639b1cd48f23d7e2b6863 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 3 Apr 2021 17:57:57 -0400 Subject: [PATCH 09/38] Tweaks a few values. --- .../species/station/traits_vr/positive.dm | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm index e8ce4fa599..1cd42f9b40 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm @@ -9,12 +9,21 @@ desc = "Allows you to move faster on average than baseline." cost = 4 var_changes = list("slowdown" = -0.5) + excludes = list(/datum/trait/positive/hardy,/datum/trait/positive/hardy_plus) /datum/trait/positive/hardy name = "Hardy" desc = "Allows you to carry heavy equipment with less slowdown." cost = 2 var_changes = list("item_slowdown_mod" = 0.5) + excludes = list(/datum/trait/positive/speed_fast) + +/datum/trait/positive/hardy_plus + name = "Major Hardy" + desc = "Allows you to carry heavy equipment with almost no slowdown." + cost = 3 + var_changes = list("item_slowdown_mod" = 0.25) + excludes = list(/datum/trait/positive/speed_fast) /datum/trait/positive/endurance_high name = "High Endurance" @@ -42,30 +51,30 @@ name = "Darksight" desc = "Allows you to see a short distance in the dark." cost = 1 - var_changes = list("darksight" = 4, "flash_mod" = 1.1) + var_changes = list("darksight" = 5, "flash_mod" = 1.1) /datum/trait/positive/darksight_plus name = "Darksight (Major)" desc = "Allows you to see in the dark for the whole screen." cost = 2 - var_changes = list("darksight" = 7, "flash_mod" = 1.2) + var_changes = list("darksight" = 8, "flash_mod" = 1.2) /datum/trait/positive/melee_attack name = "Sharp Melee" desc = "Provides sharp melee attacks that do slightly more damage." - cost = 0 + cost = 1 var_changes = list("unarmed_types" = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp)) /datum/trait/positive/melee_attack_fangs name = "Sharp Melee & Numbing Fangs" desc = "Provides sharp melee attacks that do slightly more damage, along with fangs that makes the person bit unable to feel their body or pain." - cost = 1 + cost = 2 var_changes = list("unarmed_types" = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp, /datum/unarmed_attack/bite/sharp/numbing)) /datum/trait/positive/fangs name = "Numbing Fangs" desc = "Provides fangs that makes the person bit unable to feel their body or pain." - cost = 0 + cost = 1 var_changes = list("unarmed_types" = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/punch, /datum/unarmed_attack/bite/sharp/numbing)) /datum/trait/positive/minor_brute_resist @@ -97,7 +106,7 @@ /datum/trait/positive/photoresistant name = "Photoresistant" desc = "Decreases stun duration from flashes and other light-based stuns and disabilities by 20%" - cost = 0 + cost = 1 var_changes = list("flash_mod" = 0.8) /datum/trait/positive/winged_flight @@ -134,7 +143,7 @@ /datum/trait/positive/snowwalker name = "Snow Walker" desc = "You are able to move unhindered on snow." - cost = 0 + cost = 1 var_changes = list("snow_movement" = -2) /datum/trait/positive/weaver From 5dbe6e174b65392b48bfd745838ba25f5f0f4674 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Sun, 4 Apr 2021 19:26:18 -0400 Subject: [PATCH 10/38] Update positive.dm --- .../carbon/human/species/station/traits_vr/positive.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm index 1cd42f9b40..55b098d55a 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm @@ -9,21 +9,18 @@ desc = "Allows you to move faster on average than baseline." cost = 4 var_changes = list("slowdown" = -0.5) - excludes = list(/datum/trait/positive/hardy,/datum/trait/positive/hardy_plus) /datum/trait/positive/hardy name = "Hardy" desc = "Allows you to carry heavy equipment with less slowdown." cost = 2 var_changes = list("item_slowdown_mod" = 0.5) - excludes = list(/datum/trait/positive/speed_fast) /datum/trait/positive/hardy_plus name = "Major Hardy" desc = "Allows you to carry heavy equipment with almost no slowdown." cost = 3 var_changes = list("item_slowdown_mod" = 0.25) - excludes = list(/datum/trait/positive/speed_fast) /datum/trait/positive/endurance_high name = "High Endurance" @@ -158,4 +155,4 @@ H.verbs |= /mob/living/carbon/human/proc/toggle_silk_production H.verbs |= /mob/living/carbon/human/proc/weave_structure H.verbs |= /mob/living/carbon/human/proc/weave_item - H.verbs |= /mob/living/carbon/human/proc/set_silk_color \ No newline at end of file + H.verbs |= /mob/living/carbon/human/proc/set_silk_color From 688923c4c8a53ab00b5c684b446a8bf1655fcc8f Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Mon, 5 Apr 2021 12:48:09 -0400 Subject: [PATCH 11/38] Fixup things for dm-langserver --- code/__defines/sound.dm | 2 +- .../gamemodes/events/holidays/Holidays.dm | 6 +- code/game/gamemodes/technomancer/core_obj.dm | 2 +- code/game/gamemodes/technomancer/equipment.dm | 3 - code/modules/food/kitchen/microwave.dm | 121 +++++++++--------- .../mob/living/carbon/human/human_movement.dm | 2 +- .../mechanical/hivebot/ranged_damage.dm | 2 +- code/modules/surgery/organs_internal.dm | 17 --- 8 files changed, 68 insertions(+), 87 deletions(-) diff --git a/code/__defines/sound.dm b/code/__defines/sound.dm index 7db8a2f760..7be3e68857 100644 --- a/code/__defines/sound.dm +++ b/code/__defines/sound.dm @@ -112,7 +112,7 @@ 'sound/ambience/generic/generic2.ogg',\ 'sound/ambience/generic/generic3.ogg'\ ) -// 'sound/ambience/generic/generic4.ogg'\ +// 'sound/ambience/generic/generic4.ogg' // Sounds of PA announcements, presumably involving shuttles? #define AMBIENCE_ARRIVALS list(\ diff --git a/code/game/gamemodes/events/holidays/Holidays.dm b/code/game/gamemodes/events/holidays/Holidays.dm index 913b58e23b..cee83656cb 100644 --- a/code/game/gamemodes/events/holidays/Holidays.dm +++ b/code/game/gamemodes/events/holidays/Holidays.dm @@ -127,7 +127,7 @@ var/global/list/Holiday = list() //Holidays are lists now, so we can have more t if(8) //Aug switch(DD) // if(10) -// Holiday["S'randarr's Day"] = "A Tajaran holiday that occurs on the longest day of the year in summer, \ +// Holiday["S'randarr's Day"] = "A Tajaran holiday that occurs on the longest day of the year in summer, // on Ahdomai. It is named after the Tajaran deity of Light, and huge celebrations are common." //VOREStation Add - Of course we need this. if(8) @@ -167,8 +167,8 @@ var/global/list/Holiday = list() //Holidays are lists now, so we can have more t Holiday["Kindness Day"] = "Kindness Day is an unofficial holiday to highlight good deeds in the \ community, focusing on the positive power and the common thread of kindness which binds humanity and \ friends together." -// if(28) //Space thanksgiving. -// Holiday["Appreciation Day"] = "Originally an old holiday from Earth, Appreciation Day follows many of the \ + if(28) //Space thanksgiving. + Holiday["Appreciation Day"] = "Originally an old holiday from Earth, Appreciation Day follows many of the \ traditions that its predecessor did, such as having a large feast (turkey often included), gathering with family, and being thankful \ for what one has in life." if(28 > DD > 20) diff --git a/code/game/gamemodes/technomancer/core_obj.dm b/code/game/gamemodes/technomancer/core_obj.dm index 3912bc6c6b..2f4d95db9f 100644 --- a/code/game/gamemodes/technomancer/core_obj.dm +++ b/code/game/gamemodes/technomancer/core_obj.dm @@ -30,7 +30,7 @@ "wizard's cloak" = "wizard_cloak" ) - // Some spell-specific variables go here, since spells themselves are temporary. Cores are more long term and more accessable than \ + // Some spell-specific variables go here, since spells themselves are temporary. Cores are more long term and more accessable than // mind datums. It may also allow creative players to try to pull off a 'soul jar' scenario. var/list/summoned_mobs = list() // Maintained horribly with maintain_summon_list(). var/list/wards_in_use = list() // Wards don't count against the cap for other summons. diff --git a/code/game/gamemodes/technomancer/equipment.dm b/code/game/gamemodes/technomancer/equipment.dm index 8d1fb4c6ad..940e31f3cd 100644 --- a/code/game/gamemodes/technomancer/equipment.dm +++ b/code/game/gamemodes/technomancer/equipment.dm @@ -1,8 +1,5 @@ /datum/technomancer/equipment/default_core name = "Manipulation Core" -// desc = "The default core that you most likely already have. This is here in-case you change your mind after buying \ -// another core, don't forget to refund the old core. This has a capacity of 10,000 units of energy, and recharges at a \ -// rate of 50 units. It also reduces incoming instability from functions by 20%." desc = "The default core that you most likely already have. This is here in-case you change your mind after buying \ another core, don't forget to refund the old core.
\ Capacity: 10k
\ diff --git a/code/modules/food/kitchen/microwave.dm b/code/modules/food/kitchen/microwave.dm index 6b866d23ba..a92e17c6da 100644 --- a/code/modules/food/kitchen/microwave.dm +++ b/code/modules/food/kitchen/microwave.dm @@ -27,7 +27,7 @@ var/datum/looping_sound/microwave/soundloop -// see code/modules/food/recipes_microwave.dm for recipes +//see code/modules/food/recipes_microwave.dm for recipes /******************* * Initialising @@ -283,68 +283,69 @@ if("dispose") dispose() return TRUE - -// /obj/machinery/microwave/interact(mob/user as mob) // The microwave Menu -// var/dat = "" -// if(src.broken > 0) -// dat = {"Bzzzzttttt"} -// else if(src.operating) -// dat = {"Microwaving in progress!
Please wait...!"} -// else if(src.dirty==100) -// dat = {"This microwave is dirty!
Please clean it before use!"} -// else -// var/list/items_counts = new -// var/list/items_measures = new -// var/list/items_measures_p = new -// for (var/obj/O in ((contents - component_parts) - circuit)) -// var/display_name = O.name -// if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/egg)) -// items_measures[display_name] = "egg" -// items_measures_p[display_name] = "eggs" -// if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/tofu)) -// items_measures[display_name] = "tofu chunk" -// items_measures_p[display_name] = "tofu chunks" -// if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/meat)) //any meat -// items_measures[display_name] = "slab of meat" -// items_measures_p[display_name] = "slabs of meat" -// if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/donkpocket)) -// display_name = "Turnovers" -// items_measures[display_name] = "turnover" -// items_measures_p[display_name] = "turnovers" -// if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/carpmeat)) -// items_measures[display_name] = "fillet of meat" -// items_measures_p[display_name] = "fillets of meat" -// items_counts[display_name]++ -// for (var/O in items_counts) -// var/N = items_counts[O] -// if (!(O in items_measures)) -// dat += {"[capitalize(O)]: [N] [lowertext(O)]\s
"} -// else -// if (N==1) -// dat += {"[capitalize(O)]: [N] [items_measures[O]]
"} -// else -// dat += {"[capitalize(O)]: [N] [items_measures_p[O]]
"} +/* +/obj/machinery/microwave/interact(mob/user as mob) // The microwave Menu + var/dat = "" + if(src.broken > 0) + dat = {"Bzzzzttttt"} + else if(src.operating) + dat = {"Microwaving in progress!
Please wait...!"} + else if(src.dirty==100) + dat = {"This microwave is dirty!
Please clean it before use!"} + else + var/list/items_counts = new + var/list/items_measures = new + var/list/items_measures_p = new + for (var/obj/O in ((contents - component_parts) - circuit)) + var/display_name = O.name + if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/egg)) + items_measures[display_name] = "egg" + items_measures_p[display_name] = "eggs" + if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/tofu)) + items_measures[display_name] = "tofu chunk" + items_measures_p[display_name] = "tofu chunks" + if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/meat)) //any meat + items_measures[display_name] = "slab of meat" + items_measures_p[display_name] = "slabs of meat" + if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/donkpocket)) + display_name = "Turnovers" + items_measures[display_name] = "turnover" + items_measures_p[display_name] = "turnovers" + if (istype(O,/obj/item/weapon/reagent_containers/food/snacks/carpmeat)) + items_measures[display_name] = "fillet of meat" + items_measures_p[display_name] = "fillets of meat" + items_counts[display_name]++ + for (var/O in items_counts) + var/N = items_counts[O] + if (!(O in items_measures)) + dat += {"[capitalize(O)]: [N] [lowertext(O)]\s
"} + else + if (N==1) + dat += {"[capitalize(O)]: [N] [items_measures[O]]
"} + else + dat += {"[capitalize(O)]: [N] [items_measures_p[O]]
"} -// for (var/datum/reagent/R in reagents.reagent_list) -// var/display_name = R.name -// if (R.id == "capsaicin") -// display_name = "Hotsauce" -// if (R.id == "frostoil") -// display_name = "Coldsauce" -// dat += {"[display_name]: [R.volume] unit\s
"} + for (var/datum/reagent/R in reagents.reagent_list) + var/display_name = R.name + if (R.id == "capsaicin") + display_name = "Hotsauce" + if (R.id == "frostoil") + display_name = "Coldsauce" + dat += {"[display_name]: [R.volume] unit\s
"} -// if (items_counts.len==0 && reagents.reagent_list.len==0) -// dat = {"The microwave is empty
"} -// else -// dat = {"Ingredients:
[dat]"} -// dat += {"

\ -// Turn on!
\ -// Eject ingredients!
\ -// "} + if (items_counts.len==0 && reagents.reagent_list.len==0) + dat = {"The microwave is empty
"} + else + dat = {"Ingredients:
[dat]"} + dat += {"

\ +Turn on!
\ +Eject ingredients!
\ +"} -// user << browse("Microwave Controls[dat]", "window=microwave") -// onclose(user, "microwave") -// return + user << browse("Microwave Controls[dat]", "window=microwave") + onclose(user, "microwave") + return +*/ /*********************************** * Microwave Menu Handling/Cooking diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 3ac9edc068..202d0c2f34 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -189,7 +189,7 @@ if(istype(back, /obj/item/weapon/tank/jetpack)) return back else if(istype(rig)) - for(var/obj/item/rig_module/maneuvering_jets.module in rig.installed_modules) + for(var/obj/item/rig_module/maneuvering_jets/module in rig.installed_modules) return module.jets /mob/living/carbon/human/Process_Spacemove(var/check_drift = 0) diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm index a846b560d6..09bf26f05d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm +++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/ranged_damage.dm @@ -89,7 +89,7 @@ // Close to mid-ranged shooter that arcs over other things, ideal if allies are in front of it. -// Difference from siege hivebots is that siege hivebots have limited charges for their attacks, are very long range, and \ +// Difference from siege hivebots is that siege hivebots have limited charges for their attacks, are very long range, and // the projectiles have an AoE component, where as backline hivebots do not. /mob/living/simple_mob/mechanical/hivebot/ranged_damage/backline name = "backline hivebot" diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm index a6a9a87386..06dd35434c 100644 --- a/code/modules/surgery/organs_internal.dm +++ b/code/modules/surgery/organs_internal.dm @@ -466,20 +466,3 @@ user.visible_message("[user]'s hand slips, damaging [target]'s [affected.name] with \the [tool]!", \ "Your hand slips, damaging [target]'s [affected.name] with \the [tool]!") affected.createwound(BRUISE, 20) - -////////////////////////////////////////////////////////////////// -// HEART SURGERY // -////////////////////////////////////////////////////////////////// -// To be finished after some tests. -// /datum/surgery_step/ribcage/heart/cut -// allowed_tools = list( -// /obj/item/weapon/surgical/scalpel = 100, \ -// /obj/item/weapon/material/knife = 75, \ -// /obj/item/weapon/material/shard = 50, \ -// ) - -// min_duration = 30 -// max_duration = 40 - -// /datum/surgery_step/ribcage/heart/cut/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) -// return ..() && target.op_stage.ribcage == 2 \ No newline at end of file From c5cb8a4cb7895a6fadcab0c2240bd7f3604ad437 Mon Sep 17 00:00:00 2001 From: Awkward Dryad Date: Tue, 6 Apr 2021 14:38:13 -0800 Subject: [PATCH 12/38] adds awkwarddryad to mime whitelist --- config/jobwhitelist.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/config/jobwhitelist.txt b/config/jobwhitelist.txt index 6b113f77e8..ac4a862fba 100644 --- a/config/jobwhitelist.txt +++ b/config/jobwhitelist.txt @@ -1,5 +1,6 @@ # Job whitelist in format ckey - jobname # Like arokha - clown +awkwarddryad - mime akram - clown amshaegaar - mime seiga - mime From 5b3a00a2dc449f3057ece857fba492a38233bde5 Mon Sep 17 00:00:00 2001 From: Nyks Date: Wed, 7 Apr 2021 02:01:33 +0300 Subject: [PATCH 13/38] Resize proc polish and fixing --- code/game/area/Space Station 13 areas_vr.dm | 9 +++++++++ code/game/dna/dna2_helpers.dm | 2 +- code/modules/admin/admin_verb_lists_vr.dm | 1 + code/modules/admin/verbs/resize.dm | 13 +++++++++++++ .../living/carbon/human/human_defines_vr.dm | 1 - code/modules/mob/living/carbon/human/life.dm | 2 -- .../mob/living/carbon/human/life_vr.dm | 7 ------- code/modules/mob/mob_defines_vr.dm | 1 + code/modules/vore/resizing/resize_vr.dm | 19 +++++++------------ code/modules/vore/resizing/sizegun_vr.dm | 8 ++------ 10 files changed, 34 insertions(+), 29 deletions(-) create mode 100644 code/modules/admin/verbs/resize.dm diff --git a/code/game/area/Space Station 13 areas_vr.dm b/code/game/area/Space Station 13 areas_vr.dm index f4078595c8..3d9c2ab785 100644 --- a/code/game/area/Space Station 13 areas_vr.dm +++ b/code/game/area/Space Station 13 areas_vr.dm @@ -1,5 +1,14 @@ //TFF 28/8/19 - cleanup of areas placement - removes all but rogueminer_vr stuff. +/area + var/limit_mob_size = TRUE //If mob size is limited in the area. +/area/Entered(mob/living/H, oldLoc) + //Clamps mob size when entering a new area that has size limit. + //Mobs with size_uncapped set to TRUE or 1 will be ignored. + . = ..() + if (src.limit_mob_size && !H.size_uncapped) + H.resize(H.size_multiplier) + /area/shuttle/belter name = "Belter Shuttle" icon_state = "shuttle2" diff --git a/code/game/dna/dna2_helpers.dm b/code/game/dna/dna2_helpers.dm index d250c441ad..9fc924dae8 100644 --- a/code/game/dna/dna2_helpers.dm +++ b/code/game/dna/dna2_helpers.dm @@ -222,7 +222,7 @@ // Playerscale var/size = dna.GetUIValueRange(DNA_UI_PLAYERSCALE, player_sizes_list.len) if((0 < size) && (size <= player_sizes_list.len)) - H.resize(player_sizes_list[player_sizes_list[size]], FALSE) + H.resize(player_sizes_list[player_sizes_list[size]], TRUE) // Tail/Taur Color H.r_tail = dna.GetUIValueRange(DNA_UI_TAIL_R, 255) diff --git a/code/modules/admin/admin_verb_lists_vr.dm b/code/modules/admin/admin_verb_lists_vr.dm index bc6e620b7a..597c229478 100644 --- a/code/modules/admin/admin_verb_lists_vr.dm +++ b/code/modules/admin/admin_verb_lists_vr.dm @@ -155,6 +155,7 @@ var/list/admin_verbs_fun = list( /client/proc/smite, /client/proc/smite_vr, //VOREStation Add, /client/proc/admin_lightning_strike, + /client/proc/resize //VOREStation Add, ) var/list/admin_verbs_spawn = list( diff --git a/code/modules/admin/verbs/resize.dm b/code/modules/admin/verbs/resize.dm new file mode 100644 index 0000000000..e07fc5f2be --- /dev/null +++ b/code/modules/admin/verbs/resize.dm @@ -0,0 +1,13 @@ +/client/proc/resize(var/mob/living/L in player_list) + set name = "Resize" + set desc = "Resizes any living mob without any restrictions on size." + set category = "Fun" + if(!check_rights(R_ADMIN, R_FUN)) + return + + var/size_multiplier = input(usr, "Input size multiplier.", "Resize", 1) + L.resize(size_multiplier, TRUE, TRUE) + L.size_uncapped = TRUE + + log_and_message_admins("has changed [key_name(L)]'s size multiplier to [size_multiplier].") + feedback_add_details("admin_verb","RESIZE") \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/human_defines_vr.dm b/code/modules/mob/living/carbon/human/human_defines_vr.dm index cdd7276838..494f16fa42 100644 --- a/code/modules/mob/living/carbon/human/human_defines_vr.dm +++ b/code/modules/mob/living/carbon/human/human_defines_vr.dm @@ -7,7 +7,6 @@ var/impersonate_bodytype //For impersonating a bodytype var/ability_flags = 0 //Shadekin abilities/potentially other species-based? var/sensorpref = 5 //Suit sensor loadout pref - var/unnaturally_resized = FALSE //If one became larger than 200%, or smaller than 25%. This flag is needed for the case when admins want someone to be very big or very small outside of dorms. var/wings_hidden = FALSE /mob/living/carbon/human/proc/shadekin_get_energy() diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index cebfda00c0..25303971b1 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -62,8 +62,6 @@ //No need to update all of these procs if the guy is dead. fall() //VORESTATION EDIT. Prevents people from floating - if(unnaturally_resized) //VORESTATION EDIT. - handle_unnatural_size() if(stat != DEAD && !stasis) //Updates the number of stored chemicals for powers handle_changeling() diff --git a/code/modules/mob/living/carbon/human/life_vr.dm b/code/modules/mob/living/carbon/human/life_vr.dm index 2440a1ab74..c5248fc862 100644 --- a/code/modules/mob/living/carbon/human/life_vr.dm +++ b/code/modules/mob/living/carbon/human/life_vr.dm @@ -78,10 +78,3 @@ // Moving around increases germ_level faster if(germ_level < GERM_LEVEL_MOVE_CAP && prob(8)) germ_level++ - -/mob/living/carbon/human/proc/handle_unnatural_size() - if(!in_dorms()) - if(src.size_multiplier > 2) - src.resize(2) - else if (src.size_multiplier < 0.25) - src.resize(0.25) \ No newline at end of file diff --git a/code/modules/mob/mob_defines_vr.dm b/code/modules/mob/mob_defines_vr.dm index ff5f1ae582..da7c9e918b 100644 --- a/code/modules/mob/mob_defines_vr.dm +++ b/code/modules/mob/mob_defines_vr.dm @@ -1,4 +1,5 @@ /mob + var/size_uncapped = FALSE //Determines if a mob's size obedies the resize cap, used for adminbus resize. var/vantag_hud = 0 // Do I have the HUD enabled? var/mob/temporary_form // For holding onto a temporary form diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm index 703706483f..dfd620134b 100644 --- a/code/modules/vore/resizing/resize_vr.dm +++ b/code/modules/vore/resizing/resize_vr.dm @@ -64,28 +64,23 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 * Resizes the mob immediately to the desired mod, animating it growing/shrinking. * It can be used by anything that calls it. */ -/atom/movable/proc/in_dorms() - var/area/A = get_area(src) - return istype(A, /area/crew_quarters/sleep) /atom/movable/proc/size_range_check(size_select) //both objects and mobs needs to have that - if((!in_dorms() && (size_select > 200 || size_select < 25)) || (size_select > 600 || size_select <1)) + var/area/A = get_area(src) //Get the atom's area to check for size limit. + if((A.limit_mob_size && (size_select > 200 || size_select < 25)) || (size_select > 600 || size_select <1)) return FALSE return TRUE -/mob/living/proc/resize(var/new_size, var/animate = TRUE, var/mark_unnatural_size = TRUE) +/mob/living/proc/resize(var/new_size, var/animate = TRUE, var/uncapped = FALSE) + if(!uncapped) + new_size = clamp(new_size, RESIZE_TINY, RESIZE_HUGE) + src.size_uncapped = FALSE + if(size_multiplier == new_size) return 1 size_multiplier = new_size //Change size_multiplier so that other items can interact with them - if(ishuman(src)) - var/mob/living/carbon/human/H = src - if(new_size > 2 || new_size < 0.25) - if(mark_unnatural_size) //Will target size be reverted to ordinary bounds when out of dorms or not? - H.unnaturally_resized = TRUE - else - H.unnaturally_resized = FALSE if(animate) var/change = new_size - size_multiplier var/duration = (abs(change)+0.25) SECONDS diff --git a/code/modules/vore/resizing/sizegun_vr.dm b/code/modules/vore/resizing/sizegun_vr.dm index e30c218fbb..c595bea9f0 100644 --- a/code/modules/vore/resizing/sizegun_vr.dm +++ b/code/modules/vore/resizing/sizegun_vr.dm @@ -89,12 +89,8 @@ /obj/item/projectile/beam/sizelaser/on_hit(var/atom/target) var/mob/living/M = target if(istype(M)) - if(!M.in_dorms() || !istype(M, /mob/living/carbon/human)) - if(!M.resize(clamp(set_size,0.25,2))) - to_chat(M, "The beam fires into your body, changing your size!") - else - if(!M.resize(clamp(set_size,0.01,6))) - to_chat(M, "The beam fires into your body, changing your size!") + if(!M.resize(set_size)) + to_chat(M, "The beam fires into your body, changing your size!") M.updateicon() return return 1 From 42951c622f81c5e9331f4799f3b5bf62bf24a53e Mon Sep 17 00:00:00 2001 From: Nyks Date: Wed, 7 Apr 2021 02:23:18 +0300 Subject: [PATCH 14/38] Added the var for Areas with unrestricted size --- maps/tether/tether_areas.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maps/tether/tether_areas.dm b/maps/tether/tether_areas.dm index d44b934837..dc104c5cea 100644 --- a/maps/tether/tether_areas.dm +++ b/maps/tether/tether_areas.dm @@ -979,6 +979,9 @@ icon_state = "recreation_area_restroom" sound_env = SMALL_ENCLOSED +/area/crew_quarters/sleep + limit_mob_size = FALSE + /area/crew_quarters/sleep/maintDorm1 name = "\improper Construction Dorm 1" icon_state = "Sleep" @@ -1141,6 +1144,9 @@ flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE +/area/holodeck/holodorm + limit_mob_size = FALSE + /area/holodeck/holodorm/source_basic name = "\improper Holodeck Source" flags = RAD_SHIELDED | BLUE_SHIELDED @@ -1537,6 +1543,7 @@ area/shuttle/mining_outpost/shuttle requires_power = 0 flags = RAD_SHIELDED icon_state = "red2" + limit_mob_size = FALSE /area/unknown/dorm1 name = "Unknown Dorm 1" From 8ea5d5594499b154144fed3ff8771fbc94dcee17 Mon Sep 17 00:00:00 2001 From: Nyks Date: Wed, 7 Apr 2021 02:33:37 +0300 Subject: [PATCH 15/38] Include dme change needed for new dm file --- vorestation.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/vorestation.dme b/vorestation.dme index d6847b6d34..432e070c9d 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1680,6 +1680,7 @@ #include "code\modules\admin\verbs\pray.dm" #include "code\modules\admin\verbs\randomverbs.dm" #include "code\modules\admin\verbs\randomverbs_vr.dm" +#include "code\modules\admin\verbs\resize.dm" #include "code\modules\admin\verbs\smite.dm" #include "code\modules\admin\verbs\smite_vr.dm" #include "code\modules\admin\verbs\striketeam.dm" From 057f532e73419c1b079382a64484cd2a95144474 Mon Sep 17 00:00:00 2001 From: Nyks Date: Wed, 7 Apr 2021 02:50:23 +0300 Subject: [PATCH 16/38] Added overlooked type check --- code/game/area/Space Station 13 areas_vr.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/area/Space Station 13 areas_vr.dm b/code/game/area/Space Station 13 areas_vr.dm index 3d9c2ab785..816e6f6aa9 100644 --- a/code/game/area/Space Station 13 areas_vr.dm +++ b/code/game/area/Space Station 13 areas_vr.dm @@ -6,9 +6,9 @@ //Clamps mob size when entering a new area that has size limit. //Mobs with size_uncapped set to TRUE or 1 will be ignored. . = ..() - if (src.limit_mob_size && !H.size_uncapped) + if (src.limit_mob_size && isliving(H) && !H.size_uncapped) H.resize(H.size_multiplier) - + /area/shuttle/belter name = "Belter Shuttle" icon_state = "shuttle2" From 2c61ecc1c9aa61f2e3ac7b7b64021b63c5d959a4 Mon Sep 17 00:00:00 2001 From: Nyks Date: Wed, 7 Apr 2021 03:17:21 +0300 Subject: [PATCH 17/38] Small fixes/adjustments --- code/modules/mob/living/living_defines_vr.dm | 1 + code/modules/mob/mob_defines_vr.dm | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/living_defines_vr.dm b/code/modules/mob/living/living_defines_vr.dm index f06406bc86..dfe3b76c92 100644 --- a/code/modules/mob/living/living_defines_vr.dm +++ b/code/modules/mob/living/living_defines_vr.dm @@ -6,6 +6,7 @@ appearance_flags = TILE_BOUND|PIXEL_SCALE|KEEP_TOGETHER var/hunger_rate = DEFAULT_HUNGER_FACTOR var/resizable = TRUE + var/size_uncapped = FALSE //Determines if a mob's size obedies the resize cap, used for adminbus resize. //custom say verbs var/custom_say = null diff --git a/code/modules/mob/mob_defines_vr.dm b/code/modules/mob/mob_defines_vr.dm index da7c9e918b..ff5f1ae582 100644 --- a/code/modules/mob/mob_defines_vr.dm +++ b/code/modules/mob/mob_defines_vr.dm @@ -1,5 +1,4 @@ /mob - var/size_uncapped = FALSE //Determines if a mob's size obedies the resize cap, used for adminbus resize. var/vantag_hud = 0 // Do I have the HUD enabled? var/mob/temporary_form // For holding onto a temporary form From 65c539c44e1dee3bfb1601df0a172fd44131e55a Mon Sep 17 00:00:00 2001 From: Nyks Date: Wed, 7 Apr 2021 05:32:56 +0300 Subject: [PATCH 18/38] Better clamping method, more clean-up --- code/__defines/misc_vr.dm | 12 +++++- code/game/area/Space Station 13 areas_vr.dm | 7 --- code/modules/admin/verbs/resize.dm | 7 ++- code/modules/vore/resizing/resize_vr.dm | 48 +++++++++++++++------ 4 files changed, 50 insertions(+), 24 deletions(-) diff --git a/code/__defines/misc_vr.dm b/code/__defines/misc_vr.dm index 94600a0d8a..67edbeb1bf 100644 --- a/code/__defines/misc_vr.dm +++ b/code/__defines/misc_vr.dm @@ -65,4 +65,14 @@ #define MAT_PLASTITANIUM "plastitanium" #define MAT_PLASTITANIUMHULL "plastitanium hull" #define MAT_PLASTITANIUMGLASS "plastitanium glass" -#define MAT_GOLDHULL "gold hull" \ No newline at end of file +#define MAT_GOLDHULL "gold hull" + +#define RESIZE_HUGE = 2 +#define RESIZE_BIG = 1.5 +#define RESIZE_NORMAL = 1 +#define RESIZE_SMALL = 0.5 +#define RESIZE_TINY = 0.25 +#define RESIZE_A_HUGEBIG = (RESIZE_HUGE + RESIZE_BIG) / 2 +#define RESIZE_A_BIGNORMAL = (RESIZE_BIG + RESIZE_NORMAL) / 2 +#define RESIZE_A_NORMALSMALL = (RESIZE_NORMAL + RESIZE_SMALL) / 2 +#define RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 \ No newline at end of file diff --git a/code/game/area/Space Station 13 areas_vr.dm b/code/game/area/Space Station 13 areas_vr.dm index 816e6f6aa9..500ba1bc16 100644 --- a/code/game/area/Space Station 13 areas_vr.dm +++ b/code/game/area/Space Station 13 areas_vr.dm @@ -2,13 +2,6 @@ /area var/limit_mob_size = TRUE //If mob size is limited in the area. -/area/Entered(mob/living/H, oldLoc) - //Clamps mob size when entering a new area that has size limit. - //Mobs with size_uncapped set to TRUE or 1 will be ignored. - . = ..() - if (src.limit_mob_size && isliving(H) && !H.size_uncapped) - H.resize(H.size_multiplier) - /area/shuttle/belter name = "Belter Shuttle" icon_state = "shuttle2" diff --git a/code/modules/admin/verbs/resize.dm b/code/modules/admin/verbs/resize.dm index e07fc5f2be..7fa1d40d84 100644 --- a/code/modules/admin/verbs/resize.dm +++ b/code/modules/admin/verbs/resize.dm @@ -1,4 +1,4 @@ -/client/proc/resize(var/mob/living/L in player_list) +/client/proc/resize(var/mob/living/L in mob_list) set name = "Resize" set desc = "Resizes any living mob without any restrictions on size." set category = "Fun" @@ -7,7 +7,10 @@ var/size_multiplier = input(usr, "Input size multiplier.", "Resize", 1) L.resize(size_multiplier, TRUE, TRUE) - L.size_uncapped = TRUE + if(size_multiplier in range(RESIZE_TINY, RESIZE_HUGE)) + L.size_uncapped = FALSE + else + L.size_uncapped = TRUE log_and_message_admins("has changed [key_name(L)]'s size multiplier to [size_multiplier].") feedback_add_details("admin_verb","RESIZE") \ No newline at end of file diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm index dfd620134b..5beb108d38 100644 --- a/code/modules/vore/resizing/resize_vr.dm +++ b/code/modules/vore/resizing/resize_vr.dm @@ -1,16 +1,5 @@ - -//these aren't defines so they can stay in this file -var/const/RESIZE_HUGE = 2 -var/const/RESIZE_BIG = 1.5 -var/const/RESIZE_NORMAL = 1 -var/const/RESIZE_SMALL = 0.5 -var/const/RESIZE_TINY = 0.25 - -//average -var/const/RESIZE_A_HUGEBIG = (RESIZE_HUGE + RESIZE_BIG) / 2 -var/const/RESIZE_A_BIGNORMAL = (RESIZE_BIG + RESIZE_NORMAL) / 2 -var/const/RESIZE_A_NORMALSMALL = (RESIZE_NORMAL + RESIZE_SMALL) / 2 -var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 +GLOBAL_LIST_EMPTY(size_uncapped_mobs) +GLOBAL_VAR(size_uncapped_mobs_timer) // Adding needed defines to /mob/living // Note: Polaris had this on /mob/living/carbon/human We need it higher up for animals and stuff. @@ -71,11 +60,42 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 return FALSE return TRUE +/proc/add_to_uncapped_list(var/mob/living/L) + if(!GLOB.size_uncapped_mobs.len) + GLOB.size_uncapped_mobs_timer = addtimer(CALLBACK(GLOBAL_PROC, .check_uncapped_list), 2 SECONDS, TIMER_LOOP | TIMER_UNIQUE | TIMER_STOPPABLE) + GLOB.size_uncapped_mobs |= weakref(L) + +/proc/remove_from_uncapped_list(var/mob/living/L) + if(!GLOB.size_uncapped_mobs.len) + return + + GLOB.size_uncapped_mobs -= weakref(L) + + if(!GLOB.size_uncapped_mobs.len) + deltimer(GLOB.size_uncapped_mobs_timer) + +/proc/check_uncapped_list() + for(var/weakref/wr in GLOB.size_uncapped_mobs) + var/mob/living/L = wr.resolve() + var/area/A = get_area(L) + if(!istype(L)) + GLOB.size_uncapped_mobs -= wr + continue + + if((A.limit_mob_size && !L.size_uncapped) && (L.size_multiplier <= RESIZE_TINY || L.size_multiplier >= RESIZE_HUGE)) + L.resize(L.size_multiplier) + GLOB.size_uncapped_mobs -= wr + + if(!GLOB.size_uncapped_mobs.len) + deltimer(GLOB.size_uncapped_mobs_timer) + /mob/living/proc/resize(var/new_size, var/animate = TRUE, var/uncapped = FALSE) if(!uncapped) new_size = clamp(new_size, RESIZE_TINY, RESIZE_HUGE) src.size_uncapped = FALSE - + remove_from_uncapped_list(src) + else + add_to_uncapped_list(src) if(size_multiplier == new_size) return 1 From b05867b04c04c28251d4efffbbf884e1888409c8 Mon Sep 17 00:00:00 2001 From: Nyks Date: Wed, 7 Apr 2021 05:35:52 +0300 Subject: [PATCH 19/38] 100% timer clean-up --- code/modules/vore/resizing/resize_vr.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm index 5beb108d38..27c903f22c 100644 --- a/code/modules/vore/resizing/resize_vr.dm +++ b/code/modules/vore/resizing/resize_vr.dm @@ -73,6 +73,7 @@ GLOBAL_VAR(size_uncapped_mobs_timer) if(!GLOB.size_uncapped_mobs.len) deltimer(GLOB.size_uncapped_mobs_timer) + GLOB.size_uncapped_mobs_timer = null /proc/check_uncapped_list() for(var/weakref/wr in GLOB.size_uncapped_mobs) @@ -88,6 +89,7 @@ GLOBAL_VAR(size_uncapped_mobs_timer) if(!GLOB.size_uncapped_mobs.len) deltimer(GLOB.size_uncapped_mobs_timer) + GLOB.size_uncapped_mobs_timer = null /mob/living/proc/resize(var/new_size, var/animate = TRUE, var/uncapped = FALSE) if(!uncapped) From 2e68aaee5158c07393eefaf34d7605b747afbe56 Mon Sep 17 00:00:00 2001 From: Nyks Date: Wed, 7 Apr 2021 06:07:05 +0300 Subject: [PATCH 20/38] Definitely works now --- code/__defines/misc_vr.dm | 18 +++++++++--------- code/modules/admin/verbs/resize.dm | 2 +- code/modules/vore/resizing/resize_vr.dm | 2 ++ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/code/__defines/misc_vr.dm b/code/__defines/misc_vr.dm index 67edbeb1bf..55973cdafc 100644 --- a/code/__defines/misc_vr.dm +++ b/code/__defines/misc_vr.dm @@ -67,12 +67,12 @@ #define MAT_PLASTITANIUMGLASS "plastitanium glass" #define MAT_GOLDHULL "gold hull" -#define RESIZE_HUGE = 2 -#define RESIZE_BIG = 1.5 -#define RESIZE_NORMAL = 1 -#define RESIZE_SMALL = 0.5 -#define RESIZE_TINY = 0.25 -#define RESIZE_A_HUGEBIG = (RESIZE_HUGE + RESIZE_BIG) / 2 -#define RESIZE_A_BIGNORMAL = (RESIZE_BIG + RESIZE_NORMAL) / 2 -#define RESIZE_A_NORMALSMALL = (RESIZE_NORMAL + RESIZE_SMALL) / 2 -#define RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 \ No newline at end of file +#define RESIZE_HUGE 2 +#define RESIZE_BIG 1.5 +#define RESIZE_NORMAL 1 +#define RESIZE_SMALL 0.5 +#define RESIZE_TINY 0.25 +#define RESIZE_A_HUGEBIG (RESIZE_HUGE + RESIZE_BIG) / 2 +#define RESIZE_A_BIGNORMAL (RESIZE_BIG + RESIZE_NORMAL) / 2 +#define RESIZE_A_NORMALSMALL (RESIZE_NORMAL + RESIZE_SMALL) / 2 +#define RESIZE_A_SMALLTINY (RESIZE_SMALL + RESIZE_TINY) / 2 \ No newline at end of file diff --git a/code/modules/admin/verbs/resize.dm b/code/modules/admin/verbs/resize.dm index 7fa1d40d84..dddaeb9ec1 100644 --- a/code/modules/admin/verbs/resize.dm +++ b/code/modules/admin/verbs/resize.dm @@ -7,7 +7,7 @@ var/size_multiplier = input(usr, "Input size multiplier.", "Resize", 1) L.resize(size_multiplier, TRUE, TRUE) - if(size_multiplier in range(RESIZE_TINY, RESIZE_HUGE)) + if(size_multiplier >= RESIZE_TINY && size_multiplier <= RESIZE_HUGE) L.size_uncapped = FALSE else L.size_uncapped = TRUE diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm index 27c903f22c..85c398f6e8 100644 --- a/code/modules/vore/resizing/resize_vr.dm +++ b/code/modules/vore/resizing/resize_vr.dm @@ -61,6 +61,8 @@ GLOBAL_VAR(size_uncapped_mobs_timer) return TRUE /proc/add_to_uncapped_list(var/mob/living/L) + if(L.size_uncapped = TRUE) + return if(!GLOB.size_uncapped_mobs.len) GLOB.size_uncapped_mobs_timer = addtimer(CALLBACK(GLOBAL_PROC, .check_uncapped_list), 2 SECONDS, TIMER_LOOP | TIMER_UNIQUE | TIMER_STOPPABLE) GLOB.size_uncapped_mobs |= weakref(L) From 66f067fb28f380d2704ac0d410adf4bc5d5a62ab Mon Sep 17 00:00:00 2001 From: Nyks Date: Wed, 7 Apr 2021 16:22:18 +0300 Subject: [PATCH 21/38] Change admin sizegun to work like admin verb --- code/modules/vore/resizing/sizegun_vr.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/vore/resizing/sizegun_vr.dm b/code/modules/vore/resizing/sizegun_vr.dm index c595bea9f0..61e81dbd11 100644 --- a/code/modules/vore/resizing/sizegun_vr.dm +++ b/code/modules/vore/resizing/sizegun_vr.dm @@ -98,7 +98,10 @@ /obj/item/projectile/beam/sizelaser/admin/on_hit(var/atom/target) var/mob/living/M = target if(istype(M)) - M.resize(set_size, TRUE, FALSE) + M.resize(set_size, TRUE, TRUE) + if(set_size >= RESIZE_TINY && set_size <= RESIZE_HUGE) + M.uncapped_size = FALSE + M.uncapped_size = TRUE to_chat(M, "The beam fires into your body, changing your size!") M.updateicon() return From d3a536e99de3d259f91df9944c79916ea5364033 Mon Sep 17 00:00:00 2001 From: Nyks Date: Wed, 7 Apr 2021 16:31:11 +0300 Subject: [PATCH 22/38] Fixes dumb typos --- code/modules/vore/resizing/resize_vr.dm | 2 +- code/modules/vore/resizing/sizegun_vr.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm index 85c398f6e8..f726775207 100644 --- a/code/modules/vore/resizing/resize_vr.dm +++ b/code/modules/vore/resizing/resize_vr.dm @@ -61,7 +61,7 @@ GLOBAL_VAR(size_uncapped_mobs_timer) return TRUE /proc/add_to_uncapped_list(var/mob/living/L) - if(L.size_uncapped = TRUE) + if(L.size_uncapped) return if(!GLOB.size_uncapped_mobs.len) GLOB.size_uncapped_mobs_timer = addtimer(CALLBACK(GLOBAL_PROC, .check_uncapped_list), 2 SECONDS, TIMER_LOOP | TIMER_UNIQUE | TIMER_STOPPABLE) diff --git a/code/modules/vore/resizing/sizegun_vr.dm b/code/modules/vore/resizing/sizegun_vr.dm index 61e81dbd11..d042c6cb34 100644 --- a/code/modules/vore/resizing/sizegun_vr.dm +++ b/code/modules/vore/resizing/sizegun_vr.dm @@ -100,8 +100,8 @@ if(istype(M)) M.resize(set_size, TRUE, TRUE) if(set_size >= RESIZE_TINY && set_size <= RESIZE_HUGE) - M.uncapped_size = FALSE - M.uncapped_size = TRUE + M.size_uncapped = FALSE + M.size_uncapped = TRUE to_chat(M, "The beam fires into your body, changing your size!") M.updateicon() return From 89859823a1214ed37a371ad6567d2ca12cf8647e Mon Sep 17 00:00:00 2001 From: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Wed, 7 Apr 2021 17:56:12 +0100 Subject: [PATCH 23/38] adminship tweaks --- maps/submaps/admin_use_vr/ert.dmm | 2115 ++++++++++++++++----- maps/submaps/admin_use_vr/kk_mercship.dmm | 1218 ++++++++---- 2 files changed, 2511 insertions(+), 822 deletions(-) diff --git a/maps/submaps/admin_use_vr/ert.dmm b/maps/submaps/admin_use_vr/ert.dmm index 97e99eb510..85fa698241 100644 --- a/maps/submaps/admin_use_vr/ert.dmm +++ b/maps/submaps/admin_use_vr/ert.dmm @@ -88,12 +88,27 @@ /area/ship/ert/barracks) "ao" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) @@ -188,12 +203,27 @@ "br" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/tank/jetpack/carbondioxide{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/weapon/tank/jetpack/carbondioxide{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/weapon/tank/jetpack/carbondioxide{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/tank/jetpack/carbondioxide{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/tank/jetpack/carbondioxide{ + pixel_x = 6; + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "bt" = ( @@ -227,16 +257,43 @@ dir = 1 }, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/device/suit_cooling_unit{ + pixel_x = -10; + pixel_y = -10 + }, +/obj/item/device/suit_cooling_unit{ + pixel_x = -8; + pixel_y = -8 + }, +/obj/item/device/suit_cooling_unit{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/device/suit_cooling_unit{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/device/suit_cooling_unit{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/device/suit_cooling_unit{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/device/suit_cooling_unit{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/device/suit_cooling_unit{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/device/suit_cooling_unit{ + pixel_x = 8; + pixel_y = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "bJ" = ( @@ -401,22 +458,52 @@ "do" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/clothing/mask/gas{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/mask/gas{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/mask/gas{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/mask/gas{ + pixel_x = 6; + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "dp" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/rig/ert/assetprotection{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/weapon/rig/ert/assetprotection{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, +/obj/item/weapon/rig/ert/assetprotection{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/rig/ert/assetprotection{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/rig/ert/assetprotection{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) @@ -455,35 +542,75 @@ /area/ship/ert/hangar) "dB" = ( /obj/structure/table/rack/steel, +/obj/item/clothing/suit/armor/swat{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/suit/armor/swat{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/suit/armor/swat, -/obj/item/clothing/suit/armor/swat, -/obj/item/clothing/suit/armor/swat, -/obj/item/clothing/suit/armor/swat, -/obj/item/clothing/suit/armor/swat, -/obj/item/clothing/suit/armor/swat, -/obj/item/clothing/mask/gas/commando, -/obj/item/clothing/mask/gas/commando, -/obj/item/clothing/mask/gas/commando, -/obj/item/clothing/mask/gas/commando, -/obj/item/clothing/mask/gas/commando, +/obj/item/clothing/suit/armor/swat{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/suit/armor/swat{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/suit/armor/swat{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/clothing/mask/gas/commando{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/mask/gas/commando{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/mask/gas/commando, +/obj/item/clothing/mask/gas/commando{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/mask/gas/commando{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/mask/gas/commando{ + pixel_x = 6; + pixel_y = 6 + }, /obj/item/clothing/head/helmet/space/deathsquad{ - name = "swat helmet" + name = "swat helmet"; + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/head/helmet/space/deathsquad{ + name = "swat helmet"; + pixel_x = -2; + pixel_y = -2 }, /obj/item/clothing/head/helmet/space/deathsquad{ name = "swat helmet" }, /obj/item/clothing/head/helmet/space/deathsquad{ - name = "swat helmet" + name = "swat helmet"; + pixel_x = 2; + pixel_y = 2 }, /obj/item/clothing/head/helmet/space/deathsquad{ - name = "swat helmet" + name = "swat helmet"; + pixel_x = 4; + pixel_y = 4 }, /obj/item/clothing/head/helmet/space/deathsquad{ - name = "swat helmet" - }, -/obj/item/clothing/head/helmet/space/deathsquad{ - name = "swat helmet" + name = "swat helmet"; + pixel_x = 6; + pixel_y = 6 }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, @@ -505,12 +632,27 @@ /area/shuttle/ert_ship_boat) "dV" = ( /obj/structure/table/rack/steel, +/obj/item/clothing/glasses/thermal{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/glasses/thermal{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/glasses/thermal, -/obj/item/clothing/glasses/thermal, -/obj/item/clothing/glasses/thermal, -/obj/item/clothing/glasses/thermal, -/obj/item/clothing/glasses/thermal, -/obj/item/clothing/glasses/thermal, +/obj/item/clothing/glasses/thermal{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/glasses/thermal{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/glasses/thermal{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) @@ -548,12 +690,27 @@ /area/ship/ert/dock_port) "ef" = ( /obj/structure/table/rack/steel, +/obj/item/clothing/glasses/night{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/glasses/night{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, +/obj/item/clothing/glasses/night{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/glasses/night{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/glasses/night{ + pixel_x = 6; + pixel_y = 6 + }, /obj/machinery/firealarm/alarms_hidden{ pixel_y = 26 }, @@ -562,12 +719,27 @@ /area/ship/ert/barracks) "eg" = ( /obj/structure/table/rack/steel, +/obj/item/clothing/glasses/night{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/glasses/night{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, +/obj/item/clothing/glasses/night{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/glasses/night{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/glasses/night{ + pixel_x = 6; + pixel_y = 6 + }, /obj/machinery/atm{ pixel_y = 26 }, @@ -640,6 +812,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/eng_storage) +"eL" = ( +/mob/living/simple_mob/animal/passive/mimepet, +/turf/simulated/floor/wood, +/area/ship/ert/commander) "eO" = ( /obj/effect/map_helper/airlock/atmos/chamber_pump, /obj/effect/map_helper/airlock/sensor/chamber_sensor, @@ -660,15 +836,27 @@ "eP" = ( /obj/structure/table/steel_reinforced, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/item/weapon/storage/box/cdeathalarm_kit, -/obj/item/weapon/storage/box/cdeathalarm_kit, +/obj/item/weapon/storage/box/cdeathalarm_kit{ + pixel_x = -1; + pixel_y = -1 + }, +/obj/item/weapon/storage/box/cdeathalarm_kit{ + pixel_x = 1; + pixel_y = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "eX" = ( /obj/structure/table/steel_reinforced, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/item/weapon/storage/box/backup_kit, -/obj/item/weapon/storage/box/backup_kit, +/obj/item/weapon/storage/box/backup_kit{ + pixel_x = -1; + pixel_y = -1 + }, +/obj/item/weapon/storage/box/backup_kit{ + pixel_x = 1; + pixel_y = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "ff" = ( @@ -702,7 +890,6 @@ /area/ship/ert/dock_star) "fx" = ( /obj/structure/table/steel_reinforced, -/obj/item/rig_module/sprinter, /obj/machinery/light/no_nightshift{ dir = 8 }, @@ -713,17 +900,38 @@ dir = 4; pixel_x = -23 }, -/obj/item/rig_module/sprinter, -/obj/item/rig_module/rescue_pharm, +/obj/item/rig_module/sprinter{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/rig_module/sprinter{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/rig_module/rescue_pharm{ + pixel_y = -2 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "fE" = ( /obj/structure/table/steel_reinforced, -/obj/item/rig_module/mounted, -/obj/item/rig_module/mounted/egun, -/obj/item/rig_module/mounted/egun, -/obj/item/rig_module/mounted/egun, +/obj/item/rig_module/mounted{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/rig_module/mounted/egun{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/rig_module/mounted/egun, +/obj/item/rig_module/mounted/egun{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/rig_module/mounted/egun{ + pixel_x = 4; + pixel_y = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "fP" = ( @@ -740,22 +948,50 @@ /area/ship/ert/mech_bay) "fU" = ( /obj/structure/table/steel_reinforced, -/obj/item/rig_module/device/rcd, -/obj/item/rig_module/device/rcd, -/obj/item/rig_module/device/plasmacutter, -/obj/item/rig_module/device/plasmacutter, +/obj/item/rig_module/device/rcd{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/rig_module/device/rcd{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/rig_module/device/plasmacutter{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/rig_module/device/plasmacutter{ + pixel_x = 4; + pixel_y = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "fZ" = ( /obj/structure/table/steel_reinforced, -/obj/item/rig_module/device/drill, -/obj/item/rig_module/device/drill, -/obj/item/rig_module/maneuvering_jets, -/obj/item/rig_module/maneuvering_jets, -/obj/item/rig_module/maneuvering_jets, -/obj/item/rig_module/maneuvering_jets, -/obj/item/rig_module/maneuvering_jets, -/obj/item/rig_module/maneuvering_jets, +/obj/item/rig_module/device/drill{ + pixel_y = -4 + }, +/obj/item/rig_module/device/drill{ + pixel_y = 4 + }, +/obj/item/rig_module/maneuvering_jets{ + pixel_x = -5 + }, +/obj/item/rig_module/maneuvering_jets{ + pixel_x = -2 + }, +/obj/item/rig_module/maneuvering_jets{ + pixel_x = 1 + }, +/obj/item/rig_module/maneuvering_jets{ + pixel_x = 4 + }, +/obj/item/rig_module/maneuvering_jets{ + pixel_x = 7 + }, +/obj/item/rig_module/maneuvering_jets{ + pixel_x = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "ga" = ( @@ -805,14 +1041,30 @@ /area/ship/ert/atmos) "gx" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/melee/baton, -/obj/item/weapon/melee/baton, -/obj/item/weapon/melee/baton, -/obj/item/weapon/melee/baton, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, +/obj/item/weapon/melee/baton{ + pixel_x = -6 + }, +/obj/item/weapon/melee/baton{ + pixel_x = -2 + }, +/obj/item/weapon/melee/baton{ + pixel_x = 2 + }, +/obj/item/weapon/melee/baton{ + pixel_x = 6 + }, +/obj/item/weapon/shield/riot{ + pixel_x = -6 + }, +/obj/item/weapon/shield/riot{ + pixel_x = -2 + }, +/obj/item/weapon/shield/riot{ + pixel_x = 2 + }, +/obj/item/weapon/shield/riot{ + pixel_x = 6 + }, /obj/effect/floor_decal/industrial/outline/grey, /obj/machinery/recharger/wallcharger{ pixel_x = -23; @@ -881,8 +1133,14 @@ /area/ship/ert/gunnery) "gX" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/storage/box/emps, -/obj/item/weapon/storage/box/emps, +/obj/item/weapon/storage/box/emps{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/weapon/storage/box/emps{ + pixel_x = 2; + pixel_y = 2 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) @@ -1038,12 +1296,27 @@ /area/ship/ert/dock_star) "ia" = ( /obj/structure/table/rack/steel, +/obj/item/clothing/accessory/holster/leg{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/accessory/holster/leg{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/accessory/holster/leg, -/obj/item/clothing/accessory/holster/leg, -/obj/item/clothing/accessory/holster/leg, -/obj/item/clothing/accessory/holster/leg, -/obj/item/clothing/accessory/holster/leg, -/obj/item/clothing/accessory/holster/leg, +/obj/item/clothing/accessory/holster/leg{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/accessory/holster/leg{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/accessory/holster/leg{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) @@ -1100,9 +1373,15 @@ /turf/simulated/wall/shull, /area/ship/ert/dock_port) "iC" = ( +/obj/item/device/healthanalyzer/advanced{ + pixel_x = 2; + pixel_y = 2 + }, /obj/item/device/healthanalyzer/advanced, -/obj/item/device/healthanalyzer/advanced, -/obj/item/device/healthanalyzer/advanced, +/obj/item/device/healthanalyzer/advanced{ + pixel_x = -2; + pixel_y = -2 + }, /obj/structure/table/rack/steel, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -1182,24 +1461,56 @@ /area/ship/ert/mech_bay) "kf" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/gun/projectile/automatic/pdw{ + pixel_y = 6 + }, +/obj/item/weapon/gun/projectile/automatic/pdw{ + pixel_y = 4 + }, +/obj/item/weapon/gun/projectile/automatic/pdw{ + pixel_y = 2 + }, /obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/ammo_magazine/m9mml, -/obj/item/ammo_magazine/m9mml, -/obj/item/ammo_magazine/m9mml, -/obj/item/ammo_magazine/m9mml, -/obj/item/ammo_magazine/m9mml, -/obj/item/ammo_magazine/m9mml, -/obj/item/ammo_magazine/m9mml, -/obj/item/ammo_magazine/m9mml, -/obj/item/ammo_magazine/m9mml, -/obj/item/ammo_magazine/m9mml, -/obj/item/ammo_magazine/m9mml, +/obj/item/weapon/gun/projectile/automatic/pdw{ + pixel_y = -2 + }, +/obj/item/weapon/gun/projectile/automatic/pdw{ + pixel_y = -4 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = 10 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = 8 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = 6 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = 4 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = 2 + }, /obj/item/ammo_magazine/m9mml, +/obj/item/ammo_magazine/m9mml{ + pixel_x = -2 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = -4 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = -6 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = -8 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = -10 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = -12 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) @@ -1438,18 +1749,48 @@ /area/ship/ert/engine) "mb" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/storage/belt/security/tactical{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/weapon/storage/belt/security/tactical{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/clothing/glasses/sunglasses/sechud/tactical, -/obj/item/clothing/glasses/sunglasses/sechud/tactical, -/obj/item/clothing/glasses/sunglasses/sechud/tactical, -/obj/item/clothing/glasses/sunglasses/sechud/tactical, -/obj/item/clothing/glasses/sunglasses/sechud/tactical, +/obj/item/weapon/storage/belt/security/tactical{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/storage/belt/security/tactical{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/storage/belt/security/tactical{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/clothing/glasses/sunglasses/sechud/tactical{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/glasses/sunglasses/sechud/tactical{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/glasses/sunglasses/sechud/tactical, +/obj/item/clothing/glasses/sunglasses/sechud/tactical{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/glasses/sunglasses/sechud/tactical{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/glasses/sunglasses/sechud/tactical{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) @@ -1658,8 +1999,12 @@ /area/ship/ert/dock_star) "nb" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/xray, -/obj/item/weapon/gun/energy/xray, +/obj/item/weapon/gun/energy/xray{ + pixel_y = -3 + }, +/obj/item/weapon/gun/energy/xray{ + pixel_y = 3 + }, /obj/machinery/light/no_nightshift, /obj/machinery/firealarm/alarms_hidden{ dir = 1; @@ -1832,9 +2177,12 @@ /obj/item/weapon/hand_tele, /obj/item/device/perfect_tele, /obj/item/device/binoculars, -/obj/item/device/survivalcapsule, -/obj/item/device/survivalcapsule, -/mob/living/simple_mob/animal/passive/mimepet, +/obj/item/device/survivalcapsule{ + pixel_x = 3 + }, +/obj/item/device/survivalcapsule{ + pixel_x = -3 + }, /turf/simulated/floor/wood, /area/ship/ert/commander) "og" = ( @@ -1943,12 +2291,27 @@ /area/ship/ert/dock_port) "oW" = ( /obj/structure/table/rack/steel, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = 6; + pixel_y = 6 + }, /obj/machinery/power/apc/hyper{ alarms_hidden = 1; dir = 4; @@ -1962,37 +2325,77 @@ "oX" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/clothing/gloves/yellow{ + pixel_y = -3 + }, /obj/item/clothing/gloves/yellow, -/obj/item/clothing/gloves/yellow, -/obj/item/clothing/gloves/yellow, -/obj/item/weapon/storage/backpack/ert/engineer, -/obj/item/weapon/storage/backpack/ert/engineer, +/obj/item/clothing/gloves/yellow{ + pixel_y = 3 + }, +/obj/item/weapon/storage/backpack/ert/engineer{ + pixel_y = -3 + }, /obj/item/weapon/storage/backpack/ert/engineer, +/obj/item/weapon/storage/backpack/ert/engineer{ + pixel_y = 3 + }, +/obj/item/clothing/suit/space/void/responseteam/engineer{ + pixel_y = -3 + }, /obj/item/clothing/suit/space/void/responseteam/engineer, -/obj/item/clothing/suit/space/void/responseteam/engineer, -/obj/item/clothing/suit/space/void/responseteam/engineer, -/obj/item/clothing/head/helmet/ert/engineer, -/obj/item/clothing/head/helmet/ert/engineer, +/obj/item/clothing/suit/space/void/responseteam/engineer{ + pixel_y = 3 + }, +/obj/item/clothing/head/helmet/ert/engineer{ + pixel_y = -3 + }, /obj/item/clothing/head/helmet/ert/engineer, +/obj/item/clothing/head/helmet/ert/engineer{ + pixel_y = 3 + }, +/obj/item/clothing/suit/armor/vest/ert/engineer{ + pixel_y = -3 + }, /obj/item/clothing/suit/armor/vest/ert/engineer, -/obj/item/clothing/suit/armor/vest/ert/engineer, -/obj/item/clothing/suit/armor/vest/ert/engineer, +/obj/item/clothing/suit/armor/vest/ert/engineer{ + pixel_y = 3 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "pa" = ( /obj/structure/table/steel_reinforced, +/obj/item/weapon/storage/belt/medical/emt{ + pixel_y = -4 + }, +/obj/item/weapon/storage/belt/medical/emt{ + pixel_y = -2 + }, /obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/clothing/accessory/storage/white_vest, -/obj/item/clothing/accessory/storage/white_vest, -/obj/item/clothing/accessory/storage/white_vest, -/obj/item/clothing/accessory/storage/white_vest, -/obj/item/clothing/accessory/storage/white_vest, +/obj/item/weapon/storage/belt/medical/emt{ + pixel_y = 2 + }, +/obj/item/weapon/storage/belt/medical/emt{ + pixel_y = 4 + }, +/obj/item/weapon/storage/belt/medical/emt{ + pixel_y = 6 + }, +/obj/item/clothing/accessory/storage/white_vest{ + pixel_y = -4 + }, +/obj/item/clothing/accessory/storage/white_vest{ + pixel_y = -2 + }, /obj/item/clothing/accessory/storage/white_vest, +/obj/item/clothing/accessory/storage/white_vest{ + pixel_y = 2 + }, +/obj/item/clothing/accessory/storage/white_vest{ + pixel_y = 4 + }, +/obj/item/clothing/accessory/storage/white_vest{ + pixel_y = 6 + }, /obj/machinery/alarm/alarms_hidden{ dir = 1; pixel_y = -26 @@ -2010,20 +2413,36 @@ /area/ship/ert/med_surg) "pd" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/storage/backpack/ert/medical{ + pixel_y = -3 + }, /obj/item/weapon/storage/backpack/ert/medical, -/obj/item/weapon/storage/backpack/ert/medical, -/obj/item/weapon/storage/backpack/ert/medical, +/obj/item/weapon/storage/backpack/ert/medical{ + pixel_y = 3 + }, +/obj/item/clothing/suit/space/void/responseteam/medical{ + pixel_y = -3 + }, /obj/item/clothing/suit/space/void/responseteam/medical, -/obj/item/clothing/suit/space/void/responseteam/medical, -/obj/item/clothing/suit/space/void/responseteam/medical, -/obj/machinery/light/no_nightshift, +/obj/item/clothing/suit/space/void/responseteam/medical{ + pixel_y = 3 + }, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/clothing/head/helmet/ert/medical{ + pixel_y = -3 + }, /obj/item/clothing/head/helmet/ert/medical, -/obj/item/clothing/head/helmet/ert/medical, -/obj/item/clothing/head/helmet/ert/medical, -/obj/item/clothing/suit/armor/vest/ert/medical, -/obj/item/clothing/suit/armor/vest/ert/medical, +/obj/item/clothing/head/helmet/ert/medical{ + pixel_y = 3 + }, +/obj/item/clothing/suit/armor/vest/ert/medical{ + pixel_y = -3 + }, /obj/item/clothing/suit/armor/vest/ert/medical, +/obj/item/clothing/suit/armor/vest/ert/medical{ + pixel_y = 3 + }, +/obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "pf" = ( @@ -2044,19 +2463,35 @@ /area/ship/ert/med) "pn" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/storage/backpack/ert/medical{ + pixel_y = -3 + }, /obj/item/weapon/storage/backpack/ert/medical, -/obj/item/weapon/storage/backpack/ert/medical, -/obj/item/weapon/storage/backpack/ert/medical, -/obj/item/clothing/suit/space/void/responseteam/medical, -/obj/item/clothing/suit/space/void/responseteam/medical, +/obj/item/weapon/storage/backpack/ert/medical{ + pixel_y = 3 + }, +/obj/item/clothing/suit/space/void/responseteam/medical{ + pixel_y = -3 + }, /obj/item/clothing/suit/space/void/responseteam/medical, +/obj/item/clothing/suit/space/void/responseteam/medical{ + pixel_y = 3 + }, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/clothing/head/helmet/ert/medical{ + pixel_y = -3 + }, /obj/item/clothing/head/helmet/ert/medical, -/obj/item/clothing/head/helmet/ert/medical, -/obj/item/clothing/head/helmet/ert/medical, -/obj/item/clothing/suit/armor/vest/ert/medical, -/obj/item/clothing/suit/armor/vest/ert/medical, +/obj/item/clothing/head/helmet/ert/medical{ + pixel_y = 3 + }, +/obj/item/clothing/suit/armor/vest/ert/medical{ + pixel_y = -3 + }, /obj/item/clothing/suit/armor/vest/ert/medical, +/obj/item/clothing/suit/armor/vest/ert/medical{ + pixel_y = 3 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "po" = ( @@ -2079,12 +2514,27 @@ /area/ship/ert/med_surg) "pq" = ( /obj/structure/table/steel_reinforced, +/obj/item/bodybag/cryobag{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/bodybag/cryobag{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/bodybag/cryobag, -/obj/item/bodybag/cryobag, -/obj/item/bodybag/cryobag, -/obj/item/bodybag/cryobag, -/obj/item/bodybag/cryobag, -/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/bodybag/cryobag{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/bodybag/cryobag{ + pixel_x = 6; + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "pr" = ( @@ -2101,14 +2551,26 @@ /area/ship/ert/gunnery) "pt" = ( /obj/structure/table/rack/steel, +/obj/item/clothing/suit/space/void/responseteam/janitor{ + pixel_y = -2 + }, /obj/item/clothing/suit/space/void/responseteam/janitor, -/obj/item/clothing/suit/space/void/responseteam/janitor, -/obj/item/clothing/suit/space/void/responseteam/janitor, -/obj/item/clothing/suit/space/void/responseteam/janitor, -/obj/item/weapon/storage/belt/janitor, -/obj/item/weapon/storage/belt/janitor, -/obj/item/weapon/storage/belt/janitor, +/obj/item/clothing/suit/space/void/responseteam/janitor{ + pixel_y = 2 + }, +/obj/item/clothing/suit/space/void/responseteam/janitor{ + pixel_y = 4 + }, +/obj/item/weapon/storage/belt/janitor{ + pixel_y = -2 + }, /obj/item/weapon/storage/belt/janitor, +/obj/item/weapon/storage/belt/janitor{ + pixel_y = 2 + }, +/obj/item/weapon/storage/belt/janitor{ + pixel_y = 4 + }, /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) @@ -2153,35 +2615,79 @@ /obj/structure/closet{ name = "custodial" }, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/mop, -/obj/item/weapon/mop, -/obj/item/weapon/mop, -/obj/item/weapon/mop, +/obj/item/weapon/reagent_containers/spray/cleaner{ + pixel_x = -6 + }, +/obj/item/weapon/reagent_containers/spray/cleaner{ + pixel_x = -2 + }, +/obj/item/weapon/reagent_containers/spray/cleaner{ + pixel_x = 2 + }, +/obj/item/weapon/reagent_containers/spray/cleaner{ + pixel_x = 6 + }, +/obj/item/weapon/reagent_containers/glass/bucket{ + pixel_x = 6 + }, +/obj/item/weapon/reagent_containers/glass/bucket{ + pixel_x = 2 + }, +/obj/item/weapon/reagent_containers/glass/bucket{ + pixel_x = -2 + }, +/obj/item/weapon/reagent_containers/glass/bucket{ + pixel_x = -6 + }, +/obj/item/weapon/mop{ + pixel_x = 6 + }, +/obj/item/weapon/mop{ + pixel_x = 2 + }, +/obj/item/weapon/mop{ + pixel_x = -2 + }, +/obj/item/weapon/mop{ + pixel_x = -6 + }, /obj/item/weapon/rig/ert/janitor, -/obj/item/device/lightreplacer, -/obj/item/device/lightreplacer, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/device/lightreplacer{ + pixel_y = -2 + }, +/obj/item/device/lightreplacer{ + pixel_y = 2 + }, +/obj/item/weapon/storage/box/lights/mixed{ + pixel_x = -1; + pixel_y = -1 + }, +/obj/item/weapon/storage/box/lights/mixed{ + pixel_x = 1; + pixel_y = 1 + }, /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "pI" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/energy/pulse_rifle{ + pixel_y = 6 + }, +/obj/item/weapon/gun/energy/pulse_rifle{ + pixel_y = 4 + }, +/obj/item/weapon/gun/energy/pulse_rifle{ + pixel_y = 2 + }, /obj/item/weapon/gun/energy/pulse_rifle, -/obj/item/weapon/gun/energy/pulse_rifle, -/obj/item/weapon/gun/energy/pulse_rifle, -/obj/item/weapon/gun/energy/pulse_rifle, -/obj/item/weapon/gun/energy/pulse_rifle, -/obj/item/weapon/gun/energy/pulse_rifle, +/obj/item/weapon/gun/energy/pulse_rifle{ + pixel_y = -2 + }, +/obj/item/weapon/gun/energy/pulse_rifle{ + pixel_y = -4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) "pK" = ( @@ -2192,8 +2698,14 @@ /area/ship/ert/mech_bay) "pM" = ( /obj/structure/table/steel_reinforced, -/obj/item/rig_module/mounted/taser, -/obj/item/rig_module/mounted/taser, +/obj/item/rig_module/mounted/taser{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/rig_module/mounted/taser{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/rig_module/mounted/taser, /obj/machinery/light/no_nightshift{ dir = 8 @@ -2202,9 +2714,18 @@ dir = 1; pixel_y = -26 }, -/obj/item/rig_module/mounted/taser, -/obj/item/rig_module/mounted/taser, -/obj/item/rig_module/mounted/taser, +/obj/item/rig_module/mounted/taser{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/rig_module/mounted/taser{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/rig_module/mounted/taser{ + pixel_x = 6; + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "pN" = ( @@ -2234,8 +2755,12 @@ /area/ship/ert/atmos) "pW" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/plasmastun, -/obj/item/weapon/gun/energy/plasmastun, +/obj/item/weapon/gun/energy/plasmastun{ + pixel_y = -3 + }, +/obj/item/weapon/gun/energy/plasmastun{ + pixel_y = 3 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) @@ -2261,18 +2786,36 @@ /area/ship/ert/mech_bay) "qa" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/rig/ert/security{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, -/obj/item/weapon/rig/ert/security, +/obj/item/weapon/rig/ert/security{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/rig/ert/security{ + pixel_x = 4; + pixel_y = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "qd" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/rig/ert/engineer{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/weapon/rig/ert/engineer, -/obj/item/weapon/rig/ert/engineer, -/obj/item/weapon/rig/ert/engineer, -/obj/item/weapon/rig/ert/engineer, +/obj/item/weapon/rig/ert/engineer{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/rig/ert/engineer{ + pixel_x = 4; + pixel_y = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "ql" = ( @@ -2288,10 +2831,19 @@ /area/ship/ert/med) "qo" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/rig/ert/medical{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/weapon/rig/ert/medical, -/obj/item/weapon/rig/ert/medical, -/obj/item/weapon/rig/ert/medical, -/obj/item/weapon/rig/ert/medical, +/obj/item/weapon/rig/ert/medical{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/rig/ert/medical{ + pixel_x = 4; + pixel_y = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "qt" = ( @@ -2361,6 +2913,35 @@ }, /turf/simulated/floor/reinforced/airless, /area/ship/ert/eng_storage) +"qJ" = ( +/obj/structure/table/rack/steel, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/ammo_magazine/m545{ + pixel_x = -8 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = -5 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = -2 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = 1 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = 4 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = 7 + }, +/obj/item/weapon/gun/projectile/automatic/sts35{ + pixel_y = -2 + }, +/obj/item/weapon/gun/projectile/automatic/sts35{ + pixel_y = 2 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/armoury_st) "qP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -2487,26 +3068,42 @@ /area/ship/ert/med) "sf" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, /obj/machinery/chemical_dispenser/ert, +/obj/item/weapon/reagent_containers/glass/beaker/large, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "so" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/storage/backpack/ert/security{ + pixel_y = -3 + }, /obj/item/weapon/storage/backpack/ert/security, -/obj/item/weapon/storage/backpack/ert/security, -/obj/item/weapon/storage/backpack/ert/security, -/obj/item/clothing/suit/space/void/responseteam/security, -/obj/item/clothing/suit/space/void/responseteam/security, +/obj/item/weapon/storage/backpack/ert/security{ + pixel_y = 3 + }, +/obj/item/clothing/suit/space/void/responseteam/security{ + pixel_y = -3 + }, /obj/item/clothing/suit/space/void/responseteam/security, +/obj/item/clothing/suit/space/void/responseteam/security{ + pixel_y = 3 + }, /obj/machinery/light/no_nightshift, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/clothing/head/helmet/ert/security{ + pixel_y = -3 + }, /obj/item/clothing/head/helmet/ert/security, -/obj/item/clothing/head/helmet/ert/security, -/obj/item/clothing/head/helmet/ert/security, -/obj/item/clothing/suit/armor/vest/ert/security, -/obj/item/clothing/suit/armor/vest/ert/security, +/obj/item/clothing/head/helmet/ert/security{ + pixel_y = 3 + }, +/obj/item/clothing/suit/armor/vest/ert/security{ + pixel_y = -3 + }, /obj/item/clothing/suit/armor/vest/ert/security, +/obj/item/clothing/suit/armor/vest/ert/security{ + pixel_y = 3 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "sp" = ( @@ -2575,10 +3172,19 @@ /area/ship/ert/dock_star) "sF" = ( /obj/structure/table/rack/steel, +/obj/item/clothing/glasses/graviton{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/glasses/graviton, -/obj/item/clothing/glasses/graviton, -/obj/item/clothing/glasses/graviton, -/obj/item/clothing/glasses/graviton, +/obj/item/clothing/glasses/graviton{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/glasses/graviton{ + pixel_x = 4; + pixel_y = 4 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) @@ -2594,12 +3200,27 @@ /area/ship/ert/bridge) "sJ" = ( /obj/structure/table/rack/steel, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = 6; + pixel_y = 6 + }, /obj/machinery/alarm/alarms_hidden{ dir = 1; pixel_y = -26 @@ -2753,9 +3374,15 @@ /turf/simulated/floor/airless, /area/ship/ert/gunnery) "ug" = ( +/obj/item/device/healthanalyzer/advanced{ + pixel_x = 2; + pixel_y = 2 + }, /obj/item/device/healthanalyzer/advanced, -/obj/item/device/healthanalyzer/advanced, -/obj/item/device/healthanalyzer/advanced, +/obj/item/device/healthanalyzer/advanced{ + pixel_x = -2; + pixel_y = -2 + }, /obj/structure/table/rack/steel, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -2980,12 +3607,22 @@ /area/ship/ert/hallways) "wl" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/gun/energy/gun{ + pixel_y = 6 + }, +/obj/item/weapon/gun/energy/gun{ + pixel_y = 4 + }, +/obj/item/weapon/gun/energy/gun{ + pixel_y = 2 + }, /obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, +/obj/item/weapon/gun/energy/gun{ + pixel_y = -2 + }, +/obj/item/weapon/gun/energy/gun{ + pixel_y = -4 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) @@ -3013,13 +3650,22 @@ /area/ship/ert/atmos) "wt" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/firstaid/bonemed, -/obj/item/weapon/storage/firstaid/clotting, +/obj/item/weapon/storage/firstaid/bonemed{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/storage/firstaid/clotting{ + pixel_x = 2; + pixel_y = 2 + }, /obj/effect/floor_decal/corner/yellow{ dir = 1 }, /obj/item/weapon/storage/firstaid/combat, -/obj/item/weapon/storage/firstaid/combat, +/obj/item/weapon/storage/firstaid/combat{ + pixel_x = -2; + pixel_y = -2 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "wO" = ( @@ -3069,12 +3715,22 @@ "xg" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/energy/gun/nuclear{ + pixel_y = 6 + }, +/obj/item/weapon/gun/energy/gun/nuclear{ + pixel_y = 4 + }, +/obj/item/weapon/gun/energy/gun/nuclear{ + pixel_y = 2 + }, /obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear, +/obj/item/weapon/gun/energy/gun/nuclear{ + pixel_y = -2 + }, +/obj/item/weapon/gun/energy/gun/nuclear{ + pixel_y = -4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "xh" = ( @@ -3083,37 +3739,85 @@ pixel_y = 23 }, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/ammo_magazine/m9mm/large/preban{ + pixel_x = -12 + }, +/obj/item/ammo_magazine/m9mm/large/preban{ + pixel_x = -10 + }, +/obj/item/ammo_magazine/m9mm/large/preban{ + pixel_x = -8 + }, +/obj/item/ammo_magazine/m9mm/large/preban{ + pixel_x = -6 + }, +/obj/item/ammo_magazine/m9mm/large/preban{ + pixel_x = -4 + }, +/obj/item/ammo_magazine/m9mm/large/preban{ + pixel_x = -2 + }, +/obj/item/ammo_magazine/m9mm/large/preban, +/obj/item/ammo_magazine/m9mm/large/preban{ + pixel_x = 2 + }, +/obj/item/ammo_magazine/m9mm/large/preban{ + pixel_x = 4 + }, +/obj/item/ammo_magazine/m9mm/large/preban{ + pixel_x = 6 + }, +/obj/item/ammo_magazine/m9mm/large/preban{ + pixel_x = 8 + }, +/obj/item/ammo_magazine/m9mm/large/preban{ + pixel_x = 10 + }, +/obj/item/weapon/gun/projectile/p92x/large/preban{ + pixel_y = 4 + }, +/obj/item/weapon/gun/projectile/p92x/large/preban{ + pixel_y = 2 + }, /obj/item/weapon/gun/projectile/p92x/large/preban, -/obj/item/weapon/gun/projectile/p92x/large/preban, -/obj/item/weapon/gun/projectile/p92x/large/preban, -/obj/item/weapon/gun/projectile/p92x/large/preban, -/obj/item/weapon/gun/projectile/p92x/large/preban, -/obj/item/weapon/gun/projectile/p92x/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, +/obj/item/weapon/gun/projectile/p92x/large/preban{ + pixel_y = -2 + }, +/obj/item/weapon/gun/projectile/p92x/large/preban{ + pixel_y = -4 + }, +/obj/item/weapon/gun/projectile/p92x/large/preban{ + pixel_y = -6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "xi" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/gun/projectile/automatic/sts35, -/obj/item/weapon/gun/projectile/automatic/sts35, -/obj/item/ammo_magazine/m545, -/obj/item/ammo_magazine/m545, -/obj/item/ammo_magazine/m545, -/obj/item/ammo_magazine/m545, -/obj/item/ammo_magazine/m545, -/obj/item/ammo_magazine/m545, +/obj/item/ammo_magazine/m545{ + pixel_x = 7 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = 4 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = 1 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = -2 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = -5 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = -8 + }, +/obj/item/weapon/gun/projectile/automatic/sts35{ + pixel_y = -2 + }, +/obj/item/weapon/gun/projectile/automatic/sts35{ + pixel_y = 2 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "xt" = ( @@ -3137,10 +3841,16 @@ /area/ship/ert/armoury_st) "xv" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/gun/energy/ionrifle/pistol{ + pixel_y = 4 + }, /obj/item/weapon/gun/energy/ionrifle/pistol, -/obj/item/weapon/gun/energy/ionrifle/pistol, -/obj/item/weapon/gun/energy/ionrifle, -/obj/item/weapon/gun/energy/ionrifle, +/obj/item/weapon/gun/energy/ionrifle{ + pixel_y = -4 + }, +/obj/item/weapon/gun/energy/ionrifle{ + pixel_y = -8 + }, /obj/machinery/power/apc/hyper{ alarms_hidden = 1; dir = 4; @@ -3162,31 +3872,75 @@ /obj/structure/closet/medical_wall{ pixel_x = 32 }, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/weapon/storage/firstaid/adv{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/storage/firstaid/adv{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/storage/firstaid/fire{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/storage/firstaid/fire{ + pixel_x = 2; + pixel_y = 2 + }, /obj/item/weapon/storage/firstaid/o2, /obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/weapon/storage/firstaid/toxin{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/weapon/storage/firstaid/toxin{ + pixel_x = -2; + pixel_y = -2 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "xA" = ( /obj/structure/table/rack/steel, +/obj/item/clothing/shoes/magboots/adv{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/shoes/magboots/adv{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/shoes/magboots/adv, -/obj/item/clothing/shoes/magboots/adv, -/obj/item/clothing/shoes/magboots/adv, -/obj/item/clothing/shoes/magboots/adv, -/obj/item/clothing/shoes/magboots/adv, -/obj/item/clothing/shoes/magboots/adv, +/obj/item/clothing/shoes/magboots/adv{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/shoes/magboots/adv{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/shoes/magboots/adv{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "xC" = ( -/obj/machinery/portable_atmospherics/powered/scrubber, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/effect/floor_decal/industrial/outline/blue, +/obj/structure/table/steel_reinforced, +/obj/item/weapon/rcd/advanced/loaded{ + desc = "A device used to rapidly build and deconstruct. This version works faster, and has a much larger capacity than a standard model, but doesn't work at range. Reload with compressed matter cartridges."; + name = "emergency rapid construction device"; + pixel_y = 3; + ranged = 0 + }, +/obj/item/weapon/rcd/advanced/loaded{ + desc = "A device used to rapidly build and deconstruct. This version works faster, and has a much larger capacity than a standard model, but doesn't work at range. Reload with compressed matter cartridges."; + name = "emergency rapid construction device"; + pixel_y = -3; + ranged = 0 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/eng_storage) "xG" = ( @@ -3228,8 +3982,12 @@ /area/ship/ert/med_surg) "xZ" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/launcher/grenade, -/obj/item/weapon/gun/launcher/grenade, +/obj/item/weapon/gun/launcher/grenade{ + pixel_y = 3 + }, +/obj/item/weapon/gun/launcher/grenade{ + pixel_y = -3 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) @@ -3300,15 +4058,18 @@ "yp" = ( /obj/structure/table/steel_reinforced, /obj/item/weapon/storage/firstaid/fire{ - pixel_x = 2; - pixel_y = 2 + pixel_x = 4; + pixel_y = 4 }, /obj/item/weapon/storage/firstaid/fire{ pixel_x = 2; pixel_y = 2 }, /obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/weapon/storage/firstaid/adv{ + pixel_x = -2; + pixel_y = -2 + }, /obj/effect/floor_decal/corner/yellow{ dir = 8 }, @@ -3374,8 +4135,8 @@ "yJ" = ( /obj/structure/table/steel_reinforced, /obj/machinery/chemical_dispenser/biochemistry/full, -/obj/item/weapon/reagent_containers/glass/beaker/large, /obj/machinery/light/no_nightshift, +/obj/item/weapon/reagent_containers/glass/beaker/large, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "yR" = ( @@ -3646,6 +4407,7 @@ "AL" = ( /obj/structure/table/steel_reinforced, /obj/item/weapon/storage/box/pillbottles, +/obj/item/weapon/storage/box/pillbottles, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "AS" = ( @@ -3736,8 +4498,12 @@ /area/ship/ert/barracks) "Bp" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/projectile/automatic/z8, -/obj/item/weapon/gun/projectile/automatic/z8, +/obj/item/weapon/gun/projectile/automatic/z8{ + pixel_y = 3 + }, +/obj/item/weapon/gun/projectile/automatic/z8{ + pixel_y = -3 + }, /obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762, @@ -3777,6 +4543,10 @@ "Br" = ( /turf/simulated/floor/tiled/techmaint, /area/ship/ert/eng_storage) +"Bx" = ( +/obj/structure/bed/chair/bay/chair/padded/blue, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/med) "BE" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -4100,23 +4870,35 @@ /area/ship/ert/hallways_aft) "Ec" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/storage/backpack/ert/security{ + pixel_y = -3 + }, /obj/item/weapon/storage/backpack/ert/security, -/obj/item/weapon/storage/backpack/ert/security, -/obj/item/weapon/storage/backpack/ert/security, +/obj/item/weapon/storage/backpack/ert/security{ + pixel_y = 3 + }, +/obj/item/clothing/suit/space/void/responseteam/security{ + pixel_y = -3 + }, /obj/item/clothing/suit/space/void/responseteam/security, -/obj/item/clothing/suit/space/void/responseteam/security, -/obj/item/clothing/suit/space/void/responseteam/security, -/obj/machinery/firealarm/alarms_hidden{ - dir = 1; - pixel_y = -26 +/obj/item/clothing/suit/space/void/responseteam/security{ + pixel_y = 3 }, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/clothing/head/helmet/ert/security{ + pixel_y = -3 + }, /obj/item/clothing/head/helmet/ert/security, -/obj/item/clothing/head/helmet/ert/security, -/obj/item/clothing/head/helmet/ert/security, -/obj/item/clothing/suit/armor/vest/ert/security, -/obj/item/clothing/suit/armor/vest/ert/security, +/obj/item/clothing/head/helmet/ert/security{ + pixel_y = 3 + }, +/obj/item/clothing/suit/armor/vest/ert/security{ + pixel_y = -3 + }, /obj/item/clothing/suit/armor/vest/ert/security, +/obj/item/clothing/suit/armor/vest/ert/security{ + pixel_y = 3 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "Ed" = ( @@ -4285,8 +5067,14 @@ /area/ship/ert/engineering) "Fq" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/storage/box/frags, -/obj/item/weapon/storage/box/frags, +/obj/item/weapon/storage/box/frags{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/weapon/storage/box/frags{ + pixel_x = 2; + pixel_y = 2 + }, /obj/machinery/power/apc/hyper{ alarms_hidden = 1; dir = 4; @@ -4412,36 +5200,134 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -12; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -10; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -8; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -2; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 2; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 4; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 8; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 10; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -12 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -10 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -8 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -4 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -2 + }, /obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 2 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 4 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 8 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 10 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -12; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -10; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -8; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 2; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 4; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 10; + pixel_y = 6 + }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/armoury_st) "FY" = ( @@ -4462,10 +5348,25 @@ /area/ship/ert/armoury_st) "Gl" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/projectile/heavysniper, -/obj/item/weapon/storage/box/sniperammo, -/obj/item/weapon/storage/box/sniperammo, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/projectile/automatic/z8{ + pixel_y = -3 + }, +/obj/item/weapon/gun/projectile/automatic/z8{ + pixel_y = 3 + }, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762/ap, +/obj/item/ammo_magazine/m762/ap, +/obj/item/ammo_magazine/m762/ap, +/obj/item/ammo_magazine/m762/ap, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) "Gr" = ( @@ -4615,10 +5516,18 @@ /area/shuttle/ert_ship_boat) "HB" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/gun/burst, -/obj/item/weapon/gun/energy/gun/burst, -/obj/item/weapon/gun/energy/lasershotgun, -/obj/item/weapon/gun/energy/lasershotgun, +/obj/item/weapon/gun/energy/gun/burst{ + pixel_y = 3 + }, +/obj/item/weapon/gun/energy/gun/burst{ + pixel_y = -3 + }, +/obj/item/weapon/gun/energy/lasershotgun{ + pixel_y = -3 + }, +/obj/item/weapon/gun/energy/lasershotgun{ + pixel_y = 3 + }, /obj/effect/floor_decal/industrial/outline/grey, /obj/machinery/recharger/wallcharger{ pixel_x = -23; @@ -4817,6 +5726,7 @@ "IF" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline, +/obj/item/weapon/hand_labeler, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "IK" = ( @@ -4876,15 +5786,18 @@ "Jc" = ( /obj/structure/table/steel_reinforced, /obj/item/weapon/storage/firstaid/toxin{ - pixel_x = 2; - pixel_y = 2 + pixel_x = 4; + pixel_y = 4 }, /obj/item/weapon/storage/firstaid/toxin{ pixel_x = 2; pixel_y = 2 }, /obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/weapon/storage/firstaid/o2{ + pixel_x = -2; + pixel_y = -2 + }, /obj/machinery/light/no_nightshift{ dir = 1 }, @@ -4952,8 +5865,14 @@ /area/ship/ert/hallways) "Jw" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/storage/box/handcuffs, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/weapon/storage/box/handcuffs{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/weapon/storage/box/handcuffs{ + pixel_x = 2; + pixel_y = 2 + }, /obj/effect/floor_decal/corner/red{ dir = 4 }, @@ -5049,26 +5968,15 @@ /area/ship/ert/engine) "JZ" = ( /obj/structure/table/rack/steel, -/obj/machinery/light/no_nightshift, +/obj/item/weapon/gun/projectile/heavysniper, +/obj/item/weapon/storage/box/sniperammo, +/obj/item/weapon/storage/box/sniperammo, +/obj/effect/floor_decal/industrial/outline/grey, /obj/machinery/alarm/alarms_hidden{ dir = 1; pixel_y = -26 }, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/gun/projectile/automatic/z8, -/obj/item/weapon/gun/projectile/automatic/z8, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762/ap, -/obj/item/ammo_magazine/m762/ap, -/obj/item/ammo_magazine/m762/ap, -/obj/item/ammo_magazine/m762/ap, +/obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) "Kb" = ( @@ -5164,25 +6072,37 @@ /area/ship/ert/eng_storage) "KG" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/electrical, -/obj/item/weapon/storage/toolbox/electrical, -/obj/item/weapon/storage/briefcase/inflatable{ - pixel_x = 3; - pixel_y = 3 +/obj/item/weapon/storage/toolbox/mechanical{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/item/weapon/storage/toolbox/mechanical{ + pixel_x = -4; + pixel_y = -2 + }, +/obj/item/weapon/storage/toolbox/electrical{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/item/weapon/storage/toolbox/electrical{ + pixel_x = -4; + pixel_y = 6 }, /obj/item/weapon/storage/briefcase/inflatable{ - pixel_x = 3; - pixel_y = 3 + pixel_x = 4; + pixel_y = -6 }, /obj/item/weapon/storage/briefcase/inflatable{ - pixel_x = 3; - pixel_y = 3 + pixel_x = 4; + pixel_y = -2 }, /obj/item/weapon/storage/briefcase/inflatable{ - pixel_x = 3; - pixel_y = 3 + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/weapon/storage/briefcase/inflatable{ + pixel_x = 4; + pixel_y = 6 }, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/techfloor, @@ -5265,10 +6185,22 @@ /area/ship/ert/bridge) "Lg" = ( /obj/structure/table/rack/steel, -/obj/item/taperoll/engineering, -/obj/item/taperoll/engineering, -/obj/item/taperoll/engineering, -/obj/item/taperoll/engineering, +/obj/item/taperoll/engineering{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/taperoll/engineering{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/taperoll/engineering{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/taperoll/engineering{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/eng_storage) @@ -5288,12 +6220,24 @@ /area/ship/ert/med) "Lk" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = -7 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = -4 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = -1 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = 2 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = 5 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = 8 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/hallways) @@ -5304,18 +6248,26 @@ "Lq" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{ + pixel_y = 6 + }, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{ + pixel_y = 4 + }, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{ + pixel_y = 2 + }, /obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{ + pixel_y = -2 + }, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{ + pixel_y = -4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "LA" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, /obj/item/weapon/storage/box/shotgunshells/large, /obj/item/weapon/storage/box/shotgunshells/large, /obj/item/weapon/storage/box/shotgunammo/large, @@ -5326,6 +6278,12 @@ /obj/item/weapon/storage/box/beanbags/large, /obj/item/weapon/storage/box/stunshells/large, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/projectile/shotgun/pump/combat{ + pixel_y = 3 + }, +/obj/item/weapon/gun/projectile/shotgun/pump/combat{ + pixel_y = -3 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "LB" = ( @@ -5350,13 +6308,23 @@ /obj/machinery/firealarm/alarms_hidden{ pixel_y = 26 }, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, +/obj/item/weapon/gun/energy/laser{ + pixel_y = 6 + }, +/obj/item/weapon/gun/energy/laser{ + pixel_y = 4 + }, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/energy/laser{ + pixel_y = 2 + }, /obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, +/obj/item/weapon/gun/energy/laser{ + pixel_y = -2 + }, +/obj/item/weapon/gun/energy/laser{ + pixel_y = -4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "LH" = ( @@ -5410,17 +6378,23 @@ /area/ship/ert/med_surg) "Md" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, +/obj/item/weapon/gun/energy/taser{ + pixel_y = 3 + }, +/obj/item/weapon/gun/energy/taser{ + pixel_y = 1 + }, +/obj/item/weapon/gun/energy/taser{ + pixel_y = -1 + }, +/obj/item/weapon/gun/energy/taser{ + pixel_y = -3 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "Me" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/projectile/automatic/as24, -/obj/item/weapon/gun/projectile/automatic/as24, /obj/item/weapon/storage/box/shotgunshells/large, /obj/item/weapon/storage/box/shotgunshells/large, /obj/item/weapon/storage/box/shotgunammo/large, @@ -5431,6 +6405,12 @@ /obj/item/weapon/storage/box/beanbags/large, /obj/item/weapon/storage/box/stunshells/large, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/projectile/automatic/as24{ + pixel_y = 3 + }, +/obj/item/weapon/gun/projectile/automatic/as24{ + pixel_y = -3 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) "Mm" = ( @@ -5441,10 +6421,13 @@ /area/ship/ert/teleporter) "Mt" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/netgun, +/obj/item/weapon/gun/energy/netgun{ + pixel_y = -4 + }, /obj/effect/floor_decal/industrial/outline/grey, /obj/item/weapon/gun/energy/sniperrifle{ - battery_lock = 0 + battery_lock = 0; + pixel_y = 6 }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) @@ -5537,18 +6520,38 @@ /area/shuttle/ert_ship_boat) "MX" = ( /obj/structure/table/steel_reinforced, +/obj/item/clothing/accessory/storage/brown_vest{ + pixel_y = -4 + }, +/obj/item/clothing/accessory/storage/brown_vest{ + pixel_y = -2 + }, /obj/item/clothing/accessory/storage/brown_vest, -/obj/item/clothing/accessory/storage/brown_vest, -/obj/item/clothing/accessory/storage/brown_vest, -/obj/item/clothing/accessory/storage/brown_vest, -/obj/item/clothing/accessory/storage/brown_vest, -/obj/item/clothing/accessory/storage/brown_vest, -/obj/item/weapon/storage/belt/utility/chief/full, -/obj/item/weapon/storage/belt/utility/chief/full, -/obj/item/weapon/storage/belt/utility/chief/full, -/obj/item/weapon/storage/belt/utility/chief/full, -/obj/item/weapon/storage/belt/utility/chief/full, +/obj/item/clothing/accessory/storage/brown_vest{ + pixel_y = 2 + }, +/obj/item/clothing/accessory/storage/brown_vest{ + pixel_y = 4 + }, +/obj/item/clothing/accessory/storage/brown_vest{ + pixel_y = 6 + }, +/obj/item/weapon/storage/belt/utility/chief/full{ + pixel_y = -4 + }, +/obj/item/weapon/storage/belt/utility/chief/full{ + pixel_y = -2 + }, /obj/item/weapon/storage/belt/utility/chief/full, +/obj/item/weapon/storage/belt/utility/chief/full{ + pixel_y = 2 + }, +/obj/item/weapon/storage/belt/utility/chief/full{ + pixel_y = 4 + }, +/obj/item/weapon/storage/belt/utility/chief/full{ + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "MZ" = ( @@ -5915,10 +6918,12 @@ "OO" = ( /obj/structure/table/rack/steel, /obj/item/weapon/gun/energy/sniperrifle{ - battery_lock = 0 + battery_lock = 0; + pixel_y = -3 }, /obj/item/weapon/gun/energy/sniperrifle{ - battery_lock = 0 + battery_lock = 0; + pixel_y = 3 }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, @@ -6010,21 +7015,41 @@ /area/space) "OZ" = ( /obj/structure/table/standard, -/obj/item/weapon/soap, -/obj/item/weapon/soap, -/obj/item/weapon/soap, -/obj/item/weapon/soap, -/obj/item/weapon/towel{ - color = "#0000FF" +/obj/item/weapon/soap{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/weapon/soap{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/weapon/soap{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/soap{ + pixel_x = 6; + pixel_y = 6 }, /obj/item/weapon/towel{ - color = "#0000FF" + color = "#0000FF"; + pixel_x = -6; + pixel_y = -6 }, /obj/item/weapon/towel{ - color = "#0000FF" + color = "#0000FF"; + pixel_x = -2; + pixel_y = -2 }, /obj/item/weapon/towel{ - color = "#0000FF" + color = "#0000FF"; + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/towel{ + color = "#0000FF"; + pixel_x = 6; + pixel_y = 6 }, /obj/effect/floor_decal/corner/white, /obj/machinery/light/no_nightshift{ @@ -6201,8 +7226,12 @@ /obj/structure/table/steel_reinforced, /obj/item/weapon/smes_coil, /obj/item/weapon/smes_coil, -/obj/item/device/t_scanner/advanced, -/obj/item/device/t_scanner/advanced, +/obj/item/device/t_scanner/advanced{ + pixel_x = -3 + }, +/obj/item/device/t_scanner/advanced{ + pixel_x = 3 + }, /obj/machinery/power/apc/hyper{ alarms_hidden = 1; name = "VB APC - South"; @@ -6443,44 +7472,101 @@ /area/ship/ert/barracks) "St" = ( /obj/structure/table/rack/steel, +/obj/item/device/flash{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/device/flash{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, +/obj/item/device/flash{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/device/flash{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/device/flash{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/hallways) "Sx" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/projectile/automatic/p90, -/obj/item/weapon/gun/projectile/automatic/p90, -/obj/item/ammo_magazine/m9mmp90, -/obj/item/ammo_magazine/m9mmp90, -/obj/item/ammo_magazine/m9mmp90, -/obj/item/ammo_magazine/m9mmp90, -/obj/item/ammo_magazine/m9mmp90, -/obj/item/ammo_magazine/m9mmp90, -/obj/item/weapon/gun/projectile/automatic/p90, -/obj/item/weapon/gun/projectile/automatic/p90, -/obj/item/ammo_magazine/m9mmp90, -/obj/item/ammo_magazine/m9mmp90, -/obj/item/ammo_magazine/m9mmp90, -/obj/item/ammo_magazine/m9mmp90, -/obj/item/ammo_magazine/m9mmp90, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = 12 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = 10 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = 8 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = 6 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = 4 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = 2 + }, /obj/item/ammo_magazine/m9mmp90, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = -2 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = -4 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = -6 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = -8 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = -10 + }, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/projectile/automatic/p90{ + pixel_y = -6 + }, +/obj/item/weapon/gun/projectile/automatic/p90{ + pixel_y = -2 + }, +/obj/item/weapon/gun/projectile/automatic/p90{ + pixel_y = 2 + }, +/obj/item/weapon/gun/projectile/automatic/p90{ + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) "Sy" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/projectile/automatic/l6_saw, -/obj/item/weapon/gun/projectile/automatic/l6_saw, -/obj/item/ammo_magazine/m545saw, -/obj/item/ammo_magazine/m545saw, -/obj/item/ammo_magazine/m545saw, -/obj/item/ammo_magazine/m545saw, +/obj/item/weapon/gun/projectile/automatic/l6_saw{ + pixel_y = 3 + }, +/obj/item/weapon/gun/projectile/automatic/l6_saw{ + pixel_y = -3 + }, +/obj/item/ammo_magazine/m545saw{ + pixel_x = 6 + }, +/obj/item/ammo_magazine/m545saw{ + pixel_x = 2 + }, +/obj/item/ammo_magazine/m545saw{ + pixel_x = -2 + }, +/obj/item/ammo_magazine/m545saw{ + pixel_x = -6 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) @@ -6513,9 +7599,13 @@ /area/ship/ert/med_surg) "SD" = ( /obj/structure/table/rack, +/obj/item/ammo_magazine/m44{ + pixel_x = -3 + }, +/obj/item/ammo_magazine/m44{ + pixel_x = 3 + }, /obj/item/weapon/gun/projectile/deagle, -/obj/item/ammo_magazine/m44, -/obj/item/ammo_magazine/m44, /turf/simulated/floor/wood, /area/ship/ert/commander) "SE" = ( @@ -6547,9 +7637,37 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/eng_storage) "SI" = ( -/obj/machinery/portable_atmospherics/powered/scrubber, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/effect/floor_decal/industrial/outline/blue, +/obj/structure/table/steel_reinforced, +/obj/item/weapon/rcd_ammo/large{ + pixel_x = -8; + pixel_y = -8 + }, +/obj/item/weapon/rcd_ammo/large{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/weapon/rcd_ammo/large{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/weapon/rcd_ammo/large{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/weapon/rcd_ammo/large, +/obj/item/weapon/rcd_ammo/large{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/rcd_ammo/large{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/rcd_ammo/large{ + pixel_x = 6; + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/eng_storage) "SJ" = ( @@ -6569,16 +7687,26 @@ /area/ship/ert/gunnery) "SV" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/reagent_containers/hypospray{ + pixel_x = 6 + }, +/obj/item/weapon/reagent_containers/hypospray{ + pixel_x = 3 + }, /obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, +/obj/item/weapon/reagent_containers/hypospray{ + pixel_x = -3 + }, /obj/machinery/alarm/alarms_hidden{ pixel_y = 26 }, /obj/effect/floor_decal/industrial/outline, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, +/obj/item/weapon/reagent_containers/hypospray{ + pixel_x = -6 + }, +/obj/item/weapon/reagent_containers/hypospray{ + pixel_x = -9 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "SZ" = ( @@ -6842,12 +7970,27 @@ "VQ" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/corner/red, +/obj/item/device/radio/off{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/device/radio/off{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, +/obj/item/device/radio/off{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/device/radio/off{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/device/radio/off{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/hallways) @@ -6876,8 +8019,12 @@ /obj/machinery/light/no_nightshift{ dir = 1 }, -/obj/item/device/defib_kit/compact/combat/loaded, -/obj/item/device/defib_kit/compact/combat/loaded, +/obj/item/device/defib_kit/compact/combat/loaded{ + pixel_y = -3 + }, +/obj/item/device/defib_kit/compact/combat/loaded{ + pixel_y = 3 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "Wq" = ( @@ -15080,7 +16227,7 @@ iB Na JB Wa -Iv +eL zT Ez IK @@ -18346,7 +19493,7 @@ ip mV pa tH -xi +qJ BU GK FR @@ -18362,7 +19509,7 @@ SV DJ QT jn -Pq +Bx sf kx TU diff --git a/maps/submaps/admin_use_vr/kk_mercship.dmm b/maps/submaps/admin_use_vr/kk_mercship.dmm index a5a215cf4a..362023e72c 100644 --- a/maps/submaps/admin_use_vr/kk_mercship.dmm +++ b/maps/submaps/admin_use_vr/kk_mercship.dmm @@ -186,25 +186,135 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_port) "aS" = ( -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, /obj/structure/table/steel_reinforced, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -12; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -10; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -8; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -2; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 2; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 4; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 8; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 10; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -12 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -10 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -8 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -4 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -2 + }, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 2 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 4 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 8 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 10 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -12; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -10; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -8; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 2; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 4; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 10; + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "aU" = ( @@ -241,17 +351,21 @@ /area/ship/manta/armoury_st) "aZ" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/sizegun, -/obj/item/weapon/gun/energy/sizegun, -/obj/item/weapon/gun/energy/sizegun, -/obj/item/weapon/gun/energy/sizegun, +/obj/item/weapon/gun/energy/sizegun{ + pixel_y = 6 + }, +/obj/item/weapon/gun/energy/sizegun{ + pixel_y = 2 + }, +/obj/item/weapon/gun/energy/sizegun{ + pixel_y = -2 + }, +/obj/item/weapon/gun/energy/sizegun{ + pixel_y = -6 + }, /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "bc" = ( @@ -459,10 +573,22 @@ /obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/item/device/binoculars, -/obj/item/device/binoculars, -/obj/item/device/binoculars, -/obj/item/device/binoculars, +/obj/item/device/binoculars{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/device/binoculars{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/device/binoculars{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/device/binoculars{ + pixel_x = 6; + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "bL" = ( @@ -476,12 +602,27 @@ /obj/machinery/light_switch{ pixel_y = 23 }, +/obj/item/clothing/glasses/thermal{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/glasses/thermal{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/glasses/thermal, -/obj/item/clothing/glasses/thermal, -/obj/item/clothing/glasses/thermal, -/obj/item/clothing/glasses/thermal, -/obj/item/clothing/glasses/thermal, -/obj/item/clothing/glasses/thermal, +/obj/item/clothing/glasses/thermal{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/glasses/thermal{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/glasses/thermal{ + pixel_x = 6; + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "bP" = ( @@ -578,16 +719,24 @@ /turf/space, /area/space) "cn" = ( -/obj/structure/table/rack, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/machinery/recharger/wallcharger{ - pixel_x = 5; - pixel_y = -32 +/obj/structure/table/rack/steel, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = -7 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = -4 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = -1 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = 2 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = 5 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = 8 }, /obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor, @@ -617,11 +766,23 @@ /area/ship/manta/med) "ct" = ( /obj/structure/table/rack, +/obj/item/device/radio{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/device/radio{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/device/radio{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/device/radio{ + pixel_x = 4; + pixel_y = 4 + }, /obj/machinery/recharger/wallcharger{ pixel_x = 5; pixel_y = -32 @@ -691,12 +852,22 @@ /area/ship/manta/holding) "cP" = ( /obj/structure/table/rack, +/obj/item/weapon/storage/belt/utility/full{ + pixel_y = -4 + }, +/obj/item/weapon/storage/belt/utility/full{ + pixel_y = -2 + }, /obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, +/obj/item/weapon/storage/belt/utility/full{ + pixel_y = 2 + }, +/obj/item/weapon/storage/belt/utility/full{ + pixel_y = 4 + }, +/obj/item/weapon/storage/belt/utility/full{ + pixel_y = 6 + }, /obj/effect/floor_decal/techfloor{ dir = 1 }, @@ -714,17 +885,35 @@ /area/ship/manta/armoury_st) "cQ" = ( /obj/structure/table/rack, +/obj/item/weapon/tool/crowbar/red{ + pixel_x = -4 + }, +/obj/item/weapon/tool/crowbar/red{ + pixel_x = 2 + }, /obj/item/weapon/tool/crowbar/red, -/obj/item/weapon/tool/crowbar/red, -/obj/item/weapon/tool/crowbar/red, -/obj/item/weapon/tool/crowbar/red, -/obj/item/weapon/tool/crowbar/red, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, +/obj/item/weapon/tool/crowbar/red{ + pixel_x = 2 + }, +/obj/item/weapon/tool/crowbar/red{ + pixel_x = 4 + }, +/obj/item/device/flashlight/maglight{ + pixel_y = 6 + }, +/obj/item/device/flashlight/maglight{ + pixel_y = 4 + }, +/obj/item/device/flashlight/maglight{ + pixel_y = 2 + }, /obj/item/device/flashlight/maglight, +/obj/item/device/flashlight/maglight{ + pixel_y = -2 + }, +/obj/item/device/flashlight/maglight{ + pixel_y = -4 + }, /obj/effect/floor_decal/techfloor{ dir = 4 }, @@ -898,6 +1087,15 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) +"dM" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/structure/table/rack, +/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster, +/obj/item/mecha_parts/mecha_equipment/runningboard/limited, +/turf/simulated/floor/tiled/techfloor, +/area/ship/manta/mech_bay) "dO" = ( /obj/machinery/shipsensors{ dir = 1 @@ -1020,10 +1218,10 @@ "ep" = ( /obj/machinery/chemical_dispenser/full, /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, /obj/effect/floor_decal/techfloor{ dir = 9 }, +/obj/item/weapon/reagent_containers/glass/beaker/large, /turf/simulated/floor/tiled/white, /area/ship/manta/med) "er" = ( @@ -1049,22 +1247,22 @@ "eB" = ( /obj/machinery/chemical_dispenser/ert, /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, /obj/effect/floor_decal/techfloor{ dir = 1 }, /obj/machinery/light/no_nightshift{ dir = 1 }, +/obj/item/weapon/reagent_containers/glass/beaker/large, /turf/simulated/floor/tiled/white, /area/ship/manta/med) "eF" = ( /obj/machinery/chemical_dispenser/biochemistry/full, /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, /obj/effect/floor_decal/techfloor{ dir = 5 }, +/obj/item/weapon/reagent_containers/glass/beaker/large, /turf/simulated/floor/tiled/white, /area/ship/manta/med) "eG" = ( @@ -1383,6 +1581,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) +"gu" = ( +/obj/effect/floor_decal/techfloor, +/obj/structure/table/steel_reinforced, +/obj/item/weapon/storage/belt/utility/full, +/obj/item/device/multitool, +/turf/simulated/floor/tiled/techfloor, +/area/ship/manta/engineering) "gB" = ( /obj/effect/floor_decal/techfloor, /obj/structure/cable/orange{ @@ -1702,7 +1907,9 @@ /area/ship/manta/hallways_aft) "hU" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/c20r, +/obj/item/weapon/gun/projectile/automatic/c20r{ + pixel_y = 4 + }, /obj/item/weapon/gun/projectile/automatic/c20r, /obj/item/ammo_magazine/m10mm, /obj/item/ammo_magazine/m10mm, @@ -1714,7 +1921,9 @@ /obj/machinery/light/no_nightshift{ dir = 8 }, -/obj/item/weapon/gun/projectile/automatic/c20r, +/obj/item/weapon/gun/projectile/automatic/c20r{ + pixel_y = -4 + }, /obj/item/ammo_magazine/m10mm, /obj/item/ammo_magazine/m10mm, /turf/simulated/floor/tiled/techfloor, @@ -1770,8 +1979,12 @@ /obj/effect/floor_decal/techfloor{ dir = 5 }, -/obj/item/weapon/gun/projectile/sec/wood, -/obj/item/weapon/gun/projectile/sec/wood, +/obj/item/weapon/gun/projectile/sec/wood{ + pixel_y = 4 + }, +/obj/item/weapon/gun/projectile/sec/wood{ + pixel_y = -4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "ik" = ( @@ -2409,7 +2622,6 @@ /turf/simulated/floor/plating, /area/ship/manta/hallways_port) "kT" = ( -/obj/machinery/portable_atmospherics/canister/phoron/engine_setup, /turf/simulated/floor/plating, /area/ship/manta/hallways_port) "kW" = ( @@ -2484,7 +2696,9 @@ /area/ship/manta/hallways_aft) "lj" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/c20r, +/obj/item/weapon/gun/projectile/automatic/c20r{ + pixel_y = 4 + }, /obj/item/weapon/gun/projectile/automatic/c20r, /obj/item/ammo_magazine/m10mm, /obj/item/ammo_magazine/m10mm, @@ -2493,7 +2707,9 @@ /obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/item/weapon/gun/projectile/automatic/c20r, +/obj/item/weapon/gun/projectile/automatic/c20r{ + pixel_y = -4 + }, /obj/item/ammo_magazine/m10mm, /obj/item/ammo_magazine/m10mm, /turf/simulated/floor/tiled/techfloor, @@ -2506,8 +2722,12 @@ dir = 4 }, /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/sts35, -/obj/item/weapon/gun/projectile/automatic/sts35, +/obj/item/weapon/gun/projectile/automatic/sts35{ + pixel_y = -3 + }, +/obj/item/weapon/gun/projectile/automatic/sts35{ + pixel_y = 3 + }, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, @@ -2752,14 +2972,13 @@ /area/ship/manta/hallways_aft) "mp" = ( /obj/structure/table/rack, -/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster, -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/mortar, /obj/machinery/alarm/alarms_hidden{ pixel_y = 26 }, /obj/effect/floor_decal/techfloor{ dir = 9 }, +/obj/item/mecha_parts/mecha_equipment/cloak, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/mech_bay) "ms" = ( @@ -3174,6 +3393,14 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/mech_bay) +"ou" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/structure/table/rack, +/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/xray, +/turf/simulated/floor/tiled/techfloor, +/area/ship/manta/mech_bay) "ov" = ( /obj/machinery/power/apc/hyper{ alarms_hidden = 1; @@ -3202,46 +3429,47 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, +/obj/structure/table/rack, +/obj/item/mecha_parts/mecha_equipment/tool/passenger{ + pixel_x = -4 + }, +/obj/item/mecha_parts/mecha_equipment/tool/passenger{ + pixel_x = 4 + }, +/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/mech_bay) "oD" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, +/obj/item/weapon/gun/energy/laser{ + pixel_y = 3 + }, +/obj/item/weapon/gun/energy/laser{ + pixel_y = -3 + }, /obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "oE" = ( -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/orange{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 +/obj/structure/table/rack, +/obj/item/weapon/gun/projectile/automatic/sts35{ + pixel_y = 3 }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 10 - }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 9 +/obj/item/weapon/gun/projectile/automatic/sts35{ + pixel_y = -3 }, +/obj/item/ammo_magazine/m545, +/obj/item/ammo_magazine/m545, +/obj/item/ammo_magazine/m545, +/obj/item/ammo_magazine/m545, +/obj/item/ammo_magazine/m545/ap, /turf/simulated/floor/tiled/techfloor, -/area/ship/manta/engineering) +/area/ship/manta/armoury_st) "oF" = ( /obj/effect/floor_decal/techfloor{ dir = 4 @@ -3271,8 +3499,12 @@ dir = 8; pixel_x = 26 }, -/obj/item/weapon/gun/projectile/sec/wood, -/obj/item/weapon/gun/projectile/sec/wood, +/obj/item/weapon/gun/projectile/sec/wood{ + pixel_y = 4 + }, +/obj/item/weapon/gun/projectile/sec/wood{ + pixel_y = -4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "oP" = ( @@ -3301,11 +3533,14 @@ /turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "oT" = ( -/obj/mecha/combat/gygax/dark, -/obj/machinery/mech_recharger, /obj/effect/floor_decal/techfloor{ dir = 1 }, +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/mech_recharger, +/obj/mecha/combat/gygax/dark{ + desc = "A lightweight combat exosuit, based off the standard Gygax chassis but no doubt thoroughly customized and upgraded." + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/mech_bay) "oU" = ( @@ -3371,6 +3606,13 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, +/obj/structure/table/rack, +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/clusterbang{ + pixel_y = 4 + }, +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/concussion{ + pixel_y = -4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/mech_bay) "py" = ( @@ -3402,8 +3644,9 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_port) "pE" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/binary/pump/on{ + dir = 1 + }, /turf/simulated/floor/plating, /area/ship/manta/atmos) "pH" = ( @@ -3452,13 +3695,7 @@ /turf/simulated/floor/plating, /area/ship/manta/atmos) "pW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/catwalk, +/obj/machinery/atmospherics/binary/pump/on, /turf/simulated/floor/plating, /area/ship/manta/atmos) "pX" = ( @@ -3714,12 +3951,13 @@ /obj/effect/floor_decal/techfloor{ dir = 10 }, +/obj/structure/table/rack, +/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/mech_bay) "ry" = ( /obj/structure/table/rack, /obj/item/mecha_parts/mecha_equipment/tool/jetpack, -/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/xray, /obj/effect/floor_decal/techfloor{ dir = 6 }, @@ -3768,9 +4006,6 @@ /turf/simulated/floor/tiled/white, /area/ship/manta/med) "rH" = ( -/obj/structure/railing{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, @@ -4141,6 +4376,7 @@ /obj/effect/floor_decal/techfloor{ dir = 10 }, +/obj/structure/table/steel, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "tN" = ( @@ -4405,6 +4641,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/structure/table/steel, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "uV" = ( @@ -4521,6 +4758,10 @@ /obj/machinery/door/firedoor/border_only, /obj/structure/grille, /obj/structure/window/titanium/full, +/obj/structure/window/titanium, +/obj/structure/window/titanium{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) "vH" = ( @@ -4802,11 +5043,21 @@ /area/ship/manta/engineering) "ww" = ( /obj/structure/table/rack, +/obj/item/weapon/storage/firstaid/combat{ + pixel_x = -4; + pixel_y = -4 + }, /obj/item/weapon/storage/firstaid/combat, -/obj/item/weapon/storage/firstaid/combat, -/obj/item/weapon/storage/firstaid/combat, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, +/obj/item/weapon/storage/firstaid/combat{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/reagent_containers/hypospray{ + pixel_x = 3 + }, +/obj/item/weapon/reagent_containers/hypospray{ + pixel_x = -3 + }, /obj/effect/floor_decal/techfloor{ dir = 4 }, @@ -5064,7 +5315,6 @@ /turf/simulated/floor/plating, /area/ship/manta/dock_star) "xE" = ( -/obj/structure/catwalk, /obj/machinery/light_switch{ pixel_y = 23 }, @@ -5155,26 +5405,9 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_star) "xQ" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/glass_engineeringatmos{ - req_one_access = list(150) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/techfloor{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, +/obj/structure/catwalk, +/obj/structure/railing, +/turf/simulated/floor/plating, /area/ship/manta/atmos) "xT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel, @@ -5186,6 +5419,10 @@ /obj/machinery/door/firedoor/border_only, /obj/structure/grille, /obj/structure/window/titanium/full, +/obj/structure/window/titanium{ + dir = 1 + }, +/obj/structure/window/titanium, /turf/simulated/floor/plating, /area/ship/manta/engine) "xW" = ( @@ -5230,8 +5467,26 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/barracks) "yh" = ( -/obj/structure/railing, -/turf/simulated/floor/plating, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/glass_engineeringatmos{ + req_one_access = list(150) + }, +/obj/effect/floor_decal/techfloor, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, /area/ship/manta/atmos) "yj" = ( /obj/machinery/power/port_gen/pacman/super/potato, @@ -5371,6 +5626,7 @@ /obj/effect/floor_decal/techfloor{ dir = 9 }, +/obj/structure/table/steel, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "yy" = ( @@ -5419,6 +5675,7 @@ /obj/effect/floor_decal/techfloor{ dir = 9 }, +/obj/structure/table/steel, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "yO" = ( @@ -5482,12 +5739,14 @@ /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "yW" = ( -/obj/structure/railing{ +/obj/structure/railing, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/catwalk, -/obj/structure/railing, /turf/simulated/floor/plating, /area/ship/manta/atmos) "yY" = ( @@ -5601,12 +5860,12 @@ dir = 4; pixel_x = -23 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/gun/energy/netgun, -/obj/item/weapon/gun/energy/netgun, +/obj/item/weapon/gun/energy/netgun{ + pixel_y = -3 + }, +/obj/item/weapon/gun/energy/netgun{ + pixel_y = 3 + }, /obj/item/weapon/gun/energy/plasmastun, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) @@ -5623,22 +5882,42 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "zy" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = -6; + pixel_y = -2 + }, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = 6; + pixel_y = -2 + }, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = -6; + pixel_y = 2 + }, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = 6; + pixel_y = 2 + }, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/techfloor{ dir = 8 }, @@ -5706,7 +5985,7 @@ /turf/simulated/floor/plating, /area/ship/manta/engine) "zR" = ( -/turf/simulated/wall/shull, +/turf/simulated/wall/rshull, /area/ship/manta/engineering) "zS" = ( /obj/structure/bed/chair/comfy/black{ @@ -5766,6 +6045,11 @@ }, /turf/simulated/floor/reinforced/airless, /area/ship/manta/gunnery) +"Ah" = ( +/obj/effect/floor_decal/industrial/outline, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/simulated/floor/plating, +/area/ship/manta/atmos) "Aj" = ( /obj/effect/floor_decal/techfloor, /obj/structure/cable/orange{ @@ -6010,6 +6294,9 @@ /obj/effect/floor_decal/techfloor{ dir = 6 }, +/obj/structure/table/steel_reinforced, +/obj/item/clothing/suit/space/void/refurb/engineering, +/obj/item/clothing/head/helmet/space/void/refurb/engineering, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) "BN" = ( @@ -6178,8 +6465,12 @@ /area/ship/manta/recreation) "CT" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/plasmastun, -/obj/item/weapon/gun/energy/plasmastun, +/obj/item/weapon/gun/energy/plasmastun{ + pixel_y = -3 + }, +/obj/item/weapon/gun/energy/plasmastun{ + pixel_y = 3 + }, /obj/effect/floor_decal/techfloor{ dir = 10 }, @@ -6194,6 +6485,11 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) +"Da" = ( +/obj/machinery/portable_atmospherics/canister/phoron/engine_setup, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/plating, +/area/ship/manta/atmos) "Db" = ( /obj/structure/table/standard, /obj/item/device/radio/headset/syndicate, @@ -6248,8 +6544,14 @@ /area/ship/manta/dock_port) "Dg" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/frags, -/obj/item/weapon/storage/box/frags, +/obj/item/weapon/storage/box/frags{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/weapon/storage/box/frags{ + pixel_x = 2; + pixel_y = 2 + }, /obj/effect/floor_decal/techfloor{ dir = 9 }, @@ -6361,10 +6663,22 @@ /area/ship/manta/bridge) "Dy" = ( /obj/structure/table/steel_reinforced, -/obj/item/clothing/suit/storage/vest/heavy/merc, -/obj/item/clothing/suit/storage/vest/heavy/merc, -/obj/item/clothing/suit/storage/vest/heavy/merc, -/obj/item/clothing/suit/storage/vest/heavy/merc, +/obj/item/clothing/suit/storage/vest/heavy/merc{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/clothing/suit/storage/vest/heavy/merc{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/suit/storage/vest/heavy/merc{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/clothing/suit/storage/vest/heavy/merc{ + pixel_x = -6; + pixel_y = -6 + }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -6387,10 +6701,6 @@ dir = 4; pixel_x = 26 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "DB" = ( @@ -6580,14 +6890,38 @@ /area/ship/manta/hallways_aft) "EE" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/backpack/dufflebag/syndie/med, -/obj/item/weapon/storage/backpack/dufflebag/syndie/med, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, -/obj/item/weapon/storage/backpack/dufflebag/syndie, -/obj/item/weapon/storage/backpack/dufflebag/syndie, -/obj/item/weapon/storage/backpack/dufflebag/syndie, -/obj/item/weapon/storage/backpack/dufflebag/syndie, +/obj/item/weapon/storage/backpack/dufflebag/syndie/med{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/item/weapon/storage/backpack/dufflebag/syndie/med{ + pixel_x = 4; + pixel_y = -6 + }, +/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo{ + pixel_x = 4; + pixel_y = -2 + }, +/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo{ + pixel_x = -4; + pixel_y = -2 + }, +/obj/item/weapon/storage/backpack/dufflebag/syndie{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/weapon/storage/backpack/dufflebag/syndie{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/item/weapon/storage/backpack/dufflebag/syndie{ + pixel_x = 4; + pixel_y = 6 + }, +/obj/item/weapon/storage/backpack/dufflebag/syndie{ + pixel_x = -4; + pixel_y = 6 + }, /obj/effect/floor_decal/techfloor{ dir = 4 }, @@ -6732,9 +7066,15 @@ "Fx" = ( /obj/structure/table/rack, /obj/item/weapon/gun/launcher/rocket, -/obj/item/ammo_casing/rocket, -/obj/item/ammo_casing/rocket, -/obj/item/ammo_casing/rocket, +/obj/item/ammo_casing/rocket{ + pixel_y = -3 + }, +/obj/item/ammo_casing/rocket{ + pixel_y = -6 + }, +/obj/item/ammo_casing/rocket{ + pixel_y = -9 + }, /obj/effect/floor_decal/techfloor{ dir = 6 }, @@ -6875,8 +7215,11 @@ /turf/simulated/floor/wood, /area/ship/manta/barracks) "Gr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 4 }, /obj/structure/catwalk, /turf/simulated/floor/plating, @@ -6976,15 +7319,22 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 }, /obj/effect/floor_decal/techfloor{ dir = 8 }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) "GY" = ( @@ -7104,12 +7454,28 @@ /area/ship/manta/bridge) "HS" = ( /obj/structure/table/rack, -/obj/item/weapon/pinpointer/nukeop, -/obj/item/weapon/pinpointer/nukeop, -/obj/item/weapon/pinpointer/nukeop, -/obj/item/weapon/pinpointer/nukeop, -/obj/item/weapon/pinpointer/nukeop, -/obj/item/weapon/pinpointer/nukeop, +/obj/item/weapon/pinpointer/nukeop{ + pixel_x = -6; + pixel_y = -4 + }, +/obj/item/weapon/pinpointer/nukeop{ + pixel_x = 6; + pixel_y = -4 + }, +/obj/item/weapon/pinpointer/nukeop{ + pixel_x = -6 + }, +/obj/item/weapon/pinpointer/nukeop{ + pixel_x = 6 + }, +/obj/item/weapon/pinpointer/nukeop{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/weapon/pinpointer/nukeop{ + pixel_x = 6; + pixel_y = 4 + }, /obj/machinery/recharger/wallcharger{ pixel_x = 5; pixel_y = -32 @@ -7212,8 +7578,12 @@ /area/ship/manta/teleporter) "Iq" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/xray, -/obj/item/weapon/gun/energy/xray, +/obj/item/weapon/gun/energy/xray{ + pixel_y = 3 + }, +/obj/item/weapon/gun/energy/xray{ + pixel_y = -3 + }, /obj/effect/floor_decal/techfloor{ dir = 4 }, @@ -7274,13 +7644,15 @@ /area/ship/manta/engine) "IJ" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, +/obj/item/weapon/gun/energy/gun{ + pixel_y = 3 + }, +/obj/item/weapon/gun/energy/gun{ + pixel_y = -3 + }, /obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "IK" = ( @@ -7333,8 +7705,6 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "Jd" = ( @@ -7444,10 +7814,22 @@ /area/ship/manta/bridge) "Jt" = ( /obj/structure/table/rack, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, +/obj/item/clothing/shoes/magboots{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/clothing/shoes/magboots{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/clothing/shoes/magboots{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/shoes/magboots{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/techfloor{ dir = 8 }, @@ -7656,21 +8038,21 @@ /area/ship/manta/dock_star) "KA" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/clothing/under/saare, -/obj/item/clothing/under/saare, -/obj/item/clothing/under/saare, -/obj/item/clothing/under/saare, -/obj/item/clothing/accessory/armor/helmcover/saare, -/obj/item/clothing/accessory/armor/helmcover/saare, -/obj/item/clothing/accessory/armor/helmcover/saare, -/obj/item/clothing/accessory/armor/helmcover/saare, -/obj/item/clothing/accessory/storage/pouches/large/green, -/obj/item/clothing/accessory/storage/pouches/large/green, -/obj/item/clothing/accessory/storage/pouches/large/green, -/obj/item/clothing/accessory/storage/pouches/large/green, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/item/clothing/under/saare/service, +/obj/item/clothing/under/saare/service, +/obj/item/clothing/under/saare/service, +/obj/item/clothing/under/saare/service, +/obj/item/clothing/accessory/armor/helmcover/saare, +/obj/item/clothing/accessory/armor/helmcover/saare, +/obj/item/clothing/accessory/armor/helmcover/saare, +/obj/item/clothing/accessory/armor/helmcover/saare, +/obj/item/clothing/accessory/storage/pouches/large/green, +/obj/item/clothing/accessory/storage/pouches/large/green, +/obj/item/clothing/accessory/storage/pouches/large/green, +/obj/item/clothing/accessory/storage/pouches/large/green, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/barracks) "KE" = ( @@ -7801,6 +8183,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/structure/table/steel, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "Le" = ( @@ -7872,13 +8255,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) "LH" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/catwalk, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, /area/ship/manta/atmos) "LI" = ( @@ -7917,6 +8294,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 4 }, +/obj/machinery/meter, /turf/simulated/floor/plating, /area/ship/manta/atmos) "LT" = ( @@ -7998,10 +8376,13 @@ /area/ship/manta/hallways_aft) "Mg" = ( /obj/structure/sign/nosmoking_1, -/turf/simulated/wall/shull, +/turf/simulated/wall/rshull, /area/ship/manta/engineering) "Mh" = ( /obj/effect/floor_decal/techfloor, +/obj/structure/table/steel_reinforced, +/obj/item/clothing/gloves/yellow, +/obj/item/clothing/glasses/meson/aviator, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) "Mk" = ( @@ -8089,6 +8470,11 @@ }, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) +"Mz" = ( +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/portable_atmospherics/canister/phoron/engine_setup, +/turf/simulated/floor/plating, +/area/ship/manta/atmos) "ME" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -8152,35 +8538,64 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/table/steel, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "Nb" = ( /obj/structure/table/rack, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_y = -7 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_y = -4 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_y = -1 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_y = 2 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_y = 5 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_y = 8 + }, /obj/machinery/recharger/wallcharger{ pixel_x = 5; pixel_y = -32 }, /obj/effect/floor_decal/techfloor, -/obj/item/clothing/accessory/holster/armpit, -/obj/item/clothing/accessory/holster/armpit, -/obj/item/clothing/accessory/holster/armpit, -/obj/item/clothing/accessory/holster/armpit, -/obj/item/clothing/accessory/holster/armpit, -/obj/item/clothing/accessory/holster/armpit, +/obj/item/clothing/accessory/holster/armpit{ + pixel_y = -7 + }, +/obj/item/clothing/accessory/holster/armpit{ + pixel_y = -4 + }, +/obj/item/clothing/accessory/holster/armpit{ + pixel_y = -1 + }, +/obj/item/clothing/accessory/holster/armpit{ + pixel_y = 2 + }, +/obj/item/clothing/accessory/holster/armpit{ + pixel_y = 5 + }, +/obj/item/clothing/accessory/holster/armpit{ + pixel_y = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "Nc" = ( /obj/structure/table/rack, /obj/item/weapon/storage/box/shotgunshells/large, /obj/item/weapon/storage/box/shotgunammo/large, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, +/obj/item/weapon/gun/projectile/shotgun/pump/combat{ + pixel_y = 4 + }, +/obj/item/weapon/gun/projectile/shotgun/pump/combat{ + pixel_y = -4 + }, /obj/effect/floor_decal/techfloor{ dir = 8 }, @@ -8224,8 +8639,12 @@ /area/ship/manta/barracks) "Nq" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/sniperrifle, -/obj/item/weapon/gun/energy/sniperrifle, +/obj/item/weapon/gun/energy/sniperrifle{ + pixel_y = 3 + }, +/obj/item/weapon/gun/energy/sniperrifle{ + pixel_y = -3 + }, /obj/effect/floor_decal/techfloor{ dir = 4 }, @@ -8266,16 +8685,18 @@ /area/ship/manta/dock_port) "Ny" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, +/obj/item/weapon/gun/energy/gun{ + pixel_y = 3 + }, +/obj/item/weapon/gun/energy/gun{ + pixel_y = -3 + }, /obj/effect/floor_decal/techfloor{ dir = 10 }, /obj/machinery/light/no_nightshift{ dir = 8 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "NA" = ( @@ -8302,16 +8723,26 @@ /obj/machinery/light/no_nightshift{ dir = 4 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "NH" = ( /obj/structure/table/rack, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, +/obj/item/clothing/shoes/magboots{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/clothing/shoes/magboots{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/clothing/shoes/magboots{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/shoes/magboots{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/techfloor{ dir = 10 }, @@ -8363,9 +8794,18 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "NV" = ( -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 23 +/obj/structure/railing, +/obj/structure/catwalk, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plating, /area/ship/manta/atmos) @@ -8515,7 +8955,7 @@ /area/ship/manta/holding) "OO" = ( /obj/structure/sign/warning/radioactive, -/turf/simulated/wall/shull, +/turf/simulated/wall/rshull, /area/ship/manta/engineering) "OQ" = ( /obj/machinery/recharge_station, @@ -8971,8 +9411,12 @@ /obj/item/ammo_magazine/m9mm, /obj/item/ammo_magazine/m9mm, /obj/item/ammo_magazine/m9mm, -/obj/item/weapon/gun/projectile/luger, -/obj/item/weapon/gun/projectile/luger/brown, +/obj/item/weapon/gun/projectile/luger{ + pixel_y = 6 + }, +/obj/item/weapon/gun/projectile/luger/brown{ + pixel_y = -6 + }, /obj/effect/floor_decal/techfloor{ dir = 8 }, @@ -9051,8 +9495,12 @@ /area/ship/manta/holding) "RM" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/lasercannon, -/obj/item/weapon/gun/energy/lasercannon, +/obj/item/weapon/gun/energy/lasercannon{ + pixel_y = 3 + }, +/obj/item/weapon/gun/energy/lasercannon{ + pixel_y = -3 + }, /obj/item/weapon/cell/device/weapon, /obj/item/weapon/cell/device/weapon, /obj/item/weapon/cell/device/weapon, @@ -9111,14 +9559,35 @@ dir = 1; pixel_y = -23 }, +/obj/item/clothing/mask/gas/half{ + pixel_x = -8; + pixel_y = -8 + }, +/obj/item/clothing/mask/gas/half{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/clothing/mask/gas/half{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/mask/gas/half{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, +/obj/item/clothing/mask/gas/half{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/mask/gas/half{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/mask/gas/half{ + pixel_x = 6; + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "RY" = ( @@ -9148,6 +9617,10 @@ /obj/machinery/door/firedoor/border_only, /obj/structure/grille, /obj/structure/window/titanium/full, +/obj/structure/window/titanium{ + dir = 1 + }, +/obj/structure/window/titanium, /turf/simulated/floor/plating, /area/ship/manta/engine) "Sb" = ( @@ -9197,9 +9670,10 @@ /obj/machinery/alarm/alarms_hidden{ pixel_y = 26 }, -/obj/structure/catwalk, /obj/structure/railing, -/obj/effect/floor_decal/industrial/warning, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, /turf/simulated/floor/plating, /area/ship/manta/magazine) "Sq" = ( @@ -9502,6 +9976,12 @@ }, /turf/simulated/floor/wood, /area/ship/manta/barracks/bed_2) +"TD" = ( +/obj/machinery/light/small, +/obj/effect/floor_decal/industrial/outline, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/simulated/floor/plating, +/area/ship/manta/atmos) "TH" = ( /obj/structure/ship_munition/disperser_charge/emp, /obj/structure/railing{ @@ -9515,12 +9995,28 @@ /area/ship/manta/hallways_port) "TM" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/toolbox/syndicate, -/obj/item/weapon/storage/toolbox/syndicate, -/obj/item/weapon/storage/toolbox/syndicate, -/obj/item/weapon/storage/toolbox/syndicate, -/obj/item/weapon/storage/toolbox/syndicate, -/obj/item/weapon/storage/toolbox/syndicate, +/obj/item/weapon/storage/toolbox/syndicate{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/weapon/storage/toolbox/syndicate{ + pixel_x = 4; + pixel_y = -4 + }, +/obj/item/weapon/storage/toolbox/syndicate{ + pixel_x = -4 + }, +/obj/item/weapon/storage/toolbox/syndicate{ + pixel_x = 4 + }, +/obj/item/weapon/storage/toolbox/syndicate{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/weapon/storage/toolbox/syndicate{ + pixel_x = 4; + pixel_y = 4 + }, /obj/effect/floor_decal/techfloor{ dir = 8 }, @@ -9813,8 +10309,12 @@ /obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/item/weapon/gun/energy/darkmatter, -/obj/item/weapon/gun/energy/darkmatter, +/obj/item/weapon/gun/energy/darkmatter{ + pixel_y = 3 + }, +/obj/item/weapon/gun/energy/darkmatter{ + pixel_y = -3 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_as) "Vk" = ( @@ -9836,10 +10336,18 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/item/weapon/gun/projectile/automatic/bullpup, -/obj/item/weapon/gun/projectile/automatic/bullpup, -/obj/item/weapon/gun/projectile/automatic/bullpup, -/obj/item/weapon/gun/projectile/automatic/bullpup, +/obj/item/weapon/gun/projectile/automatic/bullpup{ + pixel_y = 6 + }, +/obj/item/weapon/gun/projectile/automatic/bullpup{ + pixel_y = 2 + }, +/obj/item/weapon/gun/projectile/automatic/bullpup{ + pixel_y = -2 + }, +/obj/item/weapon/gun/projectile/automatic/bullpup{ + pixel_y = -6 + }, /obj/item/ammo_magazine/m762m, /obj/item/ammo_magazine/m762m, /obj/item/ammo_magazine/m762m, @@ -9880,12 +10388,22 @@ /area/ship/manta/engineering) "VA" = ( /obj/structure/table/rack, +/obj/item/weapon/tank/emergency/oxygen/double{ + pixel_x = 6 + }, +/obj/item/weapon/tank/emergency/oxygen/double{ + pixel_x = 4 + }, +/obj/item/weapon/tank/emergency/oxygen/double{ + pixel_x = 2 + }, /obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, -/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/weapon/tank/emergency/oxygen/double{ + pixel_x = -2 + }, +/obj/item/weapon/tank/emergency/oxygen/double{ + pixel_x = -4 + }, /obj/effect/floor_decal/techfloor{ dir = 9 }, @@ -9911,17 +10429,41 @@ /area/ship/manta/bridge) "VF" = ( /obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/melee/energy/sword/red, -/obj/item/weapon/melee/energy/sword/red, -/obj/item/weapon/melee/energy/sword/red, -/obj/item/weapon/melee/energy/sword/red, -/obj/item/weapon/melee/energy/sword/red, -/obj/item/weapon/melee/energy/sword/red, +/obj/item/weapon/shield/energy{ + pixel_x = -8; + pixel_y = 8 + }, +/obj/item/weapon/shield/energy{ + pixel_x = -8 + }, +/obj/item/weapon/shield/energy{ + pixel_y = 8 + }, +/obj/item/weapon/shield/energy{ + pixel_x = 8 + }, +/obj/item/weapon/shield/energy{ + pixel_x = 8; + pixel_y = 8 + }, +/obj/item/weapon/melee/energy/sword/red{ + pixel_x = 18 + }, +/obj/item/weapon/melee/energy/sword/red{ + pixel_x = 15 + }, +/obj/item/weapon/melee/energy/sword/red{ + pixel_x = 12 + }, +/obj/item/weapon/melee/energy/sword/red{ + pixel_x = 9 + }, +/obj/item/weapon/melee/energy/sword/red{ + pixel_x = 6 + }, +/obj/item/weapon/melee/energy/sword/red{ + pixel_x = 3 + }, /obj/structure/table/steel_reinforced, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -9960,6 +10502,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/item/weapon/storage/firstaid/fire, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "VM" = ( @@ -10021,6 +10564,7 @@ /area/ship/manta/armoury_st) "Wi" = ( /obj/machinery/light/small, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, /area/ship/manta/atmos) "Wn" = ( @@ -10213,19 +10757,16 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "Xp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 23 }, +/obj/structure/catwalk, /obj/structure/cable/orange{ d1 = 1; - d2 = 4; - icon_state = "1-4" + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/railing, -/obj/structure/catwalk, /turf/simulated/floor/plating, /area/ship/manta/atmos) "Xq" = ( @@ -10279,13 +10820,6 @@ /area/ship/manta/barracks) "XB" = ( /obj/structure/table/rack, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, /obj/machinery/recharger/wallcharger{ pixel_x = 5; pixel_y = -32 @@ -10296,6 +10830,14 @@ /obj/machinery/light/no_nightshift{ dir = 4 }, +/obj/item/weapon/storage/box/flare{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/weapon/storage/box/flare{ + pixel_x = 2; + pixel_y = 2 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "XC" = ( @@ -10506,6 +11048,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/table/steel, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "YA" = ( @@ -10672,7 +11215,6 @@ /area/ship/manta/holding) "Zn" = ( /obj/structure/table/rack, -/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/frag, /obj/effect/floor_decal/techfloor{ dir = 10 @@ -18580,7 +19122,7 @@ Aw zo lm mp -Oq +ou rs PW PW @@ -18724,7 +19266,7 @@ lm RS JL ZS -Oq +dM zr PW PW @@ -19125,7 +19667,7 @@ ZT ih lo oO -lo +oE by wp zx @@ -19861,11 +20403,11 @@ AC ZU VG VG +qM +qM +xQ SI -yh -SI -SI -SI +LH ZU Va vB @@ -20149,7 +20691,7 @@ qM qM rK SI -SI +Da ZU UH vM @@ -20287,11 +20829,11 @@ VP ZU AA Dn -BU pW +BU Gr SI -SI +Mz ZU Oi vO @@ -20430,10 +20972,10 @@ ZU bw Qb qM -LH +qM yW HD -Wi +TD ZU Ni RK @@ -20575,7 +21117,7 @@ pV Xp NV SI -SI +Ah ZU Ni LU @@ -20714,8 +21256,8 @@ ZU ZU ZU ZU -xQ ZU +yh ZU ZU ZU @@ -20856,7 +21398,7 @@ WN Xa LM LM -oE +LM GS UR xp @@ -21853,7 +22395,7 @@ qw Vz wM Gk -Mh +gu Mg Va vK From 081b100e106dfa2786c4f2a6228915936733670e Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Wed, 7 Apr 2021 15:15:51 -0400 Subject: [PATCH 24/38] Update resize pref and some resizing code --- code/__defines/misc_vr.dm | 5 ++ code/game/dna/dna2_helpers.dm | 2 +- code/modules/admin/verbs/resize.dm | 22 ++++-- .../client/preference_setup/vore/02_size.dm | 2 +- .../clothing/under/miscellaneous_vr.dm | 10 +-- .../mob/living/carbon/human/emote_vr.dm | 9 --- .../station/protean_vr/protean_blob.dm | 2 +- .../station/protean_vr/protean_powers.dm | 4 +- .../simple_mob/subtypes/vore/morph/morph.dm | 6 +- code/modules/mob/transform_procs.dm | 2 +- code/modules/nifsoft/software/15_misc.dm | 2 +- .../Chemistry-Reagents-Vore_vr.dm | 6 +- code/modules/vore/eating/vore_vr.dm | 5 ++ code/modules/vore/eating/vorepanel_vr.dm | 7 ++ code/modules/vore/resizing/resize_vr.dm | 43 +++++++----- code/modules/vore/resizing/sizegun_vr.dm | 41 +++++++++--- tgui/packages/tgui/interfaces/VorePanel.js | 67 +++++++++++-------- tgui/packages/tgui/public/tgui.bundle.js | 2 +- 18 files changed, 149 insertions(+), 88 deletions(-) diff --git a/code/__defines/misc_vr.dm b/code/__defines/misc_vr.dm index 55973cdafc..244f2fedc3 100644 --- a/code/__defines/misc_vr.dm +++ b/code/__defines/misc_vr.dm @@ -67,6 +67,11 @@ #define MAT_PLASTITANIUMGLASS "plastitanium glass" #define MAT_GOLDHULL "gold hull" +#define RESIZE_MINIMUM 0.25 +#define RESIZE_MAXIMUM 2 +#define RESIZE_MINIMUM_DORMS 0.01 +#define RESIZE_MAXIMUM_DORMS 6 + #define RESIZE_HUGE 2 #define RESIZE_BIG 1.5 #define RESIZE_NORMAL 1 diff --git a/code/game/dna/dna2_helpers.dm b/code/game/dna/dna2_helpers.dm index 9fc924dae8..f4b6a24c6a 100644 --- a/code/game/dna/dna2_helpers.dm +++ b/code/game/dna/dna2_helpers.dm @@ -222,7 +222,7 @@ // Playerscale var/size = dna.GetUIValueRange(DNA_UI_PLAYERSCALE, player_sizes_list.len) if((0 < size) && (size <= player_sizes_list.len)) - H.resize(player_sizes_list[player_sizes_list[size]], TRUE) + H.resize(player_sizes_list[player_sizes_list[size]], TRUE, ignore_prefs = TRUE) // Tail/Taur Color H.r_tail = dna.GetUIValueRange(DNA_UI_TAIL_R, 255) diff --git a/code/modules/admin/verbs/resize.dm b/code/modules/admin/verbs/resize.dm index dddaeb9ec1..fc723c5278 100644 --- a/code/modules/admin/verbs/resize.dm +++ b/code/modules/admin/verbs/resize.dm @@ -5,12 +5,24 @@ if(!check_rights(R_ADMIN, R_FUN)) return - var/size_multiplier = input(usr, "Input size multiplier.", "Resize", 1) - L.resize(size_multiplier, TRUE, TRUE) - if(size_multiplier >= RESIZE_TINY && size_multiplier <= RESIZE_HUGE) - L.size_uncapped = FALSE - else + var/size_multiplier = input(usr, "Input size multiplier.", "Resize", 1) as num|null + if(!size_multiplier) + return //cancelled + + size_multiplier = clamp(size_multiplier, 0.01, 1000) + var/can_be_big = L.has_large_resize_bounds() + var/very_big = is_extreme_size(size_multiplier) + + if(very_big && can_be_big) // made an extreme size in an area that allows it, don't assume adminbuse + to_chat(src,"[L] will lose this size upon moving into an area where this size is not allowed.") + else if(very_big) // made an extreme size in an area that doesn't allow it, assume adminbuse + to_chat(src,"[L] will retain this normally unallowed size outside this area.") L.size_uncapped = TRUE + else if(L.size_uncapped) // made a normal size after having been an extreme adminbuse size + to_chat(src,"[L] now returned to normal area-based size limitations.") + L.size_uncapped = FALSE + + L.resize(size_multiplier, animate = TRUE, uncapped = TRUE, ignore_prefs = TRUE) log_and_message_admins("has changed [key_name(L)]'s size multiplier to [size_multiplier].") feedback_add_details("admin_verb","RESIZE") \ No newline at end of file diff --git a/code/modules/client/preference_setup/vore/02_size.dm b/code/modules/client/preference_setup/vore/02_size.dm index a1149821d2..5af5db28b2 100644 --- a/code/modules/client/preference_setup/vore/02_size.dm +++ b/code/modules/client/preference_setup/vore/02_size.dm @@ -45,7 +45,7 @@ character.weight_gain = pref.weight_gain character.weight_loss = pref.weight_loss character.fuzzy = pref.fuzzy - character.resize(pref.size_multiplier, animate = FALSE) + character.resize(pref.size_multiplier, animate = FALSE, ignore_prefs = TRUE) /datum/category_item/player_setup_item/vore/size/content(var/mob/user) . += "
" diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm index 762ea62109..67d08d2940 100644 --- a/code/modules/clothing/under/miscellaneous_vr.dm +++ b/code/modules/clothing/under/miscellaneous_vr.dm @@ -79,6 +79,8 @@ return var/new_size = input("Put the desired size (25-200%), or (1-600%) in dormitory areas.", "Set Size", 200) as num|null + if(!new_size) + return //cancelled //Check AGAIN because we accepted user input which is blocking. if (src != H.w_uniform) @@ -88,9 +90,9 @@ if (H.stat || H.restrained()) return - if (isnull(H.size_multiplier)) + if (isnull(H.size_multiplier)) // Why would this ever be the case? to_chat(H,"The uniform panics and corrects your apparently microscopic size.") - H.resize(RESIZE_NORMAL) + H.resize(RESIZE_NORMAL, ignore_prefs = TRUE) H.update_icons() //Just want the matrix transform return @@ -102,7 +104,7 @@ if(new_size != H.size_multiplier) if(!original_size) original_size = H.size_multiplier - H.resize(new_size/100) + H.resize(new_size/100, ignore_prefs = TRUE) // Ignores prefs because you can only resize yourself H.visible_message("The space around [H] distorts as they change size!","The space around you distorts as you change size!") else //They chose their current size. return @@ -111,7 +113,7 @@ . = ..() if(. && ishuman(M) && original_size) var/mob/living/carbon/human/H = M - H.resize(original_size) + H.resize(original_size, ignore_prefs = TRUE) original_size = null H.visible_message("The space around [H] distorts as they return to their original size!","The space around you distorts as you return to your original size!") diff --git a/code/modules/mob/living/carbon/human/emote_vr.dm b/code/modules/mob/living/carbon/human/emote_vr.dm index a23fb2a800..d8deee8e7b 100644 --- a/code/modules/mob/living/carbon/human/emote_vr.dm +++ b/code/modules/mob/living/carbon/human/emote_vr.dm @@ -181,15 +181,6 @@ return FALSE -/mob/living/carbon/human/verb/toggle_resizing_immunity() - set name = "Toggle Resizing Immunity" - set desc = "Toggles your ability to resist resizing attempts" - set category = "IC" - - resizable = !resizable - to_chat(src, "You are now [resizable ? "susceptible" : "immune"] to being resized.") - - /mob/living/carbon/human/proc/handle_flip_vr() var/original_density = density var/original_passflags = pass_flags diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm index 52918b03bb..3a1f495729 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm @@ -432,7 +432,7 @@ var/global/list/disallowed_protean_accessories = list( var/atom/reform_spot = blob.drop_location() //Size update - resize(blob.size_multiplier, FALSE) + resize(blob.size_multiplier, FALSE, ignore_prefs = TRUE) //Move them back where the blob was forceMove(reform_spot) diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm index 8a84a15331..c8e46b8600 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm @@ -300,14 +300,14 @@ //Sizing up if(cost > 0) if(refactory.use_stored_material(MAT_STEEL,cost)) - user.resize(size_factor) + user.resize(size_factor, ignore_prefs = TRUE) else to_chat(user,"That size change would cost [cost] steel, which you don't have.") //Sizing down (or not at all) else if(cost <= 0) cost = abs(cost) var/actually_added = refactory.add_stored_material(MAT_STEEL,cost) - user.resize(size_factor) + user.resize(size_factor, ignore_prefs = TRUE) if(actually_added != cost) to_chat(user,"Unfortunately, [cost-actually_added] steel was lost due to lack of storage space.") diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm b/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm index 7b2da46008..4a843eed80 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm @@ -121,7 +121,7 @@ else if(ismob(target)) var/mob/living/M = target - resize(M.size_multiplier) + resize(M.size_multiplier, ignore_prefs = TRUE) //Morphed is weaker melee_damage_lower = melee_damage_disguised @@ -165,7 +165,7 @@ maptext = null size_multiplier = our_size_multiplier - resize(size_multiplier) + resize(size_multiplier, ignore_prefs = TRUE) //Baseline stats melee_damage_lower = initial(melee_damage_lower) @@ -183,7 +183,7 @@ /mob/living/simple_mob/vore/hostile/morph/will_show_tooltip() return (!morphed) -/mob/living/simple_mob/vore/hostile/morph/resize(var/new_size, var/animate = TRUE) +/mob/living/simple_mob/vore/hostile/morph/resize(var/new_size, var/animate = TRUE, var/uncapped = FALSE, var/ignore_prefs = FALSE) if(morphed && !ismob(form)) return return ..() diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index bd7c1d0d49..fc0c3bebdd 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -192,7 +192,7 @@ var/datum/preferences/B = O.client.prefs for(var/language in B.alternate_languages) O.add_language(language) - O.resize(B.size_multiplier, animate = TRUE) //VOREStation Addition: add size prefs to borgs + O.resize(B.size_multiplier, animate = TRUE, ignore_prefs = TRUE) //VOREStation Addition: add size prefs to borgs O.fuzzy = B.fuzzy //VOREStation Addition: add size prefs to borgs callHook("borgify", list(O)) diff --git a/code/modules/nifsoft/software/15_misc.dm b/code/modules/nifsoft/software/15_misc.dm index 2b173346ce..dede84b0d9 100644 --- a/code/modules/nifsoft/software/15_misc.dm +++ b/code/modules/nifsoft/software/15_misc.dm @@ -134,7 +134,7 @@ to_chat(nif.human,"The safety features of the NIF Program prevent you from choosing this size.") return else - if(nif.human.resize(new_size/100)) + if(nif.human.resize(new_size/100, ignore_prefs = TRUE)) to_chat(nif.human,"You set the size to [new_size]%") nif.human.visible_message("Swirling grey mist envelops [nif.human] as they change size!","Swirling streams of nanites wrap around you as you change size!") spawn(0) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Vore_vr.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Vore_vr.dm index 3cf6276998..20af3a57e3 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Vore_vr.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Vore_vr.dm @@ -13,8 +13,7 @@ mrate_static = TRUE /datum/reagent/macrocillin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) - if(M.size_range_check(M.size_multiplier)) - M.resize(M.size_multiplier+0.01)//Incrrease 1% per tick. + M.resize(M.size_multiplier+0.01, uncapped = M.has_large_resize_bounds()) //Incrrease 1% per tick. return /datum/reagent/microcillin @@ -27,8 +26,7 @@ mrate_static = TRUE /datum/reagent/microcillin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) - if(M.size_range_check(M.size_multiplier)) - M.resize(M.size_multiplier-0.01) //Decrease 1% per tick. + M.resize(M.size_multiplier-0.01, uncapped = M.has_large_resize_bounds()) //Decrease 1% per tick. return diff --git a/code/modules/vore/eating/vore_vr.dm b/code/modules/vore/eating/vore_vr.dm index 2985b7c489..3c4ac85724 100644 --- a/code/modules/vore/eating/vore_vr.dm +++ b/code/modules/vore/eating/vore_vr.dm @@ -45,6 +45,7 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE //Actual preferences var/digestable = TRUE var/devourable = TRUE + var/resizable = TRUE var/feeding = TRUE var/absorbable = TRUE //TFF 14/12/19 - choose whether allowing absorbing var/digest_leave_remains = FALSE @@ -122,6 +123,7 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE digestable = json_from_file["digestable"] devourable = json_from_file["devourable"] + resizable = json_from_file["resizable"] feeding = json_from_file["feeding"] absorbable = json_from_file["absorbable"] //TFF 14/12/19 - choose whether allowing absorbing digest_leave_remains = json_from_file["digest_leave_remains"] @@ -141,6 +143,8 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE digestable = TRUE if(isnull(devourable)) devourable = TRUE + if(isnull(resizable)) + resizable = TRUE if(isnull(feeding)) feeding = TRUE if(isnull(absorbable)) @@ -175,6 +179,7 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE "version" = version, "digestable" = digestable, "devourable" = devourable, + "resizable" = resizable, "absorbable" = absorbable, "feeding" = feeding, "digest_leave_remains" = digest_leave_remains, diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index 2d5e4d36e9..b5b29fa7df 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -208,6 +208,7 @@ data["prefs"] = list( "digestable" = host.digestable, "devourable" = host.devourable, + "resizable" = host.resizable, "feeding" = host.feeding, "absorbable" = host.absorbable, "digest_leave_remains" = host.digest_leave_remains, @@ -358,6 +359,12 @@ host.client.prefs_vr.devourable = host.devourable unsaved_changes = TRUE return TRUE + if("toggle_resize") + host.resizable = !host.resizable + if(host.client.prefs_vr) + host.client.prefs_vr.resizable = host.resizable + unsaved_changes = TRUE + return TRUE if("toggle_feed") host.feeding = !host.feeding if(host.client.prefs_vr) diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm index f726775207..fa11f0cbbd 100644 --- a/code/modules/vore/resizing/resize_vr.dm +++ b/code/modules/vore/resizing/resize_vr.dm @@ -49,21 +49,25 @@ GLOBAL_VAR(size_uncapped_mobs_timer) /mob/living/get_effective_size() return size_multiplier -/** - * Resizes the mob immediately to the desired mod, animating it growing/shrinking. - * It can be used by anything that calls it. - */ - /atom/movable/proc/size_range_check(size_select) //both objects and mobs needs to have that var/area/A = get_area(src) //Get the atom's area to check for size limit. if((A.limit_mob_size && (size_select > 200 || size_select < 25)) || (size_select > 600 || size_select <1)) return FALSE return TRUE +/atom/movable/proc/has_large_resize_bounds() + var/area/A = get_area(src) //Get the atom's area to check for size limit. + return !A.limit_mob_size + +/proc/is_extreme_size(size) + return (size < RESIZE_MINIMUM || size > RESIZE_MAXIMUM) + /proc/add_to_uncapped_list(var/mob/living/L) if(L.size_uncapped) return if(!GLOB.size_uncapped_mobs.len) + //Could be a subsystem but arguably a giant waste of time to make into a subsystem. A subsystem that is paused on and off all the time? Eh. + //If you're that worried, make metrics for how often this even runs and then decide. GLOB.size_uncapped_mobs_timer = addtimer(CALLBACK(GLOBAL_PROC, .check_uncapped_list), 2 SECONDS, TIMER_LOOP | TIMER_UNIQUE | TIMER_STOPPABLE) GLOB.size_uncapped_mobs |= weakref(L) @@ -80,26 +84,33 @@ GLOBAL_VAR(size_uncapped_mobs_timer) /proc/check_uncapped_list() for(var/weakref/wr in GLOB.size_uncapped_mobs) var/mob/living/L = wr.resolve() - var/area/A = get_area(L) - if(!istype(L)) + if(!istype(L) || L.size_uncapped) GLOB.size_uncapped_mobs -= wr continue - if((A.limit_mob_size && !L.size_uncapped) && (L.size_multiplier <= RESIZE_TINY || L.size_multiplier >= RESIZE_HUGE)) - L.resize(L.size_multiplier) + // If we get here, you're a mob, and you don't have admin exclusion (size_uncapped) to being big, and you're very likely big. + // If you're not abnormally big, the below will do nothing, so it's fine to run anyway. + if(!L.has_large_resize_bounds()) + L.resize(L.size_multiplier, ignore_prefs = TRUE) //Calling this will have resize() clamp it GLOB.size_uncapped_mobs -= wr if(!GLOB.size_uncapped_mobs.len) deltimer(GLOB.size_uncapped_mobs_timer) GLOB.size_uncapped_mobs_timer = null -/mob/living/proc/resize(var/new_size, var/animate = TRUE, var/uncapped = FALSE) +/** + * Resizes the mob immediately to the desired mod, animating it growing/shrinking. + * It can be used by anything that calls it. + */ + + +/mob/living/proc/resize(var/new_size, var/animate = TRUE, var/uncapped = FALSE, var/ignore_prefs = FALSE) if(!uncapped) - new_size = clamp(new_size, RESIZE_TINY, RESIZE_HUGE) - src.size_uncapped = FALSE + new_size = clamp(new_size, RESIZE_MINIMUM, RESIZE_MAXIMUM) remove_from_uncapped_list(src) - else + else if(is_extreme_size(new_size)) add_to_uncapped_list(src) + if(size_multiplier == new_size) return 1 @@ -130,8 +141,8 @@ GLOBAL_VAR(size_uncapped_mobs_timer) else update_transform() //Lame way -/mob/living/carbon/human/resize(var/new_size, var/animate = TRUE) - if(!resizable) +/mob/living/carbon/human/resize(var/new_size, var/animate = TRUE, var/uncapped = FALSE, var/ignore_prefs = FALSE) + if(!resizable && !ignore_prefs) return 1 if(species) vis_height = species.icon_height @@ -144,7 +155,7 @@ GLOBAL_VAR(size_uncapped_mobs_timer) apply_hud(index, HI) // Optimize mannequins - never a point to animating or doing HUDs on these. -/mob/living/carbon/human/dummy/mannequin/resize(var/new_size, var/animate = TRUE) +/mob/living/carbon/human/dummy/mannequin/resize(var/new_size, var/animate = TRUE, var/uncapped = FALSE, var/ignore_prefs = FALSE) size_multiplier = new_size /** diff --git a/code/modules/vore/resizing/sizegun_vr.dm b/code/modules/vore/resizing/sizegun_vr.dm index d042c6cb34..88d0154bef 100644 --- a/code/modules/vore/resizing/sizegun_vr.dm +++ b/code/modules/vore/resizing/sizegun_vr.dm @@ -44,12 +44,15 @@ set category = "Object" set src in view(1) - var/size_select = input("Put the desired size (25-200%), (1-600%) in dormitory areas.", "Set Size", size_set_to * 100) as num - if(!size_range_check(size_select)) - to_chat(usr, "Invalid size.") - return - size_set_to = (size_select/100) + var/size_select = input("Put the desired size (25-200%), (1-600%) in dormitory areas.", "Set Size", size_set_to * 100) as num|null + if(!size_select) + return //cancelled + //We do valid resize testing in actual firings because people move after setting these things. + //Just a basic clamp here to the valid ranges. + size_set_to = clamp((size_select/100), RESIZE_MINIMUM_DORMS, RESIZE_MAXIMUM_DORMS) to_chat(usr, "You set the size to [size_select]%") + if(size_set_to < RESIZE_MINIMUM || size_set_to > RESIZE_MAXIMUM) + to_chat(usr, "Note: Resizing limited to 25-200% automatically while outside dormatory areas.") //hint that we clamp it in resize /obj/item/weapon/gun/energy/sizegun/examine(mob/user) . = ..() @@ -66,8 +69,10 @@ set category = "Object" set src in view(1) - var/size_select = input("Put the desired size", "Set Size", size_set_to * 100) as num - size_set_to = max(1,size_select/100) //No negative numbers + var/size_select = input("Put the desired size (1-600%)", "Set Size", size_set_to * 100) as num|null + if(!size_select) + return //cancelled + size_set_to = clamp((size_select/100), 0, 1000) //eheh to_chat(usr, "You set the size to [size_select]%") // @@ -88,8 +93,10 @@ /obj/item/projectile/beam/sizelaser/on_hit(var/atom/target) var/mob/living/M = target + var/ignoring_prefs = (target == firer ? TRUE : FALSE) // Resizing yourself + if(istype(M)) - if(!M.resize(set_size)) + if(!M.resize(set_size, uncapped = M.has_large_resize_bounds(), ignore_prefs = ignoring_prefs)) to_chat(M, "The beam fires into your body, changing your size!") M.updateicon() return @@ -97,11 +104,23 @@ /obj/item/projectile/beam/sizelaser/admin/on_hit(var/atom/target) var/mob/living/M = target + if(istype(M)) - M.resize(set_size, TRUE, TRUE) - if(set_size >= RESIZE_TINY && set_size <= RESIZE_HUGE) + + var/can_be_big = M.has_large_resize_bounds() + var/very_big = is_extreme_size(set_size) + + if(very_big && can_be_big) // made an extreme size in an area that allows it, don't assume adminbuse + to_chat(firer, "[M] will lose this size upon moving into an area where this size is not allowed.") + else if(very_big) // made an extreme size in an area that doesn't allow it, assume adminbuse + to_chat(firer, "[M] will retain this normally unallowed size outside this area.") + M.size_uncapped = TRUE + else if(M.size_uncapped) // made a normal size after having been an extreme adminbuse size + to_chat(firer, "[M] now returned to normal area-based size limitations.") M.size_uncapped = FALSE - M.size_uncapped = TRUE + + M.resize(set_size, uncapped = TRUE, ignoring_prefs = TRUE) // Always ignores prefs, caution is advisable + to_chat(M, "The beam fires into your body, changing your size!") M.updateicon() return diff --git a/tgui/packages/tgui/interfaces/VorePanel.js b/tgui/packages/tgui/interfaces/VorePanel.js index 60cd967d75..b0a87f2098 100644 --- a/tgui/packages/tgui/interfaces/VorePanel.js +++ b/tgui/packages/tgui/interfaces/VorePanel.js @@ -592,6 +592,7 @@ const VoreUserPreferences = (props, context) => { const { digestable, devourable, + resizable, feeding, absorbable, digest_leave_remains, @@ -722,6 +723,44 @@ const VoreUserPreferences = (props, context) => { : "Click here to turn on hunger noises.")} content={noisy ? "Hunger Noises Enabled" : "Hunger Noises Disabled"} /> + +