diff --git a/code/__defines/belly_modes_vr.dm b/code/__defines/belly_modes_vr.dm index 7ac58ddf6b..4260c8fd34 100644 --- a/code/__defines/belly_modes_vr.dm +++ b/code/__defines/belly_modes_vr.dm @@ -22,6 +22,7 @@ #define DM_FLAG_JAMSENSORS 0x20 #define DM_FLAG_FORCEPSAY 0x40 #define DM_FLAG_SLOWBODY 0x80 //CHOMPAdd +#define DM_FLAG_MUFFLEITEMS 0x100 //CHOMPAdd //Item related modes #define IM_HOLD "Hold" diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index 76c930deee..acd2be67ea 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -510,7 +510,8 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN, SPECIES_DIONA, SPECIES_ALRAUNE, SPECIES_PROTEAN, - SPECIES_MONKEY, //Exclude all monkey subtypes, to prevent abuse of it. They aren't, + /* + SPECIES_MONKEY, //Exclude all monkey subtypes, to prevent abuse of it. They aren't, //CHOMPEDIT How about let preds have skeletons, people can do so much worse than this SPECIES_MONKEY_TAJ, //set to have remains anyway, but making double sure, SPECIES_MONKEY_SKRELL, SPECIES_MONKEY_UNATHI, @@ -518,6 +519,7 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN, SPECIES_MONKEY_NEVREAN, SPECIES_MONKEY_SERGAL, SPECIES_MONKEY_VULPKANIN, + */ SPECIES_XENO, //Same for xenos, SPECIES_XENO_DRONE, SPECIES_XENO_HUNTER, diff --git a/code/game/dna/dna2.dm b/code/game/dna/dna2.dm index b68173624c..3f881631d5 100644 --- a/code/game/dna/dna2.dm +++ b/code/game/dna/dna2.dm @@ -118,6 +118,8 @@ var/global/list/datum/dna/gene/dna_genes[0] var/custom_ask var/custom_whisper var/custom_exclaim + var/list/custom_heat = list() + var/list/custom_cold = list() // VOREStation // New stuff @@ -144,6 +146,8 @@ var/global/list/datum/dna/gene/dna_genes[0] new_dna.custom_ask=custom_ask //VOREStaton Edit new_dna.custom_whisper=custom_whisper //VOREStaton Edit new_dna.custom_exclaim=custom_exclaim //VOREStaton Edit + new_dna.custom_heat=custom_heat //VOREStation Edit + new_dna.custom_cold=custom_cold //VOREStation Edit var/list/body_markings_genetic = (body_markings - body_marking_nopersist_list) new_dna.body_markings=body_markings_genetic.Copy() for(var/b=1;b<=DNA_SE_LENGTH;b++) @@ -216,6 +220,8 @@ var/global/list/datum/dna/gene/dna_genes[0] src.custom_ask = character.custom_ask src.custom_whisper = character.custom_whisper src.custom_exclaim = character.custom_exclaim + src.custom_heat = character.custom_heat + src.custom_cold = character.custom_cold // +1 to account for the none-of-the-above possibility SetUIValueRange(DNA_UI_EAR_STYLE, ear_style + 1, ear_styles_list.len + 1, 1) diff --git a/code/game/dna/dna2_helpers.dm b/code/game/dna/dna2_helpers.dm index d5cdc700c7..9b57cd87e1 100644 --- a/code/game/dna/dna2_helpers.dm +++ b/code/game/dna/dna2_helpers.dm @@ -244,6 +244,8 @@ H.custom_whisper = dna.custom_whisper H.custom_exclaim = dna.custom_exclaim H.species.blood_color = dna.blood_color + H.custom_heat = dna.custom_heat + H.custom_cold = dna.custom_cold var/datum/species/S = H.species S.produceCopy(dna.species_traits, H, dna.base_species) // VOREStation Edit End diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index a05296213c..dac041f327 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -360,13 +360,16 @@ user.position_hud_item(src,slot) if(user.client) user.client.screen |= src if(user.pulling == src) user.stop_pulling() + // Chomp edit starts if((slot_flags & slot)) - if(equip_sound) + if(equip_sound && !muffled_by_belly(user)) playsound(src, equip_sound, 20) - else + else if(!muffled_by_belly(user)) playsound(src, drop_sound, 20) else if(slot == slot_l_hand || slot == slot_r_hand) - playsound(src, pickup_sound, 20, preference = /datum/client_preference/pickup_sounds) + if(!muffled_by_belly(user)) + playsound(src, pickup_sound, 20, preference = /datum/client_preference/pickup_sounds) + // Chomp edit stops return // As above but for items being equipped to an active module on a robot. diff --git a/code/game/objects/items/devices/advnifrepair.dm b/code/game/objects/items/devices/advnifrepair.dm index 913aad68ad..ca3e455acc 100644 --- a/code/game/objects/items/devices/advnifrepair.dm +++ b/code/game/objects/items/devices/advnifrepair.dm @@ -24,7 +24,7 @@ /obj/item/device/nifrepairer/attackby(obj/W, mob/user) if(istype(W,/obj/item/stack/nanopaste)) var/obj/item/stack/nanopaste/np = W - if(np.use(1) && supply.get_free_space() >= efficiency) + if((supply.get_free_space() >= efficiency) && np.use(1)) to_chat(user, "You convert some nanopaste into programmed nanites inside \the [src].") supply.add_reagent(id = "nifrepairnanites", amount = efficiency) update_icon() diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 49aa20e4d9..c7625fb4a9 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -22,7 +22,15 @@ /obj/item/weapon/storage/backpack/equipped(var/mob/user, var/slot) if (slot == slot_back && src.use_sound) - playsound(src, src.use_sound, 50, 1, -5) +// Chomp edit + if(isbelly(user.loc)) + var/obj/belly/B = user.loc + if(B.mode_flags & DM_FLAG_MUFFLEITEMS) + return + else +// Chomp edit end + playsound(src, src.use_sound, 50, 1, -5) + ..(user, slot) /* @@ -549,4 +557,4 @@ desc = "A satchel designed for the Go Go ERT Rangers series to allow for slightly bigger carry capacity for the ERT-Rangers.\ Unlike the show claims, it is not a phoron-enhanced satchel of holding with plot-relevant content." icon = 'icons/obj/clothing/ranger.dmi' - icon_state = "ranger_satchel" \ No newline at end of file + icon_state = "ranger_satchel" diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index 12b2b5b2fb..b7c462e73d 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -237,7 +237,14 @@ /obj/item/weapon/storage/proc/open(mob/user as mob) if (use_sound) - playsound(src, src.use_sound, 50, 0, -5) + // Chomp edit + if(isbelly(user.loc)) + var/obj/belly/B = user.loc + if(B.mode_flags & DM_FLAG_MUFFLEITEMS) + // Do nothing + else + playsound(src, src.use_sound, 50, 0, -5) + // Chomp edit end orient2hud(user) if(user.s_active) diff --git a/code/game/objects/items_vr.dm b/code/game/objects/items_vr.dm index 4b8dbcaae5..09b7ff7ffd 100644 --- a/code/game/objects/items_vr.dm +++ b/code/game/objects/items_vr.dm @@ -24,4 +24,15 @@ possessed_voice.Add(new_voice) listening_objects |= src new_voice.verbs -= /mob/living/voice/verb/change_name //No changing your name! Bad! - new_voice.verbs -= /mob/living/voice/verb/hang_up //Also you can't hang up. You are the item! \ No newline at end of file + new_voice.verbs -= /mob/living/voice/verb/hang_up //Also you can't hang up. You are the item! + +// Chomp edit +/obj/item/proc/muffled_by_belly(var/mob/user) + if(isbelly(user.loc)) + var/obj/belly/B = user.loc + if(B.mode_flags & DM_FLAG_MUFFLEITEMS) + return TRUE + return FALSE + else + return FALSE +// Chomp edit end diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index 1aeb9cdf4c..84cb98b963 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -38,7 +38,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart) to_chat(user, "There's no room in [src] for [I].") return FALSE - if(!user.unEquip(I, 0, src)) + if(!user.canUnEquip(I)) to_chat(user, "[I] is stuck to your hand.") return FALSE @@ -83,6 +83,7 @@ GLOBAL_LIST_BOILERPLATE(all_janitorial_carts, /obj/structure/janitorialcart) to_chat(user, "There's no room in [src] for [I].") return FALSE + user.drop_from_inventory(I, src) update_icon() to_chat(user, "You put [I] into [src].") return TRUE diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index bf30bc0d3d..a341ef961c 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -12,7 +12,7 @@ /obj/structure/morgue name = "morgue" - desc = "Used to keep bodies in untill someone fetches them." + desc = "A refrigerated unit used to store bodies, or for surreptitious naps." icon = 'icons/obj/stationobjs.dmi' icon_state = "morgue1" dir = EAST diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index 98e1c2d51d..b4aff90dc8 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -70,7 +70,7 @@ if(href_list["irc_msg"]) if(!holder && received_irc_pm < world.time - 6000) //Worse they can do is spam IRC for 10 minutes - to_chat(usr, "You are no longer able to use this, it's been more then 10 minutes since an admin on IRC has responded to you") + to_chat(usr, "You are no longer able to use this, it's been more than 10 minutes since an admin on IRC has responded to you") return if(mute_irc) to_chat(usr, "") diff --git a/code/modules/client/preference_setup/vore/07_traits.dm b/code/modules/client/preference_setup/vore/07_traits.dm index 9627295062..0537f54eaa 100644 --- a/code/modules/client/preference_setup/vore/07_traits.dm +++ b/code/modules/client/preference_setup/vore/07_traits.dm @@ -15,6 +15,9 @@ var/custom_ask = null var/custom_exclaim = null + var/list/custom_heat = list() + var/list/custom_cold = list() + var/list/pos_traits = list() // What traits they've selected for their custom species var/list/neu_traits = list() var/list/neg_traits = list() @@ -25,6 +28,20 @@ var/dirty_synth = 0 //Are you a synth var/gross_meatbag = 0 //Where'd I leave my Voight-Kampff test kit? +/datum/preferences/proc/get_custom_bases_for_species(var/new_species) + if (!new_species) + new_species = species + var/list/choices + var/datum/species/spec = GLOB.all_species[new_species] + if (spec.selects_bodytype == SELECTS_BODYTYPE_SHAPESHIFTER) + choices = spec.get_valid_shapeshifter_forms() + choices = choices.Copy() + else if (spec.selects_bodytype == SELECTS_BODYTYPE_CUSTOM) + choices = GLOB.custom_species_bases.Copy() + if(new_species != SPECIES_CUSTOM) + choices = (choices | new_species) + return choices + // Definition of the stuff for Ears /datum/category_item/player_setup_item/vore/traits name = "Traits" @@ -47,6 +64,9 @@ S["custom_ask"] >> pref.custom_ask S["custom_exclaim"] >> pref.custom_exclaim + S["custom_heat"] >> pref.custom_heat + S["custom_cold"] >> pref.custom_cold + /datum/category_item/player_setup_item/vore/traits/save_character(var/savefile/S) S["custom_species"] << pref.custom_species S["custom_base"] << pref.custom_base @@ -64,6 +84,9 @@ S["custom_ask"] << pref.custom_ask S["custom_exclaim"] << pref.custom_exclaim + S["custom_heat"] << pref.custom_heat + S["custom_cold"] << pref.custom_cold + /datum/category_item/player_setup_item/vore/traits/sanitize_character() if(!pref.pos_traits) pref.pos_traits = list() if(!pref.neu_traits) pref.neu_traits = list() @@ -122,7 +145,9 @@ var/datum/species/selected_species = GLOB.all_species[pref.species] if(selected_species.selects_bodytype) - // Allowed! + if (!(pref.custom_base in pref.get_custom_bases_for_species())) + pref.custom_base = SPECIES_HUMAN + //otherwise, allowed! else if(!pref.custom_base || !(pref.custom_base in GLOB.custom_species_bases)) pref.custom_base = SPECIES_HUMAN @@ -131,12 +156,16 @@ pref.custom_ask = lowertext(trim(pref.custom_ask)) pref.custom_exclaim = lowertext(trim(pref.custom_exclaim)) + /datum/category_item/player_setup_item/vore/traits/copy_to_mob(var/mob/living/carbon/human/character) character.custom_species = pref.custom_species character.custom_say = lowertext(trim(pref.custom_say)) character.custom_ask = lowertext(trim(pref.custom_ask)) character.custom_whisper = lowertext(trim(pref.custom_whisper)) character.custom_exclaim = lowertext(trim(pref.custom_exclaim)) + character.custom_heat = pref.custom_heat + character.custom_cold = pref.custom_cold + if(character.isSynthetic()) //Checking if we have a synth on our hands, boys. pref.dirty_synth = 1 @@ -162,6 +191,8 @@ var/english_traits = english_list(new_S.traits, and_text = ";", comma_text = ";") log_game("TRAITS [pref.client_ckey]/([character]) with: [english_traits]") //Terrible 'fake' key_name()... but they aren't in the same entity yet + + /datum/category_item/player_setup_item/vore/traits/content(var/mob/user) . += "Custom Species Name: " . += "[pref.custom_species ? pref.custom_species : "-Input Name-"]
" @@ -228,6 +259,14 @@ . += "Set Exclaim Verb" . += "(Reset)" . += "
" + . += "Custom heat Discomfort: " + . += "Set Heat Messages" + . += "(Reset)" + . += "
" + . += "Custom Cold Discomfort: " + . += "Set Cold Messages" + . += "(Reset)" + . += "
" /datum/category_item/player_setup_item/vore/traits/OnTopic(var/href,var/list/href_list, var/mob/user) if(!CanUseTopic(user)) @@ -241,15 +280,7 @@ return TOPIC_REFRESH else if(href_list["custom_base"]) - var/list/choices - var/datum/species/spec = GLOB.all_species[pref.species] - if (spec.selects_bodytype == SELECTS_BODYTYPE_SHAPESHIFTER && istype(spec, /datum/species/shapeshifter)) - var/datum/species/spec_shifter = spec - choices = spec_shifter.get_valid_shapeshifter_forms() - else - choices = GLOB.custom_species_bases - if(pref.species != SPECIES_CUSTOM) - choices = (choices | pref.species) + var/list/choices = pref.get_custom_bases_for_species() var/text_choice = tgui_input_list(usr, "Pick an icon set for your species:","Icon Base", choices) if(text_choice in choices) pref.custom_base = text_choice @@ -318,6 +349,41 @@ pref.custom_exclaim = exclaim_choice return TOPIC_REFRESH + else if(href_list["custom_heat"]) + tgui_alert(user, "You are setting custom heat messages. These will overwrite your species' defaults. To return to defaults, click reset.") + var/old_message = pref.custom_heat.Join("\n\n") + var/new_message = sanitize(tgui_input_text(usr,"Use double enter between messages to enter a new one. Must be at least 3 characters long, 160 characters max and up to 10 messages are allowed.","Heat Discomfort messages",old_message, multiline= TRUE, prevent_enter = TRUE), MAX_MESSAGE_LEN,0,0,0) + if(length(new_message) > 0) + var/list/raw_list = splittext(new_message,"\n\n") + if(raw_list.len > 10) + raw_list.Cut(11) + for(var/i = 1, i <= raw_list.len, i++) + if(length(raw_list[i]) < 3 || length(raw_list[i]) > 160) + raw_list.Cut(i,i) + else + raw_list[i] = readd_quotes(raw_list[i]) + ASSERT(raw_list.len <= 10) + pref.custom_heat = raw_list + return TOPIC_REFRESH + + else if(href_list["custom_cold"]) + tgui_alert(user, "You are setting custom cold messages. These will overwrite your species' defaults. To return to defaults, click reset.") + var/old_message = pref.custom_heat.Join("\n\n") + var/new_message = sanitize(tgui_input_text(usr,"Use double enter between messages to enter a new one. Must be at least 3 characters long, 160 characters max and up to 10 messages are allowed.","Cold Discomfort messages",old_message, multiline= TRUE, prevent_enter = TRUE), MAX_MESSAGE_LEN,0,0,0) + if(length(new_message) > 0) + var/list/raw_list = splittext(new_message,"\n\n") + if(raw_list.len > 10) + raw_list.Cut(11) + for(var/i = 1, i <= raw_list.len, i++) + if(length(raw_list[i]) < 3 || length(raw_list[i]) > 160) + raw_list.Cut(i,i) + else + raw_list[i] = readd_quotes(raw_list[i]) + ASSERT(raw_list.len <= 10) + pref.custom_cold = raw_list + return TOPIC_REFRESH + + else if(href_list["reset_say"]) var/say_choice = tgui_alert(usr, "Reset your Custom Say Verb?","Reset Verb",list("Yes","No")) if(say_choice == "Yes") @@ -342,6 +408,18 @@ pref.custom_exclaim = null return TOPIC_REFRESH + else if(href_list["reset_cold"]) + var/cold_choice = tgui_alert(usr, "Reset your Custom Cold Discomfort messages?", "Reset Discomfort",list("Yes","No")) + if(cold_choice == "Yes") + pref.custom_cold = list() + return TOPIC_REFRESH + + else if(href_list["reset_heat"]) + var/heat_choice = tgui_alert(usr, "Reset your Custom Heat Discomfort messages?", "Reset Discomfort",list("Yes","No")) + if(heat_choice == "Yes") + pref.custom_heat = list() + return TOPIC_REFRESH + else if(href_list["add_trait"]) var/mode = text2num(href_list["add_trait"]) var/list/picklist diff --git a/code/modules/client/preference_setup/vore/09_misc.dm b/code/modules/client/preference_setup/vore/09_misc.dm index 2091566980..f73bdd80f5 100644 --- a/code/modules/client/preference_setup/vore/09_misc.dm +++ b/code/modules/client/preference_setup/vore/09_misc.dm @@ -81,6 +81,8 @@ return TOPIC_REFRESH else if(href_list["directory_ad"]) var/msg = sanitize(tgui_input_text(user,"Write your advertisement here!", "Flavor Text", html_decode(pref.directory_ad), multiline = TRUE, prevent_enter = TRUE), extra = 0) //VOREStation Edit: separating out OOC notes + if(!msg) + return pref.directory_ad = msg return TOPIC_REFRESH else if(href_list["toggle_sensor_setting"]) diff --git a/code/modules/client/verbs/character_directory.dm b/code/modules/client/verbs/character_directory.dm index 28d6e0b8e7..80ef1cfd03 100644 --- a/code/modules/client/verbs/character_directory.dm +++ b/code/modules/client/verbs/character_directory.dm @@ -101,7 +101,7 @@ GLOBAL_DATUM(character_directory, /datum/character_directory) if(istype(C.mob, /mob/living/simple_mob)) var/mob/living/simple_mob/S = C.mob name = S.name - species = "simplemob" + species = S.character_directory_species() ooc_notes = S.ooc_notes flavor_text = S.desc //CHOMPEdit End diff --git a/code/modules/events/roaming_wildlife.dm b/code/modules/events/roaming_wildlife.dm index 840350031f..55ef610664 100644 --- a/code/modules/events/roaming_wildlife.dm +++ b/code/modules/events/roaming_wildlife.dm @@ -1,6 +1,10 @@ /datum/event/roaming_wildlife announceWhen = 10 + var/threat_level + var/spawn_count + var/location_amount + /datum/event/roaming_wildlife/start() var/list/possible_spawns = list() for(var/obj/effect/landmark/C in landmarks_list) @@ -13,10 +17,6 @@ if(!(possible_spawns.len)) return - var/threat_level - var/spawn_count - var/location_amount - var/points_to_spend switch(severity) @@ -60,12 +60,39 @@ step_away(L, WL) /datum/event/roaming_wildlife/announce() - var/message - switch(severity) - if(EVENT_LEVEL_MUNDANE) - message = "Minor movements of local wildlife have been detected within proximity of the facility." - if(EVENT_LEVEL_MODERATE) - message = "Notable amount of local wildlife has been detected entering area surrounding the facility. Take caution." - if(EVENT_LEVEL_MAJOR) - message = "A particularly large shift within wildlife movement has been detected. Take caution." + var/gamount_message + var/amount_message + var/threat_message + + switch(threat_level) + if(1) + threat_message = "completely harmless" + if(2) + threat_message = "docile but easily agitated" + if(3) + threat_message = "hostile" + if(4) + threat_message = "highly hostile and dangerous" + switch(spawn_count) + if(1) + amount_message = "singular straggler[location_amount == 1 ? "" : "s"]" + if(2 to 4) + amount_message = "small grouping[location_amount == 1 ? "" : "s"]" + if(5 to 8) + amount_message = "moderate pack[location_amount == 1 ? "" : "s"]" + else + amount_message = "large swarm[location_amount == 1 ? "" : "s"]" + switch(location_amount) + if(1) + gamount_message = "a single" + if(2 to 4) + gamount_message = "a few" + if(5 to 9) + gamount_message = "several" + else + gamount_message = "numerous" + + var/message = "Movements of [gamount_message] group[location_amount == 1 ? "" : "s"] of wildlife have been detected in regions surrounding [using_map.full_name]. The wildlife group[location_amount == 1 ? "" : "s"] [location_amount == 1 ? "is" : "are"] [threat_message] and \ + [location_amount == 1 ? "is" : "are"] comprised of [amount_message].[threat_level > 2 ? " Take caution." : ""]" + command_announcement.Announce(message, "Wildlife Monitoring") diff --git a/code/modules/mob/language/language.dm b/code/modules/mob/language/language.dm index 4fa749f41e..5ab9416da3 100644 --- a/code/modules/mob/language/language.dm +++ b/code/modules/mob/language/language.dm @@ -130,11 +130,27 @@ /datum/language/proc/broadcast(var/mob/living/speaker,var/message,var/speaker_mask) log_say("(HIVE) [message]", speaker) + speaker.verbs |= /mob/proc/adjust_hive_range //VOREStation Add - If you don't have the verb you should. + if(!speaker_mask) speaker_mask = speaker.name message = "[get_spoken_verb(message)], \"[format_message(message, get_spoken_verb(message))]\"" - - for(var/mob/player in player_list) - player.hear_broadcast(src, speaker, speaker_mask, message) + //VOREStation Edit Start + if(speaker.hive_lang_range == -1) + var/turf/t = get_turf(speaker) + for(var/mob/player in player_list) + var/turf/b = get_turf(player) + if (t.z == b.z) + player.hear_broadcast(src, speaker, speaker_mask, message) + else if(speaker.hive_lang_range) + var/turf/t = get_turf(speaker) + for(var/mob/player in player_list) + var/turf/b = get_turf(player) + if(get_dist(t,b) <= speaker.hive_lang_range) + player.hear_broadcast(src, speaker, speaker_mask, message) + else + for(var/mob/player in player_list) + player.hear_broadcast(src, speaker, speaker_mask, message) + //VOREStation Edit End /mob/proc/hear_broadcast(var/datum/language/language, var/mob/speaker, var/speaker_name, var/message) if((language in languages) && language.check_special_condition(src)) @@ -187,6 +203,11 @@ return 0 languages.Add(new_language) + //VOREStation Addition Start + if(new_language.flags & HIVEMIND) + verbs |= /mob/proc/adjust_hive_range + //VOREStation Addition End + return 1 /mob/proc/remove_language(var/rem_language) diff --git a/code/modules/mob/language/snowflake.dm b/code/modules/mob/language/snowflake.dm new file mode 100644 index 0000000000..7c8160c5c1 --- /dev/null +++ b/code/modules/mob/language/snowflake.dm @@ -0,0 +1,19 @@ +/mob + var/hive_lang_range = 0 + +/mob/proc/adjust_hive_range() + set name = "Adjust Special Language Range" + set desc = "Changes the range you will transmit your hive language to!" + set category = "IC" + + var/option = tgui_alert(src, "What range?", "Adjust special language range", list("Global","This Z level","Local", "Subtle")) + + switch(option) + if("Global") + hive_lang_range = 0 + if("This Z level") + hive_lang_range = -1 + if("Local") + hive_lang_range = world.view + if("Subtle") + hive_lang_range = 1 diff --git a/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm b/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm index f76555561b..2b8edb450f 100644 --- a/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm +++ b/code/modules/mob/living/carbon/human/species/shadekin/shadekin.dm @@ -25,6 +25,8 @@ male_scream_sound = null //CHOMPedit female_scream_sound = null //CHOMPedit + inherent_verbs = list(/mob/proc/adjust_hive_range) + siemens_coefficient = 1 darksight = 10 diff --git a/code/modules/mob/living/carbon/human/species/species_getters.dm b/code/modules/mob/living/carbon/human/species/species_getters.dm index 27bb09baa6..3d5faafcfa 100644 --- a/code/modules/mob/living/carbon/human/species/species_getters.dm +++ b/code/modules/mob/living/carbon/human/species/species_getters.dm @@ -90,10 +90,18 @@ */ var/discomfort_message + var/list/custom_cold = H.custom_cold + var/list/custom_heat = H.custom_heat if(msg_type == ENVIRONMENT_COMFORT_MARKER_COLD && length(cold_discomfort_strings) /*&& !covered*/) - discomfort_message = pick(cold_discomfort_strings) + if(custom_cold.len > 0) + discomfort_message = pick(custom_cold) + else + discomfort_message = pick(cold_discomfort_strings) else if(msg_type == ENVIRONMENT_COMFORT_MARKER_HOT && length(heat_discomfort_strings) /*&& covered*/) - discomfort_message = pick(heat_discomfort_strings) + if(custom_heat.len > 0) + discomfort_message = pick(custom_heat) + else + discomfort_message = pick(heat_discomfort_strings) if(discomfort_message && prob(5)) to_chat(H, SPAN_DANGER(discomfort_message)) diff --git a/code/modules/mob/living/carbon/human/species/station/monkey.dm b/code/modules/mob/living/carbon/human/species/station/monkey.dm index d4419deb43..35e975282e 100644 --- a/code/modules/mob/living/carbon/human/species/station/monkey.dm +++ b/code/modules/mob/living/carbon/human/species/station/monkey.dm @@ -70,6 +70,12 @@ /datum/species/monkey/get_random_name() return "[lowertext(name)] ([rand(100,999)])" +/datum/species/monkey/handle_post_spawn(var/mob/living/carbon/human/H)//CHOMPadd begin + if(!H.ckey) + H.can_be_drop_prey = TRUE + H.digest_leave_remains = 1 + return ..()//CHOMPadd end + /datum/species/monkey/tajaran name = SPECIES_MONKEY_TAJ name_plural = "Farwa" diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm index 5b7d45ab28..df76228e18 100644 --- a/code/modules/mob/living/carbon/human/species/station/station.dm +++ b/code/modules/mob/living/carbon/human/species/station/station.dm @@ -572,7 +572,8 @@ inherent_verbs = list( /mob/living/carbon/human/proc/diona_split_nymph, - /mob/living/carbon/human/proc/regenerate + /mob/living/carbon/human/proc/regenerate, + /mob/proc/adjust_hive_range //VOREStation Add ) warning_low_pressure = 50 diff --git a/code/modules/mob/living/carbon/human/species/station/station_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_vr.dm index 7d80479129..0182045c53 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_vr.dm @@ -494,6 +494,8 @@ unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp) rarity_value = 5 //INTERDIMENSIONAL FLUFFERS + inherent_verbs = list(/mob/proc/adjust_hive_range) + siemens_coefficient = 0 darksight = 10 diff --git a/code/modules/mob/living/living_defines_vr.dm b/code/modules/mob/living/living_defines_vr.dm index f7a3f113ab..424ac98771 100644 --- a/code/modules/mob/living/living_defines_vr.dm +++ b/code/modules/mob/living/living_defines_vr.dm @@ -10,9 +10,12 @@ var/custom_say = null var/custom_ask = null var/custom_exclaim = null - var/custom_whisper = null + var/custom_whisper = null +//custom temperature discomfort vars + var/list/custom_heat = list() + var/list/custom_cold = list() //YW Add Start /mob var/wingdings = 0 -//Yw Add End \ No newline at end of file +//Yw Add End diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm index a4c69d6d3d..a8b2cb6194 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm @@ -234,7 +234,7 @@ "Secborg model V-3" = "SecVale", //CHOMPEdit "Cat" = "vixsec", //CHOMPEdit "Drake" = "drakesec", - "Secborg model V-4" = "secraptor"//CHOMPEdit + "Raptor V-4" = "secraptor" ) /obj/item/weapon/robot_module/robot/security/knine/New(var/mob/living/silicon/robot/R) @@ -311,7 +311,7 @@ "Mediborg model V-3" = "vale2", //CHOMPEdit "Cat" = "vixmed", //CHOMPEdit "Drake" = "drakemed", - "Mediborg model V-4" = "medraptor" //CHOMPEdit + "Raptor V-4" = "medraptor" ) /obj/item/weapon/robot_module/robot/medical/medihound/New(var/mob/living/silicon/robot/R) @@ -632,7 +632,7 @@ "SciHoundDark" = "scihounddark", "Cat" = "vixsci", //CHOMPEdit "Drake" = "drakesci", - "Sciborg model V-4" = "sciraptor"//CHOMPEdit + "Raptor V-4" = "sciraptor" ) can_be_pushed = 0 diff --git a/code/modules/mob/living/silicon/robot/robot_vr.dm b/code/modules/mob/living/silicon/robot/robot_vr.dm index 3112cb2823..1a16ed9b04 100644 --- a/code/modules/mob/living/silicon/robot/robot_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_vr.dm @@ -170,8 +170,8 @@ icon = 'modular_chomp/icons/mob/widerobot_ch.dmi' else if(icontype == "Cat" || icontype == "Cat Mining" || icontype == "Cat Cargo") // CHOMPEdit icon = 'modular_chomp/icons/mob/catborg/catborg.dmi' - else if(icontype == "Mediborg model V-4" || icontype == "Secborg model V-4"|| icontype == "Sciborg model V-4") //CHOMPEdit - icon = 'modular_chomp/icons/mob/raptorborg/raptor.dmi' + else if(icontype == "Raptor V-4") //Added for raptor sprites + icon = 'icons/mob/raptorborg/raptor.dmi' else icon = wideborg_dept return diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm b/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm index 56956f080a..eeb021d387 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/dominated_brain.dm @@ -154,6 +154,9 @@ langlist |= L.languages if(langlist.len) langlist -= languages + for(var/datum/language/L in langlist) + if(L.flags & HIVEMIND) + verbs |= /mob/proc/adjust_hive_range temp_languages |= langlist languages |= langlist diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander_ch.dm b/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander_ch.dm index 8f2ee24117..8c2a2d7027 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander_ch.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/leopardmander_ch.dm @@ -7,6 +7,7 @@ icon_dead = "leopardmander-dead" icon_living = "leopardmander" icon_state = "leopardmander" + icon_rest = "leopardmander-rest" faction = "neutral" meat_amount = 40 //I mean... meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat @@ -40,13 +41,13 @@ vore_escape_chance = 50 vore_pounce_chance = 100 vore_active = 1 - vore_icons = 4 + vore_icons = 5 vore_capacity = 4 swallowTime = 100 vore_default_mode = DM_HEAL vore_pounce_maxhealth = 125 vore_bump_emote = "tries to snap up" - + can_be_drop_prey = FALSE //CHOMP Add /datum/category_item/catalogue/fauna/leopardmander @@ -68,6 +69,10 @@ verbs |= /mob/living/simple_mob/proc/animal_mount verbs |= /mob/living/proc/toggle_rider_reins movement_cooldown = 2 + plane_holder.set_vis(VIS_CH_HEALTH_VR, 1) + plane_holder.set_vis(VIS_CH_ID, 1) + plane_holder.set_vis(VIS_CH_STATUS_R, 1) + plane_holder.set_vis(VIS_CH_BACKUP, 1) //Makes sense for player Leppy's to be able to see health. /mob/living/simple_mob/vore/leopardmander/Initialize() ..() @@ -119,6 +124,7 @@ icon_dead = "leopardmander_blue-dead" icon_living = "leopardmander_blue" icon_state = "leopardmander_blue" + icon_rest = "leopardmander_blue-rest" /mob/living/simple_mob/vore/leopardmander/exotic name = "glass-belly leopardmander" @@ -127,6 +133,7 @@ icon_dead = "leopardmander_exotic-dead" icon_living = "leopardmander_exotic" icon_state = "leopardmander_exotic" + icon_rest = "leopardmander_exotic-rest" glow_toggle = TRUE //Glow! glow_range = 2 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm index 418520f868..d32e7ff1b4 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm @@ -131,6 +131,8 @@ update_icon() + verbs |= /mob/proc/adjust_hive_range + return ..() /mob/living/simple_mob/shadekin/Destroy() diff --git a/code/modules/mob/new_player/sprite_accessories_taur_ch.dm b/code/modules/mob/new_player/sprite_accessories_taur_ch.dm deleted file mode 100644 index b2e95a8ae0..0000000000 --- a/code/modules/mob/new_player/sprite_accessories_taur_ch.dm +++ /dev/null @@ -1,111 +0,0 @@ -/datum/sprite_accessory/tail/taur/ch - icon = 'icons/mob/vore/taurs_ch.dmi'//Parent which allows us to not need to set icon every time. - -/datum/sprite_accessory/tail/taur/ch/zorgoia - name = "Zorgoia (Taur)" - icon_state = "zorgoia" - extra_overlay = "zorgoia_fluff" - -/datum/sprite_accessory/tail/taur/ch/zorgoia/fat - name = "Zorgoia (Fat Taur)" - extra_overlay = "zorgoia_fat" - -/datum/sprite_accessory/tail/taur/ch/redpanda - name = "Red Panda (Taur)" - icon_state = "redpanda" - -/datum/sprite_accessory/tail/taur/ch/redpandadc - name = "Red Panda (Taur dual-color)" - icon_state = "redpanda_dc" - extra_overlay = "redpanda_dc_markings" - -/datum/sprite_accessory/tail/taur/ch/wolf/fatwolf_2c/fatwolfalt - name = "Fat Wolf 3-color-alt (Taur)" - icon_state = "fatwolfalt_s" - extra_overlay = "fatwolfalt_markings1" - extra_overlay2 = "fatwolfalt_markings2" - icon_sprite_tag = "wolf" - -/datum/sprite_accessory/tail/taur/ch/naga/alt - name = "Naga alt (Taur)" - icon_state = "naga_alt_s" - suit_sprites = 'modular_chomp/icons/mob/taursuits_naga_ch.dmi' - - msg_owner_help_walk = "You carefully slither around %prey." - msg_prey_help_walk = "%owner's huge tail slithers past beside you!" - - msg_owner_help_run = "You carefully slither around %prey." - msg_prey_help_run = "%owner's huge tail slithers past beside you!" - - msg_owner_disarm_run = "Your tail slides over %prey, pushing them down to the ground!" - msg_prey_disarm_run = "%owner's tail slides over you, forcing you down to the ground!" - - msg_owner_disarm_walk = "You push down on %prey with your tail, pinning them down under you!" - msg_prey_disarm_walk = "%owner pushes down on you with their tail, pinning you down below them!" - - msg_owner_harm_run = "Your heavy tail carelessly slides past %prey, crushing them!" - msg_prey_harm_run = "%owner quickly goes over your body, carelessly crushing you with their heavy tail!" - - msg_owner_harm_walk = "Your heavy tail slowly and methodically slides down upon %prey, crushing against the floor below!" - msg_prey_harm_walk = "%owner's thick, heavy tail slowly and methodically slides down upon your body, mercilessly crushing you into the floor below!" - - msg_owner_grab_success = "You slither over %prey with your large, thick tail, smushing them against the ground before coiling up around them, trapping them within the tight confines of your tail!" - msg_prey_grab_success = "%owner slithers over you with their large, thick tail, smushing you against the ground before coiling up around you, trapping you within the tight confines of their tail!" - - msg_owner_grab_fail = "You squish %prey under your large, thick tail, forcing them onto the ground!" - msg_prey_grab_fail = "%owner pins you under their large, thick tail, forcing you onto the ground!" - - msg_prey_stepunder = "You jump over %prey's thick tail." - msg_owner_stepunder = "%owner bounds over your tail." - - -/datum/sprite_accessory/tail/taur/ch/naga/alt_2c - name = "Naga dual-color alt (Taur)" - icon_state = "naga_alt_s" - extra_overlay = "naga_alt_markings" - suit_sprites = 'modular_chomp/icons/mob/taursuits_naga_ch.dmi' - - msg_owner_help_walk = "You carefully slither around %prey." - msg_prey_help_walk = "%owner's huge tail slithers past beside you!" - - msg_owner_help_run = "You carefully slither around %prey." - msg_prey_help_run = "%owner's huge tail slithers past beside you!" - - msg_owner_disarm_run = "Your tail slides over %prey, pushing them down to the ground!" - msg_prey_disarm_run = "%owner's tail slides over you, forcing you down to the ground!" - - msg_owner_disarm_walk = "You push down on %prey with your tail, pinning them down under you!" - msg_prey_disarm_walk = "%owner pushes down on you with their tail, pinning you down below them!" - - msg_owner_harm_run = "Your heavy tail carelessly slides past %prey, crushing them!" - msg_prey_harm_run = "%owner quickly goes over your body, carelessly crushing you with their heavy tail!" - - msg_owner_harm_walk = "Your heavy tail slowly and methodically slides down upon %prey, crushing against the floor below!" - msg_prey_harm_walk = "%owner's thick, heavy tail slowly and methodically slides down upon your body, mercilessly crushing you into the floor below!" - - msg_owner_grab_success = "You slither over %prey with your large, thick tail, smushing them against the ground before coiling up around them, trapping them within the tight confines of your tail!" - msg_prey_grab_success = "%owner slithers over you with their large, thick tail, smushing you against the ground before coiling up around you, trapping you within the tight confines of their tail!" - - msg_owner_grab_fail = "You squish %prey under your large, thick tail, forcing them onto the ground!" - msg_prey_grab_fail = "%owner pins you under their large, thick tail, forcing you onto the ground!" - - msg_prey_stepunder = "You jump over %prey's thick tail." - msg_owner_stepunder = "%owner bounds over your tail." - - -/datum/sprite_accessory/tail/taur/ch/horse/scoli - name = "Scolipede (Taur)" - icon_state = "scoli_s" - extra_overlay = "scoli_markings1" - extra_overlay2 = "scoli_markings2" - -/datum/sprite_accessory/tail/taur/ch/sergal/wheaties - name = "Sergal (Taur)" - icon_state = "sergwheat" - icon_sprite_tag = "wolf" - -/datum/sprite_accessory/tail/taur/ch/sergal/wheaties_2c - name = "Sergal (Taur, dual-color)" - icon_state = "sergwheat" - extra_overlay = "sergwheat_markings" - icon_sprite_tag = "wolf" diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 2c1be3da9c..acfcd24f18 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -218,16 +218,12 @@ * Mako */ /obj/item/weapon/gun/projectile/revolver/lemat - name = "\improper \"Mako\" Revolver" - desc = "The Bishamonten P100 Mako is a 9 shot revolver with a secondary firing barrel loading shotgun shells. \ - For when you really need something dead. A rare yet deadly collector's item. Uses .38-Special and 12g rounds depending on the barrel." - description_fluff = "The Bishamonten Company operated from roughly 2150-2280 - the height of the first \ - extrasolar colonisation boom - before filing for bankruptcy and selling off its assets to various companies \ - that would go on to become today’s TSCs. Focused on sleek ‘futurist’ designs which have largely fallen out of \ - fashion but remain popular with collectors and people hoping to make some quick thalers from replica weapons. \ - Bishamonten weapons tended to be form over function - despite their flashy looks, most were completely \ - unremarkable one way or another as weapons and used very standard firing mechanisms - the Mako was a notable \ - exception, and original examples are much sought after." + name = "Mako revolver" + desc = "The Bishamonten P100 Mako is a 9 shot revolver with a secondary firing barrel loading shotgun shells. For when you really need something dead. A rare yet deadly collector's item. Uses .38-Special and 12g rounds depending on the barrel." + description_fluff = "The Bishamonten Company operated from roughly 2150-2280 - the height of the first extrasolar colonisation boom - before filing for bankruptcy and selling off its assets to various companies that would go on to become today’s TSCs. \ + Focused on sleek ‘futurist’ designs which have largely fallen out of fashion but remain popular with collectors and people hoping to make some quick thalers from replica weapons. \ + Bishamonten weapons tended to be form over function - despite their flashy looks, most were completely unremarkable one way or another as weapons, and used very standard firing mechanisms - \ + the Mako was a notable exception, so original examples are much sought after." icon_state = "combatrevolver" item_state = "revolver" origin_tech = list(TECH_COMBAT = 2, TECH_MATERIAL = 2) diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index d83f93c2e7..68aeaea695 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -69,7 +69,7 @@ //Actual full digest modes var/tmp/static/list/digest_modes = list(DM_HOLD,DM_DIGEST,DM_ABSORB,DM_DRAIN,DM_SELECT,DM_UNABSORB,DM_HEAL,DM_SHRINK,DM_GROW,DM_SIZE_STEAL,DM_EGG) //Digest mode addon flags - var/tmp/static/list/mode_flag_list = list("Numbing" = DM_FLAG_NUMBING, "Stripping" = DM_FLAG_STRIPPING, "Leave Remains" = DM_FLAG_LEAVEREMAINS, "Muffles" = DM_FLAG_THICKBELLY, "Affect Worn Items" = DM_FLAG_AFFECTWORN, "Jams Sensors" = DM_FLAG_JAMSENSORS, "Complete Absorb" = DM_FLAG_FORCEPSAY, "Slow Body Digestion" = DM_FLAG_SLOWBODY) //CHOMPEdit + var/tmp/static/list/mode_flag_list = list("Numbing" = DM_FLAG_NUMBING, "Stripping" = DM_FLAG_STRIPPING, "Leave Remains" = DM_FLAG_LEAVEREMAINS, "Muffles" = DM_FLAG_THICKBELLY, "Affect Worn Items" = DM_FLAG_AFFECTWORN, "Jams Sensors" = DM_FLAG_JAMSENSORS, "Complete Absorb" = DM_FLAG_FORCEPSAY, "Slow Body Digestion" = DM_FLAG_SLOWBODY, "Muffle Items" = DM_FLAG_MUFFLEITEMS) //CHOMPEdit //Item related modes var/tmp/static/list/item_digest_modes = list(IM_HOLD,IM_DIGEST_FOOD,IM_DIGEST,IM_DIGEST_PARALLEL) diff --git a/code/modules/vore/eating/bellymodes_vr.dm b/code/modules/vore/eating/bellymodes_vr.dm index 5eb6b4ebfc..7d6591202b 100644 --- a/code/modules/vore/eating/bellymodes_vr.dm +++ b/code/modules/vore/eating/bellymodes_vr.dm @@ -228,10 +228,18 @@ //Thickbelly flag if((mode_flags & DM_FLAG_THICKBELLY) && !H.muffled) H.muffled = TRUE + //CHOMPEdit Start - Fix muffled sometimes being sticky. + else if(!(mode_flags & DM_FLAG_THICKBELLY) && H.muffled) + H.muffled = FALSE + //CHOMPEdit End //Force psay if((mode_flags & DM_FLAG_FORCEPSAY) && !H.forced_psay && H.absorbed) H.forced_psay = TRUE + //CHOMPEdit Start - Fix forcepsay sometimes being sticky. + else if(!(mode_flags & DM_FLAG_FORCEPSAY) && H.forced_psay) + H.forced_psay = FALSE + //CHOMPEdit End //Worn items flag if(mode_flags & DM_FLAG_AFFECTWORN) diff --git a/code/modules/vore/eating/leave_remains_vr.dm b/code/modules/vore/eating/leave_remains_vr.dm index fedbfdb92c..21a211993c 100644 --- a/code/modules/vore/eating/leave_remains_vr.dm +++ b/code/modules/vore/eating/leave_remains_vr.dm @@ -24,6 +24,24 @@ skull_type = /obj/item/weapon/digestion_remains/skull/teshari /datum/species/vox skull_type = /obj/item/weapon/digestion_remains/skull/vox +//CHOMPadd start +/datum/species/monkey + skull_type = /obj/item/weapon/digestion_remains/skull +/datum/species/monkey/tajaran + skull_type = /obj/item/weapon/digestion_remains/skull/tajaran +/datum/species/monkey/unathi + skull_type = /obj/item/weapon/digestion_remains/skull/unathi +/datum/species/monkey/skrell + skull_type = /obj/item/weapon/digestion_remains/skull/skrell +/datum/species/monkey/shark + skull_type = /obj/item/weapon/digestion_remains/skull/akula +/datum/species/monkey/sparra + skull_type = /obj/item/weapon/digestion_remains/skull/rapala +/datum/species/monkey/vulpkanin + skull_type = /obj/item/weapon/digestion_remains/skull/vulpkanin +/datum/species/monkey/sergal + skull_type = /obj/item/weapon/digestion_remains/skull/sergal +//CHOMPadd end. /obj/belly/proc/handle_remains_leaving(var/mob/living/M) if(!ishuman(M)) //Are we even humanoid? @@ -46,7 +64,7 @@ if(H.species.skull_type) new H.species.skull_type(src, owner, H) //CHOMPEdit skull_amount-- - + if(skull_amount && H.species.selects_bodytype) // We still haven't found correct skull... if(H.species.base_species == SPECIES_HUMAN) diff --git a/icons/_nanomaps/southern_cross_nanomap_z1.png b/icons/_nanomaps/southern_cross_nanomap_z1.png index 6dd87ed95a..f35fe969c5 100644 Binary files a/icons/_nanomaps/southern_cross_nanomap_z1.png and b/icons/_nanomaps/southern_cross_nanomap_z1.png differ diff --git a/icons/inventory/back/mob_vox.dmi b/icons/inventory/back/mob_vox.dmi new file mode 100644 index 0000000000..b3c7e2dde1 Binary files /dev/null and b/icons/inventory/back/mob_vox.dmi differ diff --git a/icons/inventory/ears/mob_vox.dmi b/icons/inventory/ears/mob_vox.dmi new file mode 100644 index 0000000000..09fea15502 Binary files /dev/null and b/icons/inventory/ears/mob_vox.dmi differ diff --git a/icons/inventory/eyes/mob_vox.dmi b/icons/inventory/eyes/mob_vox.dmi index e021abfd67..4a22391b11 100644 Binary files a/icons/inventory/eyes/mob_vox.dmi and b/icons/inventory/eyes/mob_vox.dmi differ diff --git a/icons/inventory/face/mob_vox.dmi b/icons/inventory/face/mob_vox.dmi index 29b7d76ef9..de6101e2a7 100644 Binary files a/icons/inventory/face/mob_vox.dmi and b/icons/inventory/face/mob_vox.dmi differ diff --git a/icons/inventory/feet/mob_vox.dmi b/icons/inventory/feet/mob_vox.dmi index f4a67eef83..8512234e6d 100644 Binary files a/icons/inventory/feet/mob_vox.dmi and b/icons/inventory/feet/mob_vox.dmi differ diff --git a/icons/inventory/hands/mob_vox.dmi b/icons/inventory/hands/mob_vox.dmi index 091447613f..936dbc337a 100644 Binary files a/icons/inventory/hands/mob_vox.dmi and b/icons/inventory/hands/mob_vox.dmi differ diff --git a/icons/inventory/head/mob_vox.dmi b/icons/inventory/head/mob_vox.dmi index b380fb7f3b..c1fa4ed377 100644 Binary files a/icons/inventory/head/mob_vox.dmi and b/icons/inventory/head/mob_vox.dmi differ diff --git a/icons/inventory/suit/mob_vox.dmi b/icons/inventory/suit/mob_vox.dmi index c2866cc7cd..0702ce5337 100644 Binary files a/icons/inventory/suit/mob_vox.dmi and b/icons/inventory/suit/mob_vox.dmi differ diff --git a/icons/inventory/uniform/mob_vox.dmi b/icons/inventory/uniform/mob_vox.dmi index 870fa34d38..9b727a2c43 100644 Binary files a/icons/inventory/uniform/mob_vox.dmi and b/icons/inventory/uniform/mob_vox.dmi differ diff --git a/icons/mob/raptorborg/raptor.dmi b/icons/mob/raptorborg/raptor.dmi new file mode 100644 index 0000000000..742f3ecfee Binary files /dev/null and b/icons/mob/raptorborg/raptor.dmi differ diff --git a/icons/mob/vore/taurs_ch.dmi b/icons/mob/vore/taurs_ch.dmi index 0d8a62706b..c27a0fd2b7 100644 Binary files a/icons/mob/vore/taurs_ch.dmi and b/icons/mob/vore/taurs_ch.dmi differ diff --git a/maps/groundbase/groundbase_events.dm b/maps/groundbase/groundbase_events.dm index 8a75ea58d4..05af598058 100644 --- a/maps/groundbase/groundbase_events.dm +++ b/maps/groundbase/groundbase_events.dm @@ -41,7 +41,7 @@ new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Lore News", /datum/event/lore_news, 400), new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Vermin Infestation",/datum/event/infestation, 50, list(ASSIGNMENT_JANITOR = 25), 1), new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Wallrot", /datum/event/wallrot, 0, list(ASSIGNMENT_ENGINEER = 30), 1, min_jobs = list(ASSIGNMENT_ENGINEER = 1)), - new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Passing Wildlife", /datum/event/roaming_wildlife, 30, list(ASSIGNMENT_SECURITY = 15), min_jobs = list(ASSIGNMENT_SECURITY = 1)) + new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Passing Wildlife", /datum/event/roaming_wildlife, 40, list(ASSIGNMENT_SECURITY = 20), min_jobs = list(ASSIGNMENT_SECURITY = 1)) ) add_disabled_events(list( new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Ian Storm", /datum/event/ianstorm, 1, list(), 1), @@ -67,7 +67,7 @@ new /datum/event_meta(EVENT_LEVEL_MODERATE, "Drone Pod Drop", /datum/event/drone_pod_drop, 40, list(ASSIGNMENT_SCIENTIST = 40), 1), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Morph Spawn", /datum/event/morph_spawn, 75, list(ASSIGNMENT_ANY = 5), 0), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Maintenance Predator", /datum/event/maintenance_predator, 100, list(ASSIGNMENT_ANY = 5), 0), - new /datum/event_meta(EVENT_LEVEL_MODERATE, "Roaming Wildlife", /datum/event/roaming_wildlife, 0, list(ASSIGNMENT_SECURITY = 15, ASSIGNMENT_MEDICAL = 5), min_jobs = list(ASSIGNMENT_SECURITY = 2)) + new /datum/event_meta(EVENT_LEVEL_MODERATE, "Roaming Wildlife", /datum/event/roaming_wildlife, 20, list(ASSIGNMENT_SECURITY = 20, ASSIGNMENT_MEDICAL = 5), min_jobs = list(ASSIGNMENT_SECURITY = 2)) ) add_disabled_events(list( new /datum/event_meta(EVENT_LEVEL_MODERATE, "Appendicitis", /datum/event/spontaneous_appendicitis, 0, list(ASSIGNMENT_MEDICAL = 30), 1), diff --git a/maps/southern_cross/overmap/shuttles.dm b/maps/southern_cross/overmap/shuttles.dm index 11fe6a847f..d98ce7495a 100644 --- a/maps/southern_cross/overmap/shuttles.dm +++ b/maps/southern_cross/overmap/shuttles.dm @@ -4,6 +4,7 @@ name = "Stargazer" warmup_time = 1 current_location = "stargazer_dock" + docking_controller_tag = "stargazer" shuttle_area = /area/shuttle/stargazer fuel_consumption = 2 move_direction = NORTH @@ -25,8 +26,9 @@ name = "Baby_mammoth" warmup_time = 5 current_location = "baby_mammoth_dock" + docking_controller_tag = "shuttle4_shuttle" shuttle_area = /area/shuttle/baby_mammoth - fuel_consumption = 5 + fuel_consumption = 2 move_direction = NORTH /obj/effect/overmap/visitable/ship/landable/baby_mammoth @@ -46,8 +48,9 @@ name = "Ursula" warmup_time = 2 current_location = "ursula_dock" + docking_controller_tag = "ursula" shuttle_area = /area/shuttle/ursula - fuel_consumption = 3 + fuel_consumption = 2 move_direction = NORTH /obj/effect/overmap/visitable/ship/landable/ursula @@ -67,6 +70,7 @@ name = "Needle" warmup_time = 0 current_location = "needle_dock" + docking_controller_tag = "needle" shuttle_area = /area/shuttle/needle fuel_consumption = 1 move_direction = NORTH @@ -88,6 +92,7 @@ name = "Echidna" warmup_time = 4 current_location = "echidna_dock" + docking_controller_tag = "echidna" shuttle_area = /area/shuttle/echidna fuel_consumption = 2 move_direction = NORTH @@ -102,4 +107,4 @@ /obj/machinery/computer/shuttle_control/explore/echidna name = "short jump console" shuttle_tag = "Echidna" - req_one_access = list(access_pilot) \ No newline at end of file + req_one_access = list(access_pilot) diff --git a/maps/southern_cross/southern_cross-1.dmm b/maps/southern_cross/southern_cross-1.dmm index 8c49169831..3c3f2f1de6 100644 --- a/maps/southern_cross/southern_cross-1.dmm +++ b/maps/southern_cross/southern_cross-1.dmm @@ -31,7 +31,7 @@ "aaM" = (/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod2/station) "aaN" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/camera/network/first_deck{c_tag = "Hangar Two - Fore Port"; dir = 4},/turf/simulated/floor/tiled/monotile,/area/hangar/two) "aaQ" = (/obj/machinery/door/firedoor/border_only,/obj/effect/wingrille_spawn/reinforced,/turf/simulated/floor/plating,/area/teleporter/firstdeck) -"aaR" = (/obj/structure/flora/pottedplant/smelly,/obj/effect/floor_decal/spline/fancy{dir = 10},/turf/simulated/floor/carpet/sblucarpet,/area/teleporter/firstdeck) +"aaR" = (/obj/structure/table/glass,/obj/effect/floor_decal/spline/fancy{dir = 10},/obj/item/toy/plushie/white_cat{pixel_x = 2; pixel_y = 5},/turf/simulated/floor/carpet/sblucarpet,/area/teleporter/firstdeck) "aaT" = (/obj/effect/floor_decal/steeldecal/monofloor,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/teleporter/firstdeck) "aaU" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/steel_grid,/area/teleporter/firstdeck) "aaX" = (/obj/structure/bed/chair{dir = 1},/obj/machinery/light,/turf/simulated/shuttle/floor/white,/area/shuttle/large_escape_pod2/station) @@ -171,8 +171,8 @@ "agk" = (/obj/structure/closet/emcloset,/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/auxdockfore) "agl" = (/turf/simulated/shuttle/wall,/area/shuttle/escape_pod1/station) "agm" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4; health = 1e+006},/turf/simulated/shuttle/plating,/area/shuttle/escape_pod1/station) -"agq" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/green/border{dir = 8},/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled,/area/teleporter/firstdeck) -"agr" = (/obj/structure/table/glass,/obj/effect/floor_decal/spline/fancy{dir = 8},/turf/simulated/floor/carpet/sblucarpet,/area/teleporter/firstdeck) +"agq" = (/obj/machinery/disposal,/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/green/border{dir = 8},/obj/machinery/status_display{pixel_y = 31},/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor/tiled,/area/teleporter/firstdeck) +"agr" = (/obj/structure/bed/chair/sofa/right,/obj/machinery/light{dir = 1},/obj/effect/floor_decal/spline/fancy{dir = 8},/turf/simulated/floor/carpet/sblucarpet,/area/teleporter/firstdeck) "agv" = (/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 22},/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/green/border{dir = 8},/turf/simulated/floor/tiled,/area/teleporter/firstdeck) "agy" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/catwalk,/turf/simulated/floor/plating,/area/maintenance/firstdeck/foreport) "agD" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor,/area/maintenance/firstdeck/aftport) @@ -188,7 +188,7 @@ "agR" = (/obj/effect/floor_decal/industrial/warning/corner,/obj/random/trash,/turf/simulated/floor/plating,/area/maintenance/firstdeck/centralport) "agT" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/plating,/area/maintenance/firstdeck/centralport) "agU" = (/obj/effect/floor_decal/industrial/warning,/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/maintenance/firstdeck/centralport) -"agW" = (/obj/machinery/vending/wallmed1{name = "NanoMed Wall"; pixel_x = -27},/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/green/border{dir = 8},/turf/simulated/floor/tiled,/area/teleporter/firstdeck) +"agW" = (/obj/machinery/vending/wallmed1{name = "NanoMed Wall"; pixel_x = -27},/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/green/border{dir = 8},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/structure/flora/pottedplant/smelly,/turf/simulated/floor/tiled,/area/teleporter/firstdeck) "agZ" = (/obj/machinery/hologram/holopad,/obj/effect/floor_decal/industrial/outline/grey,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/dark,/area/teleporter/firstdeck) "ahh" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/rust,/obj/random/junk,/turf/simulated/floor/tiled/steel_dirty,/area/construction/firstdeck/construction2) "ahi" = (/turf/simulated/floor/plating,/area/construction/firstdeck/construction2) @@ -204,7 +204,7 @@ "ahx" = (/obj/item/weapon/extinguisher,/turf/simulated/floor/plating,/area/maintenance/firstdeck/centralport) "ahy" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/plating,/area/maintenance/firstdeck/centralport) "ahA" = (/obj/structure/window/reinforced{dir = 4; health = 1e+006},/turf/simulated/shuttle/floor,/area/shuttle/large_escape_pod2/station) -"ahC" = (/obj/effect/floor_decal/borderfloor{dir = 6},/obj/effect/floor_decal/corner/red/border{dir = 6},/obj/structure/closet/secure_closet/security,/obj/machinery/light{dir = 4},/obj/machinery/camera/network/security{c_tag = "CP - Office"; dir = 1},/turf/simulated/floor/tiled,/area/teleporter/firstdeck) +"ahC" = (/obj/machinery/light{dir = 4},/obj/structure/closet/secure_closet/guncabinet{anchored = 1; req_one_access = list(1,19)},/obj/effect/floor_decal/borderfloor{dir = 5},/obj/effect/floor_decal/corner/red/border{dir = 5},/turf/simulated/floor/tiled,/area/teleporter/firstdeck) "ahF" = (/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 9},/turf/simulated/floor/tiled,/area/teleporter/firstdeck) "ahH" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/random/mob/mouse,/obj/structure/catwalk,/turf/simulated/floor/plating,/area/maintenance/firstdeck/foreport) "ahK" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/door/airlock/glass_external{frequency = 1379; icon_state = "door_locked"; id_tag = "d1fore_port2_inner"; locked = 1; name = "Dock Internal Airlock"; req_access = list(13)},/obj/machinery/atmospherics/pipe/simple/hidden{dir = 4},/turf/simulated/floor/tiled/dark,/area/hallway/primary/firstdeck/auxdockfore) @@ -871,7 +871,7 @@ "aRa" = (/obj/effect/floor_decal/borderfloor/corner{dir = 1},/obj/effect/floor_decal/corner/green/bordercorner{dir = 1},/obj/machinery/light/spot{dir = 8},/turf/simulated/floor/tiled,/area/hangar/two) "aRd" = (/obj/machinery/newscaster{pixel_y = 30},/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/blue/border{dir = 1},/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/auxdockaft) "aRf" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/auxdockaft) -"aRh" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "qpdld"; name = "Checkpoint Lockdown"; opacity = 0},/obj/machinery/door/airlock/glass{id_tag = "qpdoorin"; name = "Inner Checkpoint Airlock"},/turf/simulated/floor/tiled/steel_grid,/area/teleporter/firstdeck) +"aRh" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "qpdld"; name = "Checkpoint Lockdown"; opacity = 0},/obj/machinery/door/airlock/glass{id_tag = "qpdoorin"; name = "Inner Checkpoint Airlock"; normalspeed = 0},/turf/simulated/floor/tiled/steel_grid,/area/teleporter/firstdeck) "aRl" = (/obj/machinery/door/airlock/glass_external{frequency = 1380; icon_state = "door_locked"; id_tag = "exp_sling_hatch"; locked = 1; name = "Carrier Sling Hatch"; req_access = list(); req_one_access = list(5,43,67)},/turf/simulated/shuttle/floor/darkred,/area/shuttle/expoutpost/station) "aRr" = (/obj/machinery/computer/secure_data{dir = 8},/obj/machinery/alarm{dir = 8; pixel_x = 22},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/red/border{dir = 4},/turf/simulated/floor/tiled,/area/security/checkpoint3) "aRs" = (/obj/effect/shuttle_landmark/southern_cross/sling_station,/turf/simulated/shuttle/floor/darkred,/area/shuttle/expoutpost/station) @@ -1038,7 +1038,7 @@ "bzn" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/status_display/supply_display{pixel_y = -32},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/obj/machinery/camera/network/cargo{c_tag = "CRG - Cargo Bay Aft"; dir = 1; name = "security camera"},/turf/simulated/floor/tiled,/area/quartermaster/storage) "bzX" = (/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/turf/simulated/floor/tiled,/area/quartermaster/storage) "bBA" = (/obj/structure/table/steel,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/item/weapon/storage/briefcase/inflatable{pixel_x = 3; pixel_y = 6},/turf/simulated/floor/tiled/steel_dirty,/area/engineering/auxiliary_engineering) -"bBI" = (/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/teleporter/firstdeck) +"bBI" = (/obj/machinery/door/airlock/security{name = "Checkpoint Office"; req_one_access = list(1,19)},/obj/machinery/door/firedoor/glass,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/steel_grid,/area/teleporter/firstdeck) "bBQ" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/green/border{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/turf/simulated/floor/tiled,/area/teleporter/firstdeck) "bCF" = (/obj/machinery/atmospherics/pipe/simple/hidden{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/catwalk,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/turf/simulated/floor/plating,/area/maintenance/firstdeck/aftstarboard) "bCN" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/effect/floor_decal/borderfloor,/obj/effect/floor_decal/corner/brown/border,/turf/simulated/floor/tiled,/area/quartermaster/storage) @@ -1070,7 +1070,7 @@ "bMN" = (/obj/machinery/atmospherics/pipe/simple/visible/supply{dir = 9},/obj/machinery/atmospherics/pipe/simple/visible/scrubbers{dir = 4},/obj/effect/floor_decal/industrial/warning/full,/turf/simulated/floor/plating,/area/engineering/auxiliary_engineering) "bMX" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/monotile,/area/hangar/two) "bNe" = (/obj/effect/floor_decal/corner_steel_grid{dir = 5},/obj/effect/floor_decal/spline/plain{dir = 1},/turf/simulated/floor/tiled,/area/rnd/xenobiology) -"bNT" = (/obj/machinery/hologram/holopad,/obj/effect/floor_decal/industrial/outline/grey,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/dark,/area/teleporter/firstdeck) +"bNT" = (/obj/machinery/hologram/holopad,/obj/effect/floor_decal/industrial/outline/grey,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/dark,/area/teleporter/firstdeck) "bOw" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/obj/machinery/camera/network/telecom{c_tag = "TCOMMS - SMES Room"; dir = 1},/obj/machinery/firealarm{dir = 1; pixel_y = -25},/turf/simulated/floor/tiled/dark,/area/tcomm/tcomfoyer) "bON" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/mob/living/simple_mob/animal/passive/mouse/brown/Tom,/turf/simulated/floor/tiled/dark,/area/security/nuke_storage) "bOS" = (/obj/machinery/atmospherics/pipe/simple/visible/universal{dir = 4},/turf/simulated/floor/tiled/steel_dirty,/area/engineering/auxiliary_engineering) @@ -1083,7 +1083,7 @@ "bST" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{req_access = null; req_one_access = null},/turf/simulated/floor/plating,/area/storage/emergency_storage/firstdeck/fs_emergency) "bTj" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 8},/obj/random/mob/mouse,/turf/simulated/floor/plating,/area/maintenance/firstdeck/aftstarboard) "bUU" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/effect/floor_decal/industrial/warning/corner{dir = 4},/turf/simulated/floor/plating,/area/maintenance/firstdeck/forestarboard) -"bVz" = (/obj/structure/table/glass,/obj/item/toy/plushie/white_cat{desc = "A rather chubby looking white cat plushy. Oddly enough it looks hungry."; name = "Frostella Plushie"; pixel_x = 2; pixel_y = 5},/obj/effect/floor_decal/spline/fancy{dir = 8},/turf/simulated/floor/carpet/sblucarpet,/area/teleporter/firstdeck) +"bVz" = (/obj/structure/table/glass,/obj/effect/floor_decal/spline/fancy{dir = 8},/turf/simulated/floor/carpet/sblucarpet,/area/teleporter/firstdeck) "bVF" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 6},/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/elevator) "bWv" = (/obj/machinery/atmospherics/pipe/manifold/visible/red{dir = 1},/obj/machinery/meter,/turf/simulated/floor/tiled/steel_dirty,/area/engineering/auxiliary_engineering) "bWN" = (/obj/structure/bed/chair,/obj/machinery/light{dir = 1},/turf/simulated/shuttle/floor/white,/area/shuttle/large_escape_pod1/station) @@ -1107,7 +1107,7 @@ "cfo" = (/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plating,/area/maintenance/firstdeck/foreport) "cfp" = (/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/green/border{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber/on,/turf/simulated/floor/tiled,/area/teleporter/firstdeck) "cfU" = (/obj/effect/floor_decal/industrial/warning{dir = 10},/turf/simulated/floor/holofloor/tiled/dark,/area/teleporter/firstdeck) -"chy" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "qpdld"; name = "Checkpoint Lockdown"; opacity = 0},/obj/machinery/door/airlock/glass{id_tag = "qpdoorout"; name = "Outer Checkpoint Airlock"},/turf/simulated/floor/tiled/steel_grid,/area/teleporter/firstdeck) +"chy" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "qpdld"; name = "Checkpoint Lockdown"; opacity = 0},/obj/machinery/door/airlock/glass{id_tag = "qpdoorout"; name = "Outer Checkpoint Airlock"; normalspeed = 0},/turf/simulated/floor/tiled/steel_grid,/area/teleporter/firstdeck) "chC" = (/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/door/airlock{name = "Unisex Restrooms"},/turf/simulated/floor/tiled/steel_grid,/area/teleporter/firstdeck) "chO" = (/obj/structure/table/standard,/obj/item/device/t_scanner,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/storage/box/lights/mixed,/turf/simulated/floor/plating,/area/storage/emergency_storage/firstdeck/aft_emergency) "chQ" = (/obj/structure/sign/directions/engineering{dir = 1; pixel_y = 10},/obj/structure/sign/directions/cargo{dir = 1},/obj/structure/sign/directions/security{dir = 1; pixel_y = -10},/turf/simulated/wall,/area/hallway/primary/firstdeck/auxdockaft) @@ -1167,7 +1167,7 @@ "cEg" = (/obj/structure/closet/emcloset/legacy,/turf/simulated/floor/tiled,/area/expoutpost/stationshuttle) "cFh" = (/obj/effect/floor_decal/borderfloor{dir = 9},/obj/effect/floor_decal/corner/red/border{dir = 9},/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 22},/obj/item/device/radio/intercom/department/security{dir = 8; icon_override = "secintercom"; pixel_x = -21},/obj/structure/table/reinforced,/obj/machinery/recharger/wallcharger{pixel_x = 5; pixel_y = 33},/turf/simulated/floor/tiled,/area/teleporter/firstdeck) "cGE" = (/obj/effect/floor_decal/industrial/outline/grey,/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/dark,/area/teleporter/firstdeck) -"cHp" = (/obj/structure/bed/chair/sofa{dir = 8},/turf/simulated/floor/carpet/sblucarpet,/area/teleporter/firstdeck) +"cHp" = (/obj/structure/bed/chair/sofa/corner,/obj/machinery/ai_status_display{pixel_y = 31},/turf/simulated/floor/carpet/sblucarpet,/area/teleporter/firstdeck) "cIq" = (/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/red/border{dir = 1},/obj/machinery/computer/security{pixel_x = 5; pixel_y = 9},/obj/machinery/button/remote/blast_door{id = "qpwld"; name = "Desk Lockdown"; pixel_x = -4; pixel_y = 24; req_one_access = list(1,19)},/obj/machinery/button/remote/blast_door{id = "qpdld"; name = "Door Lockdown"; pixel_x = 5; pixel_y = 24; req_one_access = list(1,19)},/obj/machinery/button/flasher{id = "gatewaycheckpointflash"; name = "Gateway Checkpoint flasher button"; pixel_x = 17; pixel_y = 22; req_one_access = list(1,19)},/turf/simulated/floor/tiled,/area/teleporter/firstdeck) "cIr" = (/obj/effect/floor_decal/borderfloor/corner,/obj/effect/floor_decal/corner/green/bordercorner,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/turf/simulated/floor/tiled,/area/teleporter/firstdeck) "cJx" = (/obj/machinery/door/firedoor/border_only,/obj/effect/wingrille_spawn/reinforced,/turf/simulated/floor/plating,/area/quartermaster/storage) @@ -1244,7 +1244,7 @@ "dBE" = (/obj/machinery/door/firedoor/border_only,/obj/effect/wingrille_spawn/reinforced,/turf/simulated/floor/plating,/area/rnd/xenobiology/xenoflora_isolation) "dBI" = (/obj/machinery/door/airlock/glass{name = "Central Access"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled/steel_grid,/area/hallway/primary/firstdeck/ascenter) "dDr" = (/obj/machinery/flasher{id = "gatewaycheckpointflash"; name = "Gateway Checkpoint Mounted flash"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/turf/simulated/floor/tiled/monotile,/area/teleporter/firstdeck) -"dEi" = (/obj/effect/floor_decal/spline/fancy,/obj/machinery/camera/network/security{c_tag = "CP - Lounge"; dir = 8},/turf/simulated/floor/carpet/sblucarpet,/area/teleporter/firstdeck) +"dEi" = (/obj/effect/floor_decal/spline/fancy,/obj/machinery/camera/network/security{c_tag = "CP - Lounge"; dir = 8},/obj/structure/bed/chair/sofa/left{dir = 8},/turf/simulated/floor/carpet/sblucarpet,/area/teleporter/firstdeck) "dEs" = (/obj/machinery/camera/network/first_deck{c_tag = "Hangar Two - Exploration Locker Room Two"; dir = 4},/obj/structure/closet/secure_closet/guncabinet{req_one_access = null},/obj/machinery/alarm{pixel_y = 22},/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/weapon/gun/energy/locked/phasegun/pistol,/obj/item/weapon/gun/energy/locked/phasegun,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/clothing/accessory/permit/gun/planetside,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/obj/item/weapon/cell/device/weapon,/turf/simulated/floor/tiled,/area/hangar/lockerroomtwo) "dFO" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/maintenance{req_access = null; req_one_access = null},/turf/simulated/floor/plating,/area/storage/emergency_storage/firstdeck/fp_emergency) "dGO" = (/obj/machinery/alarm{dir = 8; pixel_x = 22},/obj/effect/floor_decal/corner_steel_grid{dir = 5},/turf/simulated/floor/tiled,/area/teleporter/firstdeck) @@ -1289,7 +1289,7 @@ "dVO" = (/obj/machinery/portable_atmospherics/hydroponics,/obj/machinery/atmospherics/portables_connector,/obj/effect/landmark{name = "blobstart"},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora_isolation) "dVP" = (/obj/structure/reagent_dispensers/watertank/high,/obj/item/weapon/reagent_containers/glass/bucket,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora_isolation) "dVQ" = (/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 8},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/teleporter/firstdeck) -"dVT" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled,/area/teleporter/firstdeck) +"dVT" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/effect/floor_decal/borderfloor/corner,/obj/effect/floor_decal/corner/red/bordercorner,/turf/simulated/floor/tiled,/area/teleporter/firstdeck) "dVU" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass{name = "Checkpoint Prep Room"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/steel_grid,/area/teleporter/firstdeck) "dVV" = (/obj/machinery/portable_atmospherics/canister/oxygen,/obj/effect/floor_decal/industrial/warning{dir = 8},/turf/simulated/floor/holofloor/tiled/dark,/area/teleporter/firstdeck) "dVW" = (/obj/item/device/t_scanner,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/storage/box/lights/mixed,/obj/structure/table/steel,/obj/random/maintenance/engineering,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/obj/structure/catwalk,/turf/simulated/floor/plating,/area/storage/emergency_storage/firstdeck/fp_emergency) @@ -1437,7 +1437,7 @@ "dZr" = (/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 4},/turf/simulated/floor/tiled/hydro,/area/rnd/xenobiology/xenoflora_isolation) "dZs" = (/obj/machinery/portable_atmospherics/canister/nitrogen,/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 9},/obj/machinery/alarm{dir = 8; pixel_x = 22},/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/tiled/techmaint,/area/rnd/xenobiology/xenoflora_isolation) "dZt" = (/obj/structure/closet/emcloset,/obj/random/maintenance/medical,/obj/random/maintenance/medical,/turf/simulated/floor/plating,/area/maintenance/firstdeck/foreport) -"dZu" = (/obj/machinery/door/airlock/security{name = "Checkpoint Office"; req_one_access = list(1,19)},/obj/machinery/door/firedoor/glass,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/steel_grid,/area/teleporter/firstdeck) +"dZu" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/teleporter/firstdeck) "dZv" = (/obj/effect/wingrille_spawn/reinforced,/obj/machinery/door/firedoor/glass,/turf/simulated/floor/plating,/area/teleporter/firstdeck) "dZw" = (/obj/effect/floor_decal/borderfloor/corner{dir = 4},/obj/effect/floor_decal/corner/green/bordercorner{dir = 4},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/tiled,/area/teleporter/firstdeck) "dZx" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/machinery/atmospherics/pipe/manifold/hidden/supply,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/teleporter/firstdeck) @@ -1511,7 +1511,7 @@ "edO" = (/obj/machinery/door/airlock/glass{name = "Central Access"},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled/steel_grid,/area/hallway/primary/firstdeck/elevator) "edU" = (/obj/machinery/firealarm{pixel_y = 24},/obj/machinery/camera/network/first_deck{c_tag = "First Deck - Central Ring 8"; dir = 8},/turf/simulated/floor/tiled/dark,/area/hallway/primary/firstdeck/apcenter) "eeh" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating,/area/maintenance/firstdeck/foreport) -"eew" = (/obj/machinery/disposal,/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/green/border{dir = 8},/obj/machinery/status_display{pixel_y = 31},/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor/tiled,/area/teleporter/firstdeck) +"eew" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/effect/floor_decal/borderfloor/corner,/obj/effect/floor_decal/corner/red/bordercorner,/turf/simulated/floor/tiled,/area/teleporter/firstdeck) "eeZ" = (/obj/structure/grille,/obj/structure/window/reinforced/full,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4; health = 1e+006},/turf/simulated/shuttle/plating,/area/shuttle/escape_pod3/station) "efa" = (/obj/random/trash_pile,/turf/simulated/floor/plating,/area/maintenance/firstdeck/aftport) "efm" = (/obj/structure/table/rack/shelf,/obj/item/clothing/shoes/boots/winter,/obj/item/clothing/suit/storage/hooded/wintercoat,/obj/item/weapon/tank/emergency/oxygen/engi,/obj/item/clothing/mask/gas,/obj/effect/floor_decal/borderfloor{dir = 6},/obj/effect/floor_decal/corner/green/border{dir = 6},/turf/simulated/floor/tiled,/area/teleporter/firstdeck) @@ -1636,10 +1636,10 @@ "fHj" = (/obj/structure/table/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/machinery/button/remote/blast_door{id = "xenobio3station"; name = "Containment Blast Doors"; pixel_y = 4; req_access = list(55)},/turf/simulated/floor/tiled/dark,/area/rnd/xenobiology) "fHQ" = (/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 5},/turf/simulated/floor/tiled/hydro,/area/rnd/xenobiology/xenoflora) "fHV" = (/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/effect/floor_decal/borderfloor{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/effect/floor_decal/corner/green/border{dir = 8},/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/aft) -"fID" = (/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "qpdld"; name = "Checkpoint Lockdown"; opacity = 0},/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass{id_tag = "qpdoorout"; name = "Outer Checkpoint Airlock"},/turf/simulated/floor/tiled/steel_grid,/area/teleporter/firstdeck) +"fID" = (/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "qpdld"; name = "Checkpoint Lockdown"; opacity = 0},/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass{id_tag = "qpdoorout"; name = "Outer Checkpoint Airlock"; normalspeed = 0},/turf/simulated/floor/tiled/steel_grid,/area/teleporter/firstdeck) "fKj" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled/monotile,/area/hallway/primary/firstdeck/aft) "fKK" = (/obj/structure/closet/crate/hydroponics/prespawned,/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 4},/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/borderfloorwhite{dir = 8},/obj/effect/floor_decal/corner/green/border{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) -"fKT" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/green/border{dir = 8},/obj/machinery/light{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/turf/simulated/floor/tiled,/area/teleporter/firstdeck) +"fKT" = (/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/green/border{dir = 8},/obj/machinery/light{dir = 8},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/machinery/alarm{dir = 4; pixel_x = -22},/turf/simulated/floor/tiled,/area/teleporter/firstdeck) "fLW" = (/obj/machinery/vending/hydronutrients{categories = 3; dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) "fLZ" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/firstdeck/aftport) "fMR" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/effect/floor_decal/borderfloorwhite/corner{dir = 8},/obj/effect/floor_decal/corner/purple/bordercorner{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology) @@ -1660,7 +1660,7 @@ "fXf" = (/obj/structure/closet/secure_closet/hydroponics{req_access = list(47)},/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 4},/obj/machinery/light,/obj/item/weapon/gun/energy/floragun,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) "fXY" = (/obj/structure/closet/secure_closet/hydroponics{req_access = list(47)},/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 4},/obj/item/device/multitool,/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) "fYh" = (/obj/structure/closet/emcloset/legacy,/obj/machinery/atmospherics/pipe/simple/hidden/yellow{dir = 9},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora) -"fYU" = (/obj/effect/floor_decal/borderfloor/corner,/obj/effect/floor_decal/corner/red/bordercorner,/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/tiled,/area/teleporter/firstdeck) +"fYU" = (/obj/effect/floor_decal/borderfloor/corner{dir = 4},/obj/effect/floor_decal/corner/red/bordercorner{dir = 4},/turf/simulated/floor/tiled,/area/teleporter/firstdeck) "fZp" = (/obj/machinery/atmospherics/pipe/simple/visible{dir = 6},/obj/machinery/meter,/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora_isolation) "fZr" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/obj/structure/window/reinforced{dir = 8},/obj/effect/floor_decal/industrial/warning{dir = 5},/turf/simulated/floor/tiled/dark,/area/rnd/xenobiology) "fZV" = (/obj/machinery/atmospherics/binary/pump{dir = 4; name = "Port to Isolation"},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology/xenoflora_isolation) @@ -2219,7 +2219,7 @@ "nwj" = (/obj/item/stack/tile/wood,/obj/machinery/alarm{pixel_y = 22},/turf/simulated/floor,/area/construction/firstdeck/construction4) "nyb" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled/monotile,/area/hallway/primary/firstdeck/aft) "nyj" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/auxdockaft) -"nyV" = (/obj/structure/bed/chair/sofa/left{dir = 8},/turf/simulated/floor/carpet/sblucarpet,/area/teleporter/firstdeck) +"nyV" = (/obj/structure/bed/chair/sofa/black{dir = 8},/turf/simulated/floor/carpet/sblucarpet,/area/teleporter/firstdeck) "nzc" = (/obj/effect/floor_decal/industrial/warning/corner,/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod_berth{frequency = 1380; id_tag = "large_escape_pod_1_berth"; pixel_y = -26; tag_door = "large_escape_pod_1_berth_hatch"},/obj/machinery/light,/turf/simulated/floor/tiled,/area/hallway/secondary/escape/firstdeck/ep_starboard) "nzf" = (/turf/simulated/floor/plating,/area/construction/firstdeck/construction4) "nAo" = (/obj/structure/shuttle/engine/propulsion/burst{dir = 8},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/escape_pod5/station) @@ -2237,7 +2237,7 @@ "nNZ" = (/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_y = 24},/obj/structure/cable{d2 = 2; icon_state = "0-2"},/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/red/border{dir = 1},/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/hallway/secondary/firstdeck/research_access) "nPX" = (/obj/machinery/status_display{layer = 4; pixel_y = 32},/obj/machinery/camera/network/first_deck{c_tag = "First Deck - Research Access Hallway"},/obj/effect/floor_decal/borderfloor{dir = 1},/obj/effect/floor_decal/corner/white/border{dir = 1},/obj/effect/floor_decal/borderfloor/corner2{dir = 1},/obj/effect/floor_decal/corner/white/bordercorner2{dir = 1},/turf/simulated/floor/tiled,/area/hallway/secondary/firstdeck/research_access) "nQI" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 4},/turf/simulated/floor/tiled,/area/hallway/secondary/firstdeck/research_access) -"nRa" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/teleporter/firstdeck) +"nRa" = (/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 9},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/teleporter/firstdeck) "nRi" = (/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled,/area/hallway/secondary/firstdeck/research_access) "nSk" = (/obj/machinery/light/small{dir = 8},/obj/structure/closet/emcloset,/obj/structure/catwalk,/turf/simulated/floor/plating,/area/maintenance/firstdeck/centralstarboard) "nSt" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/elevator) @@ -2331,7 +2331,7 @@ "phf" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/structure/filingcabinet,/obj/machinery/camera/network/telecom{c_tag = "TCOMMS - Main Computer Room"; dir = 1},/turf/simulated/floor/tiled,/area/tcomm/computer) "pil" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/obj/effect/floor_decal/techfloor{dir = 8},/turf/simulated/floor/tiled/techfloor/grid,/area/hallway/primary/firstdeck/elevator) "pje" = (/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 5},/turf/simulated/floor/tiled,/area/tcomm/computer) -"pjl" = (/obj/structure/bed/chair/sofa/right,/obj/machinery/light{dir = 1},/obj/effect/floor_decal/spline/fancy{dir = 8},/turf/simulated/floor/carpet/sblucarpet,/area/teleporter/firstdeck) +"pjl" = (/obj/effect/floor_decal/borderfloor{dir = 6},/obj/effect/floor_decal/corner/red/border{dir = 6},/obj/machinery/camera/network/security{c_tag = "CP - Office"; dir = 1},/obj/structure/closet/secure_closet/security,/turf/simulated/floor/tiled,/area/teleporter/firstdeck) "pjq" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled/monotile,/area/hallway/primary/firstdeck/apcenter) "pmq" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/structure/extinguisher_cabinet{pixel_x = 28},/turf/simulated/floor/tiled,/area/tcomm/computer) "pmB" = (/obj/machinery/deployable/barrier,/obj/effect/floor_decal/industrial/hatch/yellow,/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled/monotile,/area/security/checkpoint3) @@ -2425,7 +2425,7 @@ "qkX" = (/obj/machinery/door/firedoor/glass,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/airlock/glass{name = "Pilot EVA Storage"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled/steel_grid,/area/ai_monitored/storage/eva/aux) "qlf" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/effect/floor_decal/borderfloor/corner{dir = 8},/obj/effect/floor_decal/corner/green/bordercorner{dir = 8},/obj/machinery/light{dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/monotile,/area/hallway/primary/firstdeck/port) "qls" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/port) -"qlN" = (/obj/structure/cable,/obj/machinery/power/apc{name = "south bump"; pixel_y = -24},/obj/machinery/light_switch{pixel_x = 11; pixel_y = -24},/obj/effect/floor_decal/steeldecal/steel_decals_central6,/obj/structure/table/reinforced,/obj/machinery/recharger,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/turf/simulated/floor/tiled,/area/hangar/lockerroomone) +"qlN" = (/obj/structure/cable,/obj/machinery/power/apc{name = "south bump"; pixel_y = -24},/obj/machinery/light_switch{pixel_x = 11; pixel_y = -24},/obj/effect/floor_decal/steeldecal/steel_decals_central6,/obj/structure/table/reinforced,/obj/machinery/recharger,/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/item/weapon/storage/box/cdeathalarm_kit,/turf/simulated/floor/tiled,/area/hangar/lockerroomone) "qlQ" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/light,/turf/simulated/floor/tiled,/area/hangar/lockerroomone) "qmM" = (/obj/machinery/atmospherics/pipe/manifold/visible/cyan,/obj/effect/floor_decal/rust,/turf/simulated/floor/tiled/steel_dirty,/area/engineering/auxiliary_engineering) "qnD" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled,/area/quartermaster/storage) @@ -2444,7 +2444,6 @@ "qvR" = (/obj/effect/wingrille_spawn/reinforced,/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/plating,/area/hallway/primary/firstdeck/fpcenter) "qwb" = (/turf/simulated/shuttle/wall/hard_corner,/area/shuttle/large_escape_pod1/station) "qxf" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor/tiled,/area/hallway/primary/firstdeck/aft) -"qxq" = (/obj/structure/bed/chair/sofa/corner,/obj/machinery/ai_status_display{pixel_y = 31},/turf/simulated/floor/carpet/sblucarpet,/area/teleporter/firstdeck) "qyi" = (/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/wall/r_wall,/area/hallway/primary/firstdeck/auxdockaft) "qyZ" = (/obj/effect/floor_decal/industrial/hatch/yellow,/turf/simulated/floor/tiled/monotile,/area/hallway/primary/firstdeck/aft) "qzO" = (/obj/machinery/atmospherics/pipe/simple/hidden/universal,/turf/simulated/floor/plating,/area/maintenance/substation/firstdeck) @@ -2611,7 +2610,7 @@ "szm" = (/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/effect/floor_decal/borderfloorwhite{dir = 4},/obj/effect/floor_decal/corner/purple/border{dir = 4},/turf/simulated/floor/tiled/white,/area/rnd/xenobiology) "sAo" = (/obj/effect/floor_decal/industrial/warning{dir = 8},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/door/window/brigdoor/westleft{name = "Containment Pen"; req_access = list(47)},/obj/effect/floor_decal/industrial/warning{dir = 4},/turf/simulated/floor/tiled/techmaint,/area/rnd/xenobiology) "sAE" = (/obj/effect/floor_decal/industrial/hatch/yellow,/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/door/window/brigdoor/eastright{name = "Containment Pen"; req_access = list(47)},/obj/machinery/door/blast/regular{density = 0; icon_state = "pdoor0"; id = "xenobio2station"; name = "Containment Blast Doors"; opacity = 0},/turf/simulated/floor/tiled/techmaint,/area/rnd/xenobiology) -"sDV" = (/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "qpdld"; name = "Checkpoint Lockdown"; opacity = 0},/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass{id_tag = "qpdoorin"; name = "Inner Checkpoint Airlock"},/turf/simulated/floor/tiled/steel_grid,/area/teleporter/firstdeck) +"sDV" = (/obj/machinery/door/blast/regular{density = 0; dir = 4; icon_state = "pdoor0"; id = "qpdld"; name = "Checkpoint Lockdown"; opacity = 0},/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass{id_tag = "qpdoorin"; name = "Inner Checkpoint Airlock"; normalspeed = 0},/turf/simulated/floor/tiled/steel_grid,/area/teleporter/firstdeck) "sEo" = (/mob/living/simple_mob/slime/xenobio,/turf/simulated/floor/reinforced,/area/rnd/xenobiology) "sEE" = (/obj/machinery/portable_atmospherics/powered/pump/filled,/obj/structure/catwalk,/turf/simulated/floor/plating,/area/maintenance/firstdeck/centralport) "sER" = (/obj/structure/catwalk,/obj/random/trash,/turf/simulated/floor/plating,/area/maintenance/firstdeck/centralport) @@ -3169,8 +3168,8 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaxrXvYivYivYivYivYivYiaafaafaaaaaaaaaaClaauaVWaiYgMAlcwcysauhwIApsMvpNbMqxdNaiYeSRiTCcGEipWdVVaiYaiIbErdVWdVXcZtcZtaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadKjdVYdVZcsEdWaarXdKjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabQpbQpdWbdWdbSHdWedWfaMhdUudWgaVhaViaViaVlaVlaVlaVlaVlaVlaVlaViaVibnVdWhdVdaMhdVsdWjdWkdWldVHdWmdWpdWqdWrdWGdWMdWrdWNdWOdWPdWQdWrdWqdWSdWTdVHdWUdWVdWYdWVdWYdWVdWZdzBaaaaaaaaavYiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaxrXaafaaaaaaaafaaaaaaaaaaafsFQaaaaaaaaaaCldXadXbaiYaaAcSKdVTaaGaiYaRhiEpsDVaiYaiYakiakPcIrnCBaiYaiYaadbErcZtcZtcZtaaaaaaaaaaaaaaaaaadXfdXfacuacuacudXfdXgdXhdXicsEdXjdXkdXldXmdXndXndXndXmdXmaaaaaaaaaaaaaaaaaabQpbQpbQpbSHdXodXpaMhdXqdXraVhaViaVlaVlaVlaVlaVlaVlaVlaVlaVlaVibnVdXFdXGaMhdXHdXIdXJdXKdVKdXLdXLdXLdXLdXLdXLdXLdXLdXLdXMdXLdXLdXLdXLdXNdVHdXOdXPdXQdXPdXQdXPdXQdzBaaaaaaaaavYiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaavYiaaaaaaaaaaafaaaaaaaaaaafaaaaaaaaaaaatOoaFfajEaiYmuZdVQfYUahCaiYrynvpNahFaiYftbvlUiTCdZyaiYaiYajndXUdXVaFfaaaaaaaaaeanaaaaaaacuacudXfdXWdXXdXYdXZdYadYbdYcdYdcsEdYedYfdYjdYkdYldYmdYndYodXmdXndXnaaaaaaeanaaaaaaaaaaCddYtdYudYvaMhdUucaqaVhaViaVlaVlaVlaVlaVlaVlaVlaVlaVlaVibnVcaqdVdaMhdYwdYxdYydYzdYAdYCdYDdYEdYFdYGdYGdZddZedZfdZgdYGdYFdZhdYGdZidZjdZkdZldZndZpdZqdZrdZsdzBaaaaaaaaavYiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaafaaaaaaaaaaafaaaaaaaaaaaatOodZtaTEaiYaiYdZuaiYaiYaiYdZzaaFqQSdVUpKZdZxwBXuXJaiYajnaTEdZFdZHaFfaaaaaaaaaaaaaaaacuacudZJdZKdZLdZMdZNdZOdZPdZQdZRdZSdZTdZUeameaoeapeaqeareaseateaueavdXndXnaaaaaaaaaaaaaaaaCdeaweaxdkjaMhdUucaqaVhaViaVlaVlaVlaVlaVlaVlaVleayaVlaVibnVcaqdVdaMheazeaAeaBeaCdVKeaDeaDeaEeaFeaGeaGeaHeaIeaLeaMeaGeaOeaPeaGeaQeaSeaTeaXeaYebfebgebjecVdzBaaaaaaaaavYiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafkwtkwtkwtkwtkwtkwtkwtkwtkwtkwtkwtkwtkwttOoeehaVWaiYeewbBIpjlqxqaiYfzFgnlabsaiYqjIvIomZrefmaiYafNajnagyefNaFfaaaaaaaaaaaaacuacudZJehpehXehXelZemjemEenSeoheqxerIeseeubeuiewWexseyueyDeyJeBpeBpeCbeavdXndXnaaaaaaaaaaaaaCdeCSdgHaMhaMhaMheESaVhaViaVlaVlaVlaVlaVlaVlaVlaVlaVlaVibnVeEXaMhaMheFTeHoeaBeHMdVJeKQePUeTNePUeTNeVueVQeWceXReZVeTNeTNeTNeTNfaudVHfawfazfaXfazfazfbEfcNdzBaafaafaafvYivYiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaafaaaaaaaaaaafaaaaaaaaaaaatOodZtaTEaiYmuZdZueewpjlaiYdZzaaFqQSdVUpKZdZxwBXuXJaiYajnaTEdZFdZHaFfaaaaaaaaaaaaaaaacuacudZJdZKdZLdZMdZNdZOdZPdZQdZRdZSdZTdZUeameaoeapeaqeareaseateaueavdXndXnaaaaaaaaaaaaaaaaCdeaweaxdkjaMhdUucaqaVhaViaVlaVlaVlaVlaVlaVlaVleayaVlaVibnVcaqdVdaMheazeaAeaBeaCdVKeaDeaDeaEeaFeaGeaGeaHeaIeaLeaMeaGeaOeaPeaGeaQeaSeaTeaXeaYebfebgebjecVdzBaaaaaaaaavYiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafkwtkwtkwtkwtkwtkwtkwtkwtkwtkwtkwtkwtkwttOoeehaVWaiYaiYbBIaiYaiYaiYfzFgnlabsaiYqjIvIomZrefmaiYafNajnagyefNaFfaaaaaaaaaaaaacuacudZJehpehXehXelZemjemEenSeoheqxerIeseeubeuiewWexseyueyDeyJeBpeBpeCbeavdXndXnaaaaaaaaaaaaaCdeCSdgHaMhaMhaMheESaVhaViaVlaVlaVlaVlaVlaVlaVlaVlaVlaVibnVeEXaMhaMheFTeHoeaBeHMdVJeKQePUeTNePUeTNeVueVQeWceXReZVeTNeTNeTNeTNfaudVHfawfazfaXfazfazfbEfcNdzBaafaafaafvYivYiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadWXdWXabmabmabmabgabmabmabgabmabmabmgyrtOoaauaVWaiYagqnRaagrcHpdZvaaxagZazGaiYaiYaiYaiYaiYaiYaMJajnagyaFfaFfaaaaaaaaaacuacudZJdZJffOdZJfgdfgrfgrfgrfgrfgrfgrfgrfgrfgrfgrfgrfgrwalwalwalfjYeavfkLeaveavdXndXnaaaaaaaaaaCdaCddgHdkjaMhflNflYaVhaViaVlaVlaVlaVlaVlaVlaVlaVlaVlaVibnVcALcAMaMhfmueaAeaBfsKdVHfuqfvMfxufyffBBfEBfFBfGifHQfKKfLWfQnfXffXYfYhdVHfZpfZVgbwgcqdWYgeKgeYdzBaaaaaaaaaaaavYivYivYiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaeanaaaaaaaaadWXabmgfJgfVggsgiagiOgjzaaCiIrgkbvcsfPgtOoaaDaSfaiYagWbNTbVznyVdZvpCfdoadZwaiYgoAxOidXegoAaiYgwvajnagyaClaaaaaaaaaaaaacudZJehpehXgwxgwUfgrfgrfgrfgrfgrfgrfgrfgrfgrfgrfgrfgrfgrwalwalwalwalgwXgAoeBpeCbeavdXnaaaaaaaaaaaaaGkdgHgCnaMhdUugCtaVhaViaVlaVlaVlaViaViaViaVlaVlaVlaVibnVcaqdVdaMhgDzgDBgEegGZdVHgHQdVKgIxdVKdVHdVHgITgIWgJsgKhdVHdVKgIxdVKgMTdVHgNJgRHgRTgTWgXHgXOgYBdzBaaaaaaaaaaaaaafaaavYivYiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadWXgYFhenaaMaaMaaMaaMaaMaaMaaMahAvcsfPgtOoajnaVWaiYfKThfaaaRdEiaiYdXRaaTxrzaaUuYjguxoBKdGOaiYaEnajnahHaClaaaaaaaaadXfdXfhhiffOdZJhhuhjjfgrfgrfgrhkNhkPhkYhlShmahpVhqphlShqBhsIhvPhzuhzvwalhCIhFIeavfkLhGGdXmdXmaaaaaaaaaaGkdgHhJcaMhhLrgCtaVhaViaVlaVlaViaViaViaViaViaVlaVlaVibnVcaqhOgaMhhRQhSPhVlhVGhWPhZIicjhVGhVGicVifeihkijeijJinCiovhVGisrisyisNdVsitVitVitVitVitVitVitVitVitVaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/maps/southern_cross/southern_cross-10.dmm b/maps/southern_cross/southern_cross-10.dmm index d0a88e5b7b..6a3e0e0e15 100644 --- a/maps/southern_cross/southern_cross-10.dmm +++ b/maps/southern_cross/southern_cross-10.dmm @@ -222,6 +222,7 @@ layer = 4; name = "Wilderness Shelter Shutters" }, +/obj/structure/fans/tiny, /turf/simulated/floor/wood/sif, /area/surface/outpost/shelter) "bd" = ( diff --git a/maps/southern_cross/southern_cross-12.dmm b/maps/southern_cross/southern_cross-12.dmm index ab12e85c9b..cf170464a3 100644 --- a/maps/southern_cross/southern_cross-12.dmm +++ b/maps/southern_cross/southern_cross-12.dmm @@ -67,6 +67,7 @@ layer = 4; name = "Wilderness Shelter Shutters" }, +/obj/structure/fans/tiny, /turf/simulated/floor/wood/sif, /area/surface/outpost/shelter/utilityroom) "cv" = ( diff --git a/maps/southern_cross/southern_cross-2.dmm b/maps/southern_cross/southern_cross-2.dmm index 08e8f17959..910b07d910 100644 --- a/maps/southern_cross/southern_cross-2.dmm +++ b/maps/southern_cross/southern_cross-2.dmm @@ -4501,7 +4501,7 @@ }, /obj/item/device/multitool, /obj/item/clothing/head/welding, -/obj/item/weapon/storage/belt/utility, +/obj/item/weapon/storage/belt/utility/full, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) "ans" = ( @@ -23451,6 +23451,10 @@ /area/security/aid_station) "bve" = ( /obj/structure/table/rack, +/obj/item/weapon/storage/box/cdeathalarm_kit{ + pixel_x = -3; + pixel_y = 2 + }, /obj/item/weapon/storage/box/seccarts{ pixel_x = 3; pixel_y = 2 @@ -30384,6 +30388,7 @@ /obj/item/device/t_scanner, /obj/random/tech_supply, /obj/random/tech_supply, +/obj/item/weapon/storage/belt/utility/full, /turf/simulated/floor/plating, /area/maintenance/security_port) "bRu" = ( @@ -77263,7 +77268,7 @@ /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/brown/bordercorner, /obj/machinery/mineral/equipment_vendor{ - dir = 4; + dir = 8; pixel_x = 4 }, /turf/simulated/floor/tiled, diff --git a/maps/southern_cross/southern_cross-3.dmm b/maps/southern_cross/southern_cross-3.dmm index 32a7fe4080..bd200ea391 100644 --- a/maps/southern_cross/southern_cross-3.dmm +++ b/maps/southern_cross/southern_cross-3.dmm @@ -250,6 +250,7 @@ "crb" = (/obj/structure/lattice,/obj/structure/cable{d1 = 32; icon_state = "32-1"},/obj/machinery/door/firedoor/border_only,/turf/simulated/open,/area/maintenance/thirddeck/foreport) "crM" = (/obj/structure/cable/cyan{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/greengrid,/area/ai) "crP" = (/obj/machinery/door/airlock/engineering{name = "SMES Room"; req_one_access = list(11,24)},/obj/machinery/door/firedoor/border_only,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plating,/area/maintenance/thirddeck/dormsport{name = "Third Deck Aft Port Maintenance"}) +"csD" = (/obj/structure/fans/tiny,/turf/simulated/floor/tiled/steel_grid,/area/crew_quarters/seconddeck/gym) "cuz" = (/obj/effect/floor_decal/industrial/warning/corner{dir = 1},/obj/structure/loot_pile/maint/boxfort,/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating,/area/maintenance/thirddeck/forestarboard) "cvI" = (/obj/structure/ladder,/obj/effect/floor_decal/industrial/outline/yellow,/turf/simulated/floor/plating,/area/maintenance/thirddeck/forestarboard) "cwd" = (/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 6},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/effect/floor_decal/borderfloor{dir = 8},/obj/effect/floor_decal/corner/green/border{dir = 8},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/crew_quarters/seconddeck/gym) @@ -1393,7 +1394,7 @@ "nbg" = (/obj/machinery/button/remote/airlock{id = "Dorms6"; name = "Bolt Control"; pixel_x = -30; specialfunctions = 4},/obj/structure/closet/secure_closet/personal/cabinet,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_6) "nbo" = (/obj/effect/floor_decal/borderfloor/corner{dir = 8},/obj/effect/floor_decal/corner/blue/bordercorner{dir = 8},/turf/simulated/floor/tiled,/area/bridge) "ncI" = (/obj/structure/bed/chair,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/bridge) -"ndI" = (/obj/machinery/door/airlock/multi_tile/metal{dir = 2; id_tag = "sauna1"; name = "Sauna"},/obj/machinery/door/firedoor/multi_tile/glass{dir = 1},/turf/simulated/floor/tiled/steel_grid,/area/crew_quarters/seconddeck/gym) +"ndI" = (/obj/machinery/door/airlock/multi_tile/metal{dir = 2; id_tag = "sauna1"; name = "Sauna"},/obj/machinery/door/firedoor/multi_tile/glass{dir = 1},/obj/structure/fans/tiny,/turf/simulated/floor/tiled/steel_grid,/area/crew_quarters/seconddeck/gym) "neu" = (/obj/effect/floor_decal/borderfloor/corner,/obj/effect/floor_decal/corner/blue/bordercorner,/turf/simulated/floor/tiled,/area/bridge) "nfF" = (/obj/machinery/button/remote/blast_door{id = "bridge blast"; name = "Bridge Blastdoors"; pixel_y = -36},/obj/machinery/button/windowtint{id = "bridge_center"; pixel_x = -11; pixel_y = -24},/obj/machinery/keycard_auth{pixel_y = -24},/obj/effect/floor_decal/borderfloor{dir = 6},/obj/effect/floor_decal/corner/blue/border{dir = 6},/obj/effect/floor_decal/borderfloor/corner2{dir = 6},/obj/effect/floor_decal/corner/blue/bordercorner2{dir = 6},/turf/simulated/floor/tiled,/area/bridge) "nfH" = (/obj/structure/window/reinforced{dir = 8; health = 1e+006},/obj/effect/floor_decal/borderfloor{dir = 10},/obj/effect/floor_decal/corner/white/border{dir = 10},/obj/effect/floor_decal/borderfloor/corner2{dir = 8},/obj/effect/floor_decal/corner/white/bordercorner2{dir = 8},/obj/item/modular_computer/console/preset/medical{dir = 1},/turf/simulated/floor/tiled,/area/bridge) @@ -2038,7 +2039,7 @@ "tAX" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/tiled,/area/hallway/primary/thirddeck/aft) "tBw" = (/turf/simulated/wall/r_wall,/area/crew_quarters/toilet) "tCJ" = (/obj/machinery/door/firedoor/border_only,/obj/effect/wingrille_spawn/reinforced,/turf/simulated/floor/tiled/white,/area/medical/first_aid_station/thirddeck) -"tCS" = (/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_y = 24},/obj/machinery/light_switch{pixel_x = 11; pixel_y = 24},/obj/effect/floor_decal/borderfloorwhite{dir = 1},/obj/effect/floor_decal/corner/paleblue/border{dir = 1},/obj/structure/bed/roller,/obj/structure/cable/yellow{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station/thirddeck) +"tCS" = (/obj/machinery/power/apc{dir = 1; name = "north bump"; pixel_y = 24},/obj/machinery/light_switch{pixel_x = 11; pixel_y = 24},/obj/effect/floor_decal/borderfloorwhite{dir = 1},/obj/effect/floor_decal/corner/paleblue/border{dir = 1},/obj/structure/bed/roller,/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station/thirddeck) "tDd" = (/obj/machinery/ai_status_display{pixel_y = 32},/obj/effect/floor_decal/borderfloorwhite{dir = 1},/obj/effect/floor_decal/corner/paleblue/border{dir = 1},/obj/machinery/sleep_console{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station/thirddeck) "tDp" = (/obj/machinery/firealarm{pixel_y = 24},/obj/effect/floor_decal/borderfloorwhite{dir = 1},/obj/effect/floor_decal/corner/paleblue/border{dir = 1},/obj/machinery/sleeper{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station/thirddeck) "tDY" = (/obj/machinery/atmospherics/unary/vent_pump/on,/turf/simulated/floor/tiled/dark,/area/rnd/research/particleaccelerator) @@ -2089,12 +2090,12 @@ "tYA" = (/obj/structure/railing{dir = 4},/obj/structure/railing{dir = 8},/obj/structure/railing,/obj/machinery/light,/turf/simulated/open,/area/hallway/primary/thirddeck/aft) "tZd" = (/obj/structure/table/standard,/obj/machinery/firealarm{layer = 3.3; pixel_y = 26},/obj/random/coin,/obj/random/snack,/obj/item/toy/xmastree,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_12) "tZh" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/effect/floor_decal/steeldecal/steel_decals4,/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 10},/turf/simulated/floor/tiled,/area/hallway/primary/thirddeck/aft) -"tZj" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_medical{name = "First-Aid Station"; req_access = newlist(); req_one_access = newlist()},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/steel_grid,/area/medical/first_aid_station/thirddeck) +"tZj" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_medical{name = "First-Aid Station"; req_access = newlist(); req_one_access = newlist()},/obj/structure/cable/green{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/steel_grid,/area/medical/first_aid_station/thirddeck) "tZq" = (/obj/structure/curtain/open/shower,/obj/machinery/shower{dir = 1},/obj/structure/window/basic{dir = 1},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/sleep/vistor_room_12) -"uaQ" = (/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 6},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station/thirddeck) -"ucr" = (/turf/simulated/floor/tiled/white,/area/medical/first_aid_station/thirddeck) -"uct" = (/obj/machinery/hologram/holopad,/obj/effect/floor_decal/industrial/outline/grey,/turf/simulated/floor/tiled/white,/area/medical/first_aid_station/thirddeck) -"ucA" = (/obj/machinery/light{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station/thirddeck) +"uaQ" = (/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 6},/obj/structure/cable/green{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station/thirddeck) +"ucr" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station/thirddeck) +"uct" = (/obj/machinery/hologram/holopad,/obj/effect/floor_decal/industrial/outline/grey,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station/thirddeck) +"ucA" = (/obj/machinery/light{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/turf/simulated/floor/tiled/white,/area/medical/first_aid_station/thirddeck) "ucG" = (/obj/machinery/door/airlock{name = "Unisex Showers"},/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/toilet) "udk" = (/obj/machinery/atmospherics/pipe/simple/hidden,/obj/machinery/door/airlock/glass_external{frequency = 1379; icon_state = "door_locked"; id_tag = "d3_starboard_dorms_inner"; locked = 1; name = "Internal Airlock Access"; req_access = list(13)},/turf/simulated/floor/plating,/area/maintenance/thirddeck/dormsaft{name = "Third Deck Aft Maintenance"}) "udn" = (/obj/machinery/disposal/wall{dir = 4; pixel_x = -37},/obj/structure/disposalpipe/trunk{dir = 4},/turf/simulated/floor/tiled/freezer,/area/crew_quarters/toilet) @@ -2736,7 +2737,7 @@ apcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcap apcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcaqjhtntHbepgaqjapcapcapcepgepgepgapcapcapcapcapcxPkjjKwulrWMuQdsUGsUGrTndbYrnGqGEydirTIsmFsxEkfMmvRmvRmvRrUrrUwrUKrVlrUFrYurYRrZluiKgXCspzscApLesHvsdSqjarHtrHtmNvshamCKshargynSEshUqwlrjSshVapcapcapcapcapcaqjapcapcjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgapcapcapcapcapcepgapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapc apcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcepgepgapcapcapcapcwfRcYVwulrWMwVMrmQrmQdOdqewrnNbBghiFrTIsmFgZMsivwMPwMPwMPsjbsjLwzyskaskHslkoqlsmcjGzsazsbHmeRrYjikQsmyrMhsrasrahKYjWMjQssrasrasrKqaUtcirjSshVapcapcapcapcapcaqjapcapcjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgapcapcapcapcapcaqjapcapcapcrGfapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapc apcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcepgaqjaqjaqjaqjwfRwYTwulrWMrCLrngrngrngdndbzbgnGpVYrTIsmFsxEfKCxEBxEBxEBssCstgqKUsudsuwsuQpXCcwdgnosvmsvwsxwrYjagwpMPgVjatTatTpYapYapYaatTatTpYaqaUsAcrQKshVapcapcapcapcapcaqjaqjaqjjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgapcapcapcaqjapcapcapcapcapcapcapcaqjapcapcapcapctHbhtnapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapc -apcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcrGfapcapcepgapcapcapcapcwfRhvgwulrWMsAMsUGsUGrTnsHcsGXbBgfDVrTIsmFxvgxvgsBYfWLfWLfWLsEfqKUqKZsuwsFopXCeUrxmcxmcxmcxmcrdDwLUryqsSmtfQsIAsJAsJFtfksKteJBsLpqaUpYvsLVqaUapcapcapcapcepgtHbapcapcjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgapcapcapcaqjapcapcapcapcapcapcapcaqjapcapcapcepgepgapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapc +apcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcrGfapcapcepgapcapcapcapcwfRhvgwulrWMsAMsUGsUGrTnsHcsGXbBgfDVrTIsmFxvgxvgsBYfWLfWLfWLsEfqKUqKZsuwsFopXCeUrxmcxmcxmcxmcrdDwLUryqcsDtfQsIAsJAsJFtfksKteJBsLpqaUpYvsLVqaUapcapcapcapcepgtHbapcapcjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgjhgapcapcapcaqjapcapcapcapcapcapcapcaqjapcapcapcepgepgapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapc apcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcsMlapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcxPkqldwulrWMtJGrmQrmQdOdfhsnazsxnwVHoYUbJTwTpbtHkHPsMosNBsOHsOIwzysPMsQcsRwpYakHkiANjmUxIEgnoajOrLCwDFndIlxhmFQhCKhCKhCKsmaspksgqqaUqRaqwlqaUapcapcapctHbepgapcapcapcapcapcaqjapcapcapcaqjapcapcapcaqjapcapcapcaqjapcapcapcapcapcaqjapcapcapcapcapcapcapcaqjapcapcepgepgapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapc apcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapchtnapcapcapcapcxPkpBmkvbrWMrCLrngsUkrngsUXsVKsxnodEdSSdSSdSSsVXwzywzywzywzywzywzysYVpOekPnpYasALhoiqmctbbsZgtadtaotatpYakpZmFQhCKhCKhCKtewsLgsLMqaUpZqqwlqaUaqjaqjaqjepgapcapcapcapcapcapcaqjapcapcapcaqjapcapcapcaqjapcapcapcaqjapcapcaqjaqjepgepgepgaqjykutHbepgepgepgepgepgepgepgapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapc apcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapctHbaqjaqjaqjaqjwfRpBmkvbrWMbBgbBgbBgbBgbBgtgcbBgthNdSSdSSdSSrTItiatiCtjatkItkJkqEtlMtnoqAKaSutnztnztnztnztnztpfsGTcDltpftpftpftpftpftpftpftpftpftBwqaUqwlqaUapcapcapcepgapcapcapcapcapcapcaqjapcapcapcaqjapcapcapcaqjapcepgepgaqjepgepgtHbapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapcapc diff --git a/maps/southern_cross/southern_cross-5.dmm b/maps/southern_cross/southern_cross-5.dmm index 83e13ca438..817f454bf6 100644 --- a/maps/southern_cross/southern_cross-5.dmm +++ b/maps/southern_cross/southern_cross-5.dmm @@ -1093,7 +1093,7 @@ "wS" = (/obj/effect/floor_decal/borderfloor/corner{dir = 1},/obj/effect/floor_decal/corner/white/bordercorner{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 4},/turf/simulated/floor/tiled,/area/surface/outpost/main/corridor/left_lower) "wT" = (/obj/effect/floor_decal/borderfloor/corner{dir = 1},/obj/effect/floor_decal/corner/white/bordercorner{dir = 1},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 5},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 8},/obj/structure/extinguisher_cabinet{pixel_x = -25},/turf/simulated/floor/tiled,/area/surface/outpost/main/gym) "wU" = (/obj/structure/toilet,/obj/structure/window/basic{dir = 4},/turf/simulated/floor/tiled/freezer,/area/surface/outpost/main/dorms/dorm_3) -"wV" = (/obj/structure/closet/secure_closet{name = "hunting locker"; req_one_access = list(1,43)},/obj/item/weapon/gun/energy/netgun,/obj/item/weapon/beartrap/hunting,/obj/item/weapon/material/knife/tacknife/survival,/obj/effect/floor_decal/borderfloor{dir = 8},/obj/item/clothing/shoes/boots/jungle,/obj/effect/floor_decal/corner/purple/border{dir = 8},/obj/machinery/camera/network/main_outpost{c_tag = "MO - Containment Pen"; dir = 4},/turf/simulated/floor/tiled,/area/surface/outpost/main/exploration/containment) +"wV" = (/obj/structure/closet/secure_closet{name = "hunting locker"; req_one_access = list(1,43)},/obj/item/weapon/gun/energy/netgun,/obj/item/weapon/beartrap,/obj/item/weapon/material/knife/tacknife/survival,/obj/effect/floor_decal/borderfloor{dir = 8},/obj/item/clothing/shoes/boots/jungle,/obj/effect/floor_decal/corner/purple/border{dir = 8},/obj/machinery/camera/network/main_outpost{c_tag = "MO - Containment Pen"; dir = 4},/turf/simulated/floor/tiled,/area/surface/outpost/main/exploration/containment) "wW" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/white/border{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/obj/effect/floor_decal/borderfloor/corner2{dir = 5},/obj/effect/floor_decal/corner/white/bordercorner2{dir = 5},/turf/simulated/floor/tiled,/area/surface/outpost/main/corridor/right_lower) "wX" = (/obj/effect/floor_decal/borderfloor{dir = 4},/obj/effect/floor_decal/corner/white/border{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals7{dir = 9},/turf/simulated/floor/tiled,/area/surface/outpost/main/corridor/left_lower) "wY" = (/obj/structure/sign/electricshock,/turf/simulated/wall/r_wall{cached_rad_resistance = 150},/area/surface/outpost/engineering/reactor_smes) @@ -1475,7 +1475,7 @@ "Fj" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/turf/simulated/floor/tiled,/area/surface/outpost/main/corridor/dorms) "Fk" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/wood,/area/surface/outpost/main/dorms/dorm_5) "Fl" = (/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced/full,/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/surface/outpost/main/gym) -"Fm" = (/obj/structure/closet/secure_closet{name = "hunting locker"; req_one_access = list(1,43)},/obj/item/weapon/gun/energy/netgun,/obj/item/weapon/beartrap/hunting,/obj/item/weapon/material/knife/tacknife/survival,/obj/effect/floor_decal/borderfloor{dir = 8},/obj/item/clothing/shoes/boots/jungle,/obj/effect/floor_decal/corner/purple/border{dir = 8},/turf/simulated/floor/tiled,/area/surface/outpost/main/exploration/containment) +"Fm" = (/obj/structure/closet/secure_closet{name = "hunting locker"; req_one_access = list(1,43)},/obj/item/weapon/gun/energy/netgun,/obj/item/weapon/beartrap,/obj/item/weapon/material/knife/tacknife/survival,/obj/effect/floor_decal/borderfloor{dir = 8},/obj/item/clothing/shoes/boots/jungle,/obj/effect/floor_decal/corner/purple/border{dir = 8},/turf/simulated/floor/tiled,/area/surface/outpost/main/exploration/containment) "Fn" = (/obj/item/device/radio/intercom{dir = 1; name = "Station Intercom (General)"; pixel_y = 21},/turf/simulated/floor/tiled,/area/surface/outpost/main/airlock/left_one) "Fo" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 9},/turf/simulated/floor/tiled,/area/surface/outpost/main/corridor) "Fp" = (/obj/effect/floor_decal/steeldecal/steel_decals6{dir = 10},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/cable/blue{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/cable/blue{d1 = 1; d2 = 8; icon_state = "1-8"},/turf/simulated/floor/tiled/freezer,/area/surface/outpost/civilian/pool) diff --git a/maps/southern_cross/southern_cross-7.dmm b/maps/southern_cross/southern_cross-7.dmm index 8c687b0896..dfba8cc7f8 100644 --- a/maps/southern_cross/southern_cross-7.dmm +++ b/maps/southern_cross/southern_cross-7.dmm @@ -2058,6 +2058,7 @@ pixel_y = -24 }, /obj/structure/cable/green, +/obj/structure/cable/green, /turf/simulated/shuttle/plating, /area/shuttle/ursula) "fb" = ( @@ -2912,7 +2913,6 @@ /obj/item/weapon/gun/energy/locked/phasegun/rifle{ pixel_y = -4 }, -/obj/item/weapon/gun/energy/locked/frontier/holdout, /obj/item/clothing/accessory/holster/hip, /obj/item/device/gps, /obj/effect/floor_decal/industrial/outline/grey, @@ -4720,6 +4720,14 @@ "oA" = ( /turf/simulated/shuttle/wall/voidcraft/green, /area/shuttle/stargazer) +"oB" = ( +/obj/structure/table/sifwoodentable, +/obj/item/weapon/paper{ + info = "Heyo, notice from one of the few reaming clean-up crew. Somethings up with the gateway, things seem to be changing. Careful, it's destination might even change at some point."; + name = "Notice" + }, +/turf/simulated/floor/tiled, +/area/expoutpost/prep) "oC" = ( /obj/structure/window/plastitanium/full, /obj/structure/window/reinforced/survival_pod{ @@ -5489,9 +5497,9 @@ dir = 6 }, /obj/structure/cable/green{ - d1 = 2; + d1 = 4; d2 = 8; - icon_state = "2-8" + icon_state = "4-8" }, /turf/simulated/shuttle/floor/yellow, /area/shuttle/ursula) @@ -5504,8 +5512,18 @@ opacity = 1 }, /obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" }, /turf/simulated/shuttle/plating, /area/shuttle/ursula) @@ -5517,11 +5535,11 @@ dir = 1; opacity = 1 }, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, /obj/machinery/power/port_gen/pacman, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, /turf/simulated/shuttle/plating, /area/shuttle/ursula) "qC" = ( @@ -5598,6 +5616,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 6 }, +/obj/structure/cable/blue{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/shuttle/floor/yellow, /area/shuttle/ursula) "qR" = ( @@ -5606,10 +5629,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 8 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/obj/structure/cable/blue{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /turf/simulated/shuttle/floor/yellow, /area/shuttle/ursula) @@ -5619,29 +5642,19 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, /obj/machinery/atmospherics/binary/pump{ dir = 4 }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/blue{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/shuttle/floor/yellow, /area/shuttle/ursula) "qT" = ( @@ -5652,11 +5665,6 @@ /turf/simulated/floor/plating, /area/maintenance/expoutpost/outerportmaint) "qU" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, /obj/structure/closet/walllocker/emerglocker{ dir = 1; pixel_x = 25; @@ -5668,7 +5676,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 10 }, -/obj/structure/cable/green{ +/obj/structure/cable/blue{ d1 = 4; d2 = 8; icon_state = "4-8" @@ -5694,6 +5702,11 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/cable/blue{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/shuttle/plating, /area/shuttle/ursula) "qW" = ( @@ -5710,7 +5723,7 @@ tag_interior_door = "ursula_inner" }, /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/cable/green{ +/obj/structure/cable/blue{ d1 = 4; d2 = 8; icon_state = "4-8" @@ -5734,7 +5747,7 @@ landmark_tag = "ursula_dock"; name = "Ursula Dock" }, -/obj/structure/cable/green{ +/obj/structure/cable/blue{ d1 = 4; d2 = 8; icon_state = "4-8" @@ -5755,7 +5768,7 @@ locked = 1; name = "External Access" }, -/obj/structure/cable/green{ +/obj/structure/cable/blue{ d1 = 4; d2 = 8; icon_state = "4-8" @@ -5936,6 +5949,8 @@ /obj/effect/floor_decal/industrial/warning/cee{ dir = 4 }, +/obj/item/weapon/gun/energy/locked/phasegun/rifle, +/obj/item/weapon/gun/energy/locked/phasegun/rifle, /turf/simulated/shuttle/floor/darkred, /area/shuttle/stargazer) "rw" = ( @@ -8408,14 +8423,20 @@ /obj/structure/sign/poster/nanotrasen{ dir = 1 }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, /turf/simulated/shuttle/plating, /area/shuttle/baby_mammoth) "wI" = ( -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, /obj/machinery/power/port_gen/pacman, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/shuttle/plating, /area/shuttle/baby_mammoth) "wJ" = ( @@ -8424,6 +8445,11 @@ dir = 1 }, /obj/machinery/mech_recharger, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/shuttle/plating, /area/shuttle/baby_mammoth) "wK" = ( @@ -8618,14 +8644,24 @@ pixel_x = -25; pixel_y = 32 }, +/obj/structure/cable/blue{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/shuttle/floor/yellow, /area/shuttle/baby_mammoth) "wY" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/yellow, /obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/blue{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /turf/simulated/shuttle/floor/yellow, /area/shuttle/baby_mammoth) @@ -8633,18 +8669,13 @@ /obj/structure/fuel_port{ pixel_y = -28 }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 8 }, -/obj/structure/cable/green{ - d1 = 1; +/obj/structure/cable/blue{ + d1 = 4; d2 = 8; - icon_state = "1-8" + icon_state = "4-8" }, /turf/simulated/shuttle/floor/yellow, /area/shuttle/baby_mammoth) @@ -8661,28 +8692,33 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, +/obj/structure/cable/blue{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/blue{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/shuttle/floor/black, /area/shuttle/baby_mammoth) "xb" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 10 }, /obj/effect/floor_decal/industrial/warning, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/obj/structure/cable/blue{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /turf/simulated/shuttle/floor/black, /area/shuttle/baby_mammoth) "xc" = ( /obj/effect/floor_decal/industrial/warning, -/obj/structure/cable/green{ +/obj/structure/cable/blue{ d1 = 4; d2 = 8; icon_state = "4-8" @@ -8706,7 +8742,7 @@ locked = 1; name = "Internal Access" }, -/obj/structure/cable/green{ +/obj/structure/cable/blue{ d1 = 4; d2 = 8; icon_state = "4-8" @@ -8719,7 +8755,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/structure/cable/green{ +/obj/structure/cable/blue{ d1 = 4; d2 = 8; icon_state = "4-8" @@ -8739,7 +8775,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/cable/green{ +/obj/structure/cable/blue{ d1 = 4; d2 = 8; icon_state = "4-8" @@ -8766,7 +8802,7 @@ layer = 2.5; name = "window blast shield" }, -/obj/structure/cable/green{ +/obj/structure/cable/blue{ d1 = 4; d2 = 8; icon_state = "4-8" @@ -13165,6 +13201,14 @@ /obj/item/device/cataloguer, /turf/simulated/floor/tiled, /area/expoutpost/prep) +"Nv" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/shuttle/floor/black, +/area/shuttle/baby_mammoth) "Nx" = ( /obj/machinery/atmospherics/portables_connector, /obj/structure/cable/blue{ @@ -45387,7 +45431,7 @@ KN NV Qt iY -TR +oB XO MR LG @@ -45885,7 +45929,7 @@ vr vr vr ws -vr +Nv xb xz xU diff --git a/maps/southern_cross/southern_cross-8.dmm b/maps/southern_cross/southern_cross-8.dmm index 98cd746846..ee82c4f4b1 100644 --- a/maps/southern_cross/southern_cross-8.dmm +++ b/maps/southern_cross/southern_cross-8.dmm @@ -236,7 +236,7 @@ dir = 4; name = "hacked cigarette machine"; prices = list(); - products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) + products = list(/obj/item/weapon/storage/fancy/cigarettes=10,/obj/item/weapon/storage/box/matches=10,/obj/item/weapon/flame/lighter/zippo=4,/obj/item/clothing/mask/smokable/cigarette/cigar/havana=2) }, /turf/simulated/shuttle/floor/black, /area/shuttle/merchant) @@ -251,7 +251,7 @@ contraband = null; dir = 1; name = "Old Vending Machine"; - products = list(/obj/item/device/assembly/prox_sensor = 5, /obj/item/device/assembly/signaler = 4, /obj/item/device/assembly/infra = 4, /obj/item/device/assembly/prox_sensor = 4, /obj/item/weapon/handcuffs = 8, /obj/item/device/flash = 4, /obj/item/weapon/cartridge/signal = 4, /obj/item/clothing/glasses/sunglasses = 4) + products = list(/obj/item/device/assembly/prox_sensor=5,/obj/item/device/assembly/signaler=4,/obj/item/device/assembly/infra=4,/obj/item/device/assembly/prox_sensor=4,/obj/item/weapon/handcuffs=8,/obj/item/device/flash=4,/obj/item/weapon/cartridge/signal=4,/obj/item/clothing/glasses/sunglasses=4) }, /turf/simulated/shuttle/floor/black, /area/shuttle/merchant) @@ -9182,7 +9182,7 @@ dir = 4; name = "hacked cigarette machine"; prices = list(); - products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) + products = list(/obj/item/weapon/storage/fancy/cigarettes=10,/obj/item/weapon/storage/box/matches=10,/obj/item/weapon/flame/lighter/zippo=4,/obj/item/clothing/mask/smokable/cigarette/cigar/havana=2) }, /turf/unsimulated/floor{ icon_state = "dark" @@ -10315,7 +10315,7 @@ /obj/machinery/vending/cigarette{ name = "hacked cigarette machine"; prices = list(); - products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) + products = list(/obj/item/weapon/storage/fancy/cigarettes=10,/obj/item/weapon/storage/box/matches=10,/obj/item/weapon/flame/lighter/zippo=4,/obj/item/clothing/mask/smokable/cigarette/cigar/havana=2) }, /turf/unsimulated/floor{ icon_state = "steel" @@ -10717,7 +10717,7 @@ /area/shuttle/syndicate) "mBJ" = ( /mob/living/simple_mob/animal/passive/cat/space{ - armor_soak = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 100, "bio" = 100, "rad" = 100); + armor_soak = list("melee"=100,"bullet"=100,"laser"=100,"energy"=100,"bomb"=100,"bio"=100,"rad"=100); desc = "They look well taken care of. There is a small scratch mark through the L of their collar that looks like it was made by a claw."; description_antag = "That space suit looks like it can withstand just about any assault. You feel that you will regret hurting this one."; description_fluff = "Back after a very long trip. Their suit smells of adventure!"; @@ -12993,7 +12993,7 @@ /turf/simulated/shuttle/floor/black, /area/shuttle/merchant) "pGr" = ( -/obj/structure/table/reinforced, +/obj/structure/table/steel_reinforced, /obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp, /obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp, /turf/unsimulated/floor{ @@ -13779,7 +13779,7 @@ /obj/machinery/vending/cigarette{ name = "hacked cigarette machine"; prices = list(); - products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) + products = list(/obj/item/weapon/storage/fancy/cigarettes=10,/obj/item/weapon/storage/box/matches=10,/obj/item/weapon/flame/lighter/zippo=4,/obj/item/clothing/mask/smokable/cigarette/cigar/havana=2) }, /turf/simulated/shuttle/floor/voidcraft, /area/shuttle/syndicate) @@ -16304,7 +16304,7 @@ /obj/machinery/vending/assist{ contraband = null; name = "AntagCorpVend"; - products = list(/obj/item/device/assembly/prox_sensor = 5, /obj/item/device/assembly/signaler = 4, /obj/item/device/assembly/infra = 4, /obj/item/device/assembly/prox_sensor = 4, /obj/item/weapon/handcuffs = 8, /obj/item/device/flash = 4, /obj/item/weapon/cartridge/signal = 4, /obj/item/clothing/glasses/sunglasses = 4) + products = list(/obj/item/device/assembly/prox_sensor=5,/obj/item/device/assembly/signaler=4,/obj/item/device/assembly/infra=4,/obj/item/device/assembly/prox_sensor=4,/obj/item/weapon/handcuffs=8,/obj/item/device/flash=4,/obj/item/weapon/cartridge/signal=4,/obj/item/clothing/glasses/sunglasses=4) }, /turf/simulated/shuttle/floor/voidcraft, /area/shuttle/syndicate) @@ -16927,7 +16927,7 @@ /obj/machinery/vending/cigarette{ name = "hacked cigarette machine"; prices = list(); - products = list(/obj/item/weapon/storage/fancy/cigarettes = 10, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/flame/lighter/zippo = 4, /obj/item/clothing/mask/smokable/cigarette/cigar/havana = 2) + products = list(/obj/item/weapon/storage/fancy/cigarettes=10,/obj/item/weapon/storage/box/matches=10,/obj/item/weapon/flame/lighter/zippo=4,/obj/item/clothing/mask/smokable/cigarette/cigar/havana=2) }, /turf/unsimulated/floor{ dir = 5; diff --git a/maps/southern_cross/submaps/gateway/snowfield.dmm b/maps/southern_cross/submaps/gateway/snowfield.dmm index 479a5eb140..555a86ec3b 100644 --- a/maps/southern_cross/submaps/gateway/snowfield.dmm +++ b/maps/southern_cross/submaps/gateway/snowfield.dmm @@ -184,12 +184,13 @@ /turf/simulated/floor/cult, /area/awaymission/snowfield/command/bridge) "aiA" = ( +/obj/structure/catwalk, /obj/effect/decal/cleanable/dirt, -/mob/living/simple_mob/creature/cult/strong{ - devourable = 0 +/mob/living/simple_mob/vore/demonAI/avarn{ + faction = "cult" }, -/turf/simulated/floor/cult, -/area/awaymission/snowfield/command/gateway) +/turf/simulated/floor/tiled/techfloor/grid, +/area/awaymission/snowfield/security/security_cell) "aiX" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -348,6 +349,11 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/techfloor, /area/awaymission/snowfield/public/charger) +"aqV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cult/tome, +/turf/simulated/floor/cult, +/area/awaymission/snowfield/command/gateway) "arp" = ( /obj/machinery/computer/security/engineering, /obj/effect/floor_decal/steeldecal/steel_decals5{ @@ -879,6 +885,7 @@ /obj/machinery/vending/sovietsoda{ dir = 1 }, +/obj/effect/spider/stickyweb, /turf/simulated/floor/tiled/neutral, /area/awaymission/snowfield/medical/staff_room) "aON" = ( @@ -2460,13 +2467,8 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/rdconsole, /obj/item/weapon/circuitboard/destructive_analyzer, /obj/item/weapon/circuitboard/protolathe, -/obj/item/weapon/circuitboard/rdserver{ - pixel_x = 3; - pixel_y = -3 - }, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/techfloor, /area/awaymission/snowfield/engineering/tech_storage) @@ -2872,6 +2874,20 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/steel, /area/awaymission/snowfield/engineering/monitor_room) +"czv" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/catwalk, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spider/stickyweb, +/turf/simulated/floor, +/area/awaymission/snowfield/medical/hallway) "cBr" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -3030,6 +3046,7 @@ /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/green/border, /obj/machinery/light, +/obj/effect/spider/stickyweb, /turf/simulated/floor/tiled/neutral, /area/awaymission/snowfield/medical/hallway) "cJB" = ( @@ -3157,6 +3174,12 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/outdoors/rocks/caves, /area/awaymission/snowfield/hallway/commandhallway) +"cQZ" = ( +/obj/structure/catwalk, +/obj/machinery/light/small, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/tiled/techfloor/grid, +/area/awaymission/snowfield/medical/storage_room) "cRf" = ( /turf/simulated/floor/tiled/steel, /area/awaymission/snowfield/security/warden) @@ -3276,6 +3299,10 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor, /area/awaymission/snowfield/hallway/dormhallway) +"cXK" = ( +/mob/living/simple_mob/animal/giant_spider/lurker, +/turf/simulated/floor/tiled/freezer, +/area/awaymission/snowfield/medical/medical_restroom) "cXL" = ( /obj/effect/floor_decal/corner/lightgrey/diagonal, /obj/structure/bed/chair/wood, @@ -3776,6 +3803,9 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/mob/living/simple_mob/construct/artificer/caster{ + devourable = 0 + }, /turf/simulated/floor/cult, /area/awaymission/snowfield/command/gateway) "dtS" = ( @@ -4056,6 +4086,11 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/awaymission/snowfield/hallway/frontgate_substation) +"dAC" = ( +/obj/machinery/light_construct, +/obj/item/weapon/material/shard, +/turf/simulated/floor/cult, +/area/awaymission/snowfield/command/bsa) "dAW" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -4636,6 +4671,7 @@ /obj/item/weapon/tank/emergency/oxygen/double, /obj/item/clothing/mask/breath, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/spider/stickyweb, /turf/simulated/floor/tiled/techfloor/grid, /area/awaymission/snowfield/medical/storage_room) "dXU" = ( @@ -5039,10 +5075,7 @@ /turf/simulated/floor/tiled/techfloor, /area/awaymission/snowfield/hallway/northhallway) "eoL" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/cult/tome, +/obj/item/weapon/material/shard, /turf/simulated/floor/cult, /area/awaymission/snowfield/command/gateway) "eoU" = ( @@ -5280,13 +5313,11 @@ /obj/effect/floor_decal/borderfloor{ dir = 1 }, -/obj/structure/railing{ - dir = 1 - }, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, /obj/effect/decal/cleanable/dirt, +/obj/item/weapon/material/shard, /turf/simulated/floor/tiled/techfloor, /area/awaymission/snowfield/command/gateway) "ewW" = ( @@ -5359,6 +5390,7 @@ icon_state = "0-4" }, /obj/machinery/light, +/obj/effect/spider/stickyweb, /turf/simulated/floor/tiled/neutral, /area/awaymission/snowfield/medical/surgery) "eAM" = ( @@ -5692,6 +5724,16 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/awaymission/snowfield/engineering/engine) +"eUS" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/item/weapon/material/shard, +/turf/simulated/floor/tiled/techfloor, +/area/awaymission/snowfield/command/gateway) "eVa" = ( /mob/living/simple_mob/vore/sheep, /turf/simulated/floor/outdoors/snow/sif/planetuse, @@ -6272,6 +6314,8 @@ /obj/structure/bed/chair/wood{ dir = 4 }, +/mob/living/simple_mob/animal/giant_spider/webslinger, +/obj/effect/spider/stickyweb, /turf/simulated/floor/tiled/neutral, /area/awaymission/snowfield/medical/staff_room) "fuQ" = ( @@ -6288,6 +6332,20 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/awaymission/snowfield/engineering/primary_storage) +"fve" = ( +/obj/structure/window/reinforced{ + dir = 1; + health = 1e+006 + }, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "snowfield bsa maints"; + opacity = 0 + }, +/obj/item/weapon/material/shard, +/turf/simulated/floor, +/area/awaymission/snowfield/command/bsa) "fwr" = ( /turf/simulated/wall/r_wall, /area/awaymission/snowfield/security/lobby) @@ -6463,6 +6521,10 @@ "fGh" = ( /turf/simulated/wall/r_wall, /area/awaymission/snowfield/public/publicrestroom) +"fGG" = ( +/mob/living/simple_mob/animal/giant_spider/lurker, +/turf/simulated/floor/tiled/freezer, +/area/awaymission/snowfield/medical/patient_restroom) "fIy" = ( /obj/item/weapon/stool, /obj/item/weapon/paper/awaygate/snowfield/evacuation_order, @@ -6689,6 +6751,20 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/techfloor/grid, /area/awaymission/snowfield/command/bridge) +"fQJ" = ( +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 + }, +/obj/effect/floor_decal/corner/green, +/obj/effect/floor_decal/corner/green/border{ + dir = 8 + }, +/obj/effect/floor_decal/corner/blue{ + dir = 4 + }, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/tiled/neutral, +/area/awaymission/snowfield/medical/staff_room) "fRn" = ( /obj/machinery/button/remote/blast_door{ id = "Armoury"; @@ -7805,6 +7881,9 @@ /obj/effect/floor_decal/industrial/danger{ dir = 8 }, +/mob/living/simple_mob/construct/artificer{ + devourable = 0 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/awaymission/snowfield/command/bsa) "gLD" = ( @@ -7823,6 +7902,18 @@ }, /turf/simulated/floor/tiled/freezer, /area/awaymission/snowfield/public/publicrestroom) +"gMa" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "snowfield bsa maints"; + opacity = 0 + }, +/obj/item/weapon/material/shard, +/obj/item/weapon/material/shard, +/obj/structure/grille/broken, +/turf/simulated/floor, +/area/awaymission/snowfield/command/bsa) "gMg" = ( /obj/structure/grille/rustic, /obj/item/weapon/material/shard{ @@ -8388,6 +8479,9 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, +/mob/living/simple_mob/creature/cult/strong{ + devourable = 0 + }, /turf/simulated/floor/tiled/techfloor, /area/awaymission/snowfield/command/gateway) "hjv" = ( @@ -8769,6 +8863,19 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/freezer, /area/awaymission/snowfield/public/publicrestroom) +"hAp" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "snowfield bsa maints"; + opacity = 0 + }, +/obj/item/weapon/material/shard, +/obj/item/weapon/material/shard, +/obj/item/weapon/material/shard, +/obj/structure/grille/broken, +/turf/simulated/floor, +/area/awaymission/snowfield/command/bsa) "hAH" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -9943,6 +10050,10 @@ }, /turf/simulated/floor/tiled/neutral, /area/awaymission/snowfield/public/toolstorage1) +"iDn" = ( +/mob/living/simple_mob/construct/harvester/greater, +/turf/simulated/floor/cult, +/area/awaymission/snowfield/command/bsa) "iDu" = ( /turf/simulated/wall/r_wall, /area/awaymission/snowfield/medical/morgue) @@ -10284,6 +10395,15 @@ temperature = 80 }, /area/awaymission/snowfield/command/server) +"iPB" = ( +/obj/effect/floor_decal/corner/green/diagonal, +/obj/effect/floor_decal/corner/blue/diagonal{ + dir = 4 + }, +/mob/living/simple_mob/animal/giant_spider/tunneler, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/tiled/neutral, +/area/awaymission/snowfield/medical/staff_room) "iPD" = ( /obj/machinery/door/airlock/security{ desc = "You may don't want to go in there by force."; @@ -10889,18 +11009,6 @@ }, /turf/simulated/floor/tiled/freezer, /area/awaymission/snowfield/dorms/dorm1) -"jnn" = ( -/obj/structure/table/rack{ - dir = 8; - layer = 2.9 - }, -/obj/item/weapon/circuitboard/robotics{ - pixel_x = -2; - pixel_y = 2 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/techfloor, -/area/awaymission/snowfield/engineering/secure_tech_storage) "jnY" = ( /obj/structure/bed/chair/comfy/black{ dir = 4 @@ -10984,6 +11092,16 @@ }, /turf/simulated/floor/tiled/freezer, /area/awaymission/snowfield/public/cafeteria_restroom) +"jtj" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/catwalk, +/mob/living/simple_mob/animal/giant_spider, +/turf/simulated/floor, +/area/awaymission/snowfield/medical/hallway) "jtE" = ( /obj/structure/sink{ dir = 8; @@ -11287,6 +11405,19 @@ /obj/structure/bed/chair/oldsofa, /turf/simulated/floor/wood, /area/awaymission/snowfield/checkpointunpowered) +"jEF" = ( +/obj/structure/window/reinforced{ + health = 1e+006 + }, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "snowfield bsa maints"; + opacity = 0 + }, +/obj/item/weapon/material/shard, +/turf/simulated/floor, +/area/awaymission/snowfield/command/bsa) "jEJ" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -11462,6 +11593,7 @@ }, /obj/structure/table/woodentable, /obj/item/device/radio/phone, +/obj/effect/spider/stickyweb, /turf/simulated/floor/tiled/neutral, /area/awaymission/snowfield/medical/staff_room) "jLM" = ( @@ -12042,6 +12174,16 @@ "kig" = ( /turf/simulated/wall/r_wall, /area/awaymission/snowfield/hallway/frontgate_substation) +"kiD" = ( +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/catwalk, +/mob/living/simple_mob/animal/giant_spider/frost, +/turf/simulated/floor, +/area/awaymission/snowfield/medical/hallway) "kiK" = ( /turf/simulated/floor/flesh, /area/awaymission/snowfield/command/bridge) @@ -12546,6 +12688,18 @@ }, /turf/simulated/floor/plating, /area/awaymission/snowfield/checkpointunpowered) +"kIH" = ( +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals_central2, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_mob/animal/giant_spider/carrier, +/turf/simulated/floor/tiled/steel, +/area/awaymission/snowfield/medical/storage_room) "kIX" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -12670,6 +12824,12 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/techfloor/grid, /area/awaymission/snowfield/engineering/tech_storage) +"kNi" = ( +/obj/effect/floor_decal/techfloor/orange, +/obj/structure/catwalk, +/obj/item/weapon/material/shard, +/turf/simulated/floor/tiled/techfloor/grid, +/area/awaymission/snowfield/command/bsa) "kNn" = ( /obj/machinery/door/airlock{ name = "Unisex Restrooms" @@ -12893,6 +13053,7 @@ /obj/structure/bed/chair/wood{ dir = 4 }, +/obj/effect/spider/stickyweb, /turf/simulated/floor/tiled/neutral, /area/awaymission/snowfield/medical/staff_room) "kYe" = ( @@ -13366,6 +13527,9 @@ "loh" = ( /obj/machinery/light_construct, /obj/effect/decal/cleanable/dirt, +/mob/living/simple_mob/creature/cult/strong{ + devourable = 0 + }, /turf/simulated/floor/cult, /area/awaymission/snowfield/command/gateway) "lom" = ( @@ -13571,6 +13735,21 @@ /obj/machinery/light/small, /turf/simulated/floor/outdoors/snow/sif/planetuse, /area/awaymission/snowfield/outside) +"lxg" = ( +/obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/effect/floor_decal/steeldecal/steel_decals_central2{ + dir = 1 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/warning, +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_mob/animal/giant_spider/carrier, +/turf/simulated/floor/tiled/steel, +/area/awaymission/snowfield/medical/storage_room) "lxq" = ( /obj/machinery/shower{ pixel_y = 18 @@ -13755,10 +13934,17 @@ }, /turf/simulated/floor/tiled, /area/awaymission/snowfield/command/observatory) +"lDF" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cult/tome, +/turf/simulated/floor/tiled/techfloor, +/area/awaymission/snowfield/command/gateway) "lDX" = ( /obj/machinery/iv_drip, /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/green/border, +/obj/effect/spider/stickyweb, /turf/simulated/floor/tiled/neutral, /area/awaymission/snowfield/medical/surgery) "lEI" = ( @@ -14301,6 +14487,7 @@ /obj/item/stack/rods, /obj/item/stack/rods, /obj/effect/decal/cleanable/dirt, +/obj/item/weapon/material/shard, /turf/simulated/floor/tiled/techfloor, /area/awaymission/snowfield/command/gateway) "mgo" = ( @@ -14312,10 +14499,6 @@ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/card{ - pixel_x = 2; - pixel_y = -2 - }, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/techfloor, /area/awaymission/snowfield/engineering/secure_tech_storage) @@ -14485,6 +14668,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/effect/spider/stickyweb, /turf/simulated/floor/tiled/freezer, /area/awaymission/snowfield/medical/surgery) "mpk" = ( @@ -14878,6 +15062,8 @@ /obj/structure/table/rack/shelf/steel, /obj/structure/window/reinforced, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/item/weapon/storage/pill_bottle/assorted, +/obj/effect/spider/stickyweb, /turf/simulated/floor/tiled/techfloor/grid, /area/awaymission/snowfield/medical/storage_room) "mHr" = ( @@ -14955,9 +15141,10 @@ /turf/simulated/floor, /area/awaymission/snowfield/outside) "mKv" = ( -/obj/structure/cult/tome, -/turf/simulated/floor/cult, -/area/awaymission/snowfield/command/gateway) +/obj/structure/catwalk, +/mob/living/simple_mob/animal/giant_spider/webslinger, +/turf/simulated/floor/tiled/techfloor/grid, +/area/awaymission/snowfield/medical/storage_room) "mLz" = ( /obj/structure/sink{ dir = 4; @@ -15271,6 +15458,17 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/techfloor/grid, /area/awaymission/snowfield/medical/storage_room) +"mWF" = ( +/obj/structure/table/steel_reinforced, +/obj/item/weapon/storage/firstaid/adv{ + starts_with = list(/obj/item/stack/medical/advanced/bruise_pack,/obj/item/stack/medical/advanced/bruise_pack,/obj/item/stack/medical/advanced/bruise_pack,/obj/item/stack/medical/advanced/bruise_pack,/obj/item/stack/medical/advanced/ointment,/obj/item/stack/medical/advanced/ointment,/obj/item/stack/medical/advanced/ointment) + }, +/obj/item/weapon/storage/firstaid/adv{ + starts_with = list(/obj/item/stack/medical/advanced/bruise_pack,/obj/item/stack/medical/advanced/bruise_pack,/obj/item/stack/medical/advanced/bruise_pack,/obj/item/stack/medical/advanced/bruise_pack,/obj/item/stack/medical/advanced/ointment,/obj/item/stack/medical/advanced/ointment,/obj/item/stack/medical/advanced/ointment) + }, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/tiled/freezer, +/area/awaymission/snowfield/medical/surgery) "mWM" = ( /obj/structure/table/woodentable, /obj/item/weapon/paper_bin, @@ -15514,6 +15712,17 @@ /obj/machinery/light, /turf/simulated/floor/tiled/monotile, /area/awaymission/snowfield/service/janitor) +"ngO" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/gun/projectile/shotgun/pump/shorty{ + desc = "A clunky, lightly modified special carbine, this gun is often be seen in the old terran's prison, designed to suppress the prison riots."; + description_fluff = "Designed to suppress the prison riot, KS-23 has been developed in 1970s in Soviet Russia. Crude, but compact, it is easy to carry around while in patrol, and useful in close combat."; + name = "KS-23" + }, +/obj/item/ammo_magazine/ammo_box/b12g/pellet, +/obj/item/ammo_magazine/ammo_box/b12g/pellet, +/turf/simulated/floor/carpet/turcarpet, +/area/awaymission/snowfield/medical/staff_room) "nhd" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -16179,6 +16388,10 @@ }, /turf/simulated/floor/tiled/freezer, /area/awaymission/snowfield/public/cafeteria_restroom) +"nIJ" = ( +/obj/structure/table, +/turf/simulated/floor/cult, +/area/awaymission/snowfield/command/gateway) "nIK" = ( /obj/structure/closet/secure_closet/freezer/meat, /turf/simulated/floor/tiled/freezer, @@ -16816,12 +17029,12 @@ /turf/simulated/floor/tiled/dark, /area/awaymission/snowfield/security/security_lockerroom) "okr" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/lattice, -/turf/simulated/floor/outdoors/rocks/caves, -/area/awaymission/snowfield/security/firingrange) +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/green/border, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/tiled/neutral, +/area/awaymission/snowfield/medical/hallway) "okx" = ( /obj/structure/lattice, /turf/simulated/floor/outdoors/rocks/caves, @@ -17115,6 +17328,7 @@ }, /obj/structure/table/steel_reinforced, /obj/item/weapon/storage/box/masks, +/obj/effect/spider/stickyweb, /turf/simulated/floor/tiled/neutral, /area/awaymission/snowfield/medical/surgery) "owE" = ( @@ -17122,6 +17336,10 @@ /mob/living/simple_mob/animal/giant_spider/pepper, /turf/simulated/floor/tiled/techfloor/grid, /area/awaymission/snowfield/security/security_cell) +"oxs" = ( +/mob/living/simple_mob/animal/giant_spider/carrier, +/turf/simulated/floor/tiled/freezer, +/area/awaymission/snowfield/medical/surgery) "oxR" = ( /obj/effect/decal/cleanable/dirt, /obj/item/weapon/ore/glass, @@ -17491,6 +17709,14 @@ /obj/structure/catwalk, /turf/simulated/floor/tiled/techfloor/grid, /area/awaymission/snowfield/medical/storage_room) +"oWq" = ( +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/tiled/techfloor/grid, +/area/awaymission/snowfield/medical/storage_room) "oWy" = ( /obj/structure/artilleryplaceholder{ icon_state = "8" @@ -18700,6 +18926,12 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/techfloor/grid, /area/awaymission/snowfield/hallway/northhallway) +"pTk" = ( +/mob/living/simple_mob/construct/artificer{ + devourable = 0 + }, +/turf/simulated/floor/cult, +/area/awaymission/snowfield/command/bsa) "pTp" = ( /obj/effect/floor_decal/corner/lightgrey/diagonal, /obj/effect/decal/cleanable/dirt, @@ -19141,6 +19373,19 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/techfloor, /area/awaymission/snowfield/command/bridge) +"qjp" = ( +/obj/structure/table/steel_reinforced, +/obj/item/weapon/surgical/bonesetter, +/obj/item/weapon/surgical/bone_clamp{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/weapon/surgical/bonegel, +/obj/item/weapon/surgical/FixOVein, +/obj/item/weapon/surgical/cautery, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/tiled/freezer, +/area/awaymission/snowfield/medical/surgery) "qjJ" = ( /obj/machinery/button/remote/blast_door{ id = "snowfield emergency bunk"; @@ -20033,6 +20278,16 @@ /obj/structure/outcrop, /turf/simulated/floor/outdoors/rocks, /area/awaymission/snowfield/outside) +"qZf" = ( +/obj/effect/floor_decal/techfloor/orange{ + dir = 8 + }, +/obj/structure/catwalk, +/mob/living/simple_mob/construct/artificer{ + devourable = 0 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/awaymission/snowfield/command/bsa) "qZp" = ( /obj/structure/bed, /turf/simulated/floor/tiled/steel, @@ -20158,6 +20413,7 @@ dir = 4 }, /obj/structure/bed/chair/wood, +/mob/living/simple_mob/animal/giant_spider/frost, /turf/simulated/floor/tiled/neutral, /area/awaymission/snowfield/medical/staff_room) "reQ" = ( @@ -20509,6 +20765,11 @@ }, /turf/simulated/floor/tiled/freezer, /area/awaymission/snowfield/dorms/dorm11) +"rvf" = ( +/obj/structure/catwalk, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/tiled/techfloor/grid, +/area/awaymission/snowfield/medical/storage_room) "rvN" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -20519,6 +20780,12 @@ /obj/effect/spider/stickyweb, /turf/simulated/floor, /area/awaymission/snowfield/hallway/northhallway) +"rwS" = ( +/mob/living/simple_mob/creature/cult/strong{ + devourable = 0 + }, +/turf/simulated/floor/gorefloor2, +/area/awaymission/snowfield/command/gateway) "rxY" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/yellow/border, @@ -20667,6 +20934,7 @@ dir = 1; prices = null }, +/obj/effect/spider/stickyweb, /turf/simulated/floor/tiled/neutral, /area/awaymission/snowfield/medical/staff_room) "rIV" = ( @@ -20752,6 +21020,7 @@ /obj/item/weapon/storage/firstaid/fire, /obj/structure/window/reinforced, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/spider/stickyweb, /turf/simulated/floor/tiled/techfloor/grid, /area/awaymission/snowfield/medical/storage_room) "rMo" = ( @@ -21133,6 +21402,17 @@ /obj/item/device/radio/phone, /turf/simulated/floor/wood, /area/awaymission/snowfield/checkpointunpowered) +"sgz" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/catwalk, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spider/stickyweb, +/turf/simulated/floor, +/area/awaymission/snowfield/medical/hallway) "shT" = ( /turf/simulated/floor/outdoors/rocks/caves, /area/awaymission/snowfield/security/security_cell) @@ -21289,11 +21569,11 @@ /turf/simulated/floor/cult, /area/awaymission/snowfield/command/commandarmory) "ssD" = ( -/mob/living/simple_mob/construct/juggernaut/behemoth{ - devourable = 0 - }, -/turf/simulated/floor/cult, -/area/awaymission/snowfield/command/gateway) +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/green/border, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/tiled/neutral, +/area/awaymission/snowfield/medical/hallway) "stC" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -21630,6 +21910,13 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/monotile, /area/awaymission/snowfield/security/lobby) +"sKk" = ( +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/mob/living/simple_mob/construct/harvester/greater, +/turf/simulated/floor/tiled/techfloor/grid, +/area/awaymission/snowfield/command/bsa) "sKP" = ( /obj/machinery/light, /turf/simulated/floor/tiled/techfloor/grid, @@ -22330,6 +22617,21 @@ "tsJ" = ( /turf/simulated/wall/cult, /area/awaymission/snowfield/command/bridge) +"tsZ" = ( +/obj/structure/window/reinforced{ + dir = 8; + health = 1e+006 + }, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "snowfield bsa maints"; + opacity = 0 + }, +/obj/item/weapon/material/shard, +/obj/structure/grille/broken, +/turf/simulated/floor, +/area/awaymission/snowfield/command/bsa) "ttf" = ( /obj/structure/flora/tree/dead, /obj/structure/flora/grass/both, @@ -22420,6 +22722,7 @@ pixel_x = 2; pixel_y = 2 }, +/obj/effect/spider/stickyweb, /turf/simulated/floor/tiled/neutral, /area/awaymission/snowfield/medical/surgery) "tuW" = ( @@ -22986,6 +23289,15 @@ /obj/structure/door_assembly/door_assembly_eng, /turf/simulated/floor/tiled/techfloor/grid, /area/awaymission/snowfield/hallway/northhallway) +"tWH" = ( +/obj/effect/floor_decal/corner/green/diagonal, +/obj/effect/floor_decal/corner/blue/diagonal{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/tiled/neutral, +/area/awaymission/snowfield/medical/staff_room) "tXc" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 4 @@ -23369,6 +23681,7 @@ /obj/machinery/vending/coffee{ dir = 1 }, +/obj/effect/spider/stickyweb, /turf/simulated/floor/tiled/neutral, /area/awaymission/snowfield/medical/staff_room) "ulH" = ( @@ -23954,6 +24267,8 @@ dir = 1 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/item/weapon/storage/pill_bottle/bicaridine, +/obj/item/weapon/storage/pill_bottle/bicaridine, /turf/simulated/floor/tiled/techfloor/grid, /area/awaymission/snowfield/medical/storage_room) "uLC" = ( @@ -24051,6 +24366,12 @@ /obj/machinery/light, /turf/simulated/floor/tiled/steel_grid, /area/awaymission/snowfield/dorms/dorm1) +"uRb" = ( +/obj/structure/catwalk, +/mob/living/simple_mob/animal/giant_spider/webslinger, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/tiled/techfloor/grid, +/area/awaymission/snowfield/medical/storage_room) "uRd" = ( /obj/machinery/vending/security{ description_fluff = "This security vending machine is kindly provided by the-... Sorry, how do you spell this company's name again?"; @@ -24094,6 +24415,15 @@ }, /turf/simulated/floor/tiled/techfloor, /area/awaymission/snowfield/service/cafeteria) +"uSg" = ( +/obj/effect/floor_decal/corner/green/diagonal, +/obj/effect/floor_decal/corner/blue/diagonal{ + dir = 4 + }, +/obj/structure/table/glass, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/tiled/neutral, +/area/awaymission/snowfield/medical/staff_room) "uSM" = ( /obj/structure/cult/forge, /turf/simulated/floor/cult, @@ -24692,6 +25022,12 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/techfloor, /area/awaymission/snowfield/public/toolstroage2) +"vrJ" = ( +/mob/living/simple_mob/construct/wraith{ + devourable = 0 + }, +/turf/simulated/floor/cult, +/area/awaymission/snowfield/command/bsa) "vrX" = ( /obj/structure/bed, /turf/simulated/floor/tiled/steel, @@ -24815,7 +25151,10 @@ req_one_access = list(1,11,20,47,56) }, /obj/machinery/door/blast/regular{ - id = "snowfield bsa MR" + density = 0; + icon_state = "pdoor0"; + id = "snowfield bsa MR"; + opacity = 0 }, /turf/simulated/floor/tiled/techfloor, /area/awaymission/snowfield/hallway/commandhallway) @@ -24875,6 +25214,11 @@ }, /turf/simulated/floor/outdoors/snow/sif/planetuse, /area/awaymission/snowfield/outside) +"vAm" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_mob/construct/juggernaut/behemoth/unstoppable, +/turf/simulated/floor/cult, +/area/awaymission/snowfield/command/gateway) "vAq" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -24924,6 +25268,12 @@ /obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled/neutral, /area/awaymission/snowfield/medical/medical_locker) +"vCU" = ( +/obj/structure/table/rack/shelf/steel, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/tiled/techfloor/grid, +/area/awaymission/snowfield/medical/storage_room) "vCY" = ( /turf/simulated/floor/tiled/red, /area/awaymission/snowfield/security/hallway) @@ -25066,6 +25416,11 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/neutral, /area/awaymission/snowfield/medical/medical_locker) +"vIj" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_mob/animal/giant_spider/webslinger, +/turf/simulated/floor/tiled/neutral, +/area/awaymission/snowfield/medical/patients) "vIp" = ( /obj/machinery/atmospherics/pipe/tank{ desc = "A large vessel containing huge amount of water."; @@ -25484,6 +25839,7 @@ /obj/item/weapon/tank/air, /obj/item/clothing/mask/breath, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/spider/stickyweb, /turf/simulated/floor/tiled/techfloor/grid, /area/awaymission/snowfield/medical/storage_room) "wac" = ( @@ -25622,6 +25978,7 @@ /obj/item/weapon/storage/box/bodybags, /obj/item/weapon/storage/box/bodybags, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/effect/spider/stickyweb, /turf/simulated/floor/tiled/techfloor/grid, /area/awaymission/snowfield/medical/storage_room) "wfG" = ( @@ -25673,6 +26030,7 @@ pixel_y = 8 }, /obj/item/weapon/surgical/surgicaldrill, +/obj/effect/spider/stickyweb, /turf/simulated/floor/tiled/freezer, /area/awaymission/snowfield/medical/surgery) "whO" = ( @@ -26635,6 +26993,15 @@ /obj/machinery/door/airlock/security, /turf/simulated/floor/tiled/red, /area/awaymission/snowfield/security/seconddesk) +"wWF" = ( +/obj/structure/table/rack/shelf/steel, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/item/weapon/storage/pill_bottle/myelamine, +/turf/simulated/floor/tiled/techfloor/grid, +/area/awaymission/snowfield/medical/storage_room) "wWN" = ( /obj/structure/fireaxecabinet{ pixel_y = 32 @@ -26648,6 +27015,10 @@ /obj/effect/spider/stickyweb, /turf/simulated/floor/tiled/neutral, /area/awaymission/snowfield/medical/medical_locker) +"wXd" = ( +/obj/item/weapon/material/shard, +/turf/simulated/floor/cult, +/area/awaymission/snowfield/command/bsa) "wXh" = ( /obj/item/weapon/reagent_containers/spray/cleaner, /obj/item/weapon/reagent_containers/spray/cleaner, @@ -26893,8 +27264,8 @@ /turf/simulated/floor/cult, /area/awaymission/snowfield/command/gateway) "xbT" = ( -/obj/structure/table/steel_reinforced, /obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/autolathe/armory, /turf/simulated/floor/tiled/techfloor/grid, /area/awaymission/snowfield/security/heavy_armory) "xcE" = ( @@ -27293,6 +27664,7 @@ pixel_x = 23; req_one_access = list(1,45) }, +/mob/living/simple_mob/animal/giant_spider/webslinger, /turf/simulated/floor/tiled/neutral, /area/awaymission/snowfield/medical/hallway) "xmu" = ( @@ -27537,6 +27909,9 @@ /obj/machinery/light/flicker{ dir = 4 }, +/mob/living/simple_mob/construct/artificer/caster{ + devourable = 0 + }, /turf/simulated/floor/tiled/techfloor/grid, /area/awaymission/snowfield/command/gateway) "xxj" = ( @@ -27800,6 +28175,14 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/awaymission/snowfield/engineering/engine_checkpoint) +"xIO" = ( +/obj/effect/floor_decal/corner/green/diagonal, +/obj/effect/floor_decal/corner/blue/diagonal{ + dir = 4 + }, +/mob/living/simple_mob/animal/giant_spider/carrier, +/turf/simulated/floor/tiled/neutral, +/area/awaymission/snowfield/medical/staff_room) "xIQ" = ( /obj/effect/floor_decal/steeldecal/steel_decals5, /obj/structure/table/reinforced, @@ -29544,20 +29927,20 @@ uoM uoM uoM uoM -szB -szB -szB -szB -szB -szB -szB -szB -szB -szB -szB -szB -szB -szB +uoM +uoM +uoM +uoM +uoM +uoM +uoM +uoM +uoM +uoM +uoM +uoM +uoM +uoM uoM uoM uoM @@ -29802,20 +30185,20 @@ uoM uoM uoM uoM -szB -szB -szB -szB -szB -szB -szB -szB -szB -szB -szB -szB -szB -szB +uoM +uoM +uoM +uoM +uoM +uoM +uoM +uoM +uoM +uoM +uoM +uoM +uoM +uoM uoM uoM uoM @@ -30061,18 +30444,18 @@ uoM uoM uoM uoM -szB -szB -szB -szB -szB -szB -szB -szB -szB -szB -szB -szB +uoM +uoM +uoM +uoM +uoM +uoM +uoM +uoM +uoM +uoM +uoM +uoM uoM uoM uoM @@ -30320,17 +30703,17 @@ uoM uoM uoM uoM -szB -szB -szB -szB -szB -szB -szB -szB -szB -szB -szB +uoM +uoM +uoM +uoM +uoM +uoM +uoM +uoM +uoM +uoM +uoM uoM uoM uoM @@ -30578,17 +30961,17 @@ uoM uoM uoM uoM -szB -szB -szB -szB -szB -szB -szB -szB -szB -szB -szB +uoM +uoM +uoM +uoM +uoM +uoM +uoM +uoM +uoM +uoM +uoM uoM uoM uoM @@ -30837,16 +31220,16 @@ uoM uoM uoM uoM -szB -szB -szB -szB -szB -szB -szB -szB -szB -szB +uoM +uoM +uoM +uoM +uoM +uoM +uoM +uoM +uoM +uoM uoM uoM uoM @@ -31095,16 +31478,16 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -31355,14 +31738,14 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -31614,13 +31997,13 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -31872,13 +32255,13 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -32130,13 +32513,13 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -32388,13 +32771,13 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -32646,13 +33029,13 @@ vDF vDF vDF vDF -hTO vDF vDF -hTO -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -32907,9 +33290,9 @@ vDF vDF vDF vDF -hTO -hTO -hTO +vDF +vDF +vDF vDF vDF vDF @@ -33165,9 +33548,9 @@ vDF vDF vDF vDF -hTO -hTO -hTO +vDF +vDF +vDF vDF vDF vDF @@ -33423,9 +33806,9 @@ vDF vDF vDF vDF -hTO -hTO -hTO +vDF +vDF +vDF vDF vDF vDF @@ -33681,9 +34064,9 @@ vDF vDF vDF vDF -hTO -hTO -hTO +vDF +vDF +vDF vDF vDF vDF @@ -33939,9 +34322,9 @@ vDF vDF vDF vDF -hTO -hTO -hTO +vDF +vDF +vDF vDF vDF vDF @@ -34197,9 +34580,9 @@ vDF vDF vDF vDF -hTO -hTO -hTO +vDF +vDF +vDF vDF vDF vDF @@ -34455,9 +34838,9 @@ vDF vDF vDF vDF -hTO -hTO -hTO +vDF +vDF +vDF vDF vDF vDF @@ -34713,9 +35096,9 @@ vDF vDF vDF vDF -hTO -hTO -hTO +vDF +vDF +vDF vDF vDF vDF @@ -34971,9 +35354,9 @@ vDF vDF vDF vDF -hTO -hTO -hTO +vDF +vDF +vDF vDF vDF vDF @@ -35230,7 +35613,7 @@ vDF vDF vDF vDF -hTO +vDF vDF vDF vDF @@ -35488,7 +35871,7 @@ vDF vDF vDF vDF -hTO +vDF vDF vDF vDF @@ -35746,7 +36129,7 @@ vDF vDF vDF vDF -hTO +vDF vDF vDF vDF @@ -36004,7 +36387,7 @@ vDF vDF vDF vDF -hTO +vDF vDF vDF vDF @@ -36262,7 +36645,7 @@ vDF vDF vDF vDF -hTO +vDF vDF vDF vDF @@ -36520,7 +36903,7 @@ vDF vDF vDF vDF -hTO +vDF vDF vDF vDF @@ -36778,7 +37161,7 @@ vDF vDF vDF vDF -hTO +vDF vDF vDF vDF @@ -37036,7 +37419,7 @@ vDF vDF vDF vDF -hTO +vDF vDF vDF vDF @@ -37294,7 +37677,7 @@ vDF vDF vDF vDF -hTO +vDF vDF vDF vDF @@ -37552,7 +37935,7 @@ vDF vDF vDF vDF -hTO +vDF vDF vDF vDF @@ -37810,7 +38193,7 @@ vDF vDF vDF vDF -hTO +vDF vDF vDF vDF @@ -37893,7 +38276,7 @@ bvS pZF oWf oWf -osG +cQZ pMX pMX bXH @@ -38068,7 +38451,7 @@ vDF vDF vDF vDF -hTO +vDF vDF vDF vDF @@ -38150,7 +38533,7 @@ bvf aMQ rff aWv -sRX +vCU rMl pMX pMX @@ -38326,7 +38709,7 @@ vDF vDF vDF vDF -hTO +vDF vDF vDF vDF @@ -38402,14 +38785,14 @@ vDF vDF nyy nyy -wUo +oWq oWf oWf -bvS -pZF +kIH +lxg oWf -oWf -osG +rvf +cQZ xod xod xod @@ -38584,7 +38967,7 @@ vDF vDF vDF vDF -hTO +vDF vDF vDF vDF @@ -38665,8 +39048,8 @@ vZQ jXb ybq ybW -kEt -sRX +wWF +vCU mHh xod vjO @@ -38842,7 +39225,7 @@ vDF vDF vDF vDF -hTO +vDF vDF vDF vDF @@ -38918,14 +39301,14 @@ vDF vDF nyy nyy -wUo -oWf +oWq +uRb oWf jDy pZF oWf -oWf -osG +mKv +cQZ xod afc qrK @@ -39100,7 +39483,7 @@ vDF vDF vDF vDF -hTO +vDF vDF vDF vDF @@ -39358,7 +39741,7 @@ vDF vDF vDF vDF -hTO +vDF vDF vDF vDF @@ -39616,7 +39999,7 @@ vDF vDF vDF vDF -hTO +vDF vDF vDF vDF @@ -39874,7 +40257,7 @@ vDF vDF vDF vDF -hTO +vDF vDF vDF vDF @@ -40132,7 +40515,7 @@ vDF vDF vDF vDF -hTO +vDF vDF vDF vDF @@ -40390,7 +40773,7 @@ vDF vDF vDF vDF -hTO +vDF vDF vDF vDF @@ -40647,9 +41030,9 @@ vDF vDF vDF vDF -hTO -hTO -hTO +vDF +vDF +vDF vDF vDF vDF @@ -40905,9 +41288,9 @@ vDF vDF vDF vDF -hTO -hTO -hTO +vDF +vDF +vDF vDF vDF vDF @@ -41163,9 +41546,9 @@ vDF vDF vDF vDF -hTO -hTO -hTO +vDF +vDF +vDF vDF vDF vDF @@ -41421,9 +41804,9 @@ vDF vDF vDF vDF -hTO -hTO -hTO +vDF +vDF +vDF vDF vDF vDF @@ -41505,7 +41888,7 @@ vir iJk oVH kjZ -xeR +okr uYG nZN emW @@ -41679,9 +42062,9 @@ vDF vDF vDF vDF -hTO -hTO -hTO +vDF +vDF +vDF vDF vDF vDF @@ -41763,7 +42146,7 @@ vUR vUR vUR siu -cIk +ssD uYG tNE uaB @@ -41937,9 +42320,9 @@ vDF vDF vDF vDF -hTO -hTO -hTO +vDF +vDF +vDF vDF vDF vDF @@ -42016,12 +42399,12 @@ vUR lyN vDZ fuC -vDZ +fQJ kXS jLm vUR siu -cIk +ssD uYG rim uKp @@ -42195,9 +42578,9 @@ vDF vDF vDF vDF -hTO -hTO -hTO +vDF +vDF +vDF vDF vDF vDF @@ -42274,8 +42657,8 @@ vUR pZK wTm iDx -iDx -wTm +uSg +iPB ulu vUR oCc @@ -42453,9 +42836,9 @@ vDF vDF vDF vDF -hTO -hTO -hTO +vDF +vDF +vDF vDF vDF vDF @@ -42530,10 +42913,10 @@ vDF vUR vUR iVZ -wTm +xIO xXJ iDx -nBM +tWH aOC vUR vHw @@ -42711,9 +43094,9 @@ vDF vDF vDF vDF -hTO -hTO -hTO +vDF +vDF +vDF vDF vDF vDF @@ -42968,10 +43351,10 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO +vDF +vDF +vDF +vDF vDF vDF vDF @@ -43070,7 +43453,7 @@ rrm uVh wQd sbj -jnn +jmE eWn tPy sok @@ -43226,10 +43609,10 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO +vDF +vDF +vDF +vDF vDF vDF vDF @@ -43484,11 +43867,11 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -43562,7 +43945,7 @@ vDF vUR vUR plr -xYW +ngO xYW tqN nBM @@ -43742,11 +44125,11 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -44000,11 +44383,11 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -44258,11 +44641,11 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -44516,11 +44899,11 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -44774,11 +45157,11 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -44859,7 +45242,7 @@ hBV hBV hBV siu -xeR +okr hBV vDF tBf @@ -45032,11 +45415,11 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -45117,7 +45500,7 @@ hBV hBV hBV vHw -cIk +ssD hBV vDF tBf @@ -45289,12 +45672,12 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -45374,7 +45757,7 @@ vDF vDF hBV hBV -oCc +czv cJn hBV vDF @@ -45547,12 +45930,12 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -45632,8 +46015,8 @@ vDF vDF hBV hBV -vHw -cIk +sgz +ssD hBV vDF tBf @@ -45805,12 +46188,12 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -45891,14 +46274,14 @@ vDF hBV hBV vHw -xeR +okr hBV vDF tBf alU gzQ kOt -kOt +giF kOt fpc kOt @@ -46063,12 +46446,12 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -46148,7 +46531,7 @@ vDF vDF hBV hBV -siu +jtj cIk hBV vDF @@ -46321,12 +46704,12 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -46579,12 +46962,12 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -46672,7 +47055,7 @@ rLd uGz oVH iHU -uGz +kiD xiw oVH uGz @@ -46837,13 +47220,13 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -47095,13 +47478,13 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -47353,13 +47736,13 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -47610,15 +47993,15 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -47694,7 +48077,7 @@ vDF vDF pgd pgd -hzb +qjp jKy xYD jKy @@ -47707,7 +48090,7 @@ hMq hMq hVe rZS -hVe +fGG qID qyT gbn @@ -47717,7 +48100,7 @@ pnb tmQ qID rjH -nVo +cXK nVo vsh vsh @@ -47747,7 +48130,7 @@ gWC aBy aBy rSH -okr +gWC cCl bZn bZn @@ -47868,16 +48251,16 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO vDF vDF vDF -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -47952,10 +48335,10 @@ vDF vDF pgd pgd -iNT +mWF kCk ePu -jKy +oxs uxq bcr kFL @@ -48126,17 +48509,17 @@ vDF vDF vDF vDF -hTO -hTO -hTO vDF vDF vDF vDF vDF vDF -hTO -hTO +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -48227,7 +48610,7 @@ skE qID fLg fLg -gsE +vIj fLg our ttU @@ -48384,9 +48767,6 @@ vDF vDF vDF vDF -hTO -hTO -hTO vDF vDF vDF @@ -48394,7 +48774,10 @@ vDF vDF vDF vDF -hTO +vDF +vDF +vDF +vDF vDF vDF vDF @@ -48642,9 +49025,6 @@ vDF vDF vDF vDF -hTO -hTO -hTO vDF vDF vDF @@ -48652,7 +49032,10 @@ vDF vDF vDF vDF -hTO +vDF +vDF +vDF +vDF vDF vDF vDF @@ -48737,7 +49120,7 @@ owy hMq hMq uiq -hVe +fGG rZS cdN qID @@ -48900,9 +49283,6 @@ vDF vDF vDF vDF -hTO -hTO -exB vDF vDF vDF @@ -48910,8 +49290,11 @@ vDF vDF vDF vDF -hTO -hTO +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -49158,9 +49541,6 @@ vDF vDF vDF vDF -hTO -hTO -exB vDF vDF vDF @@ -49169,8 +49549,11 @@ vDF vDF vDF vDF -hTO -hTO +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -49416,9 +49799,6 @@ vDF vDF vDF vDF -hTO -hTO -exB vDF vDF vDF @@ -49428,9 +49808,12 @@ vDF vDF vDF vDF -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -49674,9 +50057,6 @@ vDF vDF vDF vDF -hTO -hTO -exB vDF vDF vDF @@ -49688,10 +50068,13 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF +vDF +vDF vDF vDF pun @@ -49932,9 +50315,6 @@ vDF vDF vDF vDF -hTO -hTO -exB vDF vDF vDF @@ -49949,8 +50329,11 @@ vDF vDF vDF vDF -hTO -hTO +vDF +vDF +vDF +vDF +vDF vDF pun imC @@ -50076,7 +50459,7 @@ ocr cQM bNc jje -rIV +aiA fMy ocr ocr @@ -50190,9 +50573,6 @@ vDF vDF vDF vDF -hTO -hTO -exB vDF vDF vDF @@ -50207,8 +50587,11 @@ vDF vDF vDF vDF -hTO -hTO +vDF +vDF +vDF +vDF +vDF pun pun pun @@ -50448,9 +50831,6 @@ vDF vDF vDF vDF -hTO -hTO -exB vDF vDF vDF @@ -50466,7 +50846,10 @@ vDF vDF vDF vDF -hTO +vDF +vDF +vDF +vDF pun imC pun @@ -50706,9 +51089,6 @@ vDF vDF vDF vDF -hTO -hTO -exB vDF vDF vDF @@ -50724,7 +51104,10 @@ vDF vDF vDF vDF -hTO +vDF +vDF +vDF +vDF pun pun pun @@ -50962,11 +51345,6 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -exB vDF vDF vDF @@ -50982,7 +51360,12 @@ vDF vDF vDF vDF -hTO +vDF +vDF +vDF +vDF +vDF +vDF pun pun pun @@ -51220,11 +51603,6 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -exB vDF vDF vDF @@ -51240,7 +51618,12 @@ vDF vDF vDF vDF -hTO +vDF +vDF +vDF +vDF +vDF +vDF pun pun pun @@ -51477,12 +51860,6 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -exB vDF vDF vDF @@ -51498,7 +51875,13 @@ vDF vDF vDF vDF -hTO +vDF +vDF +vDF +vDF +vDF +vDF +vDF pun pun pun @@ -51735,8 +52118,6 @@ vDF vDF vDF vDF -hTO -hTO vDF vDF vDF @@ -51756,7 +52137,9 @@ vDF vDF vDF vDF -hTO +vDF +vDF +vDF pun pun pun @@ -51993,8 +52376,6 @@ vDF vDF vDF vDF -hTO -hTO vDF vDF vDF @@ -52013,8 +52394,10 @@ vDF vDF vDF vDF -hTO -hTO +vDF +vDF +vDF +vDF pun pun kNs @@ -52248,11 +52631,6 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO vDF vDF vDF @@ -52271,7 +52649,12 @@ vDF vDF vDF vDF -hTO +vDF +vDF +vDF +vDF +vDF +vDF nZF laC kNs @@ -52506,11 +52889,6 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO vDF vDF vDF @@ -52526,10 +52904,15 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF nZF nZF nZF @@ -52762,19 +53145,19 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -55854,35 +56237,35 @@ pun vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO vDF vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF laC jUY laC @@ -56116,19 +56499,6 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO vDF vDF vDF @@ -56139,8 +56509,21 @@ vDF vDF vDF vDF -hTO -hTO +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF nZF nZF laC @@ -56375,18 +56758,6 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO vDF vDF vDF @@ -56398,7 +56769,19 @@ vDF vDF vDF vDF -hTO +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF nZF pun pun @@ -56633,18 +57016,6 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO vDF vDF vDF @@ -56656,7 +57027,19 @@ vDF vDF vDF vDF -hTO +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF pun kNs pun @@ -56798,7 +57181,7 @@ qDO jjw bBV wQH -wQH +qZf wQH wQH pGC @@ -56893,15 +57276,6 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO vDF vDF vDF @@ -56914,7 +57288,16 @@ vDF vDF vDF vDF -hTO +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF pun pun pun @@ -57053,7 +57436,7 @@ hrj hrj hrj dHG -bBV +pTk ygP ygP ygP @@ -57151,15 +57534,6 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO vDF vDF vDF @@ -57170,9 +57544,18 @@ vDF vDF vDF vDF -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF pun pun pun @@ -57409,15 +57792,6 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO vDF vDF vDF @@ -57425,12 +57799,21 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF hTO pun pun @@ -57575,7 +57958,7 @@ rpz frj oDp qhx -qhV +kNi kzi dKR gmg @@ -57667,14 +58050,6 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO vDF vDF vDF @@ -57682,13 +58057,21 @@ vDF vDF vDF vDF -hTO -hTO -hTO vDF vDF vDF -hTO +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF hTO pun pun @@ -57834,7 +58217,7 @@ frj oDp qhx bBV -hBm +hAp eoL srQ srQ @@ -57925,22 +58308,22 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO vDF vDF vDF vDF vDF -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -58091,12 +58474,12 @@ fxn oLt oDp qhx -rdy +dAC bMc xxU dLU tHV -srQ +aqV iRf iRf bfk @@ -58183,20 +58566,20 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -hTO -hTO -hTO vDF vDF vDF vDF -hTO -hTO +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -58349,9 +58732,9 @@ new jyr kmt bBV -bBV -kzi -xbR +iDn +tsZ +nIJ srQ tHV srQ @@ -58441,19 +58824,19 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -hTO -hTO -exB vDF vDF vDF -hTO -hTO +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -58607,8 +58990,8 @@ vRM ayQ dvn qhx -bBV -ibJ +wXd +gMa ewH pIi gWN @@ -58701,16 +59084,16 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -exB vDF vDF vDF -hTO +vDF +vDF +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -58865,7 +59248,7 @@ xmu qij obI qhx -qhV +kNi ibJ ewH doC @@ -58959,16 +59342,16 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -exB vDF vDF vDF -hTO +vDF +vDF +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -59117,7 +59500,7 @@ hrj hrj hrj dHG -uut +sKk oDp cNE jdW @@ -59217,16 +59600,16 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -exB vDF vDF -hTO -hTO +vDF +vDF +vDF +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -59475,15 +59858,15 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO vDF vDF vDF -hTO +vDF +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -59641,10 +60024,10 @@ nsC bBV rdy bMc -mKv +tHV gJu gJu -igK +lDF iRf iRf iRf @@ -59734,14 +60117,14 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO vDF -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -59897,7 +60280,7 @@ sUc htH gwq qhx -bBV +wXd kzi wdl vnj @@ -59992,12 +60375,12 @@ vDF vDF vDF vDF -hTO -hTO -hTO -hTO -hTO -hTO +vDF +vDF +vDF +vDF +vDF +vDF vDF vDF vDF @@ -60155,8 +60538,8 @@ aNA vSW frZ qhx -qhV -ibJ +kNi +jEF mfp srQ ltZ @@ -60252,9 +60635,9 @@ vDF vDF vDF vDF -hTO -hTO -hTO +vDF +vDF +vDF vDF vDF vDF @@ -60413,9 +60796,9 @@ rdQ isM jfU qhx -qhV -ibJ -hiZ +kNi +fve +eUS srQ tHV gRe @@ -60669,9 +61052,9 @@ dds ezz ezz bBV -bBV +vrJ bYW -qhV +kNi ibJ hiZ srQ @@ -60934,7 +61317,7 @@ kbh dKR srQ gJu -gJu +rwS nNX iRf bfk @@ -61701,7 +62084,7 @@ srQ tHV srQ srQ -aiA +srQ tHV srQ ehC @@ -61964,7 +62347,7 @@ tgp iPW iRf cMA -ssD +tHV srQ igK iRf @@ -62218,12 +62601,12 @@ srQ xge gPa oOF -srQ +vAm tHV iRf srQ srQ -tHV +gla cyK iRf iRf @@ -62732,10 +63115,10 @@ iRf jpM rcg srQ -aiA srQ srQ -gla +srQ +tHV lcC srQ rTy diff --git a/maps/submaps/surface_submaps/plains/Diner.dmm b/maps/submaps/surface_submaps/plains/Diner.dmm index cf272b32e4..3588396ed5 100644 --- a/maps/submaps/surface_submaps/plains/Diner.dmm +++ b/maps/submaps/surface_submaps/plains/Diner.dmm @@ -465,6 +465,11 @@ /obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/tiled/white, /area/submap/diner) +"Km" = ( +/obj/structure/table/standard, +/obj/item/device/flashlight/lamp, +/turf/simulated/floor/tiled/white, +/area/submap/diner) (1,1,1) = {" aa @@ -874,7 +879,7 @@ aa (16,1,1) = {" aa ad -bj +Km ap ap ap diff --git a/maps/submaps/surface_submaps/wilderness/FrostflyNest.dmm b/maps/submaps/surface_submaps/wilderness/FrostflyNest.dmm index 082fcef589..ff952ccd31 100644 --- a/maps/submaps/surface_submaps/wilderness/FrostflyNest.dmm +++ b/maps/submaps/surface_submaps/wilderness/FrostflyNest.dmm @@ -9,7 +9,7 @@ }, /area/submap/FrostflyNest) "d" = ( -/turf/simulated/wall/solidrock, +/turf/simulated/mineral, /area/submap/FrostflyNest) "e" = ( /turf/simulated/floor/outdoors/dirt{ @@ -29,12 +29,7 @@ }, /area/submap/FrostflyNest) "h" = ( -/obj/structure/prop/nest{ - color = "#041164"; - creature_types = list(/mob/living/simple_mob/animal/sif/frostfly); - name = "frostfly den"; - spawn_delay = 300 - }, +/mob/living/simple_mob/animal/sif/frostfly, /turf/simulated/floor/outdoors/dirt{ outdoors = 0 }, @@ -120,7 +115,7 @@ f i e e -e +h g d d @@ -142,7 +137,7 @@ d d d i -e +h e l d diff --git a/maps/submaps/surface_submaps/wilderness/MCamp1.dmm b/maps/submaps/surface_submaps/wilderness/MCamp1.dmm index 8aa52b9763..383e813679 100644 --- a/maps/submaps/surface_submaps/wilderness/MCamp1.dmm +++ b/maps/submaps/surface_submaps/wilderness/MCamp1.dmm @@ -75,9 +75,9 @@ /area/submap/MilitaryCamp1) "t" = ( /obj/structure/table/standard, +/mob/living/simple_mob/mechanical/viscerator, +/mob/living/simple_mob/mechanical/viscerator, /obj/random/energy, -/mob/living/simple_mob/mechanical/viscerator, -/mob/living/simple_mob/mechanical/viscerator, /turf/simulated/floor, /area/submap/MilitaryCamp1) "u" = ( @@ -120,6 +120,7 @@ /area/submap/MilitaryCamp1) "C" = ( /obj/structure/table, +/obj/random/firstaid, /turf/simulated/floor, /area/submap/MilitaryCamp1) "D" = ( diff --git a/maps/submaps/surface_submaps/wilderness/Manor1.dmm b/maps/submaps/surface_submaps/wilderness/Manor1.dmm index 3df6ee1299..b6290282af 100644 --- a/maps/submaps/surface_submaps/wilderness/Manor1.dmm +++ b/maps/submaps/surface_submaps/wilderness/Manor1.dmm @@ -326,10 +326,6 @@ /obj/item/clothing/accessory/sweater/blue, /turf/simulated/floor/carpet/blucarpet, /area/submap/Manor1) -"bn" = ( -/obj/structure/window/reinforced/full, -/turf/template_noop, -/area/submap/Manor1) "bo" = ( /obj/item/weapon/material/twohanded/baseballbat/metal, /turf/simulated/floor/carpet/blucarpet, @@ -342,15 +338,6 @@ /obj/effect/decal/cleanable/blood/drip, /turf/simulated/floor/holofloor/wood, /area/submap/Manor1) -"br" = ( -/obj/structure/bed/chair/comfy/purp{ - dir = 4; - icon_state = "comfychair_preview" - }, -/turf/simulated/floor/holofloor/wood{ - icon_state = "wood_broken5" - }, -/area/submap/Manor1) "bs" = ( /obj/structure/table, /turf/simulated/floor/holofloor/wood, @@ -1744,8 +1731,8 @@ aa aa aa ab -bn -bn +ac +ac ab aa aa @@ -3634,7 +3621,7 @@ ab ab ab ag -br +bx ML bC ab diff --git a/maps/submaps/surface_submaps/wilderness/Shelter.dmm b/maps/submaps/surface_submaps/wilderness/Shelter.dmm index adb7a6ae97..f4b34cf6cc 100644 --- a/maps/submaps/surface_submaps/wilderness/Shelter.dmm +++ b/maps/submaps/surface_submaps/wilderness/Shelter.dmm @@ -45,7 +45,7 @@ /obj/item/clothing/mask/gas/explorer, /obj/item/clothing/accessory/permit/gun/planetside, /obj/item/clothing/suit/armor/pcarrier/light/nt, -/obj/random/projectile/scrapped_smg, +/obj/random/projectile/scrapped_gun, /obj/random/projectile/scrapped_pistol, /turf/simulated/floor/outdoors/rocks/caves, /area/submap/Shelter1) diff --git a/modular_chomp/code/modules/mob/living/carbon/human/species/station/prommie_blob.dm b/modular_chomp/code/modules/mob/living/carbon/human/species/station/prommie_blob.dm new file mode 100644 index 0000000000..2b465747e1 --- /dev/null +++ b/modular_chomp/code/modules/mob/living/carbon/human/species/station/prommie_blob.dm @@ -0,0 +1,4 @@ +/mob/living/simple_mob/slime/promethean/character_directory_species() + if (humanform) + return "[humanform.custom_species ? humanform.custom_species : (humanform.species ? humanform.species.name : "Promethean Blob")]" + return "Promethean Blob" diff --git a/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm b/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm index 4904ded817..260e6ca283 100644 --- a/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm +++ b/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_blob.dm @@ -437,6 +437,11 @@ return ..() +/mob/living/simple_mob/protean_blob/character_directory_species() + if (humanform) + return "[humanform.custom_species ? humanform.custom_species : (humanform.species ? humanform.species.name : "Protean")]" + return "Protean" + // Helpers - Unsafe, WILL perform change. /mob/living/carbon/human/proc/nano_intoblob(force) if(!force && !isturf(loc) && !loc == /obj/item/weapon/rig/protean) diff --git a/modular_chomp/code/modules/mob/living/simple_mob/simple_mob.dm b/modular_chomp/code/modules/mob/living/simple_mob/simple_mob.dm index 9e1c264ac7..b8ed4037ba 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/simple_mob.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/simple_mob.dm @@ -129,3 +129,6 @@ var/vs_fullness = vore_fullness_ex[belly_class] if(vs_fullness > 0) add_overlay("[icon_state]_[belly_class]-[vs_fullness]") + +/mob/living/simple_mob/proc/character_directory_species() + return "simplemob" diff --git a/modular_chomp/code/modules/mob/new_player/sprite_accessories_taur.dm b/modular_chomp/code/modules/mob/new_player/sprite_accessories_taur.dm index 61592cb852..d004395390 100644 --- a/modular_chomp/code/modules/mob/new_player/sprite_accessories_taur.dm +++ b/modular_chomp/code/modules/mob/new_player/sprite_accessories_taur.dm @@ -72,6 +72,33 @@ extra_overlay = "naga_alt_markings" suit_sprites = 'modular_chomp/icons/mob/taursuits_naga_ch.dmi' + msg_owner_help_walk = "You carefully slither around %prey." + msg_prey_help_walk = "%owner's huge tail slithers past beside you!" + + msg_owner_help_run = "You carefully slither around %prey." + msg_prey_help_run = "%owner's huge tail slithers past beside you!" + + msg_owner_disarm_run = "Your tail slides over %prey, pushing them down to the ground!" + msg_prey_disarm_run = "%owner's tail slides over you, forcing you down to the ground!" + + msg_owner_disarm_walk = "You push down on %prey with your tail, pinning them down under you!" + msg_prey_disarm_walk = "%owner pushes down on you with their tail, pinning you down below them!" + + msg_owner_harm_run = "Your heavy tail carelessly slides past %prey, crushing them!" + msg_prey_harm_run = "%owner quickly goes over your body, carelessly crushing you with their heavy tail!" + + msg_owner_harm_walk = "Your heavy tail slowly and methodically slides down upon %prey, crushing against the floor below!" + msg_prey_harm_walk = "%owner's thick, heavy tail slowly and methodically slides down upon your body, mercilessly crushing you into the floor below!" + + msg_owner_grab_success = "You slither over %prey with your large, thick tail, smushing them against the ground before coiling up around them, trapping them within the tight confines of your tail!" + msg_prey_grab_success = "%owner slithers over you with their large, thick tail, smushing you against the ground before coiling up around you, trapping you within the tight confines of their tail!" + + msg_owner_grab_fail = "You squish %prey under your large, thick tail, forcing them onto the ground!" + msg_prey_grab_fail = "%owner pins you under their large, thick tail, forcing you onto the ground!" + + msg_prey_stepunder = "You jump over %prey's thick tail." + msg_owner_stepunder = "%owner bounds over your tail." + /datum/sprite_accessory/tail/taur/ch/horse/scoli name = "Scolipede (Taur)" icon_state = "scoli_s" diff --git a/modular_chomp/icons/mob/vore128x64_ch.dmi b/modular_chomp/icons/mob/vore128x64_ch.dmi index 120f630d33..a8422c16bd 100644 Binary files a/modular_chomp/icons/mob/vore128x64_ch.dmi and b/modular_chomp/icons/mob/vore128x64_ch.dmi differ diff --git a/vorestation.dme b/vorestation.dme index 49d7bdc22d..08ba683e78 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2903,6 +2903,7 @@ #include "code\modules\mob\language\generic.dm" #include "code\modules\mob\language\language.dm" #include "code\modules\mob\language\outsider.dm" +#include "code\modules\mob\language\snowflake.dm" #include "code\modules\mob\language\station.dm" #include "code\modules\mob\language\station_vr.dm" #include "code\modules\mob\language\station_YW.dm" @@ -4559,6 +4560,7 @@ #include "modular_chomp\code\modules\mob\living\carbon\human\update_icons.dm" #include "modular_chomp\code\modules\mob\living\carbon\human\species\species.dm" #include "modular_chomp\code\modules\mob\living\carbon\human\species\outsider\vox.dm" +#include "modular_chomp\code\modules\mob\living\carbon\human\species\station\prommie_blob.dm" #include "modular_chomp\code\modules\mob\living\carbon\human\species\station\station.dm" #include "modular_chomp\code\modules\mob\living\carbon\human\species\station\teshari.dm" #include "modular_chomp\code\modules\mob\living\carbon\human\species\station\protean\_protean_defines.dm"