diff --git a/code/__defines/dcs/signals.dm b/code/__defines/dcs/signals.dm index 26b1d2d44a..017c92c922 100644 --- a/code/__defines/dcs/signals.dm +++ b/code/__defines/dcs/signals.dm @@ -80,6 +80,8 @@ #define COMSIG_ATOM_UPDATED_ICON "atom_updated_icon" ///from base of atom/Entered(): (atom/movable/entering, /atom) #define COMSIG_ATOM_ENTERED "atom_entered" +/// Sent from the atom that just Entered src. From base of atom/Entered(): (/atom/entered_atom, /atom/oldLoc) +#define COMSIG_ATOM_ENTERING "atom_entering" ///from base of atom/Exit(): (/atom/movable/exiting, /atom/newloc) #define COMSIG_ATOM_EXIT "atom_exit" #define COMPONENT_ATOM_BLOCK_EXIT (1<<0) diff --git a/code/__defines/misc_vr.dm b/code/__defines/misc_vr.dm index 94600a0d8a..6ed1384429 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 @@ -65,4 +65,19 @@ #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_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 +#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/__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/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index 5024a1b1a1..057c96e204 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -11,7 +11,7 @@ var/global/list/traits_costs = list() // Just path = cost list, saves time in c var/global/list/all_traits = list() // All of 'em at once (same instances) var/global/list/active_ghost_pods = list() -var/global/list/sensorpreflist = list("Off", "Binary", "Vitals", "Tracking", "No Preference") //TFF 5/8/19 - Suit Sensors global list +var/global/list/sensorpreflist = list("Off", "Binary", "Vitals", "Tracking", "No Preference") //stores numeric player size options indexed by name var/global/list/player_sizes_list = list( @@ -173,8 +173,8 @@ var/global/list/tf_vore_egg_types = list( "Spotted pink" = /obj/item/weapon/storage/vore_egg/pinkspots) var/global/list/edible_trash = list(/obj/item/broken_device, - /obj/item/clothing/accessory/collar, //TFF 10/7/19 - add option to nom collars, - /obj/item/device/communicator, //TFF 19/9/19 - add option to nom communicators and commwatches, + /obj/item/clothing/accessory/collar, + /obj/item/device/communicator, /obj/item/clothing/mask, /obj/item/clothing/glasses, /obj/item/clothing/gloves, @@ -490,10 +490,11 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN, var/datum/trait/instance = new path() if(!instance.name) continue //A prototype or something + var/category = instance.category var/cost = instance.cost traits_costs[path] = cost all_traits[path] = instance - switch(cost) + switch(category) if(-INFINITY to -0.1) negative_traits[path] = instance if(0) diff --git a/code/datums/autolathe/general.dm b/code/datums/autolathe/general.dm index 00151d6e75..4be460a17d 100644 --- a/code/datums/autolathe/general.dm +++ b/code/datums/autolathe/general.dm @@ -85,7 +85,6 @@ name = "welding mask" path =/obj/item/clothing/head/welding -//TFF 24/12/19 - Let people print more spray bottles if needed. /datum/category_item/autolathe/general/spraybottle name = "spray bottle" path = /obj/item/weapon/reagent_containers/spray diff --git a/code/datums/components/resize_guard.dm b/code/datums/components/resize_guard.dm new file mode 100644 index 0000000000..724d252443 --- /dev/null +++ b/code/datums/components/resize_guard.dm @@ -0,0 +1,19 @@ +/datum/component/resize_guard + +/datum/component/resize_guard/Initialize() + if(!isliving(parent)) + return COMPONENT_INCOMPATIBLE + +/datum/component/resize_guard/RegisterWithParent() + // When our parent mob enters any atom, we check resize + RegisterSignal(parent, COMSIG_ATOM_ENTERING, .proc/check_resize) + +/datum/component/resize_guard/UnregisterFromParent() + UnregisterSignal(parent, COMSIG_ATOM_ENTERING) + +/datum/component/resize_guard/proc/check_resize() + var/area/A = get_area(parent) + if(A?.limit_mob_size) + var/mob/living/L = parent + L.resize(L.size_multiplier) + qdel(src) \ 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 cdc5ffe96c..9d7b722acc 100644 --- a/code/game/area/Space Station 13 areas_vr.dm +++ b/code/game/area/Space Station 13 areas_vr.dm @@ -1,4 +1,5 @@ -//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/shuttle/belter name = "Belter Shuttle" diff --git a/code/game/atoms.dm b/code/game/atoms.dm index c20c29be7b..e4ad20f5d4 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -638,6 +638,7 @@ . = ..() GLOB.moved_event.raise_event(AM, old_loc, AM.loc) SEND_SIGNAL(src, COMSIG_ATOM_ENTERED, AM, old_loc) + SEND_SIGNAL(AM, COMSIG_ATOM_ENTERING, src, old_loc) /atom/Exit(atom/movable/AM, atom/new_loc) . = ..() diff --git a/code/game/dna/dna2_helpers.dm b/code/game/dna/dna2_helpers.dm index d250c441ad..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]], FALSE) + 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/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/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 08e22f96e0..d172e0e8db 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -257,9 +257,17 @@ for(var/obj/thing in E.implants) var/implantSubData[0] var/obj/item/weapon/implant/I = thing - implantSubData["name"] = I.name - implantSubData["known"] = istype(I) && I.known_implant - implantData.Add(list(implantSubData)) + //VOREStation Block Edit Start + var/obj/item/device/nif/N = thing + if(istype(I)) + implantSubData["name"] = I.name + implantSubData["known"] = istype(I) && I.known_implant + implantData.Add(list(implantSubData)) + else + implantSubData["name"] = N.name + implantSubData["known"] = istype(N) && N.known_implant + implantData.Add(list(implantSubData)) + //VOREStation Block Edit End organData["implants"] = implantData organData["implants_len"] = implantData.len @@ -464,8 +472,11 @@ var/unknown_body = 0 for(var/thing in e.implants) var/obj/item/weapon/implant/I = thing + var/obj/item/device/nif/N = thing //VOREStation Add: NIFs if(istype(I) && I.known_implant) imp += "[I] implanted:" + if(istype(N) && N.known_implant) //VOREStation Add: NIFs + imp += "[N] implanted:" else unknown_body++ diff --git a/code/game/machinery/doorbell_vr.dm b/code/game/machinery/doorbell_vr.dm index 3c453682b7..3dd029631e 100644 --- a/code/game/machinery/doorbell_vr.dm +++ b/code/game/machinery/doorbell_vr.dm @@ -43,7 +43,6 @@ else icon_state = "dbchime-standby" -//TFF 3/6/19 - Port Cit RP fix of infinite frames. ToDo: Make it so that you can completely deconstruct it and reconstruct it. /obj/machinery/doorbell_chime/attackby(obj/item/W as obj, mob/user as mob) src.add_fingerprint(user) if(default_deconstruction_screwdriver(user, W)) diff --git a/code/game/machinery/exonet_node.dm b/code/game/machinery/exonet_node.dm index a8f6a38734..8fe0e3b5f0 100644 --- a/code/game/machinery/exonet_node.dm +++ b/code/game/machinery/exonet_node.dm @@ -16,7 +16,6 @@ var/list/logs = list() // Gets written to by exonet's send_message() function. -//TFF 3/6/19 - Port Cit RP fix for infinite frames circuit = /obj/item/weapon/circuitboard/telecomms/exonet_node // Proc: New() // Parameters: None diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index a96ef4ed0a..e410914bee 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -428,7 +428,7 @@ Class Procs: for(var/obj/I in contents) if(istype(I,/obj/item/weapon/card/id)) I.forceMove(src.loc) - //TFF 3/6/19 - port Cit RP fix of infinite frames. If it doesn't have a circuit board, don't create a frame. Return a smack instead. BONK! + if(!circuit) return 0 var/obj/structure/frame/A = new /obj/structure/frame(src.loc) diff --git a/code/game/machinery/vending_machines_vr.dm b/code/game/machinery/vending_machines_vr.dm index eb7476febe..50ccbed9a2 100644 --- a/code/game/machinery/vending_machines_vr.dm +++ b/code/game/machinery/vending_machines_vr.dm @@ -1410,7 +1410,6 @@ contraband = list(/obj/item/clothing/head/syndicatefake = 1, /obj/item/clothing/suit/syndicatefake = 1) -//TFF 19/12/19 - Brig version of a seed storage vendor /obj/machinery/seed_storage/brig name = "Prisoners' food seed storage" starting_seeds = list( @@ -4540,7 +4539,6 @@ /obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat = 10) vend_delay = 15 -//TFF 19/12/19 - Brig version of a seed storage vendor /obj/machinery/seed_storage/brig name = "Prisoners' food seed storage" starting_seeds = list( diff --git a/code/game/machinery/wall_frames.dm b/code/game/machinery/wall_frames.dm index 764cd378e1..aabb65769a 100644 --- a/code/game/machinery/wall_frames.dm +++ b/code/game/machinery/wall_frames.dm @@ -105,7 +105,7 @@ desc = "Used for building lights." icon = 'icons/obj/lighting.dmi' icon_state = "tube-construct-item" - refund_amt = 2 //TFF 17/1/20 - Oversight fix for infinite steel produciton. + refund_amt = 2 build_machine_type = /obj/machinery/light_construct reverse = 1 diff --git a/code/game/objects/effects/decals/posters/polarisposters.dm b/code/game/objects/effects/decals/posters/polarisposters.dm index 45cfd8622d..8835d58242 100644 --- a/code/game/objects/effects/decals/posters/polarisposters.dm +++ b/code/game/objects/effects/decals/posters/polarisposters.dm @@ -291,7 +291,7 @@ The image seems important." listing_name = "Safety - Mech Operation" -//VOREStation Removal Start TFF 17/12/19 - lore not used in our station's own lore. +//VOREStation Removal Start /* /datum/poster/nanotrasen/nt_4 icon_state = "ntposter04" diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index d35a7546b7..4d006f162f 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -294,7 +294,7 @@ icon_state = "lamp" force = 10 center_of_mass = list("x" = 13,"y" = 11) - brightness_on = 10 //TFF 27/11/19 - post refactor fix for intensity levels. + brightness_on = 10 w_class = ITEMSIZE_LARGE power_use = 0 on = 1 diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm index 4391901918..ea457f651e 100644 --- a/code/game/objects/items/toys/toys.dm +++ b/code/game/objects/items/toys/toys.dm @@ -949,7 +949,7 @@ /obj/item/toy/plushie/mouse name = "mouse plush" desc = "A plushie of a delightful mouse! What was once considered a vile rodent is now your very best friend." - icon_state = "mouseplushie" //TFF 12/11/19 - updated icon to show a sprite that doesn't replicate a dead mouse. Heck you for that! >:C + icon_state = "mouseplushie" pokephrase = "Squeak!" /obj/item/toy/plushie/kitten 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..140ce75393 --- /dev/null +++ b/code/modules/admin/verbs/resize.dm @@ -0,0 +1,24 @@ +/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" + if(!check_rights(R_ADMIN, R_FUN)) + return + + 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.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/loadout/loadout_accessories_vr.dm b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm index 3be939bab9..56c850c50e 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm @@ -44,7 +44,6 @@ display_name = "collar, holo" path = /obj/item/clothing/accessory/collar/holo -//TFF 17/6/19 - public loadout addition: Indigestible Holocollar /datum/gear/collar/holo/indigestible display_name = "collar, holo (indigestible)" path = /obj/item/clothing/accessory/collar/holo/indigestible 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/client/preference_setup/vore/09_misc.dm b/code/modules/client/preference_setup/vore/09_misc.dm index 1396b4570f..7018d9342d 100644 --- a/code/modules/client/preference_setup/vore/09_misc.dm +++ b/code/modules/client/preference_setup/vore/09_misc.dm @@ -1,5 +1,3 @@ -//TFF 5/8/19 - moved /datum/preferences to preferences_vr.dm - /datum/category_item/player_setup_item/vore/misc name = "Misc Settings" sort_order = 9 @@ -9,16 +7,15 @@ S["directory_tag"] >> pref.directory_tag S["directory_erptag"] >> pref.directory_erptag S["directory_ad"] >> pref.directory_ad - S["sensorpref"] >> pref.sensorpref //TFF 5/8/19 - add sensor pref setting to load after saved + S["sensorpref"] >> pref.sensorpref /datum/category_item/player_setup_item/vore/misc/save_character(var/savefile/S) S["show_in_directory"] << pref.show_in_directory S["directory_tag"] << pref.directory_tag S["directory_erptag"] << pref.directory_erptag S["directory_ad"] << pref.directory_ad - S["sensorpref"] << pref.sensorpref //TFF 5/8/19 - add sensor pref setting to be saveable + S["sensorpref"] << pref.sensorpref -//TFF 5/8/19 - add new datum category to allow for setting multiple settings when this is selected in the loadout. /datum/category_item/player_setup_item/vore/misc/copy_to_mob(var/mob/living/carbon/human/character) if(pref.sensorpref > 5 || pref.sensorpref < 1) pref.sensorpref = 5 @@ -28,7 +25,7 @@ pref.show_in_directory = sanitize_integer(pref.show_in_directory, 0, 1, initial(pref.show_in_directory)) pref.directory_tag = sanitize_inlist(pref.directory_tag, GLOB.char_directory_tags, initial(pref.directory_tag)) pref.directory_erptag = sanitize_inlist(pref.directory_erptag, GLOB.char_directory_erptags, initial(pref.directory_erptag)) - pref.sensorpref = sanitize_integer(pref.sensorpref, 1, sensorpreflist.len, initial(pref.sensorpref)) //TFF - 5/8/19 - add santisation for sensor prefs + pref.sensorpref = sanitize_integer(pref.sensorpref, 1, sensorpreflist.len, initial(pref.sensorpref)) /datum/category_item/player_setup_item/vore/misc/content(var/mob/user) . += "
" @@ -36,7 +33,7 @@ . += "Character Directory Vore Tag: [pref.directory_tag]
" . += "Character Directory ERP Tag: [pref.directory_erptag]
" . += "Character Directory Advertisement: Set Directory Ad
" - . += "Suit Sensors Preference: [sensorpreflist[pref.sensorpref]]
" //TFF 5/8/19 - Allow selection of sensor settings from off, binary, vitals, tracking, or random + . += "Suit Sensors Preference: [sensorpreflist[pref.sensorpref]]
" /datum/category_item/player_setup_item/vore/misc/OnTopic(var/href, var/list/href_list, var/mob/user) if(href_list["toggle_show_in_directory"]) @@ -58,7 +55,6 @@ var/msg = sanitize(input(user,"Write your advertisement here!", "Flavor Text", html_decode(pref.directory_ad)) as message, extra = 0) //VOREStation Edit: separating out OOC notes pref.directory_ad = msg return TOPIC_REFRESH - //TFF 5/8/19 - add new thing so you can choose the sensor setting your character can get. else if(href_list["toggle_sensor_setting"]) var/new_sensorpref = input(user, "Choose your character's sensor preferences:", "Character Preferences", sensorpreflist[pref.sensorpref]) as null|anything in sensorpreflist if (!isnull(new_sensorpref) && CanUseTopic(user)) diff --git a/code/modules/clothing/clothing_vr.dm b/code/modules/clothing/clothing_vr.dm index bf28eb5a36..43f7a7e0bb 100644 --- a/code/modules/clothing/clothing_vr.dm +++ b/code/modules/clothing/clothing_vr.dm @@ -154,7 +154,6 @@ SPECIES_VOX = 'icons/mob/species/vox/suit.dmi', SPECIES_WEREBEAST = 'icons/mob/species/werebeast/suit.dmi') -//TFF 5/8/19 - sets Vorestation /obj/item/clothing/under sensor setting default? /obj/item/clothing/under sensor_mode = 3 var/sensorpref = 5 @@ -165,7 +164,6 @@ SPECIES_GREY_YW = 'icons/mob/species/grey/uniform.dmi'/*ywedit*/ ) -//TFF 5/8/19 - define numbers and specifics for suit sensor settings /obj/item/clothing/under/New(var/mob/living/carbon/human/H) ..() sensorpref = isnull(H) ? 1 : (ishuman(H) ? H.sensorpref : 1) diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index 9638a414bd..b20524a136 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -30,8 +30,6 @@ icon_state = "grey" rolled_sleeves = 0 -//TFF 5/8/19 - add a non perma-set orange jumpsuit, splits prison into its own obj with override var settings. -//TFF 5/9/19 - add a different icon_state to both jumpsuits, orange and prison. Refactors orange and prison jumpsuit slightly. /obj/item/clothing/under/color/orange name = "orange jumpsuit" icon_state = "orange" diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm index 075b3daece..4c581d728b 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/events/rogue_drones.dm b/code/modules/events/rogue_drones.dm index 56e795dd3f..e937189b96 100644 --- a/code/modules/events/rogue_drones.dm +++ b/code/modules/events/rogue_drones.dm @@ -22,7 +22,7 @@ /datum/event/rogue_drone/announce() var/msg var/rng = rand(1,5) - //VOREStation Edit Start TFF 16/12/19 - Sif -> Virgo 3b + //VOREStation Edit Start //YW EDIT 1/13/2020 - Virgo3b -> Cryogaia switch(rng) if(1) diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm index d28ea98bef..89bea23108 100644 --- a/code/modules/food/food/snacks_vr.dm +++ b/code/modules/food/food/snacks_vr.dm @@ -58,7 +58,7 @@ desc = "It's beef. It's roasted. It's been a staple of dining tradition for centuries." icon = 'icons/obj/food_vr.dmi' icon_state = "roastbeef" - trash = /obj/item/trash/plate //TFF 30/11/19 - Roast beef are put on plates, not waffle trays, you dunce~ + trash = /obj/item/trash/plate nutriment_amt = 8 nutriment_desc = list("cooked meat" = 5) 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/holomap/holomap_area.dm b/code/modules/holomap/holomap_area.dm index a9677c562e..71a762c7fc 100644 --- a/code/modules/holomap/holomap_area.dm +++ b/code/modules/holomap/holomap_area.dm @@ -33,7 +33,6 @@ /area/engineering holomap_color = HOLOMAP_AREACOLOR_ENGINEERING -//TFF 11/12/19 - Minor refactor, makes mice spawn only in Atmos. /area/engineering/atmos_intake holomap_color = null /area/maintenance/substation/engineering diff --git a/code/modules/hydroponics/seed_machines.dm b/code/modules/hydroponics/seed_machines.dm index bec4978201..66e7875e16 100644 --- a/code/modules/hydroponics/seed_machines.dm +++ b/code/modules/hydroponics/seed_machines.dm @@ -94,7 +94,6 @@ to_chat(user, "You load [W] into [src].") return -//TFF 3/6/19 - fix infinite frame creation, ported from Cit RP - also allow movement of hydroponic-related machines. if(default_deconstruction_screwdriver(user, W)) return if(W.is_wrench()) diff --git a/code/modules/mob/living/bot/farmbot.dm b/code/modules/mob/living/bot/farmbot.dm index 3172836d44..9334fbbcec 100644 --- a/code/modules/mob/living/bot/farmbot.dm +++ b/code/modules/mob/living/bot/farmbot.dm @@ -10,7 +10,7 @@ icon_state = "farmbot0" health = 50 maxHealth = 50 - req_one_access = list(access_robotics, access_hydroponics, access_xenobiology) //TFF 11/7/19 - adds Xenobio access on behalf of Nalarac + req_one_access = list(access_robotics, access_hydroponics, access_xenobiology) var/action = "" // Used to update icon var/waters_trays = 1 diff --git a/code/modules/mob/living/carbon/human/emote_vr.dm b/code/modules/mob/living/carbon/human/emote_vr.dm index 44fec3246c..15d9bca818 100644 --- a/code/modules/mob/living/carbon/human/emote_vr.dm +++ b/code/modules/mob/living/carbon/human/emote_vr.dm @@ -201,15 +201,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/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/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 3ac9edc068..52020b9076 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -97,6 +97,7 @@ var/their_slowdown = max(H.calculate_item_encumbrance(), 1) item_tally = max(item_tally, their_slowdown) // If our slowdown is less than theirs, then we become as slow as them (before species modifires). + item_tally /= 2 //VOREStation Add item_tally *= species.item_slowdown_mod . += item_tally @@ -189,7 +190,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/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index cebfda00c0..286c257b97 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() @@ -1268,7 +1266,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/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/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 23aa2a57dc..80ad0763e2 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -413,7 +413,6 @@ H.visible_message( \ "[H] shakes [target]'s hand.", \ "You shake [target]'s hand.", ) - //TFF 15/12/19 - Port nose booping from CHOMPStation else if(H.zone_sel.selecting == "mouth") H.visible_message( \ "[H] boops [target]'s nose.", \ diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/_protean_defines.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/_protean_defines.dm new file mode 100644 index 0000000000..e469a4dded --- /dev/null +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/_protean_defines.dm @@ -0,0 +1 @@ +#define PROTEAN_EDIBLE_MATERIALS list(MAT_STEEL, MAT_SILVER, MAT_GOLD, MAT_URANIUM, MAT_METALHYDROGEN) 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..ec0bab797c 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 @@ -267,9 +267,8 @@ if(refactory && istype(A,/obj/item/stack/material)) var/obj/item/stack/material/S = A var/substance = S.material.name - var/list/edible_materials = list("steel", "plasteel", "diamond", "mhydrogen") //Can't eat all materials, just useful ones. var allowed = FALSE - for(var/material in edible_materials) + for(var/material in PROTEAN_EDIBLE_MATERIALS) if(material == substance) allowed = TRUE if(!allowed) return @@ -282,9 +281,8 @@ if(refactory && istype(O,/obj/item/stack/material)) var/obj/item/stack/material/S = O var/substance = S.material.name - var/list/edible_materials = list("steel", "plasteel", "diamond", "mhydrogen") //Can't eat all materials, just useful ones. var allowed = FALSE - for(var/material in edible_materials) + for(var/material in PROTEAN_EDIBLE_MATERIALS) if(material == substance) allowed = TRUE if(!allowed) return @@ -432,7 +430,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..d18ad678df 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 @@ -201,9 +201,8 @@ var/obj/item/stack/material/matstack = held var/substance = matstack.material.name - var/list/edible_materials = list(MAT_STEEL, MAT_SILVER, MAT_GOLD, MAT_URANIUM, MAT_METALHYDROGEN) //Can't eat all materials, just useful ones. var allowed = FALSE - for(var/material in edible_materials) + for(var/material in PROTEAN_EDIBLE_MATERIALS) if(material == substance) allowed = TRUE if(!allowed) to_chat(src,"You can't process [substance]!") @@ -300,14 +299,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/carbon/human/species/station/protean_vr/protean_species.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm index 405fd6c58c..f03fa270c5 100755 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm @@ -201,7 +201,7 @@ if(refactory.get_stored_material(MAT_GOLD) >= METAL_PER_TICK) H.add_modifier(/datum/modifier/protean/gold, origin = refactory) - //Silver adds darksight + //Silver adds accuracy and evasion if(refactory.get_stored_material(MAT_SILVER) >= METAL_PER_TICK) H.add_modifier(/datum/modifier/protean/silver, origin = refactory) 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/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index fc9ee91e9f..bfb4856017 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -1120,13 +1120,13 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() return //If you are FBP with wing style and didn't set a custom one - if(synthetic && synthetic.includes_wing && !wing_style) + if(synthetic && synthetic.includes_wing && !wing_style && !wings_hidden) //VOREStation Edit var/icon/wing_s = new/icon("icon" = synthetic.icon, "icon_state" = "wing") //I dunno. If synths have some custom wing? wing_s.Blend(rgb(src.r_skin, src.g_skin, src.b_skin), species.color_mult ? ICON_MULTIPLY : ICON_ADD) return image(wing_s) //If you have custom wings selected - if(wing_style && !(wear_suit && wear_suit.flags_inv & HIDETAIL)) + if(wing_style && !(wear_suit && wear_suit.flags_inv & HIDETAIL) && !wings_hidden) //VOREStation Edit var/icon/wing_s = new/icon("icon" = wing_style.icon, "icon_state" = flapping && wing_style.ani_state ? wing_style.ani_state : wing_style.icon_state) if(wing_style.do_colouration) wing_s.Blend(rgb(src.r_wing, src.g_wing, src.b_wing), wing_style.color_blend_mode) diff --git a/code/modules/mob/living/living_defines_vr.dm b/code/modules/mob/living/living_defines_vr.dm index 648ea8aa49..0a536505e0 100644 --- a/code/modules/mob/living/living_defines_vr.dm +++ b/code/modules/mob/living/living_defines_vr.dm @@ -5,8 +5,6 @@ var/ooc_notes = null appearance_flags = TILE_BOUND|PIXEL_SCALE|KEEP_TOGETHER var/hunger_rate = DEFAULT_HUNGER_FACTOR - var/resizable = TRUE - //custom say verbs var/custom_say = null var/custom_ask = null diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index bcbfebd05d..257b1204c9 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -8,7 +8,7 @@ var/list/department_radio_keys = list( ":n" = "Science", ".n" = "Science", ":m" = "Medical", ".m" = "Medical", ":e" = "Engineering", ".e" = "Engineering", - ":k" = "Response Team", ".k" = "Response Team", //TFF 11/3/20 - Add Response Team to channels usable rather than resorting to :H or such., + ":k" = "Response Team", ".k" = "Response Team", ":s" = "Security", ".s" = "Security", ":w" = "whisper", ".w" = "whisper", ":t" = "Mercenary", ".t" = "Mercenary", @@ -27,7 +27,7 @@ var/list/department_radio_keys = list( ":N" = "Science", ".N" = "Science", ":M" = "Medical", ".M" = "Medical", ":E" = "Engineering", ".E" = "Engineering", - ":k" = "Response Team", ".k" = "Response Team", //TFF 11/3/20 - Add Response Team to channels usable rather than resorting to :H or such., + ":k" = "Response Team", ".k" = "Response Team", ":S" = "Security", ".S" = "Security", ":W" = "whisper", ".W" = "whisper", ":T" = "Mercenary", ".T" = "Mercenary", diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index cf135f9d55..6ade1a6521 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -53,7 +53,7 @@ "Chirp" = list("chirps","chirrups","cheeps"), "Feline" = list("purrs","yowls","meows"), "Canine" = list("yaps","barks","woofs"), - "Rodent" = list("squeaks", "SQUEAKS", "sqiks") //VOREStation Edit - TFF 22/11/19 - CHOMPStation port of pAI additions, + "Rodent" = list("squeaks", "SQUEAKS", "sqiks") //VOREStation Edit ) var/obj/item/weapon/pai_cable/cable // The cable we produce and use when door or camera jacking @@ -330,8 +330,7 @@ close_up() -//VOREStation Removal Start - TFF 22/11/19 - Refactored in pai_vr.dm -/* +/* //VOREStation Removal Start /mob/living/silicon/pai/proc/choose_chassis() set category = "pAI Commands" set name = "Choose Chassis" diff --git a/code/modules/mob/living/silicon/pai/pai_vr.dm b/code/modules/mob/living/silicon/pai/pai_vr.dm index f44d39f460..b8eb228326 100644 --- a/code/modules/mob/living/silicon/pai/pai_vr.dm +++ b/code/modules/mob/living/silicon/pai/pai_vr.dm @@ -1,7 +1,6 @@ /mob/living/silicon/pai var/people_eaten = 0 icon = 'icons/mob/pai_vr.dmi' - //TFF 22/11/19 - CHOMPStation port of pAI additions. var/global/list/wide_chassis = list( "rat", "panther" @@ -36,7 +35,6 @@ else if(people_eaten && resting) icon_state = "[chassis]_rest_full" - //TFF 22/11/19 - CHOMPStation port of pAI additions. if(chassis in wide_chassis) icon = 'icons/mob/pai_vr64x64.dmi' pixel_x = -16 @@ -58,7 +56,6 @@ else if(people_eaten && resting) icon_state = "[chassis]_rest_full" - //TFF 22/11/19 - CHOMPStation port of pAI additions. if(chassis in wide_chassis) icon = 'icons/mob/pai_vr64x64.dmi' pixel_x = -16 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/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/new_player/preferences_setup_vr.dm b/code/modules/mob/new_player/preferences_setup_vr.dm index dca0ff56ec..d15ec88af5 100644 --- a/code/modules/mob/new_player/preferences_setup_vr.dm +++ b/code/modules/mob/new_player/preferences_setup_vr.dm @@ -1,3 +1,2 @@ -//TFF 5/8/19 - add randomised sensor setting for random button clicking /datum/preferences/randomize_appearance_and_body_for(var/mob/living/carbon/human/H) sensorpref = rand(1,5) \ No newline at end of file diff --git a/code/modules/mob/new_player/sprite_accessories_taur.dm b/code/modules/mob/new_player/sprite_accessories_taur.dm index 748a6904b4..db2394f84a 100644 --- a/code/modules/mob/new_player/sprite_accessories_taur.dm +++ b/code/modules/mob/new_player/sprite_accessories_taur.dm @@ -146,7 +146,6 @@ suit_sprites = 'icons/mob/taursuits_wolf.dmi' icon_sprite_tag = "wolf" -//TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/fatwolf name = "Fat Wolf (Taur)" icon_state = "fatwolf_s" @@ -158,7 +157,6 @@ extra_overlay = "wolf_markings" //icon_sprite_tag = "wolf2c" -//TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/wolf/fatwolf_2c name = "Fat Wolf dual-color (Taur)" icon_state = "fatwolf_s" @@ -245,7 +243,6 @@ suit_sprites = 'icons/mob/taursuits_feline.dmi' icon_sprite_tag = "feline" -//TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/fatfeline name = "Fat Feline (Taur)" icon_state = "fatfeline_s" @@ -262,7 +259,6 @@ extra_overlay = "feline_markings" //icon_sprite_tag = "feline2c" -//TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/feline/fatfeline_2c name = "Fat Feline dual-color (Taur)" icon_state = "fatfeline_s" diff --git a/code/modules/mob/new_player/sprite_accessories_taur_vr.dm b/code/modules/mob/new_player/sprite_accessories_taur_vr.dm index 0464214518..4bc79e1629 100644 --- a/code/modules/mob/new_player/sprite_accessories_taur_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_taur_vr.dm @@ -57,7 +57,6 @@ suit_sprites = 'icons/mob/taursuits_wolf_vr.dmi' icon_sprite_tag = "wolf" -//TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/fatwolf name = "Fat Wolf (Taur)" icon_state = "fatwolf_s" @@ -70,7 +69,6 @@ extra_overlay2 = "wolf_markings_2" //icon_sprite_tag = "wolf2c" -//TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/wolf/fatwolf_2c name = "Fat Wolf 3-color (Taur)" icon_state = "fatwolf_s" @@ -276,7 +274,6 @@ suit_sprites = 'icons/mob/taursuits_feline_vr.dmi' icon_sprite_tag = "feline" -//TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/fatfeline name = "Fat Feline (Taur)" icon_state = "fatfeline_s" @@ -294,7 +291,6 @@ extra_overlay2 = "feline_markings_2" //icon_sprite_tag = "feline2c" -//TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/feline/fatfeline_2c name = "Fat Feline 3-color (Taur)" icon_state = "fatfeline_s" 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..79592fa030 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, uncapped=nif.human.has_large_resize_bounds(), 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/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm index 28835d7fdd..2657b34a0a 100644 --- a/code/modules/power/tesla/coil.dm +++ b/code/modules/power/tesla/coil.dm @@ -95,7 +95,6 @@ playsound(src, 'sound/effects/lightningshock.ogg', 100, 1, extrarange = 5) tesla_zap(src, 10, power/(coeff/2)) -//TFF 3/6/19 - Port Cit RP fix for infinite frames /obj/machinery/power/grounding_rod name = "grounding rod" desc = "Keep an area from being fried from Edison's Bane." diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index e5f5dfb728..d0005c1a03 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -1474,7 +1474,7 @@ /datum/reagent/qerr_quem name = "Qerr-quem" - id = "querr_quem" + id = "qerr_quem" description = "A potent stimulant and anti-anxiety medication, made for the Qerr-Katish." taste_description = "mint" reagent_state = LIQUID 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/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index fe0a4c1381..1098c5e713 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -6,7 +6,6 @@ item_state = "cleaner" center_of_mass = list("x" = 16,"y" = 10) flags = OPENCONTAINER|NOBLUDGEON - //TFF 24/12/19 - Let people print more spray bottles if needed. matter = list("glass" = 300, DEFAULT_WALL_MATERIAL = 300) slot_flags = SLOT_BELT throwforce = 3 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 diff --git a/code/modules/turbolift/turbolift_console_vr.dm b/code/modules/turbolift/turbolift_console_vr.dm index a02730c08d..d244418693 100644 --- a/code/modules/turbolift/turbolift_console_vr.dm +++ b/code/modules/turbolift/turbolift_console_vr.dm @@ -1,5 +1,3 @@ -// TFF 6/10/20 - Just a little thing to prevent the button - // and console from being destroyed by explosions. /obj/structure/lift/button/ex_act() return diff --git a/code/modules/vehicles/Securitrain_vr.dm b/code/modules/vehicles/Securitrain_vr.dm index 0320721038..e8b1750691 100644 --- a/code/modules/vehicles/Securitrain_vr.dm +++ b/code/modules/vehicles/Securitrain_vr.dm @@ -23,7 +23,7 @@ var/car_limit = 0 //how many cars an engine can pull before performance degrades. This should be 0 to prevent trailers from unhitching. active_engines = 1 - var/obj/item/weapon/key/key //TFF 19/1/20 - Bugfix for key being prevented from getting used again + var/obj/item/weapon/key/key var/key_type = /obj/item/weapon/key/security var/siren = 0 //This is for eventually getting the siren sprite to work. @@ -62,7 +62,7 @@ /obj/vehicle/train/security/engine/New() ..() cell = new /obj/item/weapon/cell/high(src) - key = new key_type(src) //TFF 19/1/20 - Bugfix for key being prevented from getting used again + key = new key_type(src) var/image/I = new(icon = 'icons/obj/vehicles.dmi', icon_state = "cargo_engine_overlay", layer = src.layer + 0.2) //over mobs overlays += I turn_off() //so engine verbs are correctly set @@ -91,7 +91,7 @@ ..() /obj/vehicle/train/security/engine/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, key_type)) //TFF 19/1/20 - Bugfix for key being prevented from getting used again + if(istype(W, key_type)) if(!key) user.drop_item() W.forceMove(src) diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index f9f485219d..a0bdeaca35 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -3,7 +3,8 @@ var/digestable = TRUE // Can the mob be digested inside a belly? var/devourable = TRUE // Can the mob be devoured at all? var/feeding = TRUE // Can the mob be vorishly force fed or fed to others? - var/absorbable = TRUE // Are you allowed to absorb this person? TFF addition 14/12/19 + var/absorbable = TRUE // Are you allowed to absorb this person? + var/resizable = TRUE // Can other people resize you? (Usually ignored for self-resizes) var/digest_leave_remains = FALSE // Will this mob leave bones/skull/etc after the melty demise? var/allowmobvore = TRUE // Will simplemobs attempt to eat the mob? var/showvoreprefs = TRUE // Determines if the mechanical vore preferences button will be displayed on the mob or not. @@ -225,7 +226,8 @@ P.digestable = src.digestable P.devourable = src.devourable P.feeding = src.feeding - P.absorbable = src.absorbable //TFF 14/12/19 - choose whether allowing absorbing + P.absorbable = src.absorbable + P.resizable = src.resizable P.digest_leave_remains = src.digest_leave_remains P.allowmobvore = src.allowmobvore P.vore_taste = src.vore_taste @@ -259,7 +261,8 @@ digestable = P.digestable devourable = P.devourable feeding = P.feeding - absorbable = P.absorbable //TFF 14/12/19 - choose whether allowing absorbing + absorbable = P.absorbable + resizable = P.resizable digest_leave_remains = P.digest_leave_remains allowmobvore = P.allowmobvore vore_taste = P.vore_taste @@ -683,7 +686,6 @@ to_chat(src, "You can taste the flavor of garbage and leftovers. Delicious?") else to_chat(src, "You can taste the flavor of gluttonous waste of food.") - //TFF 10/7/19 - Add custom flavour for collars for trash can trait. else if (istype(I,/obj/item/clothing/accessory/collar)) visible_message("[src] demonstrates their voracious capabilities by swallowing [I] whole!") to_chat(src, "You can taste the submissiveness in the wearer of [I]!") diff --git a/code/modules/vore/eating/vore_vr.dm b/code/modules/vore/eating/vore_vr.dm index 2985b7c489..82df33ccf2 100644 --- a/code/modules/vore/eating/vore_vr.dm +++ b/code/modules/vore/eating/vore_vr.dm @@ -45,19 +45,22 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE //Actual preferences var/digestable = TRUE var/devourable = TRUE + var/absorbable = TRUE var/feeding = TRUE - var/absorbable = TRUE //TFF 14/12/19 - choose whether allowing absorbing + var/can_be_drop_prey = FALSE + var/can_be_drop_pred = FALSE var/digest_leave_remains = FALSE var/allowmobvore = TRUE + var/permit_healbelly = TRUE + + var/resizable = TRUE + var/show_vore_fx = TRUE + var/step_mechanics_pref = FALSE + var/pickup_pref = TRUE + var/list/belly_prefs = list() var/vore_taste = "nothing in particular" var/vore_smell = "nothing in particular" - var/permit_healbelly = TRUE - var/show_vore_fx = TRUE - var/can_be_drop_prey = FALSE - var/can_be_drop_pred = FALSE - var/step_mechanics_pref = FALSE - var/pickup_pref = TRUE //Mechanically required var/path @@ -122,8 +125,9 @@ 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 + absorbable = json_from_file["absorbable"] digest_leave_remains = json_from_file["digest_leave_remains"] allowmobvore = json_from_file["allowmobvore"] vore_taste = json_from_file["vore_taste"] @@ -141,6 +145,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 +181,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/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index 5b0f2f115f..82891d6b4c 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -340,7 +340,7 @@ name = "Mouse Plushie" desc = "A plushie of a delightful mouse! What was once considered a vile rodent is now your very best friend." slot_flags = SLOT_HEAD - icon_state = "mouse_brown" //TFF 12/11/19 - Change sprite to not look dead. Heck you for that choice! >:C + icon_state = "mouse_brown" item_state = "mouse_brown_head" icon = 'icons/vore/custom_items_vr.dmi' icon_override = 'icons/vore/custom_items_vr.dmi' diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm index 703706483f..04c3e47dba 100644 --- a/code/modules/vore/resizing/resize_vr.dm +++ b/code/modules/vore/resizing/resize_vr.dm @@ -1,17 +1,3 @@ - -//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 - // Adding needed defines to /mob/living // Note: Polaris had this on /mob/living/carbon/human We need it higher up for animals and stuff. /mob/living @@ -60,32 +46,45 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 /mob/living/get_effective_size() return size_multiplier +/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) + + /** * 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)) - 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, var/ignore_prefs = FALSE) + if(!uncapped) + new_size = clamp(new_size, RESIZE_MINIMUM, RESIZE_MAXIMUM) + var/datum/component/resize_guard/guard = GetComponent(/datum/component/resize_guard) + if(guard) + qdel(guard) + else if(has_large_resize_bounds()) + if(is_extreme_size(new_size)) + AddComponent(/datum/component/resize_guard) + else + var/datum/component/resize_guard/guard = GetComponent(/datum/component/resize_guard) + if(guard) + qdel(guard) + 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 @@ -111,8 +110,8 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 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 @@ -125,7 +124,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 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 e30c218fbb..41775af2a5 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,21 +93,30 @@ /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.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, 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 return 1 /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) + + 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.resize(set_size, uncapped = TRUE, ignore_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/code/modules/xenoarcheaology/finds/finds.dm b/code/modules/xenoarcheaology/finds/finds.dm index 4713ac0e76..aa620393dd 100644 --- a/code/modules/xenoarcheaology/finds/finds.dm +++ b/code/modules/xenoarcheaology/finds/finds.dm @@ -21,7 +21,7 @@ icon_state = "strange" var/datum/geosample/geologic_data origin_tech = list(TECH_MATERIAL = 5) - w_class = ITEMSIZE_SMALL //TFF 25/11/19 - fixes the strange rocks to be small size like before and not normal. + w_class = ITEMSIZE_SMALL /obj/item/weapon/strangerock/New(loc, var/inside_item_type = 0) pixel_x = rand(0,16)-8 diff --git a/icons/_nanomaps/tether_nanomap_z7.png b/icons/_nanomaps/tether_nanomap_z7.png index 526a173d19..06bd760d7b 100644 Binary files a/icons/_nanomaps/tether_nanomap_z7.png and b/icons/_nanomaps/tether_nanomap_z7.png differ diff --git a/maps/expedition_vr/space/_debrisfield.dm b/maps/expedition_vr/space/_debrisfield.dm index e8ffd87a0b..f1b36da15a 100644 --- a/maps/expedition_vr/space/_debrisfield.dm +++ b/maps/expedition_vr/space/_debrisfield.dm @@ -71,8 +71,6 @@ icon_state = "debrisexplored" forced_ambience = list('sound/ambience/tension/tension.ogg', 'sound/ambience/tension/horror.ogg') -//TFF 26/12/19 - Sub-areas for the APCs. - /area/submap/debrisfield/derelict/ai_access_port name = "POI - Abandoned Derelict AI Acess Port" 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/guttersite.dm b/maps/submaps/admin_use_vr/guttersite.dm index 23c54af980..3d99c8ef0b 100644 --- a/maps/submaps/admin_use_vr/guttersite.dm +++ b/maps/submaps/admin_use_vr/guttersite.dm @@ -47,7 +47,6 @@ icon_state = "debrisexplored" forced_ambience = list('sound/ambience/tension/tension.ogg', 'sound/ambience/tension/horror.ogg') -//TFF 26/12/19 - Sub-areas for the APCs. /area/tether_away/guttersite/engines name = "Gutter - Gutter Engineering" 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 diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index 3e3f625621..167d809c49 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -3325,11 +3325,14 @@ /turf/simulated/floor/bluegrid, /area/ai) "afV" = ( -/obj/machinery/atmospherics/unary/engine{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 }, -/turf/space, -/turf/simulated/shuttle/plating/airless/carry, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6; + icon_state = "intact" + }, +/turf/simulated/wall/rshull, /area/shuttle/excursion/general) "afW" = ( /obj/effect/floor_decal/borderfloorblack, @@ -3413,20 +3416,23 @@ /turf/simulated/open, /area/security/brig) "agc" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion_l" +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5; + icon_state = "intact-fuel" }, -/turf/simulated/floor/tiled/asteroid_steel/airless, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/mining_outpost/shuttle) +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4; + icon_state = "map" + }, +/turf/simulated/wall/rshull, +/area/shuttle/excursion/general) "agd" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8 +/obj/machinery/atmospherics/unary/engine{ + dir = 1 }, -/turf/simulated/floor/tiled/asteroid_steel/airless, +/turf/space, /turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/mining_outpost/shuttle) +/area/shuttle/excursion/general) "age" = ( /obj/structure/window/reinforced{ dir = 8 @@ -3451,7 +3457,7 @@ "agf" = ( /obj/structure/shuttle/engine/propulsion{ dir = 8; - icon_state = "propulsion_r" + icon_state = "propulsion_l" }, /turf/simulated/floor/tiled/asteroid_steel/airless, /turf/simulated/shuttle/plating/airless/carry, @@ -3459,6 +3465,21 @@ "agg" = ( /turf/simulated/floor/airless, /area/space) +"agh" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8 + }, +/turf/simulated/floor/tiled/asteroid_steel/airless, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/mining_outpost/shuttle) +"agi" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "propulsion_r" + }, +/turf/simulated/floor/tiled/asteroid_steel/airless, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/mining_outpost/shuttle) "agj" = ( /obj/machinery/access_button{ command = "cycle_exterior"; @@ -21163,17 +21184,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) -"aXC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 5; - icon_state = "intact-fuel" - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" - }, -/turf/simulated/wall/rshull, -/area/shuttle/excursion/general) "aXD" = ( /obj/structure/bed/chair/shuttle{ dir = 8 @@ -21612,12 +21622,6 @@ /obj/machinery/mineral/input, /turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) -"aZD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 9 - }, -/turf/simulated/wall/rshull, -/area/shuttle/excursion/general) "aZH" = ( /obj/machinery/conveyor{ dir = 8; @@ -22631,13 +22635,6 @@ /obj/machinery/light, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) -"esH" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1; - icon_state = "map" - }, -/turf/simulated/wall/rshull, -/area/shuttle/excursion/general) "esK" = ( /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 1 @@ -22824,13 +22821,6 @@ /obj/machinery/door/firedoor/glass/hidden/steel, /turf/simulated/floor/tiled, /area/hallway/station/upper) -"fmc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6; - icon_state = "intact" - }, -/turf/simulated/wall/rshull, -/area/shuttle/excursion/general) "fox" = ( /obj/structure/cable{ icon_state = "1-2" @@ -36827,7 +36817,7 @@ aUJ aXb afT aez -afV +agd ams aXq abe @@ -36969,7 +36959,7 @@ wRt eug afT aeG -afV +agd ams aXq abe @@ -37110,8 +37100,8 @@ wOI afO wOI aiX -aZD -acK +afV +vJd ams aXq abe @@ -37252,8 +37242,8 @@ hNx kTn ckU aiY -fmc -vJd +xiw +acK ams ghy abe @@ -37820,8 +37810,8 @@ aXS rLd opv uVS -esH -vJd +xiw +acK ams eof abe @@ -37962,8 +37952,8 @@ uGF wPw xvO aRv -aXC -acK +agc +vJd ams amq abe @@ -38105,7 +38095,7 @@ ikk efQ wPF aeG -afV +agd ams aSx krj @@ -38247,7 +38237,7 @@ iEV tEV xiw aeH -afV +agd ams eAm abe @@ -40284,11 +40274,11 @@ avt avt adD aZS -agc -agd -agd -agd agf +agh +agh +agh +agi baB adD avt diff --git a/maps/tether/tether_areas.dm b/maps/tether/tether_areas.dm index d44b934837..1389266ce8 100644 --- a/maps/tether/tether_areas.dm +++ b/maps/tether/tether_areas.dm @@ -250,7 +250,6 @@ name = "\improper Vacant Prep Area" /area/vacant/vacant_site/gateway/lower name = "\improper Lower Vacant Prep Area" -//TFF 5/4/20 - Mining Ops move TODO Change all Vacant areas to construction_site per vermin event location announcement. /area/construction/vacant_mining_ops name = "\improper Vacant Mining Operations" @@ -267,7 +266,6 @@ /area/tether/surfacebase/emergency_storage/atrium name = "\improper Atrium Emergency Storage" -//TFF 7/4/20 - New areas for Surface Cargo bits as well as the Mining Outpost. Some former ones deleted. Others renamed. // Surface Cargo/Mining EVA/Warehouse/Mining Outpost adadditions /area/tether/surfacebase/cargo name = "Surface Cargo Foyer" @@ -650,7 +648,6 @@ name = "Atmospherics Gas Storage" icon_state = "atmos" -//TFF 11/12/19 - Minor refactor, makes mice spawn only in Atmos. /area/engineering/atmos_intake name = "\improper Atmospherics Intake" icon_state = "atmos" @@ -776,7 +773,6 @@ /area/rnd/robotics/resleeving name = "\improper Robotics Resleeving" -//TFF 28/8/19 - cleanup of areas placement /area/rnd/research/testingrange name = "\improper Weapons Testing Range" icon_state = "firingrange" @@ -787,7 +783,6 @@ //Outpost areas -//TFF 28/8/19 - cleanup of areas placement /area/rnd/outpost name = "\improper Research Outpost Hallway" icon_state = "research" @@ -939,7 +934,6 @@ name = "Public Meeting Room" icon_state = "blue" sound_env = SMALL_SOFTFLOOR -//TFF 28/8/19 - cleanup of areas placement /area/chapel/observation name = "\improper Chapel Observation" icon_state = "chapel" @@ -979,6 +973,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" @@ -1003,7 +1000,6 @@ flags = RAD_SHIELDED soundproofed = TRUE -//TFF 28/8/19 - cleanup of areas placement /area/crew_quarters/sleep/vistor_room_1 flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE @@ -1141,6 +1137,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 @@ -1412,7 +1411,6 @@ /area/shuttle/securiship/engines name = "\improper Securiship Engines" -//TFF 5/4/20 - Mining Ops move // Asteroid Mining belter and Mining Outpost shuttles and refinery/gear areas /area/quartermaster/belterdock name = "\improper Cargo Belter Access" @@ -1463,7 +1461,6 @@ area/shuttle/mining_outpost/shuttle name = "\improper Ninjacraft" icon_state = "shuttle2" -//TFF 28/8/19 - cleanup of areas placement /area/teleporter/departing name = "\improper Long-Range Teleporter" icon_state = "teleporter" @@ -1537,6 +1534,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" diff --git a/maps/tether/tether_defines.dm b/maps/tether/tether_defines.dm index 783aad8510..f12d322510 100644 --- a/maps/tether/tether_defines.dm +++ b/maps/tether/tether_defines.dm @@ -143,7 +143,6 @@ /area/rnd/miscellaneous_lab ) -//TFF 5/4/20 - Mining Ops move, airlock path change unit_test_exempt_from_atmos = list( /area/engineering/atmos_intake, // Outside, /area/rnd/external, // Outside, @@ -191,7 +190,6 @@ belter_belt_z = list(Z_LEVEL_ROGUEMINE_1, Z_LEVEL_ROGUEMINE_2) -//TFF 16/4/20 - mining outpost shuttle defines mining_station_z = list(Z_LEVEL_SPACE_HIGH) mining_outpost_z = list(Z_LEVEL_SURFACE_MINE) diff --git a/maps/tether/tether_shuttle_defs.dm b/maps/tether/tether_shuttle_defs.dm index 29489eea93..847cd0e480 100644 --- a/maps/tether/tether_shuttle_defs.dm +++ b/maps/tether/tether_shuttle_defs.dm @@ -212,7 +212,7 @@ ..() ////////////////////////////////////////////////////////////// -//TFF 12/4/20 Surface Mining Outpost Shuttle +// Surface Mining Outpost Shuttle /datum/shuttle/autodock/ferry/surface_mining_outpost name = "Mining Outpost" diff --git a/maps/tether/tether_shuttles.dm b/maps/tether/tether_shuttles.dm index 6ec0c4bc62..e380c18003 100644 --- a/maps/tether/tether_shuttles.dm +++ b/maps/tether/tether_shuttles.dm @@ -32,7 +32,6 @@ shuttle_tag = "Trade" req_one_access = list(access_trader) -//TFF 12/4/20 - Add console for Mining Outpost Shuttle /obj/machinery/computer/shuttle_control/surface_mining_outpost name = "surface mining outpost shuttle control console" shuttle_tag = "Mining Outpost" diff --git a/maps/tether_better/tether_areas.dm b/maps/tether_better/tether_areas.dm index 68a3d8db83..bbac67466f 100644 --- a/maps/tether_better/tether_areas.dm +++ b/maps/tether_better/tether_areas.dm @@ -250,7 +250,6 @@ name = "\improper Vacant Prep Area" /area/vacant/vacant_site/gateway/lower name = "\improper Lower Vacant Prep Area" -//TFF 5/4/20 - Mining Ops move TODO Change all Vacant areas to construction_site per vermin event location announcement. /area/construction/vacant_mining_ops name = "\improper Vacant Mining Operations" @@ -267,7 +266,6 @@ /area/tether/surfacebase/emergency_storage/atrium name = "\improper Atrium Emergency Storage" -//TFF 7/4/20 - New areas for Surface Cargo bits as well as the Mining Outpost. Some former ones deleted. Others renamed. // Surface Cargo/Mining EVA/Warehouse/Mining Outpost adadditions /area/tether/surfacebase/cargo name = "Surface Cargo Foyer" @@ -650,7 +648,6 @@ name = "Atmospherics Gas Storage" icon_state = "atmos" -//TFF 11/12/19 - Minor refactor, makes mice spawn only in Atmos. /area/engineering/atmos_intake name = "\improper Atmospherics Intake" icon_state = "atmos" @@ -776,7 +773,6 @@ /area/rnd/robotics/resleeving name = "\improper Robotics Resleeving" -//TFF 28/8/19 - cleanup of areas placement /area/rnd/research/testingrange name = "\improper Weapons Testing Range" icon_state = "firingrange" @@ -787,7 +783,6 @@ //Outpost areas -//TFF 28/8/19 - cleanup of areas placement /area/rnd/outpost name = "\improper Research Outpost Hallway" icon_state = "research" @@ -939,7 +934,6 @@ name = "Public Meeting Room" icon_state = "blue" sound_env = SMALL_SOFTFLOOR -//TFF 28/8/19 - cleanup of areas placement /area/chapel/observation name = "\improper Chapel Observation" icon_state = "chapel" @@ -1003,7 +997,6 @@ flags = RAD_SHIELDED soundproofed = TRUE -//TFF 28/8/19 - cleanup of areas placement /area/crew_quarters/sleep/vistor_room_1 flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE @@ -1412,7 +1405,6 @@ /area/shuttle/securiship/engines name = "\improper Securiship Engines" -//TFF 5/4/20 - Mining Ops move // Asteroid Mining belter and Mining Outpost shuttles and refinery/gear areas /area/quartermaster/belterdock name = "\improper Cargo Belter Access" @@ -1460,7 +1452,6 @@ area/shuttle/mining_outpost/shuttle name = "\improper Ninjacraft" icon_state = "shuttle2" -//TFF 28/8/19 - cleanup of areas placement /area/teleporter/departing name = "\improper Long-Range Teleporter" icon_state = "teleporter" diff --git a/maps/tether_better/tether_defines.dm b/maps/tether_better/tether_defines.dm index 5529983b94..cc7f0b5a97 100644 --- a/maps/tether_better/tether_defines.dm +++ b/maps/tether_better/tether_defines.dm @@ -138,7 +138,6 @@ /area/rnd/miscellaneous_lab ) -//TFF 5/4/20 - Mining Ops move, airlock path change unit_test_exempt_from_atmos = list( /area/engineering/atmos_intake, // Outside, /area/rnd/external, // Outside, @@ -186,7 +185,6 @@ belter_belt_z = list(Z_LEVEL_ROGUEMINE_1, Z_LEVEL_ROGUEMINE_2) -//TFF 16/4/20 - mining outpost shuttle defines mining_station_z = list(Z_LEVEL_SPACE_HIGH) mining_outpost_z = list(Z_LEVEL_SURFACE_MINE) diff --git a/maps/tether_better/tether_shuttle_defs.dm b/maps/tether_better/tether_shuttle_defs.dm index 29489eea93..847cd0e480 100644 --- a/maps/tether_better/tether_shuttle_defs.dm +++ b/maps/tether_better/tether_shuttle_defs.dm @@ -212,7 +212,7 @@ ..() ////////////////////////////////////////////////////////////// -//TFF 12/4/20 Surface Mining Outpost Shuttle +// Surface Mining Outpost Shuttle /datum/shuttle/autodock/ferry/surface_mining_outpost name = "Mining Outpost" diff --git a/maps/tether_better/tether_shuttles.dm b/maps/tether_better/tether_shuttles.dm index 6ec0c4bc62..e380c18003 100644 --- a/maps/tether_better/tether_shuttles.dm +++ b/maps/tether_better/tether_shuttles.dm @@ -32,7 +32,6 @@ shuttle_tag = "Trade" req_one_access = list(access_trader) -//TFF 12/4/20 - Add console for Mining Outpost Shuttle /obj/machinery/computer/shuttle_control/surface_mining_outpost name = "surface mining outpost shuttle control console" shuttle_tag = "Mining Outpost" diff --git a/maps/~map_system/maps.dm b/maps/~map_system/maps.dm index e7e096e856..f6e7287bf9 100644 --- a/maps/~map_system/maps.dm +++ b/maps/~map_system/maps.dm @@ -67,7 +67,7 @@ var/list/all_maps = list() var/ai_shell_restricted = FALSE //VOREStation Addition - are there z-levels restricted? var/ai_shell_allowed_levels = list() //VOREStation Addition - which z-levels ARE we allowed to visit? - //VOREStation Addition Start - belter stuff TFF 16/4/20 - Mining Outpost Shuttle + //VOREStation Addition Start var/list/belter_docked_z = list() var/list/belter_transit_z = list() var/list/belter_belt_z = list() 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"} /> + +